@nmshd/transport 1.0.2 → 1.0.3

package/lib-web/nmshd.transport.js

@@ -15,11 +15,11 @@ exports.buildInformation = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 exports.buildInformation = {
-    version: "1.0.2",
-    build: "5",
-    date: "2021-09-30T08:27:43+00:00",
-    commit: "dbec0223dae9590e34133f0058f0ae4b88fe652c",
-    dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.0","@js-soft/ts-utils":"1.0.1","axios":"^0.21.4","deep-equal":"^2.0.5","fast-json-patch":"^3.1.0","form-data":"^4.0.0","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^2.0.2","qs":"^6.10.1","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^8.3.2"},
+    version: "1.0.3",
+    build: "6",
+    date: "2021-10-04T12:56:05+00:00",
+    commit: "d976ae0870949b85d8b2c8c4ca728ba1c09d0353",
+    dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.0","@js-soft/ts-utils":"1.0.1","axios":"^0.22.0","deep-equal":"^2.0.5","fast-json-patch":"^3.1.0","form-data":"^4.0.0","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^2.0.2","qs":"^6.10.1","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^8.3.2"},
     libraries: {
         crypto: crypto_1.buildInformation,
         serval: ts_serval_1.buildInformation
@@ -546,29 +546,29 @@ exports.CoreUtil = CoreUtil;
 
 /***/ }),
 
-/***/ "./dist/core/DbCollectionNames.js":
-/*!****************************************!*\
-  !*** ./dist/core/DbCollectionNames.js ***!
-  \****************************************/
+/***/ "./dist/core/DbCollectionName.js":
+/*!***************************************!*\
+  !*** ./dist/core/DbCollectionName.js ***!
+  \***************************************/
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.DbCollectionNames = void 0;
-var DbCollectionNames;
-(function (DbCollectionNames) {
-    DbCollectionNames["Files"] = "Files";
-    DbCollectionNames["Tokens"] = "Tokens";
-    DbCollectionNames["Relationships"] = "Relationships";
-    DbCollectionNames["Templates"] = "Templates";
-    DbCollectionNames["Messages"] = "Messages";
-    DbCollectionNames["CertificatesIssued"] = "CertificatesIssued";
-    DbCollectionNames["UnpushedDatawalletModifications"] = "UnpushedDatawalletModifications";
-    DbCollectionNames["Devices"] = "Devices";
-    DbCollectionNames["Secrets"] = "Secrets";
-})(DbCollectionNames = exports.DbCollectionNames || (exports.DbCollectionNames = {}));
-//# sourceMappingURL=DbCollectionNames.js.map
+exports.DbCollectionName = void 0;
+var DbCollectionName;
+(function (DbCollectionName) {
+    DbCollectionName["Files"] = "Files";
+    DbCollectionName["Tokens"] = "Tokens";
+    DbCollectionName["Relationships"] = "Relationships";
+    DbCollectionName["RelationshipTemplates"] = "Templates";
+    DbCollectionName["Messages"] = "Messages";
+    DbCollectionName["CertificatesIssued"] = "CertificatesIssued";
+    DbCollectionName["UnpushedDatawalletModifications"] = "UnpushedDatawalletModifications";
+    DbCollectionName["Devices"] = "Devices";
+    DbCollectionName["Secrets"] = "Secrets";
+})(DbCollectionName = exports.DbCollectionName || (exports.DbCollectionName = {}));
+//# sourceMappingURL=DbCollectionName.js.map
 
 /***/ }),
 
@@ -588,8 +588,12 @@ function isCacheable(object) {
     if (!(object instanceof CoreSynchronizable_1.CoreSynchronizable)) {
         return false;
     }
-    const hasCacheProperty = Object.prototype.hasOwnProperty.call(object.toJSON(), (0, ts_simple_nameof_1.nameof)((o) => o.cache));
-    return hasCacheProperty;
+    if (typeof object !== "object") {
+        return false;
+    }
+    const hasCacheProperty = object.toJSON().hasOwnProperty((0, ts_simple_nameof_1.nameof)((o) => o.cache));
+    const hasSetCacheMethod = typeof object.setCache === "function";
+    return hasCacheProperty && hasSetCacheMethod;
 }
 exports.isCacheable = isCacheable;
 //# sourceMappingURL=ICacheable.js.map
