@dxos/feed 0.8.4-main.3eb6e50203 → 0.8.4-main.3fbcb4aa9b
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/README.md +0 -1
- package/dist/lib/neutral/{chunk-ZDHDC5PZ.mjs → chunk-YYASRWLE.mjs} +249 -120
- package/dist/lib/neutral/chunk-YYASRWLE.mjs.map +7 -0
- package/dist/lib/neutral/index.mjs +1 -5
- package/dist/lib/neutral/meta.json +1 -1
- package/dist/lib/neutral/testing/index.mjs +8 -7
- package/dist/lib/neutral/testing/index.mjs.map +3 -3
- package/dist/types/src/errors.d.ts +5 -72
- package/dist/types/src/errors.d.ts.map +1 -1
- package/dist/types/src/feed-store.d.ts +39 -4
- package/dist/types/src/feed-store.d.ts.map +1 -1
- package/dist/types/src/sync-client.d.ts +4 -3
- package/dist/types/src/sync-client.d.ts.map +1 -1
- package/dist/types/src/sync-server.d.ts +3 -2
- package/dist/types/src/sync-server.d.ts.map +1 -1
- package/dist/types/src/testing/test-builder.d.ts +5 -5
- package/dist/types/src/testing/test-builder.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +15 -20
- package/src/errors.ts +0 -18
- package/src/feed-store.test.ts +175 -68
- package/src/feed-store.ts +130 -118
- package/src/sync-client.ts +109 -17
- package/src/sync-server.ts +70 -12
- package/src/testing/test-builder.ts +11 -11
- package/dist/lib/neutral/chunk-ZDHDC5PZ.mjs.map +0 -7
package/README.md
CHANGED
|
@@ -1,21 +1,5 @@
|
|
|
1
1
|
// src/errors.ts
|
|
2
2
|
import { BaseError } from "@dxos/errors";
|
|
3
|
-
var DuplicateBlockPositionError = class extends BaseError.extend("DuplicateBlockPositionError") {
|
|
4
|
-
constructor(args) {
|
|
5
|
-
super({
|
|
6
|
-
message: `Non-unique block position detected (feedId=${args.feedId} position=${args.position}).`,
|
|
7
|
-
context: args
|
|
8
|
-
});
|
|
9
|
-
}
|
|
10
|
-
};
|
|
11
|
-
var DuplicateBlockLamportTimestampError = class extends BaseError.extend("DuplicateBlockLamportTimestampError") {
|
|
12
|
-
constructor(args) {
|
|
13
|
-
super({
|
|
14
|
-
message: `Non-unique block Lamport timestamp detected (feedId=${args.feedId} actorId=${args.actorId} sequence=${args.sequence}).`,
|
|
15
|
-
context: args
|
|
16
|
-
});
|
|
17
|
-
}
|
|
18
|
-
};
|
|
19
3
|
var PositionConflictError = class extends BaseError.extend("PositionConflictError") {
|
|
20
4
|
constructor(args) {
|
|
21
5
|
super({
|
|
@@ -93,7 +77,9 @@ var FeedStore = class {
|
|
|
93
77
|
const rows = yield* sql`
|
|
94
78
|
SELECT feedPrivateId FROM feeds WHERE spaceId = ${spaceId} AND feedId = ${feedId}
|
|
95
79
|
`;
|
|
96
|
-
if (rows.length > 0)
|
|
80
|
+
if (rows.length > 0) {
|
|
81
|
+
return rows[0].feedPrivateId;
|
|
82
|
+
}
|
|
97
83
|
const newRows = yield* sql`
|
|
98
84
|
INSERT INTO feeds (spaceId, feedId, feedNamespace) VALUES (${spaceId}, ${feedId}, ${namespace}) RETURNING feedPrivateId
|
|
99
85
|
`;
|
|
@@ -105,7 +91,9 @@ var FeedStore = class {
|
|
|
105
91
|
#ensureCursorToken = Effect.fn("Feed.ensureCursorToken")((spaceId) => Effect.gen(this, function* () {
|
|
106
92
|
const sql = yield* SqlClient.SqlClient;
|
|
107
93
|
const rows = yield* sql`SELECT token FROM cursor_tokens WHERE spaceId = ${spaceId}`;
|
|
108
|
-
if (rows.length > 0)
|
|
94
|
+
if (rows.length > 0) {
|
|
95
|
+
return rows[0].token;
|
|
96
|
+
}
|
|
109
97
|
const token = crypto.randomUUID().replace(/-/g, "").slice(0, 6);
|
|
110
98
|
yield* sql`INSERT INTO cursor_tokens (spaceId, token) VALUES (${spaceId}, ${token})`;
|
|
111
99
|
return token;
|
|
@@ -256,80 +244,51 @@ var FeedStore = class {
|
|
|
256
244
|
`;
|
|
257
245
|
}).pipe(Effect.withSpan("FeedStore.setSyncState"));
|
|
258
246
|
/**
|
|
259
|
-
*
|
|
247
|
+
* Returns the number of stored blocks for a single feed in a space/namespace.
|
|
248
|
+
* Intended as a low-level primitive for callers (for example Cloudflare Worker code)
|
|
249
|
+
* that need to make retention decisions under constrained storage resources.
|
|
260
250
|
*/
|
|
261
|
-
|
|
251
|
+
countBlocks = (opts) => Effect.gen(this, function* () {
|
|
262
252
|
const sql = yield* SqlClient.SqlClient;
|
|
263
|
-
const
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
lamportFeedIdByKey.set(lamportKey, block.feedId);
|
|
286
|
-
}
|
|
287
|
-
const lamportConditions = blocks.map((block) => {
|
|
288
|
-
const feedPrivateId = feedPrivateIds.get(block.feedId);
|
|
289
|
-
return sql`(feedPrivateId = ${feedPrivateId} AND actorId = ${block.actorId} AND sequence = ${block.sequence})`;
|
|
290
|
-
});
|
|
291
|
-
if (lamportConditions.length > 0) {
|
|
292
|
-
const existingLamports = yield* sql`
|
|
293
|
-
SELECT feedPrivateId, actorId, sequence
|
|
294
|
-
FROM blocks
|
|
295
|
-
WHERE ${sql.or(lamportConditions)}
|
|
296
|
-
LIMIT 1
|
|
297
|
-
`;
|
|
298
|
-
const lamportConflict = existingLamports[0];
|
|
299
|
-
if (lamportConflict) {
|
|
300
|
-
const key = `${lamportConflict.feedPrivateId}|${lamportConflict.actorId}|${lamportConflict.sequence}`;
|
|
301
|
-
yield* Effect.fail(new DuplicateBlockLamportTimestampError({
|
|
302
|
-
feedId: lamportFeedIdByKey.get(key),
|
|
303
|
-
actorId: lamportConflict.actorId,
|
|
304
|
-
sequence: lamportConflict.sequence
|
|
305
|
-
}));
|
|
306
|
-
}
|
|
307
|
-
}
|
|
308
|
-
if (!this.#options.assignPositions) {
|
|
309
|
-
const positionedBlocks = blocks.filter((block) => block.position != null);
|
|
310
|
-
const positionConditions = positionedBlocks.map((block) => {
|
|
311
|
-
const feedPrivateId = feedPrivateIds.get(block.feedId);
|
|
312
|
-
return sql`(feedPrivateId = ${feedPrivateId} AND position = ${block.position})`;
|
|
313
|
-
});
|
|
314
|
-
if (positionConditions.length > 0) {
|
|
315
|
-
const existingPositions = yield* sql`
|
|
316
|
-
SELECT feedPrivateId, position
|
|
317
|
-
FROM blocks
|
|
318
|
-
WHERE position IS NOT NULL
|
|
319
|
-
AND (${sql.or(positionConditions)})
|
|
320
|
-
LIMIT 1
|
|
321
|
-
`;
|
|
322
|
-
const positionConflict = existingPositions[0];
|
|
323
|
-
if (positionConflict) {
|
|
324
|
-
const key = `${positionConflict.feedPrivateId}|${positionConflict.position}`;
|
|
325
|
-
yield* Effect.fail(new DuplicateBlockPositionError({
|
|
326
|
-
feedId: positionFeedIdByKey.get(key),
|
|
327
|
-
position: positionConflict.position
|
|
328
|
-
}));
|
|
329
|
-
}
|
|
330
|
-
}
|
|
253
|
+
const rows = yield* sql`
|
|
254
|
+
SELECT COUNT(*) AS count
|
|
255
|
+
FROM blocks
|
|
256
|
+
JOIN feeds ON blocks.feedPrivateId = feeds.feedPrivateId
|
|
257
|
+
WHERE feeds.spaceId = ${opts.spaceId}
|
|
258
|
+
AND feeds.feedNamespace = ${opts.feedNamespace}
|
|
259
|
+
AND feeds.feedId = ${opts.feedId}
|
|
260
|
+
`;
|
|
261
|
+
return rows[0]?.count ?? 0;
|
|
262
|
+
}).pipe(Effect.withSpan("FeedStore.countBlocks"));
|
|
263
|
+
/**
|
|
264
|
+
* Deletes the oldest blocks for a single feed in a space/namespace.
|
|
265
|
+
* This API intentionally does not enforce any retention policy (such as max size);
|
|
266
|
+
* callers decide when and how much to prune, which is useful for constrained
|
|
267
|
+
* environments like Cloudflare Workers.
|
|
268
|
+
*
|
|
269
|
+
* @returns Number of deleted rows.
|
|
270
|
+
*/
|
|
271
|
+
deleteOldestBlocks = (opts) => Effect.gen(this, function* () {
|
|
272
|
+
const sql = yield* SqlClient.SqlClient;
|
|
273
|
+
if (opts.count <= 0) {
|
|
274
|
+
return 0;
|
|
331
275
|
}
|
|
332
|
-
|
|
276
|
+
const deletedRows = yield* sql`
|
|
277
|
+
DELETE FROM blocks
|
|
278
|
+
WHERE insertionId IN (
|
|
279
|
+
SELECT blocks.insertionId
|
|
280
|
+
FROM blocks
|
|
281
|
+
JOIN feeds ON blocks.feedPrivateId = feeds.feedPrivateId
|
|
282
|
+
WHERE feeds.spaceId = ${opts.spaceId}
|
|
283
|
+
AND feeds.feedNamespace = ${opts.feedNamespace}
|
|
284
|
+
AND feeds.feedId = ${opts.feedId}
|
|
285
|
+
ORDER BY blocks.insertionId ASC
|
|
286
|
+
LIMIT ${opts.count}
|
|
287
|
+
)
|
|
288
|
+
RETURNING insertionId
|
|
289
|
+
`;
|
|
290
|
+
return deletedRows.length;
|
|
291
|
+
}).pipe(Effect.withSpan("FeedStore.deleteOldestBlocks"));
|
|
333
292
|
/**
|
|
334
293
|
* Appends blocks for a space/namespace and optionally assigns global positions.
|
|
335
294
|
*/
|
|
@@ -362,7 +321,6 @@ var FeedStore = class {
|
|
|
362
321
|
}), {
|
|
363
322
|
concurrency: "unbounded"
|
|
364
323
|
});
|
|
365
|
-
yield* this.#validateAppendBlocks(request.blocks, feedPrivateIds);
|
|
366
324
|
const maxPositions = /* @__PURE__ */ new Map();
|
|
367
325
|
if (this.#options.assignPositions) {
|
|
368
326
|
const maxPosResult = yield* sql`
|
|
@@ -507,6 +465,19 @@ var FeedStore = class {
|
|
|
507
465
|
setPosition = (request) => Effect.gen(this, function* () {
|
|
508
466
|
const sql = yield* SqlClient.SqlClient;
|
|
509
467
|
for (const block of request.blocks) {
|
|
468
|
+
const updated = yield* sql`
|
|
469
|
+
UPDATE blocks SET position = ${block.position}
|
|
470
|
+
WHERE feedPrivateId = (
|
|
471
|
+
SELECT feedPrivateId FROM feeds
|
|
472
|
+
WHERE spaceId = ${request.spaceId} AND feedId = ${block.feedId} AND feedNamespace = ${block.feedNamespace}
|
|
473
|
+
)
|
|
474
|
+
AND actorId = ${block.actorId} AND sequence = ${block.sequence}
|
|
475
|
+
AND (position IS NULL OR position = ${block.position})
|
|
476
|
+
RETURNING position
|
|
477
|
+
`;
|
|
478
|
+
if (updated.length > 0) {
|
|
479
|
+
continue;
|
|
480
|
+
}
|
|
510
481
|
const existing = yield* sql`
|
|
511
482
|
SELECT position FROM blocks
|
|
512
483
|
WHERE feedPrivateId = (
|
|
@@ -525,16 +496,39 @@ var FeedStore = class {
|
|
|
525
496
|
requestedPosition: block.position
|
|
526
497
|
}));
|
|
527
498
|
}
|
|
528
|
-
yield* sql`
|
|
529
|
-
UPDATE blocks SET position = ${block.position}
|
|
530
|
-
WHERE feedPrivateId = (
|
|
531
|
-
SELECT feedPrivateId FROM feeds
|
|
532
|
-
WHERE spaceId = ${request.spaceId} AND feedId = ${block.feedId} AND feedNamespace = ${block.feedNamespace}
|
|
533
|
-
)
|
|
534
|
-
AND actorId = ${block.actorId} AND sequence = ${block.sequence}
|
|
535
|
-
`;
|
|
536
499
|
}
|
|
537
500
|
}).pipe(Effect.withSpan("FeedStore.setPosition"));
|
|
501
|
+
/**
|
|
502
|
+
* Gets all feeds and their blocks for a space, organized by feed ID and namespace.
|
|
503
|
+
* Used for space archive export.
|
|
504
|
+
*/
|
|
505
|
+
getAllFeedsForSpace = (opts) => Effect.gen(this, function* () {
|
|
506
|
+
const sql = yield* SqlClient.SqlClient;
|
|
507
|
+
const feeds = yield* sql`
|
|
508
|
+
SELECT DISTINCT feedId, feedNamespace FROM feeds WHERE spaceId = ${opts.spaceId}
|
|
509
|
+
`;
|
|
510
|
+
const result = [];
|
|
511
|
+
for (const feed of feeds) {
|
|
512
|
+
const blocks = yield* sql`
|
|
513
|
+
SELECT blocks.*, feeds.feedId, feeds.feedNamespace
|
|
514
|
+
FROM blocks
|
|
515
|
+
JOIN feeds ON blocks.feedPrivateId = feeds.feedPrivateId
|
|
516
|
+
WHERE feeds.spaceId = ${opts.spaceId}
|
|
517
|
+
AND feeds.feedId = ${feed.feedId}
|
|
518
|
+
AND feeds.feedNamespace = ${feed.feedNamespace}
|
|
519
|
+
ORDER BY blocks.sequence ASC
|
|
520
|
+
`;
|
|
521
|
+
result.push({
|
|
522
|
+
feedId: feed.feedId,
|
|
523
|
+
feedNamespace: feed.feedNamespace,
|
|
524
|
+
blocks: blocks.map((row) => ({
|
|
525
|
+
...row,
|
|
526
|
+
data: new Uint8Array(row.data)
|
|
527
|
+
}))
|
|
528
|
+
});
|
|
529
|
+
}
|
|
530
|
+
return result;
|
|
531
|
+
}).pipe(Effect.withSpan("FeedStore.getAllFeedsForSpace"));
|
|
538
532
|
};
|
|
539
533
|
var encodeCursor = (token, insertionId) => FeedCursor.make(`${token}|${insertionId}`);
|
|
540
534
|
var decodeCursor = (cursor) => {
|
|
@@ -547,6 +541,19 @@ var decodeCursor = (cursor) => {
|
|
|
547
541
|
|
|
548
542
|
// src/sync-server.ts
|
|
549
543
|
import * as Effect2 from "effect/Effect";
|
|
544
|
+
import { log } from "@dxos/log";
|
|
545
|
+
var __dxlog_file = "/__w/dxos/dxos/packages/core/echo/feed/src/sync-server.ts";
|
|
546
|
+
var inboundSummary = (message) => ({
|
|
547
|
+
tag: message._tag,
|
|
548
|
+
senderPeerId: message.senderPeerId,
|
|
549
|
+
recipientPeerId: message.recipientPeerId,
|
|
550
|
+
requestId: "requestId" in message ? message.requestId : void 0,
|
|
551
|
+
spaceId: "spaceId" in message ? message.spaceId : void 0,
|
|
552
|
+
feedNamespace: "feedNamespace" in message ? message.feedNamespace : void 0,
|
|
553
|
+
blockCount: "blocks" in message ? message.blocks.length : void 0,
|
|
554
|
+
position: "position" in message ? message.position : void 0,
|
|
555
|
+
limit: "limit" in message ? message.limit : void 0
|
|
556
|
+
});
|
|
550
557
|
var SyncServer = class {
|
|
551
558
|
#peerId;
|
|
552
559
|
#feedStore;
|
|
@@ -559,8 +566,12 @@ var SyncServer = class {
|
|
|
559
566
|
/**
|
|
560
567
|
* Receive a message from a client. Handles QueryRequest and AppendRequest; sends response via sendMessage with correct peer ids.
|
|
561
568
|
*/
|
|
562
|
-
handleMessage(message) {
|
|
569
|
+
handleMessage(ctx, message) {
|
|
563
570
|
const self = this;
|
|
571
|
+
log("feed sync server received message", {
|
|
572
|
+
peerId: self.#peerId,
|
|
573
|
+
...inboundSummary(message)
|
|
574
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 33, S: this });
|
|
564
575
|
const recipientPeerId = message.senderPeerId;
|
|
565
576
|
const withPeerIds = (payload) => ({
|
|
566
577
|
...payload,
|
|
@@ -572,29 +583,70 @@ var SyncServer = class {
|
|
|
572
583
|
const req = message;
|
|
573
584
|
return Effect2.gen(function* () {
|
|
574
585
|
const response = yield* self.#feedStore.query(req);
|
|
575
|
-
|
|
586
|
+
log("feed sync server query completed", {
|
|
587
|
+
peerId: self.#peerId,
|
|
588
|
+
recipientPeerId,
|
|
589
|
+
requestId: req.requestId,
|
|
590
|
+
spaceId: req.spaceId,
|
|
591
|
+
feedNamespace: req.feedNamespace,
|
|
592
|
+
returnedBlocks: response.blocks.length,
|
|
593
|
+
hasMore: response.hasMore
|
|
594
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 49, S: this });
|
|
595
|
+
yield* self.#sendMessage(ctx, withPeerIds({
|
|
576
596
|
_tag: "QueryResponse",
|
|
577
597
|
...response
|
|
578
598
|
}));
|
|
579
|
-
}).pipe(Effect2.catchAll((err) =>
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
599
|
+
}).pipe(Effect2.catchAll((err) => {
|
|
600
|
+
log("feed sync server query failed", {
|
|
601
|
+
peerId: self.#peerId,
|
|
602
|
+
recipientPeerId,
|
|
603
|
+
requestId: req.requestId,
|
|
604
|
+
spaceId: req.spaceId,
|
|
605
|
+
feedNamespace: req.feedNamespace,
|
|
606
|
+
cause: err instanceof Error ? err.message : String(err)
|
|
607
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 63, S: this });
|
|
608
|
+
return self.#sendMessage(ctx, withPeerIds({
|
|
609
|
+
_tag: "Error",
|
|
610
|
+
message: err instanceof Error ? err.message : String(err)
|
|
611
|
+
}));
|
|
612
|
+
}));
|
|
583
613
|
}
|
|
584
614
|
case "AppendRequest": {
|
|
585
615
|
const req = message;
|
|
586
616
|
return Effect2.gen(function* () {
|
|
587
617
|
const response = yield* self.#feedStore.append(req);
|
|
588
|
-
|
|
618
|
+
log("feed sync server append completed", {
|
|
619
|
+
peerId: self.#peerId,
|
|
620
|
+
recipientPeerId,
|
|
621
|
+
requestId: req.requestId,
|
|
622
|
+
spaceId: req.spaceId,
|
|
623
|
+
feedNamespace: req.feedNamespace,
|
|
624
|
+
assignedPositions: response.positions.length
|
|
625
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 82, S: this });
|
|
626
|
+
yield* self.#sendMessage(ctx, withPeerIds({
|
|
589
627
|
_tag: "AppendResponse",
|
|
590
628
|
...response
|
|
591
629
|
}));
|
|
592
|
-
}).pipe(Effect2.catchAll((err) =>
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
630
|
+
}).pipe(Effect2.catchAll((err) => {
|
|
631
|
+
log("feed sync server append failed", {
|
|
632
|
+
peerId: self.#peerId,
|
|
633
|
+
recipientPeerId,
|
|
634
|
+
requestId: req.requestId,
|
|
635
|
+
spaceId: req.spaceId,
|
|
636
|
+
feedNamespace: req.feedNamespace,
|
|
637
|
+
cause: err instanceof Error ? err.message : String(err)
|
|
638
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 95, S: this });
|
|
639
|
+
return self.#sendMessage(ctx, withPeerIds({
|
|
640
|
+
_tag: "Error",
|
|
641
|
+
message: err instanceof Error ? err.message : String(err)
|
|
642
|
+
}));
|
|
643
|
+
}));
|
|
596
644
|
}
|
|
597
645
|
default:
|
|
646
|
+
log("feed sync server ignoring unsupported message", {
|
|
647
|
+
peerId: self.#peerId,
|
|
648
|
+
tag: message._tag
|
|
649
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 110, S: this });
|
|
598
650
|
return Effect2.void;
|
|
599
651
|
}
|
|
600
652
|
}
|
|
@@ -604,6 +656,9 @@ var SyncServer = class {
|
|
|
604
656
|
import * as Array from "effect/Array";
|
|
605
657
|
import * as Deferred from "effect/Deferred";
|
|
606
658
|
import * as Effect3 from "effect/Effect";
|
|
659
|
+
import { ContextDisposedError } from "@dxos/context";
|
|
660
|
+
import { log as log2 } from "@dxos/log";
|
|
661
|
+
var __dxlog_file2 = "/__w/dxos/dxos/packages/core/echo/feed/src/sync-client.ts";
|
|
607
662
|
var SyncClient = class {
|
|
608
663
|
#peerId;
|
|
609
664
|
#serverPeerId;
|
|
@@ -635,16 +690,36 @@ var SyncClient = class {
|
|
|
635
690
|
*/
|
|
636
691
|
handleMessage(message) {
|
|
637
692
|
const requestId = "requestId" in message && message.requestId != null ? String(message.requestId) : void 0;
|
|
638
|
-
if (requestId == null)
|
|
693
|
+
if (requestId == null) {
|
|
694
|
+
log2.trace("feed sync client response ignored (no request id)", {
|
|
695
|
+
tag: message._tag,
|
|
696
|
+
senderPeerId: message.senderPeerId
|
|
697
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 45, S: this });
|
|
698
|
+
return Effect3.void;
|
|
699
|
+
}
|
|
639
700
|
const deferred = this.#handlers.get(requestId);
|
|
640
|
-
if (deferred == null)
|
|
701
|
+
if (deferred == null) {
|
|
702
|
+
log2.trace("feed sync client response ignored (no pending rpc)", {
|
|
703
|
+
requestId,
|
|
704
|
+
tag: message._tag,
|
|
705
|
+
senderPeerId: message.senderPeerId
|
|
706
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 53, S: this });
|
|
707
|
+
return Effect3.void;
|
|
708
|
+
}
|
|
641
709
|
this.#handlers.delete(requestId);
|
|
710
|
+
log2("feed sync client rpc completed", {
|
|
711
|
+
requestId,
|
|
712
|
+
tag: message._tag,
|
|
713
|
+
blockCount: "blocks" in message ? message.blocks.length : void 0,
|
|
714
|
+
positionCount: "positions" in message ? message.positions.length : void 0,
|
|
715
|
+
error: message._tag === "Error" ? message.message : void 0
|
|
716
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 61, S: this });
|
|
642
717
|
if (message._tag === "Error") {
|
|
643
718
|
return Effect3.andThen(Deferred.fail(deferred, new Error(message.message)), () => Effect3.void);
|
|
644
719
|
}
|
|
645
720
|
return Effect3.andThen(Deferred.succeed(deferred, message), () => Effect3.void);
|
|
646
721
|
}
|
|
647
|
-
pull(opts) {
|
|
722
|
+
pull(ctx, opts) {
|
|
648
723
|
const self = this;
|
|
649
724
|
return Effect3.gen(function* () {
|
|
650
725
|
const lastPulledPosition = yield* self.#feedStore.getSyncState({
|
|
@@ -654,6 +729,13 @@ var SyncClient = class {
|
|
|
654
729
|
const requestId = crypto.randomUUID();
|
|
655
730
|
const deferred = yield* Deferred.make();
|
|
656
731
|
self.#handlers.set(requestId, deferred);
|
|
732
|
+
const cleanupDispose = ctx.disposed ? () => {
|
|
733
|
+
} : ctx.onDispose(() => {
|
|
734
|
+
Effect3.runFork(Deferred.fail(deferred, new ContextDisposedError()));
|
|
735
|
+
});
|
|
736
|
+
if (ctx.disposed) {
|
|
737
|
+
yield* Deferred.fail(deferred, new ContextDisposedError());
|
|
738
|
+
}
|
|
657
739
|
const request = {
|
|
658
740
|
_tag: "QueryRequest",
|
|
659
741
|
requestId,
|
|
@@ -662,10 +744,25 @@ var SyncClient = class {
|
|
|
662
744
|
position: lastPulledPosition,
|
|
663
745
|
limit: opts.limit
|
|
664
746
|
};
|
|
665
|
-
|
|
666
|
-
|
|
747
|
+
log2("feed sync client pull rpc sending", {
|
|
748
|
+
requestId,
|
|
749
|
+
spaceId: opts.spaceId,
|
|
750
|
+
feedNamespace: opts.feedNamespace,
|
|
751
|
+
afterPosition: lastPulledPosition,
|
|
752
|
+
limit: opts.limit
|
|
753
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 97, S: this });
|
|
754
|
+
yield* self.#sendMessage(ctx, self.#withPeerIds(request));
|
|
755
|
+
const message = yield* Effect3.ensuring(Deferred.await(deferred), Effect3.sync(() => {
|
|
756
|
+
cleanupDispose();
|
|
757
|
+
self.#handlers.delete(requestId);
|
|
758
|
+
}));
|
|
667
759
|
const response = yield* self.#expectResponse(requestId, message, "QueryResponse");
|
|
668
760
|
if (response.blocks.length === 0) {
|
|
761
|
+
log2.trace("feed sync client pull done (empty batch)", {
|
|
762
|
+
requestId,
|
|
763
|
+
spaceId: opts.spaceId,
|
|
764
|
+
feedNamespace: opts.feedNamespace
|
|
765
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 111, S: this });
|
|
669
766
|
return {
|
|
670
767
|
done: true
|
|
671
768
|
};
|
|
@@ -681,12 +778,20 @@ var SyncClient = class {
|
|
|
681
778
|
feedNamespace: opts.feedNamespace,
|
|
682
779
|
lastPulledPosition: maxPulledPosition
|
|
683
780
|
});
|
|
781
|
+
log2("feed sync client pull applied batch", {
|
|
782
|
+
requestId,
|
|
783
|
+
spaceId: opts.spaceId,
|
|
784
|
+
feedNamespace: opts.feedNamespace,
|
|
785
|
+
batchSize: response.blocks.length,
|
|
786
|
+
hasMore: response.hasMore,
|
|
787
|
+
maxPulledPosition
|
|
788
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 132, S: this });
|
|
684
789
|
return {
|
|
685
790
|
done: false
|
|
686
791
|
};
|
|
687
792
|
});
|
|
688
793
|
}
|
|
689
|
-
push(opts) {
|
|
794
|
+
push(ctx, opts) {
|
|
690
795
|
const self = this;
|
|
691
796
|
return Effect3.gen(function* () {
|
|
692
797
|
const unpositioned = yield* self.#feedStore.query({
|
|
@@ -696,6 +801,10 @@ var SyncClient = class {
|
|
|
696
801
|
limit: opts.limit
|
|
697
802
|
});
|
|
698
803
|
if (unpositioned.blocks.length === 0) {
|
|
804
|
+
log2.trace("feed sync client push skipped (nothing to send)", {
|
|
805
|
+
spaceId: opts.spaceId,
|
|
806
|
+
feedNamespace: opts.feedNamespace
|
|
807
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 155, S: this });
|
|
699
808
|
return {
|
|
700
809
|
done: true
|
|
701
810
|
};
|
|
@@ -703,6 +812,13 @@ var SyncClient = class {
|
|
|
703
812
|
const requestId = crypto.randomUUID();
|
|
704
813
|
const deferred = yield* Deferred.make();
|
|
705
814
|
self.#handlers.set(requestId, deferred);
|
|
815
|
+
const cleanupDispose = ctx.disposed ? () => {
|
|
816
|
+
} : ctx.onDispose(() => {
|
|
817
|
+
Effect3.runFork(Deferred.fail(deferred, new ContextDisposedError()));
|
|
818
|
+
});
|
|
819
|
+
if (ctx.disposed) {
|
|
820
|
+
yield* Deferred.fail(deferred, new ContextDisposedError());
|
|
821
|
+
}
|
|
706
822
|
const request = {
|
|
707
823
|
_tag: "AppendRequest",
|
|
708
824
|
requestId,
|
|
@@ -710,8 +826,17 @@ var SyncClient = class {
|
|
|
710
826
|
feedNamespace: opts.feedNamespace,
|
|
711
827
|
blocks: unpositioned.blocks
|
|
712
828
|
};
|
|
713
|
-
|
|
714
|
-
|
|
829
|
+
log2("feed sync client push rpc sending", {
|
|
830
|
+
requestId,
|
|
831
|
+
spaceId: opts.spaceId,
|
|
832
|
+
feedNamespace: opts.feedNamespace,
|
|
833
|
+
blockCount: unpositioned.blocks.length
|
|
834
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 179, S: this });
|
|
835
|
+
yield* self.#sendMessage(ctx, self.#withPeerIds(request));
|
|
836
|
+
const message = yield* Effect3.ensuring(Deferred.await(deferred), Effect3.sync(() => {
|
|
837
|
+
cleanupDispose();
|
|
838
|
+
self.#handlers.delete(requestId);
|
|
839
|
+
}));
|
|
715
840
|
const response = yield* self.#expectResponse(requestId, message, "AppendResponse");
|
|
716
841
|
yield* self.#feedStore.setPosition({
|
|
717
842
|
spaceId: opts.spaceId,
|
|
@@ -723,6 +848,12 @@ var SyncClient = class {
|
|
|
723
848
|
position
|
|
724
849
|
}))
|
|
725
850
|
});
|
|
851
|
+
log2("feed sync client push positions applied", {
|
|
852
|
+
requestId,
|
|
853
|
+
spaceId: opts.spaceId,
|
|
854
|
+
feedNamespace: opts.feedNamespace,
|
|
855
|
+
positionCount: response.positions.length
|
|
856
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 201, S: this });
|
|
726
857
|
return {
|
|
727
858
|
done: false
|
|
728
859
|
};
|
|
@@ -741,11 +872,9 @@ var SyncClient = class {
|
|
|
741
872
|
};
|
|
742
873
|
|
|
743
874
|
export {
|
|
744
|
-
DuplicateBlockPositionError,
|
|
745
|
-
DuplicateBlockLamportTimestampError,
|
|
746
875
|
PositionConflictError,
|
|
747
876
|
FeedStore,
|
|
748
877
|
SyncServer,
|
|
749
878
|
SyncClient
|
|
750
879
|
};
|
|
751
|
-
//# sourceMappingURL=chunk-
|
|
880
|
+
//# sourceMappingURL=chunk-YYASRWLE.mjs.map
|