@dxos/feed 0.8.4-main.6fa680abb7 → 0.8.4-main.765dc60934

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/feed",
3
- "version": "0.8.4-main.6fa680abb7",
3
+ "version": "0.8.4-main.765dc60934",
4
4
  "description": "Append-only replicatable log",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,7 +8,7 @@
8
8
  "type": "git",
9
9
  "url": "https://github.com/dxos/dxos"
10
10
  },
11
- "license": "MIT",
11
+ "license": "FSL-1.1-Apache-2.0",
12
12
  "author": "info@dxos.org",
13
13
  "sideEffects": true,
14
14
  "type": "module",
@@ -25,13 +25,6 @@
25
25
  }
26
26
  },
27
27
  "types": "dist/types/src/index.d.ts",
28
- "typesVersions": {
29
- "*": {
30
- "testing": [
31
- "dist/types/src/testing/index.d.ts"
32
- ]
33
- }
34
- },
35
28
  "files": [
36
29
  "dist",
37
30
  "src"
@@ -39,18 +32,20 @@
39
32
  "dependencies": {
40
33
  "@effect/sql": "0.49.0",
41
34
  "@effect/sql-sqlite-node": "0.50.1",
42
- "@effect/vitest": "0.27.0",
43
- "effect": "3.19.16",
44
- "@dxos/async": "0.8.4-main.6fa680abb7",
45
- "@dxos/effect": "0.8.4-main.6fa680abb7",
46
- "@dxos/errors": "0.8.4-main.6fa680abb7",
47
- "@dxos/invariant": "0.8.4-main.6fa680abb7",
48
- "@dxos/keys": "0.8.4-main.6fa680abb7",
49
- "@dxos/protocols": "0.8.4-main.6fa680abb7",
50
- "@dxos/sql-sqlite": "0.8.4-main.6fa680abb7",
51
- "@dxos/log": "0.8.4-main.6fa680abb7",
52
- "@dxos/util": "0.8.4-main.6fa680abb7",
53
- "@dxos/context": "0.8.4-main.6fa680abb7"
35
+ "effect": "3.20.0",
36
+ "@dxos/async": "0.8.4-main.765dc60934",
37
+ "@dxos/context": "0.8.4-main.765dc60934",
38
+ "@dxos/effect": "0.8.4-main.765dc60934",
39
+ "@dxos/errors": "0.8.4-main.765dc60934",
40
+ "@dxos/invariant": "0.8.4-main.765dc60934",
41
+ "@dxos/log": "0.8.4-main.765dc60934",
42
+ "@dxos/protocols": "0.8.4-main.765dc60934",
43
+ "@dxos/keys": "0.8.4-main.765dc60934",
44
+ "@dxos/sql-sqlite": "0.8.4-main.765dc60934",
45
+ "@dxos/util": "0.8.4-main.765dc60934"
46
+ },
47
+ "devDependencies": {
48
+ "@effect/vitest": "0.29.0"
54
49
  },
55
50
  "publishConfig": {
56
51
  "access": "public"
@@ -312,7 +312,9 @@ describe('Feed V2', () => {
312
312
  // Ideally we use Cause.isDie(cause) -> error
313
313
  // But for quick check:
314
314
  let error = cause.value || cause.defect || cause;
315
- if (cause._tag === 'Die') error = cause.value || cause.defect;
315
+ if (cause._tag === 'Die') {
316
+ error = cause.value || cause.defect;
317
+ }
316
318
 
317
319
  expect(error).toBeDefined();
318
320
  expect(error.message).toBe('Cursor token mismatch');
package/src/feed-store.ts CHANGED
@@ -124,7 +124,9 @@ export class FeedStore {
124
124
  const rows = yield* sql<{ feedPrivateId: number }>`
125
125
  SELECT feedPrivateId FROM feeds WHERE spaceId = ${spaceId} AND feedId = ${feedId}
126
126
  `;
127
- if (rows.length > 0) return rows[0].feedPrivateId;
127
+ if (rows.length > 0) {
128
+ return rows[0].feedPrivateId;
129
+ }
128
130
 
129
131
  const newRows = yield* sql<{ feedPrivateId: number }>`
130
132
  INSERT INTO feeds (spaceId, feedId, feedNamespace) VALUES (${spaceId}, ${feedId}, ${namespace}) RETURNING feedPrivateId
@@ -141,7 +143,9 @@ export class FeedStore {
141
143
  Effect.gen(this, function* () {
142
144
  const sql = yield* SqlClient.SqlClient;
143
145
  const rows = yield* sql<{ token: string }>`SELECT token FROM cursor_tokens WHERE spaceId = ${spaceId}`;
144
- if (rows.length > 0) return rows[0].token;
146
+ if (rows.length > 0) {
147
+ return rows[0].token;
148
+ }
145
149
 
146
150
  const token = crypto.randomUUID().replace(/-/g, '').slice(0, 6);
147
151
  yield* sql`INSERT INTO cursor_tokens (spaceId, token) VALUES (${spaceId}, ${token})`;
@@ -643,6 +647,23 @@ export class FeedStore {
643
647
  Effect.gen(this, function* () {
644
648
  const sql = yield* SqlClient.SqlClient;
645
649
  for (const block of request.blocks) {
650
+ // Fold the conflict check into the UPDATE itself: only write when the row is
651
+ // unset or already at the requested position. RETURNING tells us whether the
652
+ // write took effect, so we avoid the per-block SELECT round-trip on the
653
+ // common path. Conflicts (rare) take the slow path below.
654
+ const updated = yield* sql<{ position: number | null }>`
655
+ UPDATE blocks SET position = ${block.position}
656
+ WHERE feedPrivateId = (
657
+ SELECT feedPrivateId FROM feeds
658
+ WHERE spaceId = ${request.spaceId} AND feedId = ${block.feedId} AND feedNamespace = ${block.feedNamespace}
659
+ )
660
+ AND actorId = ${block.actorId} AND sequence = ${block.sequence}
661
+ AND (position IS NULL OR position = ${block.position})
662
+ RETURNING position
663
+ `;
664
+ if (updated.length > 0) {
665
+ continue;
666
+ }
646
667
  const existing = yield* sql<{ position: number | null }>`
647
668
  SELECT position FROM blocks
648
669
  WHERE feedPrivateId = (
@@ -663,16 +684,56 @@ export class FeedStore {
663
684
  }),
664
685
  );
665
686
  }
666
- yield* sql`
667
- UPDATE blocks SET position = ${block.position}
668
- WHERE feedPrivateId = (
669
- SELECT feedPrivateId FROM feeds
670
- WHERE spaceId = ${request.spaceId} AND feedId = ${block.feedId} AND feedNamespace = ${block.feedNamespace}
671
- )
672
- AND actorId = ${block.actorId} AND sequence = ${block.sequence}
673
- `;
674
687
  }
675
688
  }).pipe(Effect.withSpan('FeedStore.setPosition'));
