Skip to content

Commit 1f085e4

Browse files
committed
Merge branch 'master' into phoebe/procedure/rust-sdk
2 parents ba059e6 + db21fce commit 1f085e4

42 files changed

Lines changed: 1956 additions & 268 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.env.sample

Lines changed: 0 additions & 2 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,17 @@ jobs:
5050
- uses: actions/setup-dotnet@v4
5151
with:
5252
global-json-file: global.json
53+
54+
# nodejs and pnpm are required for the typescript quickstart smoketest
55+
- name: Set up Node.js
56+
uses: actions/setup-node@v4
57+
with:
58+
node-version: 18
59+
60+
- uses: pnpm/action-setup@v4
61+
with:
62+
run_install: true
63+
5364
- name: Install psql (Windows)
5465
if: runner.os == 'Windows'
5566
run: choco install psql -y --no-progress

.github/workflows/package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
include:
17-
- { name: x86_64 Linux, target: x86_64-unknown-linux-gnu, runner: bare-metal, container: 'debian:bookworm' }
17+
- { name: x86_64 Linux, target: x86_64-unknown-linux-gnu, runner: ubuntu-latest }
1818
- { name: aarch64 Linux, target: aarch64-unknown-linux-gnu, runner: arm-runner }
1919
# Disabled because musl builds weren't working and we didn't want to investigate. See https://github.com/clockworklabs/SpacetimeDB/pull/2964.
2020
# - { name: x86_64 Linux musl, target: x86_64-unknown-linux-musl, runner: bare-metal, container: alpine }

Cargo.lock

Lines changed: 67 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,9 @@ lazy_static = "1.4.0"
209209
log = "0.4.17"
210210
memchr = "2"
211211
mimalloc = "0.1.39"
212+
names = "0.14"
212213
nohash-hasher = "0.2"
214+
notify = "7.0"
213215
nix = "0.30"
214216
once_cell = "1.16"
215217
parking_lot = { version = "0.12.1", features = ["send_guard", "arc_lock"] }

crates/bindings-csharp/Codegen.Tests/fixtures/diag/snapshots/Module#FFI.verified.cs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/bindings-csharp/Codegen.Tests/fixtures/server/snapshots/Module#FFI.verified.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public sealed record ReducerContext : DbContext<Local>, Internal.IReducerContext
1414
public readonly ConnectionId? ConnectionId;
1515
public readonly Random Rng;
1616
public readonly Timestamp Timestamp;
17-
public readonly AuthCtx AuthCtx;
17+
public readonly AuthCtx SenderAuth;
1818

1919
// We need this property to be non-static for parity with client SDK.
2020
public Identity Identity => Internal.IReducerContext.GetIdentity();
@@ -30,7 +30,7 @@ Timestamp time
3030
ConnectionId = connectionId;
3131
Rng = random;
3232
Timestamp = time;
33-
AuthCtx = AuthCtx.BuildFromSystemTables(connectionId, identity);
33+
SenderAuth = AuthCtx.BuildFromSystemTables(connectionId, identity);
3434
}
3535
}
3636

crates/bindings-csharp/Codegen/Module.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@ public sealed record ReducerContext : DbContext<Local>, Internal.IReducerContext
11111111
public readonly ConnectionId? ConnectionId;
11121112
public readonly Random Rng;
11131113
public readonly Timestamp Timestamp;
1114-
public readonly AuthCtx AuthCtx;
1114+
public readonly AuthCtx SenderAuth;
11151115
11161116
// We need this property to be non-static for parity with client SDK.
11171117
public Identity Identity => Internal.IReducerContext.GetIdentity();
@@ -1121,7 +1121,7 @@ internal ReducerContext(Identity identity, ConnectionId? connectionId, Random ra
11211121
ConnectionId = connectionId;
11221122
Rng = random;
11231123
Timestamp = time;
1124-
AuthCtx = AuthCtx.BuildFromSystemTables(connectionId, identity);
1124+
SenderAuth = AuthCtx.BuildFromSystemTables(connectionId, identity);
11251125
}
11261126
}
11271127

crates/bindings-csharp/Runtime/JwtClaims.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private List<string> ExtractAudience()
6767
{
6868
if (!RootElement.TryGetProperty("aud", out var aud))
6969
{
70-
throw new InvalidOperationException("JWT missing 'aud' claim");
70+
return [];
7171
}
7272

7373
return aud.ValueKind switch

crates/bindings-typescript/src/server/reducers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export type ReducerCtx<SchemaDef extends UntypedSchemaDef> = Readonly<{
116116
timestamp: Timestamp;
117117
connectionId: ConnectionId | null;
118118
db: DbView<SchemaDef>;
119-
authCtx: AuthCtx;
119+
senderAuth: AuthCtx;
120120
}>;
121121

122122
/**

0 commit comments

Comments
 (0)