cojson 0.16.3 → 0.16.5
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 +20 -0
- package/dist/coValue.d.ts +1 -1
- package/dist/coValue.d.ts.map +1 -1
- package/dist/coValue.js.map +1 -1
- package/dist/coValueContentMessage.d.ts +10 -0
- package/dist/coValueContentMessage.d.ts.map +1 -0
- package/dist/coValueContentMessage.js +46 -0
- package/dist/coValueContentMessage.js.map +1 -0
- package/dist/coValueCore/coValueCore.d.ts +6 -10
- package/dist/coValueCore/coValueCore.d.ts.map +1 -1
- package/dist/coValueCore/coValueCore.js +20 -125
- package/dist/coValueCore/coValueCore.js.map +1 -1
- package/dist/coValueCore/verifiedState.d.ts +1 -0
- package/dist/coValueCore/verifiedState.d.ts.map +1 -1
- package/dist/coValueCore/verifiedState.js +14 -27
- package/dist/coValueCore/verifiedState.js.map +1 -1
- package/dist/coValues/group.d.ts +18 -10
- package/dist/coValues/group.d.ts.map +1 -1
- package/dist/coValues/group.js +237 -67
- package/dist/coValues/group.js.map +1 -1
- package/dist/ids.d.ts +3 -3
- package/dist/ids.d.ts.map +1 -1
- package/dist/ids.js.map +1 -1
- package/dist/localNode.d.ts +11 -6
- package/dist/localNode.d.ts.map +1 -1
- package/dist/localNode.js +7 -2
- package/dist/localNode.js.map +1 -1
- package/dist/queue/LocalTransactionsSyncQueue.d.ts +24 -0
- package/dist/queue/LocalTransactionsSyncQueue.d.ts.map +1 -0
- package/dist/queue/LocalTransactionsSyncQueue.js +55 -0
- package/dist/queue/LocalTransactionsSyncQueue.js.map +1 -0
- package/dist/queue/StoreQueue.d.ts +9 -6
- package/dist/queue/StoreQueue.d.ts.map +1 -1
- package/dist/queue/StoreQueue.js +10 -2
- package/dist/queue/StoreQueue.js.map +1 -1
- package/dist/storage/storageAsync.d.ts +11 -3
- package/dist/storage/storageAsync.d.ts.map +1 -1
- package/dist/storage/storageAsync.js +59 -46
- package/dist/storage/storageAsync.js.map +1 -1
- package/dist/storage/storageSync.d.ts +9 -3
- package/dist/storage/storageSync.d.ts.map +1 -1
- package/dist/storage/storageSync.js +48 -35
- package/dist/storage/storageSync.js.map +1 -1
- package/dist/storage/syncUtils.d.ts +2 -1
- package/dist/storage/syncUtils.d.ts.map +1 -1
- package/dist/storage/syncUtils.js +4 -0
- package/dist/storage/syncUtils.js.map +1 -1
- package/dist/storage/types.d.ts +3 -2
- package/dist/storage/types.d.ts.map +1 -1
- package/dist/sync.d.ts +6 -6
- package/dist/sync.d.ts.map +1 -1
- package/dist/sync.js +33 -56
- package/dist/sync.js.map +1 -1
- package/dist/tests/StorageApiAsync.test.d.ts +2 -0
- package/dist/tests/StorageApiAsync.test.d.ts.map +1 -0
- package/dist/tests/StorageApiAsync.test.js +574 -0
- package/dist/tests/StorageApiAsync.test.js.map +1 -0
- package/dist/tests/StorageApiSync.test.d.ts +2 -0
- package/dist/tests/StorageApiSync.test.d.ts.map +1 -0
- package/dist/tests/StorageApiSync.test.js +426 -0
- package/dist/tests/StorageApiSync.test.js.map +1 -0
- package/dist/tests/StoreQueue.test.js +9 -21
- package/dist/tests/StoreQueue.test.js.map +1 -1
- package/dist/tests/SyncStateManager.test.js +18 -8
- package/dist/tests/SyncStateManager.test.js.map +1 -1
- package/dist/tests/group.inheritance.test.js +274 -2
- package/dist/tests/group.inheritance.test.js.map +1 -1
- package/dist/tests/group.removeMember.test.js +152 -1
- package/dist/tests/group.removeMember.test.js.map +1 -1
- package/dist/tests/group.roleOf.test.js +2 -2
- package/dist/tests/group.roleOf.test.js.map +1 -1
- package/dist/tests/group.test.js +81 -3
- package/dist/tests/group.test.js.map +1 -1
- package/dist/tests/sync.auth.test.js +22 -10
- package/dist/tests/sync.auth.test.js.map +1 -1
- package/dist/tests/sync.load.test.js +30 -25
- package/dist/tests/sync.load.test.js.map +1 -1
- package/dist/tests/sync.mesh.test.js +12 -6
- package/dist/tests/sync.mesh.test.js.map +1 -1
- package/dist/tests/sync.peerReconciliation.test.js +6 -4
- package/dist/tests/sync.peerReconciliation.test.js.map +1 -1
- package/dist/tests/sync.storage.test.js +8 -14
- package/dist/tests/sync.storage.test.js.map +1 -1
- package/dist/tests/sync.storageAsync.test.js +31 -14
- package/dist/tests/sync.storageAsync.test.js.map +1 -1
- package/dist/tests/sync.test.js +5 -9
- package/dist/tests/sync.test.js.map +1 -1
- package/dist/tests/sync.upload.test.js +31 -1
- package/dist/tests/sync.upload.test.js.map +1 -1
- package/dist/tests/testStorage.d.ts +2 -3
- package/dist/tests/testStorage.d.ts.map +1 -1
- package/dist/tests/testStorage.js +16 -8
- package/dist/tests/testStorage.js.map +1 -1
- package/dist/tests/testUtils.d.ts +4 -0
- package/dist/tests/testUtils.d.ts.map +1 -1
- package/dist/tests/testUtils.js +22 -4
- package/dist/tests/testUtils.js.map +1 -1
- package/dist/typeUtils/accountOrAgentIDfromSessionID.d.ts +2 -2
- package/dist/typeUtils/accountOrAgentIDfromSessionID.d.ts.map +1 -1
- package/dist/typeUtils/expectGroup.d.ts.map +1 -1
- package/dist/typeUtils/expectGroup.js +6 -5
- package/dist/typeUtils/expectGroup.js.map +1 -1
- package/package.json +1 -1
- package/src/coValue.ts +1 -4
- package/src/coValueContentMessage.ts +73 -0
- package/src/coValueCore/coValueCore.ts +36 -192
- package/src/coValueCore/verifiedState.ts +28 -35
- package/src/coValues/group.ts +329 -99
- package/src/ids.ts +3 -3
- package/src/localNode.ts +15 -10
- package/src/queue/LocalTransactionsSyncQueue.ts +96 -0
- package/src/queue/StoreQueue.ts +22 -12
- package/src/storage/storageAsync.ts +78 -56
- package/src/storage/storageSync.ts +66 -45
- package/src/storage/syncUtils.ts +9 -1
- package/src/storage/types.ts +6 -5
- package/src/sync.ts +47 -67
- package/src/tests/StorageApiAsync.test.ts +829 -0
- package/src/tests/StorageApiSync.test.ts +628 -0
- package/src/tests/StoreQueue.test.ts +10 -24
- package/src/tests/SyncStateManager.test.ts +22 -21
- package/src/tests/group.inheritance.test.ts +415 -1
- package/src/tests/group.removeMember.test.ts +244 -1
- package/src/tests/group.roleOf.test.ts +2 -2
- package/src/tests/group.test.ts +105 -5
- package/src/tests/sync.auth.test.ts +22 -10
- package/src/tests/sync.load.test.ts +32 -26
- package/src/tests/sync.mesh.test.ts +12 -6
- package/src/tests/sync.peerReconciliation.test.ts +6 -4
- package/src/tests/sync.storage.test.ts +8 -14
- package/src/tests/sync.storageAsync.test.ts +39 -14
- package/src/tests/sync.test.ts +6 -14
- package/src/tests/sync.upload.test.ts +38 -1
- package/src/tests/testStorage.ts +19 -13
- package/src/tests/testUtils.ts +29 -5
- package/src/typeUtils/accountOrAgentIDfromSessionID.ts +2 -2
- package/src/typeUtils/expectGroup.ts +8 -5
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { createContentMessage, exceedsRecommendedSize, } from "../coValueContentMessage.js";
|
|
2
|
+
import { logger, } from "../exports.js";
|
|
3
3
|
import { StoreQueue } from "../queue/StoreQueue.js";
|
|
4
4
|
import { emptyKnownState, } from "../sync.js";
|
|
5
5
|
import { StorageKnownState } from "./knownState.js";
|
|
6
|
-
import { collectNewTxs, getDependedOnCoValues } from "./syncUtils.js";
|
|
6
|
+
import { collectNewTxs, getDependedOnCoValues, getNewTransactionsSize, } from "./syncUtils.js";
|
|
7
7
|
export class StorageApiAsync {
|
|
8
8
|
constructor(dbClient) {
|
|
9
9
|
this.loadedCoValues = new Set();
|
|
@@ -34,17 +34,12 @@ export class StorageApiAsync {
|
|
|
34
34
|
}
|
|
35
35
|
}));
|
|
36
36
|
const knownState = this.knwonStates.getKnownState(coValueRow.id);
|
|
37
|
+
knownState.header = true;
|
|
37
38
|
for (const sessionRow of allCoValueSessions) {
|
|
38
39
|
knownState.sessions[sessionRow.sessionID] = sessionRow.lastIdx;
|
|
39
40
|
}
|
|
40
41
|
this.loadedCoValues.add(coValueRow.id);
|
|
41
|
-
let contentMessage =
|
|
42
|
-
action: "content",
|
|
43
|
-
id: coValueRow.id,
|
|
44
|
-
header: coValueRow.header,
|
|
45
|
-
new: {},
|
|
46
|
-
priority: getPriorityFromHeader(coValueRow.header),
|
|
47
|
-
};
|
|
42
|
+
let contentMessage = createContentMessage(coValueRow.id, coValueRow.header);
|
|
48
43
|
if (contentStreaming) {
|
|
49
44
|
contentMessage.expectContentUntil = knownState["sessions"];
|
|
50
45
|
}
|
|
@@ -69,13 +64,7 @@ export class StorageApiAsync {
|
|
|
69
64
|
// Having more than one signature means that the content needs streaming
|
|
70
65
|
// So we start pushing the content to the client, and start a new content message
|
|
71
66
|
await this.pushContentWithDependencies(coValueRow, contentMessage, callback);
|
|
72
|
-
contentMessage =
|
|
73
|
-
action: "content",
|
|
74
|
-
id: coValueRow.id,
|
|
75
|
-
header: coValueRow.header,
|
|
76
|
-
new: {},
|
|
77
|
-
priority: getPriorityFromHeader(coValueRow.header),
|
|
78
|
-
};
|
|
67
|
+
contentMessage = createContentMessage(coValueRow.id, coValueRow.header);
|
|
79
68
|
}
|
|
80
69
|
}
|
|
81
70
|
}
|
|
@@ -102,24 +91,50 @@ export class StorageApiAsync {
|
|
|
102
91
|
await Promise.all(promises);
|
|
103
92
|
pushCallback(contentMessage);
|
|
104
93
|
}
|
|
105
|
-
async store(
|
|
94
|
+
async store(msg, correctionCallback) {
|
|
106
95
|
/**
|
|
107
96
|
* The store operations must be done one by one, because we can't start a new transaction when there
|
|
108
97
|
* is already a transaction open.
|
|
109
98
|
*/
|
|
110
|
-
this.storeQueue.push(
|
|
99
|
+
this.storeQueue.push(msg, correctionCallback);
|
|
111
100
|
this.storeQueue.processQueue(async (data, correctionCallback) => {
|
|
112
|
-
|
|
113
|
-
const success = await this.storeSingle(msg, correctionCallback);
|
|
114
|
-
if (!success) {
|
|
115
|
-
// Stop processing the messages for this entry, because the data is out of sync with storage
|
|
116
|
-
// and the other transactions will be rejected anyway.
|
|
117
|
-
break;
|
|
118
|
-
}
|
|
119
|
-
}
|
|
101
|
+
return this.storeSingle(data, correctionCallback);
|
|
120
102
|
});
|
|
121
103
|
}
|
|
104
|
+
/**
|
|
105
|
+
* This function is called when the storage lacks the information required to store the incoming content.
|
|
106
|
+
*
|
|
107
|
+
* It triggers a `correctionCallback` to ask the syncManager to provide the missing information.
|
|
108
|
+
*
|
|
109
|
+
* The correction is applied immediately, to ensure that, when applicable, the dependent content in the queue won't require additional corrections.
|
|
110
|
+
*/
|
|
111
|
+
async handleCorrection(knownState, correctionCallback) {
|
|
112
|
+
const correction = correctionCallback(knownState);
|
|
113
|
+
if (!correction) {
|
|
114
|
+
logger.error("Correction callback returned undefined", {
|
|
115
|
+
knownState,
|
|
116
|
+
correction: correction ?? null,
|
|
117
|
+
});
|
|
118
|
+
return false;
|
|
119
|
+
}
|
|
120
|
+
for (const msg of correction) {
|
|
121
|
+
const success = await this.storeSingle(msg, (knownState) => {
|
|
122
|
+
logger.error("Double correction requested", {
|
|
123
|
+
msg,
|
|
124
|
+
knownState,
|
|
125
|
+
});
|
|
126
|
+
return undefined;
|
|
127
|
+
});
|
|
128
|
+
if (!success) {
|
|
129
|
+
return false;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
return true;
|
|
133
|
+
}
|
|
122
134
|
async storeSingle(msg, correctionCallback) {
|
|
135
|
+
if (this.storeQueue.closed) {
|
|
136
|
+
return false;
|
|
137
|
+
}
|
|
123
138
|
const id = msg.id;
|
|
124
139
|
const coValueRow = await this.dbClient.getCoValue(id);
|
|
125
140
|
// We have no info about coValue header
|
|
@@ -127,8 +142,7 @@ export class StorageApiAsync {
|
|
|
127
142
|
if (invalidAssumptionOnHeaderPresence) {
|
|
128
143
|
const knownState = emptyKnownState(id);
|
|
129
144
|
this.knwonStates.setKnownState(id, knownState);
|
|
130
|
-
|
|
131
|
-
return false;
|
|
145
|
+
return this.handleCorrection(knownState, correctionCallback);
|
|
132
146
|
}
|
|
133
147
|
const storedCoValueRowID = coValueRow
|
|
134
148
|
? coValueRow.rowID
|
|
@@ -156,30 +170,30 @@ export class StorageApiAsync {
|
|
|
156
170
|
}
|
|
157
171
|
this.knwonStates.handleUpdate(id, knownState);
|
|
158
172
|
if (invalidAssumptions) {
|
|
159
|
-
|
|
160
|
-
return false;
|
|
173
|
+
return this.handleCorrection(knownState, correctionCallback);
|
|
161
174
|
}
|
|
162
175
|
return true;
|
|
163
176
|
}
|
|
164
177
|
async putNewTxs(msg, sessionID, sessionRow, storedCoValueRowID) {
|
|
165
178
|
const newTransactions = msg.new[sessionID]?.newTransactions || [];
|
|
166
|
-
const
|
|
179
|
+
const lastIdx = sessionRow?.lastIdx || 0;
|
|
180
|
+
const actuallyNewOffset = lastIdx - (msg.new[sessionID]?.after || 0);
|
|
167
181
|
const actuallyNewTransactions = newTransactions.slice(actuallyNewOffset);
|
|
168
182
|
if (actuallyNewTransactions.length === 0) {
|
|
169
|
-
return
|
|
170
|
-
}
|
|
171
|
-
let
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
? tx.encryptedChanges.length
|
|
175
|
-
: tx.changes.length), 0);
|
|
176
|
-
const newLastIdx = (sessionRow?.lastIdx || 0) + actuallyNewTransactions.length;
|
|
183
|
+
return lastIdx;
|
|
184
|
+
}
|
|
185
|
+
let bytesSinceLastSignature = sessionRow?.bytesSinceLastSignature || 0;
|
|
186
|
+
const newTransactionsSize = getNewTransactionsSize(actuallyNewTransactions);
|
|
187
|
+
const newLastIdx = lastIdx + actuallyNewTransactions.length;
|
|
177
188
|
let shouldWriteSignature = false;
|
|
178
|
-
if (
|
|
189
|
+
if (exceedsRecommendedSize(bytesSinceLastSignature, newTransactionsSize)) {
|
|
179
190
|
shouldWriteSignature = true;
|
|
180
|
-
|
|
191
|
+
bytesSinceLastSignature = 0;
|
|
192
|
+
}
|
|
193
|
+
else {
|
|
194
|
+
bytesSinceLastSignature += newTransactionsSize;
|
|
181
195
|
}
|
|
182
|
-
const nextIdx =
|
|
196
|
+
const nextIdx = lastIdx;
|
|
183
197
|
if (!msg.new[sessionID])
|
|
184
198
|
throw new Error("Session ID not found");
|
|
185
199
|
const sessionUpdate = {
|
|
@@ -187,7 +201,7 @@ export class StorageApiAsync {
|
|
|
187
201
|
sessionID,
|
|
188
202
|
lastIdx: newLastIdx,
|
|
189
203
|
lastSignature: msg.new[sessionID].lastSignature,
|
|
190
|
-
bytesSinceLastSignature
|
|
204
|
+
bytesSinceLastSignature,
|
|
191
205
|
};
|
|
192
206
|
const sessionRowID = await this.dbClient.addSessionUpdate({
|
|
193
207
|
sessionUpdate,
|
|
@@ -207,8 +221,7 @@ export class StorageApiAsync {
|
|
|
207
221
|
return this.knwonStates.waitForSync(id, coValue);
|
|
208
222
|
}
|
|
209
223
|
close() {
|
|
210
|
-
|
|
211
|
-
this.storeQueue.drain();
|
|
224
|
+
return this.storeQueue.close();
|
|
212
225
|
}
|
|
213
226
|
}
|
|
214
227
|
//# sourceMappingURL=storageAsync.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storageAsync.js","sourceRoot":"","sources":["../../src/storage/storageAsync.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"storageAsync.js","sourceRoot":"","sources":["../../src/storage/storageAsync.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { CoValueCore, type StorageAPI } from "../exports.js";
|
|
2
2
|
import { CoValueKnownState, NewContentMessage } from "../sync.js";
|
|
3
3
|
import { StorageKnownState } from "./knownState.js";
|
|
4
|
-
import type { DBClientInterfaceSync, StoredCoValueRow } from "./types.js";
|
|
4
|
+
import type { CorrectionCallback, DBClientInterfaceSync, StoredCoValueRow } from "./types.js";
|
|
5
5
|
export declare class StorageApiSync implements StorageAPI {
|
|
6
6
|
private streamingCounter;
|
|
7
7
|
private readonly dbClient;
|
|
@@ -12,10 +12,16 @@ export declare class StorageApiSync implements StorageAPI {
|
|
|
12
12
|
load(id: string, callback: (data: NewContentMessage) => void, done: (found: boolean) => void): Promise<void>;
|
|
13
13
|
loadCoValue(id: string, callback: (data: NewContentMessage) => void, done?: (found: boolean) => void): Promise<void>;
|
|
14
14
|
pushContentWithDependencies(coValueRow: StoredCoValueRow, contentMessage: NewContentMessage, pushCallback: (data: NewContentMessage) => void): Promise<void>;
|
|
15
|
-
store(
|
|
15
|
+
store(msg: NewContentMessage, correctionCallback: CorrectionCallback): boolean;
|
|
16
|
+
/**
|
|
17
|
+
* This function is called when the storage lacks the information required to store the incoming content.
|
|
18
|
+
*
|
|
19
|
+
* It triggers a `correctionCallback` to ask the syncManager to provide the missing information.
|
|
20
|
+
*/
|
|
21
|
+
private handleCorrection;
|
|
16
22
|
private storeSingle;
|
|
17
23
|
private putNewTxs;
|
|
18
24
|
waitForSync(id: string, coValue: CoValueCore): Promise<void>;
|
|
19
|
-
close():
|
|
25
|
+
close(): undefined;
|
|
20
26
|
}
|
|
21
27
|
//# sourceMappingURL=storageSync.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storageSync.d.ts","sourceRoot":"","sources":["../../src/storage/storageSync.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"storageSync.d.ts","sourceRoot":"","sources":["../../src/storage/storageSync.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,WAAW,EAGX,KAAK,UAAU,EAEhB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EAElB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAMpD,OAAO,KAAK,EACV,kBAAkB,EAClB,qBAAqB,EAErB,gBAAgB,EAEjB,MAAM,YAAY,CAAC;AAEpB,qBAAa,cAAe,YAAW,UAAU;IAC/C,OAAO,CAAC,gBAAgB,CAAgB;IAExC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwB;IACjD,OAAO,CAAC,cAAc,CAAsB;gBAEhC,QAAQ,EAAE,qBAAqB;IAW3C,WAAW,oBAA2B;IAEtC,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,iBAAiB;IAItC,IAAI,CACR,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,CAAC,IAAI,EAAE,iBAAiB,KAAK,IAAI,EAC3C,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI;IAK1B,WAAW,CACf,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,CAAC,IAAI,EAAE,iBAAiB,KAAK,IAAI,EAC3C,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI;IAyG3B,2BAA2B,CAC/B,UAAU,EAAE,gBAAgB,EAC5B,cAAc,EAAE,iBAAiB,EACjC,YAAY,EAAE,CAAC,IAAI,EAAE,iBAAiB,KAAK,IAAI;IAkBjD,KAAK,CAAC,GAAG,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,kBAAkB;IAIpE;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,WAAW;IA4DnB,OAAO,CAAC,SAAS;IAgEjB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;IAI5C,KAAK;CAGN"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { metrics } from "@opentelemetry/api";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { createContentMessage, exceedsRecommendedSize, } from "../coValueContentMessage.js";
|
|
3
|
+
import { logger, } from "../exports.js";
|
|
4
4
|
import { emptyKnownState, } from "../sync.js";
|
|
5
5
|
import { StorageKnownState } from "./knownState.js";
|
|
6
|
-
import { collectNewTxs, getDependedOnCoValues } from "./syncUtils.js";
|
|
6
|
+
import { collectNewTxs, getDependedOnCoValues, getNewTransactionsSize, } from "./syncUtils.js";
|
|
7
7
|
export class StorageApiSync {
|
|
8
8
|
constructor(dbClient) {
|
|
9
9
|
this.loadedCoValues = new Set();
|
|
@@ -40,17 +40,12 @@ export class StorageApiSync {
|
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
const knownState = this.knwonStates.getKnownState(coValueRow.id);
|
|
43
|
+
knownState.header = true;
|
|
43
44
|
for (const sessionRow of allCoValueSessions) {
|
|
44
45
|
knownState.sessions[sessionRow.sessionID] = sessionRow.lastIdx;
|
|
45
46
|
}
|
|
46
47
|
this.loadedCoValues.add(coValueRow.id);
|
|
47
|
-
let contentMessage =
|
|
48
|
-
action: "content",
|
|
49
|
-
id: coValueRow.id,
|
|
50
|
-
header: coValueRow.header,
|
|
51
|
-
new: {},
|
|
52
|
-
priority: getPriorityFromHeader(coValueRow.header),
|
|
53
|
-
};
|
|
48
|
+
let contentMessage = createContentMessage(coValueRow.id, coValueRow.header);
|
|
54
49
|
if (contentStreaming) {
|
|
55
50
|
this.streamingCounter.add(1);
|
|
56
51
|
contentMessage.expectContentUntil = knownState["sessions"];
|
|
@@ -74,13 +69,7 @@ export class StorageApiSync {
|
|
|
74
69
|
idx = signature.idx + 1;
|
|
75
70
|
if (signatures.length > 1) {
|
|
76
71
|
this.pushContentWithDependencies(coValueRow, contentMessage, callback);
|
|
77
|
-
contentMessage =
|
|
78
|
-
action: "content",
|
|
79
|
-
id: coValueRow.id,
|
|
80
|
-
header: coValueRow.header,
|
|
81
|
-
new: {},
|
|
82
|
-
priority: getPriorityFromHeader(coValueRow.header),
|
|
83
|
-
};
|
|
72
|
+
contentMessage = createContentMessage(coValueRow.id, coValueRow.header);
|
|
84
73
|
// Introduce a delay to not block the main thread
|
|
85
74
|
// for the entire content processing
|
|
86
75
|
await new Promise((resolve) => setTimeout(resolve));
|
|
@@ -109,13 +98,36 @@ export class StorageApiSync {
|
|
|
109
98
|
}
|
|
110
99
|
pushCallback(contentMessage);
|
|
111
100
|
}
|
|
112
|
-
store(
|
|
113
|
-
|
|
114
|
-
|
|
101
|
+
store(msg, correctionCallback) {
|
|
102
|
+
return this.storeSingle(msg, correctionCallback);
|
|
103
|
+
}
|
|
104
|
+
/**
|
|
105
|
+
* This function is called when the storage lacks the information required to store the incoming content.
|
|
106
|
+
*
|
|
107
|
+
* It triggers a `correctionCallback` to ask the syncManager to provide the missing information.
|
|
108
|
+
*/
|
|
109
|
+
handleCorrection(knownState, correctionCallback) {
|
|
110
|
+
const correction = correctionCallback(knownState);
|
|
111
|
+
if (!correction) {
|
|
112
|
+
logger.error("Correction callback returned undefined", {
|
|
113
|
+
knownState,
|
|
114
|
+
correction: correction ?? null,
|
|
115
|
+
});
|
|
116
|
+
return false;
|
|
117
|
+
}
|
|
118
|
+
for (const msg of correction) {
|
|
119
|
+
const success = this.storeSingle(msg, (knownState) => {
|
|
120
|
+
logger.error("Double correction requested", {
|
|
121
|
+
msg,
|
|
122
|
+
knownState,
|
|
123
|
+
});
|
|
124
|
+
return undefined;
|
|
125
|
+
});
|
|
115
126
|
if (!success) {
|
|
116
127
|
return false;
|
|
117
128
|
}
|
|
118
129
|
}
|
|
130
|
+
return true;
|
|
119
131
|
}
|
|
120
132
|
storeSingle(msg, correctionCallback) {
|
|
121
133
|
const id = msg.id;
|
|
@@ -124,9 +136,8 @@ export class StorageApiSync {
|
|
|
124
136
|
const invalidAssumptionOnHeaderPresence = !msg.header && !coValueRow;
|
|
125
137
|
if (invalidAssumptionOnHeaderPresence) {
|
|
126
138
|
const knownState = emptyKnownState(id);
|
|
127
|
-
correctionCallback(knownState);
|
|
128
139
|
this.knwonStates.setKnownState(id, knownState);
|
|
129
|
-
return
|
|
140
|
+
return this.handleCorrection(knownState, correctionCallback);
|
|
130
141
|
}
|
|
131
142
|
const storedCoValueRowID = coValueRow
|
|
132
143
|
? coValueRow.rowID
|
|
@@ -151,28 +162,28 @@ export class StorageApiSync {
|
|
|
151
162
|
}
|
|
152
163
|
this.knwonStates.handleUpdate(id, knownState);
|
|
153
164
|
if (invalidAssumptions) {
|
|
154
|
-
|
|
155
|
-
return false;
|
|
165
|
+
return this.handleCorrection(knownState, correctionCallback);
|
|
156
166
|
}
|
|
157
167
|
return true;
|
|
158
168
|
}
|
|
159
169
|
putNewTxs(msg, sessionID, sessionRow, storedCoValueRowID) {
|
|
160
170
|
const newTransactions = msg.new[sessionID]?.newTransactions || [];
|
|
161
|
-
const
|
|
171
|
+
const lastIdx = sessionRow?.lastIdx || 0;
|
|
172
|
+
const actuallyNewOffset = lastIdx - (msg.new[sessionID]?.after || 0);
|
|
162
173
|
const actuallyNewTransactions = newTransactions.slice(actuallyNewOffset);
|
|
163
174
|
if (actuallyNewTransactions.length === 0) {
|
|
164
|
-
return
|
|
175
|
+
return lastIdx;
|
|
165
176
|
}
|
|
166
|
-
let
|
|
167
|
-
|
|
168
|
-
(tx.privacy === "private"
|
|
169
|
-
? tx.encryptedChanges.length
|
|
170
|
-
: tx.changes.length), 0);
|
|
177
|
+
let bytesSinceLastSignature = sessionRow?.bytesSinceLastSignature || 0;
|
|
178
|
+
const newTransactionsSize = getNewTransactionsSize(actuallyNewTransactions);
|
|
171
179
|
const newLastIdx = (sessionRow?.lastIdx || 0) + actuallyNewTransactions.length;
|
|
172
180
|
let shouldWriteSignature = false;
|
|
173
|
-
if (
|
|
181
|
+
if (exceedsRecommendedSize(bytesSinceLastSignature, newTransactionsSize)) {
|
|
174
182
|
shouldWriteSignature = true;
|
|
175
|
-
|
|
183
|
+
bytesSinceLastSignature = 0;
|
|
184
|
+
}
|
|
185
|
+
else {
|
|
186
|
+
bytesSinceLastSignature += newTransactionsSize;
|
|
176
187
|
}
|
|
177
188
|
const nextIdx = sessionRow?.lastIdx || 0;
|
|
178
189
|
if (!msg.new[sessionID])
|
|
@@ -182,7 +193,7 @@ export class StorageApiSync {
|
|
|
182
193
|
sessionID,
|
|
183
194
|
lastIdx: newLastIdx,
|
|
184
195
|
lastSignature: msg.new[sessionID].lastSignature,
|
|
185
|
-
bytesSinceLastSignature
|
|
196
|
+
bytesSinceLastSignature,
|
|
186
197
|
};
|
|
187
198
|
const sessionRowID = this.dbClient.addSessionUpdate({
|
|
188
199
|
sessionUpdate,
|
|
@@ -201,6 +212,8 @@ export class StorageApiSync {
|
|
|
201
212
|
waitForSync(id, coValue) {
|
|
202
213
|
return this.knwonStates.waitForSync(id, coValue);
|
|
203
214
|
}
|
|
204
|
-
close() {
|
|
215
|
+
close() {
|
|
216
|
+
return undefined;
|
|
217
|
+
}
|
|
205
218
|
}
|
|
206
219
|
//# sourceMappingURL=storageSync.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storageSync.js","sourceRoot":"","sources":["../../src/storage/storageSync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,
|
|
1
|
+
{"version":3,"file":"storageSync.js","sourceRoot":"","sources":["../../src/storage/storageSync.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { CoValueHeader } from "../coValueCore/verifiedState.js";
|
|
1
|
+
import type { CoValueHeader, Transaction } from "../coValueCore/verifiedState.js";
|
|
2
2
|
import type { Signature } from "../crypto/crypto.js";
|
|
3
3
|
import type { NewContentMessage } from "../sync.js";
|
|
4
4
|
import type { StoredSessionRow, TransactionRow } from "./types.js";
|
|
@@ -10,4 +10,5 @@ export declare function collectNewTxs({ newTxsInSession, contentMessage, session
|
|
|
10
10
|
firstNewTxIdx: number;
|
|
11
11
|
}): void;
|
|
12
12
|
export declare function getDependedOnCoValues(header: CoValueHeader, contentMessage: NewContentMessage): Set<`co_z${string}`>;
|
|
13
|
+
export declare function getNewTransactionsSize(newTxs: Transaction[]): number;
|
|
13
14
|
//# sourceMappingURL=syncUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncUtils.d.ts","sourceRoot":"","sources":["../../src/storage/syncUtils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"syncUtils.d.ts","sourceRoot":"","sources":["../../src/storage/syncUtils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACZ,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEnE,wBAAgB,aAAa,CAAC,EAC5B,eAAe,EACf,cAAc,EACd,UAAU,EACV,aAAa,EACb,SAAS,GACV,EAAE;IACD,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,cAAc,EAAE,iBAAiB,CAAC;IAClC,UAAU,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACvB,QAiBA;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,iBAAiB,wBASlC;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,WAAW,EAAE,UAE3D"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { getTransactionSize } from "../coValueContentMessage.js";
|
|
1
2
|
import { getDependedOnCoValuesFromRawData } from "../coValueCore/utils.js";
|
|
2
3
|
export function collectNewTxs({ newTxsInSession, contentMessage, sessionRow, firstNewTxIdx, signature, }) {
|
|
3
4
|
let sessionEntry = contentMessage.new[sessionRow.sessionID];
|
|
@@ -22,4 +23,7 @@ export function getDependedOnCoValues(header, contentMessage) {
|
|
|
22
23
|
const transactions = Object.values(contentMessage.new).map((entry) => entry.newTransactions);
|
|
23
24
|
return getDependedOnCoValuesFromRawData(id, header, sessionIDs, transactions);
|
|
24
25
|
}
|
|
26
|
+
export function getNewTransactionsSize(newTxs) {
|
|
27
|
+
return newTxs.reduce((sum, tx) => sum + getTransactionSize(tx), 0);
|
|
28
|
+
}
|
|
25
29
|
//# sourceMappingURL=syncUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncUtils.js","sourceRoot":"","sources":["../../src/storage/syncUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gCAAgC,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"syncUtils.js","sourceRoot":"","sources":["../../src/storage/syncUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,gCAAgC,EAAE,MAAM,yBAAyB,CAAC;AAU3E,MAAM,UAAU,aAAa,CAAC,EAC5B,eAAe,EACf,cAAc,EACd,UAAU,EACV,aAAa,EACb,SAAS,GAOV;IACC,IAAI,YAAY,GAAG,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAE5D,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,YAAY,GAAG;YACb,KAAK,EAAE,aAAa;YACpB,aAAa,EAAE,SAAS;YACxB,eAAe,EAAE,EAAE;SACpB,CAAC;QACF,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC;IAC1D,CAAC;SAAM,CAAC;QACN,YAAY,CAAC,aAAa,GAAG,SAAS,CAAC;IACzC,CAAC;IAED,KAAK,MAAM,EAAE,IAAI,eAAe,EAAE,CAAC;QACjC,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC3C,CAAC;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,MAAqB,EACrB,cAAiC;IAEjC,MAAM,EAAE,GAAG,cAAc,CAAC,EAAE,CAAC;IAC7B,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAgB,CAAC;IAClE,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,CACxD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,eAAe,CACjC,CAAC;IAEF,OAAO,gCAAgC,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;AAChF,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,MAAqB;IAC1D,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,GAAG,kBAAkB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AACrE,CAAC"}
|
package/dist/storage/types.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import type { CoValueHeader, Transaction } from "../coValueCore/verifiedState.js
|
|
|
2
2
|
import { Signature } from "../crypto/crypto.js";
|
|
3
3
|
import type { CoValueCore, RawCoID, SessionID } from "../exports.js";
|
|
4
4
|
import { CoValueKnownState, NewContentMessage } from "../sync.js";
|
|
5
|
+
export type CorrectionCallback = (correction: CoValueKnownState) => NewContentMessage[] | undefined;
|
|
5
6
|
/**
|
|
6
7
|
* The StorageAPI is the interface that the StorageSync and StorageAsync classes implement.
|
|
7
8
|
*
|
|
@@ -9,10 +10,10 @@ import { CoValueKnownState, NewContentMessage } from "../sync.js";
|
|
|
9
10
|
*/
|
|
10
11
|
export interface StorageAPI {
|
|
11
12
|
load(id: string, callback: (data: NewContentMessage) => void, done?: (found: boolean) => void): void;
|
|
12
|
-
store(data: NewContentMessage
|
|
13
|
+
store(data: NewContentMessage, handleCorrection: CorrectionCallback): void;
|
|
13
14
|
getKnownState(id: string): CoValueKnownState;
|
|
14
15
|
waitForSync(id: string, coValue: CoValueCore): Promise<void>;
|
|
15
|
-
close():
|
|
16
|
+
close(): Promise<unknown> | undefined;
|
|
16
17
|
}
|
|
17
18
|
export type CoValueRow = {
|
|
18
19
|
id: RawCoID;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/storage/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACZ,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAElE;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB,IAAI,CACF,EAAE,EAAE,MAAM,EAEV,QAAQ,EAAE,CAAC,IAAI,EAAE,iBAAiB,KAAK,IAAI,EAC3C,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAC9B,IAAI,CAAC;IACR,KAAK,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/storage/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACZ,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAElE,MAAM,MAAM,kBAAkB,GAAG,CAC/B,UAAU,EAAE,iBAAiB,KAC1B,iBAAiB,EAAE,GAAG,SAAS,CAAC;AAErC;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB,IAAI,CACF,EAAE,EAAE,MAAM,EAEV,QAAQ,EAAE,CAAC,IAAI,EAAE,iBAAiB,KAAK,IAAI,EAC3C,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAC9B,IAAI,CAAC;IACR,KAAK,CAAC,IAAI,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAE3E,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,iBAAiB,CAAC;IAE7C,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7D,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;CACvC;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9D,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,SAAS,CAAC;IACzB,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9D,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,WAAW,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,SAAS,CAAC;CACtB,CAAC;AAEF,MAAM,WAAW,sBAAsB;IACrC,UAAU,CACR,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,GAAG,SAAS,CAAC;IAErD,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAEtE,uBAAuB,CACrB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAAC;IAEzC,0BAA0B,CACxB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;IAE7B,aAAa,CACX,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAEhC,UAAU,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpD,gBAAgB,CAAC,EACf,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,UAAU,CAAC;QAC1B,UAAU,CAAC,EAAE,gBAAgB,CAAC;KAC/B,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpB,cAAc,CACZ,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,WAAW,GAC1B,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS,GAAG,OAAO,CAAC;IAEzC,iBAAiB,CAAC,EAChB,YAAY,EACZ,GAAG,EACH,SAAS,GACV,EAAE;QACD,YAAY,EAAE,MAAM,CAAC;QACrB,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,EAAE,SAAS,CAAC;KACtB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAErB,WAAW,CAAC,QAAQ,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACxD;AAED,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAAC;IAE5D,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAC;IAE7D,uBAAuB,CACrB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,SAAS,GACnB,gBAAgB,GAAG,SAAS,CAAC;IAEhC,0BAA0B,CACxB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,cAAc,EAAE,CAAC;IAEpB,aAAa,CACX,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GACpB,IAAI,CAAC,iBAAiB,EAAE,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC;IAElD,UAAU,CAAC,GAAG,EAAE,iBAAiB,GAAG,MAAM,CAAC;IAE3C,gBAAgB,CAAC,EACf,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,UAAU,CAAC;QAC1B,UAAU,CAAC,EAAE,gBAAgB,CAAC;KAC/B,GAAG,MAAM,CAAC;IAEX,cAAc,CACZ,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,WAAW,GAC1B,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;IAEhC,iBAAiB,CAAC,EAChB,YAAY,EACZ,GAAG,EACH,SAAS,GACV,EAAE;QACD,YAAY,EAAE,MAAM,CAAC;QACrB,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,EAAE,SAAS,CAAC;KACtB,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;IAEjC,WAAW,CAAC,QAAQ,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC;CAC/C"}
|
package/dist/sync.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { PeerState } from "./PeerState.js";
|
|
2
2
|
import { SyncStateManager } from "./SyncStateManager.js";
|
|
3
|
-
import {
|
|
4
|
-
import { CoValueHeader, Transaction } from "./coValueCore/verifiedState.js";
|
|
3
|
+
import { CoValueHeader, Transaction, VerifiedState } from "./coValueCore/verifiedState.js";
|
|
5
4
|
import { Signature } from "./crypto/crypto.js";
|
|
6
5
|
import { RawCoID, SessionID } from "./ids.js";
|
|
7
6
|
import { LocalNode } from "./localNode.js";
|
|
@@ -102,10 +101,11 @@ export declare class SyncManager {
|
|
|
102
101
|
trackDirtyCoValues(): {
|
|
103
102
|
done: () => Set<`co_z${string}`>;
|
|
104
103
|
};
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
104
|
+
private syncQueue;
|
|
105
|
+
syncHeader: (coValue: VerifiedState) => void;
|
|
106
|
+
syncLocalTransaction: (coValue: VerifiedState, transaction: Transaction, sessionID: SessionID, signature: Signature, txIdx: number) => void;
|
|
107
|
+
syncContent(content: NewContentMessage): void;
|
|
108
|
+
private storeContent;
|
|
109
109
|
waitForSyncWithPeer(peerId: PeerID, id: RawCoID, timeout: number): Promise<unknown> | undefined;
|
|
110
110
|
waitForStorageSync(id: RawCoID): Promise<void> | undefined;
|
|
111
111
|
waitForSync(id: RawCoID, timeout?: number): Promise<unknown[]>;
|
package/dist/sync.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"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"}
|