689
+
690
+ /**
691
+ * Gets all feeds and their blocks for a space, organized by feed ID and namespace.
692
+ * Used for space archive export.
693
+ */
694
+ getAllFeedsForSpace = (opts: {
695
+ spaceId: SpaceId;
696
+ }): Effect.Effect<
697
+ Array<{
698
+ feedId: string;
699
+ feedNamespace: string;
700
+ blocks: Block[];
701
+ }>,
702
+ SqlError.SqlError,
703
+ SqlClient.SqlClient
704
+ > =>
705
+ Effect.gen(this, function* () {
706
+ const sql = yield* SqlClient.SqlClient;
707
+
708
+ const feeds = yield* sql<{ feedId: string; feedNamespace: string }>`
709
+ SELECT DISTINCT feedId, feedNamespace FROM feeds WHERE spaceId = ${opts.spaceId}
710
+ `;
711
+
712
+ const result: Array<{ feedId: string; feedNamespace: string; blocks: Block[] }> = [];
713
+
714
+ for (const feed of feeds) {
715
+ const blocks = yield* sql<Block>`
716
+ SELECT blocks.*, feeds.feedId, feeds.feedNamespace
717
+ FROM blocks
718
+ JOIN feeds ON blocks.feedPrivateId = feeds.feedPrivateId
719
+ WHERE feeds.spaceId = ${opts.spaceId}
720
+ AND feeds.feedId = ${feed.feedId}
721
+ AND feeds.feedNamespace = ${feed.feedNamespace}
722
+ ORDER BY blocks.sequence ASC
723
+ `;
724
+
725
+ result.push({
726
+ feedId: feed.feedId,
727
+ feedNamespace: feed.feedNamespace,
728
+ blocks: blocks.map((row) => ({
729
+ ...row,
730
+ data: new Uint8Array(row.data),
731
+ })),
732
+ });
733
+ }
734
+
735
+ return result;
736
+ }).pipe(Effect.withSpan('FeedStore.getAllFeedsForSpace'));
676
737
  }
