cojson 0.15.8 → 0.15.10
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 +12 -0
- package/dist/IncomingMessagesQueue.d.ts +27 -0
- package/dist/IncomingMessagesQueue.d.ts.map +1 -0
- package/dist/IncomingMessagesQueue.js +114 -0
- package/dist/IncomingMessagesQueue.js.map +1 -0
- package/dist/PeerState.d.ts +2 -10
- package/dist/PeerState.d.ts.map +1 -1
- package/dist/PeerState.js +9 -90
- package/dist/PeerState.js.map +1 -1
- package/dist/PriorityBasedMessageQueue.d.ts +2 -1
- package/dist/PriorityBasedMessageQueue.d.ts.map +1 -1
- package/dist/PriorityBasedMessageQueue.js +9 -6
- package/dist/PriorityBasedMessageQueue.js.map +1 -1
- package/dist/SyncStateManager.d.ts +1 -0
- package/dist/SyncStateManager.d.ts.map +1 -1
- package/dist/SyncStateManager.js +1 -1
- package/dist/SyncStateManager.js.map +1 -1
- package/dist/coValue.d.ts +1 -1
- package/dist/coValueCore/coValueCore.d.ts +9 -17
- package/dist/coValueCore/coValueCore.d.ts.map +1 -1
- package/dist/coValueCore/coValueCore.js +75 -50
- package/dist/coValueCore/coValueCore.js.map +1 -1
- package/dist/coValueCore/verifiedState.d.ts +10 -3
- package/dist/coValueCore/verifiedState.d.ts.map +1 -1
- package/dist/coValueCore/verifiedState.js +73 -14
- package/dist/coValueCore/verifiedState.js.map +1 -1
- package/dist/coValues/coMap.d.ts +3 -3
- package/dist/coValues/coStream.d.ts +2 -2
- package/dist/coValues/group.d.ts +1 -1
- package/dist/coValues/group.d.ts.map +1 -1
- package/dist/coValues/group.js +2 -4
- package/dist/coValues/group.js.map +1 -1
- package/dist/config.d.ts +19 -0
- package/dist/config.d.ts.map +1 -0
- package/dist/config.js +23 -0
- package/dist/config.js.map +1 -0
- package/dist/crypto/WasmCrypto.d.ts.map +1 -1
- package/dist/crypto/WasmCrypto.js +2 -1
- package/dist/crypto/WasmCrypto.js.map +1 -1
- package/dist/exports.d.ts +18 -7
- package/dist/exports.d.ts.map +1 -1
- package/dist/exports.js +11 -8
- package/dist/exports.js.map +1 -1
- package/dist/localNode.d.ts +8 -2
- package/dist/localNode.d.ts.map +1 -1
- package/dist/localNode.js +19 -12
- package/dist/localNode.js.map +1 -1
- package/dist/storage/StoreQueue.d.ts +15 -0
- package/dist/storage/StoreQueue.d.ts.map +1 -0
- package/dist/storage/StoreQueue.js +35 -0
- package/dist/storage/StoreQueue.js.map +1 -0
- package/dist/storage/index.d.ts +6 -0
- package/dist/storage/index.d.ts.map +1 -0
- package/dist/storage/index.js +6 -0
- package/dist/storage/index.js.map +1 -0
- package/dist/storage/knownState.d.ts +18 -0
- package/dist/storage/knownState.d.ts.map +1 -0
- package/dist/storage/knownState.js +63 -0
- package/dist/storage/knownState.js.map +1 -0
- package/dist/storage/sqlite/client.d.ts +37 -0
- package/dist/storage/sqlite/client.d.ts.map +1 -0
- package/dist/storage/sqlite/client.js +89 -0
- package/dist/storage/sqlite/client.js.map +1 -0
- package/dist/storage/sqlite/index.d.ts +5 -0
- package/dist/storage/sqlite/index.d.ts.map +1 -0
- package/dist/storage/sqlite/index.js +13 -0
- package/dist/storage/sqlite/index.js.map +1 -0
- package/dist/storage/sqlite/sqliteMigrations.d.ts +3 -0
- package/dist/storage/sqlite/sqliteMigrations.d.ts.map +1 -0
- package/dist/storage/sqlite/sqliteMigrations.js +44 -0
- package/dist/storage/sqlite/sqliteMigrations.js.map +1 -0
- package/dist/storage/sqlite/types.d.ts +8 -0
- package/dist/storage/sqlite/types.d.ts.map +1 -0
- package/dist/storage/sqlite/types.js +2 -0
- package/dist/storage/sqlite/types.js.map +1 -0
- package/dist/storage/sqliteAsync/client.d.ts +37 -0
- package/dist/storage/sqliteAsync/client.d.ts.map +1 -0
- package/dist/storage/sqliteAsync/client.js +88 -0
- package/dist/storage/sqliteAsync/client.js.map +1 -0
- package/dist/storage/sqliteAsync/index.d.ts +6 -0
- package/dist/storage/sqliteAsync/index.d.ts.map +1 -0
- package/dist/storage/sqliteAsync/index.js +15 -0
- package/dist/storage/sqliteAsync/index.js.map +1 -0
- package/dist/storage/sqliteAsync/types.d.ts +9 -0
- package/dist/storage/sqliteAsync/types.d.ts.map +1 -0
- package/dist/storage/sqliteAsync/types.js +2 -0
- package/dist/storage/sqliteAsync/types.js.map +1 -0
- package/dist/storage/storageAsync.d.ts +22 -0
- package/dist/storage/storageAsync.d.ts.map +1 -0
- package/dist/storage/storageAsync.js +214 -0
- package/dist/storage/storageAsync.js.map +1 -0
- package/dist/storage/storageSync.d.ts +21 -0
- package/dist/storage/storageSync.d.ts.map +1 -0
- package/dist/storage/storageSync.js +206 -0
- package/dist/storage/storageSync.js.map +1 -0
- package/dist/storage/syncUtils.d.ts +13 -0
- package/dist/storage/syncUtils.d.ts.map +1 -0
- package/dist/storage/syncUtils.js +25 -0
- package/dist/storage/syncUtils.js.map +1 -0
- package/dist/storage/types.d.ts +82 -0
- package/dist/storage/types.d.ts.map +1 -0
- package/dist/storage/types.js +2 -0
- package/dist/storage/types.js.map +1 -0
- package/dist/streamUtils.d.ts +13 -9
- package/dist/streamUtils.d.ts.map +1 -1
- package/dist/streamUtils.js +46 -13
- package/dist/streamUtils.js.map +1 -1
- package/dist/sync.d.ts +22 -14
- package/dist/sync.d.ts.map +1 -1
- package/dist/sync.js +143 -125
- package/dist/sync.js.map +1 -1
- package/dist/tests/IncomingMessagesQueue.test.d.ts +2 -0
- package/dist/tests/IncomingMessagesQueue.test.d.ts.map +1 -0
- package/dist/tests/IncomingMessagesQueue.test.js +437 -0
- package/dist/tests/IncomingMessagesQueue.test.js.map +1 -0
- package/dist/tests/PeerState.test.js +6 -94
- package/dist/tests/PeerState.test.js.map +1 -1
- package/dist/tests/PriorityBasedMessageQueue.test.js +14 -14
- package/dist/tests/PriorityBasedMessageQueue.test.js.map +1 -1
- package/dist/tests/StoreQueue.test.d.ts +2 -0
- package/dist/tests/StoreQueue.test.d.ts.map +1 -0
- package/dist/tests/StoreQueue.test.js +208 -0
- package/dist/tests/StoreQueue.test.js.map +1 -0
- package/dist/tests/SyncStateManager.test.js +3 -1
- package/dist/tests/SyncStateManager.test.js.map +1 -1
- package/dist/tests/account.test.js +9 -9
- package/dist/tests/account.test.js.map +1 -1
- package/dist/tests/coStream.test.js +1 -1
- package/dist/tests/coStream.test.js.map +1 -1
- package/dist/tests/coValueCore.test.js +208 -1
- package/dist/tests/coValueCore.test.js.map +1 -1
- package/dist/tests/coValueCoreLoadingState.test.js +2 -2
- package/dist/tests/coValueCoreLoadingState.test.js.map +1 -1
- package/dist/tests/group.addMember.test.js.map +1 -1
- package/dist/tests/group.removeMember.test.js +1 -1
- package/dist/tests/group.removeMember.test.js.map +1 -1
- package/dist/tests/messagesTestUtils.js +1 -1
- package/dist/tests/messagesTestUtils.js.map +1 -1
- package/dist/tests/sync.auth.test.js +23 -15
- package/dist/tests/sync.auth.test.js.map +1 -1
- package/dist/tests/sync.invite.test.js +10 -16
- package/dist/tests/sync.invite.test.js.map +1 -1
- package/dist/tests/sync.load.test.js +52 -50
- package/dist/tests/sync.load.test.js.map +1 -1
- package/dist/tests/sync.mesh.test.js +173 -56
- package/dist/tests/sync.mesh.test.js.map +1 -1
- package/dist/tests/sync.peerReconciliation.test.js +42 -32
- package/dist/tests/sync.peerReconciliation.test.js.map +1 -1
- package/dist/tests/sync.storage.test.js +162 -62
- package/dist/tests/sync.storage.test.js.map +1 -1
- package/dist/tests/sync.storageAsync.test.d.ts +2 -0
- package/dist/tests/sync.storageAsync.test.d.ts.map +1 -0
- package/dist/tests/sync.storageAsync.test.js +361 -0
- package/dist/tests/sync.storageAsync.test.js.map +1 -0
- package/dist/tests/sync.test.js +16 -21
- package/dist/tests/sync.test.js.map +1 -1
- package/dist/tests/sync.upload.test.js +28 -25
- package/dist/tests/sync.upload.test.js.map +1 -1
- package/dist/tests/testStorage.d.ts +12 -0
- package/dist/tests/testStorage.d.ts.map +1 -0
- package/dist/tests/testStorage.js +151 -0
- package/dist/tests/testStorage.js.map +1 -0
- package/dist/tests/testUtils.d.ts +20 -15
- package/dist/tests/testUtils.d.ts.map +1 -1
- package/dist/tests/testUtils.js +79 -45
- package/dist/tests/testUtils.js.map +1 -1
- package/package.json +2 -2
- package/src/IncomingMessagesQueue.ts +142 -0
- package/src/PeerState.ts +11 -110
- package/src/PriorityBasedMessageQueue.ts +13 -5
- package/src/SyncStateManager.ts +1 -1
- package/src/coValueCore/coValueCore.ts +100 -66
- package/src/coValueCore/verifiedState.ts +91 -21
- package/src/coValues/group.ts +2 -4
- package/src/config.ts +26 -0
- package/src/crypto/WasmCrypto.ts +3 -1
- package/src/exports.ts +20 -27
- package/src/localNode.ts +27 -12
- package/src/storage/StoreQueue.ts +56 -0
- package/src/storage/index.ts +5 -0
- package/src/storage/knownState.ts +88 -0
- package/src/storage/sqlite/client.ts +180 -0
- package/src/storage/sqlite/index.ts +19 -0
- package/src/storage/sqlite/sqliteMigrations.ts +44 -0
- package/src/storage/sqlite/types.ts +7 -0
- package/src/storage/sqliteAsync/client.ts +179 -0
- package/src/storage/sqliteAsync/index.ts +25 -0
- package/src/storage/sqliteAsync/types.ts +8 -0
- package/src/storage/storageAsync.ts +367 -0
- package/src/storage/storageSync.ts +343 -0
- package/src/storage/syncUtils.ts +50 -0
- package/src/storage/types.ts +162 -0
- package/src/streamUtils.ts +61 -19
- package/src/sync.ts +191 -160
- package/src/tests/IncomingMessagesQueue.test.ts +626 -0
- package/src/tests/PeerState.test.ts +6 -118
- package/src/tests/PriorityBasedMessageQueue.test.ts +18 -14
- package/src/tests/StoreQueue.test.ts +283 -0
- package/src/tests/SyncStateManager.test.ts +4 -1
- package/src/tests/account.test.ts +11 -12
- package/src/tests/coStream.test.ts +1 -3
- package/src/tests/coValueCore.test.ts +270 -1
- package/src/tests/coValueCoreLoadingState.test.ts +2 -2
- package/src/tests/group.addMember.test.ts +1 -0
- package/src/tests/group.removeMember.test.ts +2 -8
- package/src/tests/messagesTestUtils.ts +2 -2
- package/src/tests/sync.auth.test.ts +24 -14
- package/src/tests/sync.invite.test.ts +11 -17
- package/src/tests/sync.load.test.ts +53 -49
- package/src/tests/sync.mesh.test.ts +198 -56
- package/src/tests/sync.peerReconciliation.test.ts +44 -34
- package/src/tests/sync.storage.test.ts +231 -64
- package/src/tests/sync.storageAsync.test.ts +486 -0
- package/src/tests/sync.test.ts +17 -23
- package/src/tests/sync.upload.test.ts +29 -24
- package/src/tests/testStorage.ts +216 -0
- package/src/tests/testUtils.ts +89 -54
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { type CoValueCore, type StorageAPI } from "../exports.js";
|
|
2
|
+
import { CoValueKnownState, NewContentMessage } from "../sync.js";
|
|
3
|
+
import { StoreQueue } from "./StoreQueue.js";
|
|
4
|
+
import { StorageKnownState } from "./knownState.js";
|
|
5
|
+
import type { DBClientInterfaceAsync, StoredCoValueRow } from "./types.js";
|
|
6
|
+
export declare class StorageApiAsync implements StorageAPI {
|
|
7
|
+
private readonly dbClient;
|
|
8
|
+
private loadedCoValues;
|
|
9
|
+
constructor(dbClient: DBClientInterfaceAsync);
|
|
10
|
+
knwonStates: StorageKnownState;
|
|
11
|
+
getKnownState(id: string): CoValueKnownState;
|
|
12
|
+
load(id: string, callback: (data: NewContentMessage) => void, done: (found: boolean) => void): Promise<void>;
|
|
13
|
+
loadCoValue(id: string, callback: (data: NewContentMessage) => void, done: (found: boolean) => void): Promise<void>;
|
|
14
|
+
pushContentWithDependencies(coValueRow: StoredCoValueRow, contentMessage: NewContentMessage, pushCallback: (data: NewContentMessage) => void): Promise<void>;
|
|
15
|
+
storeQueue: StoreQueue;
|
|
16
|
+
store(msgs: NewContentMessage[], correctionCallback: (data: CoValueKnownState) => void): Promise<void>;
|
|
17
|
+
private storeSingle;
|
|
18
|
+
private putNewTxs;
|
|
19
|
+
waitForSync(id: string, coValue: CoValueCore): Promise<void>;
|
|
20
|
+
close(): void;
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=storageAsync.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storageAsync.d.ts","sourceRoot":"","sources":["../../src/storage/storageAsync.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,WAAW,EAIhB,KAAK,UAAU,EAChB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EAElB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,KAAK,EACV,sBAAsB,EAEtB,gBAAgB,EAEjB,MAAM,YAAY,CAAC;AAEpB,qBAAa,eAAgB,YAAW,UAAU;IAChD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyB;IAElD,OAAO,CAAC,cAAc,CAAsB;gBAEhC,QAAQ,EAAE,sBAAsB;IAI5C,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,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI;IAoH1B,2BAA2B,CAC/B,UAAU,EAAE,gBAAgB,EAC5B,cAAc,EAAE,iBAAiB,EACjC,YAAY,EAAE,CAAC,IAAI,EAAE,iBAAiB,KAAK,IAAI;IA0BjD,UAAU,aAAoB;IAExB,KAAK,CACT,IAAI,EAAE,iBAAiB,EAAE,EACzB,kBAAkB,EAAE,CAAC,IAAI,EAAE,iBAAiB,KAAK,IAAI;YAqBzC,WAAW;YAkEX,SAAS;IAwEvB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;IAI5C,KAAK;CAIN"}
|
|
@@ -0,0 +1,214 @@
|
|
|
1
|
+
import { MAX_RECOMMENDED_TX_SIZE, } from "../exports.js";
|
|
2
|
+
import { getPriorityFromHeader } from "../priority.js";
|
|
3
|
+
import { emptyKnownState, } from "../sync.js";
|
|
4
|
+
import { StoreQueue } from "./StoreQueue.js";
|
|
5
|
+
import { StorageKnownState } from "./knownState.js";
|
|
6
|
+
import { collectNewTxs, getDependedOnCoValues } from "./syncUtils.js";
|
|
7
|
+
export class StorageApiAsync {
|
|
8
|
+
constructor(dbClient) {
|
|
9
|
+
this.loadedCoValues = new Set();
|
|
10
|
+
this.knwonStates = new StorageKnownState();
|
|
11
|
+
this.storeQueue = new StoreQueue();
|
|
12
|
+
this.dbClient = dbClient;
|
|
13
|
+
}
|
|
14
|
+
getKnownState(id) {
|
|
15
|
+
return this.knwonStates.getKnownState(id);
|
|
16
|
+
}
|
|
17
|
+
async load(id, callback, done) {
|
|
18
|
+
await this.loadCoValue(id, callback, done);
|
|
19
|
+
}
|
|
20
|
+
async loadCoValue(id, callback, done) {
|
|
21
|
+
const coValueRow = await this.dbClient.getCoValue(id);
|
|
22
|
+
if (!coValueRow) {
|
|
23
|
+
done?.(false);
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
const allCoValueSessions = await this.dbClient.getCoValueSessions(coValueRow.rowID);
|
|
27
|
+
const signaturesBySession = new Map();
|
|
28
|
+
let contentStreaming = false;
|
|
29
|
+
await Promise.all(allCoValueSessions.map(async (sessionRow) => {
|
|
30
|
+
const signatures = await this.dbClient.getSignatures(sessionRow.rowID, 0);
|
|
31
|
+
if (signatures.length > 0) {
|
|
32
|
+
contentStreaming = true;
|
|
33
|
+
signaturesBySession.set(sessionRow.sessionID, signatures);
|
|
34
|
+
}
|
|
35
|
+
}));
|
|
36
|
+
const knownState = this.knwonStates.getKnownState(coValueRow.id);
|
|
37
|
+
for (const sessionRow of allCoValueSessions) {
|
|
38
|
+
knownState.sessions[sessionRow.sessionID] = sessionRow.lastIdx;
|
|
39
|
+
}
|
|
40
|
+
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
|
+
};
|
|
48
|
+
if (contentStreaming) {
|
|
49
|
+
contentMessage.expectContentUntil = knownState["sessions"];
|
|
50
|
+
}
|
|
51
|
+
for (const sessionRow of allCoValueSessions) {
|
|
52
|
+
const signatures = signaturesBySession.get(sessionRow.sessionID) || [];
|
|
53
|
+
let idx = 0;
|
|
54
|
+
signatures.push({
|
|
55
|
+
idx: sessionRow.lastIdx,
|
|
56
|
+
signature: sessionRow.lastSignature,
|
|
57
|
+
});
|
|
58
|
+
for (const signature of signatures) {
|
|
59
|
+
const newTxsInSession = await this.dbClient.getNewTransactionInSession(sessionRow.rowID, idx, signature.idx);
|
|
60
|
+
collectNewTxs({
|
|
61
|
+
newTxsInSession,
|
|
62
|
+
contentMessage,
|
|
63
|
+
sessionRow,
|
|
64
|
+
firstNewTxIdx: idx,
|
|
65
|
+
signature: signature.signature,
|
|
66
|
+
});
|
|
67
|
+
idx = signature.idx + 1;
|
|
68
|
+
if (signatures.length > 1) {
|
|
69
|
+
// Having more than one signature means that the content needs streaming
|
|
70
|
+
// So we start pushing the content to the client, and start a new content message
|
|
71
|
+
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
|
+
};
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
const hasNewContent = Object.keys(contentMessage.new).length > 0;
|
|
83
|
+
// If there is no new content but steaming is not active, it's the case for a coValue with the header but no transactions
|
|
84
|
+
// For streaming the push has already been done in the loop above
|
|
85
|
+
if (hasNewContent || !contentStreaming) {
|
|
86
|
+
await this.pushContentWithDependencies(coValueRow, contentMessage, callback);
|
|
87
|
+
}
|
|
88
|
+
this.knwonStates.handleUpdate(coValueRow.id, knownState);
|
|
89
|
+
done?.(true);
|
|
90
|
+
}
|
|
91
|
+
async pushContentWithDependencies(coValueRow, contentMessage, pushCallback) {
|
|
92
|
+
const dependedOnCoValuesList = getDependedOnCoValues(coValueRow.header, contentMessage);
|
|
93
|
+
const promises = [];
|
|
94
|
+
for (const dependedOnCoValue of dependedOnCoValuesList) {
|
|
95
|
+
if (this.loadedCoValues.has(dependedOnCoValue)) {
|
|
96
|
+
continue;
|
|
97
|
+
}
|
|
98
|
+
promises.push(new Promise((resolve) => {
|
|
99
|
+
this.loadCoValue(dependedOnCoValue, pushCallback, resolve);
|
|
100
|
+
}));
|
|
101
|
+
}
|
|
102
|
+
await Promise.all(promises);
|
|
103
|
+
pushCallback(contentMessage);
|
|
104
|
+
}
|
|
105
|
+
async store(msgs, correctionCallback) {
|
|
106
|
+
/**
|
|
107
|
+
* The store operations must be done one by one, because we can't start a new transaction when there
|
|
108
|
+
* is already a transaction open.
|
|
109
|
+
*/
|
|
110
|
+
this.storeQueue.push(msgs, correctionCallback);
|
|
111
|
+
this.storeQueue.processQueue(async (data, correctionCallback) => {
|
|
112
|
+
for (const msg of data) {
|
|
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
|
+
}
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
async storeSingle(msg, correctionCallback) {
|
|
123
|
+
const id = msg.id;
|
|
124
|
+
const coValueRow = await this.dbClient.getCoValue(id);
|
|
125
|
+
// We have no info about coValue header
|
|
126
|
+
const invalidAssumptionOnHeaderPresence = !msg.header && !coValueRow;
|
|
127
|
+
if (invalidAssumptionOnHeaderPresence) {
|
|
128
|
+
const knownState = emptyKnownState(id);
|
|
129
|
+
this.knwonStates.setKnownState(id, knownState);
|
|
130
|
+
correctionCallback(knownState);
|
|
131
|
+
return false;
|
|
132
|
+
}
|
|
133
|
+
const storedCoValueRowID = coValueRow
|
|
134
|
+
? coValueRow.rowID
|
|
135
|
+
: await this.dbClient.addCoValue(msg);
|
|
136
|
+
const knownState = this.knwonStates.getKnownState(id);
|
|
137
|
+
knownState.header = true;
|
|
138
|
+
let invalidAssumptions = false;
|
|
139
|
+
for (const sessionID of Object.keys(msg.new)) {
|
|
140
|
+
await this.dbClient.transaction(async () => {
|
|
141
|
+
const sessionRow = await this.dbClient.getSingleCoValueSession(storedCoValueRowID, sessionID);
|
|
142
|
+
if (sessionRow) {
|
|
143
|
+
knownState.sessions[sessionRow.sessionID] = sessionRow.lastIdx;
|
|
144
|
+
}
|
|
145
|
+
const lastIdx = sessionRow?.lastIdx || 0;
|
|
146
|
+
const after = msg.new[sessionID]?.after || 0;
|
|
147
|
+
if (lastIdx < after) {
|
|
148
|
+
knownState.sessions[sessionID] = lastIdx;
|
|
149
|
+
invalidAssumptions = true;
|
|
150
|
+
}
|
|
151
|
+
else {
|
|
152
|
+
const newLastIdx = await this.putNewTxs(msg, sessionID, sessionRow, storedCoValueRowID);
|
|
153
|
+
knownState.sessions[sessionID] = newLastIdx;
|
|
154
|
+
}
|
|
155
|
+
});
|
|
156
|
+
}
|
|
157
|
+
this.knwonStates.handleUpdate(id, knownState);
|
|
158
|
+
if (invalidAssumptions) {
|
|
159
|
+
correctionCallback(knownState);
|
|
160
|
+
return false;
|
|
161
|
+
}
|
|
162
|
+
return true;
|
|
163
|
+
}
|
|
164
|
+
async putNewTxs(msg, sessionID, sessionRow, storedCoValueRowID) {
|
|
165
|
+
const newTransactions = msg.new[sessionID]?.newTransactions || [];
|
|
166
|
+
const actuallyNewOffset = (sessionRow?.lastIdx || 0) - (msg.new[sessionID]?.after || 0);
|
|
167
|
+
const actuallyNewTransactions = newTransactions.slice(actuallyNewOffset);
|
|
168
|
+
if (actuallyNewTransactions.length === 0) {
|
|
169
|
+
return sessionRow?.lastIdx || 0;
|
|
170
|
+
}
|
|
171
|
+
let newBytesSinceLastSignature = (sessionRow?.bytesSinceLastSignature || 0) +
|
|
172
|
+
actuallyNewTransactions.reduce((sum, tx) => sum +
|
|
173
|
+
(tx.privacy === "private"
|
|
174
|
+
? tx.encryptedChanges.length
|
|
175
|
+
: tx.changes.length), 0);
|
|
176
|
+
const newLastIdx = (sessionRow?.lastIdx || 0) + actuallyNewTransactions.length;
|
|
177
|
+
let shouldWriteSignature = false;
|
|
178
|
+
if (newBytesSinceLastSignature > MAX_RECOMMENDED_TX_SIZE) {
|
|
179
|
+
shouldWriteSignature = true;
|
|
180
|
+
newBytesSinceLastSignature = 0;
|
|
181
|
+
}
|
|
182
|
+
const nextIdx = sessionRow?.lastIdx || 0;
|
|
183
|
+
if (!msg.new[sessionID])
|
|
184
|
+
throw new Error("Session ID not found");
|
|
185
|
+
const sessionUpdate = {
|
|
186
|
+
coValue: storedCoValueRowID,
|
|
187
|
+
sessionID,
|
|
188
|
+
lastIdx: newLastIdx,
|
|
189
|
+
lastSignature: msg.new[sessionID].lastSignature,
|
|
190
|
+
bytesSinceLastSignature: newBytesSinceLastSignature,
|
|
191
|
+
};
|
|
192
|
+
const sessionRowID = await this.dbClient.addSessionUpdate({
|
|
193
|
+
sessionUpdate,
|
|
194
|
+
sessionRow,
|
|
195
|
+
});
|
|
196
|
+
if (shouldWriteSignature) {
|
|
197
|
+
await this.dbClient.addSignatureAfter({
|
|
198
|
+
sessionRowID,
|
|
199
|
+
idx: newLastIdx - 1,
|
|
200
|
+
signature: msg.new[sessionID].lastSignature,
|
|
201
|
+
});
|
|
202
|
+
}
|
|
203
|
+
await Promise.all(actuallyNewTransactions.map((newTransaction, i) => this.dbClient.addTransaction(sessionRowID, nextIdx + i, newTransaction)));
|
|
204
|
+
return newLastIdx;
|
|
205
|
+
}
|
|
206
|
+
waitForSync(id, coValue) {
|
|
207
|
+
return this.knwonStates.waitForSync(id, coValue);
|
|
208
|
+
}
|
|
209
|
+
close() {
|
|
210
|
+
// Drain the store queue
|
|
211
|
+
this.storeQueue.drain();
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
//# sourceMappingURL=storageAsync.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storageAsync.js","sourceRoot":"","sources":["../../src/storage/storageAsync.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { CoValueCore, type StorageAPI } from "../exports.js";
|
|
2
|
+
import { CoValueKnownState, NewContentMessage } from "../sync.js";
|
|
3
|
+
import { StorageKnownState } from "./knownState.js";
|
|
4
|
+
import type { DBClientInterfaceSync, StoredCoValueRow } from "./types.js";
|
|
5
|
+
export declare class StorageApiSync implements StorageAPI {
|
|
6
|
+
private streamingCounter;
|
|
7
|
+
private readonly dbClient;
|
|
8
|
+
private loadedCoValues;
|
|
9
|
+
constructor(dbClient: DBClientInterfaceSync);
|
|
10
|
+
knwonStates: StorageKnownState;
|
|
11
|
+
getKnownState(id: string): CoValueKnownState;
|
|
12
|
+
load(id: string, callback: (data: NewContentMessage) => void, done: (found: boolean) => void): Promise<void>;
|
|
13
|
+
loadCoValue(id: string, callback: (data: NewContentMessage) => void, done?: (found: boolean) => void): Promise<void>;
|
|
14
|
+
pushContentWithDependencies(coValueRow: StoredCoValueRow, contentMessage: NewContentMessage, pushCallback: (data: NewContentMessage) => void): Promise<void>;
|
|
15
|
+
store(msgs: NewContentMessage[], correctionCallback: (data: CoValueKnownState) => void): false | undefined;
|
|
16
|
+
private storeSingle;
|
|
17
|
+
private putNewTxs;
|
|
18
|
+
waitForSync(id: string, coValue: CoValueCore): Promise<void>;
|
|
19
|
+
close(): void;
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=storageSync.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storageSync.d.ts","sourceRoot":"","sources":["../../src/storage/storageSync.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EAIX,KAAK,UAAU,EAChB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EAElB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,KAAK,EACV,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;IAiH3B,2BAA2B,CAC/B,UAAU,EAAE,gBAAgB,EAC5B,cAAc,EAAE,iBAAiB,EACjC,YAAY,EAAE,CAAC,IAAI,EAAE,iBAAiB,KAAK,IAAI;IAkBjD,KAAK,CACH,IAAI,EAAE,iBAAiB,EAAE,EACzB,kBAAkB,EAAE,CAAC,IAAI,EAAE,iBAAiB,KAAK,IAAI;IAWvD,OAAO,CAAC,WAAW;IA+DnB,OAAO,CAAC,SAAS;IAsEjB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;IAI5C,KAAK;CACN"}
|
|
@@ -0,0 +1,206 @@
|
|
|
1
|
+
import { metrics } from "@opentelemetry/api";
|
|
2
|
+
import { MAX_RECOMMENDED_TX_SIZE, } from "../exports.js";
|
|
3
|
+
import { getPriorityFromHeader } from "../priority.js";
|
|
4
|
+
import { emptyKnownState, } from "../sync.js";
|
|
5
|
+
import { StorageKnownState } from "./knownState.js";
|
|
6
|
+
import { collectNewTxs, getDependedOnCoValues } from "./syncUtils.js";
|
|
7
|
+
export class StorageApiSync {
|
|
8
|
+
constructor(dbClient) {
|
|
9
|
+
this.loadedCoValues = new Set();
|
|
10
|
+
this.knwonStates = new StorageKnownState();
|
|
11
|
+
this.dbClient = dbClient;
|
|
12
|
+
this.streamingCounter = metrics
|
|
13
|
+
.getMeter("cojson")
|
|
14
|
+
.createUpDownCounter(`jazz.storage.streaming`, {
|
|
15
|
+
description: "Number of streaming coValues",
|
|
16
|
+
unit: "1",
|
|
17
|
+
});
|
|
18
|
+
this.streamingCounter.add(0);
|
|
19
|
+
}
|
|
20
|
+
getKnownState(id) {
|
|
21
|
+
return this.knwonStates.getKnownState(id);
|
|
22
|
+
}
|
|
23
|
+
async load(id, callback, done) {
|
|
24
|
+
await this.loadCoValue(id, callback, done);
|
|
25
|
+
}
|
|
26
|
+
async loadCoValue(id, callback, done) {
|
|
27
|
+
const coValueRow = this.dbClient.getCoValue(id);
|
|
28
|
+
if (!coValueRow) {
|
|
29
|
+
done?.(false);
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
const allCoValueSessions = this.dbClient.getCoValueSessions(coValueRow.rowID);
|
|
33
|
+
const signaturesBySession = new Map();
|
|
34
|
+
let contentStreaming = false;
|
|
35
|
+
for (const sessionRow of allCoValueSessions) {
|
|
36
|
+
const signatures = this.dbClient.getSignatures(sessionRow.rowID, 0);
|
|
37
|
+
if (signatures.length > 0) {
|
|
38
|
+
contentStreaming = true;
|
|
39
|
+
signaturesBySession.set(sessionRow.sessionID, signatures);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
const knownState = this.knwonStates.getKnownState(coValueRow.id);
|
|
43
|
+
for (const sessionRow of allCoValueSessions) {
|
|
44
|
+
knownState.sessions[sessionRow.sessionID] = sessionRow.lastIdx;
|
|
45
|
+
}
|
|
46
|
+
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
|
+
};
|
|
54
|
+
if (contentStreaming) {
|
|
55
|
+
this.streamingCounter.add(1);
|
|
56
|
+
contentMessage.expectContentUntil = knownState["sessions"];
|
|
57
|
+
}
|
|
58
|
+
for (const sessionRow of allCoValueSessions) {
|
|
59
|
+
const signatures = signaturesBySession.get(sessionRow.sessionID) || [];
|
|
60
|
+
let idx = 0;
|
|
61
|
+
signatures.push({
|
|
62
|
+
idx: sessionRow.lastIdx,
|
|
63
|
+
signature: sessionRow.lastSignature,
|
|
64
|
+
});
|
|
65
|
+
for (const signature of signatures) {
|
|
66
|
+
const newTxsInSession = this.dbClient.getNewTransactionInSession(sessionRow.rowID, idx, signature.idx);
|
|
67
|
+
collectNewTxs({
|
|
68
|
+
newTxsInSession,
|
|
69
|
+
contentMessage,
|
|
70
|
+
sessionRow,
|
|
71
|
+
firstNewTxIdx: idx,
|
|
72
|
+
signature: signature.signature,
|
|
73
|
+
});
|
|
74
|
+
idx = signature.idx + 1;
|
|
75
|
+
if (signatures.length > 1) {
|
|
76
|
+
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
|
+
};
|
|
84
|
+
// Introduce a delay to not block the main thread
|
|
85
|
+
// for the entire content processing
|
|
86
|
+
await new Promise((resolve) => setTimeout(resolve));
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
const hasNewContent = Object.keys(contentMessage.new).length > 0;
|
|
91
|
+
// If there is no new content but steaming is not active, it's the case for a coValue with the header but no transactions
|
|
92
|
+
// For streaming the push has already been done in the loop above
|
|
93
|
+
if (hasNewContent || !contentStreaming) {
|
|
94
|
+
this.pushContentWithDependencies(coValueRow, contentMessage, callback);
|
|
95
|
+
}
|
|
96
|
+
if (contentStreaming) {
|
|
97
|
+
this.streamingCounter.add(-1);
|
|
98
|
+
}
|
|
99
|
+
this.knwonStates.handleUpdate(coValueRow.id, knownState);
|
|
100
|
+
done?.(true);
|
|
101
|
+
}
|
|
102
|
+
async pushContentWithDependencies(coValueRow, contentMessage, pushCallback) {
|
|
103
|
+
const dependedOnCoValuesList = getDependedOnCoValues(coValueRow.header, contentMessage);
|
|
104
|
+
for (const dependedOnCoValue of dependedOnCoValuesList) {
|
|
105
|
+
if (this.loadedCoValues.has(dependedOnCoValue)) {
|
|
106
|
+
continue;
|
|
107
|
+
}
|
|
108
|
+
this.loadCoValue(dependedOnCoValue, pushCallback);
|
|
109
|
+
}
|
|
110
|
+
pushCallback(contentMessage);
|
|
111
|
+
}
|
|
112
|
+
store(msgs, correctionCallback) {
|
|
113
|
+
for (const msg of msgs) {
|
|
114
|
+
const success = this.storeSingle(msg, correctionCallback);
|
|
115
|
+
if (!success) {
|
|
116
|
+
return false;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
storeSingle(msg, correctionCallback) {
|
|
121
|
+
const id = msg.id;
|
|
122
|
+
const coValueRow = this.dbClient.getCoValue(id);
|
|
123
|
+
// We have no info about coValue header
|
|
124
|
+
const invalidAssumptionOnHeaderPresence = !msg.header && !coValueRow;
|
|
125
|
+
if (invalidAssumptionOnHeaderPresence) {
|
|
126
|
+
const knownState = emptyKnownState(id);
|
|
127
|
+
correctionCallback(knownState);
|
|
128
|
+
this.knwonStates.setKnownState(id, knownState);
|
|
129
|
+
return false;
|
|
130
|
+
}
|
|
131
|
+
const storedCoValueRowID = coValueRow
|
|
132
|
+
? coValueRow.rowID
|
|
133
|
+
: this.dbClient.addCoValue(msg);
|
|
134
|
+
const knownState = this.knwonStates.getKnownState(id);
|
|
135
|
+
knownState.header = true;
|
|
136
|
+
let invalidAssumptions = false;
|
|
137
|
+
for (const sessionID of Object.keys(msg.new)) {
|
|
138
|
+
this.dbClient.transaction(() => {
|
|
139
|
+
const sessionRow = this.dbClient.getSingleCoValueSession(storedCoValueRowID, sessionID);
|
|
140
|
+
if (sessionRow) {
|
|
141
|
+
knownState.sessions[sessionRow.sessionID] = sessionRow.lastIdx;
|
|
142
|
+
}
|
|
143
|
+
if ((sessionRow?.lastIdx || 0) < (msg.new[sessionID]?.after || 0)) {
|
|
144
|
+
invalidAssumptions = true;
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
const newLastIdx = this.putNewTxs(msg, sessionID, sessionRow, storedCoValueRowID);
|
|
148
|
+
knownState.sessions[sessionID] = newLastIdx;
|
|
149
|
+
}
|
|
150
|
+
});
|
|
151
|
+
}
|
|
152
|
+
this.knwonStates.handleUpdate(id, knownState);
|
|
153
|
+
if (invalidAssumptions) {
|
|
154
|
+
correctionCallback(knownState);
|
|
155
|
+
return false;
|
|
156
|
+
}
|
|
157
|
+
return true;
|
|
158
|
+
}
|
|
159
|
+
putNewTxs(msg, sessionID, sessionRow, storedCoValueRowID) {
|
|
160
|
+
const newTransactions = msg.new[sessionID]?.newTransactions || [];
|
|
161
|
+
const actuallyNewOffset = (sessionRow?.lastIdx || 0) - (msg.new[sessionID]?.after || 0);
|
|
162
|
+
const actuallyNewTransactions = newTransactions.slice(actuallyNewOffset);
|
|
163
|
+
if (actuallyNewTransactions.length === 0) {
|
|
164
|
+
return sessionRow?.lastIdx || 0;
|
|
165
|
+
}
|
|
166
|
+
let newBytesSinceLastSignature = (sessionRow?.bytesSinceLastSignature || 0) +
|
|
167
|
+
actuallyNewTransactions.reduce((sum, tx) => sum +
|
|
168
|
+
(tx.privacy === "private"
|
|
169
|
+
? tx.encryptedChanges.length
|
|
170
|
+
: tx.changes.length), 0);
|
|
171
|
+
const newLastIdx = (sessionRow?.lastIdx || 0) + actuallyNewTransactions.length;
|
|
172
|
+
let shouldWriteSignature = false;
|
|
173
|
+
if (newBytesSinceLastSignature > MAX_RECOMMENDED_TX_SIZE) {
|
|
174
|
+
shouldWriteSignature = true;
|
|
175
|
+
newBytesSinceLastSignature = 0;
|
|
176
|
+
}
|
|
177
|
+
const nextIdx = sessionRow?.lastIdx || 0;
|
|
178
|
+
if (!msg.new[sessionID])
|
|
179
|
+
throw new Error("Session ID not found");
|
|
180
|
+
const sessionUpdate = {
|
|
181
|
+
coValue: storedCoValueRowID,
|
|
182
|
+
sessionID,
|
|
183
|
+
lastIdx: newLastIdx,
|
|
184
|
+
lastSignature: msg.new[sessionID].lastSignature,
|
|
185
|
+
bytesSinceLastSignature: newBytesSinceLastSignature,
|
|
186
|
+
};
|
|
187
|
+
const sessionRowID = this.dbClient.addSessionUpdate({
|
|
188
|
+
sessionUpdate,
|
|
189
|
+
sessionRow,
|
|
190
|
+
});
|
|
191
|
+
if (shouldWriteSignature) {
|
|
192
|
+
this.dbClient.addSignatureAfter({
|
|
193
|
+
sessionRowID,
|
|
194
|
+
idx: newLastIdx - 1,
|
|
195
|
+
signature: msg.new[sessionID].lastSignature,
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
actuallyNewTransactions.map((newTransaction, i) => this.dbClient.addTransaction(sessionRowID, nextIdx + i, newTransaction));
|
|
199
|
+
return newLastIdx;
|
|
200
|
+
}
|
|
201
|
+
waitForSync(id, coValue) {
|
|
202
|
+
return this.knwonStates.waitForSync(id, coValue);
|
|
203
|
+
}
|
|
204
|
+
close() { }
|
|
205
|
+
}
|
|
206
|
+
//# sourceMappingURL=storageSync.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storageSync.js","sourceRoot":"","sources":["../../src/storage/storageSync.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { CoValueHeader } from "../coValueCore/verifiedState.js";
|
|
2
|
+
import type { Signature } from "../crypto/crypto.js";
|
|
3
|
+
import type { NewContentMessage } from "../sync.js";
|
|
4
|
+
import type { StoredSessionRow, TransactionRow } from "./types.js";
|
|
5
|
+
export declare function collectNewTxs({ newTxsInSession, contentMessage, sessionRow, firstNewTxIdx, signature, }: {
|
|
6
|
+
newTxsInSession: TransactionRow[];
|
|
7
|
+
contentMessage: NewContentMessage;
|
|
8
|
+
sessionRow: StoredSessionRow;
|
|
9
|
+
signature: Signature;
|
|
10
|
+
firstNewTxIdx: number;
|
|
11
|
+
}): void;
|
|
12
|
+
export declare function getDependedOnCoValues(header: CoValueHeader, contentMessage: NewContentMessage): Set<`co_z${string}`>;
|
|
13
|
+
//# sourceMappingURL=syncUtils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"syncUtils.d.ts","sourceRoot":"","sources":["../../src/storage/syncUtils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { getDependedOnCoValuesFromRawData } from "../coValueCore/utils.js";
|
|
2
|
+
export function collectNewTxs({ newTxsInSession, contentMessage, sessionRow, firstNewTxIdx, signature, }) {
|
|
3
|
+
let sessionEntry = contentMessage.new[sessionRow.sessionID];
|
|
4
|
+
if (!sessionEntry) {
|
|
5
|
+
sessionEntry = {
|
|
6
|
+
after: firstNewTxIdx,
|
|
7
|
+
lastSignature: signature,
|
|
8
|
+
newTransactions: [],
|
|
9
|
+
};
|
|
10
|
+
contentMessage.new[sessionRow.sessionID] = sessionEntry;
|
|
11
|
+
}
|
|
12
|
+
else {
|
|
13
|
+
sessionEntry.lastSignature = signature;
|
|
14
|
+
}
|
|
15
|
+
for (const tx of newTxsInSession) {
|
|
16
|
+
sessionEntry.newTransactions.push(tx.tx);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
export function getDependedOnCoValues(header, contentMessage) {
|
|
20
|
+
const id = contentMessage.id;
|
|
21
|
+
const sessionIDs = Object.keys(contentMessage.new);
|
|
22
|
+
const transactions = Object.values(contentMessage.new).map((entry) => entry.newTransactions);
|
|
23
|
+
return getDependedOnCoValuesFromRawData(id, header, sessionIDs, transactions);
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=syncUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"syncUtils.js","sourceRoot":"","sources":["../../src/storage/syncUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gCAAgC,EAAE,MAAM,yBAAyB,CAAC;AAO3E,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"}
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import type { CoValueHeader, Transaction } from "../coValueCore/verifiedState.js";
|
|
2
|
+
import { Signature } from "../crypto/crypto.js";
|
|
3
|
+
import type { CoValueCore, RawCoID, SessionID } from "../exports.js";
|
|
4
|
+
import { CoValueKnownState, NewContentMessage } from "../sync.js";
|
|
5
|
+
/**
|
|
6
|
+
* The StorageAPI is the interface that the StorageSync and StorageAsync classes implement.
|
|
7
|
+
*
|
|
8
|
+
* It uses callbacks instead of promises to have no overhead when using the StorageSync and less overhead when using the StorageAsync.
|
|
9
|
+
*/
|
|
10
|
+
export interface StorageAPI {
|
|
11
|
+
load(id: string, callback: (data: NewContentMessage) => void, done?: (found: boolean) => void): void;
|
|
12
|
+
store(data: NewContentMessage[] | undefined, handleCorrection: (correction: CoValueKnownState) => void): void;
|
|
13
|
+
getKnownState(id: string): CoValueKnownState;
|
|
14
|
+
waitForSync(id: string, coValue: CoValueCore): Promise<void>;
|
|
15
|
+
close(): void;
|
|
16
|
+
}
|
|
17
|
+
export type CoValueRow = {
|
|
18
|
+
id: RawCoID;
|
|
19
|
+
header: CoValueHeader;
|
|
20
|
+
};
|
|
21
|
+
export type StoredCoValueRow = CoValueRow & {
|
|
22
|
+
rowID: number;
|
|
23
|
+
};
|
|
24
|
+
export type SessionRow = {
|
|
25
|
+
coValue: number;
|
|
26
|
+
sessionID: SessionID;
|
|
27
|
+
lastIdx: number;
|
|
28
|
+
lastSignature: Signature;
|
|
29
|
+
bytesSinceLastSignature?: number;
|
|
30
|
+
};
|
|
31
|
+
export type StoredSessionRow = SessionRow & {
|
|
32
|
+
rowID: number;
|
|
33
|
+
};
|
|
34
|
+
export type TransactionRow = {
|
|
35
|
+
ses: number;
|
|
36
|
+
idx: number;
|
|
37
|
+
tx: Transaction;
|
|
38
|
+
};
|
|
39
|
+
export type SignatureAfterRow = {
|
|
40
|
+
ses: number;
|
|
41
|
+
idx: number;
|
|
42
|
+
signature: Signature;
|
|
43
|
+
};
|
|
44
|
+
export interface DBClientInterfaceAsync {
|
|
45
|
+
getCoValue(coValueId: string): Promise<StoredCoValueRow | undefined> | undefined;
|
|
46
|
+
getCoValueSessions(coValueRowId: number): Promise<StoredSessionRow[]>;
|
|
47
|
+
getSingleCoValueSession(coValueRowId: number, sessionID: SessionID): Promise<StoredSessionRow | undefined>;
|
|
48
|
+
getNewTransactionInSession(sessionRowId: number, fromIdx: number, toIdx: number): Promise<TransactionRow[]>;
|
|
49
|
+
getSignatures(sessionRowId: number, firstNewTxIdx: number): Promise<SignatureAfterRow[]>;
|
|
50
|
+
addCoValue(msg: NewContentMessage): Promise<number>;
|
|
51
|
+
addSessionUpdate({ sessionUpdate, sessionRow, }: {
|
|
52
|
+
sessionUpdate: SessionRow;
|
|
53
|
+
sessionRow?: StoredSessionRow;
|
|
54
|
+
}): Promise<number>;
|
|
55
|
+
addTransaction(sessionRowID: number, idx: number, newTransaction: Transaction): Promise<number> | undefined | unknown;
|
|
56
|
+
addSignatureAfter({ sessionRowID, idx, signature, }: {
|
|
57
|
+
sessionRowID: number;
|
|
58
|
+
idx: number;
|
|
59
|
+
signature: Signature;
|
|
60
|
+
}): Promise<unknown>;
|
|
61
|
+
transaction(callback: () => unknown): Promise<unknown>;
|
|
62
|
+
}
|
|
63
|
+
export interface DBClientInterfaceSync {
|
|
64
|
+
getCoValue(coValueId: string): StoredCoValueRow | undefined;
|
|
65
|
+
getCoValueSessions(coValueRowId: number): StoredSessionRow[];
|
|
66
|
+
getSingleCoValueSession(coValueRowId: number, sessionID: SessionID): StoredSessionRow | undefined;
|
|
67
|
+
getNewTransactionInSession(sessionRowId: number, fromIdx: number, toIdx: number): TransactionRow[];
|
|
68
|
+
getSignatures(sessionRowId: number, firstNewTxIdx: number): Pick<SignatureAfterRow, "idx" | "signature">[];
|
|
69
|
+
addCoValue(msg: NewContentMessage): number;
|
|
70
|
+
addSessionUpdate({ sessionUpdate, sessionRow, }: {
|
|
71
|
+
sessionUpdate: SessionRow;
|
|
72
|
+
sessionRow?: StoredSessionRow;
|
|
73
|
+
}): number;
|
|
74
|
+
addTransaction(sessionRowID: number, idx: number, newTransaction: Transaction): number | undefined | unknown;
|
|
75
|
+
addSignatureAfter({ sessionRowID, idx, signature, }: {
|
|
76
|
+
sessionRowID: number;
|
|
77
|
+
idx: number;
|
|
78
|
+
signature: Signature;
|
|
79
|
+
}): number | undefined | unknown;
|
|
80
|
+
transaction(callback: () => unknown): unknown;
|
|
81
|
+
}
|
|
82
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/storage/types.ts"],"names":[],"mappings":"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"}
|