@nmshd/transport 7.0.0-alpha.52 → 7.0.0-alpha.54

package/dist/modules/relationships/local/Relationship.d.ts

@@ -1,37 +1,41 @@
-import { ISerializable } from "@js-soft/ts-serval";
-import { CoreDate, CoreId, ICoreId } from "@nmshd/core-types";
+import { ISerializable, Serializable } from "@js-soft/ts-serval";
+import { CoreDate, CoreId, ICoreDate, ICoreId } from "@nmshd/core-types";
 import { CoreSynchronizable, ICoreSynchronizable } from "../../../core";
 import { Identity, IIdentity } from "../../accounts/data/Identity";
 import { BackboneGetRelationshipResponse } from "../backbone/BackboneGetRelationships";
 import { RelationshipStatus } from "../transmission/RelationshipStatus";
-import { CachedRelationship, ICachedRelationship } from "./CachedRelationship";
 import { IPeerDeletionInfo, PeerDeletionInfo } from "./PeerDeletionInfo";
+import { IRelationshipAuditLogEntry, RelationshipAuditLogEntry } from "./RelationshipAuditLogEntry";
 export interface IRelationship extends ICoreSynchronizable {
     relationshipSecretId: ICoreId;
     peer: IIdentity;
     peerDeletionInfo?: IPeerDeletionInfo;
     status: RelationshipStatus;
-    cache?: ICachedRelationship;
-    cachedAt?: CoreDate;
+    templateId: ICoreId;
+    creationContent: ISerializable;
+    lastMessageSentAt?: ICoreDate;
+    lastMessageReceivedAt?: ICoreDate;
+    auditLog: IRelationshipAuditLogEntry[];
     metadata?: any;
     metadataModifiedAt?: CoreDate;
 }
 export declare class Relationship extends CoreSynchronizable implements IRelationship {
     readonly technicalProperties: string[];
+    readonly contentProperties: string[];
     readonly metadataProperties: string[];
     relationshipSecretId: CoreId;
     peer: Identity;
     peerDeletionInfo?: PeerDeletionInfo;
     status: RelationshipStatus;
-    cache?: CachedRelationship;
-    cachedAt?: CoreDate;
+    templateId: CoreId;
+    creationContent: Serializable;
+    lastMessageSentAt?: CoreDate;
+    lastMessageReceivedAt?: CoreDate;
+    auditLog: RelationshipAuditLogEntry[];
     metadata?: any;
     metadataModifiedAt?: CoreDate;
-    toJSON(verbose?: boolean | undefined, serializeAsString?: boolean | undefined): Object;
     static fromBackboneAndCreationContent(response: BackboneGetRelationshipResponse, peer: IIdentity, creationContent: ISerializable, relationshipSecretId: CoreId): Relationship;
     static from(value: IRelationship): Relationship;
-    setCache(cache: CachedRelationship): this;
     setMetadata(metadata: any): this;
-    private newCacheEmptyError;
 }
 //# sourceMappingURL=Relationship.d.ts.map