677
738
 
678
739
  const encodeCursor = (token: string, insertionId: number) => FeedCursor.make(`${token}|${insertionId}`);
@@ -7,7 +7,9 @@ import * as Array from 'effect/Array';
7
7
  import * as Deferred from 'effect/Deferred';
8
8
  import * as Effect from 'effect/Effect';
9
9
 
10
+ import { Context, ContextDisposedError } from '@dxos/context';
10
11
  import type { SpaceId } from '@dxos/keys';
12
+ import { log } from '@dxos/log';
11
13
  import { type FeedProtocol } from '@dxos/protocols';
12
14
  import type { SqlTransaction } from '@dxos/sql-sqlite';
13
15
 
@@ -30,7 +32,7 @@ export type SyncClientOptions = {
30
32
  serverPeerId?: string;
31
33
  feedStore: FeedStore;
32
34
  /** Send a protocol message to the server. Returns Effect. */
33
- sendMessage: (message: RequestMessage) => Effect.Effect<void, unknown, never>;
35
+ sendMessage: (ctx: Context, message: RequestMessage) => Effect.Effect<void, unknown, never>;
34
36
  };
35
37
 
36
38
  /**
@@ -73,21 +75,44 @@ export class SyncClient {
73
75
  */
74
76
  handleMessage(message: ProtocolMessage): Effect.Effect<void, never, never> {
75
77
  const requestId = 'requestId' in message && message.requestId != null ? String(message.requestId) : undefined;
76
- if (requestId == null) return Effect.void;
78
+ if (requestId == null) {
79
+ log.trace('feed sync client response ignored (no request id)', {
80
+ tag: message._tag,
81
+ senderPeerId: message.senderPeerId,
82
+ });
83
+ return Effect.void;
84
+ }
77
85
  const deferred = this.#handlers.get(requestId);
78
- if (deferred == null) return Effect.void;
86
+ if (deferred == null) {
87
+ log.trace('feed sync client response ignored (no pending rpc)', {
88
+ requestId,
89
+ tag: message._tag,
90
+ senderPeerId: message.senderPeerId,
91
+ });
92
+ return Effect.void;
93
+ }
79
94
  this.#handlers.delete(requestId);
95
+ log('feed sync client rpc completed', {
96
+ requestId,
97
+ tag: message._tag,
98
+ blockCount: 'blocks' in message ? message.blocks.length : undefined,
99
+ positionCount: 'positions' in message ? message.positions.length : undefined,
100
+ error: message._tag === 'Error' ? message.message : undefined,
101
+ });
80
102
  if (message._tag === 'Error') {
81
103
  return Effect.andThen(Deferred.fail(deferred, new Error(message.message)), () => Effect.void);
82
104
  }
83
105
  return Effect.andThen(Deferred.succeed(deferred, message), () => Effect.void);
84
106
  }
85
107
 