@@ -1543,10 +1547,9 @@ class RESTClient {
             return response;
         });
         const logResponseTime = (response) => {
-            var _a;
             const requestStartTime = response.config.meta.startTime;
             // Backbone Call duration
-            const backboneResponseDuration = ((_a = response.headers) === null || _a === void 0 ? void 0 : _a["x-response-duration-ms"])
+            const backboneResponseDuration = response.headers["x-response-duration-ms"]
                 ? Number.parseInt(response.headers["x-response-duration-ms"])
                 : undefined;
             const backboneMessage = `${response.config.method.toUpperCase()} ${response.request.path} (backbone call): ${backboneResponseDuration ? `${backboneResponseDuration}ms` : "unknown"}`;
@@ -2591,7 +2594,7 @@ const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
 const Authenticator_1 = __webpack_require__(/*! ../../core/backbone/Authenticator */ "./dist/core/backbone/Authenticator.js");
 const CoreCrypto_1 = __webpack_require__(/*! ../../core/CoreCrypto */ "./dist/core/CoreCrypto.js");
-const DbCollectionNames_1 = __webpack_require__(/*! ../../core/DbCollectionNames */ "./dist/core/DbCollectionNames.js");
+const DbCollectionName_1 = __webpack_require__(/*! ../../core/DbCollectionName */ "./dist/core/DbCollectionName.js");
 const TransportLoggerFactory_1 = __webpack_require__(/*! ../../core/TransportLoggerFactory */ "./dist/core/TransportLoggerFactory.js");
 const util_1 = __webpack_require__(/*! ../../util */ "./dist/util/index.js");
 const CertificateController_1 = __webpack_require__(/*! ../certificates/CertificateController */ "./dist/modules/certificates/CertificateController.js");
@@ -2656,7 +2659,7 @@ class AccountController {
     // TODO: JSSNMSHDD-2487 (last login date)
     async init(deviceSharedSecret) {
         this.info = await this.db.getMap("AccountInfo");
-        this.unpushedDatawalletModifications = await this.db.getCollection(DbCollectionNames_1.DbCollectionNames.UnpushedDatawalletModifications);
+        this.unpushedDatawalletModifications = await this.db.getCollection(DbCollectionName_1.DbCollectionName.UnpushedDatawalletModifications);
         this.deviceClient = new DeviceClient_1.DeviceClient(this.config);
         this.identityClient = new IdentityClient_1.IdentityClient(this.config);
         this._identity = new IdentityController_1.IdentityController(this);
@@ -3213,7 +3216,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.CertificateContentParam = exports.CertificateIssuer = void 0;
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
-const DbCollectionNames_1 = __webpack_require__(/*! ../../core/DbCollectionNames */ "./dist/core/DbCollectionNames.js");
+const DbCollectionName_1 = __webpack_require__(/*! ../../core/DbCollectionName */ "./dist/core/DbCollectionName.js");
 const Certificate_1 = __webpack_require__(/*! ./data/Certificate */ "./dist/modules/certificates/data/Certificate.js");
 const CertificateContent_1 = __webpack_require__(/*! ./data/CertificateContent */ "./dist/modules/certificates/data/CertificateContent.js");
 /**
@@ -3227,7 +3230,7 @@ class CertificateIssuer extends core_1.TransportController {
     }
     async init() {
         await super.init();
-        this.certificatesIssued = await this.db.getCollection(DbCollectionNames_1.DbCollectionNames.CertificatesIssued);
+        this.certificatesIssued = await this.db.getCollection(DbCollectionName_1.DbCollectionName.CertificatesIssued);
         return this;
     }
     async issueCertificate(value) {
@@ -4684,7 +4687,7 @@ DeviceSecretController.secretContext = "DEVICE01";
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DevicesController = void 0;
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
-const DbCollectionNames_1 = __webpack_require__(/*! ../../core/DbCollectionNames */ "./dist/core/DbCollectionNames.js");
+const DbCollectionName_1 = __webpack_require__(/*! ../../core/DbCollectionName */ "./dist/core/DbCollectionName.js");
 const TransportController_1 = __webpack_require__(/*! ../../core/TransportController */ "./dist/core/TransportController.js");
 const util_1 = __webpack_require__(/*! ../../util */ "./dist/util/index.js");
 const Challenge_1 = __webpack_require__(/*! ../challenges/data/Challenge */ "./dist/modules/challenges/data/Challenge.js");
@@ -4698,7 +4701,7 @@ class DevicesController extends TransportController_1.TransportController {
     async init() {
         await super.init();
         this.client = new DeviceAuthClient_1.DeviceAuthClient(this.config, this.parent.authenticator);
-        this.devices = await this.parent.getSynchronizedCollection(DbCollectionNames_1.DbCollectionNames.Devices);
+        this.devices = await this.parent.getSynchronizedCollection(DbCollectionName_1.DbCollectionName.Devices);
         return this;
     }
     async get(id) {
@@ -5188,7 +5191,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.FileController = void 0;
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
-const DbCollectionNames_1 = __webpack_require__(/*! ../../core/DbCollectionNames */ "./dist/core/DbCollectionNames.js");
+const DbCollectionName_1 = __webpack_require__(/*! ../../core/DbCollectionName */ "./dist/core/DbCollectionName.js");
 const TransportController_1 = __webpack_require__(/*! ../../core/TransportController */ "./dist/core/TransportController.js");
 const FileClient_1 = __webpack_require__(/*! ./backbone/FileClient */ "./dist/modules/files/backbone/FileClient.js");
 const CachedFile_1 = __webpack_require__(/*! ./local/CachedFile */ "./dist/modules/files/local/CachedFile.js");
@@ -5203,7 +5206,7 @@ class FileController extends TransportController_1.TransportController {
     async init() {
         await super.init();
         this.client = new FileClient_1.FileClient(this.config, this.parent.authenticator);
-        this.files = await this.parent.getSynchronizedCollection(DbCollectionNames_1.DbCollectionNames.Files);
+        this.files = await this.parent.getSynchronizedCollection(DbCollectionName_1.DbCollectionName.Files);
         return this;
     }
     async getFiles(query) {
@@ -5214,6 +5217,17 @@ class FileController extends TransportController_1.TransportController {
         const doc = await this.files.read(id.toString());
         return doc ? await File_1.File.from(doc) : undefined;
     }
+    async fetchCaches(ids) {
+        if (ids.length === 0)
+            return [];
+        const backboneFiles = await (await this.client.getFiles({ ids: ids.map((id) => id.id) })).value.collect();
+        const decryptionPromises = backboneFiles.map(async (f) => {
+            const fileDoc = await this.files.read(f.id);
+            const file = await File_1.File.from(fileDoc);
+            return { id: core_1.CoreId.from(f.id), cache: await this.decryptFile(f, file.secretKey) };
+        });
+        return await Promise.all(decryptionPromises);
+    }
     async updateCache(ids) {
         const resultItems = (await this.client.getFiles({ ids })).value;
         const promises = [];
@@ -5237,17 +5251,21 @@ class FileController extends TransportController_1.TransportController {
         if (!response) {
             response = (await this.client.getFile(fileId)).value;
         }
+        const cachedFile = await this.decryptFile(response, file.secretKey);
+        file.setCache(cachedFile);
+        // Update isOwn, as it is possible that the identity receives an attachment with an own File.
+        file.isOwn = this.parent.identity.isMe(cachedFile.createdBy);
+    }
+    async decryptFile(response, secretKey) {
         const cipher = await crypto_1.CryptoCipher.fromBase64(response.encryptedProperties);
-        const plaintextMetadataBuffer = await core_1.CoreCrypto.decrypt(cipher, file.secretKey);
+        const plaintextMetadataBuffer = await core_1.CoreCrypto.decrypt(cipher, secretKey);
         const plaintextMetadata = await FileMetadata_1.FileMetadata.deserialize(plaintextMetadataBuffer.toUtf8());
         if (!(plaintextMetadata instanceof FileMetadata_1.FileMetadata)) {
-            throw core_1.TransportErrors.files.invalidMetadata(fileId).logWith(this._log);
+            throw core_1.TransportErrors.files.invalidMetadata(response.id).logWith(this._log);
         }
         // TODO: JSSNMSHDD-2486 (check signature)
         const cachedFile = await CachedFile_1.CachedFile.fromBackbone(response, plaintextMetadata);
-        file.setCache(cachedFile);
-        // Update isOwn, as it is possible that the identity receives an attachment with an own File.
-        file.isOwn = this.parent.identity.isMe(cachedFile.createdBy);
+        return cachedFile;
     }
     async loadPeerFileByTruncated(truncated) {
         const reference = await FileReference_1.FileReference.fromTruncated(truncated);
@@ -6065,7 +6083,7 @@ exports.MessageController = void 0;
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
-const DbCollectionNames_1 = __webpack_require__(/*! ../../core/DbCollectionNames */ "./dist/core/DbCollectionNames.js");
+const DbCollectionName_1 = __webpack_require__(/*! ../../core/DbCollectionName */ "./dist/core/DbCollectionName.js");
 const TransportController_1 = __webpack_require__(/*! ../../core/TransportController */ "./dist/core/TransportController.js");
 const File_1 = __webpack_require__(/*! ../files/local/File */ "./dist/modules/files/local/File.js");
 const Relationship_1 = __webpack_require__(/*! ../relationships/local/Relationship */ "./dist/modules/relationships/local/Relationship.js");
@@ -6089,7 +6107,7 @@ class MessageController extends TransportController_1.TransportController {
         this.secrets = new RelationshipSecretController_1.RelationshipSecretController(this.parent);
         await this.secrets.init();
         this.client = new MessageClient_1.MessageClient(this.config, this.parent.authenticator);
-        this.messages = await this.parent.getSynchronizedCollection(DbCollectionNames_1.DbCollectionNames.Messages);
+        this.messages = await this.parent.getSynchronizedCollection(DbCollectionName_1.DbCollectionName.Messages);
         return this;
     }
     async getMessages(query) {
@@ -6127,6 +6145,19 @@ class MessageController extends TransportController_1.TransportController {
         }
         return await Promise.all(promises);
     }
+    async fetchCaches(ids) {
+        if (ids.length === 0)
+            return [];
+        const backboneMessages = await (await this.client.getMessages({ ids: ids.map((id) => id.toString()) })).value.collect();
+        const decryptionPromises = backboneMessages.map(async (m) => {
+            const messageDoc = await this.messages.read(m.id);
+            const message = await Message_1.Message.from(messageDoc);
+            const envelope = await this.getEnvelopeFromBackboneGetMessagesResponse(m);
+            const cachedMessage = (await this.decryptMessage(envelope, message.secretKey))[0];
+            return { id: core_1.CoreId.from(m.id), cache: cachedMessage };
+        });
+        return await Promise.all(decryptionPromises);
+    }
     async updateCacheOfExistingMessageInDb(id, response) {
         const messageDoc = await this.messages.read(id);
         if (!messageDoc) {
@@ -6143,14 +6174,14 @@ class MessageController extends TransportController_1.TransportController {
             response = (await this.client.getMessage(messageId)).value;
         }
         const envelope = await this.getEnvelopeFromBackboneGetMessagesResponse(response);
-        const [cachedMessage, messageKey] = await this.decryptSealedEnvelope(envelope, message.secretKey);
+        const [cachedMessage, messageKey] = await this.decryptMessage(envelope, message.secretKey);
         message.secretKey = messageKey;
         message.setCache(cachedMessage);
     }
     async loadPeerMessage(id) {
         const response = (await this.client.getMessage(id.toString())).value;
         const envelope = await this.getEnvelopeFromBackboneGetMessagesResponse(response);
-        const [cachedMessage, messageKey, relationship] = await this.decryptSealedEnvelope(envelope);
+        const [cachedMessage, messageKey, relationship] = await this.decryptMessage(envelope);
         if (!relationship) {
             throw core_1.TransportErrors.general.recordNotFound(Relationship_1.Relationship, envelope.id.toString()).logWith(this._log);
         }
@@ -6331,7 +6362,7 @@ class MessageController extends TransportController_1.TransportController {
         }
         return [messagePlain, plaintextKey];
     }
-    async decryptSealedEnvelope(envelope, secretKey) {
+    async decryptMessage(envelope, secretKey) {
         this.log.trace(`Decrypting MessageEnvelope with id ${envelope.id}...`);
         let plainMessage;
         let messageKey;
@@ -7002,7 +7033,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RelationshipTemplateController = void 0;
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
-const DbCollectionNames_1 = __webpack_require__(/*! ../../core/DbCollectionNames */ "./dist/core/DbCollectionNames.js");
+const DbCollectionName_1 = __webpack_require__(/*! ../../core/DbCollectionName */ "./dist/core/DbCollectionName.js");
 const TransportController_1 = __webpack_require__(/*! ../../core/TransportController */ "./dist/core/TransportController.js");
 const RelationshipTemplateClient_1 = __webpack_require__(/*! ./backbone/RelationshipTemplateClient */ "./dist/modules/relationshipTemplates/backbone/RelationshipTemplateClient.js");
 const CachedRelationshipTemplate_1 = __webpack_require__(/*! ./local/CachedRelationshipTemplate */ "./dist/modules/relationshipTemplates/local/CachedRelationshipTemplate.js");
@@ -7018,7 +7049,7 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
     }
     async init() {
         await super.init();
-        this.templates = await this.parent.getSynchronizedCollection(DbCollectionNames_1.DbCollectionNames.Templates);
+        this.templates = await this.parent.getSynchronizedCollection(DbCollectionName_1.DbCollectionName.RelationshipTemplates);
         return this;
     }
     async sendRelationshipTemplate(parameters) {
@@ -7081,6 +7112,17 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
         }
         return await Promise.all(promises);
     }
+    async fetchCaches(ids) {
+        if (ids.length === 0)
+            return [];
+        const backboneRelationships = await (await this.client.getRelationshipTemplates({ ids: ids.map((id) => id.id) })).value.collect();
+        const decryptionPromises = backboneRelationships.map(async (t) => {
+            const templateDoc = await this.templates.read(t.id);
+            const template = await RelationshipTemplate_1.RelationshipTemplate.from(templateDoc);
+            return { id: core_1.CoreId.from(t.id), cache: await this.decryptRelationshipTemplate(t, template.secretKey) };
+        });
+        return await Promise.all(decryptionPromises);
+    }
     async updateCacheOfExistingTemplateInDb(id, response) {
         const templateDoc = await this.templates.read(id);
         if (!templateDoc) {
@@ -7092,12 +7134,18 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
         return template;
     }
     async updateCacheOfTemplate(template, response) {
-        var _a;
         if (!response) {
             response = (await this.client.getRelationshipTemplate(template.id.toString())).value;
         }
+        const cachedTemplate = await this.decryptRelationshipTemplate(response, template.secretKey);
+        template.setCache(cachedTemplate);
+        // Update isOwn, as it is possible that the identity receives an own template.
+        template.isOwn = this.parent.identity.isMe(cachedTemplate.createdBy);
+    }
+    async decryptRelationshipTemplate(response, secretKey) {
+        var _a;
         const cipher = await crypto_1.CryptoCipher.fromBase64(response.content);
-        const signedTemplateBuffer = await this.secrets.decryptTemplate(cipher, template.secretKey);
+        const signedTemplateBuffer = await this.secrets.decryptTemplate(cipher, secretKey);
         const signedTemplate = await RelationshipTemplateSigned_1.RelationshipTemplateSigned.deserialize(signedTemplateBuffer.toUtf8());
         const templateContent = await RelationshipTemplateContent_1.RelationshipTemplateContent.deserialize(signedTemplate.serializedTemplate);
         const templateSignatureValid = await this.secrets.verifyTemplate(crypto_1.CoreBuffer.fromUtf8(signedTemplate.serializedTemplate), signedTemplate.deviceSignature, templateContent.identity.publicKey);
@@ -7114,9 +7162,7 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
             maxNumberOfRelationships: (_a = response.maxNumberOfRelationships) !== null && _a !== void 0 ? _a : undefined,
             templateKey: templateContent.templateKey
         });
-        template.setCache(cachedTemplate);
-        // Update isOwn, as it is possible that the identity receives an own template.
-        template.isOwn = this.parent.identity.isMe(cachedTemplate.createdBy);
+        return cachedTemplate;
     }
     async getRelationshipTemplate(id) {
         const templateDoc = await this.templates.read(id.toString());
@@ -7811,7 +7857,7 @@ const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
 const CoreUtil_1 = __webpack_require__(/*! ../../core/CoreUtil */ "./dist/core/CoreUtil.js");
-const DbCollectionNames_1 = __webpack_require__(/*! ../../core/DbCollectionNames */ "./dist/core/DbCollectionNames.js");
+const DbCollectionName_1 = __webpack_require__(/*! ../../core/DbCollectionName */ "./dist/core/DbCollectionName.js");
 const TransportErrors_1 = __webpack_require__(/*! ../../core/TransportErrors */ "./dist/core/TransportErrors.js");
 const TransportIds_1 = __webpack_require__(/*! ../../core/TransportIds */ "./dist/core/TransportIds.js");
 const RelationshipTemplate_1 = __webpack_require__(/*! ../relationshipTemplates/local/RelationshipTemplate */ "./dist/modules/relationshipTemplates/local/RelationshipTemplate.js");
@@ -7838,7 +7884,7 @@ class RelationshipsController extends core_1.TransportController {
     async init() {
         await super.init();
         this.client = new RelationshipClient_1.RelationshipClient(this.config, this.parent.authenticator);
-        this.relationships = await this.parent.getSynchronizedCollection(DbCollectionNames_1.DbCollectionNames.Relationships);
+        this.relationships = await this.parent.getSynchronizedCollection(DbCollectionName_1.DbCollectionName.Relationships);
         return this;
     }
     async getRelationships(query) {
@@ -7853,6 +7899,20 @@ class RelationshipsController extends core_1.TransportController {
         }
         return await Promise.all(promises);
     }
+    async fetchCaches(ids) {
+        if (ids.length === 0)
+            return [];
+        const backboneRelationships = await (await this.client.getRelationships({ ids: ids.map((id) => id.id) })).value.collect();
+        const decryptionPromises = backboneRelationships.map(async (r) => {
+            const relationshipDoc = await this.relationships.read(r.id);
+            const relationship = await Relationship_1.Relationship.from(relationshipDoc);
+            return {
+                id: core_1.CoreId.from(r.id),
+                cache: await this.decryptRelationship(r, relationship.relationshipSecretId)
+            };
+        });
+        return await Promise.all(decryptionPromises);
+    }
     async updateCacheOfExistingRelationshipInDb(id, response) {
         const relationshipDoc = await this.relationships.read(id);
         if (!relationshipDoc) {
@@ -7939,18 +7999,22 @@ class RelationshipsController extends core_1.TransportController {
         if (!response) {
             response = (await this.client.getRelationship(relationship.id.toString())).value;
         }
+        const cachedRelationship = await this.decryptRelationship(response, relationship.relationshipSecretId);
+        relationship.setCache(cachedRelationship);
+    }
+    async decryptRelationship(response, relationshipSecretId) {
         const templateId = core_1.CoreId.from(response.relationshipTemplateId);
-        this._log.trace(`Parsing relationship template ${templateId} for ${relationship.id}...`);
+        this._log.trace(`Parsing relationship template ${templateId} for ${response.id}...`);
         const template = await this.parent.relationshipTemplates.getRelationshipTemplate(templateId);
         if (!template) {
             throw TransportErrors_1.TransportErrors.general.recordNotFound(RelationshipTemplate_1.RelationshipTemplate, templateId.toString());
         }
-        this._log.trace(`Parsing relationship changes of ${relationship.id}...`);
+        this._log.trace(`Parsing relationship changes of ${response.id}...`);
         const changesPromises = [];
         for (const change of response.changes) {
             switch (change.type) {
                 case RelationshipChangeType_1.RelationshipChangeType.Creation:
-                    changesPromises.push(this.parseCreationChange(change, relationship, templateId));
+                    changesPromises.push(this.parseCreationChange(change, relationshipSecretId, templateId));
                     break;
                 default:
                     break;
@@ -7961,7 +8025,7 @@ class RelationshipsController extends core_1.TransportController {
             changes: changes,
             template: template
         });
-        relationship.setCache(cachedRelationship);
+        return cachedRelationship;
     }
     async prepareRequest(relationshipSecretId, template, content) {
         if (!template.cache) {
@@ -8027,15 +8091,15 @@ class RelationshipsController extends core_1.TransportController {
         }
         return newRelationship;
     }
-    async parseCreationChange(change, relationship, templateId) {
+    async parseCreationChange(change, relationshipSecretId, templateId) {
         if (change.type !== RelationshipChangeType_1.RelationshipChangeType.Creation) {
             throw TransportErrors_1.TransportErrors.relationships.wrongChangeType(change.type).logWith(this._log);
         }
         const promises = [];
-        promises.push(this.decryptCreationChangeRequest(change.request, relationship.relationshipSecretId, templateId));
-        const hasRelationshipSecret = await this.secrets.hasCryptoRelationshipSecrets(relationship.relationshipSecretId);
+        promises.push(this.decryptCreationChangeRequest(change.request, relationshipSecretId, templateId));
+        const hasRelationshipSecret = await this.secrets.hasCryptoRelationshipSecrets(relationshipSecretId);
         if (change.response && hasRelationshipSecret) {
-            promises.push(this.decryptCreationChangeResponse(change, relationship));
+            promises.push(this.decryptCreationChangeResponse(change, relationshipSecretId));
         }
         const [requestContent, responseContent] = await Promise.all(promises);
         const creationChange = await RelationshipChange_1.RelationshipChange.fromBackbone(change, requestContent.content, responseContent === null || responseContent === void 0 ? void 0 : responseContent.content);
@@ -8065,7 +8129,7 @@ class RelationshipsController extends core_1.TransportController {
         }
         return requestContent;
     }
-    async decryptCreationChangeResponse(change, relationship) {
+    async decryptCreationChangeResponse(change, relationshipSecretId) {
         if (!change.response) {
             throw TransportErrors_1.TransportErrors.relationships.changeResponseMissing(change.id).logWith(this._log);
         }
@@ -8080,28 +8144,28 @@ class RelationshipsController extends core_1.TransportController {
         let signedResponseBuffer;
         if (change.status !== RelationshipChangeStatus_1.RelationshipChangeStatus.Revoked) {
             if (isOwnChange) {
-                signedResponseBuffer = await this.secrets.decryptOwn(relationship.relationshipSecretId, cipher.cipher);
+                signedResponseBuffer = await this.secrets.decryptOwn(relationshipSecretId, cipher.cipher);
             }
             else {
-                signedResponseBuffer = await this.secrets.decryptPeer(relationship.relationshipSecretId, cipher.cipher, true);
+                signedResponseBuffer = await this.secrets.decryptPeer(relationshipSecretId, cipher.cipher, true);
             }
         }
         else {
-            signedResponseBuffer = await this.secrets.decryptRequest(relationship.relationshipSecretId, cipher.cipher);
+            signedResponseBuffer = await this.secrets.decryptRequest(relationshipSecretId, cipher.cipher);
         }
         const signedResponse = await RelationshipCreationChangeResponseSigned_1.RelationshipCreationChangeResponseSigned.deserialize(signedResponseBuffer.toUtf8());
         let relationshipSignatureValid;
         if (isOwnChange) {
-            relationshipSignatureValid = await this.secrets.verifyOwn(relationship.relationshipSecretId, crypto_1.CoreBuffer.fromUtf8(signedResponse.serializedResponse), signedResponse.relationshipSignature);
+            relationshipSignatureValid = await this.secrets.verifyOwn(relationshipSecretId, crypto_1.CoreBuffer.fromUtf8(signedResponse.serializedResponse), signedResponse.relationshipSignature);
         }
         else {
-            relationshipSignatureValid = await this.secrets.verifyPeer(relationship.relationshipSecretId, crypto_1.CoreBuffer.fromUtf8(signedResponse.serializedResponse), signedResponse.relationshipSignature);
+            relationshipSignatureValid = await this.secrets.verifyPeer(relationshipSecretId, crypto_1.CoreBuffer.fromUtf8(signedResponse.serializedResponse), signedResponse.relationshipSignature);
         }
         if (!relationshipSignatureValid) {
             throw TransportErrors_1.TransportErrors.general.signatureNotValid("relationshipResponse").logWith(this._log);
         }
         const responseContent = await RelationshipCreationChangeResponseContent_1.RelationshipCreationChangeResponseContent.deserialize(signedResponse.serializedResponse);
-        if (responseContent.relationshipId.toString() !== relationship.id.toString()) {
+        if (responseContent.relationshipId.toString() !== change.relationshipId.toString()) {
             throw TransportErrors_1.TransportErrors.relationships.responseContainsWrongRequestId().logWith(this._log);
         }
         return responseContent;
@@ -8128,7 +8192,7 @@ class RelationshipsController extends core_1.TransportController {
             }
             await this.secrets.convertSecrets(relationship.relationshipSecretId, cipher.publicResponseCrypto);
         }
-        const responseContent = await this.decryptCreationChangeResponse(change, relationship);
+        const responseContent = await this.decryptCreationChangeResponse(change, relationship.relationshipSecretId);
         const response = await RelationshipChangeResponse_1.RelationshipChangeResponse.fromBackbone(change.response, responseContent.content);
         if (!relationship.cache) {
             throw TransportErrors_1.TransportErrors.general.cacheEmpty(Relationship_1.Relationship, relationship.id.toString());
@@ -9231,7 +9295,7 @@ exports.SecretController = exports.SecretBaseKeyType = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
-const DbCollectionNames_1 = __webpack_require__(/*! ../../core/DbCollectionNames */ "./dist/core/DbCollectionNames.js");
+const DbCollectionName_1 = __webpack_require__(/*! ../../core/DbCollectionName */ "./dist/core/DbCollectionName.js");
 const TransportController_1 = __webpack_require__(/*! ../../core/TransportController */ "./dist/core/TransportController.js");
 const DeviceSecretController_1 = __webpack_require__(/*! ../devices/DeviceSecretController */ "./dist/modules/devices/DeviceSecretController.js");
 const SecretContainerCipher_1 = __webpack_require__(/*! ./data/SecretContainerCipher */ "./dist/modules/secrets/data/SecretContainerCipher.js");
@@ -9253,7 +9317,7 @@ class SecretController extends TransportController_1.TransportController {
     }
     async init() {
         await super.init();
-        this.secrets = await this.parent.getSynchronizedCollection(DbCollectionNames_1.DbCollectionNames.Secrets);
+        this.secrets = await this.parent.getSynchronizedCollection(DbCollectionName_1.DbCollectionName.Secrets);
         const lastNonce = await this.parent.info.get(SecretController.secretNonceKey);
         if (lastNonce) {
             this.nonce = lastNonce;
@@ -9690,20 +9754,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.DatawalletModificationsProcessor = void 0;
+exports.CacheFetcher = exports.DatawalletModificationsProcessor = void 0;
 const lodash_1 = __importDefault(__webpack_require__(/*! lodash */ "./node_modules/lodash/lodash.js"));
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
-const DbCollectionNames_1 = __webpack_require__(/*! ../../core/DbCollectionNames */ "./dist/core/DbCollectionNames.js");
+const DbCollectionName_1 = __webpack_require__(/*! ../../core/DbCollectionName */ "./dist/core/DbCollectionName.js");
+const File_1 = __webpack_require__(/*! ../files/local/File */ "./dist/modules/files/local/File.js");
+const Message_1 = __webpack_require__(/*! ../messages/local/Message */ "./dist/modules/messages/local/Message.js");
+const Relationship_1 = __webpack_require__(/*! ../relationships/local/Relationship */ "./dist/modules/relationships/local/Relationship.js");
+const RelationshipTemplate_1 = __webpack_require__(/*! ../relationshipTemplates/local/RelationshipTemplate */ "./dist/modules/relationshipTemplates/local/RelationshipTemplate.js");
+const Token_1 = __webpack_require__(/*! ../tokens/local/Token */ "./dist/modules/tokens/local/Token.js");
 const DatawalletModification_1 = __webpack_require__(/*! ./local/DatawalletModification */ "./dist/modules/sync/local/DatawalletModification.js");
 class DatawalletModificationsProcessor {
-    constructor(collectionProvider, modifications, fileCacheUpdater, messageCacheUpdater, relationshipTemplateCacheUpdater, relationshipCacheUpdater, tokenCacheUpdater) {
+    constructor(cacheFetcher, collectionProvider, modifications) {
+        this.cacheFetcher = cacheFetcher;
         this.collectionProvider = collectionProvider;
         this.modifications = modifications;
-        this.fileCacheUpdater = fileCacheUpdater;
-        this.messageCacheUpdater = messageCacheUpdater;
-        this.relationshipTemplateCacheUpdater = relationshipTemplateCacheUpdater;
-        this.relationshipCacheUpdater = relationshipCacheUpdater;
-        this.tokenCacheUpdater = tokenCacheUpdater;
     }
     async execute() {
         const modificationsGroupedByType = lodash_1.default.groupBy(this.modifications, (m) => m.type);
@@ -9759,42 +9824,70 @@ class DatawalletModificationsProcessor {
         }
     }
     async applyCacheChanges(cacheChanges) {
+        var _a, _b, _c, _d, _e;
         if (!cacheChanges || cacheChanges.length === 0) {
             return;
         }
         const cacheChangesGroupedByCollection = lodash_1.default.groupBy(cacheChanges, (c) => c.collection);
-        const fillCachePromises = [];
-        for (const collectionName in cacheChangesGroupedByCollection) {
-            const modificationsInCollection = cacheChangesGroupedByCollection[collectionName];
-            switch (collectionName) {
-                case DbCollectionNames_1.DbCollectionNames.Files:
-                    fillCachePromises.push(this.fileCacheUpdater.updateCache(modificationsInCollection.map((m) => m.objectIdentifier.toString())));
-                    break;
-                case DbCollectionNames_1.DbCollectionNames.Messages:
-                    fillCachePromises.push(this.messageCacheUpdater.updateCache(modificationsInCollection.map((m) => m.objectIdentifier.toString())));
-                    break;
-                case DbCollectionNames_1.DbCollectionNames.Relationships:
-                    // Relationship caches are filled afterwards. It requires the template caches to be filled.
-                    break;
-                case DbCollectionNames_1.DbCollectionNames.Templates:
-                    fillCachePromises.push(this.relationshipTemplateCacheUpdater.updateCache(modificationsInCollection.map((m) => m.objectIdentifier.toString())));
-                    break;
-                case DbCollectionNames_1.DbCollectionNames.Tokens:
-                    fillCachePromises.push(this.tokenCacheUpdater.updateCache(modificationsInCollection.map((m) => m.objectIdentifier.toString())));
-                    break;
-                default:
-                    throw new Error(`DB collection with name '${collectionName}' is not supported.'`);
-            }
-        }
-        await Promise.all(fillCachePromises);
-        const relationshipCacheUpdates = cacheChangesGroupedByCollection[DbCollectionNames_1.DbCollectionNames.Relationships];
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        if (relationshipCacheUpdates) {
-            await this.relationshipCacheUpdater.updateCache(relationshipCacheUpdates.map((m) => m.objectIdentifier.toString()));
-        }
+        const caches = await this.cacheFetcher.fetchCacheFor({
+            files: ((_a = cacheChangesGroupedByCollection[DbCollectionName_1.DbCollectionName.Files]) !== null && _a !== void 0 ? _a : []).map((m) => m.objectIdentifier),
+            messages: ((_b = cacheChangesGroupedByCollection[DbCollectionName_1.DbCollectionName.Messages]) !== null && _b !== void 0 ? _b : []).map((m) => m.objectIdentifier),
+            relationshipTemplates: ((_c = cacheChangesGroupedByCollection[DbCollectionName_1.DbCollectionName.RelationshipTemplates]) !== null && _c !== void 0 ? _c : []).map((m) => m.objectIdentifier),
+            tokens: ((_d = cacheChangesGroupedByCollection[DbCollectionName_1.DbCollectionName.Tokens]) !== null && _d !== void 0 ? _d : []).map((m) => m.objectIdentifier)
+        });
+        await this.save(caches.files, DbCollectionName_1.DbCollectionName.Files, File_1.File);
+        await this.save(caches.messages, DbCollectionName_1.DbCollectionName.Messages, Message_1.Message);
+        await this.save(caches.relationshipTemplates, DbCollectionName_1.DbCollectionName.RelationshipTemplates, RelationshipTemplate_1.RelationshipTemplate);
+        await this.save(caches.tokens, DbCollectionName_1.DbCollectionName.Tokens, Token_1.Token);
+        const relationshipCaches = await this.cacheFetcher.fetchCacheFor({
+            relationships: ((_e = cacheChangesGroupedByCollection[DbCollectionName_1.DbCollectionName.Relationships]) !== null && _e !== void 0 ? _e : []).map((m) => m.objectIdentifier)
+        });
+        await this.save(relationshipCaches.relationships, DbCollectionName_1.DbCollectionName.Relationships, Relationship_1.Relationship);
+    }
+    async save(caches, collectionName, constructorOfT) {
+        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);
+            item.setCache(c.cache);
+            await collection.update(itemDoc, item);
+        }));
     }
 }
 exports.DatawalletModificationsProcessor = DatawalletModificationsProcessor;
+class CacheFetcher {
+    constructor(fileController, messageController, relationshipTemplateController, relationshipController, tokenController) {
+        this.fileController = fileController;
+        this.messageController = messageController;
+        this.relationshipTemplateController = relationshipTemplateController;
+        this.relationshipController = relationshipController;
+        this.tokenController = tokenController;
+    }
+    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)
+        ]);
+        const output = {
+            files: caches[0],
+            messages: caches[1],
+            relationships: caches[2],
+            relationshipTemplates: caches[3],
+            tokens: caches[4]
+        };
+        return output;
+    }
+    async fetchCaches(controller, ids) {
+        if (!ids)
+            return [];
+        const caches = await controller.fetchCaches(ids);
+        return caches;
+    }
+}
+exports.CacheFetcher = CacheFetcher;
 //# sourceMappingURL=DatawalletModificationsProcessor.js.map
 
 /***/ }),
@@ -9985,7 +10078,7 @@ class SyncController extends core_1.TransportController {
         }
         const incomingModifications = await this.decryptDatawalletModifications(encryptedIncomingModifications);
         this.log.trace(`${incomingModifications.length} incoming modifications found`);
-        const datawalletModificationsProcessor = new DatawalletModificationsProcessor_1.DatawalletModificationsProcessor(this._db, incomingModifications, this.parent.files, this.parent.messages, this.parent.relationshipTemplates, this.parent.relationships, this.parent.tokens);
+        const datawalletModificationsProcessor = new DatawalletModificationsProcessor_1.DatawalletModificationsProcessor(new DatawalletModificationsProcessor_1.CacheFetcher(this.parent.files, this.parent.messages, this.parent.relationshipTemplates, this.parent.relationships, this.parent.tokens), this._db, incomingModifications);
         await datawalletModificationsProcessor.execute();
         this.log.trace(`${incomingModifications.length} incoming modifications executed`, incomingModifications);
         await this.updateLocalDatawalletModificationIndex(encryptedIncomingModifications.sort(descending)[0].index);
@@ -10492,7 +10585,7 @@ exports.TokenController = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
-const DbCollectionNames_1 = __webpack_require__(/*! ../../core/DbCollectionNames */ "./dist/core/DbCollectionNames.js");
+const DbCollectionName_1 = __webpack_require__(/*! ../../core/DbCollectionName */ "./dist/core/DbCollectionName.js");
 const TransportController_1 = __webpack_require__(/*! ../../core/TransportController */ "./dist/core/TransportController.js");
 const TokenClient_1 = __webpack_require__(/*! ./backbone/TokenClient */ "./dist/modules/tokens/backbone/TokenClient.js");
 const CachedToken_1 = __webpack_require__(/*! ./local/CachedToken */ "./dist/modules/tokens/local/CachedToken.js");
@@ -10506,7 +10599,7 @@ class TokenController extends TransportController_1.TransportController {
     async init() {
         await super.init();
         this.client = new TokenClient_1.TokenClient(this.config, this.parent.authenticator);
-        this.tokens = await this.parent.getSynchronizedCollection(DbCollectionNames_1.DbCollectionNames.Tokens);
+        this.tokens = await this.parent.getSynchronizedCollection(DbCollectionName_1.DbCollectionName.Tokens);
         return this;
     }
     async getTokens(query) {
@@ -10565,6 +10658,17 @@ class TokenController extends TransportController_1.TransportController {
         }
         return await Promise.all(promises);
     }
+    async fetchCaches(ids) {
+        if (ids.length === 0)
+            return [];
+        const backboneTokens = await (await this.client.getTokens({ ids: ids.map((id) => id.id) })).value.collect();
+        const decryptionPromises = backboneTokens.map(async (t) => {
+            const tokenDoc = await this.tokens.read(t.id);
+            const token = await Token_1.Token.from(tokenDoc);
+            return { id: core_1.CoreId.from(t), cache: await this.decryptToken(t, token.secretKey) };
+        });
+        return await Promise.all(decryptionPromises);
+    }
     async updateCacheOfExistingTokenInDb(id, response) {
         const tokenDoc = await this.tokens.read(id);
         if (!tokenDoc) {
@@ -10580,11 +10684,17 @@ class TokenController extends TransportController_1.TransportController {
         if (!response) {
             response = (await this.client.getToken(tokenId)).value;
         }
+        const cachedToken = await this.decryptToken(response, token.secretKey);
+        token.setCache(cachedToken);
+        // Update isOwn, as it is possible that the identity receives an own token
+        token.isOwn = this.parent.identity.isMe(cachedToken.createdBy);
+    }
+    async decryptToken(response, secretKey) {
         const cipher = await crypto_1.CryptoCipher.fromBase64(response.content);
-        const plaintextTokenBuffer = await core_1.CoreCrypto.decrypt(cipher, token.secretKey);
+        const plaintextTokenBuffer = await core_1.CoreCrypto.decrypt(cipher, secretKey);
         const plaintextTokenContent = await core_1.CoreSerializableAsync.deserializeUnknown(plaintextTokenBuffer.toUtf8());
         if (!(plaintextTokenContent instanceof ts_serval_1.SerializableAsync)) {
-            throw core_1.TransportErrors.tokens.invalidTokenContent(tokenId).logWith(this._log);
+            throw core_1.TransportErrors.tokens.invalidTokenContent(response.id).logWith(this._log);
         }
         const cachedToken = await CachedToken_1.CachedToken.from({
             createdAt: core_1.CoreDate.from(response.createdAt),
@@ -10593,9 +10703,7 @@ class TokenController extends TransportController_1.TransportController {
             createdByDevice: core_1.CoreId.from(response.createdByDevice),
             content: plaintextTokenContent
         });
-        token.setCache(cachedToken);
-        // Update isOwn, as it is possible that the identity receives an own token
-        token.isOwn = this.parent.identity.isMe(cachedToken.createdBy);
+        return cachedToken;
     }
     async loadPeerTokenByTruncated(truncated, ephemeral) {
         const reference = await TokenReference_1.TokenReference.fromTruncated(truncated);
@@ -12088,12 +12196,24 @@ var buildFullPath = __webpack_require__(/*! ../core/buildFullPath */ "./node_mod
 var parseHeaders = __webpack_require__(/*! ./../helpers/parseHeaders */ "./node_modules/axios/lib/helpers/parseHeaders.js");
 var isURLSameOrigin = __webpack_require__(/*! ./../helpers/isURLSameOrigin */ "./node_modules/axios/lib/helpers/isURLSameOrigin.js");
 var createError = __webpack_require__(/*! ../core/createError */ "./node_modules/axios/lib/core/createError.js");
+var defaults = __webpack_require__(/*! ../defaults */ "./node_modules/axios/lib/defaults.js");
+var Cancel = __webpack_require__(/*! ../cancel/Cancel */ "./node_modules/axios/lib/cancel/Cancel.js");
 
 module.exports = function xhrAdapter(config) {
   return new Promise(function dispatchXhrRequest(resolve, reject) {
     var requestData = config.data;
     var requestHeaders = config.headers;
     var responseType = config.responseType;
+    var onCanceled;
+    function done() {
+      if (config.cancelToken) {
+        config.cancelToken.unsubscribe(onCanceled);
+      }
+
+      if (config.signal) {
+        config.signal.removeEventListener('abort', onCanceled);
+      }
+    }
 
     if (utils.isFormData(requestData)) {
       delete requestHeaders['Content-Type']; // Let the browser set it
@@ -12131,7 +12251,13 @@ module.exports = function xhrAdapter(config) {
         request: request
       };
 
-      settle(resolve, reject, response);
+      settle(function _resolve(value) {
+        resolve(value);
+        done();
+      }, function _reject(err) {
+        reject(err);
+        done();
+      }, response);
 
       // Clean up request
       request = null;
@@ -12185,13 +12311,14 @@ module.exports = function xhrAdapter(config) {
     // Handle timeout
     request.ontimeout = function handleTimeout() {
       var timeoutErrorMessage = 'timeout of ' + config.timeout + 'ms exceeded';
+      var transitional = config.transitional || defaults.transitional;
       if (config.timeoutErrorMessage) {
         timeoutErrorMessage = config.timeoutErrorMessage;
       }
       reject(createError(
         timeoutErrorMessage,
         config,
-        config.transitional && config.transitional.clarifyTimeoutError ? 'ETIMEDOUT' : 'ECONNABORTED',
+        transitional.clarifyTimeoutError ? 'ETIMEDOUT' : 'ECONNABORTED',
         request));
 
       // Clean up request
@@ -12245,18 +12372,22 @@ module.exports = function xhrAdapter(config) {
       request.upload.addEventListener('progress', config.onUploadProgress);
     }
 
-    if (config.cancelToken) {
+    if (config.cancelToken || config.signal) {
       // Handle cancellation
-      config.cancelToken.promise.then(function onCanceled(cancel) {
+      // eslint-disable-next-line func-names
+      onCanceled = function(cancel) {
         if (!request) {
           return;
         }
-
+        reject(!cancel || (cancel && cancel.type) ? new Cancel('canceled') : cancel);
         request.abort();
-        reject(cancel);
-        // Clean up request
         request = null;
-      });
+      };
+
+      config.cancelToken && config.cancelToken.subscribe(onCanceled);
+      if (config.signal) {
+        config.signal.aborted ? onCanceled() : config.signal.addEventListener('abort', onCanceled);
+      }
     }
 
     if (!requestData) {
@@ -12302,6 +12433,11 @@ function createInstance(defaultConfig) {
   // Copy context to instance
   utils.extend(instance, context);
 
+  // Factory for creating new instances
+  instance.create = function create(instanceConfig) {
+    return createInstance(mergeConfig(defaultConfig, instanceConfig));
+  };
+
   return instance;
 }
 
@@ -12311,15 +12447,11 @@ var axios = createInstance(defaults);
 // Expose Axios class to allow class inheritance
 axios.Axios = Axios;
 
-// Factory for creating new instances
-axios.create = function create(instanceConfig) {
-  return createInstance(mergeConfig(axios.defaults, instanceConfig));
-};
-
 // Expose Cancel & CancelToken
 axios.Cancel = __webpack_require__(/*! ./cancel/Cancel */ "./node_modules/axios/lib/cancel/Cancel.js");
 axios.CancelToken = __webpack_require__(/*! ./cancel/CancelToken */ "./node_modules/axios/lib/cancel/CancelToken.js");
 axios.isCancel = __webpack_require__(/*! ./cancel/isCancel */ "./node_modules/axios/lib/cancel/isCancel.js");
+axios.VERSION = __webpack_require__(/*! ./env/data */ "./node_modules/axios/lib/env/data.js").version;
 
 // Expose all/spread
 axios.all = function all(promises) {
@@ -12391,11 +12523,42 @@ function CancelToken(executor) {
   }
 
   var resolvePromise;
+
   this.promise = new Promise(function promiseExecutor(resolve) {
     resolvePromise = resolve;
   });
 
   var token = this;
+
+  // eslint-disable-next-line func-names
+  this.promise.then(function(cancel) {
+    if (!token._listeners) return;
+
+    var i;
+    var l = token._listeners.length;
+
+    for (i = 0; i < l; i++) {
+      token._listeners[i](cancel);
+    }
+    token._listeners = null;
+  });
+
+  // eslint-disable-next-line func-names
+  this.promise.then = function(onfulfilled) {
+    var _resolve;
+    // eslint-disable-next-line func-names
+    var promise = new Promise(function(resolve) {
+      token.subscribe(resolve);
+      _resolve = resolve;
+    }).then(onfulfilled);
+
+    promise.cancel = function reject() {
+      token.unsubscribe(_resolve);
+    };
+
+    return promise;
+  };
+
   executor(function cancel(message) {
     if (token.reason) {
       // Cancellation has already been requested
@@ -12416,6 +12579,37 @@ CancelToken.prototype.throwIfRequested = function throwIfRequested() {
   }
 };
 
+/**
+ * Subscribe to the cancel signal
+ */
+
+CancelToken.prototype.subscribe = function subscribe(listener) {
+  if (this.reason) {
+    listener(this.reason);
+    return;
+  }
+
+  if (this._listeners) {
+    this._listeners.push(listener);
+  } else {
+    this._listeners = [listener];
+  }
+};
+
+/**
+ * Unsubscribe from the cancel signal
+ */
+
+CancelToken.prototype.unsubscribe = function unsubscribe(listener) {
+  if (!this._listeners) {
+    return;
+  }
+  var index = this._listeners.indexOf(listener);
+  if (index !== -1) {
+    this._listeners.splice(index, 1);
+  }
+};
+
 /**
  * Returns an object that contains a new `CancelToken` and a function that, when called,
  * cancels the `CancelToken`.
@@ -12512,9 +12706,9 @@ Axios.prototype.request = function request(config) {
 
   if (transitional !== undefined) {
     validator.assertOptions(transitional, {
-      silentJSONParsing: validators.transitional(validators.boolean, '1.0.0'),
-      forcedJSONParsing: validators.transitional(validators.boolean, '1.0.0'),
-      clarifyTimeoutError: validators.transitional(validators.boolean, '1.0.0')
+      silentJSONParsing: validators.transitional(validators.boolean),
+      forcedJSONParsing: validators.transitional(validators.boolean),
+      clarifyTimeoutError: validators.transitional(validators.boolean)
     }, false);
   }
 
@@ -12749,6 +12943,7 @@ var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/util
 var transformData = __webpack_require__(/*! ./transformData */ "./node_modules/axios/lib/core/transformData.js");
 var isCancel = __webpack_require__(/*! ../cancel/isCancel */ "./node_modules/axios/lib/cancel/isCancel.js");
 var defaults = __webpack_require__(/*! ../defaults */ "./node_modules/axios/lib/defaults.js");
+var Cancel = __webpack_require__(/*! ../cancel/Cancel */ "./node_modules/axios/lib/cancel/Cancel.js");
 
 /**
  * Throws a `Cancel` if cancellation has been requested.
@@ -12757,6 +12952,10 @@ function throwIfCancellationRequested(config) {
   if (config.cancelToken) {
     config.cancelToken.throwIfRequested();
   }
+
+  if (config.signal && config.signal.aborted) {
+    throw new Cancel('canceled');
+  }
 }
 
 /**
@@ -12873,7 +13072,8 @@ module.exports = function enhanceError(error, config, code, request, response) {
       stack: this.stack,
       // Axios
       config: this.config,
-      code: this.code
+      code: this.code,
+      status: this.response && this.response.status ? this.response.status : null
     };
   };
   return error;
@@ -12906,17 +13106,6 @@ module.exports = function mergeConfig(config1, config2) {
   config2 = config2 || {};
   var config = {};
 
-  var valueFromConfig2Keys = ['url', 'method', 'data'];
-  var mergeDeepPropertiesKeys = ['headers', 'auth', 'proxy', 'params'];
-  var defaultToConfig2Keys = [
-    'baseURL', 'transformRequest', 'transformResponse', 'paramsSerializer',
-    'timeout', 'timeoutMessage', 'withCredentials', 'adapter', 'responseType', 'xsrfCookieName',
-    'xsrfHeaderName', 'onUploadProgress', 'onDownloadProgress', 'decompress',
-    'maxContentLength', 'maxBodyLength', 'maxRedirects', 'transport', 'httpAgent',
-    'httpsAgent', 'cancelToken', 'socketPath', 'responseEncoding'
-  ];
-  var directMergeKeys = ['validateStatus'];
-
   function getMergedValue(target, source) {
     if (utils.isPlainObject(target) && utils.isPlainObject(source)) {
       return utils.merge(target, source);
@@ -12928,51 +13117,74 @@ module.exports = function mergeConfig(config1, config2) {
     return source;
   }
 
+  // eslint-disable-next-line consistent-return
   function mergeDeepProperties(prop) {
     if (!utils.isUndefined(config2[prop])) {
-      config[prop] = getMergedValue(config1[prop], config2[prop]);
+      return getMergedValue(config1[prop], config2[prop]);
     } else if (!utils.isUndefined(config1[prop])) {
-      config[prop] = getMergedValue(undefined, config1[prop]);
+      return getMergedValue(undefined, config1[prop]);
     }
   }
 
-  utils.forEach(valueFromConfig2Keys, function valueFromConfig2(prop) {
+  // eslint-disable-next-line consistent-return
+  function valueFromConfig2(prop) {
     if (!utils.isUndefined(config2[prop])) {
-      config[prop] = getMergedValue(undefined, config2[prop]);
+      return getMergedValue(undefined, config2[prop]);
     }
-  });
-
-  utils.forEach(mergeDeepPropertiesKeys, mergeDeepProperties);
+  }
 
-  utils.forEach(defaultToConfig2Keys, function defaultToConfig2(prop) {
+  // eslint-disable-next-line consistent-return
+  function defaultToConfig2(prop) {
     if (!utils.isUndefined(config2[prop])) {
-      config[prop] = getMergedValue(undefined, config2[prop]);
+      return getMergedValue(undefined, config2[prop]);
     } else if (!utils.isUndefined(config1[prop])) {
-      config[prop] = getMergedValue(undefined, config1[prop]);
+      return getMergedValue(undefined, config1[prop]);
     }
-  });
+  }
 
-  utils.forEach(directMergeKeys, function merge(prop) {
+  // eslint-disable-next-line consistent-return
+  function mergeDirectKeys(prop) {
     if (prop in config2) {
-      config[prop] = getMergedValue(config1[prop], config2[prop]);
+      return getMergedValue(config1[prop], config2[prop]);
     } else if (prop in config1) {
-      config[prop] = getMergedValue(undefined, config1[prop]);
-    }
-  });
-
-  var axiosKeys = valueFromConfig2Keys
-    .concat(mergeDeepPropertiesKeys)
-    .concat(defaultToConfig2Keys)
-    .concat(directMergeKeys);
-
-  var otherKeys = Object
-    .keys(config1)
-    .concat(Object.keys(config2))
-    .filter(function filterAxiosKeys(key) {
-      return axiosKeys.indexOf(key) === -1;
-    });
+      return getMergedValue(undefined, config1[prop]);
+    }
+  }
+
+  var mergeMap = {
+    'url': valueFromConfig2,
+    'method': valueFromConfig2,
+    'data': valueFromConfig2,
+    'baseURL': defaultToConfig2,
+    'transformRequest': defaultToConfig2,
+    'transformResponse': defaultToConfig2,
+    'paramsSerializer': defaultToConfig2,
+    'timeout': defaultToConfig2,
+    'timeoutMessage': defaultToConfig2,
+    'withCredentials': defaultToConfig2,
+    'adapter': defaultToConfig2,
+    'responseType': defaultToConfig2,
+    'xsrfCookieName': defaultToConfig2,
+    'xsrfHeaderName': defaultToConfig2,
+    'onUploadProgress': defaultToConfig2,
+    'onDownloadProgress': defaultToConfig2,
+    'decompress': defaultToConfig2,
+    'maxContentLength': defaultToConfig2,
+    'maxBodyLength': defaultToConfig2,
+    'transport': defaultToConfig2,
+    'httpAgent': defaultToConfig2,
+    'httpsAgent': defaultToConfig2,
+    'cancelToken': defaultToConfig2,
+    'socketPath': defaultToConfig2,
+    'responseEncoding': defaultToConfig2,
+    'validateStatus': mergeDirectKeys
+  };
 
-  utils.forEach(otherKeys, mergeDeepProperties);
+  utils.forEach(Object.keys(config1).concat(Object.keys(config2)), function computeConfigValue(prop) {
+    var merge = mergeMap[prop] || mergeDeepProperties;
+    var configValue = merge(prop);
+    (utils.isUndefined(configValue) && merge !== mergeDirectKeys) || (config[prop] = configValue);
+  });
 
   return config;
 };
@@ -13137,7 +13349,7 @@ var defaults = {
   }],
 
   transformResponse: [function transformResponse(data) {
-    var transitional = this.transitional;
+    var transitional = this.transitional || defaults.transitional;
     var silentJSONParsing = transitional && transitional.silentJSONParsing;
     var forcedJSONParsing = transitional && transitional.forcedJSONParsing;
     var strictJSONParsing = !silentJSONParsing && this.responseType === 'json';
@@ -13172,12 +13384,12 @@ var defaults = {
 
   validateStatus: function validateStatus(status) {
     return status >= 200 && status < 300;
-  }
-};
+  },
 
-defaults.headers = {
-  common: {
-    'Accept': 'application/json, text/plain, */*'
+  headers: {
+    common: {
+      'Accept': 'application/json, text/plain, */*'
+    }
   }
 };
 
@@ -13192,6 +13404,18 @@ utils.forEach(['post', 'put', 'patch'], function forEachMethodWithData(method) {
 module.exports = defaults;
 
 
+/***/ }),
+
+/***/ "./node_modules/axios/lib/env/data.js":
+/*!********************************************!*\
+  !*** ./node_modules/axios/lib/env/data.js ***!
+  \********************************************/
+/***/ ((module) => {
+
+module.exports = {
+  "version": "0.22.0"
+};
+
 /***/ }),
 
 /***/ "./node_modules/axios/lib/helpers/bind.js":
@@ -13646,7 +13870,7 @@ module.exports = function spread(callback) {
 "use strict";
 
 
-var pkg = __webpack_require__(/*! ./../../package.json */ "./node_modules/axios/package.json");
+var VERSION = __webpack_require__(/*! ../env/data */ "./node_modules/axios/lib/env/data.js").version;
 
 var validators = {};
 
@@ -13658,48 +13882,26 @@ var validators = {};
 });
 
 var deprecatedWarnings = {};
-var currentVerArr = pkg.version.split('.');
-
-/**
- * Compare package versions
- * @param {string} version
- * @param {string?} thanVersion
- * @returns {boolean}
- */
-function isOlderVersion(version, thanVersion) {
-  var pkgVersionArr = thanVersion ? thanVersion.split('.') : currentVerArr;
-  var destVer = version.split('.');
-  for (var i = 0; i < 3; i++) {
-    if (pkgVersionArr[i] > destVer[i]) {
-      return true;
-    } else if (pkgVersionArr[i] < destVer[i]) {
-      return false;
-    }
-  }
-  return false;
-}
 
 /**
  * Transitional option validator
- * @param {function|boolean?} validator
- * @param {string?} version
- * @param {string} message
+ * @param {function|boolean?} validator - set to false if the transitional option has been removed
+ * @param {string?} version - deprecated version / removed since version
+ * @param {string?} message - some message with additional info
  * @returns {function}
  */
 validators.transitional = function transitional(validator, version, message) {
-  var isDeprecated = version && isOlderVersion(version);
-
   function formatMessage(opt, desc) {
-    return '[Axios v' + pkg.version + '] Transitional option \'' + opt + '\'' + desc + (message ? '. ' + message : '');
+    return '[Axios v' + VERSION + '] Transitional option \'' + opt + '\'' + desc + (message ? '. ' + message : '');
   }
 
   // eslint-disable-next-line func-names
   return function(value, opt, opts) {
     if (validator === false) {
-      throw new Error(formatMessage(opt, ' has been removed in ' + version));
+      throw new Error(formatMessage(opt, ' has been removed' + (version ? ' in ' + version : '')));
     }
 
-    if (isDeprecated && !deprecatedWarnings[opt]) {
+    if (version && !deprecatedWarnings[opt]) {
       deprecatedWarnings[opt] = true;
       // eslint-disable-next-line no-console
       console.warn(
@@ -13745,7 +13947,6 @@ function assertOptions(options, schema, allowUnknown) {
 }
 
 module.exports = {
-  isOlderVersion: isOlderVersion,
   assertOptions: assertOptions,
   validators: validators
 };
@@ -54620,17 +54821,6 @@ var PatchError = /** @class */ (function (_super) {
 
 
 
-/***/ }),
-
-/***/ "./node_modules/axios/package.json":
-/*!*****************************************!*\
-  !*** ./node_modules/axios/package.json ***!
-  \*****************************************/
-/***/ ((module) => {
-
-"use strict";
-module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"Promise based HTTP client for the browser and node.js","main":"index.js","scripts":{"test":"grunt test","start":"node ./sandbox/server.js","build":"NODE_ENV=production grunt build","preversion":"npm test","version":"npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json","postversion":"git push && git push --tags","examples":"node ./examples/server.js","coveralls":"cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js","fix":"eslint --fix lib/**/*.js"},"repository":{"type":"git","url":"https://github.com/axios/axios.git"},"keywords":["xhr","http","ajax","promise","node"],"author":"Matt Zabriskie","license":"MIT","bugs":{"url":"https://github.com/axios/axios/issues"},"homepage":"https://axios-http.com","devDependencies":{"coveralls":"^3.0.0","es6-promise":"^4.2.4","grunt":"^1.3.0","grunt-banner":"^0.6.0","grunt-cli":"^1.2.0","grunt-contrib-clean":"^1.1.0","grunt-contrib-watch":"^1.0.0","grunt-eslint":"^23.0.0","grunt-karma":"^4.0.0","grunt-mocha-test":"^0.13.3","grunt-ts":"^6.0.0-beta.19","grunt-webpack":"^4.0.2","istanbul-instrumenter-loader":"^1.0.0","jasmine-core":"^2.4.1","karma":"^6.3.2","karma-chrome-launcher":"^3.1.0","karma-firefox-launcher":"^2.1.0","karma-jasmine":"^1.1.1","karma-jasmine-ajax":"^0.1.13","karma-safari-launcher":"^1.0.0","karma-sauce-launcher":"^4.3.6","karma-sinon":"^1.0.5","karma-sourcemap-loader":"^0.3.8","karma-webpack":"^4.0.2","load-grunt-tasks":"^3.5.2","minimist":"^1.2.0","mocha":"^8.2.1","sinon":"^4.5.0","terser-webpack-plugin":"^4.2.3","typescript":"^4.0.5","url-search-params":"^0.10.0","webpack":"^4.44.2","webpack-dev-server":"^3.11.0"},"browser":{"./lib/adapters/http.js":"./lib/adapters/xhr.js"},"jsdelivr":"dist/axios.min.js","unpkg":"dist/axios.min.js","typings":"./index.d.ts","dependencies":{"follow-redirects":"^1.14.0"},"bundlesize":[{"path":"./dist/axios.min.js","threshold":"5kB"}],"_resolved":"https://registry.npmjs.org/axios/-/axios-0.21.4.tgz","_integrity":"sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==","_from":"axios@0.21.4"}');
-
 /***/ })
 
 /******/ 	});