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/dist/queue/LinkedList.js
CHANGED
|
@@ -46,6 +46,9 @@ export class LinkedList {
|
|
|
46
46
|
this.meter?.pull();
|
|
47
47
|
return value;
|
|
48
48
|
}
|
|
49
|
+
trackPushPull() {
|
|
50
|
+
this.meter?.trackPushPull();
|
|
51
|
+
}
|
|
49
52
|
/**
|
|
50
53
|
* Remove a specific node from the list in O(1) time.
|
|
51
54
|
* The node must be a valid node that was returned by push().
|
|
@@ -105,6 +108,10 @@ class QueueMeter {
|
|
|
105
108
|
push() {
|
|
106
109
|
this.pushCounter.add(1, this.attrs);
|
|
107
110
|
}
|
|
111
|
+
trackPushPull() {
|
|
112
|
+
this.pullCounter.add(1, this.attrs);
|
|
113
|
+
this.pushCounter.add(1, this.attrs);
|
|
114
|
+
}
|
|
108
115
|
}
|
|
109
116
|
export function meteredList(type, attrs) {
|
|
110
117
|
return new LinkedList(new QueueMeter("jazz.messagequeue." + type, attrs));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LinkedList.js","sourceRoot":"","sources":["../../src/queue/LinkedList.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"LinkedList.js","sourceRoot":"","sources":["../../src/queue/LinkedList.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ import type { PeerID } from "../sync.js";
|
|
|
7
7
|
* - "immediate": bypasses the queue entirely, executes immediately
|
|
8
8
|
*/
|
|
9
9
|
export type LoadMode = "low-priority" | "immediate" | "high-priority";
|
|
10
|
+
export type LoadCompletionSource = "content" | "known";
|
|
10
11
|
/**
|
|
11
12
|
* A queue that manages outgoing load requests with throttling.
|
|
12
13
|
*
|
|
@@ -19,6 +20,7 @@ export type LoadMode = "low-priority" | "immediate" | "high-priority";
|
|
|
19
20
|
export declare class OutgoingLoadQueue {
|
|
20
21
|
private peerId;
|
|
21
22
|
private inFlightLoads;
|
|
23
|
+
private inFlightCounter;
|
|
22
24
|
private highPriorityPending;
|
|
23
25
|
private lowPriorityPending;
|
|
24
26
|
/**
|
|
@@ -39,6 +41,7 @@ export declare class OutgoingLoadQueue {
|
|
|
39
41
|
* Track that a load request has been sent.
|
|
40
42
|
*/
|
|
41
43
|
private trackSent;
|
|
44
|
+
private untrackInFlight;
|
|
42
45
|
/**
|
|
43
46
|
* Schedule a timeout check if not already scheduled.
|
|
44
47
|
* Uses a single timer to check all in-flight loads.
|
|
@@ -53,7 +56,7 @@ export declare class OutgoingLoadQueue {
|
|
|
53
56
|
* Track that a load request has completed.
|
|
54
57
|
* Triggers processing of pending requests.
|
|
55
58
|
*/
|
|
56
|
-
trackComplete(coValue: CoValueCore): void;
|
|
59
|
+
trackComplete(coValue: CoValueCore, source?: LoadCompletionSource): void;
|
|
57
60
|
/**
|
|
58
61
|
* Enqueue a load request.
|
|
59
62
|
* Immediately processes the queue to send requests if capacity is available.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutgoingLoadQueue.d.ts","sourceRoot":"","sources":["../../src/queue/OutgoingLoadQueue.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"OutgoingLoadQueue.d.ts","sourceRoot":"","sources":["../../src/queue/OutgoingLoadQueue.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAazC;;;;;GAKG;AACH,MAAM,MAAM,QAAQ,GAAG,cAAc,GAAG,WAAW,GAAG,eAAe,CAAC;AACtE,MAAM,MAAM,oBAAoB,GAAG,SAAS,GAAG,OAAO,CAAC;AAEvD;;;;;;;;GAQG;AACH,qBAAa,iBAAiB;IAuBhB,OAAO,CAAC,MAAM;IAtB1B,OAAO,CAAC,aAAa,CAAyC;IAC9D,OAAO,CAAC,eAAe,CAAgB;IACvC,OAAO,CAAC,mBAAmB,CAGzB;IACF,OAAO,CAAC,kBAAkB,CAGxB;IACF;;OAEG;IACH,OAAO,CAAC,gBAAgB,CACZ;IACZ;;OAEG;IACH,OAAO,CAAC,iBAAiB,CACb;IACZ,OAAO,CAAC,aAAa,CAA8C;gBAE/C,MAAM,EAAE,MAAM;IAalC;;OAEG;IACH,OAAO,CAAC,OAAO;IAOf;;OAEG;IACH,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,eAAe;IASvB;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAW5B;;OAEG;IACH,OAAO,CAAC,aAAa;IA2CrB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;IAYvC;;;OAGG;IACH,aAAa,CACX,OAAO,EAAE,WAAW,EACpB,MAAM,GAAE,oBAAgC,GACvC,IAAI;IAeP;;;;;;;;OAQG;IACH,OAAO,CACL,KAAK,EAAE,WAAW,EAClB,YAAY,EAAE,MAAM,IAAI,EACxB,IAAI,GAAE,QAA0B,GAC/B,IAAI;IAsDP,OAAO,CAAC,UAAU,CAAS;IAC3B;;;OAGG;IACH,OAAO,CAAC,YAAY;IAiCpB;;;OAGG;IACH,KAAK,IAAI,IAAI;IAmBb;;OAEG;IACH,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED;;OAEG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;OAEG;IACH,IAAI,wBAAwB,IAAI,MAAM,CAErC;IAED;;OAEG;IACH,IAAI,uBAAuB,IAAI,MAAM,CAEpC;CACF"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ValueType, metrics } from "@opentelemetry/api";
|
|
1
2
|
import { CO_VALUE_LOADING_CONFIG } from "../config.js";
|
|
2
3
|
import { logger } from "../logger.js";
|
|
3
4
|
import { meteredList } from "./LinkedList.js";
|
|
@@ -26,6 +27,15 @@ export class OutgoingLoadQueue {
|
|
|
26
27
|
this.highPriorityNodes = new Map();
|
|
27
28
|
this.timeoutHandle = null;
|
|
28
29
|
this.processing = false;
|
|
30
|
+
this.inFlightCounter = metrics
|
|
31
|
+
.getMeter("cojson")
|
|
32
|
+
.createUpDownCounter("jazz.loadqueue.outgoing.inflight", {
|
|
33
|
+
description: "Number of in-flight outgoing load requests",
|
|
34
|
+
unit: "1",
|
|
35
|
+
valueType: ValueType.INT,
|
|
36
|
+
});
|
|
37
|
+
// Emit an initial 0 value so the series appears immediately.
|
|
38
|
+
this.inFlightCounter.add(0);
|
|
29
39
|
}
|
|
30
40
|
/**
|
|
31
41
|
* Check if we can send another load request.
|
|
@@ -39,9 +49,17 @@ export class OutgoingLoadQueue {
|
|
|
39
49
|
*/
|
|
40
50
|
trackSent(coValue) {
|
|
41
51
|
const now = performance.now();
|
|
42
|
-
this.inFlightLoads.set(coValue, now);
|
|
52
|
+
this.inFlightLoads.set(coValue.id, { value: coValue, sentAt: now });
|
|
53
|
+
this.inFlightCounter.add(1);
|
|
43
54
|
this.scheduleTimeoutCheck(CO_VALUE_LOADING_CONFIG.TIMEOUT);
|
|
44
55
|
}
|
|
56
|
+
untrackInFlight(id) {
|
|
57
|
+
if (!this.inFlightLoads.delete(id)) {
|
|
58
|
+
return false;
|
|
59
|
+
}
|
|
60
|
+
this.inFlightCounter.add(-1);
|
|
61
|
+
return true;
|
|
62
|
+
}
|
|
45
63
|
/**
|
|
46
64
|
* Schedule a timeout check if not already scheduled.
|
|
47
65
|
* Uses a single timer to check all in-flight loads.
|
|
@@ -61,7 +79,7 @@ export class OutgoingLoadQueue {
|
|
|
61
79
|
checkTimeouts() {
|
|
62
80
|
const now = performance.now();
|
|
63
81
|
let nextTimeout;
|
|
64
|
-
for (const
|
|
82
|
+
for (const { value: coValue, sentAt } of this.inFlightLoads.values()) {
|
|
65
83
|
const timeout = sentAt + CO_VALUE_LOADING_CONFIG.TIMEOUT;
|
|
66
84
|
if (now >= timeout) {
|
|
67
85
|
if (!coValue.isAvailable()) {
|
|
@@ -69,7 +87,8 @@ export class OutgoingLoadQueue {
|
|
|
69
87
|
id: coValue.id,
|
|
70
88
|
peerId: this.peerId,
|
|
71
89
|
});
|
|
72
|
-
|
|
90
|
+
// Re-resolve by ID to avoid mutating a stale CoValue instance.
|
|
91
|
+
coValue.node.getCoValue(coValue.id).markNotFoundInPeer(this.peerId);
|
|
73
92
|
}
|
|
74
93
|
else if (coValue.isStreaming()) {
|
|
75
94
|
logger.warn("Content streaming is taking more than " +
|
|
@@ -81,8 +100,9 @@ export class OutgoingLoadQueue {
|
|
|
81
100
|
streamingTarget: coValue.knownStateWithStreaming().sessions,
|
|
82
101
|
});
|
|
83
102
|
}
|
|
84
|
-
this.
|
|
85
|
-
|
|
103
|
+
if (this.untrackInFlight(coValue.id)) {
|
|
104
|
+
this.processQueue();
|
|
105
|
+
}
|
|
86
106
|
}
|
|
87
107
|
else {
|
|
88
108
|
nextTimeout = Math.min(nextTimeout ?? Infinity, timeout - now);
|
|
@@ -94,26 +114,30 @@ export class OutgoingLoadQueue {
|
|
|
94
114
|
}
|
|
95
115
|
}
|
|
96
116
|
trackUpdate(coValue) {
|
|
97
|
-
if (!this.inFlightLoads.has(coValue)) {
|
|
117
|
+
if (!this.inFlightLoads.has(coValue.id)) {
|
|
98
118
|
return;
|
|
99
119
|
}
|
|
100
120
|
// Refresh the timeout for the in-flight load
|
|
101
|
-
this.inFlightLoads.set(coValue,
|
|
121
|
+
this.inFlightLoads.set(coValue.id, {
|
|
122
|
+
value: coValue,
|
|
123
|
+
sentAt: performance.now(),
|
|
124
|
+
});
|
|
102
125
|
}
|
|
103
126
|
/**
|
|
104
127
|
* Track that a load request has completed.
|
|
105
128
|
* Triggers processing of pending requests.
|
|
106
129
|
*/
|
|
107
|
-
trackComplete(coValue) {
|
|
108
|
-
if (!this.inFlightLoads.has(coValue)) {
|
|
130
|
+
trackComplete(coValue, source = "content") {
|
|
131
|
+
if (!this.inFlightLoads.has(coValue.id)) {
|
|
109
132
|
return;
|
|
110
133
|
}
|
|
111
|
-
if (coValue.isStreaming()) {
|
|
134
|
+
if (source === "content" && coValue.isStreaming()) {
|
|
112
135
|
// wait for the next chunk
|
|
113
136
|
return;
|
|
114
137
|
}
|
|
115
|
-
this.
|
|
116
|
-
|
|
138
|
+
if (this.untrackInFlight(coValue.id)) {
|
|
139
|
+
this.processQueue();
|
|
140
|
+
}
|
|
117
141
|
}
|
|
118
142
|
/**
|
|
119
143
|
* Enqueue a load request.
|
|
@@ -125,7 +149,7 @@ export class OutgoingLoadQueue {
|
|
|
125
149
|
* @param mode - Optional mode: "low-priority" for background loads, "immediate" to bypass queue
|
|
126
150
|
*/
|
|
127
151
|
enqueue(value, sendCallback, mode = "high-priority") {
|
|
128
|
-
if (this.inFlightLoads.has(value)) {
|
|
152
|
+
if (this.inFlightLoads.has(value.id)) {
|
|
129
153
|
return;
|
|
130
154
|
}
|
|
131
155
|
const lowPriorityNode = this.lowPriorityNodes.get(value.id);
|
|
@@ -206,7 +230,11 @@ export class OutgoingLoadQueue {
|
|
|
206
230
|
clearTimeout(this.timeoutHandle);
|
|
207
231
|
this.timeoutHandle = null;
|
|
208
232
|
}
|
|
233
|
+
const inFlightCount = this.inFlightLoads.size;
|
|
209
234
|
this.inFlightLoads.clear();
|
|
235
|
+
if (inFlightCount > 0) {
|
|
236
|
+
this.inFlightCounter.add(-inFlightCount);
|
|
237
|
+
}
|
|
210
238
|
// Drain existing queues to balance push/pull metrics
|
|
211
239
|
while (this.highPriorityPending.shift()) { }
|
|
212
240
|
while (this.lowPriorityPending.shift()) { }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutgoingLoadQueue.js","sourceRoot":"","sources":["../../src/queue/OutgoingLoadQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAGvD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAmC,WAAW,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"OutgoingLoadQueue.js","sourceRoot":"","sources":["../../src/queue/OutgoingLoadQueue.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PriorityBasedMessageQueue.d.ts","sourceRoot":"","sources":["../../src/queue/PriorityBasedMessageQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAS9C,qBAAa,yBAAyB;IAIlC,OAAO,CAAC,eAAe;IAHzB,OAAO,CAAC,MAAM,CAAa;gBAGjB,eAAe,EAAE,eAAe,EACxC,IAAI,EAAE,UAAU,GAAG,UAAU;IAC7B;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IASzC,OAAO,CAAC,QAAQ;IAIT,IAAI,CAAC,GAAG,EAAE,WAAW;
|
|
1
|
+
{"version":3,"file":"PriorityBasedMessageQueue.d.ts","sourceRoot":"","sources":["../../src/queue/PriorityBasedMessageQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAS9C,qBAAa,yBAAyB;IAIlC,OAAO,CAAC,eAAe;IAHzB,OAAO,CAAC,MAAM,CAAa;gBAGjB,eAAe,EAAE,eAAe,EACxC,IAAI,EAAE,UAAU,GAAG,UAAU;IAC7B;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IASzC,OAAO,CAAC,QAAQ;IAIT,IAAI,CAAC,GAAG,EAAE,WAAW;IAUrB,IAAI;IAMJ,aAAa,CAAC,GAAG,EAAE,WAAW;CAStC"}
|
|
@@ -23,12 +23,22 @@ export class PriorityBasedMessageQueue {
|
|
|
23
23
|
return this.queues[PRIORITY_TO_QUEUE_INDEX[priority]];
|
|
24
24
|
}
|
|
25
25
|
push(msg) {
|
|
26
|
-
|
|
26
|
+
let priority = "priority" in msg ? msg.priority : this.defaultPriority;
|
|
27
|
+
if (msg.action === "reconcile") {
|
|
28
|
+
priority = CO_VALUE_PRIORITY.LOW;
|
|
29
|
+
}
|
|
27
30
|
this.getQueue(priority).push(msg);
|
|
28
31
|
}
|
|
29
32
|
pull() {
|
|
30
33
|
const priority = this.queues.findIndex((queue) => queue.length > 0);
|
|
31
34
|
return this.queues[priority]?.shift();
|
|
32
35
|
}
|
|
36
|
+
trackPushPull(msg) {
|
|
37
|
+
let priority = "priority" in msg ? msg.priority : this.defaultPriority;
|
|
38
|
+
if (msg.action === "reconcile") {
|
|
39
|
+
priority = CO_VALUE_PRIORITY.LOW;
|
|
40
|
+
}
|
|
41
|
+
this.getQueue(priority).trackPushPull();
|
|
42
|
+
}
|
|
33
43
|
}
|
|
34
44
|
//# sourceMappingURL=PriorityBasedMessageQueue.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PriorityBasedMessageQueue.js","sourceRoot":"","sources":["../../src/queue/PriorityBasedMessageQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAwB,MAAM,gBAAgB,CAAC;AAEzE,OAAO,EAAc,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE1D,MAAM,uBAAuB,GAAG;IAC9B,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;IAC3B,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;IAC7B,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;CAClB,CAAC;AAEX,MAAM,OAAO,yBAAyB;IAGpC,YACU,eAAgC,EACxC,IAA6B;IAC7B;;;OAGG;IACH,KAAuC;QAN/B,oBAAe,GAAf,eAAe,CAAiB;QAQxC,IAAI,CAAC,MAAM,GAAG;YACZ,WAAW,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,iBAAiB,CAAC,IAAI,EAAE,GAAG,KAAK,EAAE,CAAC;YACjE,WAAW,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,iBAAiB,CAAC,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;YACnE,WAAW,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;SACjE,CAAC;IACJ,CAAC;IAEO,QAAQ,CAAC,QAAyB;QACxC,OAAO,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC;IACxD,CAAC;IAEM,IAAI,CAAC,GAAgB;QAC1B,
|
|
1
|
+
{"version":3,"file":"PriorityBasedMessageQueue.js","sourceRoot":"","sources":["../../src/queue/PriorityBasedMessageQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAwB,MAAM,gBAAgB,CAAC;AAEzE,OAAO,EAAc,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE1D,MAAM,uBAAuB,GAAG;IAC9B,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;IAC3B,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;IAC7B,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;CAClB,CAAC;AAEX,MAAM,OAAO,yBAAyB;IAGpC,YACU,eAAgC,EACxC,IAA6B;IAC7B;;;OAGG;IACH,KAAuC;QAN/B,oBAAe,GAAf,eAAe,CAAiB;QAQxC,IAAI,CAAC,MAAM,GAAG;YACZ,WAAW,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,iBAAiB,CAAC,IAAI,EAAE,GAAG,KAAK,EAAE,CAAC;YACjE,WAAW,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,iBAAiB,CAAC,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;YACnE,WAAW,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;SACjE,CAAC;IACJ,CAAC;IAEO,QAAQ,CAAC,QAAyB;QACxC,OAAO,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC;IACxD,CAAC;IAEM,IAAI,CAAC,GAAgB;QAC1B,IAAI,QAAQ,GAAG,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;QAEvE,IAAI,GAAG,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;YAC/B,QAAQ,GAAG,iBAAiB,CAAC,GAAG,CAAC;QACnC,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IAEM,IAAI;QACT,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAEpE,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;IACxC,CAAC;IAEM,aAAa,CAAC,GAAgB;QACnC,IAAI,QAAQ,GAAG,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;QAEvE,IAAI,GAAG,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;YAC/B,QAAQ,GAAG,iBAAiB,CAAC,GAAG,CAAC;QACnC,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,aAAa,EAAE,CAAC;IAC1C,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"knownState.d.ts","sourceRoot":"","sources":["../../src/storage/knownState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,EACL,iBAAiB,EAGlB,MAAM,kBAAkB,CAAC;AAE1B;;;GAGG;AACH,qBAAa,iBAAiB;IAC5B,WAAW,iCAAwC;IAEnD,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,iBAAiB;IAY5C;;;OAGG;IACH,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAQ9D,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB;IAIvD,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB;IAetD,mBAAmB;oBAGH,iBAAiB;iBACpB,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI;QAE9B;IAEJ,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;
|
|
1
|
+
{"version":3,"file":"knownState.d.ts","sourceRoot":"","sources":["../../src/storage/knownState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,EACL,iBAAiB,EAGlB,MAAM,kBAAkB,CAAC;AAE1B;;;GAGG;AACH,qBAAa,iBAAiB;IAC5B,WAAW,iCAAwC;IAEnD,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,iBAAiB;IAY5C;;;OAGG;IACH,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAQ9D,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB;IAIvD,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB;IAetD,mBAAmB;oBAGH,iBAAiB;iBACpB,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI;QAE9B;IAEJ,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;IA0B5C,gBAAgB,CAAC,EAAE,EAAE,MAAM;IAS3B,KAAK;CAIN"}
|
|
@@ -63,6 +63,17 @@ export class StorageKnownState {
|
|
|
63
63
|
requests.add(req);
|
|
64
64
|
});
|
|
65
65
|
}
|
|
66
|
+
deleteKnownState(id) {
|
|
67
|
+
this.knownStates.delete(id);
|
|
68
|
+
for (const request of this.waitForSyncRequests.get(id) || []) {
|
|
69
|
+
request.resolve();
|
|
70
|
+
}
|
|
71
|
+
this.waitForSyncRequests.delete(id);
|
|
72
|
+
}
|
|
73
|
+
clear() {
|
|
74
|
+
this.knownStates.clear();
|
|
75
|
+
this.waitForSyncRequests.clear();
|
|
76
|
+
}
|
|
66
77
|
}
|
|
67
78
|
function isInSync(knownState, knownStateFromStorage) {
|
|
68
79
|
if (!knownStateFromStorage.header && knownState.header) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"knownState.js","sourceRoot":"","sources":["../../src/storage/knownState.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,eAAe,EACf,4BAA4B,GAC7B,MAAM,kBAAkB,CAAC;AAE1B;;;GAGG;AACH,MAAM,OAAO,iBAAiB;IAA9B;QACE,gBAAW,GAAG,IAAI,GAAG,EAA6B,CAAC;QA6CnD,wBAAmB,GAAG,IAAI,GAAG,EAM1B,CAAC;
|
|
1
|
+
{"version":3,"file":"knownState.js","sourceRoot":"","sources":["../../src/storage/knownState.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import type { Signature } from "../../crypto/crypto.js";
|
|
|
3
3
|
import type { RawCoID, SessionID } from "../../exports.js";
|
|
4
4
|
import type { CoValueKnownState } from "../../knownState.js";
|
|
5
5
|
import type { PeerID } from "../../sync.js";
|
|
6
|
-
import type { DBClientInterfaceSync, DBTransactionInterfaceSync, SessionRow, SignatureAfterRow, StoredCoValueRow, StoredSessionRow, TransactionRow } from "../types.js";
|
|
6
|
+
import type { DBClientInterfaceSync, DBTransactionInterfaceSync, SessionRow, SignatureAfterRow, StorageReconciliationLockRow, StoredCoValueRow, StoredSessionRow, TransactionRow, StorageReconciliationAcquireResult } from "../types.js";
|
|
7
7
|
import type { SQLiteDatabaseDriver } from "./types.js";
|
|
8
8
|
export type RawCoValueRow = {
|
|
9
9
|
id: RawCoID;
|
|
@@ -37,7 +37,13 @@ export declare class SQLiteClient implements DBClientInterfaceSync, DBTransactio
|
|
|
37
37
|
idx: number;
|
|
38
38
|
signature: Signature;
|
|
39
39
|
}): void;
|
|
40
|
+
getStorageReconciliationLock(key: string): StorageReconciliationLockRow | undefined;
|
|
41
|
+
putStorageReconciliationLock(entry: StorageReconciliationLockRow): void;
|
|
40
42
|
transaction(operationsCallback: (tx: DBTransactionInterfaceSync) => unknown): undefined;
|
|
43
|
+
getCoValueIDs(limit: number, offset: number): {
|
|
44
|
+
id: RawCoID;
|
|
45
|
+
}[];
|
|
46
|
+
getCoValueCount(): number;
|
|
41
47
|
getUnsyncedCoValueIDs(): RawCoID[];
|
|
42
48
|
trackCoValuesSyncState(updates: {
|
|
43
49
|
id: RawCoID;
|
|
@@ -45,6 +51,9 @@ export declare class SQLiteClient implements DBClientInterfaceSync, DBTransactio
|
|
|
45
51
|
synced: boolean;
|
|
46
52
|
}[]): void;
|
|
47
53
|
stopTrackingSyncState(id: RawCoID): void;
|
|
54
|
+
tryAcquireStorageReconciliationLock(sessionId: SessionID, peerId: PeerID): StorageReconciliationAcquireResult;
|
|
55
|
+
renewStorageReconciliationLock(sessionId: SessionID, peerId: PeerID, offset: number): void;
|
|
56
|
+
releaseStorageReconciliationLock(sessionId: SessionID, peerId: PeerID): void;
|
|
48
57
|
getCoValueKnownState(coValueId: string): CoValueKnownState | undefined;
|
|
49
58
|
}
|
|
50
59
|
//# sourceMappingURL=client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/storage/sqlite/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACZ,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,KAAK,EACV,qBAAqB,EACrB,0BAA0B,EAC1B,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/storage/sqlite/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { logger } from "../../logger.js";
|
|
2
2
|
import { DeletedCoValueDeletionStatus } from "../types.js";
|
|
3
|
+
import { STORAGE_RECONCILIATION_CONFIG } from "../../config.js";
|
|
3
4
|
export function getErrorMessage(error) {
|
|
4
5
|
return error instanceof Error ? error.message : "Unknown error";
|
|
5
6
|
}
|
|
@@ -134,10 +135,30 @@ export class SQLiteClient {
|
|
|
134
135
|
addSignatureAfter({ sessionRowID, idx, signature, }) {
|
|
135
136
|
this.db.run("INSERT INTO signatureAfter (ses, idx, signature) VALUES (?, ?, ?)", [sessionRowID, idx, signature]);
|
|
136
137
|
}
|
|
138
|
+
getStorageReconciliationLock(key) {
|
|
139
|
+
return this.db.get("SELECT * FROM storageReconciliationLocks WHERE key = ?", [key]);
|
|
140
|
+
}
|
|
141
|
+
putStorageReconciliationLock(entry) {
|
|
142
|
+
const { key, holderSessionId, acquiredAt, releasedAt, lastProcessedOffset, } = entry;
|
|
143
|
+
this.db.run(`INSERT OR REPLACE INTO storageReconciliationLocks (key, holderSessionId, acquiredAt, releasedAt, lastProcessedOffset) VALUES (?, ?, ?, ?, ?)`, [
|
|
144
|
+
key,
|
|
145
|
+
holderSessionId,
|
|
146
|
+
acquiredAt,
|
|
147
|
+
releasedAt ?? null,
|
|
148
|
+
lastProcessedOffset,
|
|
149
|
+
]);
|
|
150
|
+
}
|
|
137
151
|
transaction(operationsCallback) {
|
|
138
152
|
this.db.transaction(() => operationsCallback(this));
|
|
139
153
|
return undefined;
|
|
140
154
|
}
|
|
155
|
+
getCoValueIDs(limit, offset) {
|
|
156
|
+
return this.db.query("SELECT id FROM coValues WHERE rowID > ? ORDER BY rowID LIMIT ?", [offset, limit]);
|
|
157
|
+
}
|
|
158
|
+
getCoValueCount() {
|
|
159
|
+
const row = this.db.get("SELECT COUNT(*) as count FROM coValues", []);
|
|
160
|
+
return row?.count ?? 0;
|
|
161
|
+
}
|
|
141
162
|
getUnsyncedCoValueIDs() {
|
|
142
163
|
const rows = this.db.query("SELECT DISTINCT co_value_id FROM unsynced_covalues", []);
|
|
143
164
|
return rows.map((row) => row.co_value_id);
|
|
@@ -155,6 +176,69 @@ export class SQLiteClient {
|
|
|
155
176
|
stopTrackingSyncState(id) {
|
|
156
177
|
this.db.run("DELETE FROM unsynced_covalues WHERE co_value_id = ?", [id]);
|
|
157
178
|
}
|
|
179
|
+
tryAcquireStorageReconciliationLock(sessionId, peerId) {
|
|
180
|
+
let result = {
|
|
181
|
+
acquired: false,
|
|
182
|
+
reason: "not_due",
|
|
183
|
+
};
|
|
184
|
+
this.transaction(() => {
|
|
185
|
+
const now = Date.now();
|
|
186
|
+
const lockKey = `lock#${peerId}`;
|
|
187
|
+
const lockRow = this.getStorageReconciliationLock(lockKey);
|
|
188
|
+
if (lockRow?.releasedAt &&
|
|
189
|
+
now - lockRow.releasedAt <
|
|
190
|
+
STORAGE_RECONCILIATION_CONFIG.RECONCILIATION_INTERVAL_MS) {
|
|
191
|
+
result = { acquired: false, reason: "not_due" };
|
|
192
|
+
return;
|
|
193
|
+
}
|
|
194
|
+
const expiresAt = lockRow
|
|
195
|
+
? lockRow.acquiredAt + STORAGE_RECONCILIATION_CONFIG.LOCK_TTL_MS
|
|
196
|
+
: 0;
|
|
197
|
+
const isLockHeldByOtherSession = lockRow?.holderSessionId !== sessionId;
|
|
198
|
+
if (lockRow &&
|
|
199
|
+
!lockRow.releasedAt &&
|
|
200
|
+
expiresAt >= now &&
|
|
201
|
+
isLockHeldByOtherSession) {
|
|
202
|
+
result = { acquired: false, reason: "lock_held" };
|
|
203
|
+
return;
|
|
204
|
+
}
|
|
205
|
+
const lastProcessedOffset = lockRow && !lockRow.releasedAt ? (lockRow.lastProcessedOffset ?? 0) : 0;
|
|
206
|
+
this.putStorageReconciliationLock({
|
|
207
|
+
key: lockKey,
|
|
208
|
+
holderSessionId: sessionId,
|
|
209
|
+
acquiredAt: now,
|
|
210
|
+
lastProcessedOffset,
|
|
211
|
+
});
|
|
212
|
+
result = { acquired: true, lastProcessedOffset };
|
|
213
|
+
});
|
|
214
|
+
return result;
|
|
215
|
+
}
|
|
216
|
+
renewStorageReconciliationLock(sessionId, peerId, offset) {
|
|
217
|
+
const lockKey = `lock#${peerId}`;
|
|
218
|
+
const lockRow = this.getStorageReconciliationLock(lockKey);
|
|
219
|
+
if (lockRow &&
|
|
220
|
+
lockRow.holderSessionId === sessionId &&
|
|
221
|
+
!lockRow.releasedAt) {
|
|
222
|
+
this.putStorageReconciliationLock({
|
|
223
|
+
...lockRow,
|
|
224
|
+
lastProcessedOffset: offset,
|
|
225
|
+
});
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
releaseStorageReconciliationLock(sessionId, peerId) {
|
|
229
|
+
this.transaction(() => {
|
|
230
|
+
const lockKey = `lock#${peerId}`;
|
|
231
|
+
const releasedAt = Date.now();
|
|
232
|
+
const lockRow = this.getStorageReconciliationLock(lockKey);
|
|
233
|
+
if (lockRow?.holderSessionId === sessionId) {
|
|
234
|
+
this.putStorageReconciliationLock({
|
|
235
|
+
...lockRow,
|
|
236
|
+
releasedAt,
|
|
237
|
+
lastProcessedOffset: 0,
|
|
238
|
+
});
|
|
239
|
+
}
|
|
240
|
+
});
|
|
241
|
+
}
|
|
158
242
|
getCoValueKnownState(coValueId) {
|
|
159
243
|
// First check if the CoValue exists
|
|
160
244
|
const coValueRow = this.db.get("SELECT rowID FROM coValues WHERE id = ?", [coValueId]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/storage/sqlite/client.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/storage/sqlite/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqliteMigrations.d.ts","sourceRoot":"","sources":["../../../src/storage/sqlite/sqliteMigrations.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"sqliteMigrations.d.ts","sourceRoot":"","sources":["../../../src/storage/sqlite/sqliteMigrations.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CA4D/C,CAAC;AAEF,KAAK,SAAS,GAAG;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAEF,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,CAMtE"}
|
|
@@ -47,6 +47,17 @@ export const migrations = {
|
|
|
47
47
|
) WITHOUT ROWID;`,
|
|
48
48
|
"CREATE INDEX IF NOT EXISTS deletedCoValuesByStatus ON deletedCoValues (status);",
|
|
49
49
|
],
|
|
50
|
+
6: [
|
|
51
|
+
`CREATE TABLE IF NOT EXISTS storageReconciliationLocks (
|
|
52
|
+
key TEXT PRIMARY KEY,
|
|
53
|
+
holderSessionId TEXT NOT NULL,
|
|
54
|
+
acquiredAt INTEGER NOT NULL,
|
|
55
|
+
expiresAt INTEGER NOT NULL,
|
|
56
|
+
lastProcessedOffset INTEGER NOT NULL DEFAULT 0,
|
|
57
|
+
releasedAt INTEGER
|
|
58
|
+
) WITHOUT ROWID;`,
|
|
59
|
+
],
|
|
60
|
+
7: ["ALTER TABLE storageReconciliationLocks DROP COLUMN expiresAt;"],
|
|
50
61
|
};
|
|
51
62
|
export function getSQLiteMigrationQueries(version) {
|
|
52
63
|
return Object.keys(migrations)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqliteMigrations.js","sourceRoot":"","sources":["../../../src/storage/sqlite/sqliteMigrations.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAA6B;IAClD,CAAC,EAAE;QACD;;;;;qBAKiB;QACjB;;;;;;;OAOG;QACH,qEAAqE;QACrE;;;;OAIG;QACH,2DAA2D;KAC5D;IACD,CAAC,EAAE;QACD;;;;;qBAKiB;QACjB,kEAAkE;KACnE;IACD,CAAC,EAAE;QACD;;;;;OAKG;QACH,iGAAiG;KAClG;IACD,CAAC,EAAE;QACD;;;qBAGiB;QACjB,iFAAiF;KAClF;
|
|
1
|
+
{"version":3,"file":"sqliteMigrations.js","sourceRoot":"","sources":["../../../src/storage/sqlite/sqliteMigrations.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAA6B;IAClD,CAAC,EAAE;QACD;;;;;qBAKiB;QACjB;;;;;;;OAOG;QACH,qEAAqE;QACrE;;;;OAIG;QACH,2DAA2D;KAC5D;IACD,CAAC,EAAE;QACD;;;;;qBAKiB;QACjB,kEAAkE;KACnE;IACD,CAAC,EAAE;QACD;;;;;OAKG;QACH,iGAAiG;KAClG;IACD,CAAC,EAAE;QACD;;;qBAGiB;QACjB,iFAAiF;KAClF;IACD,CAAC,EAAE;QACD;;;;;;;qBAOiB;KAClB;IACD,CAAC,EAAE,CAAC,+DAA+D,CAAC;CACrE,CAAC;AAOF,MAAM,UAAU,yBAAyB,CAAC,OAAe;IACvD,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;SAC3B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;SAClC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC;SAC1B,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;SACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;AAChE,CAAC"}
|
|
@@ -2,7 +2,7 @@ import type { CoValueHeader, Transaction } from "../../coValueCore/verifiedState
|
|
|
2
2
|
import type { Signature } from "../../crypto/crypto.js";
|
|
3
3
|
import type { RawCoID, SessionID } from "../../exports.js";
|
|
4
4
|
import type { CoValueKnownState } from "../../knownState.js";
|
|
5
|
-
import type { DBClientInterfaceAsync, DBTransactionInterfaceAsync, SessionRow, SignatureAfterRow, StoredCoValueRow, StoredSessionRow, TransactionRow } from "../types.js";
|
|
5
|
+
import type { DBClientInterfaceAsync, DBTransactionInterfaceAsync, SessionRow, SignatureAfterRow, StorageReconciliationLockRow, StoredCoValueRow, StoredSessionRow, TransactionRow, StorageReconciliationAcquireResult } from "../types.js";
|
|
6
6
|
import type { SQLiteDatabaseDriverAsync } from "./types.js";
|
|
7
7
|
import type { PeerID } from "../../sync.js";
|
|
8
8
|
export type RawCoValueRow = {
|
|
@@ -34,6 +34,8 @@ export declare class SQLiteTransactionAsync implements DBTransactionInterfaceAsy
|
|
|
34
34
|
signature: Signature;
|
|
35
35
|
}): Promise<void>;
|
|
36
36
|
deleteCoValueContent(coValueRow: Pick<StoredCoValueRow, "rowID" | "id">): Promise<void>;
|
|
37
|
+
getStorageReconciliationLock(key: string): Promise<StorageReconciliationLockRow | undefined>;
|
|
38
|
+
putStorageReconciliationLock(entry: StorageReconciliationLockRow): Promise<void>;
|
|
37
39
|
}
|
|
38
40
|
export declare class SQLiteClientAsync implements DBClientInterfaceAsync {
|
|
39
41
|
private readonly db;
|
|
@@ -57,6 +59,13 @@ export declare class SQLiteClientAsync implements DBClientInterfaceAsync {
|
|
|
57
59
|
synced: boolean;
|
|
58
60
|
}[]): Promise<void>;
|
|
59
61
|
stopTrackingSyncState(id: RawCoID): Promise<void>;
|
|
62
|
+
getCoValueIDs(limit: number, offset: number): Promise<{
|
|
63
|
+
id: RawCoID;
|
|
64
|
+
}[]>;
|
|
65
|
+
getCoValueCount(): Promise<number>;
|
|
66
|
+
tryAcquireStorageReconciliationLock(sessionId: SessionID, peerId: PeerID): Promise<StorageReconciliationAcquireResult>;
|
|
67
|
+
renewStorageReconciliationLock(sessionId: SessionID, peerId: PeerID, offset: number): Promise<void>;
|
|
68
|
+
releaseStorageReconciliationLock(sessionId: SessionID, peerId: PeerID): Promise<void>;
|
|
60
69
|
getCoValueKnownState(coValueId: string): Promise<CoValueKnownState | undefined>;
|
|
61
70
|
}
|
|
62
71
|
//# sourceMappingURL=client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/storage/sqliteAsync/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACZ,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,KAAK,EACV,sBAAsB,EACtB,2BAA2B,EAC3B,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/storage/sqliteAsync/client.ts"],"names":[],"mappings":"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"}
|