86
- pull(opts: {
87
- spaceId: SpaceId;
88
- feedNamespace: string;
89
- limit?: number;
90
- }): Effect.Effect<{ done: boolean }, unknown, SqlClient.SqlClient | SqlTransaction.SqlTransaction> {
108
+ pull(
109
+ ctx: Context,
110
+ opts: {
111
+ spaceId: SpaceId;
112
+ feedNamespace: string;
113
+ limit?: number;
114
+ },
115
+ ): Effect.Effect<{ done: boolean }, unknown, SqlClient.SqlClient | SqlTransaction.SqlTransaction> {
91
116
  const self = this;
92
117
  return Effect.gen(function* () {
93
118
  const lastPulledPosition = yield* self.#feedStore.getSyncState({
@@ -97,6 +122,14 @@ export class SyncClient {
97
122
  const requestId = crypto.randomUUID();
98
123
  const deferred = yield* Deferred.make<ProtocolMessage, Error>();
99
124
  self.#handlers.set(requestId, deferred);
125
+ const cleanupDispose = ctx.disposed
126
+ ? () => {}
127
+ : ctx.onDispose(() => {
128
+ Effect.runFork(Deferred.fail(deferred, new ContextDisposedError()));
129
+ });
130
+ if (ctx.disposed) {
131
+ yield* Deferred.fail(deferred, new ContextDisposedError());
132
+ }
100
133
  const request: RequestPayload = {
101
134
  _tag: 'QueryRequest',
102
135
  requestId,
@@ -105,10 +138,28 @@ export class SyncClient {
105
138
  position: lastPulledPosition,
106
139
  limit: opts.limit,
107
140
  };
108
- yield* self.#sendMessage(self.#withPeerIds(request));
109
- const message = yield* Deferred.await(deferred);
141
+ log('feed sync client pull rpc sending', {
142
+ requestId,
143
+ spaceId: opts.spaceId,
144
+ feedNamespace: opts.feedNamespace,
145
+ afterPosition: lastPulledPosition,
146
+ limit: opts.limit,
147
+ });
148
+ yield* self.#sendMessage(ctx, self.#withPeerIds(request));
149
+ const message = yield* Effect.ensuring(
150
+ Deferred.await(deferred),
151
+ Effect.sync(() => {
152
+ cleanupDispose();
153
+ self.#handlers.delete(requestId);
154
+ }),
155
+ );
110
156
  const response = yield* self.#expectResponse<QueryResponse>(requestId, message, 'QueryResponse');
111
157
  if (response.blocks.length === 0) {
158
+ log.trace('feed sync client pull done (empty batch)', {
159
+ requestId,
160
+ spaceId: opts.spaceId,
161
+ feedNamespace: opts.feedNamespace,
162
+ });
112
163
  return { done: true };
113
164
  }
114
165
  yield* self.#feedStore.append({
@@ -128,15 +179,26 @@ export class SyncClient {
128
179
  lastPulledPosition: maxPulledPosition,
129
180
  });
130
181
 
182
+ log('feed sync client pull applied batch', {
183
+ requestId,
184
+ spaceId: opts.spaceId,
185
+ feedNamespace: opts.feedNamespace,
186
+ batchSize: response.blocks.length,
187
+ hasMore: response.hasMore,
188
+ maxPulledPosition,
189
+ });
131
190
  return { done: false };
132
191
  });
133
192
  }
134
193
 
135
- push(opts: {
136
- spaceId: SpaceId;
137
- feedNamespace: string;
138
- limit?: number;
139
- }): Effect.Effect<{ done: boolean }, unknown, SqlClient.SqlClient | SqlTransaction.SqlTransaction> {
194
+ push(
195
+ ctx: Context,
196
+ opts: {
197
+ spaceId: SpaceId;
198
+ feedNamespace: string;
199
+ limit?: number;
200
+ },
201
+ ): Effect.Effect<{ done: boolean }, unknown, SqlClient.SqlClient | SqlTransaction.SqlTransaction> {
140
202
  const self = this;
141
203
  return Effect.gen(function* () {
142
204
  const unpositioned = yield* self.#feedStore.query({
@@ -146,11 +208,23 @@ export class SyncClient {
146
208
  limit: opts.limit,
147
209
  });
148
210
  if (unpositioned.blocks.length === 0) {
211
+ log.trace('feed sync client push skipped (nothing to send)', {
212
+ spaceId: opts.spaceId,
213
+ feedNamespace: opts.feedNamespace,
214
+ });
149
215
  return { done: true };
150
216
  }
151
217
  const requestId = crypto.randomUUID();
152
218
  const deferred = yield* Deferred.make<ProtocolMessage, Error>();
153
219
  self.#handlers.set(requestId, deferred);
220
+ const cleanupDispose = ctx.disposed
221
+ ? () => {}
222
+ : ctx.onDispose(() => {
223
+ Effect.runFork(Deferred.fail(deferred, new ContextDisposedError()));
224
+ });
225
+ if (ctx.disposed) {
226
+ yield* Deferred.fail(deferred, new ContextDisposedError());
227
+ }
154
228
  const request: RequestPayload = {
155
229
  _tag: 'AppendRequest',
156
230
  requestId,
@@ -158,8 +232,20 @@ export class SyncClient {
158
232
  feedNamespace: opts.feedNamespace,
159
233
  blocks: unpositioned.blocks,
160
234
  };
161
- yield* self.#sendMessage(self.#withPeerIds(request));
162
- const message = yield* Deferred.await(deferred);
235
+ log('feed sync client push rpc sending', {
236
+ requestId,
237
+ spaceId: opts.spaceId,
238
+ feedNamespace: opts.feedNamespace,
239
+ blockCount: unpositioned.blocks.length,
240
+ });
241
+ yield* self.#sendMessage(ctx, self.#withPeerIds(request));
242
+ const message = yield* Effect.ensuring(
243
+ Deferred.await(deferred),
244
+ Effect.sync(() => {
245
+ cleanupDispose();
246
+ self.#handlers.delete(requestId);
247
+ }),
248
+ );
163
249
  const response = yield* self.#expectResponse<AppendResponse>(requestId, message, 'AppendResponse');
164
250
  yield* self.#feedStore.setPosition({
165
251
  spaceId: opts.spaceId,
@@ -171,6 +257,12 @@ export class SyncClient {
171
257
  position,
172
258
  })),
173
259
  });
260
+ log('feed sync client push positions applied', {
261
+ requestId,
262
+ spaceId: opts.spaceId,
263
+ feedNamespace: opts.feedNamespace,
264
+ positionCount: response.positions.length,
265
+ });
174
266
  return { done: false };
175
267
  });
