Merge master into tyler/spacetime-json-docs

Resolves conflict in spacetime_config.rs: master added r#gen keyword
escaping (Rust 2024) to generate-inheritance test assertions, but this
branch removed generate inheritance entirely, so those assertions are
correctly absent.

Author: clockwork-labs-bot

.github/workflows/package.yml

@@ -4,12 +4,14 @@ on:
   push:
     tags:
       - '**'
-    branches:
-      - master
-      - release/*
+  workflow_dispatch:
+
+permissions:
+  contents: read
 
 jobs:
   build-cli:
+    if: ${{ !(startsWith(github.ref, 'refs/tags/') && matrix.target == 'x86_64-pc-windows-msvc') }}
     strategy:
       fail-fast: false
       matrix:
@@ -85,3 +87,89 @@ jobs:
           source_dir: build
           endpoint: https://nyc3.digitaloceanspaces.com
           destination_dir: ${{ steps.extract_branch.outputs.branch }}
+
+  build-cli-windows-signed:
+    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    name: Build and sign CLI for x86_64 Windows
+    runs-on: [self-hosted, windows, signing]
+    environment: codesign
+    concurrency:
+      group: codesign-${{ github.ref }}
+      cancel-in-progress: false
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Rust
+        uses: dsherret/rust-toolchain-file@v1
+
+      - name: Install rust target
+        run: rustup target add x86_64-pc-windows-msvc
+
+      - name: Compile
+        run: |
+          cargo build --release --target x86_64-pc-windows-msvc -p spacetimedb-cli -p spacetimedb-standalone -p spacetimedb-update
+
+      - name: Write certificate file
+        shell: powershell
+        env:
+          DIGICERT_CERT_B64: ${{ secrets.DIGICERT_CERT_B64 }}
+        run: |
+          [IO.File]::WriteAllBytes("digicert.crt", [Convert]::FromBase64String($env:DIGICERT_CERT_B64))
+
+      - name: Sign binaries
+        shell: powershell
+        env:
+          DIGICERT_KEYPAIR_ALIAS: ${{ secrets.DIGICERT_KEYPAIR_ALIAS }}
+        run: |
+          $ErrorActionPreference = 'Stop'
+          $targetDir = Join-Path $env:GITHUB_WORKSPACE 'target\x86_64-pc-windows-msvc\release'
+          $certFile = Join-Path $env:GITHUB_WORKSPACE 'digicert.crt'
+
+          $signtool = Get-Command signtool.exe -ErrorAction Stop
+
+          $files = @(
+            (Join-Path $targetDir 'spacetimedb-update.exe'),
+            (Join-Path $targetDir 'spacetimedb-cli.exe'),
+            (Join-Path $targetDir 'spacetimedb-standalone.exe')
+          )
+
+          foreach ($file in $files) {
+            & $signtool.Path sign /csp "DigiCert Signing Manager KSP" /kc $env:DIGICERT_KEYPAIR_ALIAS /f $certFile /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 $file
+            & $signtool.Path verify /v /pa $file
+          }
+
+      - name: Package (windows)
+        shell: powershell
+        run: |
+          $ErrorActionPreference = 'Stop'
+          New-Item -ItemType Directory -Force -Path build | Out-Null
+          $releaseDir = Join-Path $env:GITHUB_WORKSPACE 'target\x86_64-pc-windows-msvc\release'
+
+          Copy-Item (Join-Path $releaseDir 'spacetimedb-update.exe') (Join-Path $env:GITHUB_WORKSPACE 'build\spacetimedb-update-x86_64-pc-windows-msvc.exe')
+          Compress-Archive -Force -Path @(
+            (Join-Path $releaseDir 'spacetimedb-cli.exe'),
+            (Join-Path $releaseDir 'spacetimedb-standalone.exe')
+          ) -DestinationPath (Join-Path $env:GITHUB_WORKSPACE 'build\spacetime-x86_64-pc-windows-msvc.zip')
+
+      - name: Extract branch name
+        shell: powershell
+        run: |
+          $ErrorActionPreference = 'Stop'
+          $branch = $env:GITHUB_HEAD_REF
+          if ([string]::IsNullOrEmpty($branch)) {
+            $branch = $env:GITHUB_REF -replace '^refs/heads/', ''
+          }
+          "branch=$branch" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
+        id: extract_branch
+
+      - name: Upload to DO Spaces
+        uses: shallwefootball/s3-upload-action@master
+        with:
+          aws_key_id: ${{ secrets.AWS_KEY_ID }}
+          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
+          aws_bucket: ${{ vars.AWS_BUCKET }}
+          source_dir: build
+          endpoint: https://nyc3.digitaloceanspaces.com
+          destination_dir: ${{ steps.extract_branch.outputs.branch }}

.gitignore

@@ -264,3 +264,6 @@ nul
 # AI agent config
 .codex
 .claude
+
+# Any local file
+*.local

.rustfmt.toml

@@ -1,2 +1,3 @@
 max_width = 120
-edition = "2021"
+style_edition = "2021"
+edition = "2024"

Cargo.lock

@@ -107,7 +107,7 @@ debug = true
 
 [workspace.package]
 version = "2.0.3"
-edition = "2021"
+edition = "2024"
 # update rust-toolchain.toml too!
 rust-version = "1.93.0"
 

Cargo.toml

@@ -115,12 +115,12 @@ impl TryInto<SpacetimeIdentityClaims> for IncomingClaims {
 
         let computed_identity = Identity::from_claims(&self.issuer, &self.subject);
         // If an identity is provided, it must match the computed identity.
-        if let Some(token_identity) = self.identity {
-            if token_identity != computed_identity {
-                return Err(anyhow::anyhow!(
+        if let Some(token_identity) = self.identity
+            && token_identity != computed_identity
+        {
+            return Err(anyhow::anyhow!(
                     "Identity mismatch: token identity {token_identity:?} does not match computed identity {computed_identity:?}",
                 ));
-            }
         }
 
         Ok(SpacetimeIdentityClaims {

crates/auth/src/identity.rs

@@ -171,7 +171,7 @@ pub fn table_name<T: BenchTable>(style: IndexStrategy) -> TableName {
 #[derive(Clone)]
 pub struct XorShiftLite(pub u64);
 impl XorShiftLite {
-    fn gen(&mut self) -> u64 {
+    fn r#gen(&mut self) -> u64 {
         let old = self.0;
         self.0 ^= self.0 << 13;
         self.0 ^= self.0 >> 7;
@@ -189,36 +189,36 @@ pub trait RandomTable {
     /// Then in the filter benchmarks, `mean_result_count = table_size / buckets`.
     ///
     /// Currently the same number of buckets is used for all attributes.
-    fn gen(id: u32, rng: &mut XorShiftLite, buckets: u64) -> Self;
+    fn r#gen(id: u32, rng: &mut XorShiftLite, buckets: u64) -> Self;
 }
 
 impl RandomTable for u32_u64_str {
-    fn gen(id: u32, rng: &mut XorShiftLite, buckets: u64) -> Self {
-        let name = nth_name(rng.gen() % buckets).into();
-        let age = rng.gen() % buckets;
+    fn r#gen(id: u32, rng: &mut XorShiftLite, buckets: u64) -> Self {
+        let name = nth_name(rng.r#gen() % buckets).into();
+        let age = rng.r#gen() % buckets;
         u32_u64_str { id, name, age }
     }
 }
 
 impl RandomTable for u32_u64_u64 {
-    fn gen(id: u32, rng: &mut XorShiftLite, buckets: u64) -> Self {
-        let x = rng.gen() % buckets;
-        let y = rng.gen() % buckets;
+    fn r#gen(id: u32, rng: &mut XorShiftLite, buckets: u64) -> Self {
+        let x = rng.r#gen() % buckets;
+        let y = rng.r#gen() % buckets;
         u32_u64_u64 { id, x, y }
     }
 }
 
 impl RandomTable for u64_u64_u32 {
-    fn gen(id: u32, rng: &mut XorShiftLite, buckets: u64) -> Self {
-        let x = rng.gen() % buckets;
-        let y = rng.gen() % buckets;
+    fn r#gen(id: u32, rng: &mut XorShiftLite, buckets: u64) -> Self {
+        let x = rng.r#gen() % buckets;
+        let y = rng.r#gen() % buckets;
         u64_u64_u32 { x, y, id }
     }
 }
 
 pub fn create_sequential<T: RandomTable>(seed: u64, count: u32, buckets: u64) -> Vec<T> {
     let mut rng = XorShiftLite(seed);
-    (0..count).map(|id| T::gen(id, &mut rng, buckets)).collect()
+    (0..count).map(|id| T::r#gen(id, &mut rng, buckets)).collect()
 }
 
 /// Create a table whose first `identical` rows are identical except for their `id` column.
@@ -237,13 +237,13 @@ pub fn create_partly_identical<T: RandomTable>(seed: u64, identical: u64, total:
     for _ in 0..identical {
         // clone to preserve rng state
         let mut rng_ = rng.clone();
-        result.push(T::gen(id as u32, &mut rng_, buckets));
+        result.push(T::r#gen(id as u32, &mut rng_, buckets));
         id += 1;
     }
     // advance rng
-    drop(T::gen(id as u32, &mut rng, buckets));
+    drop(T::r#gen(id as u32, &mut rng, buckets));
     for _ in identical..total {
-        result.push(T::gen(id as u32, &mut rng, buckets));
+        result.push(T::r#gen(id as u32, &mut rng, buckets));
         id += 1;
     }
     result
@@ -254,8 +254,8 @@ pub fn create_random<T: RandomTable>(seed: u64, count: u32, buckets: u64) -> Vec
     let mut rng = XorShiftLite(seed);
     (0..count)
         .map(|_| {
-            let id = (rng.gen() % (u32::MAX as u64)) as u32;
-            T::gen(id, &mut rng, buckets)
+            let id = (rng.r#gen() % (u32::MAX as u64)) as u32;
+            T::r#gen(id, &mut rng, buckets)
         })
         .collect()
 }
@@ -362,7 +362,7 @@ mod tests {
             }
             // sample some earlier names to make sure we haven't overlapped
             for _ in 0..30 {
-                let prev = rng.gen() % n;
+                let prev = rng.r#gen() % n;
                 assert!(
                     name != nth_name(prev),
                     "names should not repeat, but {}->{} and {}->{}",

crates/bench/src/schemas.rs

@@ -227,10 +227,10 @@ fn memo_query<F: FnOnce() -> String>(bench_name: BenchName, table_id: &str, gene
     // fast path
     let queries = QUERIES.read().unwrap();
 
-    if let Some(bench_queries) = queries.get(&bench_name) {
-        if let Some(query) = bench_queries.get(table_id) {
-            return query.clone();
-        }
+    if let Some(bench_queries) = queries.get(&bench_name)
+        && let Some(query) = bench_queries.get(table_id)
+    {
+        return query.clone();
     }
 
     // slow path