@nmshd/transport 1.1.10 → 2.0.0-alpha.1

package/dist/modules/secrets/SecretController.js

@@ -51,7 +51,7 @@ class SecretController extends TransportController_1.TransportController {
             validTo: validTo,
             active: true
         };
-        const container = await SecretContainerCipher_1.SecretContainerCipher.from(secretContainerInterface);
+        const container = SecretContainerCipher_1.SecretContainerCipher.from(secretContainerInterface);
         this.log.trace(`Created secret id:${container.id} name:${container.name} on ${container.createdAt.toISOString()}.`);
         await this.secrets.create(container);
         return container;
@@ -60,7 +60,7 @@ class SecretController extends TransportController_1.TransportController {
         const secrets = await this.secrets.find({ name: name });
         const plainSecrets = [];
         for (const secretObj of secrets) {
-            const secret = await SecretContainerCipher_1.SecretContainerCipher.from(secretObj);
+            const secret = SecretContainerCipher_1.SecretContainerCipher.from(secretObj);
             const plainSecret = await this.loadSecretById(secret.id);
             if (plainSecret) {
                 plainSecrets.push(plainSecret);
@@ -82,13 +82,13 @@ class SecretController extends TransportController_1.TransportController {
         if (secrets.length > 1) {
             this.log.warn(`More than one active secret has been found for secret name '${name}'.`);
         }
-        const secret = await SecretContainerCipher_1.SecretContainerCipher.from(secrets[0]);
+        const secret = SecretContainerCipher_1.SecretContainerCipher.from(secrets[0]);
         return secret;
     }
     async succeedSecretWithName(secret, name, description = "", validTo) {
         const oldSecret = await this.secrets.findOne({ name: name, active: true });
         if (oldSecret) {
-            const updatedOldSecret = await SecretContainerCipher_1.SecretContainerCipher.from(oldSecret);
+            const updatedOldSecret = SecretContainerCipher_1.SecretContainerCipher.from(oldSecret);
             updatedOldSecret.validTo = core_1.CoreDate.utc();
             updatedOldSecret.active = false;
             await this.secrets.update(oldSecret, updatedOldSecret);
@@ -100,8 +100,8 @@ class SecretController extends TransportController_1.TransportController {
         const decryptionKey = await core_1.CoreCrypto.deriveKeyFromBase(baseKey, secret.nonce ? secret.nonce : 0, SecretController.secretContext);
         const plainBuffer = await core_1.CoreCrypto.decrypt(secret.cipher, decryptionKey);
         const plainString = plainBuffer.toUtf8();
-        const decryptedSecret = await ts_serval_1.SerializableAsync.deserializeUnknown(plainString);
-        const plainSecret = await SecretContainerPlain_1.SecretContainerPlain.from({
+        const decryptedSecret = ts_serval_1.Serializable.deserializeUnknown(plainString);
+        const plainSecret = SecretContainerPlain_1.SecretContainerPlain.from({
             id: secret.id,
             createdAt: secret.createdAt,
             description: secret.description,
@@ -119,7 +119,7 @@ class SecretController extends TransportController_1.TransportController {
         const secretObj = await this.secrets.findOne({ id: id.toString() });
         if (!secretObj)
             return;
-        const secret = await SecretContainerCipher_1.SecretContainerCipher.from(secretObj);
+        const secret = SecretContainerCipher_1.SecretContainerCipher.from(secretObj);
         return await this.decryptSecret(secret);
     }
     async deleteSecretById(id) {

package/dist/modules/secrets/SecretController.js.map

@@ -1 +1 @@
-{"version":3,"file":"SecretController.js","sourceRoot":"","sources":["../../../src/modules/secrets/SecretController.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SecretController.js","sourceRoot":"","sources":["../../../src/modules/secrets/SecretController.ts"],"names":[],"mappings":"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"}

package/dist/modules/secrets/data/SecretContainerCipher.d.ts

@@ -21,5 +21,5 @@ export declare class SecretContainerCipher extends CoreSynchronizable implements
     nonce?: number;
     active: boolean;
     cipher: CryptoCipher;
-    static from(value: ISecretContainerCipher): Promise<SecretContainerCipher>;
+    static from(value: ISecretContainerCipher): SecretContainerCipher;
 }

package/dist/modules/secrets/data/SecretContainerCipher.js

@@ -8,7 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var SecretContainerCipher_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecretContainerCipher = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
@@ -16,7 +15,7 @@ const crypto_1 = require("@nmshd/crypto");
 const ts_simple_nameof_1 = require("ts-simple-nameof");
 const CoreSynchronizable_1 = require("../../../core/CoreSynchronizable");
 const CoreDate_1 = require("../../../core/types/CoreDate");
-let SecretContainerCipher = SecretContainerCipher_1 = class SecretContainerCipher extends CoreSynchronizable_1.CoreSynchronizable {
+let SecretContainerCipher = class SecretContainerCipher extends CoreSynchronizable_1.CoreSynchronizable {
     constructor() {
         super(...arguments);
         this.technicalProperties = [
@@ -36,8 +35,8 @@ let SecretContainerCipher = SecretContainerCipher_1 = class SecretContainerCiphe
         // eslint-disable-next-line @typescript-eslint/no-inferrable-types
         this.description = "";
     }
-    static async from(value) {
-        return await super.fromT(value, SecretContainerCipher_1);
+    static from(value) {
+        return this.fromAny(value);
     }
 };
 __decorate([
@@ -80,7 +79,7 @@ __decorate([
     (0, ts_serval_1.validate)(),
     __metadata("design:type", crypto_1.CryptoCipher)
 ], SecretContainerCipher.prototype, "cipher", void 0);
-SecretContainerCipher = SecretContainerCipher_1 = __decorate([
+SecretContainerCipher = __decorate([
     (0, ts_serval_1.type)("SecretContainerCipher")
 ], SecretContainerCipher);
 exports.SecretContainerCipher = SecretContainerCipher;

package/dist/modules/secrets/data/SecretContainerCipher.js.map

@@ -1 +1 @@
-{"version":3,"file":"SecretContainerCipher.js","sourceRoot":"","sources":["../../../../src/modules/secrets/data/SecretContainerCipher.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAA8D;AAC9D,0CAA2D;AAC3D,uDAAyC;AACzC,yEAA0F;AAC1F,2DAAkE;AAclE,IAAa,qBAAqB,6BAAlC,MAAa,qBAAsB,SAAQ,uCAAkB;IAA7D;;QACoB,wBAAmB,GAAG;YAClC,OAAO;YACP,UAAU;YACV,IAAA,yBAAM,EAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAC5C,IAAA,yBAAM,EAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;YACnD,IAAA,yBAAM,EAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACjD,IAAA,yBAAM,EAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACjD,IAAA,yBAAM,EAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YAC/C,IAAA,yBAAM,EAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YAC7C,IAAA,yBAAM,EAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9C,IAAA,yBAAM,EAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;SACjD,CAAA;QAED,kEAAkE;QAG3D,SAAI,GAAW,EAAE,CAAA;QAExB,kEAAkE;QAG3D,gBAAW,GAAW,EAAE,CAAA;IA6BnC,CAAC;IAHU,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAA6B;QAClD,OAAO,MAAM,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,uBAAqB,CAAC,CAAA;IAC1D,CAAC;CACJ,CAAA;AAlCG;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACL;AAKxB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACE;AAI/B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACO,mBAAQ;wDAAA;AAI1B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACO,mBAAQ;wDAAA;AAI1B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACb,mBAAQ;sDAAA;AAIxB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACR;AAIrB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;;qDACW;AAItB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACI,qBAAY;qDAAA;AA9ClB,qBAAqB;IADjC,IAAA,gBAAI,EAAC,uBAAuB,CAAC;GACjB,qBAAqB,CAmDjC;AAnDY,sDAAqB"}
+{"version":3,"file":"SecretContainerCipher.js","sourceRoot":"","sources":["../../../../src/modules/secrets/data/SecretContainerCipher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA8D;AAC9D,0CAA2D;AAC3D,uDAAyC;AACzC,yEAA0F;AAC1F,2DAAkE;AAclE,IAAa,qBAAqB,GAAlC,MAAa,qBAAsB,SAAQ,uCAAkB;IAA7D;;QAC6B,wBAAmB,GAAG;YAC3C,OAAO;YACP,UAAU;YACV,IAAA,yBAAM,EAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAC5C,IAAA,yBAAM,EAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;YACnD,IAAA,yBAAM,EAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACjD,IAAA,yBAAM,EAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACjD,IAAA,yBAAM,EAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YAC/C,IAAA,yBAAM,EAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YAC7C,IAAA,yBAAM,EAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9C,IAAA,yBAAM,EAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;SACjD,CAAA;QAED,kEAAkE;QAG3D,SAAI,GAAW,EAAE,CAAA;QAExB,kEAAkE;QAG3D,gBAAW,GAAW,EAAE,CAAA;IA6BnC,CAAC;IAHU,MAAM,CAAC,IAAI,CAAC,KAA6B;QAC5C,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;CACJ,CAAA;AAlCG;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACL;AAKxB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACE;AAI/B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACO,mBAAQ;wDAAA;AAI1B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACO,mBAAQ;wDAAA;AAI1B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACb,mBAAQ;sDAAA;AAIxB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACR;AAIrB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;;qDACW;AAItB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACI,qBAAY;qDAAA;AA9ClB,qBAAqB;IADjC,IAAA,gBAAI,EAAC,uBAAuB,CAAC;GACjB,qBAAqB,CAmDjC;AAnDY,sDAAqB"}

package/dist/modules/secrets/data/SecretContainerPlain.d.ts

@@ -1,6 +1,6 @@
-import { SerializableAsync } from "@js-soft/ts-serval";
-import { CoreDate, CoreId, CoreSerializableAsync, ICoreDate, ICoreId, ICoreSerializableAsync } from "../../../core";
-export interface ISecretContainerPlain extends ICoreSerializableAsync {
+import { Serializable } from "@js-soft/ts-serval";
+import { CoreDate, CoreId, CoreSerializable, ICoreDate, ICoreId, ICoreSerializable } from "../../../core";
+export interface ISecretContainerPlain extends ICoreSerializable {
     id: ICoreId;
     name: string;
     description?: string;
@@ -9,9 +9,9 @@ export interface ISecretContainerPlain extends ICoreSerializableAsync {
     validFrom: ICoreDate;
     validTo?: ICoreDate;
     active: boolean;
-    secret: ICoreSerializableAsync;
+    secret: ICoreSerializable;
 }
-export declare class SecretContainerPlain extends CoreSerializableAsync implements ISecretContainerPlain {
+export declare class SecretContainerPlain extends CoreSerializable implements ISecretContainerPlain {
     id: CoreId;
     name: string;
     description: string;
@@ -20,6 +20,6 @@ export declare class SecretContainerPlain extends CoreSerializableAsync implemen
     validTo: CoreDate;
     nonce?: number;
     active: boolean;
-    secret: SerializableAsync;
-    static from(value: ISecretContainerPlain): Promise<SecretContainerPlain>;
+    secret: Serializable;
+    static from(value: ISecretContainerPlain): SecretContainerPlain;
 }

package/dist/modules/secrets/data/SecretContainerPlain.js

@@ -8,20 +8,19 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var SecretContainerPlain_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecretContainerPlain = void 0;
 /* eslint-disable @typescript-eslint/no-inferrable-types */
 const ts_serval_1 = require("@js-soft/ts-serval");
 const core_1 = require("../../../core");
-let SecretContainerPlain = SecretContainerPlain_1 = class SecretContainerPlain extends core_1.CoreSerializableAsync {
+let SecretContainerPlain = class SecretContainerPlain extends core_1.CoreSerializable {
     constructor() {
         super(...arguments);
         this.name = "";
         this.description = "";
     }
-    static async from(value) {
-        return await super.fromT(value, SecretContainerPlain_1);
+    static from(value) {
+        return this.fromAny(value);
     }
 };
 __decorate([
@@ -67,9 +66,9 @@ __decorate([
 __decorate([
     (0, ts_serval_1.serialize)(),
     (0, ts_serval_1.validate)(),
-    __metadata("design:type", ts_serval_1.SerializableAsync)
+    __metadata("design:type", ts_serval_1.Serializable)
 ], SecretContainerPlain.prototype, "secret", void 0);
-SecretContainerPlain = SecretContainerPlain_1 = __decorate([
+SecretContainerPlain = __decorate([
     (0, ts_serval_1.type)("SecretContainerPlain")
 ], SecretContainerPlain);
 exports.SecretContainerPlain = SecretContainerPlain;

package/dist/modules/secrets/data/SecretContainerPlain.js.map

@@ -1 +1 @@
-{"version":3,"file":"SecretContainerPlain.js","sourceRoot":"","sources":["../../../../src/modules/secrets/data/SecretContainerPlain.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2DAA2D;AAC3D,kDAAiF;AACjF,wCAAmH;AAenH,IAAa,oBAAoB,4BAAjC,MAAa,oBAAqB,SAAQ,4BAAqB;IAA/D;;QAOW,SAAI,GAAW,EAAE,CAAA;QAIjB,gBAAW,GAAW,EAAE,CAAA;IA6BnC,CAAC;IAHU,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAA4B;QACjD,OAAO,MAAM,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,sBAAoB,CAAC,CAAA;IACzD,CAAC;CACJ,CAAA;AArCG;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACA,aAAM;gDAAA;AAIjB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACL;AAIxB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACE;AAI/B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACO,eAAQ;uDAAA;AAI1B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACO,eAAQ;uDAAA;AAI1B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACb,eAAQ;qDAAA;AAIxB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACR;AAIrB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;;oDACW;AAItB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACI,6BAAiB;oDAAA;AAnCvB,oBAAoB;IADhC,IAAA,gBAAI,EAAC,sBAAsB,CAAC;GAChB,oBAAoB,CAwChC;AAxCY,oDAAoB"}
+{"version":3,"file":"SecretContainerPlain.js","sourceRoot":"","sources":["../../../../src/modules/secrets/data/SecretContainerPlain.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAA2D;AAC3D,kDAA4E;AAC5E,wCAAyG;AAezG,IAAa,oBAAoB,GAAjC,MAAa,oBAAqB,SAAQ,uBAAgB;IAA1D;;QAOW,SAAI,GAAW,EAAE,CAAA;QAIjB,gBAAW,GAAW,EAAE,CAAA;IA6BnC,CAAC;IAHU,MAAM,CAAC,IAAI,CAAC,KAA4B;QAC3C,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;CACJ,CAAA;AArCG;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACA,aAAM;gDAAA;AAIjB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACL;AAIxB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACE;AAI/B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACO,eAAQ;uDAAA;AAI1B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACO,eAAQ;uDAAA;AAI1B;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACb,eAAQ;qDAAA;AAIxB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACR;AAIrB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;;oDACW;AAItB;IAFC,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACI,wBAAY;oDAAA;AAnClB,oBAAoB;IADhC,IAAA,gBAAI,EAAC,sBAAsB,CAAC;GAChB,oBAAoB,CAwChC;AAxCY,oDAAoB"}

package/dist/modules/sync/DatawalletModificationsProcessor.d.ts

@@ -12,6 +12,7 @@ import { RelationshipTemplateController } from "../relationshipTemplates/Relatio
 import { CachedToken } from "../tokens/local/CachedToken";
 import { TokenController } from "../tokens/TokenController";
 import { DatawalletModification } from "./local/DatawalletModification";
+import { SyncProgressReporter } from "./SyncCallback";
 export declare class DatawalletModificationsProcessor {
     private readonly cacheFetcher;
     private readonly collectionProvider;
@@ -20,7 +21,8 @@ export declare class DatawalletModificationsProcessor {
     private readonly updates;
     private readonly deletes;
     private readonly cacheChanges;
-    constructor(modifications: DatawalletModification[], cacheFetcher: CacheFetcher, collectionProvider: IDatabaseCollectionProvider, logger: ILogger);
+    private readonly syncStep;
+    constructor(modifications: DatawalletModification[], cacheFetcher: CacheFetcher, collectionProvider: IDatabaseCollectionProvider, logger: ILogger, reporter: SyncProgressReporter);
     private readonly collectionsWithCacheableItems;
     execute(): Promise<void>;
     private applyCreates;

package/dist/modules/sync/DatawalletModificationsProcessor.js

@@ -13,8 +13,9 @@ const Relationship_1 = require("../relationships/local/Relationship");
 const RelationshipTemplate_1 = require("../relationshipTemplates/local/RelationshipTemplate");
 const Token_1 = require("../tokens/local/Token");
 const DatawalletModification_1 = require("./local/DatawalletModification");
+const SyncCallback_1 = require("./SyncCallback");
 class DatawalletModificationsProcessor {
-    constructor(modifications, cacheFetcher, collectionProvider, logger) {
+    constructor(modifications, cacheFetcher, collectionProvider, logger, reporter) {
         var _a, _b, _c, _d;
         this.cacheFetcher = cacheFetcher;
         this.collectionProvider = collectionProvider;
@@ -31,12 +32,17 @@ class DatawalletModificationsProcessor {
         this.updates = (_b = modificationsGroupedByType[DatawalletModification_1.DatawalletModificationType.Update]) !== null && _b !== void 0 ? _b : [];
         this.deletes = (_c = modificationsGroupedByType[DatawalletModification_1.DatawalletModificationType.Delete]) !== null && _c !== void 0 ? _c : [];
         this.cacheChanges = (_d = modificationsGroupedByType[DatawalletModification_1.DatawalletModificationType.CacheChanged]) !== null && _d !== void 0 ? _d : [];
+        const totalItems = this.creates.length + this.updates.length + this.deletes.length + this.cacheChanges.length;
+        this.syncStep = reporter.createStep(SyncCallback_1.SyncStep.DatawalletSyncProcessing, totalItems);
     }
     async execute() {
         await this.applyCreates();
         await this.applyUpdates();
         await this.applyCacheChanges();
         await this.applyDeletes();
+        // cache-fills are optimized by the backbone, so it is possible that the processedItemCount is
+        // lower than the total number of items - in this case the 100% callback is triggered here
+        this.syncStep.finish();
     }
     async applyCreates() {
         if (this.creates.length === 0) {
@@ -51,10 +57,10 @@ class DatawalletModificationsProcessor {
             for (const create of currentCreates) {
                 mergedPayload = { ...mergedPayload, ...create.payload };
             }
-            const newObject = await core_1.CoreSerializableAsync.fromUnknown(mergedPayload);
+            const newObject = core_1.CoreSerializable.fromUnknown(mergedPayload);
             const oldDoc = await targetCollection.read(objectIdentifier);
             if (oldDoc) {
-                const oldObject = await core_1.CoreSerializableAsync.fromUnknown(oldDoc);
+                const oldObject = core_1.CoreSerializable.fromUnknown(oldDoc);
                 const updatedObject = { ...oldObject.toJSON(), ...newObject.toJSON() };
                 await targetCollection.update(oldDoc, updatedObject);
             }
@@ -66,8 +72,10 @@ class DatawalletModificationsProcessor {
                     objectIdentifier: core_1.CoreId.from(objectIdentifier)
                 });
                 this.cacheChanges.push(modification);
+                this.syncStep.incrementTotalNumberOfItems();
             }
             await targetCollection.create(newObject);
+            this.syncStep.progress();
         }
     }
     async applyUpdates() {
@@ -80,9 +88,10 @@ class DatawalletModificationsProcessor {
             if (!oldDoc) {
                 throw new Error("Document to update was not found.");
             }
-            const oldObject = await core_1.CoreSerializableAsync.fromUnknown(oldDoc);
+            const oldObject = core_1.CoreSerializable.fromUnknown(oldDoc);
             const newObject = { ...oldObject.toJSON(), ...updateModification.payload };
             await targetCollection.update(oldDoc, newObject);
+            this.syncStep.progress();
         }
     }
     async applyCacheChanges() {
@@ -130,12 +139,15 @@ class DatawalletModificationsProcessor {
         return { fileIds, messageIds, relationshipTemplateIds: templateIds, tokenIds, relationshipIds };
     }
     async saveNewCaches(caches, collectionName, constructorOfT) {
+        if (caches.length === 0)
+            return;
         const collection = await this.collectionProvider.getCollection(collectionName);
         await Promise.all(caches.map(async (c) => {
             const itemDoc = await collection.read(c.id.toString());
-            const item = await core_1.CoreSerializableAsync.fromT(itemDoc, constructorOfT);
+            const item = constructorOfT.from(itemDoc);
             item.setCache(c.cache);
             await collection.update(itemDoc, item);
+            this.syncStep.progress();
         }));
     }
     async applyDeletes() {
@@ -145,6 +157,7 @@ class DatawalletModificationsProcessor {
         for (const deleteModification of this.deletes) {
             const targetCollection = await this.collectionProvider.getCollection(deleteModification.collection);
             await targetCollection.delete({ id: deleteModification.objectIdentifier });
+            this.syncStep.progress();
         }
     }
 }

package/dist/modules/sync/DatawalletModificationsProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"DatawalletModificationsProcessor.js","sourceRoot":"","sources":["../../../src/modules/sync/DatawalletModificationsProcessor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DatawalletModificationsProcessor.js","sourceRoot":"","sources":["../../../src/modules/sync/DatawalletModificationsProcessor.ts"],"names":[],"mappings":"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"}

package/dist/modules/sync/ExternalEventsProcessor.d.ts

@@ -3,6 +3,7 @@ import { RelationshipsController } from "../relationships/RelationshipsControlle
 import { BackboneExternalEvent } from "./backbone/BackboneExternalEvent";
 import { FinalizeSyncRunRequestExternalEventResult } from "./backbone/FinalizeSyncRun";
 import { ChangedItems } from "./ChangedItems";
+import { SyncProgressReporter } from "./SyncCallback";
 export declare class ExternalEventsProcessor {
     private readonly messagesController;
     private readonly relationshipsController;
@@ -10,7 +11,8 @@ export declare class ExternalEventsProcessor {
     private readonly log;
     readonly changedItems: ChangedItems;
     readonly results: FinalizeSyncRunRequestExternalEventResult[];
-    constructor(messagesController: MessageController, relationshipsController: RelationshipsController, externalEvents: BackboneExternalEvent[]);
+    private readonly syncStep;
+    constructor(messagesController: MessageController, relationshipsController: RelationshipsController, externalEvents: BackboneExternalEvent[], reporter: SyncProgressReporter);
     execute(): Promise<void>;
     private applyRelationshipChangeCompletedEvent;
     private applyRelationshipChangeCreatedEvent;

package/dist/modules/sync/ExternalEventsProcessor.js

@@ -3,14 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExternalEventsProcessor = void 0;
 const core_1 = require("../../core");
 const ChangedItems_1 = require("./ChangedItems");
+const SyncCallback_1 = require("./SyncCallback");
 class ExternalEventsProcessor {
-    constructor(messagesController, relationshipsController, externalEvents) {
+    constructor(messagesController, relationshipsController, externalEvents, reporter) {
         this.messagesController = messagesController;
         this.relationshipsController = relationshipsController;
         this.externalEvents = externalEvents;
         this.changedItems = new ChangedItems_1.ChangedItems();
         this.results = [];
         this.log = core_1.TransportLoggerFactory.getLogger(ExternalEventsProcessor);
+        this.syncStep = reporter.createStep(SyncCallback_1.SyncStep.ExternalEventsProcessing, externalEvents.length);
     }
     async execute() {
         for (const externalEvent of this.externalEvents) {
@@ -52,6 +54,9 @@ class ExternalEventsProcessor {
                     errorCode: errorCode
                 });
             }
+            finally {
+                this.syncStep.progress();
+            }
         }
     }
     async applyRelationshipChangeCompletedEvent(externalEvent) {

package/dist/modules/sync/ExternalEventsProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExternalEventsProcessor.js","sourceRoot":"","sources":["../../../src/modules/sync/ExternalEventsProcessor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ExternalEventsProcessor.js","sourceRoot":"","sources":["../../../src/modules/sync/ExternalEventsProcessor.ts"],"names":[],"mappings":"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"}

package/dist/modules/sync/SyncCallback.d.ts

@@ -0,0 +1,17 @@
+import { ProgressReporter, ProgressReporterStep } from "../../core";
+export declare type SyncProgressCallback = (percentage: number, step: SyncStep) => void;
+export declare class SyncProgressReporter extends ProgressReporter<SyncStep> {
+    static fromCallback(callback?: SyncProgressCallback): SyncProgressReporter;
+}
+export declare class SyncProgressReporterStep extends ProgressReporterStep<SyncStep> {
+}
+export declare enum SyncStep {
+    Sync = "sync",
+    DatawalletSync = "sync:datawallet",
+    DatawalletSyncDownloading = "sync:datawallet:downloading",
+    DatawalletSyncDecryption = "sync:datawallet:decrypting",
+    DatawalletSyncProcessing = "sync:datawallet:processing",
+    ExternalEventsSync = "sync:externalEvents",
+    ExternalEventsSyncDownloading = "sync:externalEvents:downloading",
+    ExternalEventsProcessing = "sync:externalEvents:processing"
+}

package/dist/modules/sync/SyncCallback.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SyncStep = exports.SyncProgressReporterStep = exports.SyncProgressReporter = void 0;
+const core_1 = require("../../core");
+class SyncProgressReporter extends core_1.ProgressReporter {
+    static fromCallback(callback) {
+        return new SyncProgressReporter(callback);
+    }
+}
+exports.SyncProgressReporter = SyncProgressReporter;
+class SyncProgressReporterStep extends core_1.ProgressReporterStep {
+}
+exports.SyncProgressReporterStep = SyncProgressReporterStep;
+var SyncStep;
+(function (SyncStep) {
+    SyncStep["Sync"] = "sync";
+    SyncStep["DatawalletSync"] = "sync:datawallet";
+    SyncStep["DatawalletSyncDownloading"] = "sync:datawallet:downloading";
+    SyncStep["DatawalletSyncDecryption"] = "sync:datawallet:decrypting";
+    SyncStep["DatawalletSyncProcessing"] = "sync:datawallet:processing";
+    SyncStep["ExternalEventsSync"] = "sync:externalEvents";
+    SyncStep["ExternalEventsSyncDownloading"] = "sync:externalEvents:downloading";
+    SyncStep["ExternalEventsProcessing"] = "sync:externalEvents:processing";
+})(SyncStep = exports.SyncStep || (exports.SyncStep = {}));
+//# sourceMappingURL=SyncCallback.js.map

package/dist/modules/sync/SyncCallback.js.map

@@ -0,0 +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"}

package/dist/modules/sync/SyncController.d.ts

@@ -3,6 +3,7 @@ import { CoreDate, TransportController } from "../../core";
 import { DependencyOverrides } from "../../core/DependencyOverrides";
 import { AccountController } from "../accounts/AccountController";
 import { ChangedItems } from "./ChangedItems";
+import { SyncProgressReporter } from "./SyncCallback";
 import { WhatToSync } from "./WhatToSync";
 export declare class SyncController extends TransportController {
     private readonly unpushedDatawalletModifications;
@@ -17,10 +18,9 @@ export declare class SyncController extends TransportController {
     init(): Promise<SyncController>;
     private currentSync?;
     private currentSyncRun?;
-    sync(): Promise<ChangedItems>;
-    sync(whatToSync: "OnlyDatawallet"): Promise<void>;
-    sync(whatToSync: "Everything"): Promise<ChangedItems>;
-    sync(whatToSync: WhatToSync): Promise<ChangedItems | void>;
+    sync(whatToSync: "OnlyDatawallet", reporter: SyncProgressReporter): Promise<void>;
+    sync(whatToSync: "Everything", reporter: SyncProgressReporter): Promise<ChangedItems>;
+    sync(whatToSync: WhatToSync, reporter: SyncProgressReporter): Promise<ChangedItems | void>;
     private _sync;
     private syncExternalEvents;
     private syncDatawallet;
@@ -28,7 +28,9 @@ export declare class SyncController extends TransportController {
     private upgradeIdentityDatawalletVersion;
     private upgradeDeviceDatawalletVersion;
     private applyIncomingDatawalletModifications;
+    private promiseAllWithProgess;
     private decryptDatawalletModifications;
+    private decryptDatawalletModification;
     private pushLocalDatawalletModifications;
     private prepareLocalDatawalletModificationsForPush;
     private deleteUnpushedDatawalletModifications;