package/dist/modules/relationships/local/Relationship.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Relationship.d.ts","sourceRoot":"","sources":["../../../../src/modules/relationships/local/Relationship.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA6B,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAkB,MAAM,eAAe,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AACvF,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGzE,MAAM,WAAW,aAAc,SAAQ,mBAAmB;IACtD,oBAAoB,EAAE,OAAO,CAAC;IAC9B,IAAI,EAAE,SAAS,CAAC;IAChB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,MAAM,EAAE,kBAAkB,CAAC;IAE3B,KAAK,CAAC,EAAE,mBAAmB,CAAC;IAC5B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,kBAAkB,CAAC,EAAE,QAAQ,CAAC;CACjC;AAED,qBACa,YAAa,SAAQ,kBAAmB,YAAW,aAAa;IACzE,SAAyB,mBAAmB,WAO1C;IAEF,SAAyB,kBAAkB,WAAgG;IAIpI,oBAAoB,EAAE,MAAM,CAAC;IAI7B,IAAI,EAAE,QAAQ,CAAC;IAIf,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAIpC,MAAM,EAAE,kBAAkB,CAAC;IAI3B,KAAK,CAAC,EAAE,kBAAkB,CAAC;IAI3B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAIpB,QAAQ,CAAC,EAAE,GAAG,CAAC;IAIf,kBAAkB,CAAC,EAAE,QAAQ,CAAC;IAErB,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,EAAE,iBAAiB,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM;WAWxF,8BAA8B,CACxC,QAAQ,EAAE,+BAA+B,EACzC,IAAI,EAAE,SAAS,EACf,eAAe,EAAE,aAAa,EAC9B,oBAAoB,EAAE,MAAM,GAC7B,YAAY;WAiBD,IAAI,CAAC,KAAK,EAAE,aAAa,GAAG,YAAY;IAI/C,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAMzC,WAAW,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI;IAMvC,OAAO,CAAC,kBAAkB;CAG7B"}
+{"version":3,"file":"Relationship.d.ts","sourceRoot":"","sources":["../../../../src/modules/relationships/local/Relationship.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAA6B,MAAM,oBAAoB,CAAC;AAC5F,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEzE,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AACvF,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEzE,OAAO,EAAE,0BAA0B,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAEpG,MAAM,WAAW,aAAc,SAAQ,mBAAmB;IACtD,oBAAoB,EAAE,OAAO,CAAC;IAC9B,IAAI,EAAE,SAAS,CAAC;IAChB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,MAAM,EAAE,kBAAkB,CAAC;IAE3B,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,aAAa,CAAC;IAE/B,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,qBAAqB,CAAC,EAAE,SAAS,CAAC;IAClC,QAAQ,EAAE,0BAA0B,EAAE,CAAC;IAEvC,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,kBAAkB,CAAC,EAAE,QAAQ,CAAC;CACjC;AAED,qBACa,YAAa,SAAQ,kBAAmB,YAAW,aAAa;IACzE,SAAyB,mBAAmB,WAQ1C;IAEF,SAAyB,iBAAiB,WAKxC;IAEF,SAAyB,kBAAkB,WAAgG;IAIpI,oBAAoB,EAAE,MAAM,CAAC;IAI7B,IAAI,EAAE,QAAQ,CAAC;IAIf,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAIpC,MAAM,EAAE,kBAAkB,CAAC;IAI3B,UAAU,EAAE,MAAM,CAAC;IAInB,eAAe,EAAE,YAAY,CAAC;IAI9B,iBAAiB,CAAC,EAAE,QAAQ,CAAC;IAI7B,qBAAqB,CAAC,EAAE,QAAQ,CAAC;IAIjC,QAAQ,EAAE,yBAAyB,EAAE,CAAC;IAItC,QAAQ,CAAC,EAAE,GAAG,CAAC;IAIf,kBAAkB,CAAC,EAAE,QAAQ,CAAC;WAEvB,8BAA8B,CACxC,QAAQ,EAAE,+BAA+B,EACzC,IAAI,EAAE,SAAS,EACf,eAAe,EAAE,aAAa,EAC9B,oBAAoB,EAAE,MAAM,GAC7B,YAAY;WAYD,IAAI,CAAC,KAAK,EAAE,aAAa,GAAG,YAAY;IAI/C,WAAW,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI;CAK1C"}

package/dist/modules/relationships/local/Relationship.js

@@ -17,9 +17,9 @@ const ts_simple_nameof_1 = require("ts-simple-nameof");
 const core_1 = require("../../../core");
 const Identity_1 = require("../../accounts/data/Identity");
 const RelationshipStatus_1 = require("../transmission/RelationshipStatus");
-const CachedRelationship_1 = require("./CachedRelationship");
 const PeerDeletionInfo_1 = require("./PeerDeletionInfo");
 const RelationshipAuditLog_1 = require("./RelationshipAuditLog");
+const RelationshipAuditLogEntry_1 = require("./RelationshipAuditLogEntry");
 let Relationship = Relationship_1 = class Relationship extends core_1.CoreSynchronizable {
     constructor() {
         super(...arguments);
@@ -29,49 +29,36 @@ let Relationship = Relationship_1 = class Relationship extends core_1.CoreSynchr
             (0, ts_simple_nameof_1.nameof)((r) => r.relationshipSecretId),
             (0, ts_simple_nameof_1.nameof)((r) => r.peer),
             (0, ts_simple_nameof_1.nameof)((r) => r.status),
-            (0, ts_simple_nameof_1.nameof)((r) => r.peerDeletionInfo)
+            (0, ts_simple_nameof_1.nameof)((r) => r.peerDeletionInfo),
+            (0, ts_simple_nameof_1.nameof)((r) => r.auditLog)
+        ];
+        this.contentProperties = [
+            (0, ts_simple_nameof_1.nameof)((r) => r.templateId),
+            (0, ts_simple_nameof_1.nameof)((r) => r.creationContent),
+            (0, ts_simple_nameof_1.nameof)((r) => r.lastMessageSentAt),
+            (0, ts_simple_nameof_1.nameof)((r) => r.lastMessageReceivedAt)
         ];
         this.metadataProperties = [(0, ts_simple_nameof_1.nameof)((r) => r.metadata), (0, ts_simple_nameof_1.nameof)((r) => r.metadataModifiedAt)];
     }
-    toJSON(verbose, serializeAsString) {
-        const json = super.toJSON(verbose, serializeAsString);
-        // Adds flattened peerAddress and templateId to the JSON stored in the database.
-        // This helps us to boost the performance of database queries that include these fields.
-        json.peerAddress = this.peer.address.toString();
-        json.templateId = this.cache?.templateId.toString();
-        return json;
-    }
     static fromBackboneAndCreationContent(response, peer, creationContent, relationshipSecretId) {
-        const cache = CachedRelationship_1.CachedRelationship.from({
-            creationContent,
-            templateId: core_types_1.CoreId.from(response.relationshipTemplateId),
-            auditLog: RelationshipAuditLog_1.RelationshipAuditLog.fromBackboneAuditLog(response.auditLog)
-        });
         return Relationship_1.from({
             id: core_types_1.CoreId.from(response.id),
             relationshipSecretId: relationshipSecretId,
             peer: peer,
             status: RelationshipStatus_1.RelationshipStatus.Pending,
-            cache: cache,
-            cachedAt: core_types_1.CoreDate.utc()
+            creationContent,
+            templateId: core_types_1.CoreId.from(response.relationshipTemplateId),
+            auditLog: RelationshipAuditLog_1.RelationshipAuditLog.fromBackboneAuditLog(response.auditLog)
         });
     }
     static from(value) {
         return this.fromAny(value);
     }
-    setCache(cache) {
-        this.cache = cache;
-        this.cachedAt = core_types_1.CoreDate.utc();
-        return this;
-    }
     setMetadata(metadata) {
         this.metadata = metadata;
         this.metadataModifiedAt = core_types_1.CoreDate.utc();
         return this;
     }
-    newCacheEmptyError() {
-        return new core_1.TransportError(`The cache of the Relationship with id "${this.id}" is empty.`);
-    }
 };
 exports.Relationship = Relationship;
 __decorate([
@@ -94,16 +81,31 @@ __decorate([
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", String)
 ], Relationship.prototype, "status", void 0);
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", core_types_1.CoreId)
+], Relationship.prototype, "templateId", void 0);
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", ts_serval_1.Serializable)
+], Relationship.prototype, "creationContent", void 0);
 __decorate([
     (0, ts_serval_1.validate)({ nullable: true }),
     (0, ts_serval_1.serialize)(),
-    __metadata("design:type", CachedRelationship_1.CachedRelationship)
-], Relationship.prototype, "cache", void 0);
+    __metadata("design:type", core_types_1.CoreDate)
+], Relationship.prototype, "lastMessageSentAt", void 0);
 __decorate([
     (0, ts_serval_1.validate)({ nullable: true }),
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", core_types_1.CoreDate)
-], Relationship.prototype, "cachedAt", void 0);
+], Relationship.prototype, "lastMessageReceivedAt", void 0);
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)({ type: RelationshipAuditLogEntry_1.RelationshipAuditLogEntry }),
+    __metadata("design:type", Array)
+], Relationship.prototype, "auditLog", void 0);
 __decorate([
     (0, ts_serval_1.validate)({ nullable: true }),
     (0, ts_serval_1.serialize)(),

package/dist/modules/relationships/local/Relationship.js.map

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

package/dist/modules/sync/DatawalletModificationMapper.js

@@ -17,9 +17,6 @@ class DatawalletModificationMapper {
             case "Delete":
                 type = DatawalletModification_1.DatawalletModificationType.Delete;
                 break;
-            case "CacheChanged":
-                type = DatawalletModification_1.DatawalletModificationType.CacheChanged;
-                break;
             default:
                 throw new core_1.TransportError("Unsupported DatawalletModificationType '${backboneDatawalletModification.type}'");
         }
@@ -28,6 +25,9 @@ class DatawalletModificationMapper {
             case "TechnicalData":
                 payloadCategory = DatawalletModification_1.DatawalletModificationCategory.TechnicalData;
                 break;
+            case "Content":
+                payloadCategory = DatawalletModification_1.DatawalletModificationCategory.Content;
+                break;
             case "Userdata":
                 payloadCategory = DatawalletModification_1.DatawalletModificationCategory.Userdata;
                 break;

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

@@ -1 +1 @@
-{"version":3,"file":"DatawalletModificationMapper.js","sourceRoot":"","sources":["../../../src/modules/sync/DatawalletModificationMapper.ts"],"names":[],"mappings":";;;AAAA,kDAA2C;AAC3C,qCAA0D;AAG1D,2EAAoI;AAEpI,MAAa,4BAA4B;IAC9B,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAClD,8BAA8D,EAC9D,gBAAoC,EACpC,iBAAyB;QAEzB,IAAI,IAAgC,CAAC;QAErC,QAAQ,8BAA8B,CAAC,IAAI,EAAE,CAAC;YAC1C,KAAK,QAAQ;gBACT,IAAI,GAAG,mDAA0B,CAAC,MAAM,CAAC;gBACzC,MAAM;YACV,KAAK,QAAQ;gBACT,IAAI,GAAG,mDAA0B,CAAC,MAAM,CAAC;gBACzC,MAAM;YACV,KAAK,QAAQ;gBACT,IAAI,GAAG,mDAA0B,CAAC,MAAM,CAAC;gBACzC,MAAM;YACV,KAAK,cAAc;gBACf,IAAI,GAAG,mDAA0B,CAAC,YAAY,CAAC;gBAC/C,MAAM;YACV;gBACI,MAAM,IAAI,qBAAc,CAAC,iFAAiF,CAAC,CAAC;QACpH,CAAC;QAED,IAAI,eAA2D,CAAC;QAEhE,QAAQ,8BAA8B,CAAC,eAAe,EAAE,CAAC;YACrD,KAAK,eAAe;gBAChB,eAAe,GAAG,uDAA8B,CAAC,aAAa,CAAC;gBAC/D,MAAM;YACV,KAAK,UAAU;gBACX,eAAe,GAAG,uDAA8B,CAAC,QAAQ,CAAC;gBAC1D,MAAM;YACV,KAAK,UAAU;gBACX,eAAe,GAAG,uDAA8B,CAAC,QAAQ,CAAC;gBAC1D,MAAM;YACV,KAAK,IAAI;gBACL,eAAe,GAAG,SAAS,CAAC;gBAC5B,MAAM;YACV;gBACI,MAAM,IAAI,qBAAc,CAAC,+CAA+C,8BAA8B,CAAC,eAAe,GAAG,CAAC,CAAC;QACnI,CAAC;QAED,OAAO,+CAAsB,CAAC,IAAI,CAAC;YAC/B,OAAO,EAAE,MAAM,mBAAY,CAAC,sBAAsB,CAAC,QAAQ,EAAE;YAC7D,gBAAgB,EAAE,mBAAM,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,CAAC;IACP,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,sBAAsB,CAAC,iBAAiB,IAAI,CAAC;SACnE,CAAC;IACN,CAAC;CACJ;AApED,oEAoEC"}
+{"version":3,"file":"DatawalletModificationMapper.js","sourceRoot":"","sources":["../../../src/modules/sync/DatawalletModificationMapper.ts"],"names":[],"mappings":";;;AAAA,kDAA2C;AAC3C,qCAA0D;AAG1D,2EAAoI;AAEpI,MAAa,4BAA4B;IAC9B,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAClD,8BAA8D,EAC9D,gBAAoC,EACpC,iBAAyB;QAEzB,IAAI,IAAgC,CAAC;QAErC,QAAQ,8BAA8B,CAAC,IAAI,EAAE,CAAC;YAC1C,KAAK,QAAQ;gBACT,IAAI,GAAG,mDAA0B,CAAC,MAAM,CAAC;gBACzC,MAAM;YACV,KAAK,QAAQ;gBACT,IAAI,GAAG,mDAA0B,CAAC,MAAM,CAAC;gBACzC,MAAM;YACV,KAAK,QAAQ;gBACT,IAAI,GAAG,mDAA0B,CAAC,MAAM,CAAC;gBACzC,MAAM;YACV;gBACI,MAAM,IAAI,qBAAc,CAAC,iFAAiF,CAAC,CAAC;QACpH,CAAC;QAED,IAAI,eAA2D,CAAC;QAEhE,QAAQ,8BAA8B,CAAC,eAAe,EAAE,CAAC;YACrD,KAAK,eAAe;gBAChB,eAAe,GAAG,uDAA8B,CAAC,aAAa,CAAC;gBAC/D,MAAM;YACV,KAAK,SAAS;gBACV,eAAe,GAAG,uDAA8B,CAAC,OAAO,CAAC;gBACzD,MAAM;YACV,KAAK,UAAU;gBACX,eAAe,GAAG,uDAA8B,CAAC,QAAQ,CAAC;gBAC1D,MAAM;YACV,KAAK,UAAU;gBACX,eAAe,GAAG,uDAA8B,CAAC,QAAQ,CAAC;gBAC1D,MAAM;YACV,KAAK,IAAI;gBACL,eAAe,GAAG,SAAS,CAAC;gBAC5B,MAAM;YACV;gBACI,MAAM,IAAI,qBAAc,CAAC,+CAA+C,8BAA8B,CAAC,eAAe,GAAG,CAAC,CAAC;QACnI,CAAC;QAED,OAAO,+CAAsB,CAAC,IAAI,CAAC;YAC/B,OAAO,EAAE,MAAM,mBAAY,CAAC,sBAAsB,CAAC,QAAQ,EAAE;YAC7D,gBAAgB,EAAE,mBAAM,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,CAAC;IACP,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,sBAAsB,CAAC,iBAAiB,IAAI,CAAC;SACnE,CAAC;IACN,CAAC;CACJ;AApED,oEAoEC"}

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

@@ -1,73 +1,15 @@
 import { IDatabaseCollectionProvider } from "@js-soft/docdb-access-abstractions";
 import { ILogger } from "@js-soft/logging-abstractions";
-import { CoreId } from "@nmshd/core-types";
-import { CachedIdentityDeletionProcess } from "../accounts/data/CachedIdentityDeletionProcess";
-import { IdentityDeletionProcessController } from "../accounts/IdentityDeletionProcessController";
-import { FileController } from "../files/FileController";
-import { CachedFile } from "../files/local/CachedFile";
-import { CachedMessage } from "../messages/local/CachedMessage";
-import { MessageController } from "../messages/MessageController";
-import { CachedRelationship } from "../relationships/local/CachedRelationship";
-import { RelationshipsController } from "../relationships/RelationshipsController";
-import { CachedRelationshipTemplate } from "../relationshipTemplates/local/CachedRelationshipTemplate";
-import { RelationshipTemplateController } from "../relationshipTemplates/RelationshipTemplateController";
-import { CachedToken } from "../tokens/local/CachedToken";
-import { TokenController } from "../tokens/TokenController";
 import { DatawalletModification } from "./local/DatawalletModification";
 export declare class DatawalletModificationsProcessor {
-    private readonly cacheFetcher;
+    private readonly modifications;
     private readonly collectionProvider;
     private readonly logger;
-    private readonly modificationsWithoutCacheChanges;
-    private readonly cacheChanges;
     private readonly deletedObjectIdentifiers;
     private readonly _changedObjectIdentifiers;
     get changedObjectIdentifiers(): string[];
     get log(): ILogger;
-    constructor(modifications: DatawalletModification[], cacheFetcher: CacheFetcher, collectionProvider: IDatabaseCollectionProvider, logger: ILogger);
-    private readonly collectionsWithCacheableItems;
+    constructor(modifications: DatawalletModification[], collectionProvider: IDatabaseCollectionProvider, logger: ILogger);
     execute(): Promise<void>;
-    private applyModifications;
-    /**
-     * if a collection contains cacheable items, the cache has to be fetched after the item is created on a new device
-     * this can only happen after all creates are applied, because the fetching needs properties like the secret key
-     */
-    private simulateCacheChangeForCreate;
-    private applyCacheChanges;
-    private ensureAllItemsAreCacheable;
-    private groupCacheChangesByCollection;
-    private saveNewCaches;
 }
-export declare class CacheFetcher {
-    private readonly fileController;
-    private readonly messageController;
-    private readonly relationshipTemplateController;
-    private readonly relationshipController;
-    private readonly tokenController;
-    private readonly identityDeletionProcessController;
-    constructor(fileController: FileController, messageController: MessageController, relationshipTemplateController: RelationshipTemplateController, relationshipController: RelationshipsController, tokenController: TokenController, identityDeletionProcessController: IdentityDeletionProcessController);
-    fetchCacheFor(input: FetchCacheInput): Promise<FetchCacheOutput>;
-    private fetchCaches;
-}
-interface FetchCacheInput {
-    files?: CoreId[];
-    messages?: CoreId[];
-    relationships?: CoreId[];
-    relationshipTemplates?: CoreId[];
-    tokens?: CoreId[];
-    identityDeletionProcesses?: CoreId[];
-}
-interface FetchCacheOutput {
-    files: FetchCacheOutputItem<CachedFile>[];
-    messages: FetchCacheOutputItem<CachedMessage>[];
-    relationships: FetchCacheOutputItem<CachedRelationship>[];
-    relationshipTemplates: FetchCacheOutputItem<CachedRelationshipTemplate>[];
-    tokens: FetchCacheOutputItem<CachedToken>[];
-    identityDeletionProcesses: FetchCacheOutputItem<CachedIdentityDeletionProcess>[];
-}
-interface FetchCacheOutputItem<TCache> {
-    id: CoreId;
-    cache: TCache;
-}
-export {};
 //# sourceMappingURL=DatawalletModificationsProcessor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"DatawalletModificationsProcessor.d.ts","sourceRoot":"","sources":["../../../src/modules/sync/DatawalletModificationsProcessor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DatawalletModificationsProcessor.d.ts","sourceRoot":"","sources":["../../../src/modules/sync/DatawalletModificationsProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAIxD,OAAO,EAAE,sBAAsB,EAA8B,MAAM,gCAAgC,CAAC;AAEpG,qBAAa,gCAAgC;IAarC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAd3B,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAgB;IAEzD,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAA0B;IACpE,IAAW,wBAAwB,IAAI,MAAM,EAAE,CAE9C;IAED,IAAW,GAAG,IAAI,OAAO,CAExB;gBAGoB,aAAa,EAAE,sBAAsB,EAAE,EACvC,kBAAkB,EAAE,2BAA2B,EAC/C,MAAM,EAAE,OAAO;IAGvB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAqDxC"}

package/dist/modules/sync/DatawalletModificationsProcessor.js

@@ -1,30 +1,12 @@
 "use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CacheFetcher = exports.DatawalletModificationsProcessor = void 0;
+exports.DatawalletModificationsProcessor = void 0;
 const ts_serval_1 = require("@js-soft/ts-serval");
-const ts_utils_1 = require("@js-soft/ts-utils");
-const core_types_1 = require("@nmshd/core-types");
 const lodash_1 = __importDefault(require("lodash"));
 const core_1 = require("../../core");
-const DbCollectionName_1 = require("../../core/DbCollectionName");
-const IdentityDeletionProcess_1 = require("../accounts/data/IdentityDeletionProcess");
-const File_1 = require("../files/local/File");
-const Message_1 = require("../messages/local/Message");
-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");
 class DatawalletModificationsProcessor {
     get changedObjectIdentifiers() {
@@ -33,29 +15,15 @@ class DatawalletModificationsProcessor {
     get log() {
         return this.logger;
     }
-    constructor(modifications, cacheFetcher, collectionProvider, logger) {
-        this.cacheFetcher = cacheFetcher;
+    constructor(modifications, collectionProvider, logger) {
+        this.modifications = modifications;
         this.collectionProvider = collectionProvider;
         this.logger = logger;
         this.deletedObjectIdentifiers = [];
         this._changedObjectIdentifiers = new Set();
-        this.collectionsWithCacheableItems = [
-            DbCollectionName_1.DbCollectionName.Files,
-            DbCollectionName_1.DbCollectionName.Messages,
-            DbCollectionName_1.DbCollectionName.Relationships,
-            DbCollectionName_1.DbCollectionName.RelationshipTemplates,
-            DbCollectionName_1.DbCollectionName.Tokens,
-            DbCollectionName_1.DbCollectionName.IdentityDeletionProcess
-        ];
-        this.modificationsWithoutCacheChanges = modifications.filter((m) => m.type !== DatawalletModification_1.DatawalletModificationType.CacheChanged);
-        this.cacheChanges = modifications.filter((m) => m.type === DatawalletModification_1.DatawalletModificationType.CacheChanged);
     }
     async execute() {
-        await this.applyModifications();
-        await this.applyCacheChanges();
-    }
-    async applyModifications() {
-        const modificationsGroupedByObjectIdentifier = lodash_1.default.groupBy(this.modificationsWithoutCacheChanges, (m) => m.objectIdentifier);
+        const modificationsGroupedByObjectIdentifier = lodash_1.default.groupBy(this.modifications, (m) => m.objectIdentifier);
         for (const objectIdentifier in modificationsGroupedByObjectIdentifier) {
             this._changedObjectIdentifiers.add(objectIdentifier);
             const currentModifications = modificationsGroupedByObjectIdentifier[objectIdentifier];
@@ -77,8 +45,8 @@ class DatawalletModificationsProcessor {
                     case DatawalletModification_1.DatawalletModificationType.Delete:
                         resultingObject = {};
                         break;
-                    case DatawalletModification_1.DatawalletModificationType.CacheChanged:
-                        throw new core_1.TransportError("CacheChanged modifications are not allowed in this context.");
+                    default:
+                        throw new core_1.TransportError(`${modification.type} modifications are not allowed in this context.`);
                 }
             }
             const oldDoc = await targetCollection.read(objectIdentifier);
@@ -89,129 +57,14 @@ class DatawalletModificationsProcessor {
                     ...resultingObject
                 };
                 await targetCollection.update(oldDoc, newObject);
+                continue;
             }
-            else {
-                await this.simulateCacheChangeForCreate(targetCollectionName, objectIdentifier);
-                await targetCollection.create({
-                    id: objectIdentifier,
-                    ...resultingObject
-                });
-            }
+            await targetCollection.create({
+                id: objectIdentifier,
+                ...resultingObject
+            });
         }
     }
-    /**
-     * if a collection contains cacheable items, the cache has to be fetched after the item is created on a new device
-     * this can only happen after all creates are applied, because the fetching needs properties like the secret key
-     */
-    async simulateCacheChangeForCreate(targetCollectionName, objectIdentifier) {
-        if (!this.collectionsWithCacheableItems.includes(targetCollectionName))
-            return;
-        const modification = DatawalletModification_1.DatawalletModification.from({
-            localId: await core_1.TransportIds.datawalletModification.generate(),
-            type: DatawalletModification_1.DatawalletModificationType.CacheChanged,
-            collection: targetCollectionName,
-            objectIdentifier: core_types_1.CoreId.from(objectIdentifier)
-        });
-        this.cacheChanges.push(modification);
-    }
-    async applyCacheChanges() {
-        if (this.cacheChanges.length === 0) {
-            return;
-        }
-        this.ensureAllItemsAreCacheable();
-        const cacheChangesWithoutDeletes = this.cacheChanges.filter((c) => !this.deletedObjectIdentifiers.some((d) => c.objectIdentifier.equals(d)));
-        for (const objectIdentifier of cacheChangesWithoutDeletes.map((c) => c.objectIdentifier.toString())) {
-            this._changedObjectIdentifiers.add(objectIdentifier);
-        }
-        const cacheChangesGroupedByCollection = this.groupCacheChangesByCollection(cacheChangesWithoutDeletes);
-        const caches = await this.cacheFetcher.fetchCacheFor({
-            files: cacheChangesGroupedByCollection.fileIds,
-            relationshipTemplates: cacheChangesGroupedByCollection.relationshipTemplateIds,
-            tokens: cacheChangesGroupedByCollection.tokenIds,
-            identityDeletionProcesses: cacheChangesGroupedByCollection.identityDeletionProcessIds
-        });
-        await this.saveNewCaches(caches.files, DbCollectionName_1.DbCollectionName.Files, File_1.File);
-        await this.saveNewCaches(caches.relationshipTemplates, DbCollectionName_1.DbCollectionName.RelationshipTemplates, RelationshipTemplate_1.RelationshipTemplate);
-        await this.saveNewCaches(caches.tokens, DbCollectionName_1.DbCollectionName.Tokens, Token_1.Token);
-        await this.saveNewCaches(caches.identityDeletionProcesses, DbCollectionName_1.DbCollectionName.IdentityDeletionProcess, IdentityDeletionProcess_1.IdentityDeletionProcess);
-        // Need to fetch the cache for relationships after the cache for relationship templates was fetched, because when building the relationship cache, the cache of thecorresponding relationship template is needed
-        const relationshipCaches = await this.cacheFetcher.fetchCacheFor({ relationships: cacheChangesGroupedByCollection.relationshipIds });
-        await this.saveNewCaches(relationshipCaches.relationships, DbCollectionName_1.DbCollectionName.Relationships, Relationship_1.Relationship);
-        // Need to fetch the cache for messages after the cache for relationships was fetched, because when building the message cache, the cache of thecorresponding relationship is needed
-        const messageCaches = await this.cacheFetcher.fetchCacheFor({ messages: cacheChangesGroupedByCollection.messageIds });
-        await this.saveNewCaches(messageCaches.messages, DbCollectionName_1.DbCollectionName.Messages, Message_1.Message);
-    }
-    ensureAllItemsAreCacheable() {
-        const collections = this.cacheChanges.map((c) => c.collection);
-        const uniqueCollections = [...new Set(collections)];
-        const collectionsWithUncacheableItems = uniqueCollections.filter((c) => !this.collectionsWithCacheableItems.includes(c));
-        if (collectionsWithUncacheableItems.length > 0) {
-            throw core_1.TransportCoreErrors.datawallet.unsupportedModification(`The following collections were received in CacheChanged datawallet modifications but are not supported by the current version of this library: '${collectionsWithUncacheableItems.join(", ")}'.`);
-        }
-    }
-    groupCacheChangesByCollection(cacheChanges) {
-        const groups = lodash_1.default.groupBy(cacheChanges, (c) => c.collection);
-        const fileIds = (groups[DbCollectionName_1.DbCollectionName.Files] ?? []).map((m) => m.objectIdentifier);
-        const messageIds = (groups[DbCollectionName_1.DbCollectionName.Messages] ?? []).map((m) => m.objectIdentifier);
-        const relationshipIds = (groups[DbCollectionName_1.DbCollectionName.Relationships] ?? []).map((m) => m.objectIdentifier);
-        const relationshipTemplateIds = (groups[DbCollectionName_1.DbCollectionName.RelationshipTemplates] ?? []).map((m) => m.objectIdentifier);
-        const tokenIds = (groups[DbCollectionName_1.DbCollectionName.Tokens] ?? []).map((m) => m.objectIdentifier);
-        const identityDeletionProcessIds = (groups[DbCollectionName_1.DbCollectionName.IdentityDeletionProcess] ?? []).map((m) => m.objectIdentifier);
-        return { fileIds, messageIds, relationshipTemplateIds, tokenIds, relationshipIds, identityDeletionProcessIds };
-    }
-    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 = constructorOfT.from(itemDoc);
-            item.setCache(c.cache);
-            await collection.update(itemDoc, item);
-        }));
-    }
 }
 exports.DatawalletModificationsProcessor = DatawalletModificationsProcessor;
