@dxos/feed 0.8.4-main.cb12b3f963 → 0.8.4-main.dfabb4ec29

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.cb12b3f963",
3
+ "version": "0.8.4-main.dfabb4ec29",
4
4
  "description": "Append-only replicatable log",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -33,16 +33,16 @@
33
33
  "@effect/sql": "0.49.0",
34
34
  "@effect/sql-sqlite-node": "0.50.1",
35
35
  "effect": "3.20.0",
36
- "@dxos/async": "0.8.4-main.cb12b3f963",
37
- "@dxos/context": "0.8.4-main.cb12b3f963",
38
- "@dxos/effect": "0.8.4-main.cb12b3f963",
39
- "@dxos/errors": "0.8.4-main.cb12b3f963",
40
- "@dxos/invariant": "0.8.4-main.cb12b3f963",
41
- "@dxos/keys": "0.8.4-main.cb12b3f963",
42
- "@dxos/protocols": "0.8.4-main.cb12b3f963",
43
- "@dxos/sql-sqlite": "0.8.4-main.cb12b3f963",
44
- "@dxos/util": "0.8.4-main.cb12b3f963",
45
- "@dxos/log": "0.8.4-main.cb12b3f963"
36
+ "@dxos/context": "0.8.4-main.dfabb4ec29",
37
+ "@dxos/effect": "0.8.4-main.dfabb4ec29",
38
+ "@dxos/errors": "0.8.4-main.dfabb4ec29",
39
+ "@dxos/invariant": "0.8.4-main.dfabb4ec29",
40
+ "@dxos/keys": "0.8.4-main.dfabb4ec29",
41
+ "@dxos/sql-sqlite": "0.8.4-main.dfabb4ec29",
42
+ "@dxos/async": "0.8.4-main.dfabb4ec29",
43
+ "@dxos/log": "0.8.4-main.dfabb4ec29",
44
+ "@dxos/util": "0.8.4-main.dfabb4ec29",
45
+ "@dxos/protocols": "0.8.4-main.dfabb4ec29"
46
46
  },
47
47
  "devDependencies": {
48
48
  "@effect/vitest": "0.29.0"
@@ -9,6 +9,7 @@ import * as Effect from 'effect/Effect';
9
9
 
10
10
  import { Context, ContextDisposedError } from '@dxos/context';
11
11
  import type { SpaceId } from '@dxos/keys';
12
+ import { log } from '@dxos/log';
12
13
  import { type FeedProtocol } from '@dxos/protocols';
13
14
  import type { SqlTransaction } from '@dxos/sql-sqlite';
14
15
 
@@ -75,13 +76,29 @@ export class SyncClient {
75
76
  handleMessage(message: ProtocolMessage): Effect.Effect<void, never, never> {
76
77
  const requestId = 'requestId' in message && message.requestId != null ? String(message.requestId) : undefined;
77
78
  if (requestId == null) {
79
+ log.trace('feed sync client response ignored (no request id)', {
80
+ tag: message._tag,
81
+ senderPeerId: message.senderPeerId,
82
+ });
78
83
  return Effect.void;
79
84
  }
80
85
  const deferred = this.#handlers.get(requestId);
81
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
+ });
82
92
  return Effect.void;
83
93
  }
84
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
+ });
85
102
  if (message._tag === 'Error') {
86
103
  return Effect.andThen(Deferred.fail(deferred, new Error(message.message)), () => Effect.void);
87
104
  }
@@ -121,6 +138,13 @@ export class SyncClient {
121
138
  position: lastPulledPosition,
122
139
  limit: opts.limit,
123
140
  };
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
+ });
124
148
  yield* self.#sendMessage(ctx, self.#withPeerIds(request));
125
149
  const message = yield* Effect.ensuring(
126
150
  Deferred.await(deferred),
@@ -131,6 +155,11 @@ export class SyncClient {
131
155
  );
132
156
  const response = yield* self.#expectResponse<QueryResponse>(requestId, message, 'QueryResponse');
133
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
+ });
134
163
  return { done: true };
135
164
  }
136
165
  yield* self.#feedStore.append({
@@ -150,6 +179,14 @@ export class SyncClient {
150
179
  lastPulledPosition: maxPulledPosition,
151
180
  });
152
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
+ });
153
190
  return { done: false };
154
191
  });
155
192
  }
