cojson 0.20.9 → 0.20.11
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/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +29 -0
- package/dist/OngoingStorageReconciliationTracker.d.ts +16 -0
- package/dist/OngoingStorageReconciliationTracker.d.ts.map +1 -0
- package/dist/OngoingStorageReconciliationTracker.js +75 -0
- package/dist/OngoingStorageReconciliationTracker.js.map +1 -0
- package/dist/PeerState.d.ts +2 -2
- package/dist/PeerState.d.ts.map +1 -1
- package/dist/PeerState.js +3 -3
- package/dist/PeerState.js.map +1 -1
- package/dist/StorageReconciliationAckTracker.d.ts +14 -0
- package/dist/StorageReconciliationAckTracker.d.ts.map +1 -0
- package/dist/StorageReconciliationAckTracker.js +72 -0
- package/dist/StorageReconciliationAckTracker.js.map +1 -0
- package/dist/SyncStateManager.js +2 -2
- package/dist/SyncStateManager.js.map +1 -1
- package/dist/coValueCore/coValueCore.d.ts +2 -1
- package/dist/coValueCore/coValueCore.d.ts.map +1 -1
- package/dist/coValueCore/coValueCore.js +43 -10
- package/dist/coValueCore/coValueCore.js.map +1 -1
- package/dist/coValues/coList.d.ts +2 -0
- package/dist/coValues/coList.d.ts.map +1 -1
- package/dist/coValues/coList.js +28 -0
- package/dist/coValues/coList.js.map +1 -1
- package/dist/coValues/group.d.ts +4 -1
- package/dist/coValues/group.d.ts.map +1 -1
- package/dist/coValues/group.js +15 -1
- package/dist/coValues/group.js.map +1 -1
- package/dist/config.d.ts +8 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +14 -0
- package/dist/config.js.map +1 -1
- package/dist/exports.d.ts +9 -1
- package/dist/exports.d.ts.map +1 -1
- package/dist/exports.js +5 -1
- package/dist/exports.js.map +1 -1
- package/dist/localNode.d.ts +7 -3
- package/dist/localNode.d.ts.map +1 -1
- package/dist/localNode.js +13 -5
- package/dist/localNode.js.map +1 -1
- package/dist/permissions.d.ts +1 -0
- package/dist/permissions.d.ts.map +1 -1
- package/dist/queue/LinkedList.d.ts +2 -0
- package/dist/queue/LinkedList.d.ts.map +1 -1
- package/dist/queue/LinkedList.js +7 -0
- package/dist/queue/LinkedList.js.map +1 -1
- package/dist/queue/OutgoingLoadQueue.d.ts +4 -1
- package/dist/queue/OutgoingLoadQueue.d.ts.map +1 -1
- package/dist/queue/OutgoingLoadQueue.js +41 -13
- package/dist/queue/OutgoingLoadQueue.js.map +1 -1
- package/dist/queue/PriorityBasedMessageQueue.d.ts +1 -0
- package/dist/queue/PriorityBasedMessageQueue.d.ts.map +1 -1
- package/dist/queue/PriorityBasedMessageQueue.js +11 -1
- package/dist/queue/PriorityBasedMessageQueue.js.map +1 -1
- package/dist/storage/knownState.d.ts +2 -0
- package/dist/storage/knownState.d.ts.map +1 -1
- package/dist/storage/knownState.js +11 -0
- package/dist/storage/knownState.js.map +1 -1
- package/dist/storage/sqlite/client.d.ts +10 -1
- package/dist/storage/sqlite/client.d.ts.map +1 -1
- package/dist/storage/sqlite/client.js +84 -0
- package/dist/storage/sqlite/client.js.map +1 -1
- package/dist/storage/sqlite/sqliteMigrations.d.ts.map +1 -1
- package/dist/storage/sqlite/sqliteMigrations.js +11 -0
- package/dist/storage/sqlite/sqliteMigrations.js.map +1 -1
- package/dist/storage/sqliteAsync/client.d.ts +10 -1
- package/dist/storage/sqliteAsync/client.d.ts.map +1 -1
- package/dist/storage/sqliteAsync/client.js +86 -0
- package/dist/storage/sqliteAsync/client.js.map +1 -1
- package/dist/storage/storageAsync.d.ts +9 -2
- package/dist/storage/storageAsync.d.ts.map +1 -1
- package/dist/storage/storageAsync.js +19 -0
- package/dist/storage/storageAsync.js.map +1 -1
- package/dist/storage/storageSync.d.ts +9 -2
- package/dist/storage/storageSync.d.ts.map +1 -1
- package/dist/storage/storageSync.js +20 -13
- package/dist/storage/storageSync.js.map +1 -1
- package/dist/storage/types.d.ts +64 -0
- package/dist/storage/types.d.ts.map +1 -1
- package/dist/storage/types.js.map +1 -1
- package/dist/sync.d.ts +53 -2
- package/dist/sync.d.ts.map +1 -1
- package/dist/sync.js +300 -44
- package/dist/sync.js.map +1 -1
- package/dist/tests/OngoingStorageReconciliationTracker.test.d.ts +2 -0
- package/dist/tests/OngoingStorageReconciliationTracker.test.d.ts.map +1 -0
- package/dist/tests/OngoingStorageReconciliationTracker.test.js +60 -0
- package/dist/tests/OngoingStorageReconciliationTracker.test.js.map +1 -0
- package/dist/tests/OutgoingLoadQueue.test.js +137 -39
- package/dist/tests/OutgoingLoadQueue.test.js.map +1 -1
- package/dist/tests/SQLiteClientAsync.test.js +1 -1
- package/dist/tests/SQLiteClientAsync.test.js.map +1 -1
- package/dist/tests/StorageApiAsync.test.js +138 -0
- package/dist/tests/StorageApiAsync.test.js.map +1 -1
- package/dist/tests/StorageApiSync.test.js +154 -0
- package/dist/tests/StorageApiSync.test.js.map +1 -1
- package/dist/tests/StorageReconciliationAckTracker.test.d.ts +2 -0
- package/dist/tests/StorageReconciliationAckTracker.test.d.ts.map +1 -0
- package/dist/tests/StorageReconciliationAckTracker.test.js +74 -0
- package/dist/tests/StorageReconciliationAckTracker.test.js.map +1 -0
- package/dist/tests/SyncStateManager.test.js +18 -0
- package/dist/tests/SyncStateManager.test.js.map +1 -1
- package/dist/tests/coList.test.js +112 -1
- package/dist/tests/coList.test.js.map +1 -1
- package/dist/tests/coValueCore.loadFromStorage.test.js +36 -0
- package/dist/tests/coValueCore.loadFromStorage.test.js.map +1 -1
- package/dist/tests/group.test.js +44 -0
- package/dist/tests/group.test.js.map +1 -1
- package/dist/tests/knownState.lazyLoading.test.js +6 -0
- package/dist/tests/knownState.lazyLoading.test.js.map +1 -1
- package/dist/tests/messagesTestUtils.d.ts.map +1 -1
- package/dist/tests/messagesTestUtils.js +4 -0
- package/dist/tests/messagesTestUtils.js.map +1 -1
- package/dist/tests/sync.concurrentLoad.test.js +333 -1
- package/dist/tests/sync.concurrentLoad.test.js.map +1 -1
- package/dist/tests/sync.garbageCollection.test.js +4 -0
- package/dist/tests/sync.garbageCollection.test.js.map +1 -1
- package/dist/tests/sync.load.test.js +19 -0
- package/dist/tests/sync.load.test.js.map +1 -1
- package/dist/tests/sync.mesh.test.js +1 -0
- package/dist/tests/sync.mesh.test.js.map +1 -1
- package/dist/tests/sync.multipleServers.test.js +41 -3
- package/dist/tests/sync.multipleServers.test.js.map +1 -1
- package/dist/tests/sync.storage.test.js +2 -0
- package/dist/tests/sync.storage.test.js.map +1 -1
- package/dist/tests/sync.storageAsync.test.js +1 -0
- package/dist/tests/sync.storageAsync.test.js.map +1 -1
- package/dist/tests/sync.storageReconciliation.test.d.ts +2 -0
- package/dist/tests/sync.storageReconciliation.test.d.ts.map +1 -0
- package/dist/tests/sync.storageReconciliation.test.js +502 -0
- package/dist/tests/sync.storageReconciliation.test.js.map +1 -0
- package/dist/tests/testUtils.d.ts +1 -0
- package/dist/tests/testUtils.d.ts.map +1 -1
- package/dist/tests/testUtils.js +3 -2
- package/dist/tests/testUtils.js.map +1 -1
- package/package.json +4 -4
- package/src/OngoingStorageReconciliationTracker.ts +97 -0
- package/src/PeerState.ts +10 -3
- package/src/StorageReconciliationAckTracker.ts +83 -0
- package/src/SyncStateManager.ts +3 -3
- package/src/coValueCore/coValueCore.ts +47 -16
- package/src/coValues/coList.ts +23 -0
- package/src/coValues/group.ts +18 -0
- package/src/config.ts +18 -0
- package/src/exports.ts +8 -0
- package/src/localNode.ts +18 -0
- package/src/permissions.ts +1 -1
- package/src/queue/LinkedList.ts +10 -0
- package/src/queue/OutgoingLoadQueue.ts +57 -15
- package/src/queue/PriorityBasedMessageQueue.ts +15 -1
- package/src/storage/knownState.ts +14 -0
- package/src/storage/sqlite/client.ts +128 -0
- package/src/storage/sqlite/sqliteMigrations.ts +11 -0
- package/src/storage/sqliteAsync/client.ts +139 -0
- package/src/storage/storageAsync.ts +37 -0
- package/src/storage/storageSync.ts +41 -16
- package/src/storage/types.ts +110 -0
- package/src/sync.ts +359 -14
- package/src/tests/OngoingStorageReconciliationTracker.test.ts +85 -0
- package/src/tests/OutgoingLoadQueue.test.ts +226 -59
- package/src/tests/SQLiteClientAsync.test.ts +1 -1
- package/src/tests/StorageApiAsync.test.ts +161 -1
- package/src/tests/StorageApiSync.test.ts +176 -0
- package/src/tests/StorageReconciliationAckTracker.test.ts +99 -0
- package/src/tests/SyncStateManager.test.ts +25 -0
- package/src/tests/coList.test.ts +138 -0
- package/src/tests/coValueCore.loadFromStorage.test.ts +72 -1
- package/src/tests/group.test.ts +87 -0
- package/src/tests/knownState.lazyLoading.test.ts +36 -1
- package/src/tests/messagesTestUtils.ts +4 -0
- package/src/tests/sync.concurrentLoad.test.ts +491 -0
- package/src/tests/sync.garbageCollection.test.ts +4 -0
- package/src/tests/sync.load.test.ts +26 -0
- package/src/tests/sync.mesh.test.ts +1 -0
- package/src/tests/sync.multipleServers.test.ts +60 -2
- package/src/tests/sync.storage.test.ts +2 -0
- package/src/tests/sync.storageAsync.test.ts +1 -0
- package/src/tests/sync.storageReconciliation.test.ts +696 -0
- package/src/tests/testUtils.ts +10 -1
package/.turbo/turbo-build.log
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,34 @@
|
|
|
1
1
|
# cojson
|
|
2
2
|
|
|
3
|
+
## 0.20.11
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- d91408c: Wait for coValue sync before acknowledging a storage reconciliation batch
|
|
8
|
+
- cojson-core-wasm@0.20.11
|
|
9
|
+
- cojson-core-rn@0.20.11
|
|
10
|
+
- cojson-core-napi@0.20.11
|
|
11
|
+
|
|
12
|
+
## 0.20.10
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- 706ab57: Added optional restricted deletion mode for CoList values, allowing only manager/admin roles to perform deletions when enabled via schema permissions: `co.list().withPermission({writer: "appendOnly"})`
|
|
17
|
+
- 3f50adb: Throw immediately when calling `.create()` on a group where the current user does not have write permissions, instead of silently producing empty data.
|
|
18
|
+
- 283ff4f: Fixed an issue where CoValues could remain stuck in a loading state when using persistent server peers.
|
|
19
|
+
|
|
20
|
+
Closed persistent peers are now marked unavailable after a grace timeout, and load requests are no longer considered complete when a peer replies with `KNOWN` and `header: true` but never sends content.
|
|
21
|
+
|
|
22
|
+
- 93c220c: Improved sync load handling and queue behavior by prioritizing pending loads and ensuring peers always respond to load requests, including cases with no new content.
|
|
23
|
+
|
|
24
|
+
Added queue and in-flight load metrics, plus richer WebSocket peer metadata and ping-delay logging to improve observability during sync operations.
|
|
25
|
+
|
|
26
|
+
- 41d8587: Run a full storage reconciliation process periodically to ensure all CoValues in storage are synced with the server.
|
|
27
|
+
- Updated dependencies [706ab57]
|
|
28
|
+
- cojson-core-wasm@0.20.10
|
|
29
|
+
- cojson-core-rn@0.20.10
|
|
30
|
+
- cojson-core-napi@0.20.10
|
|
31
|
+
|
|
3
32
|
## 0.20.9
|
|
4
33
|
|
|
5
34
|
### Patch Changes
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { RawCoID } from "./ids.js";
|
|
2
|
+
import { PeerID, ReconcileBatchID } from "./sync.js";
|
|
3
|
+
/**
|
|
4
|
+
* Tracks ongoing storage reconciliation batches in a server.
|
|
5
|
+
*/
|
|
6
|
+
export declare class OngoingStorageReconciliationTracker {
|
|
7
|
+
private reconcileBatches;
|
|
8
|
+
private reconcileBatchesByCoValue;
|
|
9
|
+
trackBatch(peerId: PeerID, batchId: ReconcileBatchID, pendingCoValues: Set<RawCoID>): void;
|
|
10
|
+
/**
|
|
11
|
+
* Marks a coValue as reconciled and returns the batch IDs that completed syncing.
|
|
12
|
+
*/
|
|
13
|
+
markItemComplete(peerId: PeerID, coValueId: RawCoID): ReconcileBatchID[];
|
|
14
|
+
clearPeer(peerId: PeerID): void;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=OngoingStorageReconciliationTracker.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OngoingStorageReconciliationTracker.d.ts","sourceRoot":"","sources":["../src/OngoingStorageReconciliationTracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAErD;;GAEG;AACH,qBAAa,mCAAmC;IAC9C,OAAO,CAAC,gBAAgB,CACZ;IACZ,OAAO,CAAC,yBAAyB,CAGnB;IAEd,UAAU,CACR,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,EACzB,eAAe,EAAE,GAAG,CAAC,OAAO,CAAC,GAC5B,IAAI;IA6BP;;OAEG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,gBAAgB,EAAE;IA0CxE,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAIhC"}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tracks ongoing storage reconciliation batches in a server.
|
|
3
|
+
*/
|
|
4
|
+
export class OngoingStorageReconciliationTracker {
|
|
5
|
+
constructor() {
|
|
6
|
+
this.reconcileBatches = new Map();
|
|
7
|
+
this.reconcileBatchesByCoValue = new Map();
|
|
8
|
+
}
|
|
9
|
+
trackBatch(peerId, batchId, pendingCoValues) {
|
|
10
|
+
if (pendingCoValues.size === 0) {
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
let batchesForPeer = this.reconcileBatches.get(peerId);
|
|
14
|
+
if (!batchesForPeer) {
|
|
15
|
+
batchesForPeer = new Map();
|
|
16
|
+
this.reconcileBatches.set(peerId, batchesForPeer);
|
|
17
|
+
}
|
|
18
|
+
batchesForPeer.set(batchId, pendingCoValues);
|
|
19
|
+
let coValuesToBatches = this.reconcileBatchesByCoValue.get(peerId);
|
|
20
|
+
if (!coValuesToBatches) {
|
|
21
|
+
coValuesToBatches = new Map();
|
|
22
|
+
this.reconcileBatchesByCoValue.set(peerId, coValuesToBatches);
|
|
23
|
+
}
|
|
24
|
+
for (const coValueId of pendingCoValues) {
|
|
25
|
+
let batchIds = coValuesToBatches.get(coValueId);
|
|
26
|
+
if (!batchIds) {
|
|
27
|
+
batchIds = new Set();
|
|
28
|
+
coValuesToBatches.set(coValueId, batchIds);
|
|
29
|
+
}
|
|
30
|
+
batchIds.add(batchId);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Marks a coValue as reconciled and returns the batch IDs that completed syncing.
|
|
35
|
+
*/
|
|
36
|
+
markItemComplete(peerId, coValueId) {
|
|
37
|
+
const coValuesToBatches = this.reconcileBatchesByCoValue.get(peerId);
|
|
38
|
+
const batchesForPeer = this.reconcileBatches.get(peerId);
|
|
39
|
+
if (!coValuesToBatches || !batchesForPeer) {
|
|
40
|
+
return [];
|
|
41
|
+
}
|
|
42
|
+
const batchIdsForCoValue = coValuesToBatches.get(coValueId);
|
|
43
|
+
if (!batchIdsForCoValue || batchIdsForCoValue.size === 0) {
|
|
44
|
+
return [];
|
|
45
|
+
}
|
|
46
|
+
const completedBatchIds = [];
|
|
47
|
+
for (const batchId of batchIdsForCoValue) {
|
|
48
|
+
const batch = batchesForPeer.get(batchId);
|
|
49
|
+
if (!batch) {
|
|
50
|
+
continue;
|
|
51
|
+
}
|
|
52
|
+
batch.delete(coValueId);
|
|
53
|
+
if (batch.size === 0) {
|
|
54
|
+
completedBatchIds.push(batchId);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
// This coValue was just completed, so it is no longer pending in any batch.
|
|
58
|
+
coValuesToBatches.delete(coValueId);
|
|
59
|
+
for (const batchId of completedBatchIds) {
|
|
60
|
+
batchesForPeer.delete(batchId);
|
|
61
|
+
}
|
|
62
|
+
if (coValuesToBatches.size === 0) {
|
|
63
|
+
this.reconcileBatchesByCoValue.delete(peerId);
|
|
64
|
+
}
|
|
65
|
+
if (batchesForPeer.size === 0) {
|
|
66
|
+
this.reconcileBatches.delete(peerId);
|
|
67
|
+
}
|
|
68
|
+
return completedBatchIds;
|
|
69
|
+
}
|
|
70
|
+
clearPeer(peerId) {
|
|
71
|
+
this.reconcileBatches.delete(peerId);
|
|
72
|
+
this.reconcileBatchesByCoValue.delete(peerId);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=OngoingStorageReconciliationTracker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OngoingStorageReconciliationTracker.js","sourceRoot":"","sources":["../src/OngoingStorageReconciliationTracker.ts"],"names":[],"mappings":"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"}
|
package/dist/PeerState.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { PeerKnownState } from "./coValueCore/PeerKnownState.js";
|
|
|
2
2
|
import { CoValueCore } from "./exports.js";
|
|
3
3
|
import { RawCoID } from "./ids.js";
|
|
4
4
|
import { CoValueKnownState } from "./knownState.js";
|
|
5
|
-
import { type LoadMode } from "./queue/OutgoingLoadQueue.js";
|
|
5
|
+
import { type LoadCompletionSource, type LoadMode } from "./queue/OutgoingLoadQueue.js";
|
|
6
6
|
import { Peer, SyncMessage } from "./sync.js";
|
|
7
7
|
export declare class PeerState {
|
|
8
8
|
private peer;
|
|
@@ -28,7 +28,7 @@ export declare class PeerState {
|
|
|
28
28
|
private loadQueue;
|
|
29
29
|
sendLoadRequest(coValue: CoValueCore, mode?: LoadMode): void;
|
|
30
30
|
trackLoadRequestUpdate(coValue: CoValueCore): void;
|
|
31
|
-
trackLoadRequestComplete(coValue: CoValueCore): void;
|
|
31
|
+
trackLoadRequestComplete(coValue: CoValueCore, source?: LoadCompletionSource): void;
|
|
32
32
|
trackToldKnownState(id: RawCoID): void;
|
|
33
33
|
private getOrCreateKnownState;
|
|
34
34
|
updateHeader(id: RawCoID, header: boolean): void;
|
package/dist/PeerState.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PeerState.d.ts","sourceRoot":"","sources":["../src/PeerState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,
|
|
1
|
+
{"version":3,"file":"PeerState.d.ts","sourceRoot":"","sources":["../src/PeerState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,QAAQ,EAEd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAE9C,qBAAa,SAAS;IASlB,OAAO,CAAC,IAAI;IARd;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA+B;gBAGlD,IAAI,EAAE,IAAI,EAClB,WAAW,EAAE,GAAG,CAAC,OAAO,EAAE,cAAc,CAAC,GAAG,SAAS;IAMvD,aAAa,CAAC,EAAE,EAAE,OAAO;IAIzB,uBAAuB,CAAC,EAAE,EAAE,OAAO;IAInC,yBAAyB,CAAC,EAAE,EAAE,OAAO;IAIrC;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,IAAI;IAe3B,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,CAAa;IAClD,QAAQ,CAAC,eAAe,EAAE,GAAG,CAAC,OAAO,CAAC,CAAa;IACnD,OAAO,CAAC,SAAS,CAAoB;IAErC,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,QAAQ,GAAG,IAAI;IAe5D,sBAAsB,CAAC,OAAO,EAAE,WAAW;IAI3C,wBAAwB,CACtB,OAAO,EAAE,WAAW,EACpB,MAAM,GAAE,oBAAgC;IAK1C,mBAAmB,CAAC,EAAE,EAAE,OAAO;IAI/B,OAAO,CAAC,qBAAqB;IAW7B,YAAY,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO;IAMzC,WAAW,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB;IAMjD,qBAAqB,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB;IAM3D,aAAa,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO;IAM/D;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,EAAE,OAAO;IAS7B,OAAO,CAAC,SAAS,CAA2D;IAE5E,OAAO,CAAC,aAAa;IAMrB,6BAA6B,CAC3B,QAAQ,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,KAAK,IAAI;IASxD,IAAI,EAAE,WAEL;IAED,IAAI,IAAI,wBAEP;IAED,IAAI,QAAQ,uBAEX;IAEM,MAAM,UAAS;IAEtB,IAAI,QAAQ,4CAEX;IAED,IAAI,UAAU,wBAEb;IAED,mBAAmB,CAAC,GAAG,EAAE,WAAW;IAIpC,cAAc,YAAiB,IAAI,EAAI;IAEvC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,IAAI;IAarC,SAAS;IAQT,gBAAgB,IAAI,IAAI;CAiBzB"}
|
package/dist/PeerState.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PeerKnownState } from "./coValueCore/PeerKnownState.js";
|
|
2
2
|
import { logger } from "./logger.js";
|
|
3
|
-
import { OutgoingLoadQueue } from "./queue/OutgoingLoadQueue.js";
|
|
3
|
+
import { OutgoingLoadQueue, } from "./queue/OutgoingLoadQueue.js";
|
|
4
4
|
export class PeerState {
|
|
5
5
|
constructor(peer, knownStates) {
|
|
6
6
|
this.peer = peer;
|
|
@@ -52,8 +52,8 @@ export class PeerState {
|
|
|
52
52
|
trackLoadRequestUpdate(coValue) {
|
|
53
53
|
this.loadQueue.trackUpdate(coValue);
|
|
54
54
|
}
|
|
55
|
-
trackLoadRequestComplete(coValue) {
|
|
56
|
-
this.loadQueue.trackComplete(coValue);
|
|
55
|
+
trackLoadRequestComplete(coValue, source = "content") {
|
|
56
|
+
this.loadQueue.trackComplete(coValue, source);
|
|
57
57
|
}
|
|
58
58
|
trackToldKnownState(id) {
|
|
59
59
|
this.toldKnownState.add(id);
|
package/dist/PeerState.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PeerState.js","sourceRoot":"","sources":["../src/PeerState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAIjE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"PeerState.js","sourceRoot":"","sources":["../src/PeerState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAIjE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAGL,iBAAiB,GAClB,MAAM,8BAA8B,CAAC;AAGtC,MAAM,OAAO,SAAS;IAQpB,YACU,IAAU,EAClB,WAAqD;QAD7C,SAAI,GAAJ,IAAI,CAAM;QAwCX,mBAAc,GAAiB,IAAI,GAAG,EAAE,CAAC;QACzC,oBAAe,GAAiB,IAAI,GAAG,EAAE,CAAC;QAmF3C,cAAS,GAAG,IAAI,GAAG,EAAgD,CAAC;QA8BrE,WAAM,GAAG,KAAK,CAAC;QActB,mBAAc,GAAG,IAAI,GAAG,EAAc,CAAC;QArKrC,IAAI,CAAC,YAAY,GAAG,WAAW,IAAI,IAAI,GAAG,EAAE,CAAC;QAC7C,IAAI,CAAC,SAAS,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,aAAa,CAAC,EAAW;QACvB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;IAC5C,CAAC;IAED,uBAAuB,CAAC,EAAW;QACjC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC;IACtD,CAAC;IAED,yBAAyB,CAAC,EAAW;QACnC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACnC,CAAC;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,IAAU;QACzB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1B,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAC;QACvD,yDAAyD;QACzD,8DAA8D;QAC9D,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;YACpD,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,sBAAsB,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,OAAO,IAAI,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC1C,CAAC;IAMD,eAAe,CAAC,OAAoB,EAAE,IAAe;QACnD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACrC,IAAI,CAAC,SAAS,CAAC,OAAO,CACpB,OAAO,EACP,GAAG,EAAE;YACH,IAAI,CAAC,mBAAmB,CAAC;gBACvB,MAAM,EAAE,MAAM;gBACd,GAAG,OAAO,CAAC,uBAAuB,EAAE;aACrC,CAAC,CAAC;QACL,CAAC,EACD,IAAI,CACL,CAAC;IACJ,CAAC;IAED,sBAAsB,CAAC,OAAoB;QACzC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAED,wBAAwB,CACtB,OAAoB,EACpB,SAA+B,SAAS;QAExC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAChD,CAAC;IAED,mBAAmB,CAAC,EAAW;QAC7B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAEO,qBAAqB,CAAC,EAAW;QACvC,IAAI,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAE3C,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,UAAU,GAAG,IAAI,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;QACxC,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,YAAY,CAAC,EAAW,EAAE,MAAe;QACvC,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;QAClD,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAChC,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACrC,CAAC;IAED,WAAW,CAAC,EAAW,EAAE,KAAwB;QAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;QAClD,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACrC,CAAC;IAED,qBAAqB,CAAC,EAAW,EAAE,KAAwB;QACzD,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;QAClD,UAAU,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACrC,CAAC;IAED,aAAa,CAAC,EAAW,EAAE,OAAoC;QAC7D,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;QAClD,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACxB,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACrC,CAAC;IAED;;;;;OAKG;IACH,iBAAiB,CAAC,EAAW;QAC3B,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,EAAE,CAAC,EAAE,CAAC;YACvE,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;QAClD,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACrC,CAAC;IAIO,aAAa,CAAC,EAAW,EAAE,KAAqB;QACtD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACtC,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAED,6BAA6B,CAC3B,QAAsD;QAEtD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE7B,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC,CAAC;IACJ,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACtB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IACxB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC5B,CAAC;IAID,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC5B,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;IAC9B,CAAC;IAED,mBAAmB,CAAC,GAAgB;QAClC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAID,gBAAgB,CAAC,QAAoB;QACnC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,QAAQ,EAAE,CAAC;YACX,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;QAClB,CAAC;QAED,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAElC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC,CAAC;IACJ,CAAC;IAED,SAAS;QACP,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YAC3C,QAAQ,EAAE,CAAC;QACb,CAAC;QAED,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;IAC9B,CAAC;IAED,gBAAgB;QACd,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO;QACT,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE;YACjC,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,QAAQ,EAAE,IAAI,CAAC,IAAI;SACpB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACxC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;CACF"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { PeerState } from "./PeerState.js";
|
|
2
|
+
export declare class StorageReconciliationServerAckTracker {
|
|
3
|
+
/**
|
|
4
|
+
* Tracks pending reconcile acks from the server: "batchId#peerId->offset".
|
|
5
|
+
* Cleared in handleAck.
|
|
6
|
+
*/
|
|
7
|
+
pendingReconciliationAck: Map<string, number>;
|
|
8
|
+
private batchAckListeners;
|
|
9
|
+
trackBatch(batchId: string, peerId: string, nextOffset: number): void;
|
|
10
|
+
handleAck(batchId: string, peerId: string): number | undefined;
|
|
11
|
+
waitForAck(batchId: string, peer: PeerState, callback: () => void): void;
|
|
12
|
+
private key;
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=StorageReconciliationAckTracker.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"StorageReconciliationAckTracker.d.ts","sourceRoot":"","sources":["../src/StorageReconciliationAckTracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,qBAAa,qCAAqC;IAChD;;;OAGG;IACH,wBAAwB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAC1D,OAAO,CAAC,iBAAiB,CAA2C;IAEpE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAQrE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAiB9D,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;IA4CxE,OAAO,CAAC,GAAG;CAGZ"}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
export class StorageReconciliationServerAckTracker {
|
|
2
|
+
constructor() {
|
|
3
|
+
/**
|
|
4
|
+
* Tracks pending reconcile acks from the server: "batchId#peerId->offset".
|
|
5
|
+
* Cleared in handleAck.
|
|
6
|
+
*/
|
|
7
|
+
this.pendingReconciliationAck = new Map();
|
|
8
|
+
this.batchAckListeners = new Map();
|
|
9
|
+
}
|
|
10
|
+
trackBatch(batchId, peerId, nextOffset) {
|
|
11
|
+
const key = this.key(batchId, peerId);
|
|
12
|
+
this.pendingReconciliationAck.set(key, nextOffset);
|
|
13
|
+
if (!this.batchAckListeners.has(key)) {
|
|
14
|
+
this.batchAckListeners.set(key, new Set());
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
handleAck(batchId, peerId) {
|
|
18
|
+
const key = this.key(batchId, peerId);
|
|
19
|
+
const nextOffset = this.pendingReconciliationAck.get(key);
|
|
20
|
+
this.pendingReconciliationAck.delete(key);
|
|
21
|
+
const listeners = this.batchAckListeners.get(key);
|
|
22
|
+
if (listeners) {
|
|
23
|
+
for (const listener of listeners) {
|
|
24
|
+
listener();
|
|
25
|
+
}
|
|
26
|
+
this.batchAckListeners.delete(key);
|
|
27
|
+
}
|
|
28
|
+
return nextOffset;
|
|
29
|
+
}
|
|
30
|
+
waitForAck(batchId, peer, callback) {
|
|
31
|
+
const key = this.key(batchId, peer.id);
|
|
32
|
+
const listeners = this.batchAckListeners.get(key);
|
|
33
|
+
if (!this.pendingReconciliationAck.has(key) || !listeners) {
|
|
34
|
+
callback();
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
let finished = false;
|
|
38
|
+
let unsubscribeCloseListener = () => { };
|
|
39
|
+
const finish = () => {
|
|
40
|
+
if (finished) {
|
|
41
|
+
return false;
|
|
42
|
+
}
|
|
43
|
+
finished = true;
|
|
44
|
+
unsubscribeCloseListener();
|
|
45
|
+
return true;
|
|
46
|
+
};
|
|
47
|
+
const onAck = () => {
|
|
48
|
+
if (!finish()) {
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
callback();
|
|
52
|
+
};
|
|
53
|
+
const onPeerClose = () => {
|
|
54
|
+
if (!finish()) {
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
listeners.delete(onAck);
|
|
58
|
+
this.pendingReconciliationAck.delete(key);
|
|
59
|
+
if (listeners.size === 0) {
|
|
60
|
+
this.batchAckListeners.delete(key);
|
|
61
|
+
}
|
|
62
|
+
// The `callback` is never invoked, so the reconciliation process for this peer
|
|
63
|
+
// is interrupted. Once the peer reconnects, the reconciliation process will resume.
|
|
64
|
+
};
|
|
65
|
+
listeners.add(onAck);
|
|
66
|
+
unsubscribeCloseListener = peer.addCloseListener(onPeerClose);
|
|
67
|
+
}
|
|
68
|
+
key(batchId, peerId) {
|
|
69
|
+
return `${batchId}#${peerId}`;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
//# sourceMappingURL=StorageReconciliationAckTracker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"StorageReconciliationAckTracker.js","sourceRoot":"","sources":["../src/StorageReconciliationAckTracker.ts"],"names":[],"mappings":"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"}
|
package/dist/SyncStateManager.js
CHANGED
|
@@ -84,10 +84,10 @@ export class SyncStateManager {
|
|
|
84
84
|
}
|
|
85
85
|
getIsCoValueFullyUploadedIntoPeer(peerKnownState, id) {
|
|
86
86
|
const entry = this.syncManager.local.getCoValue(id);
|
|
87
|
-
|
|
87
|
+
const knownState = entry.knownState();
|
|
88
|
+
if (!knownState.header) {
|
|
88
89
|
return false;
|
|
89
90
|
}
|
|
90
|
-
const knownState = entry.verified.knownState();
|
|
91
91
|
return areCurrentSessionsInSyncWith(knownState.sessions, peerKnownState.sessions);
|
|
92
92
|
}
|
|
93
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SyncStateManager.js","sourceRoot":"","sources":["../src/SyncStateManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SyncStateManager.js","sourceRoot":"","sources":["../src/SyncStateManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,9 +77,10 @@ export declare class CoValueCore {
|
|
|
77
77
|
readonly listeners: Set<(core: CoValueCore, unsub: () => void) => void>;
|
|
78
78
|
private counter;
|
|
79
79
|
constructor(id: RawCoID, node: LocalNode);
|
|
80
|
-
get loadingState(): "available" | "
|
|
80
|
+
get loadingState(): "available" | "garbageCollected" | "onlyKnownState" | "loading" | "unknown" | "unavailable";
|
|
81
81
|
hasMissingDependencies(): boolean;
|
|
82
82
|
isAvailable(): this is AvailableCoValueCore;
|
|
83
|
+
isKnownStateAvailable(): boolean;
|
|
83
84
|
isCompletelyDownloaded(): boolean;
|
|
84
85
|
isStreaming(): boolean;
|
|
85
86
|
hasVerifiedContent(): this is AvailableCoValueCore;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coValueCore.d.ts","sourceRoot":"","sources":["../../src/coValueCore/coValueCore.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAGrD,OAAO,EACL,cAAc,EACd,IAAI,EACJ,KAAK,EACL,SAAS,EACT,SAAS,EACT,QAAQ,EACT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,OAAO,EAEP,OAAO,EACP,SAAS,EACT,aAAa,EACd,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAGtE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAQ1E,OAAO,
|
|
1
|
+
{"version":3,"file":"coValueCore.d.ts","sourceRoot":"","sources":["../../src/coValueCore/coValueCore.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
|
|
|
11
11
|
};
|
|
12
12
|
var _CoValueCore_instances, _CoValueCore_lastKnownStateSource, _CoValueCore_lastKnownState, _CoValueCore_isDeleteTransaction, _CoValueCore_markAsDeleted, _CoValueCore_getDeleteMarker, _CoValueCore_canAuthorDeleteCoValueAtTime, _CoValueCore_isNotificationScheduled, _CoValueCore_batchedUpdates, _CoValueCore_isContentRebuildScheduled, _CoValueCore_isNotifyUpdatePaused, _CoValueCore_fwwWinners;
|
|
13
13
|
import { ValueType, metrics } from "@opentelemetry/api";
|
|
14
|
+
import { CO_VALUE_LOADING_CONFIG } from "../config.js";
|
|
14
15
|
import { coreToCoValue } from "../coreToCoValue.js";
|
|
15
16
|
import { isDeleteSessionID, } from "../ids.js";
|
|
16
17
|
import { logger } from "../logger.js";
|
|
@@ -18,7 +19,7 @@ import { determineValidTransactions } from "../permissions.js";
|
|
|
18
19
|
import { accountOrAgentIDfromSessionID } from "../typeUtils/accountOrAgentIDfromSessionID.js";
|
|
19
20
|
import { expectGroup } from "../typeUtils/expectGroup.js";
|
|
20
21
|
import { getDependenciesFromContentMessage, getDependenciesFromGroupRawTransactions, getDependenciesFromHeader, } from "./utils.js";
|
|
21
|
-
import { VerifiedState
|
|
22
|
+
import { VerifiedState } from "./verifiedState.js";
|
|
22
23
|
import { createBranch, getBranchId, getBranchOwnerId, getBranchSource, mergeBranch, } from "./branching.js";
|
|
23
24
|
import { decryptTransactionChangesAndMeta } from "./decryptTransactionChangesAndMeta.js";
|
|
24
25
|
import { cloneKnownState, combineKnownStateSessions, emptyKnownState, } from "../knownState.js";
|
|
@@ -230,16 +231,16 @@ export class CoValueCore {
|
|
|
230
231
|
if (this.verified) {
|
|
231
232
|
return "available";
|
|
232
233
|
}
|
|
234
|
+
// Check for lastKnownStateSource (garbageCollected or onlyKnownState)
|
|
235
|
+
if (__classPrivateFieldGet(this, _CoValueCore_lastKnownStateSource, "f")) {
|
|
236
|
+
return __classPrivateFieldGet(this, _CoValueCore_lastKnownStateSource, "f");
|
|
237
|
+
}
|
|
233
238
|
// Check for pending peers FIRST - loading takes priority over other states
|
|
234
239
|
for (const peer of this.loadingStatuses.values()) {
|
|
235
240
|
if (peer.type === "pending") {
|
|
236
241
|
return "loading";
|
|
237
242
|
}
|
|
238
243
|
}
|
|
239
|
-
// Check for lastKnownStateSource (garbageCollected or onlyKnownState)
|
|
240
|
-
if (__classPrivateFieldGet(this, _CoValueCore_lastKnownStateSource, "f")) {
|
|
241
|
-
return __classPrivateFieldGet(this, _CoValueCore_lastKnownStateSource, "f");
|
|
242
|
-
}
|
|
243
244
|
if (this.loadingStatuses.size === 0) {
|
|
244
245
|
return "unknown";
|
|
245
246
|
}
|
|
@@ -256,6 +257,11 @@ export class CoValueCore {
|
|
|
256
257
|
isAvailable() {
|
|
257
258
|
return this.hasVerifiedContent();
|
|
258
259
|
}
|
|
260
|
+
isKnownStateAvailable() {
|
|
261
|
+
return (this.loadingState === "available" ||
|
|
262
|
+
this.loadingState === "onlyKnownState" ||
|
|
263
|
+
this.loadingState === "garbageCollected");
|
|
264
|
+
}
|
|
259
265
|
isCompletelyDownloaded() {
|
|
260
266
|
if (!this.hasVerifiedContent()) {
|
|
261
267
|
return false;
|
|
@@ -1345,6 +1351,7 @@ export class CoValueCore {
|
|
|
1345
1351
|
this.markNotFoundInPeer(peer.id);
|
|
1346
1352
|
return;
|
|
1347
1353
|
}
|
|
1354
|
+
let persistentCloseTimer;
|
|
1348
1355
|
const markNotFound = () => {
|
|
1349
1356
|
if (this.getLoadingStateForPeer(peer.id) === "pending") {
|
|
1350
1357
|
logger.warn("Timeout waiting for peer to load coValue", {
|
|
@@ -1354,10 +1361,32 @@ export class CoValueCore {
|
|
|
1354
1361
|
this.markNotFoundInPeer(peer.id);
|
|
1355
1362
|
}
|
|
1356
1363
|
};
|
|
1357
|
-
|
|
1358
|
-
|
|
1359
|
-
|
|
1360
|
-
|
|
1364
|
+
const clearPersistentCloseTimer = () => {
|
|
1365
|
+
if (persistentCloseTimer) {
|
|
1366
|
+
clearTimeout(persistentCloseTimer);
|
|
1367
|
+
persistentCloseTimer = undefined;
|
|
1368
|
+
}
|
|
1369
|
+
};
|
|
1370
|
+
const schedulePersistentPeerGraceTimeout = () => {
|
|
1371
|
+
clearPersistentCloseTimer();
|
|
1372
|
+
persistentCloseTimer = setTimeout(() => {
|
|
1373
|
+
// If the peer with the same id reconnected, avoid marking it as unavailable.
|
|
1374
|
+
const currentPeer = this.node.syncManager.peers[peer.id];
|
|
1375
|
+
if (currentPeer && !currentPeer.closed) {
|
|
1376
|
+
return;
|
|
1377
|
+
}
|
|
1378
|
+
markNotFound();
|
|
1379
|
+
}, CO_VALUE_LOADING_CONFIG.TIMEOUT);
|
|
1380
|
+
};
|
|
1381
|
+
// Non-persistent peers are considered unavailable immediately on close.
|
|
1382
|
+
// Persistent peers get a grace period to reconnect before being marked unavailable.
|
|
1383
|
+
const removeCloseListener = peer.addCloseListener(() => {
|
|
1384
|
+
if (!peer.persistent) {
|
|
1385
|
+
markNotFound();
|
|
1386
|
+
return;
|
|
1387
|
+
}
|
|
1388
|
+
schedulePersistentPeerGraceTimeout();
|
|
1389
|
+
});
|
|
1361
1390
|
/**
|
|
1362
1391
|
* On reconnection persistent peers will automatically fire the load request
|
|
1363
1392
|
* as part of the reconnection process.
|
|
@@ -1365,6 +1394,9 @@ export class CoValueCore {
|
|
|
1365
1394
|
if (!peer.closed) {
|
|
1366
1395
|
peer.sendLoadRequest(this, mode);
|
|
1367
1396
|
}
|
|
1397
|
+
else if (peer.persistent) {
|
|
1398
|
+
schedulePersistentPeerGraceTimeout();
|
|
1399
|
+
}
|
|
1368
1400
|
this.subscribe((state, unsubscribe) => {
|
|
1369
1401
|
const peerState = state.getLoadingStateForPeer(peer.id);
|
|
1370
1402
|
if (state.isAvailable() || // might have become available from another peer e.g. through handleNewContent
|
|
@@ -1372,7 +1404,8 @@ export class CoValueCore {
|
|
|
1372
1404
|
peerState === "errored" ||
|
|
1373
1405
|
peerState === "unavailable") {
|
|
1374
1406
|
unsubscribe();
|
|
1375
|
-
removeCloseListener
|
|
1407
|
+
removeCloseListener();
|
|
1408
|
+
clearPersistentCloseTimer();
|
|
1376
1409
|
}
|
|
1377
1410
|
}, true);
|
|
1378
1411
|
}
|