Merge branch 'master' into bfops/blackholio-ci

Author: bfops

.github/workflows/docs-check-links.yml

@@ -0,0 +1,30 @@
+name: Docs - Check Link Validity
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+  merge_group:
+
+jobs:
+  check-links:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16' # or the version of Node.js you're using
+
+      - name: Install dependencies
+        working-directory: docs
+        run: |
+          npm install
+
+      - name: Run link check
+        working-directory: docs
+        run: |
+          npm run check-links

.github/workflows/docs-validate-nav-build.yml

@@ -0,0 +1,47 @@
+name: Docs - Validate nav.ts Matches nav.js
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+  merge_group:
+
+jobs:
+  validate-build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16'
+
+      - name: Install dependencies
+        working-directory: docs
+        run: |
+          npm install
+
+      - name: Backup existing nav.js
+        working-directory: docs
+        run: |
+          mv docs/nav.js docs/nav.js.original
+
+      - name: Build nav.ts
+        working-directory: docs
+        run: |
+          npm run build
+
+      - name: Compare generated nav.js with original nav.js
+        working-directory: docs
+        run: |
+          diff -q docs/nav.js docs/nav.js.original || (echo "Generated nav.js differs from committed version. Run 'npm run build' and commit the updated file." && exit 1)
+
+      - name: Restore original nav.js
+        working-directory: docs
+        if: success() || failure()
+        run: |
+          mv docs/nav.js.original docs/nav.js

…ks/typescript/.github/workflows/lint.yml .github/workflows/lint.ymlsdks/typescript/.github/workflows/lint.yml renamed to .github/workflows/lint.yml sdks/typescript/.github/workflows/lint.yml renamed to .github/workflows/lint.yml

@@ -1,10 +1,10 @@
-name: Lint
+name: TypeScript - Lint
 
 on:
   pull_request:
   push:
     branches:
-      - main
+      - master
 
 jobs:
   build:
@@ -25,6 +25,7 @@ jobs:
           run_install: true
 
       - name: Get pnpm store directory
+        working-directory: sdks/typescript
         shell: bash
         run: |
           echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
@@ -38,4 +39,5 @@ jobs:
             ${{ runner.os }}-pnpm-store-
 
       - name: Lint
+        working-directory: sdks/typescript
         run: pnpm lint

.github/workflows/pr-only-ci.yml

@@ -31,18 +31,12 @@ jobs:
         with:
           ref: ${{ env.GIT_REF }}
       - uses: dsherret/rust-toolchain-file@v1
-      - name: Checkout docs
-        uses: actions/checkout@v4
-        with:
-          repository: clockworklabs/spacetime-docs
-          ref: master
-          path: spacetime-docs
       - name: Check for docs change
         run: |
-          cargo run --features markdown-docs -p spacetimedb-cli > spacetime-docs/docs/cli-reference.md
-          cd spacetime-docs
+          cargo run --features markdown-docs -p spacetimedb-cli > docs/docs/cli-reference.md
+          cd docs
           # This is needed because our website doesn't render markdown quite properly.
-          # See the README in spacetime-docs for more details.
+          # See the README in docs for more details.
           sed -i'' -E 's!^(##) `(.*)`$!\1 \2!' docs/cli-reference.md
           sed -i'' -E 's!^(######) \*\*(.*)\*\*$!\1 <b>\2</b>!' docs/cli-reference.md
           git status

…ks/typescript/.github/workflows/test.yml .github/workflows/test.ymlsdks/typescript/.github/workflows/test.yml renamed to .github/workflows/test.yml sdks/typescript/.github/workflows/test.yml renamed to .github/workflows/test.yml

@@ -1,9 +1,8 @@
-name: Tests
+name: TypeScript - Tests
 
 on:
   push:
     branches:
-      - main
       - master
   pull_request:
 
@@ -27,6 +26,7 @@ jobs:
 
       - name: Get pnpm store directory
         shell: bash
+        working-directory: sdks/typescript
         run: |
           echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
 
@@ -39,10 +39,11 @@ jobs:
             ${{ runner.os }}-pnpm-store-
 
       - name: Compile
+        working-directory: sdks/typescript
         run: pnpm compile
 
       - name: Run sdk tests