-__decorate([
-    (0, ts_utils_1.log)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", void 0)
-], DatawalletModificationsProcessor.prototype, "ensureAllItemsAreCacheable", null);
-class CacheFetcher {
-    constructor(fileController, messageController, relationshipTemplateController, relationshipController, tokenController, identityDeletionProcessController) {
-        this.fileController = fileController;
-        this.messageController = messageController;
-        this.relationshipTemplateController = relationshipTemplateController;
-        this.relationshipController = relationshipController;
-        this.tokenController = tokenController;
-        this.identityDeletionProcessController = identityDeletionProcessController;
-    }
-    async fetchCacheFor(input) {
-        const caches = await Promise.all([
-            this.fetchCaches(this.fileController, input.files),
-            this.fetchCaches(this.messageController, input.messages),
-            this.fetchCaches(this.relationshipController, input.relationships),
-            this.fetchCaches(this.relationshipTemplateController, input.relationshipTemplates),
-            this.fetchCaches(this.tokenController, input.tokens),
-            this.fetchCaches(this.identityDeletionProcessController, input.identityDeletionProcesses)
-        ]);
-        const output = {
-            files: caches[0],
-            messages: caches[1],
-            relationships: caches[2],
-            relationshipTemplates: caches[3],
-            tokens: caches[4],
-            identityDeletionProcesses: caches[5]
-        };
-        return output;
-    }
-    async fetchCaches(controller, ids) {
-        if (!ids)
-            return [];
-        const caches = await controller.fetchCaches(ids);
-        return caches;
-    }
-}
-exports.CacheFetcher = CacheFetcher;
 //# sourceMappingURL=DatawalletModificationsProcessor.js.map

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":";;;;;;AAEA,kDAAkD;AAClD,oDAAuB;AACvB,qCAA4C;AAC5C,2EAAoG;AAEpG,MAAa,gCAAgC;IAIzC,IAAW,wBAAwB;QAC/B,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACtD,CAAC;IAED,IAAW,GAAG;QACV,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,YACqB,aAAuC,EACvC,kBAA+C,EAC/C,MAAe;QAFf,kBAAa,GAAb,aAAa,CAA0B;QACvC,uBAAkB,GAAlB,kBAAkB,CAA6B;QAC/C,WAAM,GAAN,MAAM,CAAS;QAdnB,6BAAwB,GAAa,EAAE,CAAC;QAExC,8BAAyB,GAAgB,IAAI,GAAG,EAAE,CAAC;IAajE,CAAC;IAEG,KAAK,CAAC,OAAO;QAChB,MAAM,sCAAsC,GAAG,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;QAExG,KAAK,MAAM,gBAAgB,IAAI,sCAAsC,EAAE,CAAC;YACpE,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YAErD,MAAM,oBAAoB,GAAG,sCAAsC,CAAC,gBAAgB,CAAC,CAAC;YAEtF,MAAM,oBAAoB,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YAChE,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;YAE3F,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;YACtD,IAAI,gBAAgB,CAAC,IAAI,KAAK,mDAA0B,CAAC,MAAM,EAAE,CAAC;gBAC9D,MAAM,gBAAgB,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC;gBACxD,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBAErD,SAAS;YACb,CAAC;YAED,IAAI,eAAe,GAAQ,EAAE,CAAC;YAC9B,KAAK,MAAM,YAAY,IAAI,oBAAoB,EAAE,CAAC;gBAC9C,QAAQ,YAAY,CAAC,IAAI,EAAE,CAAC;oBACxB,KAAK,mDAA0B,CAAC,MAAM,CAAC;oBACvC,KAAK,mDAA0B,CAAC,MAAM;wBAClC,eAAe,GAAG,EAAE,GAAG,eAAe,EAAE,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC;wBAClE,MAAM;oBACV,KAAK,mDAA0B,CAAC,MAAM;wBAClC,eAAe,GAAG,EAAE,CAAC;wBACrB,MAAM;oBACV;wBACI,MAAM,IAAI,qBAAc,CAAC,GAAG,YAAY,CAAC,IAAI,iDAAiD,CAAC,CAAC;gBACxG,CAAC;YACL,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAC7D,IAAI,MAAM,EAAE,CAAC;gBACT,MAAM,SAAS,GAAG,wBAAY,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBAEnD,MAAM,SAAS,GAAG;oBACd,GAAG,SAAS,CAAC,MAAM,EAAE;oBACrB,GAAG,eAAe;iBACrB,CAAC;gBAEF,MAAM,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;gBACjD,SAAS;YACb,CAAC;YAED,MAAM,gBAAgB,CAAC,MAAM,CAAC;gBAC1B,EAAE,EAAE,gBAAgB;gBACpB,GAAG,eAAe;aACrB,CAAC,CAAC;QACP,CAAC;IACL,CAAC;CACJ;AAvED,4EAuEC"}

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

