@nmshd/transport 1.0.5 → 1.1.0
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/dist/buildInformation.js +5 -5
- package/dist/core/DependencyOverrides.d.ts +4 -0
- package/dist/core/DependencyOverrides.js +3 -0
- package/dist/core/DependencyOverrides.js.map +1 -0
- package/dist/core/Transport.d.ts +2 -3
- package/dist/core/Transport.js +26 -23
- package/dist/core/Transport.js.map +1 -1
- package/dist/core/TransportErrors.d.ts +4 -0
- package/dist/core/TransportErrors.js +12 -0
- package/dist/core/TransportErrors.js.map +1 -1
- package/dist/core/backbone/BackboneIds.d.ts +0 -1
- package/dist/core/backbone/BackboneIds.js +0 -1
- package/dist/core/backbone/BackboneIds.js.map +1 -1
- package/dist/core/backbone/RESTClient.js +1 -1
- package/dist/core/backbone/RESTClient.js.map +1 -1
- package/dist/core/backbone/index.d.ts +1 -0
- package/dist/core/backbone/index.js +1 -0
- package/dist/core/backbone/index.js.map +1 -1
- package/dist/core/index.d.ts +1 -0
- package/dist/core/index.js +1 -0
- package/dist/core/index.js.map +1 -1
- package/dist/modules/accounts/AccountController.d.ts +3 -2
- package/dist/modules/accounts/AccountController.js +9 -7
- package/dist/modules/accounts/AccountController.js.map +1 -1
- package/dist/modules/devices/DeviceController.d.ts +5 -1
- package/dist/modules/devices/DeviceController.js +9 -4
- package/dist/modules/devices/DeviceController.js.map +1 -1
- package/dist/modules/devices/local/Device.d.ts +2 -0
- package/dist/modules/devices/local/Device.js +7 -1
- package/dist/modules/devices/local/Device.js.map +1 -1
- package/dist/modules/index.d.ts +8 -0
- package/dist/modules/index.js +8 -0
- package/dist/modules/index.js.map +1 -1
- package/dist/modules/relationshipTemplates/RelationshipTemplateController.js +2 -2
- package/dist/modules/relationshipTemplates/RelationshipTemplateController.js.map +1 -1
- package/dist/modules/relationships/local/Relationship.d.ts +2 -2
- package/dist/modules/relationships/local/Relationship.js.map +1 -1
- package/dist/modules/sync/DatawalletModificationMapper.d.ts +1 -1
- package/dist/modules/sync/DatawalletModificationMapper.js +6 -3
- package/dist/modules/sync/DatawalletModificationMapper.js.map +1 -1
- package/dist/modules/sync/DatawalletModificationsProcessor.d.ts +9 -4
- package/dist/modules/sync/DatawalletModificationsProcessor.js +66 -45
- package/dist/modules/sync/DatawalletModificationsProcessor.js.map +1 -1
- package/dist/modules/sync/SyncController.d.ts +17 -4
- package/dist/modules/sync/SyncController.js +154 -24
- package/dist/modules/sync/SyncController.js.map +1 -1
- package/dist/modules/sync/SynchronizedCollection.d.ts +2 -1
- package/dist/modules/sync/SynchronizedCollection.js +18 -18
- package/dist/modules/sync/SynchronizedCollection.js.map +1 -1
- package/dist/modules/sync/backbone/BackboneDatawalletModification.d.ts +1 -0
- package/dist/modules/sync/backbone/CreateDatawalletModifications.d.ts +1 -0
- package/dist/modules/sync/backbone/FinalizeSyncRun.d.ts +15 -9
- package/dist/modules/sync/backbone/GetDatawallet.d.ts +3 -0
- package/dist/modules/sync/backbone/GetDatawallet.js +3 -0
- package/dist/modules/sync/backbone/GetDatawallet.js.map +1 -0
- package/dist/modules/sync/backbone/StartSyncRun.d.ts +8 -0
- package/dist/modules/sync/backbone/StartSyncRun.js +6 -1
- package/dist/modules/sync/backbone/StartSyncRun.js.map +1 -1
- package/dist/modules/sync/backbone/SyncClient.d.ts +21 -6
- package/dist/modules/sync/backbone/SyncClient.js +19 -6
- package/dist/modules/sync/backbone/SyncClient.js.map +1 -1
- package/dist/modules/sync/local/DatawalletModification.d.ts +2 -0
- package/dist/modules/sync/local/DatawalletModification.js +5 -0
- package/dist/modules/sync/local/DatawalletModification.js.map +1 -1
- package/dist/modules/sync/migrations/DeviceMigrations.d.ts +6 -0
- package/dist/modules/sync/migrations/DeviceMigrations.js +24 -0
- package/dist/modules/sync/migrations/DeviceMigrations.js.map +1 -0
- package/dist/modules/sync/migrations/IdentityMigrations.d.ts +6 -0
- package/dist/modules/sync/migrations/IdentityMigrations.js +14 -0
- package/dist/modules/sync/migrations/IdentityMigrations.js.map +1 -0
- package/lib-web/nmshd.transport.js +826 -444
- package/lib-web/nmshd.transport.js.map +1 -1
- package/lib-web/nmshd.transport.min.js +1 -1
- package/lib-web/nmshd.transport.min.js.map +1 -1
- package/package.json +26 -26
|
@@ -26,6 +26,7 @@ export interface IDevice extends ICoreSynchronizable {
|
|
|
26
26
|
type: DeviceType;
|
|
27
27
|
username: string;
|
|
28
28
|
initialPassword?: string;
|
|
29
|
+
datawalletVersion?: number;
|
|
29
30
|
}
|
|
30
31
|
export declare class Device extends CoreSynchronizable implements IDevice {
|
|
31
32
|
readonly technicalProperties: string[];
|
|
@@ -42,5 +43,6 @@ export declare class Device extends CoreSynchronizable implements IDevice {
|
|
|
42
43
|
username: string;
|
|
43
44
|
initialPassword?: string;
|
|
44
45
|
isAdmin?: boolean;
|
|
46
|
+
datawalletVersion?: number;
|
|
45
47
|
static from(value: IDevice): Promise<Device>;
|
|
46
48
|
}
|
|
@@ -40,7 +40,8 @@ let Device = Device_1 = class Device extends core_1.CoreSynchronizable {
|
|
|
40
40
|
(0, ts_simple_nameof_1.nameof)((d) => d.createdByDevice),
|
|
41
41
|
(0, ts_simple_nameof_1.nameof)((d) => d.lastLoginAt),
|
|
42
42
|
(0, ts_simple_nameof_1.nameof)((d) => d.username),
|
|
43
|
-
(0, ts_simple_nameof_1.nameof)((d) => d.initialPassword)
|
|
43
|
+
(0, ts_simple_nameof_1.nameof)((d) => d.initialPassword),
|
|
44
|
+
(0, ts_simple_nameof_1.nameof)((d) => d.datawalletVersion)
|
|
44
45
|
];
|
|
45
46
|
this.userdataProperties = [(0, ts_simple_nameof_1.nameof)((d) => d.name), (0, ts_simple_nameof_1.nameof)((d) => d.description)];
|
|
46
47
|
}
|
|
@@ -108,6 +109,11 @@ __decorate([
|
|
|
108
109
|
(0, ts_serval_1.serialize)(),
|
|
109
110
|
__metadata("design:type", Boolean)
|
|
110
111
|
], Device.prototype, "isAdmin", void 0);
|
|
112
|
+
__decorate([
|
|
113
|
+
(0, ts_serval_1.validate)({ nullable: true }),
|
|
114
|
+
(0, ts_serval_1.serialize)(),
|
|
115
|
+
__metadata("design:type", Number)
|
|
116
|
+
], Device.prototype, "datawalletVersion", void 0);
|
|
111
117
|
Device = Device_1 = __decorate([
|
|
112
118
|
(0, ts_serval_1.type)("Device")
|
|
113
119
|
], Device);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Device.js","sourceRoot":"","sources":["../../../../src/modules/devices/local/Device.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAA8D;AAC9D,0CAAmF;AACnF,uDAAyC;AACzC,wCAAuE;AACvE,2DAAuD;AACvD,uDAAmD;AAEnD,IAAY,UAMX;AAND,WAAY,UAAU;IAClB,iDAAS,CAAA;IACT,6CAAO,CAAA;IACP,+CAAQ,CAAA;IACR,iDAAS,CAAA;IACT,qDAAW,CAAA;AACf,CAAC,EANW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAMrB;
|
|
1
|
+
{"version":3,"file":"Device.js","sourceRoot":"","sources":["../../../../src/modules/devices/local/Device.ts"],"names":[],"mappings":"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"}
|
package/dist/modules/index.d.ts
CHANGED
|
@@ -90,6 +90,14 @@ export * from "./relationshipTemplates/transmission/RelationshipTemplateSigned";
|
|
|
90
90
|
export * from "./secrets/data/SecretContainerCipher";
|
|
91
91
|
export * from "./secrets/data/SecretContainerPlain";
|
|
92
92
|
export * from "./secrets/SecretController";
|
|
93
|
+
export * from "./sync/backbone/BackboneDatawalletModification";
|
|
94
|
+
export * from "./sync/backbone/BackboneExternalEvent";
|
|
95
|
+
export * from "./sync/backbone/CreateDatawalletModifications";
|
|
96
|
+
export * from "./sync/backbone/FinalizeSyncRun";
|
|
97
|
+
export * from "./sync/backbone/GetDatawallet";
|
|
98
|
+
export * from "./sync/backbone/GetDatawalletModifications";
|
|
99
|
+
export * from "./sync/backbone/StartSyncRun";
|
|
100
|
+
export * from "./sync/backbone/SyncClient";
|
|
93
101
|
export * from "./sync/ChangedItems";
|
|
94
102
|
export * from "./sync/DatawalletModificationsProcessor";
|
|
95
103
|
export * from "./sync/ExternalEventsProcessor";
|
package/dist/modules/index.js
CHANGED
|
@@ -102,6 +102,14 @@ __exportStar(require("./relationshipTemplates/transmission/RelationshipTemplateS
|
|
|
102
102
|
__exportStar(require("./secrets/data/SecretContainerCipher"), exports);
|
|
103
103
|
__exportStar(require("./secrets/data/SecretContainerPlain"), exports);
|
|
104
104
|
__exportStar(require("./secrets/SecretController"), exports);
|
|
105
|
+
__exportStar(require("./sync/backbone/BackboneDatawalletModification"), exports);
|
|
106
|
+
__exportStar(require("./sync/backbone/BackboneExternalEvent"), exports);
|
|
107
|
+
__exportStar(require("./sync/backbone/CreateDatawalletModifications"), exports);
|
|
108
|
+
__exportStar(require("./sync/backbone/FinalizeSyncRun"), exports);
|
|
109
|
+
__exportStar(require("./sync/backbone/GetDatawallet"), exports);
|
|
110
|
+
__exportStar(require("./sync/backbone/GetDatawalletModifications"), exports);
|
|
111
|
+
__exportStar(require("./sync/backbone/StartSyncRun"), exports);
|
|
112
|
+
__exportStar(require("./sync/backbone/SyncClient"), exports);
|
|
105
113
|
__exportStar(require("./sync/ChangedItems"), exports);
|
|
106
114
|
__exportStar(require("./sync/DatawalletModificationsProcessor"), exports);
|
|
107
115
|
__exportStar(require("./sync/ExternalEventsProcessor"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/modules/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAA4C;AAC5C,qEAAkD;AAClD,2DAAwC;AACxC,gEAA6C;AAC7C,0DAAuC;AACvC,uEAAoD;AACpD,mEAAgD;AAChD,sEAAmD;AACnD,kEAA+C;AAC/C,4EAAyD;AACzD,yEAAsD;AACtD,sEAAmD;AACnD,8FAA2E;AAC3E,4FAAyE;AACzE,gGAA6E;AAC7E,4FAAyE;AACzE,yFAAsE;AACtE,oFAAiE;AACjE,4FAAyE;AACzE,kGAA+E;AAC/E,2FAAwE;AACxE,gFAA6D;AAC7D,4EAAyD;AACzD,wEAAqD;AACrD,mEAAgD;AAChD,8DAA2C;AAC3C,oEAAiD;AACjD,yEAAsD;AACtD,sEAAmD;AACnD,kEAA+C;AAC/C,6DAA0C;AAC1C,8DAA2C;AAC3C,mEAAgD;AAChD,yDAAsC;AACtC,0EAAuD;AACvD,uEAAoD;AACpD,4EAAyD;AACzD,oEAAiD;AACjD,qEAAkD;AAClD,8DAA2C;AAC3C,yDAAsC;AACtC,2DAAwC;AACxC,qDAAkC;AAClC,mEAAgD;AAChD,oEAAiD;AACjD,qEAAkD;AAClD,0EAAuD;AACvD,2EAAwD;AACxD,oEAAiD;AACjD,iEAA8C;AAC9C,2DAAwC;AACxC,yEAAsD;AACtD,+DAA4C;AAC5C,0EAAuD;AACvD,mFAAgE;AAChE,uEAAoD;AACpD,2EAAwD;AACxD,wEAAqD;AACrD,oFAAiE;AACjE,2FAAwE;AACxE,4FAAyE;AACzE,8EAA2D;AAC3D,2EAAwD;AACxD,qEAAkD;AAClD,mFAAgE;AAChE,0EAAuD;AACvD,+EAA4D;AAC5D,0FAAuE;AACvE,iGAA8E;AAC9E,kGAA+E;AAC/E,gGAA6E;AAC7E,8FAA2E;AAC3E,kFAA+D;AAC/D,gHAA6F;AAC7F,iHAA8F;AAC9F,gHAA6F;AAC7F,kHAA+F;AAC/F,mHAAgG;AAChG,kHAA+F;AAC/F,oGAAiF;AACjF,qGAAkF;AAClF,8FAA2E;AAC3E,2FAAwE;AACxE,qFAAkE;AAClE,mGAAgF;AAChF,yFAAsE;AACtE,mGAAgF;AAChF,qGAAkF;AAClF,kGAA+E;AAC/E,uEAAoD;AACpD,sEAAmD;AACnD,6DAA0C;AAC1C,sDAAmC;AACnC,0EAAuD;AACvD,iEAA8C;AAC9C,sEAAmD;AACnD,wDAAqC;AACrC,gEAA6C;AAC7C,oEAAiD;AACjD,sEAAmD;AACnD,uEAAoD;AACpD,gEAA6C;AAC7C,6DAA0C;AAC1C,qEAAkD;AAClD,uDAAoC;AACpC,2DAAwC;AACxC,uFAAoE;AACpE,yEAAsD;AACtD,yFAAsE;AACtE,uEAAoD"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/modules/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAA4C;AAC5C,qEAAkD;AAClD,2DAAwC;AACxC,gEAA6C;AAC7C,0DAAuC;AACvC,uEAAoD;AACpD,mEAAgD;AAChD,sEAAmD;AACnD,kEAA+C;AAC/C,4EAAyD;AACzD,yEAAsD;AACtD,sEAAmD;AACnD,8FAA2E;AAC3E,4FAAyE;AACzE,gGAA6E;AAC7E,4FAAyE;AACzE,yFAAsE;AACtE,oFAAiE;AACjE,4FAAyE;AACzE,kGAA+E;AAC/E,2FAAwE;AACxE,gFAA6D;AAC7D,4EAAyD;AACzD,wEAAqD;AACrD,mEAAgD;AAChD,8DAA2C;AAC3C,oEAAiD;AACjD,yEAAsD;AACtD,sEAAmD;AACnD,kEAA+C;AAC/C,6DAA0C;AAC1C,8DAA2C;AAC3C,mEAAgD;AAChD,yDAAsC;AACtC,0EAAuD;AACvD,uEAAoD;AACpD,4EAAyD;AACzD,oEAAiD;AACjD,qEAAkD;AAClD,8DAA2C;AAC3C,yDAAsC;AACtC,2DAAwC;AACxC,qDAAkC;AAClC,mEAAgD;AAChD,oEAAiD;AACjD,qEAAkD;AAClD,0EAAuD;AACvD,2EAAwD;AACxD,oEAAiD;AACjD,iEAA8C;AAC9C,2DAAwC;AACxC,yEAAsD;AACtD,+DAA4C;AAC5C,0EAAuD;AACvD,mFAAgE;AAChE,uEAAoD;AACpD,2EAAwD;AACxD,wEAAqD;AACrD,oFAAiE;AACjE,2FAAwE;AACxE,4FAAyE;AACzE,8EAA2D;AAC3D,2EAAwD;AACxD,qEAAkD;AAClD,mFAAgE;AAChE,0EAAuD;AACvD,+EAA4D;AAC5D,0FAAuE;AACvE,iGAA8E;AAC9E,kGAA+E;AAC/E,gGAA6E;AAC7E,8FAA2E;AAC3E,kFAA+D;AAC/D,gHAA6F;AAC7F,iHAA8F;AAC9F,gHAA6F;AAC7F,kHAA+F;AAC/F,mHAAgG;AAChG,kHAA+F;AAC/F,oGAAiF;AACjF,qGAAkF;AAClF,8FAA2E;AAC3E,2FAAwE;AACxE,qFAAkE;AAClE,mGAAgF;AAChF,yFAAsE;AACtE,mGAAgF;AAChF,qGAAkF;AAClF,kGAA+E;AAC/E,uEAAoD;AACpD,sEAAmD;AACnD,6DAA0C;AAC1C,iFAA8D;AAC9D,wEAAqD;AACrD,gFAA6D;AAC7D,kEAA+C;AAC/C,gEAA6C;AAC7C,6EAA0D;AAC1D,+DAA4C;AAC5C,6DAA0C;AAC1C,sDAAmC;AACnC,0EAAuD;AACvD,iEAA8C;AAC9C,sEAAmD;AACnD,wDAAqC;AACrC,gEAA6C;AAC7C,oEAAiD;AACjD,sEAAmD;AACnD,uEAAoD;AACpD,gEAA6C;AAC7C,6DAA0C;AAC1C,qEAAkD;AAClD,uDAAoC;AACpC,2DAAwC;AACxC,uFAAoE;AACpE,yEAAsD;AACtD,yFAAsE;AACtE,uEAAoD"}
|
|
@@ -28,7 +28,7 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
|
|
|
28
28
|
const templateKey = await this.secrets.createTemplateKey();
|
|
29
29
|
const templateContent = await RelationshipTemplateContent_1.RelationshipTemplateContent.from({
|
|
30
30
|
content: parameters.content,
|
|
31
|
-
identity: this.parent.identity,
|
|
31
|
+
identity: this.parent.identity.identity,
|
|
32
32
|
templateKey: templateKey
|
|
33
33
|
});
|
|
34
34
|
const secretKey = await core_1.CoreCrypto.generateSecretKey();
|
|
@@ -52,7 +52,7 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
|
|
|
52
52
|
createdBy: this.parent.identity.address,
|
|
53
53
|
createdByDevice: this.parent.activeDevice.id,
|
|
54
54
|
expiresAt: parameters.expiresAt,
|
|
55
|
-
identity: this.parent.identity,
|
|
55
|
+
identity: this.parent.identity.identity,
|
|
56
56
|
maxNumberOfRelationships: (_a = parameters.maxNumberOfRelationships) !== null && _a !== void 0 ? _a : undefined,
|
|
57
57
|
templateKey: templateKey
|
|
58
58
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RelationshipTemplateController.js","sourceRoot":"","sources":["../../../src/modules/relationshipTemplates/RelationshipTemplateController.ts"],"names":[],"mappings":";;;AACA,0CAA0F;AAC1F,qCAAuF;AACvF,kEAA8D;AAC9D,wEAAoF;AAKpF,sFAAkF;AAClF,mFAA+E;AAC/E,uEAAmE;AACnE,mGAGmD;AACnD,4FAAwF;AACxF,0FAAsF;AAEtF,MAAa,8BAA+B,SAAQ,yCAAmB;IAKnE,YACI,MAAyB,EACzB,OAAqC,EACrC,cAA+B;QAE/B,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,oCAAc,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAA;QACpF,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,MAAM,GAAG,IAAI,uDAA0B,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;IACxF,CAAC;IAEM,KAAK,CAAC,IAAI;QACb,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;QAElB,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,mCAAgB,CAAC,qBAAqB,CAAC,CAAA;QAEpG,OAAO,IAAI,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,wBAAwB,CACjC,UAA+C;;QAE/C,UAAU,GAAG,MAAM,uEAAkC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACtE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAA;QAE1D,MAAM,eAAe,GAAG,MAAM,yDAA2B,CAAC,IAAI,CAAC;YAC3D,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"RelationshipTemplateController.js","sourceRoot":"","sources":["../../../src/modules/relationshipTemplates/RelationshipTemplateController.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,12 +5,12 @@ import { BackboneGetRelationshipsResponse } from "../backbone/BackboneGetRelatio
|
|
|
5
5
|
import { IRelationshipChange } from "../transmission/changes/RelationshipChange";
|
|
6
6
|
import { RelationshipChangeResponse } from "../transmission/changes/RelationshipChangeResponse";
|
|
7
7
|
import { RelationshipStatus } from "../transmission/RelationshipStatus";
|
|
8
|
-
import { CachedRelationship } from "./CachedRelationship";
|
|
8
|
+
import { CachedRelationship, ICachedRelationship } from "./CachedRelationship";
|
|
9
9
|
export interface IRelationship extends ICoreSynchronizable {
|
|
10
10
|
relationshipSecretId: ICoreId;
|
|
11
11
|
peer: IIdentity;
|
|
12
12
|
status: RelationshipStatus;
|
|
13
|
-
cache?:
|
|
13
|
+
cache?: ICachedRelationship;
|
|
14
14
|
cachedAt?: CoreDate;
|
|
15
15
|
metadata?: any;
|
|
16
16
|
metadataModifiedAt?: CoreDate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Relationship.js","sourceRoot":"","sources":["../../../../src/modules/relationships/local/Relationship.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAA8D;AAC9D,uDAAyC;AACzC,wCAAmH;AACnH,2DAAkE;AAKlE,2EAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"Relationship.js","sourceRoot":"","sources":["../../../../src/modules/relationships/local/Relationship.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,6 @@ import { BackboneDatawalletModification } from "./backbone/BackboneDatawalletMod
|
|
|
2
2
|
import { CreateDatawalletModificationsRequestItem } from "./backbone/CreateDatawalletModifications";
|
|
3
3
|
import { DatawalletModification } from "./local/DatawalletModification";
|
|
4
4
|
export declare class DatawalletModificationMapper {
|
|
5
|
-
static fromBackboneDatawalletModification(backboneDatawalletModification: BackboneDatawalletModification, decryptedPayload: object | undefined): Promise<DatawalletModification>;
|
|
5
|
+
static fromBackboneDatawalletModification(backboneDatawalletModification: BackboneDatawalletModification, decryptedPayload: object | undefined, datawalletVersion: number): Promise<DatawalletModification>;
|
|
6
6
|
static toCreateDatawalletModificationsRequestItem(datawalletModification: DatawalletModification, encryptedPayload: string | undefined): CreateDatawalletModificationsRequestItem;
|
|
7
7
|
}
|
|
@@ -4,7 +4,7 @@ exports.DatawalletModificationMapper = void 0;
|
|
|
4
4
|
const core_1 = require("../../core");
|
|
5
5
|
const DatawalletModification_1 = require("./local/DatawalletModification");
|
|
6
6
|
class DatawalletModificationMapper {
|
|
7
|
-
static async fromBackboneDatawalletModification(backboneDatawalletModification, decryptedPayload) {
|
|
7
|
+
static async fromBackboneDatawalletModification(backboneDatawalletModification, decryptedPayload, datawalletVersion) {
|
|
8
8
|
let type;
|
|
9
9
|
switch (backboneDatawalletModification.type) {
|
|
10
10
|
case "Create":
|
|
@@ -45,16 +45,19 @@ class DatawalletModificationMapper {
|
|
|
45
45
|
payloadCategory: payloadCategory,
|
|
46
46
|
collection: backboneDatawalletModification.collection,
|
|
47
47
|
type: type,
|
|
48
|
-
payload: decryptedPayload
|
|
48
|
+
payload: decryptedPayload,
|
|
49
|
+
datawalletVersion: datawalletVersion
|
|
49
50
|
});
|
|
50
51
|
}
|
|
51
52
|
static toCreateDatawalletModificationsRequestItem(datawalletModification, encryptedPayload) {
|
|
53
|
+
var _a;
|
|
52
54
|
return {
|
|
53
55
|
objectIdentifier: datawalletModification.objectIdentifier.toString(),
|
|
54
56
|
payloadCategory: datawalletModification.payloadCategory,
|
|
55
57
|
collection: datawalletModification.collection,
|
|
56
58
|
type: datawalletModification.type,
|
|
57
|
-
encryptedPayload: encryptedPayload
|
|
59
|
+
encryptedPayload: encryptedPayload,
|
|
60
|
+
datawalletVersion: (_a = datawalletModification.datawalletVersion) !== null && _a !== void 0 ? _a : 0
|
|
58
61
|
};
|
|
59
62
|
}
|
|
60
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatawalletModificationMapper.js","sourceRoot":"","sources":["../../../src/modules/sync/DatawalletModificationMapper.ts"],"names":[],"mappings":";;;AAAA,qCAAiD;AAGjD,2EAIuC;AAEvC,MAAa,4BAA4B;IAC9B,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAClD,8BAA8D,EAC9D,gBAAoC;
|
|
1
|
+
{"version":3,"file":"DatawalletModificationMapper.js","sourceRoot":"","sources":["../../../src/modules/sync/DatawalletModificationMapper.ts"],"names":[],"mappings":";;;AAAA,qCAAiD;AAGjD,2EAIuC;AAEvC,MAAa,4BAA4B;IAC9B,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAClD,8BAA8D,EAC9D,gBAAoC,EACpC,iBAAyB;QAEzB,IAAI,IAAgC,CAAA;QAEpC,QAAQ,8BAA8B,CAAC,IAAI,EAAE;YACzC,KAAK,QAAQ;gBACT,IAAI,GAAG,mDAA0B,CAAC,MAAM,CAAA;gBACxC,MAAK;YACT,KAAK,QAAQ;gBACT,IAAI,GAAG,mDAA0B,CAAC,MAAM,CAAA;gBACxC,MAAK;YACT,KAAK,QAAQ;gBACT,IAAI,GAAG,mDAA0B,CAAC,MAAM,CAAA;gBACxC,MAAK;YACT,KAAK,cAAc;gBACf,IAAI,GAAG,mDAA0B,CAAC,YAAY,CAAA;gBAC9C,MAAK;YACT;gBACI,MAAM,IAAI,KAAK,CAAC,iFAAiF,CAAC,CAAA;SACzG;QAED,IAAI,eAA2D,CAAA;QAE/D,QAAQ,8BAA8B,CAAC,eAAe,EAAE;YACpD,KAAK,eAAe;gBAChB,eAAe,GAAG,uDAA8B,CAAC,aAAa,CAAA;gBAC9D,MAAK;YACT,KAAK,UAAU;gBACX,eAAe,GAAG,uDAA8B,CAAC,QAAQ,CAAA;gBACzD,MAAK;YACT,KAAK,UAAU;gBACX,eAAe,GAAG,uDAA8B,CAAC,QAAQ,CAAA;gBACzD,MAAK;YACT,KAAK,IAAI;gBACL,eAAe,GAAG,SAAS,CAAA;gBAC3B,MAAK;YACT;gBACI,MAAM,IAAI,KAAK,CACX,+CAA+C,8BAA8B,CAAC,eAAe,GAAG,CACnG,CAAA;SACR;QAED,OAAO,+CAAsB,CAAC,IAAI,CAAC;YAC/B,OAAO,EAAE,MAAM,mBAAY,CAAC,sBAAsB,CAAC,QAAQ,EAAE;YAC7D,gBAAgB,EAAE,aAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,gBAAgB,CAAC;YAC9E,eAAe,EAAE,eAAe;YAChC,UAAU,EAAE,8BAA8B,CAAC,UAAU;YACrD,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,gBAAgB;YACzB,iBAAiB,EAAE,iBAAiB;SACvC,CAAC,CAAA;IACN,CAAC;IAEM,MAAM,CAAC,0CAA0C,CACpD,sBAA8C,EAC9C,gBAAoC;;QAEpC,OAAO;YACH,gBAAgB,EAAE,sBAAsB,CAAC,gBAAgB,CAAC,QAAQ,EAAE;YACpE,eAAe,EAAE,sBAAsB,CAAC,eAAe;YACvD,UAAU,EAAE,sBAAsB,CAAC,UAAU;YAC7C,IAAI,EAAE,sBAAsB,CAAC,IAAI;YACjC,gBAAgB,EAAE,gBAAgB;YAClC,iBAAiB,EAAE,MAAA,sBAAsB,CAAC,iBAAiB,mCAAI,CAAC;SACnE,CAAA;IACL,CAAC;CACJ;AAtED,oEAsEC"}
|
|
@@ -15,16 +15,21 @@ import { DatawalletModification } from "./local/DatawalletModification";
|
|
|
15
15
|
export declare class DatawalletModificationsProcessor {
|
|
16
16
|
private readonly cacheFetcher;
|
|
17
17
|
private readonly collectionProvider;
|
|
18
|
-
private readonly modifications;
|
|
19
18
|
private readonly logger;
|
|
20
|
-
|
|
19
|
+
private readonly creates;
|
|
20
|
+
private readonly updates;
|
|
21
|
+
private readonly deletes;
|
|
22
|
+
private readonly cacheChanges;
|
|
23
|
+
constructor(modifications: DatawalletModification[], cacheFetcher: CacheFetcher, collectionProvider: IDatabaseCollectionProvider, logger: ILogger);
|
|
24
|
+
private readonly collectionsWithCacheableItems;
|
|
21
25
|
execute(): Promise<void>;
|
|
22
|
-
private
|
|
26
|
+
private applyCreates;
|
|
23
27
|
private applyUpdates;
|
|
24
|
-
private applyDeletes;
|
|
25
28
|
private applyCacheChanges;
|
|
29
|
+
private ensureAllItemsAreCacheable;
|
|
26
30
|
private groupCacheChangesByCollection;
|
|
27
31
|
private saveNewCaches;
|
|
32
|
+
private applyDeletes;
|
|
28
33
|
}
|
|
29
34
|
export declare class CacheFetcher {
|
|
30
35
|
private readonly fileController;
|
|
@@ -14,46 +14,67 @@ const RelationshipTemplate_1 = require("../relationshipTemplates/local/Relations
|
|
|
14
14
|
const Token_1 = require("../tokens/local/Token");
|
|
15
15
|
const DatawalletModification_1 = require("./local/DatawalletModification");
|
|
16
16
|
class DatawalletModificationsProcessor {
|
|
17
|
-
constructor(cacheFetcher, collectionProvider,
|
|
17
|
+
constructor(modifications, cacheFetcher, collectionProvider, logger) {
|
|
18
|
+
var _a, _b, _c, _d;
|
|
18
19
|
this.cacheFetcher = cacheFetcher;
|
|
19
20
|
this.collectionProvider = collectionProvider;
|
|
20
|
-
this.modifications = modifications;
|
|
21
21
|
this.logger = logger;
|
|
22
|
+
this.collectionsWithCacheableItems = [
|
|
23
|
+
DbCollectionName_1.DbCollectionName.Files,
|
|
24
|
+
DbCollectionName_1.DbCollectionName.Messages,
|
|
25
|
+
DbCollectionName_1.DbCollectionName.Relationships,
|
|
26
|
+
DbCollectionName_1.DbCollectionName.RelationshipTemplates,
|
|
27
|
+
DbCollectionName_1.DbCollectionName.Tokens
|
|
28
|
+
];
|
|
29
|
+
const modificationsGroupedByType = lodash_1.default.groupBy(modifications, (m) => m.type);
|
|
30
|
+
this.creates = (_a = modificationsGroupedByType[DatawalletModification_1.DatawalletModificationType.Create]) !== null && _a !== void 0 ? _a : [];
|
|
31
|
+
this.updates = (_b = modificationsGroupedByType[DatawalletModification_1.DatawalletModificationType.Update]) !== null && _b !== void 0 ? _b : [];
|
|
32
|
+
this.deletes = (_c = modificationsGroupedByType[DatawalletModification_1.DatawalletModificationType.Delete]) !== null && _c !== void 0 ? _c : [];
|
|
33
|
+
this.cacheChanges = (_d = modificationsGroupedByType[DatawalletModification_1.DatawalletModificationType.CacheChanged]) !== null && _d !== void 0 ? _d : [];
|
|
22
34
|
}
|
|
23
35
|
async execute() {
|
|
24
|
-
|
|
25
|
-
await this.
|
|
26
|
-
await this.
|
|
27
|
-
await this.applyDeletes(
|
|
28
|
-
await this.applyCacheChanges(modificationsGroupedByType[DatawalletModification_1.DatawalletModificationType.CacheChanged]);
|
|
36
|
+
await this.applyCreates();
|
|
37
|
+
await this.applyUpdates();
|
|
38
|
+
await this.applyCacheChanges();
|
|
39
|
+
await this.applyDeletes();
|
|
29
40
|
}
|
|
30
|
-
async
|
|
31
|
-
if (
|
|
41
|
+
async applyCreates() {
|
|
42
|
+
if (this.creates.length === 0) {
|
|
32
43
|
return;
|
|
33
44
|
}
|
|
34
|
-
const
|
|
35
|
-
for (const objectIdentifier in
|
|
36
|
-
const
|
|
37
|
-
const
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
45
|
+
const createsGroupedByObjectIdentifier = lodash_1.default.groupBy(this.creates, (c) => c.objectIdentifier);
|
|
46
|
+
for (const objectIdentifier in createsGroupedByObjectIdentifier) {
|
|
47
|
+
const currentCreates = createsGroupedByObjectIdentifier[objectIdentifier];
|
|
48
|
+
const targetCollectionName = currentCreates[0].collection;
|
|
49
|
+
const targetCollection = await this.collectionProvider.getCollection(targetCollectionName);
|
|
50
|
+
let mergedPayload = { id: objectIdentifier };
|
|
51
|
+
for (const create of currentCreates) {
|
|
52
|
+
mergedPayload = { ...mergedPayload, ...create.payload };
|
|
41
53
|
}
|
|
42
|
-
const newObject = await core_1.CoreSerializableAsync.fromUnknown(
|
|
54
|
+
const newObject = await core_1.CoreSerializableAsync.fromUnknown(mergedPayload);
|
|
43
55
|
const oldDoc = await targetCollection.read(objectIdentifier);
|
|
44
56
|
if (oldDoc) {
|
|
45
57
|
const oldObject = await core_1.CoreSerializableAsync.fromUnknown(oldDoc);
|
|
46
58
|
const updatedObject = { ...oldObject.toJSON(), ...newObject.toJSON() };
|
|
47
59
|
await targetCollection.update(oldDoc, updatedObject);
|
|
48
60
|
}
|
|
61
|
+
if (this.collectionsWithCacheableItems.includes(targetCollectionName)) {
|
|
62
|
+
const modification = DatawalletModification_1.DatawalletModification.from({
|
|
63
|
+
localId: await core_1.TransportIds.datawalletModification.generate(),
|
|
64
|
+
type: DatawalletModification_1.DatawalletModificationType.CacheChanged,
|
|
65
|
+
collection: targetCollectionName,
|
|
66
|
+
objectIdentifier: core_1.CoreId.from(objectIdentifier)
|
|
67
|
+
});
|
|
68
|
+
this.cacheChanges.push(modification);
|
|
69
|
+
}
|
|
49
70
|
await targetCollection.create(newObject);
|
|
50
71
|
}
|
|
51
72
|
}
|
|
52
|
-
async applyUpdates(
|
|
53
|
-
if (
|
|
73
|
+
async applyUpdates() {
|
|
74
|
+
if (this.updates.length === 0) {
|
|
54
75
|
return;
|
|
55
76
|
}
|
|
56
|
-
for (const updateModification of
|
|
77
|
+
for (const updateModification of this.updates) {
|
|
57
78
|
const targetCollection = await this.collectionProvider.getCollection(updateModification.collection);
|
|
58
79
|
const oldDoc = await targetCollection.read(updateModification.objectIdentifier.toString());
|
|
59
80
|
if (!oldDoc) {
|
|
@@ -64,20 +85,12 @@ class DatawalletModificationsProcessor {
|
|
|
64
85
|
await targetCollection.update(oldDoc, newObject);
|
|
65
86
|
}
|
|
66
87
|
}
|
|
67
|
-
async
|
|
68
|
-
if (
|
|
69
|
-
return;
|
|
70
|
-
}
|
|
71
|
-
for (const deleteModification of deleteModifications) {
|
|
72
|
-
const targetCollection = await this.collectionProvider.getCollection(deleteModification.collection);
|
|
73
|
-
await targetCollection.delete({ id: deleteModification.objectIdentifier });
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
async applyCacheChanges(cacheChanges) {
|
|
77
|
-
if (!cacheChanges || cacheChanges.length === 0) {
|
|
88
|
+
async applyCacheChanges() {
|
|
89
|
+
if (this.cacheChanges.length === 0) {
|
|
78
90
|
return;
|
|
79
91
|
}
|
|
80
|
-
|
|
92
|
+
this.ensureAllItemsAreCacheable();
|
|
93
|
+
const cacheChangesGroupedByCollection = this.groupCacheChangesByCollection(this.cacheChanges);
|
|
81
94
|
const caches = await this.cacheFetcher.fetchCacheFor({
|
|
82
95
|
files: cacheChangesGroupedByCollection.fileIds,
|
|
83
96
|
messages: cacheChangesGroupedByCollection.messageIds,
|
|
@@ -96,26 +109,25 @@ class DatawalletModificationsProcessor {
|
|
|
96
109
|
});
|
|
97
110
|
await this.saveNewCaches(relationshipCaches.relationships, DbCollectionName_1.DbCollectionName.Relationships, Relationship_1.Relationship);
|
|
98
111
|
}
|
|
112
|
+
ensureAllItemsAreCacheable() {
|
|
113
|
+
const collections = this.cacheChanges.map((c) => c.collection);
|
|
114
|
+
const uniqueCollections = [...new Set(collections)];
|
|
115
|
+
const collectionsWithUncacheableItems = uniqueCollections.filter((c) => !this.collectionsWithCacheableItems.includes(c));
|
|
116
|
+
if (collectionsWithUncacheableItems.length > 0) {
|
|
117
|
+
throw core_1.TransportErrors.datawallet
|
|
118
|
+
.unsupportedModification("unsupportedCacheChangedModificationCollection", collectionsWithUncacheableItems)
|
|
119
|
+
.logWith(this.logger);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
99
122
|
groupCacheChangesByCollection(cacheChanges) {
|
|
100
123
|
var _a, _b, _c, _d, _e;
|
|
101
124
|
const groups = lodash_1.default.groupBy(cacheChanges, (c) => c.collection);
|
|
102
125
|
const fileIds = ((_a = groups[DbCollectionName_1.DbCollectionName.Files]) !== null && _a !== void 0 ? _a : []).map((m) => m.objectIdentifier);
|
|
103
|
-
delete groups[DbCollectionName_1.DbCollectionName.Files];
|
|
104
126
|
const messageIds = ((_b = groups[DbCollectionName_1.DbCollectionName.Messages]) !== null && _b !== void 0 ? _b : []).map((m) => m.objectIdentifier);
|
|
105
|
-
delete groups[DbCollectionName_1.DbCollectionName.Messages];
|
|
106
127
|
const relationshipIds = ((_c = groups[DbCollectionName_1.DbCollectionName.Relationships]) !== null && _c !== void 0 ? _c : []).map((m) => m.objectIdentifier);
|
|
107
|
-
|
|
108
|
-
const relationshipTemplateIds = ((_d = groups[DbCollectionName_1.DbCollectionName.RelationshipTemplates]) !== null && _d !== void 0 ? _d : []).map((m) => m.objectIdentifier);
|
|
109
|
-
delete groups[DbCollectionName_1.DbCollectionName.RelationshipTemplates];
|
|
128
|
+
const templateIds = ((_d = groups[DbCollectionName_1.DbCollectionName.RelationshipTemplates]) !== null && _d !== void 0 ? _d : []).map((m) => m.objectIdentifier);
|
|
110
129
|
const tokenIds = ((_e = groups[DbCollectionName_1.DbCollectionName.Tokens]) !== null && _e !== void 0 ? _e : []).map((m) => m.objectIdentifier);
|
|
111
|
-
|
|
112
|
-
const unsupportedCollections = Object.keys(groups); // all collections not deleted before are considered as unsupported
|
|
113
|
-
if (unsupportedCollections.length > 0) {
|
|
114
|
-
throw core_1.TransportErrors.datawallet
|
|
115
|
-
.unsupportedModification("unsupportedCacheChangedModificationCollection", unsupportedCollections)
|
|
116
|
-
.logWith(this.logger);
|
|
117
|
-
}
|
|
118
|
-
return { fileIds, messageIds, relationshipTemplateIds, tokenIds, relationshipIds };
|
|
130
|
+
return { fileIds, messageIds, relationshipTemplateIds: templateIds, tokenIds, relationshipIds };
|
|
119
131
|
}
|
|
120
132
|
async saveNewCaches(caches, collectionName, constructorOfT) {
|
|
121
133
|
const collection = await this.collectionProvider.getCollection(collectionName);
|
|
@@ -126,6 +138,15 @@ class DatawalletModificationsProcessor {
|
|
|
126
138
|
await collection.update(itemDoc, item);
|
|
127
139
|
}));
|
|
128
140
|
}
|
|
141
|
+
async applyDeletes() {
|
|
142
|
+
if (this.deletes.length === 0) {
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
145
|
+
for (const deleteModification of this.deletes) {
|
|
146
|
+
const targetCollection = await this.collectionProvider.getCollection(deleteModification.collection);
|
|
147
|
+
await targetCollection.delete({ id: deleteModification.objectIdentifier });
|
|
148
|
+
}
|
|
149
|
+
}
|
|
129
150
|
}
|
|
130
151
|
exports.DatawalletModificationsProcessor = DatawalletModificationsProcessor;
|
|
131
152
|
class CacheFetcher {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatawalletModificationsProcessor.js","sourceRoot":"","sources":["../../../src/modules/sync/DatawalletModificationsProcessor.ts"],"names":[],"mappings":";;;;;;AAGA,oDAAsB;AACtB,
|
|
1
|
+
{"version":3,"file":"DatawalletModificationsProcessor.js","sourceRoot":"","sources":["../../../src/modules/sync/DatawalletModificationsProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,19 @@
|
|
|
1
1
|
import { IDatabaseCollection } from "@js-soft/docdb-access-abstractions";
|
|
2
2
|
import { CoreDate, TransportController } from "../../core";
|
|
3
|
+
import { DependencyOverrides } from "../../core/DependencyOverrides";
|
|
3
4
|
import { AccountController } from "../accounts/AccountController";
|
|
4
5
|
import { ChangedItems } from "./ChangedItems";
|
|
5
6
|
import { WhatToSync } from "./WhatToSync";
|
|
6
7
|
export declare class SyncController extends TransportController {
|
|
7
8
|
private readonly unpushedDatawalletModifications;
|
|
8
9
|
private readonly datawalletEnabled;
|
|
9
|
-
private client;
|
|
10
10
|
private syncInfo;
|
|
11
|
-
|
|
11
|
+
private readonly client;
|
|
12
|
+
private readonly deviceMigrations;
|
|
13
|
+
private readonly identityMigrations;
|
|
14
|
+
private _cacheFetcher?;
|
|
15
|
+
private get cacheFetcher();
|
|
16
|
+
constructor(parent: AccountController, dependencyOverrides: DependencyOverrides, unpushedDatawalletModifications: IDatabaseCollection, datawalletEnabled: boolean);
|
|
12
17
|
init(): Promise<SyncController>;
|
|
13
18
|
private currentSync?;
|
|
14
19
|
private currentSyncRun?;
|
|
@@ -17,15 +22,23 @@ export declare class SyncController extends TransportController {
|
|
|
17
22
|
sync(whatToSync: "Everything"): Promise<ChangedItems>;
|
|
18
23
|
sync(whatToSync: WhatToSync): Promise<ChangedItems | void>;
|
|
19
24
|
private _sync;
|
|
25
|
+
private syncExternalEvents;
|
|
20
26
|
private syncDatawallet;
|
|
27
|
+
private checkDatawalletVersion;
|
|
28
|
+
private upgradeIdentityDatawalletVersion;
|
|
29
|
+
private upgradeDeviceDatawalletVersion;
|
|
21
30
|
private applyIncomingDatawalletModifications;
|
|
22
31
|
private decryptDatawalletModifications;
|
|
23
32
|
private pushLocalDatawalletModifications;
|
|
24
33
|
private prepareLocalDatawalletModificationsForPush;
|
|
25
34
|
private deleteUnpushedDatawalletModifications;
|
|
26
|
-
|
|
35
|
+
setInititalDatawalletVersion(version: number): Promise<void>;
|
|
36
|
+
private getIdentityDatawalletVersion;
|
|
37
|
+
private startExternalEventsSyncRun;
|
|
38
|
+
private startDatawalletVersionUpgradeSyncRun;
|
|
27
39
|
private applyIncomingExternalEvents;
|
|
28
|
-
private
|
|
40
|
+
private finalizeExternalEventsSyncRun;
|
|
41
|
+
private finalizeDatawalletVersionUpgradeSyncRun;
|
|
29
42
|
private getLocalDatawalletModificationIndex;
|
|
30
43
|
private updateLocalDatawalletModificationIndex;
|
|
31
44
|
private getSyncTimeByName;
|