-        working-directory: packages/sdk
+        working-directory: sdks/typescript/packages/sdk
         run: pnpm test
 
       # - name: Extract SpacetimeDB branch name from file
@@ -70,42 +71,37 @@ jobs:
       #     echo "branch=$branch" >> $GITHUB_OUTPUT
       #     echo "Using SpacetimeDB branch from file: $branch"
 
-      - name: Checkout SpacetimeDB
-        uses: actions/checkout@v4
-        with:
-          repository: clockworklabs/SpacetimeDB
-      #    ref: ${{ steps.extract-branch.outputs.branch }}
-          path: SpacetimeDB
-
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
 
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v2
         with:
-          workspaces: SpacetimeDB/modules/quickstart-chat
+          workspaces: modules/quickstart-chat
           shared-key: quickstart-chat-test
 
       - name: Install SpacetimeDB CLI from the local checkout
         run: |
-          cargo install --force --path SpacetimeDB/crates/cli --locked --message-format=short
-          cargo install --force --path SpacetimeDB/crates/standalone --locked --message-format=short
+          cargo install --force --path crates/cli --locked --message-format=short
+          cargo install --force --path crates/standalone --locked --message-format=short
           # Add a handy alias using the old binary name, so that we don't have to rewrite all scripts (incl. in submodules).
           rm -f $HOME/.cargo/bin/spacetime
           ln -s $HOME/.cargo/bin/spacetimedb-cli $HOME/.cargo/bin/spacetime
           # Clear any existing information
           spacetime server clear -y
         env:
           # Share the target directory with our local project to avoid rebuilding same SpacetimeDB crates twice.
-          CARGO_TARGET_DIR: SpacetimeDB/modules/quickstart-chat/target
+          CARGO_TARGET_DIR: modules/quickstart-chat/target
 
       - name: Generate client bindings
-        working-directory: SpacetimeDB/modules/quickstart-chat
+        working-directory: modules/quickstart-chat
         run: |
-          spacetime generate --lang typescript --out-dir ../../../examples/quickstart-chat/src/module_bindings
+          spacetime generate --lang typescript --out-dir ../../sdks/typescript/examples/quickstart-chat/src/module_bindings
+          cd ../../sdks/typescript
           pnpm lint --write
 
       - name: Check for changes
+        working-directory: sdks/typescript
         run: |
           # This was copied from SpacetimeDB/tools/check-diff.sh.
           # It's required because `spacetime generate` creates lines with the SpacetimeDB commit
@@ -133,7 +129,7 @@ jobs:
       #     spacetime logs quickstart-chat
 
       - name: Check that quickstart-chat builds
-        working-directory: examples/quickstart-chat
+        working-directory: sdks/typescript/examples/quickstart-chat
         run: pnpm build
 
       # - name: Run quickstart-chat tests

Cargo.lock

@@ -51,13 +51,15 @@ jsonwebtoken.workspace = true
 scopeguard.workspace = true
 serde_with.workspace = true
 async-stream.workspace = true
+humantime.workspace = true
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 jemalloc_pprof.workspace = true
 
 [dev-dependencies]
 jsonwebtoken.workspace = true
 pretty_assertions = { workspace = true, features = ["unstable"] }
+toml.workspace = true
 
 [lints]
 workspace = true

crates/client-api/Cargo.toml

@@ -31,7 +31,7 @@ use spacetimedb_lib::db::raw_def::v9::RawModuleDefV9;
 use spacetimedb_lib::identity::AuthCtx;
 use spacetimedb_lib::{sats, Timestamp};
 
-use super::subscribe::handle_websocket;
+use super::subscribe::{handle_websocket, HasWebSocketOptions};
 
 #[derive(Deserialize)]
 pub struct CallParams {
@@ -790,7 +790,7 @@ pub struct DatabaseRoutes<S> {
 
 impl<S> Default for DatabaseRoutes<S>
 where
-    S: NodeDelegate + ControlStateDelegate + Clone + 'static,
+    S: NodeDelegate + ControlStateDelegate + HasWebSocketOptions + Clone + 'static,
 {
     fn default() -> Self {
         use axum::routing::{delete, get, post, put};