@@ -13,8 +13,6 @@ export declare class SyncController extends TransportController {
     private readonly deviceMigrations;
     private readonly identityMigrations;
     private readonly externalEventRegistry;
-    private _cacheFetcher?;
-    private get cacheFetcher();
     constructor(parent: AccountController, dependencyOverrides: DependencyOverrides, unpushedDatawalletModifications: IDatabaseCollection, datawalletEnabled: boolean);
     init(): Promise<SyncController>;
     private currentSync?;

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

@@ -1 +1 @@
-{"version":3,"file":"SyncController.d.ts","sourceRoot":"","sources":["../../../src/modules/sync/SyncController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAgB,MAAM,oCAAoC,CAAC;AAEvF,OAAO,EAAE,QAAQ,EAAqB,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAgC,mBAAmB,EAA+D,MAAM,YAAY,CAAC;AAC5I,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAa1C,qBAAa,cAAe,SAAQ,mBAAmB;IAyB/C,OAAO,CAAC,QAAQ,CAAC,+BAA+B;IAChD,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAzBtC,OAAO,CAAC,QAAQ,CAAe;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IACpD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IACxD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAwC;IAE9E,OAAO,CAAC,aAAa,CAAC,CAAe;IACrC,OAAO,KAAK,YAAY,GAYvB;gBAGG,MAAM,EAAE,iBAAiB,EACzB,mBAAmB,EAAE,mBAAmB,EACvB,+BAA+B,EAAE,mBAAmB,EACpD,iBAAiB,EAAE,OAAO;IAUzB,IAAI,IAAI,OAAO,CAAC,cAAc,CAAC;IAQrD,OAAO,CAAC,WAAW,CAAC,CAAe;IACnC,OAAO,CAAC,cAAc,CAAC,CAAkB;IAE5B,IAAI,CAAC,UAAU,GAAE,UAAyB,GAAG,OAAO,CAAC,YAAY,CAAC;YAsBjE,wBAAwB;YAmBxB,KAAK;YAYL,kBAAkB;YAmBlB,cAAc;YAiCd,sBAAsB;YAgBtB,gCAAgC;YA4BhC,8BAA8B;YAyB9B,oCAAoC;YA0BpC,8BAA8B;YAK9B,6BAA6B;YAW7B,gCAAgC;YAgBhC,0CAA0C;YAsB1C,qCAAqC;IAMtC,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAK3D,4BAA4B;YAK5B,0BAA0B;YAW1B,oCAAoC;YAOpC,2BAA2B;YAiC3B,6BAA6B;YAwB7B,uCAAuC;YAuBvC,mCAAmC;YAKnC,sCAAsC;YAItC,iBAAiB;YAMjB,iBAAiB;IAKlB,wBAAwB,IAAI,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IAIzD,kCAAkC,IAAI,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;YAIlE,wBAAwB;YAIxB,kCAAkC;IAIhD,OAAO,CAAC,4BAA4B;CAGvC"}
+{"version":3,"file":"SyncController.d.ts","sourceRoot":"","sources":["../../../src/modules/sync/SyncController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAgB,MAAM,oCAAoC,CAAC;AAEvF,OAAO,EAAE,QAAQ,EAAqB,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAgC,mBAAmB,EAA+D,MAAM,YAAY,CAAC;AAC5I,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAa1C,qBAAa,cAAe,SAAQ,mBAAmB;IAU/C,OAAO,CAAC,QAAQ,CAAC,+BAA+B;IAChD,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAVtC,OAAO,CAAC,QAAQ,CAAe;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IACpD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IACxD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAwC;gBAG1E,MAAM,EAAE,iBAAiB,EACzB,mBAAmB,EAAE,mBAAmB,EACvB,+BAA+B,EAAE,mBAAmB,EACpD,iBAAiB,EAAE,OAAO;IAUzB,IAAI,IAAI,OAAO,CAAC,cAAc,CAAC;IAQrD,OAAO,CAAC,WAAW,CAAC,CAAe;IACnC,OAAO,CAAC,cAAc,CAAC,CAAkB;IAE5B,IAAI,CAAC,UAAU,GAAE,UAAyB,GAAG,OAAO,CAAC,YAAY,CAAC;YAsBjE,wBAAwB;YAmBxB,KAAK;YAYL,kBAAkB;YAmBlB,cAAc;YAiCd,sBAAsB;YAgBtB,gCAAgC;YA4BhC,8BAA8B;YAyB9B,oCAAoC;YAyBpC,8BAA8B;YAK9B,6BAA6B;YAW7B,gCAAgC;YAgBhC,0CAA0C;YAsB1C,qCAAqC;IAMtC,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAK3D,4BAA4B;YAK5B,0BAA0B;YAW1B,oCAAoC;YAOpC,2BAA2B;YAiC3B,6BAA6B;YAwB7B,uCAAuC;YAuBvC,mCAAmC;YAKnC,sCAAsC;YAItC,iBAAiB;YAMjB,iBAAiB;IAKlB,wBAAwB,IAAI,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IAIzD,kCAAkC,IAAI,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;YAIlE,wBAAwB;YAIxB,kCAAkC;IAIhD,OAAO,CAAC,4BAA4B;CAGvC"}

package/dist/modules/sync/SyncController.js

@@ -25,12 +25,6 @@ const DatawalletModification_1 = require("./local/DatawalletModification");
 const DeviceMigrations_1 = require("./migrations/DeviceMigrations");
 const IdentityMigrations_1 = require("./migrations/IdentityMigrations");
 class SyncController extends core_1.TransportController {
-    get cacheFetcher() {
-        if (!this._cacheFetcher) {
-            this._cacheFetcher = new DatawalletModificationsProcessor_1.CacheFetcher(this.parent.files, this.parent.messages, this.parent.relationshipTemplates, this.parent.relationships, this.parent.tokens, this.parent.identityDeletionProcess);
-        }
-        return this._cacheFetcher;
-    }
     constructor(parent, dependencyOverrides, unpushedDatawalletModifications, datawalletEnabled) {
         super(core_1.ControllerName.Sync, parent);
         this.unpushedDatawalletModifications = unpushedDatawalletModifications;
@@ -185,7 +179,7 @@ class SyncController extends core_1.TransportController {
             return [];
         const incomingModifications = await this.decryptDatawalletModifications(encryptedIncomingModifications);
         this.log.trace(`${incomingModifications.length} incoming modifications found`);
-        const datawalletModificationsProcessor = new DatawalletModificationsProcessor_1.DatawalletModificationsProcessor(incomingModifications, this.cacheFetcher, this.db, core_1.TransportLoggerFactory.getLogger(DatawalletModificationsProcessor_1.DatawalletModificationsProcessor));
+        const datawalletModificationsProcessor = new DatawalletModificationsProcessor_1.DatawalletModificationsProcessor(incomingModifications, this.db, core_1.TransportLoggerFactory.getLogger(DatawalletModificationsProcessor_1.DatawalletModificationsProcessor));
         await datawalletModificationsProcessor.execute();
         this.log.trace(`${incomingModifications.length} incoming modifications executed`, incomingModifications);
         await this.updateLocalDatawalletModificationIndex(encryptedIncomingModifications.sort(descending)[0].index);
@@ -295,7 +289,7 @@ class SyncController extends core_1.TransportController {
             throw response.error;
         await this.deleteUnpushedDatawalletModifications(localModificationIds);
         const oldDatawalletModificationIndex = await this.getLocalDatawalletModificationIndex();
-        const newDatawalletModificationIndex = (oldDatawalletModificationIndex || -1) + backboneModifications.length;
+        const newDatawalletModificationIndex = (oldDatawalletModificationIndex ?? -1) + backboneModifications.length;
         await this.updateLocalDatawalletModificationIndex(newDatawalletModificationIndex);
         this.currentSyncRun = undefined;
         return { newUnsyncedExternalEventsExist: response.value.newUnsyncedExternalEventsExist };
@@ -313,7 +307,7 @@ class SyncController extends core_1.TransportController {
             throw response.error;
         await this.deleteUnpushedDatawalletModifications(localModificationIds);
         const oldDatawalletModificationIndex = await this.getLocalDatawalletModificationIndex();
-        const newDatawalletModificationIndex = (oldDatawalletModificationIndex || -1) + backboneModifications.length;
+        const newDatawalletModificationIndex = (oldDatawalletModificationIndex ?? -1) + backboneModifications.length;
         await this.updateLocalDatawalletModificationIndex(newDatawalletModificationIndex);
         this.currentSyncRun = undefined;
     }