176
268
  }
@@ -5,6 +5,8 @@
5
5
  import type * as SqlClient from '@effect/sql/SqlClient';
6
6
  import * as Effect from 'effect/Effect';
7
7
 
8
+ import { Context } from '@dxos/context';
9
+ import { log } from '@dxos/log';
8
10
  import { type FeedProtocol } from '@dxos/protocols';
9
11
  import type { SqlTransaction } from '@dxos/sql-sqlite';
10
12
 
@@ -15,12 +17,24 @@ type ProtocolMessage = FeedProtocol.ProtocolMessage;
15
17
  type QueryRequest = FeedProtocol.QueryRequest;
16
18
  type QueryResponse = FeedProtocol.QueryResponse;
17
19
 
20
+ const inboundSummary = (message: ProtocolMessage) => ({
21
+ tag: message._tag,
22
+ senderPeerId: message.senderPeerId,
23
+ recipientPeerId: message.recipientPeerId,
24
+ requestId: 'requestId' in message ? message.requestId : undefined,
25
+ spaceId: 'spaceId' in message ? message.spaceId : undefined,
26
+ feedNamespace: 'feedNamespace' in message ? message.feedNamespace : undefined,
27
+ blockCount: 'blocks' in message ? message.blocks.length : undefined,
28
+ position: 'position' in message ? message.position : undefined,
29
+ limit: 'limit' in message ? message.limit : undefined,
30
+ });
31
+
18
32
  export type SyncServerOptions = {
19
33
  /** This server's peer id. Set as senderPeerId on all replies. */
20
34
  peerId: string;
21
35
  feedStore: FeedStore;
22
36
  /** Send a protocol message to a client. Receives full message (recipient is set by server). Returns Effect. */
23
- sendMessage: (message: ProtocolMessage) => Effect.Effect<void, unknown, never>;
37
+ sendMessage: (ctx: Context, message: ProtocolMessage) => Effect.Effect<void, unknown, never>;
24
38
  };
25
39
 