@@ -171,6 +208,10 @@ export class SyncClient {
171
208
  limit: opts.limit,
172
209
  });
173
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
+ });
174
215
  return { done: true };
175
216
  }
176
217
  const requestId = crypto.randomUUID();
@@ -191,6 +232,12 @@ export class SyncClient {
191
232
  feedNamespace: opts.feedNamespace,
192
233
  blocks: unpositioned.blocks,
193
234
  };
235
+ log('feed sync client push rpc sending', {
236
+ requestId,
237
+ spaceId: opts.spaceId,
238
+ feedNamespace: opts.feedNamespace,
239
+ blockCount: unpositioned.blocks.length,
240
+ });
194
241
  yield* self.#sendMessage(ctx, self.#withPeerIds(request));
195
242
  const message = yield* Effect.ensuring(
196
243
  Deferred.await(deferred),
@@ -210,6 +257,12 @@ export class SyncClient {
210
257
  position,
211
258
  })),
212
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
+ });
213
266
  return { done: false };
214
267
  });
215
268
  }
@@ -6,6 +6,7 @@ import type * as SqlClient from '@effect/sql/SqlClient';
6
6
  import * as Effect from 'effect/Effect';
7
7
 
8
8
  import { Context } from '@dxos/context';
9
+ import { log } from '@dxos/log';
9
10
  import { type FeedProtocol } from '@dxos/protocols';
10
11
  import type { SqlTransaction } from '@dxos/sql-sqlite';
11
12
 
@@ -16,6 +17,18 @@ type ProtocolMessage = FeedProtocol.ProtocolMessage;
16
17
  type QueryRequest = FeedProtocol.QueryRequest;
17
18
  type QueryResponse = FeedProtocol.QueryResponse;
18
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
+
19
32
  export type SyncServerOptions = {
20
33
  /** This server's peer id. Set as senderPeerId on all replies. */
21
34
  peerId: string;
@@ -47,6 +60,10 @@ export class SyncServer {
47
60
  message: ProtocolMessage,
48
61
  ): Effect.Effect<void, unknown, SqlClient.SqlClient | SqlTransaction.SqlTransaction> {
49
62
  const self = this;
63
+ log('feed sync server received message', {
64
+ peerId: self.#peerId,
65
+ ...inboundSummary(message),
66
+ });
50
67
  const recipientPeerId = message.senderPeerId;
51
68
  const withPeerIds = (payload: Omit<ProtocolMessage, 'senderPeerId' | 'recipientPeerId'>): ProtocolMessage =>
52
69
  ({
@@ -59,37 +76,74 @@ export class SyncServer {
59
76
  const req = message as QueryRequest;
60
77
  return Effect.gen(function* () {
61
78
  const response: QueryResponse = yield* self.#feedStore.query(req);
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
+ });
62
88
  yield* self.#sendMessage(ctx, withPeerIds({ _tag: 'QueryResponse', ...response }));
63
89
  }).pipe(
64
- Effect.catchAll((err: unknown) =>
65
- 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(
66
100
  ctx,
67
101
  withPeerIds({
68
102
  _tag: 'Error',
69
103
  message: err instanceof Error ? err.message : String(err),
70
104
  } as Omit<ProtocolMessage, 'senderPeerId' | 'recipientPeerId'>),
71
- ),
72
- ),
105
+ );
106
+ }),
73
107
  );
74
108
  }
75
109
  case 'AppendRequest': {
76
110
  const req = message as AppendRequest;
77
111
  return Effect.gen(function* () {
78
112
  const response = yield* self.#feedStore.append(req);
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
+ });
79
121
  yield* self.#sendMessage(ctx, withPeerIds({ _tag: 'AppendResponse', ...response }));
80
122
  }).pipe(
81
- Effect.catchAll((err: unknown) =>
82
- 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(
83
133
  ctx,
84
134
  withPeerIds({
85
135
  _tag: 'Error',
86
136
  message: err instanceof Error ? err.message : String(err),
87
137
  } as Omit<ProtocolMessage, 'senderPeerId' | 'recipientPeerId'>),
88
- ),
89
- ),
138
+ );
139
+ }),
90
140
  );
91
141
  }
92
142
  default:
143
+ log('feed sync server ignoring unsupported message', {
144
+ peerId: self.#peerId,
145
+ tag: message._tag,
146
+ });
93
147
  return Effect.void;
94
148
  }
95
149
  }