@nmshd/transport 1.1.9 → 1.2.1
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/ProgressReporter.d.ts +18 -0
- package/dist/core/ProgressReporter.js +45 -0
- package/dist/core/ProgressReporter.js.map +1 -0
- package/dist/core/backbone/Paginator.d.ts +7 -1
- package/dist/core/backbone/Paginator.js +25 -1
- package/dist/core/backbone/Paginator.js.map +1 -1
- package/dist/core/backbone/RESTClient.d.ts +2 -2
- package/dist/core/backbone/RESTClient.js +4 -4
- package/dist/core/backbone/RESTClient.js.map +1 -1
- package/dist/core/backbone/RESTClientAuthenticate.d.ts +2 -2
- package/dist/core/backbone/RESTClientAuthenticate.js +2 -2
- package/dist/core/backbone/RESTClientAuthenticate.js.map +1 -1
- package/dist/core/backbone/index.js +5 -1
- package/dist/core/backbone/index.js.map +1 -1
- package/dist/core/index.d.ts +1 -0
- package/dist/core/index.js +6 -1
- package/dist/core/index.js.map +1 -1
- package/dist/core/types/index.js +5 -1
- package/dist/core/types/index.js.map +1 -1
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/modules/accounts/AccountController.d.ts +3 -2
- package/dist/modules/accounts/AccountController.js +7 -4
- package/dist/modules/accounts/AccountController.js.map +1 -1
- package/dist/modules/challenges/ChallengeController.d.ts +5 -2
- package/dist/modules/challenges/ChallengeController.js +21 -27
- package/dist/modules/challenges/ChallengeController.js.map +1 -1
- package/dist/modules/index.d.ts +1 -0
- package/dist/modules/index.js +8 -1
- package/dist/modules/index.js.map +1 -1
- package/dist/modules/relationships/transmission/changes/RelationshipChange.js +8 -4
- package/dist/modules/relationships/transmission/changes/RelationshipChange.js.map +1 -1
- package/dist/modules/relationships/transmission/changes/RelationshipChangeRequest.js +8 -4
- package/dist/modules/relationships/transmission/changes/RelationshipChangeRequest.js.map +1 -1
- package/dist/modules/relationships/transmission/changes/RelationshipChangeResponse.js +8 -4
- package/dist/modules/relationships/transmission/changes/RelationshipChangeResponse.js.map +1 -1
- package/dist/modules/sync/DatawalletModificationsProcessor.d.ts +3 -1
- package/dist/modules/sync/DatawalletModificationsProcessor.js +14 -1
- package/dist/modules/sync/DatawalletModificationsProcessor.js.map +1 -1
- package/dist/modules/sync/ExternalEventsProcessor.d.ts +3 -1
- package/dist/modules/sync/ExternalEventsProcessor.js +6 -1
- package/dist/modules/sync/ExternalEventsProcessor.js.map +1 -1
- package/dist/modules/sync/SyncCallback.d.ts +17 -0
- package/dist/modules/sync/SyncCallback.js +25 -0
- package/dist/modules/sync/SyncCallback.js.map +1 -0
- package/dist/modules/sync/SyncController.d.ts +6 -4
- package/dist/modules/sync/SyncController.js +55 -31
- package/dist/modules/sync/SyncController.js.map +1 -1
- package/dist/modules/sync/backbone/SyncClient.d.ts +5 -5
- package/dist/modules/sync/backbone/SyncClient.js +5 -5
- package/dist/modules/sync/backbone/SyncClient.js.map +1 -1
- package/dist/util/index.js +5 -1
- package/dist/util/index.js.map +1 -1
- package/lib-web/nmshd.transport.js +432 -197
- 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 +30 -28
|
@@ -19,51 +19,45 @@ class ChallengeController extends TransportController_1.TransportController {
|
|
|
19
19
|
this.authClient = new ChallengeAuthClient_1.ChallengeAuthClient(this.config, this.parent.authenticator);
|
|
20
20
|
return this;
|
|
21
21
|
}
|
|
22
|
-
async
|
|
23
|
-
if (!challenge.createdBy)
|
|
24
|
-
return;
|
|
25
|
-
}
|
|
22
|
+
async validateChallengeLocally(challenge, signedChallenge) {
|
|
23
|
+
if (!challenge.createdBy)
|
|
24
|
+
return { isValid: false };
|
|
26
25
|
const relationship = await this.parent.relationships.getActiveRelationshipToIdentity(challenge.createdBy);
|
|
27
26
|
if (!relationship) {
|
|
28
27
|
throw core_1.TransportErrors.general.recordNotFound(Relationship_1.Relationship, challenge.createdBy.toString());
|
|
29
28
|
}
|
|
30
29
|
const challengeBuffer = crypto_1.CoreBuffer.fromUtf8(signedChallenge.challenge);
|
|
31
|
-
let
|
|
30
|
+
let isValid = false;
|
|
32
31
|
switch (challenge.type) {
|
|
33
32
|
case Challenge_1.ChallengeType.Identity:
|
|
34
|
-
|
|
33
|
+
isValid = await this.parent.relationships.verifyIdentity(relationship, challengeBuffer, signedChallenge.signature);
|
|
35
34
|
break;
|
|
36
35
|
case Challenge_1.ChallengeType.Device:
|
|
37
36
|
throw core_1.TransportErrors.general.notImplemented().logWith(this._log);
|
|
38
37
|
case Challenge_1.ChallengeType.Relationship:
|
|
39
|
-
|
|
38
|
+
isValid = await this.parent.relationships.verify(relationship, challengeBuffer, signedChallenge.signature);
|
|
40
39
|
break;
|
|
41
40
|
}
|
|
42
|
-
if (!
|
|
43
|
-
return;
|
|
44
|
-
}
|
|
45
|
-
return relationship;
|
|
41
|
+
if (!isValid)
|
|
42
|
+
return { isValid: false };
|
|
43
|
+
return { isValid: true, correspondingRelationship: relationship };
|
|
46
44
|
}
|
|
47
|
-
async
|
|
45
|
+
async validateChallenge(signedChallenge, requiredType) {
|
|
48
46
|
const challenge = await Challenge_1.Challenge.deserialize(signedChallenge.challenge);
|
|
49
|
-
if (requiredType && challenge.type !== requiredType)
|
|
50
|
-
return;
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
this.authClient.getChallenge(challenge.id.toString())
|
|
58
|
-
]);
|
|
59
|
-
if (!relationship ||
|
|
60
|
-
(challenge.createdBy && response.value.createdBy !== challenge.createdBy.toString()) ||
|
|
47
|
+
if (requiredType && challenge.type !== requiredType)
|
|
48
|
+
return { isValid: false };
|
|
49
|
+
if (challenge.expiresAt.isExpired())
|
|
50
|
+
return { isValid: false };
|
|
51
|
+
const backboneChallengeResponse = await this.authClient.getChallenge(challenge.id.toString());
|
|
52
|
+
if (backboneChallengeResponse.isError)
|
|
53
|
+
return { isValid: false };
|
|
54
|
+
if ((challenge.createdBy && backboneChallengeResponse.value.createdBy !== challenge.createdBy.toString()) ||
|
|
61
55
|
// TODO: JSSNMSHDD-2472 (Reenable check once the backbone returns with same timestamp)
|
|
62
56
|
// response.expiresAt !== challenge.expiresAt.toString() ||
|
|
63
|
-
|
|
64
|
-
return;
|
|
57
|
+
backboneChallengeResponse.value.id !== challenge.id.toString()) {
|
|
58
|
+
return { isValid: false };
|
|
65
59
|
}
|
|
66
|
-
return
|
|
60
|
+
return await this.validateChallengeLocally(challenge, signedChallenge);
|
|
67
61
|
}
|
|
68
62
|
async createAccountCreationChallenge(identity) {
|
|
69
63
|
const backboneResponse = (await this.client.createChallenge()).value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChallengeController.js","sourceRoot":"","sources":["../../../src/modules/challenges/ChallengeController.ts"],"names":[],"mappings":";;;AAAA,0CAAkE;AAClE,qCAAuF;AACvF,wEAAoF;AAEpF,sEAAkE;AAClE,wEAAoE;AACpE,gEAA4D;AAC5D,gDAA2D;AAC3D,4DAAwD;AAExD,MAAa,mBAAoB,SAAQ,yCAAmB;IAIxD,YAAmB,MAAyB;QACxC,KAAK,CAAC,oCAAc,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;IAC3C,CAAC;IAEM,KAAK,CAAC,IAAI;QACb,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;QAElB,IAAI,CAAC,MAAM,GAAG,IAAI,iCAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC9C,IAAI,CAAC,UAAU,GAAG,IAAI,yCAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QACjF,OAAO,IAAI,CAAA;IACf,CAAC;IAEO,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"ChallengeController.js","sourceRoot":"","sources":["../../../src/modules/challenges/ChallengeController.ts"],"names":[],"mappings":"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"}
|
package/dist/modules/index.d.ts
CHANGED
|
@@ -102,6 +102,7 @@ export * from "./sync/ChangedItems";
|
|
|
102
102
|
export * from "./sync/DatawalletModificationsProcessor";
|
|
103
103
|
export * from "./sync/ExternalEventsProcessor";
|
|
104
104
|
export * from "./sync/local/DatawalletModification";
|
|
105
|
+
export { SyncProgressCallback as SyncPercentageCallback, SyncStep } from "./sync/SyncCallback";
|
|
105
106
|
export * from "./sync/SyncController";
|
|
106
107
|
export * from "./sync/SynchronizedCollection";
|
|
107
108
|
export * from "./tokens/AnonymousTokenController";
|
package/dist/modules/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -10,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
10
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
11
15
|
};
|
|
12
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
exports.SyncStep = void 0;
|
|
13
18
|
__exportStar(require("./accounts/AccountController"), exports);
|
|
14
19
|
__exportStar(require("./accounts/backbone/IdentityClient"), exports);
|
|
15
20
|
__exportStar(require("./accounts/data/Identity"), exports);
|
|
@@ -114,6 +119,8 @@ __exportStar(require("./sync/ChangedItems"), exports);
|
|
|
114
119
|
__exportStar(require("./sync/DatawalletModificationsProcessor"), exports);
|
|
115
120
|
__exportStar(require("./sync/ExternalEventsProcessor"), exports);
|
|
116
121
|
__exportStar(require("./sync/local/DatawalletModification"), exports);
|
|
122
|
+
var SyncCallback_1 = require("./sync/SyncCallback");
|
|
123
|
+
Object.defineProperty(exports, "SyncStep", { enumerable: true, get: function () { return SyncCallback_1.SyncStep; } });
|
|
117
124
|
__exportStar(require("./sync/SyncController"), exports);
|
|
118
125
|
__exportStar(require("./sync/SynchronizedCollection"), exports);
|
|
119
126
|
__exportStar(require("./tokens/AnonymousTokenController"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/modules/index.ts"],"names":[],"mappings":"
|
|
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,oDAA8F;AAArC,wGAAA,QAAQ,OAAA;AACjE,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"}
|
|
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var RelationshipChange_1;
|
|
11
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
13
|
exports.RelationshipChange = void 0;
|
|
13
14
|
const ts_serval_1 = require("@js-soft/ts-serval");
|
|
@@ -17,7 +18,7 @@ const RelationshipChangeRequest_1 = require("./RelationshipChangeRequest");
|
|
|
17
18
|
const RelationshipChangeResponse_1 = require("./RelationshipChangeResponse");
|
|
18
19
|
const RelationshipChangeStatus_1 = require("./RelationshipChangeStatus");
|
|
19
20
|
const RelationshipChangeType_1 = require("./RelationshipChangeType");
|
|
20
|
-
class RelationshipChange extends core_1.CoreSerializableAsync {
|
|
21
|
+
let RelationshipChange = RelationshipChange_1 = class RelationshipChange extends core_1.CoreSerializableAsync {
|
|
21
22
|
static async fromBackbone(backboneChange, requestContent, responseContent) {
|
|
22
23
|
const relationshipChange = await this.from({
|
|
23
24
|
id: CoreId_1.CoreId.from(backboneChange.id),
|
|
@@ -32,12 +33,12 @@ class RelationshipChange extends core_1.CoreSerializableAsync {
|
|
|
32
33
|
return relationshipChange;
|
|
33
34
|
}
|
|
34
35
|
static async from(value) {
|
|
35
|
-
return await super.fromT(value,
|
|
36
|
+
return await super.fromT(value, RelationshipChange_1);
|
|
36
37
|
}
|
|
37
38
|
static async deserialize(value) {
|
|
38
|
-
return await super.deserializeT(value,
|
|
39
|
+
return await super.deserializeT(value, RelationshipChange_1);
|
|
39
40
|
}
|
|
40
|
-
}
|
|
41
|
+
};
|
|
41
42
|
__decorate([
|
|
42
43
|
(0, ts_serval_1.validate)(),
|
|
43
44
|
(0, ts_serval_1.serialize)(),
|
|
@@ -68,5 +69,8 @@ __decorate([
|
|
|
68
69
|
(0, ts_serval_1.serialize)(),
|
|
69
70
|
__metadata("design:type", String)
|
|
70
71
|
], RelationshipChange.prototype, "type", void 0);
|
|
72
|
+
RelationshipChange = RelationshipChange_1 = __decorate([
|
|
73
|
+
(0, ts_serval_1.type)("RelationshipChange")
|
|
74
|
+
], RelationshipChange);
|
|
71
75
|
exports.RelationshipChange = RelationshipChange;
|
|
72
76
|
//# sourceMappingURL=RelationshipChange.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RelationshipChange.js","sourceRoot":"","sources":["../../../../../src/modules/relationships/transmission/changes/RelationshipChange.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RelationshipChange.js","sourceRoot":"","sources":["../../../../../src/modules/relationships/transmission/changes/RelationshipChange.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAA6E;AAC7E,2CAAgF;AAChF,0DAA+D;AAE/D,2EAAmG;AACnG,6EAAsG;AACtG,yEAAqE;AACrE,qEAAiE;AAYjE,IAAa,kBAAkB,0BAA/B,MAAa,kBAAmB,SAAQ,4BAAqB;IAyBlD,MAAM,CAAC,KAAK,CAAC,YAAY,CAC5B,cAAuD,EACvD,cAA8B,EAC9B,eAA+B;QAE/B,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;YACvC,EAAE,EAAE,eAAM,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;YAClC,cAAc,EAAE,eAAM,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC;YAC1D,IAAI,EAAE,cAAc,CAAC,IAAI;YACzB,MAAM,EAAE,cAAc,CAAC,MAAM;YAC7B,OAAO,EAAE,MAAM,qDAAyB,CAAC,YAAY,CAAC,cAAc,CAAC,OAAO,EAAE,cAAc,CAAC;SAChG,CAAC,CAAA;QAEF,IAAI,cAAc,CAAC,QAAQ,EAAE;YACzB,kBAAkB,CAAC,QAAQ,GAAG,MAAM,uDAA0B,CAAC,YAAY,CACvE,cAAc,CAAC,QAAQ,EACvB,eAAe,CAClB,CAAA;SACJ;QAED,OAAO,kBAAkB,CAAA;IAC7B,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAA0B;QAC/C,OAAO,MAAM,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,oBAAkB,CAAC,CAAA;IACvD,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,KAAa;QACzC,OAAO,MAAM,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,oBAAkB,CAAC,CAAA;IAC9D,CAAC;CACJ,CAAA;AApDG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACD,eAAM;8CAAA;AAIjB;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACW,eAAM;0DAAA;AAI7B;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACI,qDAAyB;mDAAA;AAIzC;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;8BACM,uDAA0B;oDAAA;AAI5C;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;kDAC2B;AAIvC;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;;gDACuB;AAvB1B,kBAAkB;IAD9B,IAAA,gBAAI,EAAC,oBAAoB,CAAC;GACd,kBAAkB,CAuD9B;AAvDY,gDAAkB"}
|
|
@@ -8,12 +8,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var RelationshipChangeRequest_1;
|
|
11
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
13
|
exports.RelationshipChangeRequest = void 0;
|
|
13
14
|
const ts_serval_1 = require("@js-soft/ts-serval");
|
|
14
15
|
const core_1 = require("../../../../core");
|
|
15
16
|
const CoreId_1 = require("../../../../core/types/CoreId");
|
|
16
|
-
class RelationshipChangeRequest extends core_1.CoreSerializableAsync {
|
|
17
|
+
let RelationshipChangeRequest = RelationshipChangeRequest_1 = class RelationshipChangeRequest extends core_1.CoreSerializableAsync {
|
|
17
18
|
static async fromBackbone(backboneChange, content) {
|
|
18
19
|
return await this.from({
|
|
19
20
|
createdBy: core_1.CoreAddress.from(backboneChange.createdBy),
|
|
@@ -23,12 +24,12 @@ class RelationshipChangeRequest extends core_1.CoreSerializableAsync {
|
|
|
23
24
|
});
|
|
24
25
|
}
|
|
25
26
|
static async from(value) {
|
|
26
|
-
return await super.fromT(value,
|
|
27
|
+
return await super.fromT(value, RelationshipChangeRequest_1);
|
|
27
28
|
}
|
|
28
29
|
static async deserialize(value) {
|
|
29
|
-
return await super.deserializeT(value,
|
|
30
|
+
return await super.deserializeT(value, RelationshipChangeRequest_1);
|
|
30
31
|
}
|
|
31
|
-
}
|
|
32
|
+
};
|
|
32
33
|
__decorate([
|
|
33
34
|
(0, ts_serval_1.validate)(),
|
|
34
35
|
(0, ts_serval_1.serialize)(),
|
|
@@ -49,5 +50,8 @@ __decorate([
|
|
|
49
50
|
(0, ts_serval_1.serialize)(),
|
|
50
51
|
__metadata("design:type", ts_serval_1.SerializableAsync)
|
|
51
52
|
], RelationshipChangeRequest.prototype, "content", void 0);
|
|
53
|
+
RelationshipChangeRequest = RelationshipChangeRequest_1 = __decorate([
|
|
54
|
+
(0, ts_serval_1.type)("RelationshipChangeRequest")
|
|
55
|
+
], RelationshipChangeRequest);
|
|
52
56
|
exports.RelationshipChangeRequest = RelationshipChangeRequest;
|
|
53
57
|
//# sourceMappingURL=RelationshipChangeRequest.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RelationshipChangeRequest.js","sourceRoot":"","sources":["../../../../../src/modules/relationships/transmission/changes/RelationshipChangeRequest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RelationshipChangeRequest.js","sourceRoot":"","sources":["../../../../../src/modules/relationships/transmission/changes/RelationshipChangeRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAAoH;AACpH,2CAA6F;AAE7F,0DAA+D;AAW/D,IAAa,yBAAyB,iCAAtC,MAAa,yBAA0B,SAAQ,4BAAqB;IAiBzD,MAAM,CAAC,KAAK,CAAC,YAAY,CAC5B,cAAmE,EACnE,OAA4B;QAE5B,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC;YACnB,SAAS,EAAE,kBAAW,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC;YACrD,eAAe,EAAE,eAAM,CAAC,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC;YAC5D,SAAS,EAAE,eAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC;YAClD,OAAO,EAAE,OAAO;SACnB,CAAC,CAAA;IACN,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAiC;QACtD,OAAO,MAAM,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,2BAAyB,CAAC,CAAA;IAC9D,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,KAAa;QACzC,OAAO,MAAM,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,2BAAyB,CAAC,CAAA;IACrE,CAAC;CACJ,CAAA;AAjCG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACM,kBAAW;4DAAA;AAI7B;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACY,eAAM;kEAAA;AAI9B;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACM,eAAQ;4DAAA;AAI1B;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;8BACK,6BAAiB;0DAAA;AAfzB,yBAAyB;IADrC,IAAA,gBAAI,EAAC,2BAA2B,CAAC;GACrB,yBAAyB,CAoCrC;AApCY,8DAAyB"}
|
|
@@ -8,12 +8,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var RelationshipChangeResponse_1;
|
|
11
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
13
|
exports.RelationshipChangeResponse = void 0;
|
|
13
14
|
const ts_serval_1 = require("@js-soft/ts-serval");
|
|
14
15
|
const core_1 = require("../../../../core");
|
|
15
16
|
const CoreId_1 = require("../../../../core/types/CoreId");
|
|
16
|
-
class RelationshipChangeResponse extends core_1.CoreSerializableAsync {
|
|
17
|
+
let RelationshipChangeResponse = RelationshipChangeResponse_1 = class RelationshipChangeResponse extends core_1.CoreSerializableAsync {
|
|
17
18
|
static async fromBackbone(backboneChange, content) {
|
|
18
19
|
return await this.from({
|
|
19
20
|
createdBy: core_1.CoreAddress.from(backboneChange.createdBy),
|
|
@@ -23,12 +24,12 @@ class RelationshipChangeResponse extends core_1.CoreSerializableAsync {
|
|
|
23
24
|
});
|
|
24
25
|
}
|
|
25
26
|
static async from(value) {
|
|
26
|
-
return await super.fromT(value,
|
|
27
|
+
return await super.fromT(value, RelationshipChangeResponse_1);
|
|
27
28
|
}
|
|
28
29
|
static async deserialize(value) {
|
|
29
|
-
return await super.deserializeT(value,
|
|
30
|
+
return await super.deserializeT(value, RelationshipChangeResponse_1);
|
|
30
31
|
}
|
|
31
|
-
}
|
|
32
|
+
};
|
|
32
33
|
__decorate([
|
|
33
34
|
(0, ts_serval_1.validate)(),
|
|
34
35
|
(0, ts_serval_1.serialize)(),
|
|
@@ -49,5 +50,8 @@ __decorate([
|
|
|
49
50
|
(0, ts_serval_1.serialize)(),
|
|
50
51
|
__metadata("design:type", ts_serval_1.SerializableAsync)
|
|
51
52
|
], RelationshipChangeResponse.prototype, "content", void 0);
|
|
53
|
+
RelationshipChangeResponse = RelationshipChangeResponse_1 = __decorate([
|
|
54
|
+
(0, ts_serval_1.type)("RelationshipChangeResponse")
|
|
55
|
+
], RelationshipChangeResponse);
|
|
52
56
|
exports.RelationshipChangeResponse = RelationshipChangeResponse;
|
|
53
57
|
//# sourceMappingURL=RelationshipChangeResponse.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RelationshipChangeResponse.js","sourceRoot":"","sources":["../../../../../src/modules/relationships/transmission/changes/RelationshipChangeResponse.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RelationshipChangeResponse.js","sourceRoot":"","sources":["../../../../../src/modules/relationships/transmission/changes/RelationshipChangeResponse.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAAqG;AACrG,2CAAqH;AAErH,0DAA+D;AAW/D,IAAa,0BAA0B,kCAAvC,MAAa,0BAA2B,SAAQ,4BAAqB;IAiB1D,MAAM,CAAC,KAAK,CAAC,YAAY,CAC5B,cAAmE,EACnE,OAA4B;QAE5B,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC;YACnB,SAAS,EAAE,kBAAW,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC;YACrD,eAAe,EAAE,eAAM,CAAC,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC;YAC5D,SAAS,EAAE,eAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC;YAClD,OAAO,EAAE,OAAO;SACnB,CAAC,CAAA;IACN,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAkC;QACvD,OAAO,MAAM,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,4BAA0B,CAAC,CAAA;IAC/D,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,KAAa;QACzC,OAAO,MAAM,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,4BAA0B,CAAC,CAAA;IACtE,CAAC;CACJ,CAAA;AAjCG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACM,kBAAW;6DAAA;AAI7B;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACY,eAAM;mEAAA;AAI9B;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACM,eAAQ;6DAAA;AAI1B;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;8BACK,6BAAiB;2DAAA;AAfzB,0BAA0B;IADtC,IAAA,gBAAI,EAAC,4BAA4B,CAAC;GACtB,0BAA0B,CAoCtC;AApCY,gEAA0B"}
|
|
@@ -12,6 +12,7 @@ import { RelationshipTemplateController } from "../relationshipTemplates/Relatio
|
|
|
12
12
|
import { CachedToken } from "../tokens/local/CachedToken";
|
|
13
13
|
import { TokenController } from "../tokens/TokenController";
|
|
14
14
|
import { DatawalletModification } from "./local/DatawalletModification";
|
|
15
|
+
import { SyncProgressReporter } from "./SyncCallback";
|
|
15
16
|
export declare class DatawalletModificationsProcessor {
|
|
16
17
|
private readonly cacheFetcher;
|
|
17
18
|
private readonly collectionProvider;
|
|
@@ -20,7 +21,8 @@ export declare class DatawalletModificationsProcessor {
|
|
|
20
21
|
private readonly updates;
|
|
21
22
|
private readonly deletes;
|
|
22
23
|
private readonly cacheChanges;
|
|
23
|
-
|
|
24
|
+
private readonly syncStep;
|
|
25
|
+
constructor(modifications: DatawalletModification[], cacheFetcher: CacheFetcher, collectionProvider: IDatabaseCollectionProvider, logger: ILogger, reporter: SyncProgressReporter);
|
|
24
26
|
private readonly collectionsWithCacheableItems;
|
|
25
27
|
execute(): Promise<void>;
|
|
26
28
|
private applyCreates;
|
|
@@ -13,8 +13,9 @@ const Relationship_1 = require("../relationships/local/Relationship");
|
|
|
13
13
|
const RelationshipTemplate_1 = require("../relationshipTemplates/local/RelationshipTemplate");
|
|
14
14
|
const Token_1 = require("../tokens/local/Token");
|
|
15
15
|
const DatawalletModification_1 = require("./local/DatawalletModification");
|
|
16
|
+
const SyncCallback_1 = require("./SyncCallback");
|
|
16
17
|
class DatawalletModificationsProcessor {
|
|
17
|
-
constructor(modifications, cacheFetcher, collectionProvider, logger) {
|
|
18
|
+
constructor(modifications, cacheFetcher, collectionProvider, logger, reporter) {
|
|
18
19
|
var _a, _b, _c, _d;
|
|
19
20
|
this.cacheFetcher = cacheFetcher;
|
|
20
21
|
this.collectionProvider = collectionProvider;
|
|
@@ -31,12 +32,17 @@ class DatawalletModificationsProcessor {
|
|
|
31
32
|
this.updates = (_b = modificationsGroupedByType[DatawalletModification_1.DatawalletModificationType.Update]) !== null && _b !== void 0 ? _b : [];
|
|
32
33
|
this.deletes = (_c = modificationsGroupedByType[DatawalletModification_1.DatawalletModificationType.Delete]) !== null && _c !== void 0 ? _c : [];
|
|
33
34
|
this.cacheChanges = (_d = modificationsGroupedByType[DatawalletModification_1.DatawalletModificationType.CacheChanged]) !== null && _d !== void 0 ? _d : [];
|
|
35
|
+
const totalItems = this.creates.length + this.updates.length + this.deletes.length + this.cacheChanges.length;
|
|
36
|
+
this.syncStep = reporter.createStep(SyncCallback_1.SyncStep.DatawalletSyncProcessing, totalItems);
|
|
34
37
|
}
|
|
35
38
|
async execute() {
|
|
36
39
|
await this.applyCreates();
|
|
37
40
|
await this.applyUpdates();
|
|
38
41
|
await this.applyCacheChanges();
|
|
39
42
|
await this.applyDeletes();
|
|
43
|
+
// cache-fills are optimized by the backbone, so it is possible that the processedItemCount is
|
|
44
|
+
// lower than the total number of items - in this case the 100% callback is triggered here
|
|
45
|
+
this.syncStep.finish();
|
|
40
46
|
}
|
|
41
47
|
async applyCreates() {
|
|
42
48
|
if (this.creates.length === 0) {
|
|
@@ -66,8 +72,10 @@ class DatawalletModificationsProcessor {
|
|
|
66
72
|
objectIdentifier: core_1.CoreId.from(objectIdentifier)
|
|
67
73
|
});
|
|
68
74
|
this.cacheChanges.push(modification);
|
|
75
|
+
this.syncStep.incrementTotalNumberOfItems();
|
|
69
76
|
}
|
|
70
77
|
await targetCollection.create(newObject);
|
|
78
|
+
this.syncStep.progress();
|
|
71
79
|
}
|
|
72
80
|
}
|
|
73
81
|
async applyUpdates() {
|
|
@@ -83,6 +91,7 @@ class DatawalletModificationsProcessor {
|
|
|
83
91
|
const oldObject = await core_1.CoreSerializableAsync.fromUnknown(oldDoc);
|
|
84
92
|
const newObject = { ...oldObject.toJSON(), ...updateModification.payload };
|
|
85
93
|
await targetCollection.update(oldDoc, newObject);
|
|
94
|
+
this.syncStep.progress();
|
|
86
95
|
}
|
|
87
96
|
}
|
|
88
97
|
async applyCacheChanges() {
|
|
@@ -130,12 +139,15 @@ class DatawalletModificationsProcessor {
|
|
|
130
139
|
return { fileIds, messageIds, relationshipTemplateIds: templateIds, tokenIds, relationshipIds };
|
|
131
140
|
}
|
|
132
141
|
async saveNewCaches(caches, collectionName, constructorOfT) {
|
|
142
|
+
if (caches.length === 0)
|
|
143
|
+
return;
|
|
133
144
|
const collection = await this.collectionProvider.getCollection(collectionName);
|
|
134
145
|
await Promise.all(caches.map(async (c) => {
|
|
135
146
|
const itemDoc = await collection.read(c.id.toString());
|
|
136
147
|
const item = await core_1.CoreSerializableAsync.fromT(itemDoc, constructorOfT);
|
|
137
148
|
item.setCache(c.cache);
|
|
138
149
|
await collection.update(itemDoc, item);
|
|
150
|
+
this.syncStep.progress();
|
|
139
151
|
}));
|
|
140
152
|
}
|
|
141
153
|
async applyDeletes() {
|
|
@@ -145,6 +157,7 @@ class DatawalletModificationsProcessor {
|
|
|
145
157
|
for (const deleteModification of this.deletes) {
|
|
146
158
|
const targetCollection = await this.collectionProvider.getCollection(deleteModification.collection);
|
|
147
159
|
await targetCollection.delete({ id: deleteModification.objectIdentifier });
|
|
160
|
+
this.syncStep.progress();
|
|
148
161
|
}
|
|
149
162
|
}
|
|
150
163
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatawalletModificationsProcessor.js","sourceRoot":"","sources":["../../../src/modules/sync/DatawalletModificationsProcessor.ts"],"names":[],"mappings":";;;;;;AAGA,oDAAsB;AACtB,qCAAyF;AACzF,kEAA8D;AAI9D,8CAA0C;AAE1C,uDAAmD;AAGnD,sEAAkE;AAGlE,8FAA0F;AAG1F,iDAA6C;AAE7C,2EAAmG;
|
|
1
|
+
{"version":3,"file":"DatawalletModificationsProcessor.js","sourceRoot":"","sources":["../../../src/modules/sync/DatawalletModificationsProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { RelationshipsController } from "../relationships/RelationshipsControlle
|
|
|
3
3
|
import { BackboneExternalEvent } from "./backbone/BackboneExternalEvent";
|
|
4
4
|
import { FinalizeSyncRunRequestExternalEventResult } from "./backbone/FinalizeSyncRun";
|
|
5
5
|
import { ChangedItems } from "./ChangedItems";
|
|
6
|
+
import { SyncProgressReporter } from "./SyncCallback";
|
|
6
7
|
export declare class ExternalEventsProcessor {
|
|
7
8
|
private readonly messagesController;
|
|
8
9
|
private readonly relationshipsController;
|
|
@@ -10,7 +11,8 @@ export declare class ExternalEventsProcessor {
|
|
|
10
11
|
private readonly log;
|
|
11
12
|
readonly changedItems: ChangedItems;
|
|
12
13
|
readonly results: FinalizeSyncRunRequestExternalEventResult[];
|
|
13
|
-
|
|
14
|
+
private readonly syncStep;
|
|
15
|
+
constructor(messagesController: MessageController, relationshipsController: RelationshipsController, externalEvents: BackboneExternalEvent[], reporter: SyncProgressReporter);
|
|
14
16
|
execute(): Promise<void>;
|
|
15
17
|
private applyRelationshipChangeCompletedEvent;
|
|
16
18
|
private applyRelationshipChangeCreatedEvent;
|
|
@@ -3,14 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ExternalEventsProcessor = void 0;
|
|
4
4
|
const core_1 = require("../../core");
|
|
5
5
|
const ChangedItems_1 = require("./ChangedItems");
|
|
6
|
+
const SyncCallback_1 = require("./SyncCallback");
|
|
6
7
|
class ExternalEventsProcessor {
|
|
7
|
-
constructor(messagesController, relationshipsController, externalEvents) {
|
|
8
|
+
constructor(messagesController, relationshipsController, externalEvents, reporter) {
|
|
8
9
|
this.messagesController = messagesController;
|
|
9
10
|
this.relationshipsController = relationshipsController;
|
|
10
11
|
this.externalEvents = externalEvents;
|
|
11
12
|
this.changedItems = new ChangedItems_1.ChangedItems();
|
|
12
13
|
this.results = [];
|
|
13
14
|
this.log = core_1.TransportLoggerFactory.getLogger(ExternalEventsProcessor);
|
|
15
|
+
this.syncStep = reporter.createStep(SyncCallback_1.SyncStep.ExternalEventsProcessing, externalEvents.length);
|
|
14
16
|
}
|
|
15
17
|
async execute() {
|
|
16
18
|
for (const externalEvent of this.externalEvents) {
|
|
@@ -52,6 +54,9 @@ class ExternalEventsProcessor {
|
|
|
52
54
|
errorCode: errorCode
|
|
53
55
|
});
|
|
54
56
|
}
|
|
57
|
+
finally {
|
|
58
|
+
this.syncStep.progress();
|
|
59
|
+
}
|
|
55
60
|
}
|
|
56
61
|
}
|
|
57
62
|
async applyRelationshipChangeCompletedEvent(externalEvent) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExternalEventsProcessor.js","sourceRoot":"","sources":["../../../src/modules/sync/ExternalEventsProcessor.ts"],"names":[],"mappings":";;;AACA,qCAA2D;AAK3D,iDAA6C;
|
|
1
|
+
{"version":3,"file":"ExternalEventsProcessor.js","sourceRoot":"","sources":["../../../src/modules/sync/ExternalEventsProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { ProgressReporter, ProgressReporterStep } from "../../core";
|
|
2
|
+
export declare type SyncProgressCallback = (percentage: number, step: SyncStep) => void;
|
|
3
|
+
export declare class SyncProgressReporter extends ProgressReporter<SyncStep> {
|
|
4
|
+
static fromCallback(callback?: SyncProgressCallback): SyncProgressReporter;
|
|
5
|
+
}
|
|
6
|
+
export declare class SyncProgressReporterStep extends ProgressReporterStep<SyncStep> {
|
|
7
|
+
}
|
|
8
|
+
export declare enum SyncStep {
|
|
9
|
+
Sync = "sync",
|
|
10
|
+
DatawalletSync = "sync:datawallet",
|
|
11
|
+
DatawalletSyncDownloading = "sync:datawallet:downloading",
|
|
12
|
+
DatawalletSyncDecryption = "sync:datawallet:decrypting",
|
|
13
|
+
DatawalletSyncProcessing = "sync:datawallet:processing",
|
|
14
|
+
ExternalEventsSync = "sync:externalEvents",
|
|
15
|
+
ExternalEventsSyncDownloading = "sync:externalEvents:downloading",
|
|
16
|
+
ExternalEventsProcessing = "sync:externalEvents:processing"
|
|
17
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SyncStep = exports.SyncProgressReporterStep = exports.SyncProgressReporter = void 0;
|
|
4
|
+
const core_1 = require("../../core");
|
|
5
|
+
class SyncProgressReporter extends core_1.ProgressReporter {
|
|
6
|
+
static fromCallback(callback) {
|
|
7
|
+
return new SyncProgressReporter(callback);
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
exports.SyncProgressReporter = SyncProgressReporter;
|
|
11
|
+
class SyncProgressReporterStep extends core_1.ProgressReporterStep {
|
|
12
|
+
}
|
|
13
|
+
exports.SyncProgressReporterStep = SyncProgressReporterStep;
|
|
14
|
+
var SyncStep;
|
|
15
|
+
(function (SyncStep) {
|
|
16
|
+
SyncStep["Sync"] = "sync";
|
|
17
|
+
SyncStep["DatawalletSync"] = "sync:datawallet";
|
|
18
|
+
SyncStep["DatawalletSyncDownloading"] = "sync:datawallet:downloading";
|
|
19
|
+
SyncStep["DatawalletSyncDecryption"] = "sync:datawallet:decrypting";
|
|
20
|
+
SyncStep["DatawalletSyncProcessing"] = "sync:datawallet:processing";
|
|
21
|
+
SyncStep["ExternalEventsSync"] = "sync:externalEvents";
|
|
22
|
+
SyncStep["ExternalEventsSyncDownloading"] = "sync:externalEvents:downloading";
|
|
23
|
+
SyncStep["ExternalEventsProcessing"] = "sync:externalEvents:processing";
|
|
24
|
+
})(SyncStep = exports.SyncStep || (exports.SyncStep = {}));
|
|
25
|
+
//# sourceMappingURL=SyncCallback.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SyncCallback.js","sourceRoot":"","sources":["../../../src/modules/sync/SyncCallback.ts"],"names":[],"mappings":";;;AAAA,qCAAmE;AAInE,MAAa,oBAAqB,SAAQ,uBAA0B;IACzD,MAAM,CAAC,YAAY,CAAC,QAA+B;QACtD,OAAO,IAAI,oBAAoB,CAAC,QAAQ,CAAC,CAAA;IAC7C,CAAC;CACJ;AAJD,oDAIC;AACD,MAAa,wBAAyB,SAAQ,2BAA8B;CAAG;AAA/E,4DAA+E;AAE/E,IAAY,QASX;AATD,WAAY,QAAQ;IAChB,yBAAa,CAAA;IACb,8CAAkC,CAAA;IAClC,qEAAyD,CAAA;IACzD,mEAAuD,CAAA;IACvD,mEAAuD,CAAA;IACvD,sDAA0C,CAAA;IAC1C,6EAAiE,CAAA;IACjE,uEAA2D,CAAA;AAC/D,CAAC,EATW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QASnB"}
|
|
@@ -3,6 +3,7 @@ import { CoreDate, TransportController } from "../../core";
|
|
|
3
3
|
import { DependencyOverrides } from "../../core/DependencyOverrides";
|
|
4
4
|
import { AccountController } from "../accounts/AccountController";
|
|
5
5
|
import { ChangedItems } from "./ChangedItems";
|
|
6
|
+
import { SyncProgressReporter } from "./SyncCallback";
|
|
6
7
|
import { WhatToSync } from "./WhatToSync";
|
|
7
8
|
export declare class SyncController extends TransportController {
|
|
8
9
|
private readonly unpushedDatawalletModifications;
|
|
@@ -17,10 +18,9 @@ export declare class SyncController extends TransportController {
|
|
|
17
18
|
init(): Promise<SyncController>;
|
|
18
19
|
private currentSync?;
|
|
19
20
|
private currentSyncRun?;
|
|
20
|
-
sync(): Promise<
|
|
21
|
-
sync(whatToSync: "
|
|
22
|
-
sync(whatToSync:
|
|
23
|
-
sync(whatToSync: WhatToSync): Promise<ChangedItems | void>;
|
|
21
|
+
sync(whatToSync: "OnlyDatawallet", reporter: SyncProgressReporter): Promise<void>;
|
|
22
|
+
sync(whatToSync: "Everything", reporter: SyncProgressReporter): Promise<ChangedItems>;
|
|
23
|
+
sync(whatToSync: WhatToSync, reporter: SyncProgressReporter): Promise<ChangedItems | void>;
|
|
24
24
|
private _sync;
|
|
25
25
|
private syncExternalEvents;
|
|
26
26
|
private syncDatawallet;
|
|
@@ -28,7 +28,9 @@ export declare class SyncController extends TransportController {
|
|
|
28
28
|
private upgradeIdentityDatawalletVersion;
|
|
29
29
|
private upgradeDeviceDatawalletVersion;
|
|
30
30
|
private applyIncomingDatawalletModifications;
|
|
31
|
+
private promiseAllWithProgess;
|
|
31
32
|
private decryptDatawalletModifications;
|
|
33
|
+
private decryptDatawalletModification;
|
|
32
34
|
private pushLocalDatawalletModifications;
|
|
33
35
|
private prepareLocalDatawalletModificationsForPush;
|
|
34
36
|
private deleteUnpushedDatawalletModifications;
|