26
40
  /**
@@ -30,7 +44,7 @@ export type SyncServerOptions = {
30
44
  export class SyncServer {
31
45
  readonly #peerId: string;
32
46
  readonly #feedStore: FeedStore;
33
- readonly #sendMessage: (message: ProtocolMessage) => Effect.Effect<void, unknown, never>;
47
+ readonly #sendMessage: SyncServerOptions['sendMessage'];
34
48
 
35
49
  constructor(options: SyncServerOptions) {
36
50
  this.#peerId = options.peerId;
@@ -42,9 +56,14 @@ export class SyncServer {
42
56
  * Receive a message from a client. Handles QueryRequest and AppendRequest; sends response via sendMessage with correct peer ids.
43
57
  */
44
58
  handleMessage(
59
+ ctx: Context,
45
60
  message: ProtocolMessage,
46
61
  ): Effect.Effect<void, unknown, SqlClient.SqlClient | SqlTransaction.SqlTransaction> {
47
62
  const self = this;
63
+ log('feed sync server received message', {
64
+ peerId: self.#peerId,
65
+ ...inboundSummary(message),
66
+ });
48
67
  const recipientPeerId = message.senderPeerId;
49
68
  const withPeerIds = (payload: Omit<ProtocolMessage, 'senderPeerId' | 'recipientPeerId'>): ProtocolMessage =>
50
69
  ({
@@ -57,35 +76,74 @@ export class SyncServer {
57
76
  const req = message as QueryRequest;
58
77
  return Effect.gen(function* () {
59
78
  const response: QueryResponse = yield* self.#feedStore.query(req);
60
- yield* self.#sendMessage(withPeerIds({ _tag: 'QueryResponse', ...response }));
79
+ log('feed sync server query completed', {
80
+ peerId: self.#peerId,
81
+ recipientPeerId,
82
+ requestId: req.requestId,
83
+ spaceId: req.spaceId,
84
+ feedNamespace: req.feedNamespace,
85
+ returnedBlocks: response.blocks.length,
86
+ hasMore: response.hasMore,
87
+ });
88
+ yield* self.#sendMessage(ctx, withPeerIds({ _tag: 'QueryResponse', ...response }));
61
89
  }).pipe(
62
- Effect.catchAll((err: unknown) =>
63
- self.#sendMessage(
90
+ Effect.catchAll((err: unknown) => {
91
+ log('feed sync server query failed', {
92
+ peerId: self.#peerId,
93
+ recipientPeerId,
94
+ requestId: req.requestId,
95
+ spaceId: req.spaceId,
96
+ feedNamespace: req.feedNamespace,
97
+ cause: err instanceof Error ? err.message : String(err),
98
+ });
99
+ return self.#sendMessage(
100
+ ctx,
64
101
  withPeerIds({
65
102
  _tag: 'Error',
66
103
  message: err instanceof Error ? err.message : String(err),
67
104
  } as Omit<ProtocolMessage, 'senderPeerId' | 'recipientPeerId'>),
68
- ),
69
- ),
105
+ );
106
+ }),
70
107
  );
71
108
  }
72
109
  case 'AppendRequest': {
73
110
  const req = message as AppendRequest;
74
111
  return Effect.gen(function* () {
75
112
  const response = yield* self.#feedStore.append(req);
76
- yield* self.#sendMessage(withPeerIds({ _tag: 'AppendResponse', ...response }));
113
+ log('feed sync server append completed', {
114
+ peerId: self.#peerId,
115
+ recipientPeerId,
116
+ requestId: req.requestId,
117
+ spaceId: req.spaceId,
118
+ feedNamespace: req.feedNamespace,
119
+ assignedPositions: response.positions.length,
120
+ });
121
+ yield* self.#sendMessage(ctx, withPeerIds({ _tag: 'AppendResponse', ...response }));
77
122
  }).pipe(
78
- Effect.catchAll((err: unknown) =>
79
- self.#sendMessage(
123
+ Effect.catchAll((err: unknown) => {
124
+ log('feed sync server append failed', {
125
+ peerId: self.#peerId,
126
+ recipientPeerId,
127
+ requestId: req.requestId,
128
+ spaceId: req.spaceId,
129
+ feedNamespace: req.feedNamespace,
130
+ cause: err instanceof Error ? err.message : String(err),
131
+ });
132
+ return self.#sendMessage(
133
+ ctx,
80
134
  withPeerIds({
81
135
  _tag: 'Error',
82
136
  message: err instanceof Error ? err.message : String(err),
83
137
  } as Omit<ProtocolMessage, 'senderPeerId' | 'recipientPeerId'>),
84
- ),
85
- ),
138
+ );
139
+ }),
86
140
  );
