cojson 0.18.33 → 0.18.35
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 +17 -0
- package/dist/SyncStateManager.d.ts.map +1 -1
- package/dist/SyncStateManager.js +2 -2
- package/dist/SyncStateManager.js.map +1 -1
- package/dist/coValueContentMessage.d.ts +5 -2
- package/dist/coValueContentMessage.d.ts.map +1 -1
- package/dist/coValueContentMessage.js +15 -0
- package/dist/coValueContentMessage.js.map +1 -1
- package/dist/coValueCore/SessionMap.d.ts +4 -3
- package/dist/coValueCore/SessionMap.d.ts.map +1 -1
- package/dist/coValueCore/SessionMap.js +21 -30
- package/dist/coValueCore/SessionMap.js.map +1 -1
- package/dist/coValueCore/coValueCore.d.ts +14 -6
- package/dist/coValueCore/coValueCore.d.ts.map +1 -1
- package/dist/coValueCore/coValueCore.js +32 -52
- package/dist/coValueCore/coValueCore.js.map +1 -1
- package/dist/coValueCore/verifiedState.d.ts +6 -4
- package/dist/coValueCore/verifiedState.d.ts.map +1 -1
- package/dist/coValueCore/verifiedState.js +21 -7
- package/dist/coValueCore/verifiedState.js.map +1 -1
- package/dist/coValues/group.d.ts.map +1 -1
- package/dist/coValues/group.js +20 -15
- package/dist/coValues/group.js.map +1 -1
- package/dist/knownState.d.ts +9 -1
- package/dist/knownState.d.ts.map +1 -1
- package/dist/knownState.js +29 -3
- package/dist/knownState.js.map +1 -1
- package/dist/localNode.d.ts +7 -2
- package/dist/localNode.d.ts.map +1 -1
- package/dist/localNode.js +10 -15
- package/dist/localNode.js.map +1 -1
- package/dist/queue/LocalTransactionsSyncQueue.d.ts +10 -9
- package/dist/queue/LocalTransactionsSyncQueue.d.ts.map +1 -1
- package/dist/queue/LocalTransactionsSyncQueue.js +53 -47
- package/dist/queue/LocalTransactionsSyncQueue.js.map +1 -1
- package/dist/storage/knownState.js +2 -2
- package/dist/storage/knownState.js.map +1 -1
- package/dist/sync.d.ts +1 -2
- package/dist/sync.d.ts.map +1 -1
- package/dist/sync.js +15 -19
- package/dist/sync.js.map +1 -1
- package/dist/tests/coPlainText.test.js +13 -14
- package/dist/tests/coPlainText.test.js.map +1 -1
- package/dist/tests/coValueContentMessage.test.js +130 -1
- package/dist/tests/coValueContentMessage.test.js.map +1 -1
- package/dist/tests/coValueCore.isCompletelyDownloaded.test.js +3 -2
- package/dist/tests/coValueCore.isCompletelyDownloaded.test.js.map +1 -1
- package/dist/tests/coValueCore.isStreaming.test.js +54 -3
- package/dist/tests/coValueCore.isStreaming.test.js.map +1 -1
- package/dist/tests/coValueCore.test.js +3 -6
- package/dist/tests/coValueCore.test.js.map +1 -1
- package/dist/tests/group.childKeyRotation.test.js +9 -9
- package/dist/tests/group.childKeyRotation.test.js.map +1 -1
- package/dist/tests/knownState.test.js +82 -10
- package/dist/tests/knownState.test.js.map +1 -1
- package/dist/tests/sync.load.test.js +29 -29
- package/dist/tests/sync.mesh.test.js +38 -31
- package/dist/tests/sync.mesh.test.js.map +1 -1
- package/dist/tests/sync.storage.test.js +24 -23
- package/dist/tests/sync.storage.test.js.map +1 -1
- package/dist/tests/sync.storageAsync.test.js +24 -23
- package/dist/tests/sync.storageAsync.test.js.map +1 -1
- package/dist/tests/sync.upload.test.js +58 -58
- package/dist/tests/testUtils.d.ts +11 -9
- package/dist/tests/testUtils.d.ts.map +1 -1
- package/dist/tests/testUtils.js +26 -16
- package/dist/tests/testUtils.js.map +1 -1
- package/package.json +3 -4
- package/src/SyncStateManager.ts +8 -2
- package/src/coValueContentMessage.ts +29 -2
- package/src/coValueCore/SessionMap.ts +41 -31
- package/src/coValueCore/coValueCore.ts +41 -74
- package/src/coValueCore/verifiedState.ts +36 -11
- package/src/coValues/group.ts +40 -27
- package/src/knownState.ts +39 -4
- package/src/localNode.ts +16 -21
- package/src/queue/LocalTransactionsSyncQueue.ts +77 -93
- package/src/storage/knownState.ts +2 -2
- package/src/sync.ts +24 -26
- package/src/tests/coPlainText.test.ts +13 -14
- package/src/tests/coValueContentMessage.test.ts +197 -2
- package/src/tests/coValueCore.isCompletelyDownloaded.test.ts +3 -2
- package/src/tests/coValueCore.isStreaming.test.ts +84 -2
- package/src/tests/coValueCore.test.ts +7 -10
- package/src/tests/group.childKeyRotation.test.ts +9 -9
- package/src/tests/knownState.test.ts +106 -9
- package/src/tests/sync.load.test.ts +29 -29
- package/src/tests/sync.mesh.test.ts +38 -31
- package/src/tests/sync.storage.test.ts +24 -23
- package/src/tests/sync.storageAsync.test.ts +24 -23
- package/src/tests/sync.upload.test.ts +58 -58
- package/src/tests/testUtils.ts +30 -18
package/.turbo/turbo-build.log
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# cojson
|
|
2
2
|
|
|
3
|
+
## 0.18.35
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- d47ac6d: Remove neverthrow to easily propagate the original stacktrace of the transaction errors
|
|
8
|
+
- cojson-core-wasm@0.18.35
|
|
9
|
+
- cojson-core-napi@0.18.35
|
|
10
|
+
|
|
11
|
+
## 0.18.34
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- 4a79953: Fixed streaming status checks when handling streaming updates
|
|
16
|
+
- d7e5cc8: Aligned the chunking algorithm of the local transactions sync with the one used for the general sync
|
|
17
|
+
- cojson-core-wasm@0.18.34
|
|
18
|
+
- cojson-core-napi@0.18.34
|
|
19
|
+
|
|
3
20
|
## 0.18.33
|
|
4
21
|
|
|
5
22
|
### Patch Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SyncStateManager.d.ts","sourceRoot":"","sources":["../src/SyncStateManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,
|
|
1
|
+
{"version":3,"file":"SyncStateManager.d.ts","sourceRoot":"","sources":["../src/SyncStateManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EACL,iBAAiB,EAElB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAEhD,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,CAC5C,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,iBAAiB,EAC7B,IAAI,EAAE,SAAS,KACZ,IAAI,CAAC;AAEV,MAAM,MAAM,6BAA6B,GAAG,CAC1C,UAAU,EAAE,iBAAiB,EAC7B,IAAI,EAAE,SAAS,KACZ,IAAI,CAAC;AAEV,qBAAa,gBAAgB;IACf,OAAO,CAAC,WAAW;gBAAX,WAAW,EAAE,WAAW;IAE5C,OAAO,CAAC,SAAS,CAA8C;IAC/D,OAAO,CAAC,gBAAgB,CAGpB;IAEJ,kBAAkB,CAAC,QAAQ,EAAE,+BAA+B;IAQ5D,sBAAsB,CACpB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,6BAA6B;IAezC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,iBAAiB;IAuBxE,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO;IAQrC,OAAO,CAAC,iCAAiC;CAmB1C"}
|
package/dist/SyncStateManager.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { areCurrentSessionsInSyncWith, } from "./knownState.js";
|
|
2
2
|
export class SyncStateManager {
|
|
3
3
|
constructor(syncManager) {
|
|
4
4
|
this.syncManager = syncManager;
|
|
@@ -53,7 +53,7 @@ export class SyncStateManager {
|
|
|
53
53
|
// Accessing verified knownState to skip the immutability
|
|
54
54
|
// applied on CoValueCore
|
|
55
55
|
const knownState = entry.verified.knownState();
|
|
56
|
-
return
|
|
56
|
+
return areCurrentSessionsInSyncWith(knownState.sessions, peerKnownState.sessions);
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
59
|
//# sourceMappingURL=SyncStateManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SyncStateManager.js","sourceRoot":"","sources":["../src/SyncStateManager.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"SyncStateManager.js","sourceRoot":"","sources":["../src/SyncStateManager.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,4BAA4B,GAC7B,MAAM,iBAAiB,CAAC;AAmBzB,MAAM,OAAO,gBAAgB;IAC3B,YAAoB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;QAEpC,cAAS,GAAG,IAAI,GAAG,EAAmC,CAAC;QACvD,qBAAgB,GAAG,IAAI,GAAG,EAG/B,CAAC;IAN2C,CAAC;IAQhD,kBAAkB,CAAC,QAAyC;QAC1D,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE7B,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC,CAAC;IACJ,CAAC;IAED,sBAAsB,CACpB,MAAc,EACd,QAAuC;QAEvC,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;QAEjE,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAC/C,CAAC;QAED,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAExB,OAAO,GAAG,EAAE;YACV,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC7B,CAAC,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,MAAc,EAAE,EAAW,EAAE,UAA6B;QACtE,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAExD,mDAAmD;QACnD,IAAI,CAAC,aAAa,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YACjD,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG;YAChB,QAAQ,EAAE,IAAI,CAAC,iCAAiC,CAAC,UAAU,EAAE,EAAE,CAAC;SACjE,CAAC;QAEF,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACtC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QAC1C,CAAC;QAED,IAAI,CAAC,aAAa;YAAE,OAAO;QAE3B,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE,CAAC;YACrC,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,QAAQ,CAAC,IAAe,EAAE,EAAW;QACnC,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAE9C,IAAI,CAAC,cAAc;YAAE,OAAO,KAAK,CAAC;QAElC,OAAO,IAAI,CAAC,iCAAiC,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IACpE,CAAC;IAEO,iCAAiC,CACvC,cAAiC,EACjC,EAAW;QAEX,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAEpD,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,EAAE,CAAC;YAChC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,yDAAyD;QACzD,yBAAyB;QACzB,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QAE/C,OAAO,4BAA4B,CACjC,UAAU,CAAC,QAAQ,EACnB,cAAc,CAAC,QAAQ,CACxB,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -2,13 +2,16 @@ import { CoValueHeader, Transaction } from "./coValueCore/verifiedState.js";
|
|
|
2
2
|
import { Signature } from "./crypto/crypto.js";
|
|
3
3
|
import { RawCoID, SessionID } from "./ids.js";
|
|
4
4
|
import { JsonValue } from "./jsonValue.js";
|
|
5
|
-
import {
|
|
5
|
+
import { CoValueKnownState } from "./knownState.js";
|
|
6
|
+
import { NewContentMessage, SessionNewContent } from "./sync.js";
|
|
6
7
|
export declare function createContentMessage(id: RawCoID, header: CoValueHeader, includeHeader?: boolean): NewContentMessage;
|
|
7
8
|
export declare function addTransactionToContentMessage(content: NewContentMessage, transaction: Transaction, sessionID: SessionID, signature: Signature, txIdx: number): void;
|
|
8
9
|
export declare function getTransactionSize(transaction: Transaction): number;
|
|
9
10
|
export declare function exceedsRecommendedSize(baseSize: number, transactionSize?: number): boolean;
|
|
10
11
|
export declare function validateTxSizeLimitInBytes(changes: JsonValue[]): void;
|
|
11
|
-
export declare function knownStateFromContent(content: NewContentMessage):
|
|
12
|
+
export declare function knownStateFromContent(content: NewContentMessage): CoValueKnownState;
|
|
12
13
|
export declare function getContentMessageSize(msg: NewContentMessage): number;
|
|
13
14
|
export declare function getContenDebugInfo(msg: NewContentMessage): string[];
|
|
15
|
+
export declare function getNewTransactionsFromContentMessage(content: SessionNewContent, knownState: CoValueKnownState, sessionID: SessionID): Transaction[] | undefined;
|
|
16
|
+
export declare function getSessionEntriesFromContentMessage(content: NewContentMessage): [SessionID, SessionNewContent][];
|
|
14
17
|
//# sourceMappingURL=coValueContentMessage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coValueContentMessage.d.ts","sourceRoot":"","sources":["../src/coValueContentMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE5E,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"coValueContentMessage.d.ts","sourceRoot":"","sources":["../src/coValueContentMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE5E,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAmB,MAAM,iBAAiB,CAAC;AAErE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAEjE,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,OAAO,EACX,MAAM,EAAE,aAAa,EACrB,aAAa,UAAO,GACnB,iBAAiB,CAQnB;AAED,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,iBAAiB,EAC1B,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,MAAM,QAcd;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,WAAW,UAI1D;AAED,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,eAAe,CAAC,EAAE,MAAM,WASzB;AAID,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI,CAUrE;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,iBAAiB,qBAU/D;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,iBAAiB,UAS3D;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,iBAAiB,YAKxD;AAED,wBAAgB,oCAAoC,CAClD,OAAO,EAAE,iBAAiB,EAC1B,UAAU,EAAE,iBAAiB,EAC7B,SAAS,EAAE,SAAS,6BAgBrB;AAED,wBAAgB,mCAAmC,CACjD,OAAO,EAAE,iBAAiB,GAEY,CAAC,SAAS,EAAE,iBAAiB,CAAC,EAAE,CACvE"}
|
|
@@ -63,4 +63,19 @@ export function getContentMessageSize(msg) {
|
|
|
63
63
|
export function getContenDebugInfo(msg) {
|
|
64
64
|
return Object.entries(msg.new).map(([sessionID, sessionNewContent]) => `Session: ${sessionID} After: ${sessionNewContent.after} New: ${sessionNewContent.newTransactions.length}`);
|
|
65
65
|
}
|
|
66
|
+
export function getNewTransactionsFromContentMessage(content, knownState, sessionID) {
|
|
67
|
+
const ourKnownTxIdx = knownState.sessions[sessionID] ?? 0;
|
|
68
|
+
const theirFirstNewTxIdx = content.after;
|
|
69
|
+
if (ourKnownTxIdx < theirFirstNewTxIdx) {
|
|
70
|
+
// Flagging invalid state assumption by returning undefined
|
|
71
|
+
// not throwing an error or return an error object for performance reasons
|
|
72
|
+
return undefined;
|
|
73
|
+
}
|
|
74
|
+
const alreadyKnownOffset = ourKnownTxIdx - theirFirstNewTxIdx;
|
|
75
|
+
const newTransactions = content.newTransactions.slice(alreadyKnownOffset);
|
|
76
|
+
return newTransactions;
|
|
77
|
+
}
|
|
78
|
+
export function getSessionEntriesFromContentMessage(content) {
|
|
79
|
+
return Object.entries(content.new);
|
|
80
|
+
}
|
|
66
81
|
//# sourceMappingURL=coValueContentMessage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coValueContentMessage.js","sourceRoot":"","sources":["../src/coValueContentMessage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAIjD,OAAO,
|
|
1
|
+
{"version":3,"file":"coValueContentMessage.js","sourceRoot":"","sources":["../src/coValueContentMessage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAIjD,OAAO,EAAqB,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAGtD,MAAM,UAAU,oBAAoB,CAClC,EAAW,EACX,MAAqB,EACrB,aAAa,GAAG,IAAI;IAEpB,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,EAAE;QACF,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;QAC1C,QAAQ,EAAE,qBAAqB,CAAC,MAAM,CAAC;QACvC,GAAG,EAAE,EAAE;KACR,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC5C,OAA0B,EAC1B,WAAwB,EACxB,SAAoB,EACpB,SAAoB,EACpB,KAAa;IAEb,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAE9C,IAAI,cAAc,EAAE,CAAC;QACnB,cAAc,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACjD,cAAc,CAAC,aAAa,GAAG,SAAS,CAAC;IAC3C,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG;YACvB,KAAK,EAAE,KAAK;YACZ,eAAe,EAAE,CAAC,WAAW,CAAC;YAC9B,aAAa,EAAE,SAAS;SACzB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,WAAwB;IACzD,OAAO,WAAW,CAAC,OAAO,KAAK,SAAS;QACtC,CAAC,CAAC,WAAW,CAAC,gBAAgB,CAAC,MAAM;QACrC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,QAAgB,EAChB,eAAwB;IAExB,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAClC,OAAO,QAAQ,GAAG,kBAAkB,CAAC,uBAAuB,CAAC;IAC/D,CAAC;IAED,OAAO,CACL,QAAQ,GAAG,eAAe,GAAG,kBAAkB,CAAC,uBAAuB,CACxE,CAAC;AACJ,CAAC;AAED,MAAM,iBAAiB,GAAG,IAAI,WAAW,EAAE,CAAC;AAE5C,MAAM,UAAU,0BAA0B,CAAC,OAAoB;IAC7D,MAAM,cAAc,GAAG,iBAAiB,CAAC,MAAM,CAC7C,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CACxB,CAAC,MAAM,CAAC;IACT,IAAI,cAAc,GAAG,kBAAkB,CAAC,iBAAiB,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CACb,0CAA0C,cAAc,MAAM,kBAAkB,CAAC,iBAAiB,UAAU;YAC1G,yDAAyD,CAC5D,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,OAA0B;IAC9D,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC/C,UAAU,CAAC,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE5C,KAAK,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/D,UAAU,CAAC,QAAQ,CAAC,SAAsB,CAAC;YACzC,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;IACnD,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,GAAsB;IAC1D,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,iBAAiB,EAAE,EAAE;QAC9D,OAAO,CACL,GAAG;YACH,iBAAiB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE;gBACnD,OAAO,GAAG,GAAG,kBAAkB,CAAC,EAAE,CAAC,CAAC;YACtC,CAAC,EAAE,CAAC,CAAC,CACN,CAAC;IACJ,CAAC,EAAE,CAAC,CAAC,CAAC;AACR,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAsB;IACvD,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAChC,CAAC,CAAC,SAAS,EAAE,iBAAiB,CAAC,EAAE,EAAE,CACjC,YAAY,SAAS,WAAW,iBAAiB,CAAC,KAAK,SAAS,iBAAiB,CAAC,eAAe,CAAC,MAAM,EAAE,CAC7G,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oCAAoC,CAClD,OAA0B,EAC1B,UAA6B,EAC7B,SAAoB;IAEpB,MAAM,aAAa,GAAG,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IAEzC,IAAI,aAAa,GAAG,kBAAkB,EAAE,CAAC;QACvC,2DAA2D;QAC3D,0EAA0E;QAC1E,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,kBAAkB,GAAG,aAAa,GAAG,kBAAkB,CAAC;IAE9D,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAE1E,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,mCAAmC,CACjD,OAA0B;IAE1B,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAqC,CAAC;AACzE,CAAC"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
import { Result } from "neverthrow";
|
|
2
1
|
import { ControlledAccountOrAgent } from "../coValues/account.js";
|
|
3
2
|
import type { CryptoProvider, KeyID, KeySecret, SessionLogImpl, Signature, SignerID } from "../crypto/crypto.js";
|
|
4
3
|
import { RawCoID, SessionID } from "../ids.js";
|
|
5
4
|
import { JsonObject, JsonValue } from "../jsonValue.js";
|
|
6
|
-
import { TryAddTransactionsError } from "./coValueCore.js";
|
|
7
5
|
import { Transaction } from "./verifiedState.js";
|
|
8
6
|
import { CoValueKnownState, KnownStateSessions } from "../knownState.js";
|
|
9
7
|
export type SessionLog = {
|
|
@@ -23,13 +21,16 @@ export declare class SessionMap {
|
|
|
23
21
|
sessions: Map<SessionID, SessionLog>;
|
|
24
22
|
knownState: CoValueKnownState;
|
|
25
23
|
knownStateWithStreaming: CoValueKnownState | undefined;
|
|
24
|
+
immutableKnownState: CoValueKnownState;
|
|
25
|
+
immutableKnownStateWithStreaming: CoValueKnownState | undefined;
|
|
26
26
|
streamingKnownState?: KnownStateSessions;
|
|
27
27
|
constructor(id: RawCoID, crypto: CryptoProvider, streamingKnownState?: KnownStateSessions);
|
|
28
28
|
setStreamingKnownState(streamingKnownState: KnownStateSessions): void;
|
|
29
|
+
updateImmutableKnownState(): void;
|
|
29
30
|
get(sessionID: SessionID): SessionLog | undefined;
|
|
30
31
|
private getOrCreateSessionLog;
|
|
31
32
|
signerID: SignerID | undefined;
|
|
32
|
-
addTransaction(sessionID: SessionID, signerID: SignerID | undefined, newTransactions: Transaction[], newSignature: Signature, skipVerify?: boolean):
|
|
33
|
+
addTransaction(sessionID: SessionID, signerID: SignerID | undefined, newTransactions: Transaction[], newSignature: Signature, skipVerify?: boolean): void;
|
|
33
34
|
makeNewPrivateTransaction(sessionID: SessionID, signerAgent: ControlledAccountOrAgent, changes: JsonValue[], keyID: KeyID, keySecret: KeySecret, meta: JsonObject | undefined, madeAt: number): {
|
|
34
35
|
signature: Signature;
|
|
35
36
|
transaction: Transaction;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionMap.d.ts","sourceRoot":"","sources":["../../src/coValueCore/SessionMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"SessionMap.d.ts","sourceRoot":"","sources":["../../src/coValueCore/SessionMap.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { err, ok } from "neverthrow";
|
|
2
1
|
import { parseJSON } from "../jsonStringify.js";
|
|
3
2
|
import { exceedsRecommendedSize } from "../coValueContentMessage.js";
|
|
4
|
-
import { updateSessionCounter, cloneKnownState, combineKnownStateSessions, isKnownStateSubsetOf, } from "../knownState.js";
|
|
3
|
+
import { updateSessionCounter, cloneKnownState, combineKnownStateSessions, isKnownStateSubsetOf, getKnownStateToSend, } from "../knownState.js";
|
|
5
4
|
export class SessionMap {
|
|
6
5
|
constructor(id, crypto, streamingKnownState) {
|
|
7
6
|
this.id = id;
|
|
8
7
|
this.crypto = crypto;
|
|
9
8
|
this.sessions = new Map();
|
|
10
9
|
this.knownState = { id: this.id, header: true, sessions: {} };
|
|
10
|
+
this.immutableKnownState = { id: this.id, header: true, sessions: {} };
|
|
11
11
|
if (streamingKnownState) {
|
|
12
12
|
this.streamingKnownState = { ...streamingKnownState };
|
|
13
13
|
this.knownStateWithStreaming = {
|
|
@@ -15,6 +15,7 @@ export class SessionMap {
|
|
|
15
15
|
header: true,
|
|
16
16
|
sessions: { ...streamingKnownState },
|
|
17
17
|
};
|
|
18
|
+
this.immutableKnownStateWithStreaming = cloneKnownState(this.knownStateWithStreaming);
|
|
18
19
|
}
|
|
19
20
|
}
|
|
20
21
|
setStreamingKnownState(streamingKnownState) {
|
|
@@ -22,16 +23,24 @@ export class SessionMap {
|
|
|
22
23
|
if (isKnownStateSubsetOf(streamingKnownState, this.knownState.sessions)) {
|
|
23
24
|
return;
|
|
24
25
|
}
|
|
26
|
+
const actualStreamingKnownState = getKnownStateToSend(streamingKnownState, this.knownState.sessions);
|
|
25
27
|
if (this.streamingKnownState) {
|
|
26
|
-
combineKnownStateSessions(this.streamingKnownState,
|
|
28
|
+
combineKnownStateSessions(this.streamingKnownState, actualStreamingKnownState);
|
|
27
29
|
}
|
|
28
30
|
else {
|
|
29
|
-
this.streamingKnownState =
|
|
31
|
+
this.streamingKnownState = actualStreamingKnownState;
|
|
30
32
|
}
|
|
31
33
|
if (!this.knownStateWithStreaming) {
|
|
32
34
|
this.knownStateWithStreaming = cloneKnownState(this.knownState);
|
|
33
35
|
}
|
|
34
|
-
combineKnownStateSessions(this.knownStateWithStreaming.sessions,
|
|
36
|
+
combineKnownStateSessions(this.knownStateWithStreaming.sessions, actualStreamingKnownState);
|
|
37
|
+
this.immutableKnownStateWithStreaming = cloneKnownState(this.knownStateWithStreaming);
|
|
38
|
+
}
|
|
39
|
+
updateImmutableKnownState() {
|
|
40
|
+
this.immutableKnownState = cloneKnownState(this.knownState);
|
|
41
|
+
this.immutableKnownStateWithStreaming = this.knownStateWithStreaming
|
|
42
|
+
? cloneKnownState(this.knownStateWithStreaming)
|
|
43
|
+
: undefined;
|
|
35
44
|
}
|
|
36
45
|
get(sessionID) {
|
|
37
46
|
return this.sessions.get(sessionID);
|
|
@@ -54,20 +63,8 @@ export class SessionMap {
|
|
|
54
63
|
}
|
|
55
64
|
addTransaction(sessionID, signerID, newTransactions, newSignature, skipVerify = false) {
|
|
56
65
|
const sessionLog = this.getOrCreateSessionLog(sessionID, signerID);
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
this.addTransactionsToJsLog(sessionLog, newTransactions, newSignature);
|
|
60
|
-
return ok(true);
|
|
61
|
-
}
|
|
62
|
-
catch (e) {
|
|
63
|
-
return err({
|
|
64
|
-
type: "InvalidSignature",
|
|
65
|
-
id: this.id,
|
|
66
|
-
sessionID,
|
|
67
|
-
newSignature,
|
|
68
|
-
signerID,
|
|
69
|
-
});
|
|
70
|
-
}
|
|
66
|
+
sessionLog.impl.tryAdd(newTransactions, newSignature, skipVerify);
|
|
67
|
+
this.addTransactionsToJsLog(sessionLog, newTransactions, newSignature);
|
|
71
68
|
}
|
|
72
69
|
makeNewPrivateTransaction(sessionID, signerAgent, changes, keyID, keySecret, meta, madeAt) {
|
|
73
70
|
const sessionLog = this.getOrCreateSessionLog(sessionID, signerAgent.currentSignerID());
|
|
@@ -98,22 +95,16 @@ export class SessionMap {
|
|
|
98
95
|
// Update the known state with the new transactions count
|
|
99
96
|
updateSessionCounter(this.knownState.sessions, sessionLog.sessionID, transactionsCount);
|
|
100
97
|
// Check if the updated session matched the streaming state
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
delete this.streamingKnownState[sessionLog.sessionID];
|
|
106
|
-
if (Object.keys(this.streamingKnownState).length === 0) {
|
|
107
|
-
// Mark the streaming as done by deleting the streaming statuses
|
|
108
|
-
this.streamingKnownState = undefined;
|
|
109
|
-
this.knownStateWithStreaming = undefined;
|
|
110
|
-
}
|
|
111
|
-
}
|
|
98
|
+
if (this.streamingKnownState &&
|
|
99
|
+
isKnownStateSubsetOf(this.streamingKnownState, this.knownState.sessions)) {
|
|
100
|
+
this.streamingKnownState = undefined;
|
|
101
|
+
this.knownStateWithStreaming = undefined;
|
|
112
102
|
}
|
|
113
103
|
if (this.knownStateWithStreaming) {
|
|
114
104
|
// Update the streaming known state with the new transactions count
|
|
115
105
|
updateSessionCounter(this.knownStateWithStreaming.sessions, sessionLog.sessionID, transactionsCount);
|
|
116
106
|
}
|
|
107
|
+
this.updateImmutableKnownState();
|
|
117
108
|
}
|
|
118
109
|
decryptTransaction(sessionID, txIndex, keySecret) {
|
|
119
110
|
const sessionLog = this.sessions.get(sessionID);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionMap.js","sourceRoot":"","sources":["../../src/coValueCore/SessionMap.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SessionMap.js","sourceRoot":"","sources":["../../src/coValueCore/SessionMap.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Result } from "neverthrow";
|
|
2
1
|
import type { PeerState } from "../PeerState.js";
|
|
3
2
|
import type { RawCoValue } from "../coValue.js";
|
|
4
3
|
import type { ControlledAccountOrAgent } from "../coValues/account.js";
|
|
@@ -106,19 +105,17 @@ export declare class CoValueCore {
|
|
|
106
105
|
addNewContentToQueue(msg: NewContentMessage, from: PeerState | "storage" | "import"): void;
|
|
107
106
|
addDependencyFromHeader(header: CoValueHeader): void;
|
|
108
107
|
provideHeader(header: CoValueHeader, streamingKnownState?: KnownStateSessions, skipVerify?: boolean): boolean;
|
|
109
|
-
markErrored(peerId: PeerID, error:
|
|
108
|
+
markErrored(peerId: PeerID, error: unknown): void;
|
|
110
109
|
markPending(peerId: PeerID): void;
|
|
111
110
|
groupInvalidationSubscription?: () => void;
|
|
112
111
|
subscribeToGroupInvalidation(): void;
|
|
113
112
|
contentInClonedNodeWithDifferentAccount(account: ControlledAccountOrAgent): Promise<RawCoValue>;
|
|
114
|
-
private _cachedKnownStateWithStreaming?;
|
|
115
113
|
/**
|
|
116
114
|
* Returns the known state considering the known state of the streaming source
|
|
117
115
|
*
|
|
118
116
|
* Used to correctly manage the content & subscriptions during the content streaming process
|
|
119
117
|
*/
|
|
120
118
|
knownStateWithStreaming(): CoValueKnownState;
|
|
121
|
-
private _cachedKnownState?;
|
|
122
119
|
/**
|
|
123
120
|
* Returns the known state of the CoValue
|
|
124
121
|
*
|
|
@@ -130,8 +127,19 @@ export declare class CoValueCore {
|
|
|
130
127
|
get meta(): JsonValue;
|
|
131
128
|
nextTransactionID(): TransactionID;
|
|
132
129
|
addDependenciesFromContentMessage(newContent: NewContentMessage): void;
|
|
133
|
-
tryAddTransactions(sessionID: SessionID, newTransactions: Transaction[], newSignature: Signature, skipVerify?: boolean):
|
|
134
|
-
|
|
130
|
+
tryAddTransactions(sessionID: SessionID, newTransactions: Transaction[], newSignature: Signature, skipVerify?: boolean): {
|
|
131
|
+
readonly type: "ResolveAccountAgentError";
|
|
132
|
+
readonly id: `co_z${string}`;
|
|
133
|
+
readonly error: unknown;
|
|
134
|
+
} | {
|
|
135
|
+
type: string;
|
|
136
|
+
id: `co_z${string}`;
|
|
137
|
+
error: undefined;
|
|
138
|
+
} | {
|
|
139
|
+
readonly type: "InvalidSignature";
|
|
140
|
+
readonly id: `co_z${string}`;
|
|
141
|
+
readonly error: unknown;
|
|
142
|
+
} | undefined;
|
|
135
143
|
private processNewTransactions;
|
|
136
144
|
private scheduleNotifyUpdate;
|
|
137
145
|
pauseNotifyUpdate(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coValueCore.d.ts","sourceRoot":"","sources":["../../src/coValueCore/coValueCore.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"coValueCore.d.ts","sourceRoot":"","sources":["../../src/coValueCore/coValueCore.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
11
11
|
};
|
|
12
12
|
var _CoValueCore_isNotificationScheduled, _CoValueCore_batchedUpdates, _CoValueCore_isNotifyUpdatePaused;
|
|
13
13
|
import { ValueType, metrics } from "@opentelemetry/api";
|
|
14
|
-
import { err, ok } from "neverthrow";
|
|
15
14
|
import { CO_VALUE_LOADING_CONFIG } from "../config.js";
|
|
16
15
|
import { validateTxSizeLimitInBytes } from "../coValueContentMessage.js";
|
|
17
16
|
import { coreToCoValue } from "../coreToCoValue.js";
|
|
@@ -24,7 +23,7 @@ import { VerifiedState } from "./verifiedState.js";
|
|
|
24
23
|
import { SessionMap } from "./SessionMap.js";
|
|
25
24
|
import { createBranch, getBranchId, getBranchOwnerId, getBranchSource, mergeBranch, } from "./branching.js";
|
|
26
25
|
import { decryptTransactionChangesAndMeta } from "./decryptTransactionChangesAndMeta.js";
|
|
27
|
-
import {
|
|
26
|
+
import { combineKnownStateSessions, emptyKnownState, } from "../knownState.js";
|
|
28
27
|
import { safeParseJSON } from "../jsonStringify.js";
|
|
29
28
|
export function idforHeader(header, crypto) {
|
|
30
29
|
const hash = crypto.shortHash(header);
|
|
@@ -331,7 +330,6 @@ export class CoValueCore {
|
|
|
331
330
|
throw new Error("CoValueCore: provideHeader called on coValue with verified sessions present!");
|
|
332
331
|
}
|
|
333
332
|
this._verified = new VerifiedState(this.id, this.node.crypto, header, new SessionMap(this.id, this.node.crypto, streamingKnownState));
|
|
334
|
-
this.resetKnownStateCache();
|
|
335
333
|
return true;
|
|
336
334
|
}
|
|
337
335
|
markErrored(peerId, error) {
|
|
@@ -383,14 +381,8 @@ export class CoValueCore {
|
|
|
383
381
|
* Used to correctly manage the content & subscriptions during the content streaming process
|
|
384
382
|
*/
|
|
385
383
|
knownStateWithStreaming() {
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
}
|
|
389
|
-
const knownState = this.verified
|
|
390
|
-
? cloneKnownState(this.verified.knownStateWithStreaming())
|
|
391
|
-
: emptyKnownState(this.id);
|
|
392
|
-
this._cachedKnownStateWithStreaming = knownState;
|
|
393
|
-
return knownState;
|
|
384
|
+
return (this.verified?.immutableKnownStateWithStreaming() ??
|
|
385
|
+
emptyKnownState(this.id));
|
|
394
386
|
}
|
|
395
387
|
/**
|
|
396
388
|
* Returns the known state of the CoValue
|
|
@@ -400,14 +392,7 @@ export class CoValueCore {
|
|
|
400
392
|
* On change the knownState is invalidated and a new object is returned.
|
|
401
393
|
*/
|
|
402
394
|
knownState() {
|
|
403
|
-
|
|
404
|
-
return this._cachedKnownState;
|
|
405
|
-
}
|
|
406
|
-
const knownState = this.verified
|
|
407
|
-
? cloneKnownState(this.verified.knownState())
|
|
408
|
-
: emptyKnownState(this.id);
|
|
409
|
-
this._cachedKnownState = knownState;
|
|
410
|
-
return knownState;
|
|
395
|
+
return this.verified?.immutableKnownState() ?? emptyKnownState(this.id);
|
|
411
396
|
}
|
|
412
397
|
get meta() {
|
|
413
398
|
return this.verified?.header.meta ?? null;
|
|
@@ -432,36 +417,33 @@ export class CoValueCore {
|
|
|
432
417
|
}
|
|
433
418
|
}
|
|
434
419
|
tryAddTransactions(sessionID, newTransactions, newSignature, skipVerify = false) {
|
|
435
|
-
let
|
|
436
|
-
if (skipVerify) {
|
|
437
|
-
result =
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
.resolveAccountAgent(accountOrAgentIDfromSessionID(sessionID), "Expected to know signer of transaction")
|
|
442
|
-
.andThen((agent) => {
|
|
443
|
-
return ok(this.crypto.getAgentSignerID(agent));
|
|
444
|
-
});
|
|
445
|
-
}
|
|
446
|
-
return result.andThen((signerID) => {
|
|
447
|
-
if (!this.verified) {
|
|
448
|
-
return err({
|
|
449
|
-
type: "TriedToAddTransactionsWithoutVerifiedState",
|
|
420
|
+
let signerID;
|
|
421
|
+
if (!skipVerify) {
|
|
422
|
+
const result = this.node.resolveAccountAgent(accountOrAgentIDfromSessionID(sessionID), "Expected to know signer of transaction");
|
|
423
|
+
if (result.error || !result.value) {
|
|
424
|
+
return {
|
|
425
|
+
type: "ResolveAccountAgentError",
|
|
450
426
|
id: this.id,
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
const result = this.verified.tryAddTransactions(sessionID, signerID, newTransactions, newSignature, skipVerify);
|
|
454
|
-
if (result.isOk()) {
|
|
455
|
-
this.resetKnownStateCache();
|
|
456
|
-
this.processNewTransactions();
|
|
457
|
-
this.scheduleNotifyUpdate();
|
|
427
|
+
error: result.error,
|
|
428
|
+
};
|
|
458
429
|
}
|
|
459
|
-
|
|
460
|
-
}
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
430
|
+
signerID = this.crypto.getAgentSignerID(result.value);
|
|
431
|
+
}
|
|
432
|
+
if (!this.verified) {
|
|
433
|
+
return {
|
|
434
|
+
type: "TriedToAddTransactionsWithoutVerifiedState",
|
|
435
|
+
id: this.id,
|
|
436
|
+
error: undefined,
|
|
437
|
+
};
|
|
438
|
+
}
|
|
439
|
+
try {
|
|
440
|
+
this.verified.tryAddTransactions(sessionID, signerID, newTransactions, newSignature, skipVerify);
|
|
441
|
+
this.processNewTransactions();
|
|
442
|
+
this.scheduleNotifyUpdate();
|
|
443
|
+
}
|
|
444
|
+
catch (e) {
|
|
445
|
+
return { type: "InvalidSignature", id: this.id, error: e };
|
|
446
|
+
}
|
|
465
447
|
}
|
|
466
448
|
processNewTransactions() {
|
|
467
449
|
if (this._cachedContent) {
|
|
@@ -536,6 +518,7 @@ export class CoValueCore {
|
|
|
536
518
|
: this.node.currentSessionID;
|
|
537
519
|
const signerAgent = this.node.getCurrentAgent();
|
|
538
520
|
let result;
|
|
521
|
+
const knownStateBefore = this.knownState();
|
|
539
522
|
if (privacy === "private") {
|
|
540
523
|
const { secret: keySecret, id: keyID } = this.getCurrentReadKey();
|
|
541
524
|
if (!keySecret) {
|
|
@@ -546,20 +529,17 @@ export class CoValueCore {
|
|
|
546
529
|
else {
|
|
547
530
|
result = this.verified.makeNewTrustingTransaction(sessionID, signerAgent, changes, meta, madeAt ?? Date.now());
|
|
548
531
|
}
|
|
549
|
-
const { transaction
|
|
532
|
+
const { transaction } = result;
|
|
550
533
|
// Assign pre-parsed meta and changes to skip the parse/decrypt operation when loading
|
|
551
534
|
// this transaction in the current content
|
|
552
535
|
this.parsingCache.set(transaction, { changes, meta });
|
|
553
536
|
this.node.syncManager.recordTransactionsSize([transaction], "local");
|
|
554
|
-
const session = this.verified.sessions.get(sessionID);
|
|
555
|
-
const txIdx = session ? session.transactions.length - 1 : 0;
|
|
556
|
-
this.resetKnownStateCache();
|
|
557
537
|
this.processNewTransactions();
|
|
558
538
|
this.addDependenciesFromNewTransaction(transaction);
|
|
559
539
|
// force immediate notification because local updates may come from the UI
|
|
560
540
|
// where we need synchronous updates
|
|
561
541
|
this.notifyUpdate();
|
|
562
|
-
this.node.syncManager.syncLocalTransaction(this.verified,
|
|
542
|
+
this.node.syncManager.syncLocalTransaction(this.verified, knownStateBefore);
|
|
563
543
|
return true;
|
|
564
544
|
}
|
|
565
545
|
addDependenciesFromNewTransaction(transaction) {
|