Update/upgrade dependencies (#266)

* Update and dedup some deps

* Upgrade dependencies

Cargo.toml

@@ -73,17 +73,13 @@ bitflags = "2.3.3"
 byte-unit = "4.0.18"
 bytes = "1.2.1"
 bytestring = { version = "1.2.0", features = ["serde"] }
-cargo_metadata = "0.15.2"
+cargo_metadata = "0.17.0"
 chrono = { version = "0.4.24", default-features = false }
 clap = { version = "4.2.4", features = ["derive"] }
 colored = "2.0.0"
 console = { version = "0.15.6" }
 convert_case = "0.6.0"
-criterion = { version = "0.4.0", features = [
-  "async",
-  "async_tokio",
-  "html_reports",
-] }
+criterion = { version = "0.5.1", features = ["async", "async_tokio", "html_reports"] }
 crossbeam-channel = "0.5"
 cursive = { version = "0.20", default-features = false, features = ["crossterm-backend"] }
 decorum = { version = "0.3.1", default-features = false, features = ["std"] }
@@ -109,10 +105,10 @@ humantime = "2.1.0"
 hyper = "0.14.18"
 im = "15.1"
 imara-diff = "0.1.3"
-indexmap = "1.9.2"
+indexmap = "2.0.0"
 insta = { version = "1.21.0", features = ["toml"] }
 is-terminal = "0.4"
-itertools = "0.10.5"
+itertools = "0.11.0"
 jsonwebtoken = { version = "8.1.0" }
 lazy_static = "1.4.0"
 log = "0.4.17"
@@ -141,34 +137,31 @@ rust_decimal = { version = "1.29.1", features = ["db-tokio-postgres"] }
 rustyline = { version = "12.0.0", features = [] }
 scoped-tls = "1.0.1"
 scopeguard = "1.1.0"
-sendgrid = { version = "0.18.1", features = ["async"] }
+sendgrid = { version = "0.19.2", features = ["async"] }
 serde = "1.0.136"
 serde_json = { version = "1.0.87", features = ["raw_value"] }
 serde_path_to_error = "0.1.9"
-serde_with = { version = "2.2.0", features = ["base64", "hex"] }
+serde_with = { version = "3.3.0", features = ["base64", "hex"] }
 serial_test = "2.0.0"
 sha1 = "0.10.1"
 sha3 = "0.10.0"
 slab = "0.4.7"
 sled = "0.34.7"
-sqlparser = "0.34.0"
-sqllogictest-engines = "0.13.0"
-sqllogictest = "0.13.2"
-strum = { version = "0.24.1", features = ["derive"] }
+sqlparser = "0.38.0"
+sqllogictest-engines = "0.17"
+sqllogictest = "0.17"
+strum = { version = "0.25.0", features = ["derive"] }
 syn = { version = "2", features = ["full", "extra-traits"] }
-syntect = { version = "5.0.0", default-features = false, features = [
-  "default-fancy",
-] }
-tabled = "0.8.0"
-tempdir = "0.3.7"
+syntect = { version = "5.0.0", default-features = false, features = ["default-fancy"] }
+tabled = "0.14.0"
 tempfile = "3.8"
 termcolor = "1.2.0"
 thiserror = "1.0.37"
 tokio = { version = "1.25.1", features = ["full"] }
 tokio-util = { version = "0.7.4", features = ["time"] }
 tokio-postgres = { version = "0.7.8", features = ["with-chrono-0_4"] }
-tokio-tungstenite = { version = "0.19", features = ["native-tls"] }
-toml = "0.5"
+tokio-tungstenite = { version = "0.20", features = ["native-tls"] }
+toml = "0.8"
 tower-http = { version = "0.4.1", features = ["cors"] }
 tracing = { version = "0.1.37", features = ["release_max_level_off"] }
 tracing-appender = "0.2.2"
@@ -188,8 +181,7 @@ wasmer-middlewares = "4.1.1"
 wasmer-types = "4.1.1"
 wasmer-vm = "4.1.1"
 
-wasmparser = "0.92.0"
-wasmtime = { version = "7", default-features = false, features = ["cranelift"] }
+wasmtime = { version = "14", default-features = false, features = ["cranelift"] }
 
 # We use the "ondemand" feature to allow connecting after the start,
 # and reconnecting, from the tracy client to the database.
@@ -210,4 +202,4 @@ openssl = { version = "0.10", features = ["vendored"] }
 
 # Rocksdb ostorage backend, linked only if "rocksdb" feature enabled.
 # if we link bzip, we get multiple defs
-rocksdb = { version = "0.19.0", default-features = false, features = ["lz4"] }
+rocksdb = { version = "0.21.0", default-features = false, features = ["lz4"] }

crates/bench/Cargo.toml

@@ -32,7 +32,7 @@ log.workspace = true
 clap.workspace = true
 rusqlite.workspace = true
 criterion.workspace = true
-tempdir.workspace = true
+tempfile.workspace = true
 rand.workspace = true
 tokio.workspace = true
 serde_json.workspace = true

crates/bench/src/spacetime_raw.rs

@@ -8,7 +8,7 @@ use spacetimedb::db::relational_db::{open_db, RelationalDB};
 use spacetimedb_lib::sats::AlgebraicValue;
 use spacetimedb_primitives::{ColId, TableId};
 use std::hint::black_box;
-use tempdir::TempDir;
+use tempfile::TempDir;
 
 pub type DbResult = (RelationalDB, TempDir, u32);
 
@@ -27,7 +27,7 @@ impl BenchDatabase for SpacetimeRaw {
     where
         Self: Sized,
     {
-        let temp_dir = TempDir::new("stdb_test")?;
+        let temp_dir = TempDir::with_prefix("stdb_test")?;
         let db = open_db(temp_dir.path(), in_memory, fsync)?;
 
         Ok(SpacetimeRaw {

crates/bench/src/sqlite.rs

@@ -12,7 +12,7 @@ use std::{
     hint::black_box,
     sync::{Arc, RwLock},
 };
-use tempdir::TempDir;
+use tempfile::TempDir;
 
 /// SQLite benchmark harness.
 pub struct SQLite {
@@ -30,7 +30,7 @@ impl BenchDatabase for SQLite {
     where
         Self: Sized,
     {
-        let temp_dir = TempDir::new("sqlite_test")?;
+        let temp_dir = TempDir::with_prefix("sqlite_test")?;
         let db = if in_memory {
             Connection::open_in_memory()?
         } else {

crates/cli/src/subcommands/identity.rs

@@ -12,7 +12,10 @@ use reqwest::{StatusCode, Url};
 use serde::Deserialize;
 use spacetimedb::auth::identity::decode_token;
 use spacetimedb_lib::{recovery::RecoveryCodeResponse, Identity};
-use tabled::{object::Columns, Alignment, Modify, Style, Table, Tabled};
+use tabled::{
+    settings::{object::Columns, Alignment, Modify, Style},
+    Table, Tabled,
+};
 
 pub fn cli() -> Command {
     Command::new("identity")
@@ -518,7 +521,8 @@ Fetch the server's fingerprint with:
         println!("Identities for {}:", config.server_nick_or_host(server)?);
     }
 
-    let table = Table::new(&rows)
+    let mut table = Table::new(&rows);
+    table
         .with(Style::empty())
         .with(Modify::new(Columns::first()).with(Alignment::right()));
     println!("{}", table);

crates/cli/src/subcommands/list.rs

@@ -4,8 +4,10 @@ use clap::{Arg, ArgMatches, Command};
 use reqwest::StatusCode;
 use serde::Deserialize;
 use spacetimedb_lib::Address;
-use tabled::object::Columns;
-use tabled::{Alignment, Modify, Style, Table, Tabled};
+use tabled::{
+    settings::{object::Columns, Alignment, Modify, Style},
+    Table, Tabled,
+};
 
 pub fn cli() -> Command {
     Command::new("list")
@@ -67,7 +69,8 @@ pub async fn exec(config: Config, args: &ArgMatches) -> Result<(), anyhow::Error
 
     let identity = identity_config.nick_or_identity();
     if !result.addresses.is_empty() {
-        let table = Table::new(result.addresses)
+        let mut table = Table::new(result.addresses);
+        table
             .with(Style::psql())
             .with(Modify::new(Columns::first()).with(Alignment::left()));
         println!("Associated database addresses for {}:\n", identity);

crates/cli/src/subcommands/server.rs

@@ -4,7 +4,10 @@ use crate::{
 };
 use anyhow::Context;
 use clap::{Arg, ArgAction, ArgMatches, Command};
-use tabled::{object::Columns, Alignment, Modify, Style, Table, Tabled};
+use tabled::{
+    settings::{object::Columns, Alignment, Modify, Style},
+    Table, Tabled,
+};
 
 pub fn cli() -> Command {
     Command::new("server")
@@ -170,7 +173,8 @@ pub async fn exec_list(config: Config, _args: &ArgMatches) -> Result<(), anyhow:
         });
     }
 
-    let table = Table::new(&rows)
+    let mut table = Table::new(&rows);
+    table
         .with(Style::empty())
         .with(Modify::new(Columns::first()).with(Alignment::right()));
     println!("{}", table);

crates/cli/src/subcommands/sql.rs

@@ -2,11 +2,11 @@ use std::time::Instant;
 
 use crate::api::{from_json_seed, ClientApi, Connection, StmtResultJson};
 use clap::{Arg, ArgAction, ArgGroup, ArgMatches};
+use itertools::Itertools;
 use reqwest::RequestBuilder;
 use spacetimedb_lib::de::serde::SeedWrapper;
 use spacetimedb_lib::sats::{satn, Typespace};
-use tabled::builder::Builder;
-use tabled::Style;
+use tabled::settings::Style;
 
 use crate::config::Config;
 use crate::util::{database_address, get_auth_header_only};
@@ -76,17 +76,13 @@ pub(crate) async fn parse_req(mut config: Config, args: &ArgMatches) -> Result<C
 }
 
 // Need to report back timings from each query from the backend instead of infer here...
-fn print_row_count(rows: usize, with_stats: bool) {
-    if with_stats {
-        let txt = if rows == 1 { "row" } else { "rows" };
-        println!("({rows} {txt})");
-    }
+fn print_row_count(rows: usize) -> String {
+    let txt = if rows == 1 { "row" } else { "rows" };
+    format!("({rows} {txt})")
 }
 
-fn print_timings(now: Instant, with_stats: bool) {
-    if with_stats {
-        println!("Time: {:.2?}", now.elapsed());
-    }
+fn print_timings(now: Instant) {
+    println!("Time: {:.2?}", now.elapsed());
 }
 
 pub(crate) async fn run_sql(builder: RequestBuilder, sql: &str, with_stats: bool) -> Result<(), anyhow::Error> {
@@ -104,47 +100,56 @@ pub(crate) async fn run_sql(builder: RequestBuilder, sql: &str, with_stats: bool
 
     // Print only `OK for empty tables as it's likely a command like `INSERT`.
     if stmt_result_json.is_empty() {
-        print_timings(now, with_stats);
+        if with_stats {
+            print_timings(now);
+        }
         println!("OK");
         return Ok(());
     };
 
-    for (i, stmt_result) in stmt_result_json.iter().enumerate() {
-        let StmtResultJson { schema, rows } = &stmt_result;
-
-        let mut builder = Builder::default();
-        builder.set_columns(
-            schema
-                .elements
-                .iter()
-                .enumerate()
-                .map(|(i, e)| e.name.clone().unwrap_or_else(|| format!("column {i}"))),
-        );
-
-        let typespace = Typespace::default();
-        let ty = typespace.with_type(schema);
-        for row in rows {
-            let row = from_json_seed(row.get(), SeedWrapper(ty))?;
-            builder.add_record(
-                row.elements
-                    .iter()
-                    .zip(&schema.elements)
-                    .map(|(v, e)| satn::PsqlWrapper(ty.with(&e.algebraic_type).with_value(v))),
-            );
-        }
+    stmt_result_json
+        .iter()
+        .map(|stmt_result| {
+            let mut table = stmt_result_to_table(stmt_result)?;
+            if with_stats {
+                let row_count = print_row_count(table.count_rows());
+                table.with(tabled::settings::panel::Footer::new(row_count));
+            }
+            anyhow::Ok(table)
+        })
+        .process_results(|it| println!("{}", it.format("\n\n")))?;
+    if with_stats {
+        print_timings(now);
+    }
 
-        let table = builder.build().with(Style::psql());
+    Ok(())
+}
 
-        if i > 0 {
-            println!("\n{}", table);
-        } else {
-            println!("{}", table);
-        }
-        print_row_count(rows.len(), with_stats);
+fn stmt_result_to_table(stmt_result: &StmtResultJson) -> anyhow::Result<tabled::Table> {
+    let StmtResultJson { schema, rows } = stmt_result;
+
+    let mut builder = tabled::builder::Builder::default();
+    builder.set_header(
+        schema
+            .elements
+            .iter()
+            .enumerate()
+            .map(|(i, e)| e.name.clone().unwrap_or_else(|| format!("column {i}"))),
+    );
+
+    let ty = Typespace::EMPTY.with_type(schema);
+    for row in rows {
+        let row = from_json_seed(row.get(), SeedWrapper(ty))?;
+        builder.push_record(
+            ty.with_values(&row)
+                .map(|col_val| satn::PsqlWrapper(col_val).to_string()),
+        );
     }
-    print_timings(now, with_stats);
 
-    Ok(())
+    let mut table = builder.build();
+    table.with(Style::psql());
+
+    Ok(table)
 }
 
 pub async fn exec(config: Config, args: &ArgMatches) -> Result<(), anyhow::Error> {

crates/client-api/Cargo.toml

@@ -17,18 +17,18 @@ anyhow = { version = "1.0.57", features = ["backtrace"] }
 regex = "1"
 prometheus = "0.13.0"
 email_address = "0.2.3"
-tempdir = "0.3.7"
+tempfile.workspace = true
 async-trait = "0.1.60"
 chrono = { version = "0.4.23", features = ["serde"]}
 rand = "0.8.5"
-axum = { version = "0.6.16", features = ["headers", "ws", "tracing"] }
+axum = { version = "0.6.16", features = ["headers", "tracing"] }
 hyper = "0.14"
 http = "0.2"
 mime = "0.3.17"
 tokio-stream = { version = "0.1.12", features = ["sync"] }
 futures = "0.3"
 bytes = "1"
 bytestring = "1"
-tokio-tungstenite = "0.18.0"
+tokio-tungstenite.workspace = true
 itoa = "1.0.9"
 derive_more = "0.99.17"

crates/client-api/src/routes/subscribe.rs

@@ -111,10 +111,10 @@ where
     };
 
     let ws_config = WebSocketConfig {
-        max_send_queue: None,
         max_message_size: Some(0x2000000),
         max_frame_size: None,
         accept_unmasked_frames: false,
+        ..Default::default()
     };
 
     tokio::spawn(async move {

crates/client-api/src/routes/tracelog.rs

@@ -3,7 +3,7 @@ use axum::extract::{Path, State};
 use axum::response::IntoResponse;
 use http::StatusCode;
 use serde::Deserialize;
-use tempdir::TempDir;
+use tempfile::TempDir;
 
 use spacetimedb::address::Address;
 use spacetimedb::database_instance_context::DatabaseInstanceContext;
@@ -69,7 +69,7 @@ pub async fn stop_tracelog<S: ControlStateReadAccess + NodeDelegate>(
 pub async fn perform_tracelog_replay(body: Bytes) -> axum::response::Result<impl IntoResponse> {
     // Build out a temporary database
     let storage = Storage::Disk;
-    let tmp_dir = TempDir::new("stdb_test").expect("establish tmpdir");
+    let tmp_dir = TempDir::with_prefix("stdb_test").expect("establish tmpdir");
     let db_path = tmp_dir.path();
     let logger_path = tmp_dir.path();
     let identity = Identity::from_byte_array(hash_bytes(b"This is a fake identity.").data);