87
141
  }
88
142
  default:
143
+ log('feed sync server ignoring unsupported message', {
144
+ peerId: self.#peerId,
145
+ tag: message._tag,
146
+ });
89
147
  return Effect.void;
90
148
  }
91
149
  }
@@ -9,7 +9,7 @@ import * as Effect from 'effect/Effect';
9
9
  import * as Layer from 'effect/Layer';
10
10
  import * as ManagedRuntime from 'effect/ManagedRuntime';
11
11
 
12
- import { Resource } from '@dxos/context';
12
+ import { Context, Resource } from '@dxos/context';
13
13
  import { RuntimeProvider } from '@dxos/effect';
14
14
  import { type SpaceId } from '@dxos/keys';
15
15
  import { FeedProtocol } from '@dxos/protocols';
@@ -52,7 +52,7 @@ export class TestBuilder extends Resource {
52
52
  isServer: i === 0,
53
53
  actorId: `peer-${i}`,
54
54
  serverPeerId: i === 0 ? undefined : 'peer-0',
55
- sendMessage: (msg) => this.#routeMessage(msg),
55
+ sendMessage: (ctx, msg) => this.#routeMessage(ctx, msg),
56
56
  logSql,
57
57
  }),
58
58
  );
@@ -83,14 +83,14 @@ export class TestBuilder extends Resource {
83
83
  }
84
84
 
85
85
  /** Route a message to the peer identified by recipientPeerId. Runs the recipient's handleMessage with that peer's runtime. */
86
- #routeMessage(msg: ProtocolMessage): Effect.Effect<void, unknown, never> {
86
+ #routeMessage(ctx: Context, msg: ProtocolMessage): Effect.Effect<void, unknown, never> {
87
87
  const peer = this.#peers.find((p) => p.peerId === msg.recipientPeerId);
88
88
  if (peer == null) {
89
89
  return Effect.die(new Error(`TestPeer not found: ${msg.recipientPeerId}`));
90
90
  }
91
91
  const handleEffect =
92
92
  peer.syncServer != null
93
- ? peer.syncServer.handleMessage(msg)
93
+ ? peer.syncServer.handleMessage(ctx, msg)
94
94
  : peer.syncClient != null
95
95
  ? peer.syncClient.handleMessage(msg)
96
96
  : null;
@@ -129,7 +129,7 @@ export class TestPeer extends Resource {
129
129
  isServer: boolean;
130
130
  actorId: string;
131
131
  serverPeerId?: string;
132
- sendMessage: (msg: ProtocolMessage) => Effect.Effect<void, unknown, never>;
132
+ sendMessage: (ctx: Context, msg: ProtocolMessage) => Effect.Effect<void, unknown, never>;
133
133
  logSql?: boolean;
134
134
  }) {
135
135
  super();
@@ -211,13 +211,13 @@ export class TestPeer extends Resource {
211
211
 
212
212
  pull({ spaceId, feedNamespace, limit = 10 }: { spaceId: SpaceId; feedNamespace: string; limit?: number }) {
213
213
  return this.#client!
214
- .pull({ spaceId, feedNamespace, limit })
214
+ .pull(Context.default(), { spaceId, feedNamespace, limit })
215
215
  .pipe(RuntimeProvider.runPromise(this.#runtime.runtimeEffect));
216
216
  }
217
217
 
218
218
  push({ spaceId, feedNamespace, limit = 10 }: { spaceId: SpaceId; feedNamespace: string; limit?: number }) {
219
219
  return this.#client!
220
- .push({ spaceId, feedNamespace, limit })
220
+ .push(Context.default(), { spaceId, feedNamespace, limit })
221
221
  .pipe(RuntimeProvider.runPromise(this.#runtime.runtimeEffect));
222
222
  }
223
223
  }