@nmshd/transport 2.0.0-beta.5 → 2.0.0-beta.7

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: "2.0.0-beta.5",
-    build: "36",
-    date: "2022-09-13T08:49:15+00:00",
-    commit: "d3d2f38b57ea4c22496493b76a04dbdd26bca123",
-    dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.2","@js-soft/ts-utils":"2.2.2","axios":"^0.27.2","deep-equal":"^2.0.5","fast-json-patch":"^3.1.1","form-data":"^4.0.0","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^3.0.3","qs":"^6.11.0","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^9.0.0"},
+    version: "2.0.0-beta.7",
+    build: "38",
+    date: "2022-09-28T11:13:26+00:00",
+    commit: "44a803a33359c25924b03d92bece8556be05af18",
+    dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.2","@js-soft/ts-utils":"2.3.0","axios":"^0.27.2","deep-equal":"^2.0.5","fast-json-patch":"^3.1.1","form-data":"^4.0.0","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^3.0.4","qs":"^6.11.0","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^9.0.0"},
     libraries: {
         crypto: crypto_1.buildInformation,
         serval: ts_serval_1.buildInformation
@@ -41,7 +41,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.CoreCrypto = void 0;
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const util_1 = __webpack_require__(/*! ../util */ "./dist/util/index.js");
-const TransportErrors_1 = __webpack_require__(/*! ./TransportErrors */ "./dist/core/TransportErrors.js");
 const TransportVersion_1 = __webpack_require__(/*! ./types/TransportVersion */ "./dist/core/types/TransportVersion.js");
 class CoreCrypto {
     /**
@@ -57,7 +56,7 @@ class CoreCrypto {
             case TransportVersion_1.TransportVersion.V1:
                 return await crypto_1.CryptoSignatures.generateKeypair(3 /* CryptoSignatureAlgorithm.ECDSA_ED25519 */);
             default:
-                throw TransportErrors_1.TransportErrors.util.crypto.invalidVersion(version);
+                throw this.invalidVersion(version);
         }
     }
     /**
@@ -74,7 +73,7 @@ class CoreCrypto {
             case TransportVersion_1.TransportVersion.V1:
                 return await crypto_1.CryptoExchange.generateKeypair(3 /* CryptoExchangeAlgorithm.ECDH_X25519 */);
             default:
-                throw TransportErrors_1.TransportErrors.util.crypto.invalidVersion(version);
+                throw this.invalidVersion(version);
         }
     }
     /**
@@ -90,7 +89,7 @@ class CoreCrypto {
             case TransportVersion_1.TransportVersion.V1:
                 return await crypto_1.CryptoEncryption.generateKey(3 /* CryptoEncryptionAlgorithm.XCHACHA20_POLY1305 */);
             default:
-                throw TransportErrors_1.TransportErrors.util.crypto.invalidVersion(version);
+                throw this.invalidVersion(version);
         }
     }
     /**
@@ -115,7 +114,7 @@ class CoreCrypto {
             case TransportVersion_1.TransportVersion.V1:
                 return await crypto_1.CryptoDerivation.deriveKeyFromMaster(masterBuffer, 150000, keyAlgorithm, saltBuffer);
             default:
-                throw TransportErrors_1.TransportErrors.util.crypto.invalidVersion(version);
+                throw this.invalidVersion(version);
         }
     }
     static async deriveKeyFromBase(secret, keyId, context, keyAlgorithm = 3 /* CryptoEncryptionAlgorithm.XCHACHA20_POLY1305 */) {
@@ -127,7 +126,7 @@ class CoreCrypto {
             buffer = secret;
         }
         else {
-            throw TransportErrors_1.TransportErrors.util.crypto.invalidSecretType();
+            throw new Error("The secret type is invalid.");
         }
         return await crypto_1.CryptoDerivation.deriveKeyFromBase(buffer, keyId, context, keyAlgorithm);
     }
@@ -137,7 +136,7 @@ class CoreCrypto {
                 const base = await crypto_1.CryptoExchange.deriveTemplator(client, serverPublicKey, keyAlgorithm);
                 return base;
             default:
-                throw TransportErrors_1.TransportErrors.util.crypto.invalidVersion(version);
+                throw this.invalidVersion(version);
         }
     }
     static async deriveServer(server, clientPublicKey, keyAlgorithm = 3 /* CryptoEncryptionAlgorithm.XCHACHA20_POLY1305 */, version = TransportVersion_1.TransportVersion.Latest) {
@@ -146,7 +145,7 @@ class CoreCrypto {
                 const base = await crypto_1.CryptoExchange.deriveRequestor(server, clientPublicKey, keyAlgorithm);
                 return base;
             default:
-                throw TransportErrors_1.TransportErrors.util.crypto.invalidVersion(version);
+                throw this.invalidVersion(version);
         }
     }
     /**
@@ -164,7 +163,7 @@ class CoreCrypto {
             case TransportVersion_1.TransportVersion.V1:
                 return await crypto_1.CryptoSignatures.sign(content, privateKey, 2 /* CryptoHashAlgorithm.SHA512 */);
             default:
-                throw TransportErrors_1.TransportErrors.util.crypto.invalidVersion(version);
+                throw this.invalidVersion(version);
         }
     }
     /**
@@ -183,7 +182,7 @@ class CoreCrypto {
             case TransportVersion_1.TransportVersion.V1:
                 return await crypto_1.CryptoSignatures.verify(content, signature, publicKey);
             default:
-                throw TransportErrors_1.TransportErrors.util.crypto.invalidVersion(version);
+                throw this.invalidVersion(version);
         }
     }
     /**
@@ -203,7 +202,7 @@ class CoreCrypto {
             case TransportVersion_1.TransportVersion.V1:
                 return await crypto_1.CryptoEncryption.encrypt(content, secretKey);
             default:
-                throw TransportErrors_1.TransportErrors.util.crypto.invalidVersion(version);
+                throw this.invalidVersion(version);
         }
     }
     /**
@@ -223,7 +222,7 @@ class CoreCrypto {
             case TransportVersion_1.TransportVersion.V1:
                 return await crypto_1.CryptoEncryption.decrypt(cipher, secretKey);
             default:
-                throw TransportErrors_1.TransportErrors.util.crypto.invalidVersion(version);
+                throw this.invalidVersion(version);
         }
     }
     /**
@@ -238,6 +237,9 @@ class CoreCrypto {
     static async createAccountPassword() {
         return await util_1.PasswordGenerator.createStrongPassword(100, 100);
     }
+    static invalidVersion(version) {
+        return new Error(`The version ${version} is not supported.`);
+    }
 }
 exports.CoreCrypto = CoreCrypto;
 //# sourceMappingURL=CoreCrypto.js.map
@@ -502,7 +504,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.CoreUtil = 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 TransportErrors_1 = __webpack_require__(/*! ./TransportErrors */ "./dist/core/TransportErrors.js");
 class CoreUtil {
     static toBuffer(content, verbose = false) {
         let buffer;
@@ -519,7 +520,7 @@ class CoreUtil {
             buffer = new crypto_1.CoreBuffer(content);
         }
         else {
-            throw TransportErrors_1.TransportErrors.util.wrongContentForBuffer();
+            throw new Error("The given content cannot be transformed to buffer.");
         }
         return buffer;
     }
@@ -664,7 +665,7 @@ class Reference extends ts_serval_1.Serializable {
         const truncatedBuffer = crypto_1.CoreBuffer.fromBase64URL(value);
         const splitted = truncatedBuffer.toUtf8().split("|");
         if (splitted.length !== 3) {
-            throw TransportErrors_1.TransportErrors.files.invalidTruncatedReference();
+            throw TransportErrors_1.TransportErrors.general.invalidTruncatedReference();
         }
         try {
             const id = CoreId_1.CoreId.from(splitted[0]);
@@ -680,7 +681,7 @@ class Reference extends ts_serval_1.Serializable {
             });
         }
         catch (e) {
-            throw TransportErrors_1.TransportErrors.files.invalidTruncatedReference();
+            throw TransportErrors_1.TransportErrors.general.invalidTruncatedReference();
         }
     }
     static validateId(value, helper) {
@@ -749,7 +750,10 @@ class Transport {
             throw TransportErrors_1.TransportErrors.general.baseUrlNotSet().logWith(log);
         }
         if (this._config.supportedDatawalletVersion < 1) {
-            throw TransportErrors_1.TransportErrors.general.invalidDatawalletVersion().logWith(log);
+            throw new Error("The given identity version is invalid. The value must be 0 or higher.");
+        }
+        if (this._config.realm.length !== 3) {
+            throw TransportErrors_1.TransportErrors.general.realmLength();
         }
     }
     get config() {
@@ -845,7 +849,6 @@ var TransportContext;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TransportController = exports.ControllerName = void 0;
-const TransportErrors_1 = __webpack_require__(/*! ./TransportErrors */ "./dist/core/TransportErrors.js");
 const TransportLoggerFactory_1 = __webpack_require__(/*! ./TransportLoggerFactory */ "./dist/core/TransportLoggerFactory.js");
 var ControllerName;
 (function (ControllerName) {
@@ -909,9 +912,9 @@ class TransportController {
     get eventBus() {
         return this.transport.eventBus;
     }
-    init() {
+    init(..._args) {
         if (this._initialized) {
-            throw TransportErrors_1.TransportErrors.controller.alreadyInitialized(this.controllerName).logWith(this._log);
+            throw new Error(`The controller ${this.controllerName} is already initialized.`);
         }
         this._initialized = true;
         return Promise.resolve(this);
@@ -940,107 +943,12 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TransportErrors = void 0;
 const json_stringify_safe_1 = __importDefault(__webpack_require__(/*! json-stringify-safe */ "./node_modules/json-stringify-safe/stringify.js"));
 const CoreError_1 = __webpack_require__(/*! ./CoreError */ "./dist/core/CoreError.js");
-class Controller {
-    alreadyInitialized(controllerName) {
-        return new CoreError_1.CoreError("error.transport.controller.alreadyInitialized", `The controller ${controllerName} was already initialized.`);
-    }
-    contentPropertyUndefined(contentProperty) {
-        return new CoreError_1.CoreError("error.transport.controller.contentPropertyUndefined", `The property ${contentProperty} is undefined.`);
-    }
-}
-class Crypto {
-    invalidVersion(version) {
-        return new CoreError_1.CoreError("error.transport.crypto.invalidVersion", `The version ${version} is not supported.`);
-    }
-    invalidSecretType() {
-        return new CoreError_1.CoreError("error.transport.crypto.invalidSecretType", "The secret type is invalid.");
-    }
-}
-class RelationshipTemplates {
-}
 class Relationships {
-    responseCryptoIsMissing() {
-        return new CoreError_1.CoreError("error.transport.relationships.responseCryptoIsMissing", "The response crypto is missing.");
-    }
-    requestContainsWrongTemplateId() {
-        return new CoreError_1.CoreError("error.transport.relationships.requestContainsWrongTemplateId", "The relationship request contains a wrong template id.");
-    }
-    responseContainsWrongRequestId() {
-        return new CoreError_1.CoreError("error.transport.relationships.requestContainsWrongRequestId", "The relationship response contains a wrong request id.");
-    }
     wrongChangeStatus(status) {
         return new CoreError_1.CoreError("error.transport.relationships.wrongChangeStatus", `The relationship change has the wrong status (${status}) to run this operation`);
     }
-    wrongChangeType(type) {
-        return new CoreError_1.CoreError("error.transport.relationships.wrongChangeType", `The relationship change has the wrong type (${type}) to run this operation`);
-    }
-    changeResponseMissing(changeId) {
-        return new CoreError_1.CoreError("error.transport.relationships.changeResponseMissing", `The response of the relationship change (${changeId}) is missing`);
-    }
-    emptyOrInvalidContent(change) {
-        return new CoreError_1.CoreError("error.transport.relationships.wrongOrEmptyContent", `The relationship change ${change === null || change === void 0 ? void 0 : change.id} requires a content property or its content property is invalid`);
-    }
-}
-class Logging {
-    loggerNotInitialized() {
-        return new CoreError_1.CoreError("error.transport.logging.loggerNotInitialized", "The logger factory is not yet initialized");
-    }
-}
-class CoreDateErrors {
-    noIsoStringMethod() {
-        return new CoreError_1.CoreError("error.transport.date.noIsoMethod", "The provided object doesn't have an iso string method");
-    }
-    undefined() {
-        return new CoreError_1.CoreError("error.transport.date.undefined", "The provided object is undefined and cannot be deserialized.");
-    }
-    invalid() {
-        return new CoreError_1.CoreError("error.transport.date.invalid", "The provided object is invalid cannot be deserialized.");
-    }
-}
-class Random {
-    minLessThanZero() {
-        return new CoreError_1.CoreError("error.transport.util.random.minLessThanZero", "minlength must not be less than zero");
-    }
-    inputTooLong() {
-        return new CoreError_1.CoreError("error.transport.util.random.inputTooLong", "Input exceeds maximum length of 256!");
-    }
-    maxTooHigh() {
-        return new CoreError_1.CoreError("error.transport.util.random.maxTooHigh", "Max must be below 22.");
-    }
-    mnBiggerThatMax() {
-        return new CoreError_1.CoreError("error.code.util.random.minBiggerThanMax", "Max must be larger than min.");
-    }
-    rangeTooBig() {
-        return new CoreError_1.CoreError("error.transport.util.random.rangeTooBig", "The range between the numbers is too big, 32 bit is the maximum -> 4294967296");
-    }
-    intLength() {
-        return new CoreError_1.CoreError("error.transport.util.random.length", "Length must be between 1 and 21.");
-    }
-}
-class Util {
-    constructor() {
-        this.date = new CoreDateErrors();
-        this.random = new Random();
-        this.logging = new Logging();
-        this.crypto = new Crypto();
-    }
-    passwordMinLengthTooShort() {
-        return new CoreError_1.CoreError("error.transport.passwordMinLengthTooShort", "Minimum password length for a strong password should be 8 characters.");
-    }
-    wrongContentForBuffer() {
-        return new CoreError_1.CoreError("error.transport.wrongContentForBuffer", "The given content cannot be transformed to buffer.");
-    }
-    tooLongCoreIdPrefix(prefix) {
-        return new CoreError_1.CoreError("error.transport.coreid.tooLongPrefix", `The prefix "${prefix}" is too long`);
-    }
 }
 class Device {
-    deviceNotSet() {
-        return new CoreError_1.CoreError("error.transport.device.deviceNotSet", "The device must be set");
-    }
-    notOnboardedYet() {
-        return new CoreError_1.CoreError("error.transport.devices.notOnboardedYet", "The device is not onboarded yet and has no public key.");
-    }
     alreadyOnboarded() {
         return new CoreError_1.CoreError("error.transport.devices.alreadyOnboarded", "The device has already been onboarded.");
     }
@@ -1055,40 +963,14 @@ class Messages {
     signatureNotValid() {
         return new CoreError_1.CoreError("error.transport.messages.signatureNotValid", "The digital signature on this message for peer key is invalid. An impersonination attack might be the cause of this.");
     }
-    noRecipientsSet() {
-        return new CoreError_1.CoreError("error.transport.messages.noRecipientsSet", "No recipients set.");
-    }
     ownAddressNotInList(messageId) {
         return new CoreError_1.CoreError("error.transport.messages.ownAddressNotInList", `The recipients list of message ${messageId} didn't contain an entry for the own address. This message should not have been received.`);
     }
     noMatchingRelationship(senderAddress) {
-        return new CoreError_1.CoreError("error.transport.messages.noMatchingRelationship", `A relationship with sender ${senderAddress} does not exist. This might be spam.`);
-    }
-    noSecretKeyForOwnMessage(envelopeId) {
-        return new CoreError_1.CoreError(`No secret key found for own message ${envelopeId}`, "The message could not be decrypted, because no secret key was found for it.");
-    }
-}
-class Identity {
-    realmLength() {
-        return new CoreError_1.CoreError("error.transport.identity.realmLength", "Realm must be of length 3.");
-    }
-    identityNotSet() {
-        return new CoreError_1.CoreError("error.transport.identity.identityNotSet", "The identity must be set");
-    }
-    noAddressReceived() {
-        return new CoreError_1.CoreError("error.transport.identity.noAddressReceived", "The backbone did not create an address for the created device.");
-    }
-    addressMismatch() {
-        return new CoreError_1.CoreError("error.transport.identity.addressMismatch", "The backbone address does not match the local address.");
+        return new CoreError_1.CoreError("error.transport.messages.noMatchingRelationship", `A relationship with sender ${senderAddress} does not exist.`);
     }
 }
 class Secrets {
-    lengthMismatch() {
-        return new CoreError_1.CoreError("error.transport.secrets.lengthMismatch", "Length mismatch between old number of secrets and new ones.");
-    }
-    wrongBaseKeyType(baseKeyType) {
-        return new CoreError_1.CoreError("error.transport.secrets.wrongBaseKeyType", `Given BaseKey type "${baseKeyType}" is not supported!`);
-    }
     wrongSecretType(secretId) {
         return new CoreError_1.CoreError("error.transport.secrets.wrongBaseKeyType", "Given Secret type is not supported!", {
             secretId: secretId
@@ -1099,8 +981,8 @@ class Secrets {
     }
 }
 class Challenges {
-    challengeTypeRequiredRelationship() {
-        return new CoreError_1.CoreError("error.transport.challenges.challengeTypeRequiredRelationship", "The challenge type ist relationship but the relationship is undefined");
+    challengeTypeRequiresRelationship() {
+        return new CoreError_1.CoreError("error.transport.challenges.challengeTypeRequiresRelationship", "The challenge type Relationship requires a relationship.");
     }
 }
 class Datawallet {
@@ -1123,9 +1005,6 @@ class Datawallet {
     currentBiggerThanTarget(current, target) {
         return new CoreError_1.CoreError("error.transport.datawallet.currentBiggerThanTarget", `The current datawallet version '${current}' is bigger than the target version '${target}'.`);
     }
-    noMigrationAvailable(version) {
-        return new CoreError_1.CoreError("error.core.datawallet.noMigrationAvailable", `There is no migration available for the datawallet version '${version}'.`);
-    }
 }
 class Files {
     plaintextHashMismatch() {
@@ -1137,9 +1016,6 @@ class Files {
     invalidMetadata(id) {
         return new CoreError_1.CoreError("error.transport.files.invalidMetadata", `The metadata of file id "${id}" is invalid.`);
     }
-    invalidTruncatedReference() {
-        return new CoreError_1.CoreError("error.transport.files.invalidTruncatedReference", "invalid truncated reference");
-    }
     fileContentUndefined() {
         return new CoreError_1.CoreError("error.transport.files.fileContentUndefined", "The given file content is undefined.");
     }
@@ -1148,17 +1024,11 @@ class Files {
     }
 }
 class Tokens {
-    invalidTruncatedReference() {
-        return new CoreError_1.CoreError("error.transport.tokens.invalidTruncatedReference", "invalid truncated reference");
-    }
     invalidTokenContent(id) {
         return new CoreError_1.CoreError("error.transport.tokens.invalidTokenContent", `The content of token ${id} is not of type TokenContent`);
     }
 }
 class General {
-    invalidDatawalletVersion() {
-        return new CoreError_1.CoreError("error.transport.general.invalidDatawalletVersion", "The given identity version is invalid. The value must be 0 or higher.");
-    }
     baseUrlNotSet() {
         return new CoreError_1.CoreError("error.transport.general.baseUrlNotSet", "The baseUrl was not set.");
     }
@@ -1172,7 +1042,7 @@ class General {
         return new CoreError_1.CoreError("error.transport.general.platformClientInvalid", "The combination of platform clientId and clientSecret is invalid.");
     }
     cacheEmpty(entityName, id) {
-        return new CoreError_1.CoreError("error.transport.general.cacheEmpty", `The cache of ${entityName instanceof Function ? entityName.name : entityName} with id "${id}" is empty.`, id);
+        return new Error(`The cache of ${entityName instanceof Function ? entityName.name : entityName} with id "${id}" is empty.`);
     }
     incompatibleBackbone() {
         return new CoreError_1.CoreError("error.transport.incompatibleBackbone", "The backbone sent an invalid payload.");
@@ -1183,30 +1053,21 @@ class General {
     recordNotFound(entityName, entityId) {
         return new CoreError_1.CoreError("error.transport.recordNotFound", `'${entityName instanceof Function ? entityName.name : entityName}' not found.`, entityId);
     }
-    notImplemented() {
-        return new CoreError_1.CoreError("error.transport.notImplemented", "The method is not yet implemented.");
-    }
-    typeNotInReflection(type) {
-        return new CoreError_1.CoreError("error.transport.typeNotInReflectionClass", `The type ${type} was not in the reflection classes. You might have to install a module first.`);
+    notSupported() {
+        return new CoreError_1.CoreError("error.transport.notSupported", "The method is not yet supported.");
     }
-    datawalletNotAvailable() {
-        return new CoreError_1.CoreError("error.transport.datawalletNotAvailable", "The datawallet is not available (yet?) and was requested.");
-    }
-    unsupportedDatabaseTypeForQuery(databaseType, query) {
-        return new CoreError_1.CoreError("error.transport.unsupportedDatabaseTypeForQuery", `The query '${query.name}' does not (yet?) support the database type '${databaseType}'.`);
+    realmLength() {
+        return new CoreError_1.CoreError("error.transport.identity.realmLength", "Realm must be of length 3.");
     }
-    notAllowedCombinationOfDeviceSharedSecretAndAccount() {
-        return new CoreError_1.CoreError("error.transport.account", "The combination of deviceSharedSecret, existing identity or device is not allowed.");
+    invalidTruncatedReference() {
+        return new CoreError_1.CoreError("error.transport.files.invalidTruncatedReference", "invalid truncated reference");
     }
 }
 class TransportErrors {
 }
 exports.TransportErrors = TransportErrors;
-TransportErrors.controller = new Controller();
 TransportErrors.relationships = new Relationships();
-TransportErrors.util = new Util();
 TransportErrors.general = new General();
-TransportErrors.identity = new Identity();
 TransportErrors.messages = new Messages();
 TransportErrors.secrets = new Secrets();
 TransportErrors.device = new Device();
@@ -1214,7 +1075,6 @@ TransportErrors.files = new Files();
 TransportErrors.challenges = new Challenges();
 TransportErrors.datawallet = new Datawallet();
 TransportErrors.tokens = new Tokens();
-TransportErrors.relationshipTemplates = new RelationshipTemplates();
 //# sourceMappingURL=TransportErrors.js.map
 
 /***/ }),
@@ -1246,20 +1106,19 @@ TransportIds.datawalletModification = new CoreIdHelper_1.CoreIdHelper("TRPDWM");
 /*!*********************************************!*\
   !*** ./dist/core/TransportLoggerFactory.js ***!
   \*********************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TransportLoggerFactory = void 0;
-const TransportErrors_1 = __webpack_require__(/*! ./TransportErrors */ "./dist/core/TransportErrors.js");
 class TransportLoggerFactory {
     static init(instance) {
         this.instance = instance;
     }
     static getLogger(name) {
         if (!this.isInitialized()) {
-            throw TransportErrors_1.TransportErrors.util.logging.loggerNotInitialized();
+            throw new Error("The logger factory is not yet initialized. Call TransportLoggerFactory.init() first.");
         }
         if (typeof name === "function") {
             return this.instance.getLogger(`Transport.${name.name}`);
@@ -2359,7 +2218,6 @@ exports.CoreDate = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const luxon_1 = __webpack_require__(/*! luxon */ "./node_modules/luxon/build/node/luxon.js");
 const CoreSerializable_1 = __webpack_require__(/*! ../CoreSerializable */ "./dist/core/CoreSerializable.js");
-const TransportErrors_1 = __webpack_require__(/*! ../TransportErrors */ "./dist/core/TransportErrors.js");
 let CoreDate = CoreDate_1 = class CoreDate extends CoreSerializable_1.CoreSerializable {
     constructor(dateTime = luxon_1.DateTime.utc()) {
         super();
@@ -2472,12 +2330,12 @@ let CoreDate = CoreDate_1 = class CoreDate extends CoreSerializable_1.CoreSerial
     }
     static preFrom(value) {
         if (typeof value === "undefined") {
-            throw TransportErrors_1.TransportErrors.util.date.undefined();
+            throw new Error("The provided object is undefined and cannot be deserialized.");
         }
         if (typeof value === "object") {
             if (typeof value.date === "undefined") {
                 if (typeof value.toISOString !== "function") {
-                    throw TransportErrors_1.TransportErrors.util.date.noIsoStringMethod();
+                    throw new Error("The provided object doesn't have an 'toISOString' string method.");
                 }
                 const iso = value.toISOString();
                 return luxon_1.DateTime.fromISO(iso, { zone: "utc" });
@@ -2490,7 +2348,7 @@ let CoreDate = CoreDate_1 = class CoreDate extends CoreSerializable_1.CoreSerial
         if (typeof value === "string") {
             return luxon_1.DateTime.fromISO(value, { zone: "utc" }).toUTC();
         }
-        throw TransportErrors_1.TransportErrors.util.date.invalid();
+        throw new Error("The provided object is invalid cannot be deserialized.");
     }
     static from(value) {
         return this.fromAny(value);
@@ -2612,7 +2470,6 @@ exports.CoreId = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const Random_1 = __webpack_require__(/*! ../../util/Random */ "./dist/util/Random.js");
 const CoreSerializable_1 = __webpack_require__(/*! ../CoreSerializable */ "./dist/core/CoreSerializable.js");
-const TransportErrors_1 = __webpack_require__(/*! ../TransportErrors */ "./dist/core/TransportErrors.js");
 /**
  * A CoreId is any kind of identifier we have in the system.
  */
@@ -2625,7 +2482,7 @@ let CoreId = class CoreId extends CoreSerializable_1.CoreSerializable {
     }
     static async generate(prefix = "") {
         if (prefix.length > 6) {
-            throw TransportErrors_1.TransportErrors.util.tooLongCoreIdPrefix(prefix);
+            throw new Error(`The prefix "${prefix}" is too long. It must not be longer than 6 characters.`);
         }
         const random = await Random_1.Random.string(20 - prefix.length, Random_1.RandomCharacterRange.Alphanumeric);
         return this.from(prefix.toUpperCase() + random);
@@ -2909,12 +2766,22 @@ __exportStar(__webpack_require__(/*! ./util */ "./dist/util/index.js"), exports)
 /*!****************************************************!*\
   !*** ./dist/modules/accounts/AccountController.js ***!
   \****************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "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);
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AccountController = void 0;
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 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");
@@ -2933,6 +2800,7 @@ const DevicesController_1 = __webpack_require__(/*! ../devices/DevicesController
 const DeviceSecretController_1 = __webpack_require__(/*! ../devices/DeviceSecretController */ "./dist/modules/devices/DeviceSecretController.js");
 const Device_1 = __webpack_require__(/*! ../devices/local/Device */ "./dist/modules/devices/local/Device.js");
 const DeviceSecretCredentials_1 = __webpack_require__(/*! ../devices/local/DeviceSecretCredentials */ "./dist/modules/devices/local/DeviceSecretCredentials.js");
+const DeviceSharedSecret_1 = __webpack_require__(/*! ../devices/transmission/DeviceSharedSecret */ "./dist/modules/devices/transmission/DeviceSharedSecret.js");
 const FileController_1 = __webpack_require__(/*! ../files/FileController */ "./dist/modules/files/FileController.js");
 const MessageController_1 = __webpack_require__(/*! ../messages/MessageController */ "./dist/modules/messages/MessageController.js");
 const RelationshipsController_1 = __webpack_require__(/*! ../relationships/RelationshipsController */ "./dist/modules/relationships/RelationshipsController.js");
@@ -2961,6 +2829,9 @@ class AccountController {
     get authenticator() {
         return this._authenticator;
     }
+    get log() {
+        return this._log;
+    }
     get config() {
         return this._config;
     }
@@ -2982,7 +2853,6 @@ class AccountController {
     get identity() {
         return this._identity;
     }
-    // TODO: JSSNMSHDD-2487 (last login date)
     async init(deviceSharedSecret) {
         this.info = await this.db.getMap("AccountInfo");
         this.unpushedDatawalletModifications = await this.db.getCollection(DbCollectionName_1.DbCollectionName.UnpushedDatawalletModifications);
@@ -3031,7 +2901,7 @@ class AccountController {
             this.deviceAuthClient = new DeviceAuthClient_1.DeviceAuthClient(this.config, this.authenticator);
         }
         else {
-            throw core_1.TransportErrors.general.notAllowedCombinationOfDeviceSharedSecretAndAccount().logWith(this._log);
+            throw new Error("The combination of deviceSharedSecret, existing identity or device is not allowed.");
         }
         this._log.trace(`Using device ${this.activeDevice.id} for identity ${this.identity.address}.`);
         await this.initControllers();
@@ -3093,7 +2963,6 @@ class AccountController {
         return await this.synchronization.getLastCompletedDatawalletSyncTime();
     }
     async createIdentityAndDevice(realm = Identity_1.Realm.Prod) {
-        this._log.trace(`Creating new identity for realm ${realm}...`);
         const [identityKeypair, devicePwdD1, deviceKeypair, privBaseShared, privBaseDevice] = await Promise.all([
             // Generate identity keypair
             CoreCrypto_1.CoreCrypto.generateSignatureKeypair(),
@@ -3128,16 +2997,13 @@ class AccountController {
         if (deviceResponseResult.isError) {
             const error = deviceResponseResult.error;
             if (error.code === "error.platform.unauthorized") {
-                throw core_1.TransportErrors.general.platformClientInvalid().logWith(this._log);
+                throw core_1.TransportErrors.general.platformClientInvalid();
             }
         }
         const deviceResponse = deviceResponseResult.value;
         this._log.trace(`Registered identity with address ${deviceResponse.address}, device id is ${deviceResponse.device.id}.`);
-        if (!deviceResponse.address) {
-            throw core_1.TransportErrors.identity.noAddressReceived().logWith(this._log);
-        }
-        if (localAddress.toString() !== deviceResponse.address) {
-            throw core_1.TransportErrors.identity.addressMismatch().logWith(this._log);
+        if (!localAddress.equals(deviceResponse.address)) {
+            throw new Error("The backbone address does not match the local address.");
         }
         const identity = Identity_1.Identity.from({
             address: core_1.CoreAddress.from(deviceResponse.address),
@@ -3176,7 +3042,6 @@ class AccountController {
             this.activeDevice.secrets.storeSecret(deviceKeypair.privateKey, DeviceSecretController_1.DeviceSecretType.DeviceSignature),
             this.activeDevice.secrets.storeSecret(deviceCredentials, DeviceSecretController_1.DeviceSecretType.DeviceCredentials)
         ]);
-        // TODO: JSSNMSHDD-2471 (Rollback on error)
         return { identity, device };
     }
     async onboardDevice(deviceSharedSecret) {
@@ -3248,6 +3113,18 @@ class AccountController {
         return new SynchronizedCollection_1.SynchronizedCollection(collection, this.config.supportedDatawalletVersion, this.unpushedDatawalletModifications);
     }
 }
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [DeviceSharedSecret_1.DeviceSharedSecret]),
+    __metadata("design:returntype", Promise)
+], AccountController.prototype, "init", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], AccountController.prototype, "createIdentityAndDevice", null);
 exports.AccountController = AccountController;
 //# sourceMappingURL=AccountController.js.map
 
@@ -3257,15 +3134,26 @@ exports.AccountController = AccountController;
 /*!*****************************************************!*\
   !*** ./dist/modules/accounts/IdentityController.js ***!
   \*****************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "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);
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.IdentityController = void 0;
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
 const DeviceSecretController_1 = __webpack_require__(/*! ../devices/DeviceSecretController */ "./dist/modules/devices/DeviceSecretController.js");
+const Identity_1 = __webpack_require__(/*! ./data/Identity */ "./dist/modules/accounts/data/Identity.js");
 class IdentityController extends core_1.TransportController {
     constructor(parent) {
         super(core_1.ControllerName.Identity, parent);
@@ -3284,9 +3172,6 @@ class IdentityController extends core_1.TransportController {
     }
     async init(identity) {
         await super.init();
-        if (!identity) {
-            throw core_1.TransportErrors.identity.identityNotSet().logWith(this._log);
-        }
         this._identity = identity;
         return this;
     }
@@ -3299,7 +3184,7 @@ class IdentityController extends core_1.TransportController {
     async sign(content) {
         const privateKeyContainer = await this.parent.activeDevice.secrets.loadSecret(DeviceSecretController_1.DeviceSecretType.IdentitySignature);
         if (!privateKeyContainer || !(privateKeyContainer.secret instanceof crypto_1.CryptoSignaturePrivateKey)) {
-            throw core_1.TransportErrors.secrets.secretNotFound(DeviceSecretController_1.DeviceSecretType.IdentitySignature).logWith(this._log);
+            throw core_1.TransportErrors.secrets.secretNotFound(DeviceSecretController_1.DeviceSecretType.IdentitySignature);
         }
         const privateKey = privateKeyContainer.secret;
         const signature = await core_1.CoreCrypto.sign(content, privateKey);
@@ -3311,6 +3196,18 @@ class IdentityController extends core_1.TransportController {
         return valid;
     }
 }
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Identity_1.Identity]),
+    __metadata("design:returntype", Promise)
+], IdentityController.prototype, "init", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [crypto_1.CoreBuffer]),
+    __metadata("design:returntype", Promise)
+], IdentityController.prototype, "sign", null);
 exports.IdentityController = IdentityController;
 //# sourceMappingURL=IdentityController.js.map
 
@@ -3329,10 +3226,9 @@ exports.IdentityUtil = void 0;
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
 class IdentityUtil {
-    static async createAddress(publicKey, realm = "ID0") {
-        if (realm && realm.length !== 3) {
-            throw core_1.TransportErrors.identity.realmLength();
-        }
+    static async createAddress(publicKey, realm) {
+        if (realm.length !== 3)
+            throw core_1.TransportErrors.general.realmLength();
         const sha512buffer = await crypto_1.CryptoHash.hash(publicKey.publicKey, 2 /* CryptoHashAlgorithm.SHA512 */);
         const hash = await crypto_1.CryptoHash.hash(sha512buffer, 1 /* CryptoHashAlgorithm.SHA256 */);
         const hashedPublicKey = new crypto_1.CoreBuffer(hash.buffer.slice(0, 20));
@@ -3430,7 +3326,6 @@ const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-s
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const CoreSerializable_1 = __webpack_require__(/*! ../../../core/CoreSerializable */ "./dist/core/CoreSerializable.js");
 const CoreAddress_1 = __webpack_require__(/*! ../../../core/types/CoreAddress */ "./dist/core/types/CoreAddress.js");
-const CoreDate_1 = __webpack_require__(/*! ../../../core/types/CoreDate */ "./dist/core/types/CoreDate.js");
 var Realm;
 (function (Realm) {
     Realm["Dev"] = "dev";
@@ -3438,14 +3333,6 @@ var Realm;
     Realm["Prod"] = "id1";
 })(Realm = exports.Realm || (exports.Realm = {}));
 let Identity = class Identity extends CoreSerializable_1.CoreSerializable {
-    static postFrom(value) {
-        // TODO: Remove these default values once we're sure that nobody is accessing the deprecated properties anymore
-        value.name = "";
-        value.description = "";
-        value.type = "unknown";
-        value.createdAt = CoreDate_1.CoreDate.from("2020-01-01T00:00:00Z");
-        return value;
-    }
     static from(value) {
         return this.fromAny(value);
     }
@@ -3465,30 +3352,6 @@ __decorate([
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", String)
 ], Identity.prototype, "realm", void 0);
-__decorate([
-    (0, ts_serval_1.validate)({ nullable: true }),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", String)
-], Identity.prototype, "name", void 0);
-__decorate([
-    (0, ts_serval_1.validate)({ nullable: true }),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", String)
-], Identity.prototype, "description", void 0);
-__decorate([
-    (0, ts_serval_1.validate)({ nullable: true }),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", CoreDate_1.CoreDate
-    /**
-     * @deprecated
-     */
-    )
-], Identity.prototype, "createdAt", void 0);
-__decorate([
-    (0, ts_serval_1.validate)({ nullable: true }),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", String)
-], Identity.prototype, "type", void 0);
 Identity = __decorate([
     (0, ts_serval_1.type)("Identity")
 ], Identity);
@@ -4367,12 +4230,22 @@ exports.CertificateRoleItem = CertificateRoleItem;
 /*!********************************************************!*\
   !*** ./dist/modules/challenges/ChallengeController.js ***!
   \********************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "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);
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ChallengeController = void 0;
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
 const TransportController_1 = __webpack_require__(/*! ../../core/TransportController */ "./dist/core/TransportController.js");
@@ -4405,7 +4278,7 @@ class ChallengeController extends TransportController_1.TransportController {
                 isValid = await this.parent.relationships.verifyIdentity(relationship, challengeBuffer, signedChallenge.signature);
                 break;
             case Challenge_1.ChallengeType.Device:
-                throw core_1.TransportErrors.general.notImplemented().logWith(this._log);
+                throw core_1.TransportErrors.general.notSupported();
             case Challenge_1.ChallengeType.Relationship:
                 isValid = await this.parent.relationships.verify(relationship, challengeBuffer, signedChallenge.signature);
                 break;
@@ -4424,8 +4297,6 @@ class ChallengeController extends TransportController_1.TransportController {
         if (backboneChallengeResponse.isError)
             return { isValid: false };
         if ((challenge.createdBy && backboneChallengeResponse.value.createdBy !== challenge.createdBy.toString()) ||
-            // TODO: JSSNMSHDD-2472 (Reenable check once the backbone returns with same timestamp)
-            // response.expiresAt !== challenge.expiresAt.toString() ||
             backboneChallengeResponse.value.id !== challenge.id.toString()) {
             return { isValid: false };
         }
@@ -4449,7 +4320,7 @@ class ChallengeController extends TransportController_1.TransportController {
     }
     async createChallenge(type = Challenge_1.ChallengeType.Identity, relationship) {
         if (type === Challenge_1.ChallengeType.Relationship && !relationship) {
-            throw core_1.TransportErrors.challenges.challengeTypeRequiredRelationship().logWith(this._log);
+            throw core_1.TransportErrors.challenges.challengeTypeRequiresRelationship();
         }
         const backboneResponse = (await this.authClient.createChallenge()).value;
         const challenge = Challenge_1.Challenge.from({
@@ -4473,7 +4344,7 @@ class ChallengeController extends TransportController_1.TransportController {
                 break;
             case Challenge_1.ChallengeType.Relationship:
                 if (!relationship) {
-                    throw core_1.TransportErrors.challenges.challengeTypeRequiredRelationship().logWith(this._log);
+                    throw core_1.TransportErrors.challenges.challengeTypeRequiresRelationship();
                 }
                 signature = await this.parent.relationships.sign(relationship, challengeBuffer);
                 break;
@@ -4485,6 +4356,19 @@ class ChallengeController extends TransportController_1.TransportController {
         return signedChallenge;
     }
 }
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Challenge_1.Challenge,
+        ChallengeSigned_1.ChallengeSigned]),
+    __metadata("design:returntype", Promise)
+], ChallengeController.prototype, "validateChallengeLocally", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Relationship_1.Relationship]),
+    __metadata("design:returntype", Promise)
+], ChallengeController.prototype, "createChallenge", null);
 exports.ChallengeController = ChallengeController;
 //# sourceMappingURL=ChallengeController.js.map
 
@@ -4663,15 +4547,26 @@ exports.ChallengeSigned = ChallengeSigned;
 /*!**************************************************!*\
   !*** ./dist/modules/devices/DeviceController.js ***!
   \**************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "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);
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DeviceController = void 0;
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
 const DeviceSecretController_1 = __webpack_require__(/*! ./DeviceSecretController */ "./dist/modules/devices/DeviceSecretController.js");
+const Device_1 = __webpack_require__(/*! ./local/Device */ "./dist/modules/devices/local/Device.js");
 const DeviceSecretCredentials_1 = __webpack_require__(/*! ./local/DeviceSecretCredentials */ "./dist/modules/devices/local/DeviceSecretCredentials.js");
 class DeviceController extends core_1.TransportController {
     constructor(parent) {
@@ -4706,7 +4601,7 @@ class DeviceController extends core_1.TransportController {
     }
     get device() {
         if (!this._device)
-            throw core_1.TransportErrors.device.deviceNotSet();
+            throw new Error("The Device controller is not initialized.");
         return this._device;
     }
     get deviceOrUndefined() {
@@ -4714,12 +4609,6 @@ class DeviceController extends core_1.TransportController {
     }
     async init(baseKey, device) {
         await super.init();
-        if (!device) {
-            throw core_1.TransportErrors.device.deviceNotSet().logWith(this._log);
-        }
-        if (!baseKey) {
-            throw core_1.TransportErrors.secrets.secretNotFound("BaseKey").logWith(this._log);
-        }
         this._device = device;
         this._secrets = await new DeviceSecretController_1.DeviceSecretController(this.parent, baseKey).init();
         return this;
@@ -4740,8 +4629,7 @@ class DeviceController extends core_1.TransportController {
             await this.secrets.storeSecret(credentials, DeviceSecretController_1.DeviceSecretType.DeviceCredentials);
         }
         catch (e) {
-            // TODO: JSSNMSHDD-2473 (rollback if password saving failed)
-            this.log.warn(`We've changed the device password on the backboen but weren't able to store it to the database. The new password is '${newPassword}'.`);
+            this.log.warn(`We've changed the device password on the backbone but weren't able to store it to the database. The new password is '${newPassword}'.`);
             throw e;
         }
     }
@@ -4758,7 +4646,7 @@ class DeviceController extends core_1.TransportController {
     async sign(content) {
         const privateKeyContainer = await this.secrets.loadSecret(DeviceSecretController_1.DeviceSecretType.DeviceSignature);
         if (!privateKeyContainer || !(privateKeyContainer.secret instanceof crypto_1.CryptoSignaturePrivateKey)) {
-            throw core_1.TransportErrors.secrets.secretNotFound(DeviceSecretController_1.DeviceSecretType.DeviceSignature).logWith(this._log);
+            throw core_1.TransportErrors.secrets.secretNotFound(DeviceSecretController_1.DeviceSecretType.DeviceSignature);
         }
         const privateKey = privateKeyContainer.secret;
         const signature = await core_1.CoreCrypto.sign(content, privateKey);
@@ -4767,21 +4655,21 @@ class DeviceController extends core_1.TransportController {
     }
     async verify(content, signature) {
         if (!this.publicKey) {
-            throw core_1.TransportErrors.device.notOnboardedYet().logWith(this._log);
+            throw new Error("The device has no public key to verify a signature. This can happen if the device is not onboarded yet.");
         }
         return await core_1.CoreCrypto.verify(content, signature, this.publicKey);
     }
     async getCredentials() {
         const credentialContainer = await this.secrets.loadSecret(DeviceSecretController_1.DeviceSecretType.DeviceCredentials);
         if (!credentialContainer) {
-            throw core_1.TransportErrors.secrets.secretNotFound(DeviceSecretController_1.DeviceSecretType.DeviceCredentials).logWith(this._log);
+            throw core_1.TransportErrors.secrets.secretNotFound(DeviceSecretController_1.DeviceSecretType.DeviceCredentials);
         }
         if (!(credentialContainer.secret instanceof DeviceSecretCredentials_1.DeviceSecretCredentials)) {
-            throw core_1.TransportErrors.secrets.wrongSecretType(DeviceSecretController_1.DeviceSecretType.DeviceCredentials).logWith(this._log);
+            throw core_1.TransportErrors.secrets.wrongSecretType(DeviceSecretController_1.DeviceSecretType.DeviceCredentials);
         }
         const credentials = credentialContainer.secret;
         if (!credentials.username || !credentials.password) {
-            throw core_1.TransportErrors.secrets.wrongSecretType(DeviceSecretController_1.DeviceSecretType.DeviceCredentials).logWith(this._log);
+            throw core_1.TransportErrors.secrets.wrongSecretType(DeviceSecretController_1.DeviceSecretType.DeviceCredentials);
         }
         return {
             username: credentials.username,
@@ -4789,6 +4677,30 @@ class DeviceController extends core_1.TransportController {
         };
     }
 }
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [crypto_1.CryptoSecretKey, Device_1.Device]),
+    __metadata("design:returntype", Promise)
+], DeviceController.prototype, "init", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [crypto_1.CoreBuffer]),
+    __metadata("design:returntype", Promise)
+], DeviceController.prototype, "sign", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [crypto_1.CoreBuffer, crypto_1.CryptoSignature]),
+    __metadata("design:returntype", Promise)
+], DeviceController.prototype, "verify", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], DeviceController.prototype, "getCredentials", null);
 exports.DeviceController = DeviceController;
 //# sourceMappingURL=DeviceController.js.map
 
@@ -4798,19 +4710,31 @@ exports.DeviceController = DeviceController;
 /*!********************************************************!*\
   !*** ./dist/modules/devices/DeviceSecretController.js ***!
   \********************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "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);
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DeviceSecretController = exports.DeviceSecretType = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
 const TransportController_1 = __webpack_require__(/*! ../../core/TransportController */ "./dist/core/TransportController.js");
 const TransportIds_1 = __webpack_require__(/*! ../../core/TransportIds */ "./dist/core/TransportIds.js");
 const SecretContainerCipher_1 = __webpack_require__(/*! ../secrets/data/SecretContainerCipher */ "./dist/modules/secrets/data/SecretContainerCipher.js");
 const SecretContainerPlain_1 = __webpack_require__(/*! ../secrets/data/SecretContainerPlain */ "./dist/modules/secrets/data/SecretContainerPlain.js");
+const DatawalletModification_1 = __webpack_require__(/*! ../sync/local/DatawalletModification */ "./dist/modules/sync/local/DatawalletModification.js");
+const Device_1 = __webpack_require__(/*! ./local/Device */ "./dist/modules/devices/local/Device.js");
 const DeviceSharedSecret_1 = __webpack_require__(/*! ./transmission/DeviceSharedSecret */ "./dist/modules/devices/transmission/DeviceSharedSecret.js");
 var DeviceSecretType;
 (function (DeviceSecretType) {
@@ -4889,17 +4813,17 @@ class DeviceSecretController extends TransportController_1.TransportController {
     async createDeviceSharedSecret(device, deviceIndex, includeIdentityPrivateKey = false) {
         const synchronizationKey = await this.loadSecret(DeviceSecretType.IdentitySynchronizationMaster);
         if (!synchronizationKey || !(synchronizationKey.secret instanceof crypto_1.CryptoSecretKey)) {
-            throw core_1.TransportErrors.secrets.secretNotFound("SynchronizationKey").logWith(this._log);
+            throw core_1.TransportErrors.secrets.secretNotFound("SynchronizationKey");
         }
         const baseKey = await this.loadSecret(DeviceSecretType.SharedSecretBaseKey);
         if (!baseKey || !(baseKey.secret instanceof crypto_1.CryptoSecretKey)) {
-            throw core_1.TransportErrors.secrets.secretNotFound("baseKey").logWith(this._log);
+            throw core_1.TransportErrors.secrets.secretNotFound("baseKey");
         }
         let identityPrivateKey;
         if (includeIdentityPrivateKey) {
             identityPrivateKey = await this.loadSecret(DeviceSecretType.IdentitySignature);
             if (!identityPrivateKey || !(identityPrivateKey.secret instanceof crypto_1.CryptoSignaturePrivateKey)) {
-                throw core_1.TransportErrors.secrets.secretNotFound("IdentityKey").logWith(this._log);
+                throw core_1.TransportErrors.secrets.secretNotFound("IdentityKey");
             }
         }
         const deviceSharedSecret = DeviceSharedSecret_1.DeviceSharedSecret.from({
@@ -4916,7 +4840,6 @@ class DeviceSecretController extends TransportController_1.TransportController {
             password: device.initialPassword,
             identity: this.parent.identity.identity
         });
-        // TODO: JSSNMSHDD-2474 (Rollback on error)
         return deviceSharedSecret;
     }
     async encryptDatawalletModificationPayload(event, index) {
@@ -4926,9 +4849,7 @@ class DeviceSecretController extends TransportController_1.TransportController {
         const serializedEvent = crypto_1.CoreBuffer.fromUtf8(JSON.stringify(event.payload));
         const privSync = await this.loadSecret(DeviceSecretType.IdentitySynchronizationMaster);
         if (!privSync || !(privSync.secret instanceof crypto_1.CryptoSecretKey)) {
-            throw core_1.TransportErrors.secrets
-                .secretNotFound(DeviceSecretType.IdentitySynchronizationMaster)
-                .logWith(this._log);
+            throw core_1.TransportErrors.secrets.secretNotFound(DeviceSecretType.IdentitySynchronizationMaster);
         }
         const encryptionKey = await core_1.CoreCrypto.deriveKeyFromBase(privSync.secret, index, "DataSync");
         const cipher = await core_1.CoreCrypto.encrypt(serializedEvent, encryptionKey);
@@ -4942,9 +4863,7 @@ class DeviceSecretController extends TransportController_1.TransportController {
         const payloadCipher = crypto_1.CryptoCipher.fromBase64(payloadCipherBase64);
         const privSync = await this.loadSecret(DeviceSecretType.IdentitySynchronizationMaster);
         if (!privSync || !(privSync.secret instanceof crypto_1.CryptoSecretKey)) {
-            throw core_1.TransportErrors.secrets
-                .secretNotFound(DeviceSecretType.IdentitySynchronizationMaster)
-                .logWith(this._log);
+            throw core_1.TransportErrors.secrets.secretNotFound(DeviceSecretType.IdentitySynchronizationMaster);
         }
         const decryptionKey = await core_1.CoreCrypto.deriveKeyFromBase(privSync.secret, index, "DataSync");
         const plaintext = await core_1.CoreCrypto.decrypt(payloadCipher, decryptionKey);
@@ -4954,15 +4873,37 @@ class DeviceSecretController extends TransportController_1.TransportController {
     }
     getBaseKey() {
         if (!this.baseKey) {
-            throw core_1.TransportErrors.general
-                .recordNotFound(crypto_1.CryptoSecretKey, DeviceSecretType.SharedSecretBaseKey)
-                .logWith(this._log);
+            throw core_1.TransportErrors.general.recordNotFound(crypto_1.CryptoSecretKey, DeviceSecretType.SharedSecretBaseKey);
         }
         return this.baseKey;
     }
 }
-exports.DeviceSecretController = DeviceSecretController;
 DeviceSecretController.secretContext = "DEVICE01";
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Device_1.Device, Number, Object]),
+    __metadata("design:returntype", Promise)
+], DeviceSecretController.prototype, "createDeviceSharedSecret", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [DatawalletModification_1.DatawalletModification, Number]),
+    __metadata("design:returntype", Promise)
+], DeviceSecretController.prototype, "encryptDatawalletModificationPayload", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Number]),
+    __metadata("design:returntype", Promise)
+], DeviceSecretController.prototype, "decryptDatawalletModificationPayload", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", crypto_1.CryptoSecretKey)
+], DeviceSecretController.prototype, "getBaseKey", null);
+exports.DeviceSecretController = DeviceSecretController;
 //# sourceMappingURL=DeviceSecretController.js.map
 
 /***/ }),
@@ -5470,12 +5411,22 @@ exports.DeviceSharedSecret = DeviceSharedSecret;
 /*!**********************************************!*\
   !*** ./dist/modules/files/FileController.js ***!
   \**********************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "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);
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.FileController = void 0;
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
 const DbCollectionName_1 = __webpack_require__(/*! ../../core/DbCollectionName */ "./dist/core/DbCollectionName.js");
@@ -5519,7 +5470,6 @@ class FileController extends TransportController_1.TransportController {
         if (ids.length < 1) {
             return [];
         }
-        // TODO: JSSNMSHDD-2820 (check for items that couldn't be fetched e.g. because it is expired)
         const resultItems = (await this.client.getFiles({ ids })).value;
         const promises = [];
         for await (const resultItem of resultItems) {
@@ -5530,7 +5480,7 @@ class FileController extends TransportController_1.TransportController {
     async updateCacheOfExistingFileInDb(id, response) {
         const fileDoc = await this.files.read(id);
         if (!fileDoc) {
-            throw core_1.TransportErrors.general.recordNotFound(File_1.File, id).logWith(this._log);
+            throw core_1.TransportErrors.general.recordNotFound(File_1.File, id);
         }
         const file = File_1.File.from(fileDoc);
         await this.updateCacheOfFile(file, response);
@@ -5552,9 +5502,8 @@ class FileController extends TransportController_1.TransportController {
         const plaintextMetadataBuffer = await core_1.CoreCrypto.decrypt(cipher, secretKey);
         const plaintextMetadata = FileMetadata_1.FileMetadata.deserialize(plaintextMetadataBuffer.toUtf8());
         if (!(plaintextMetadata instanceof FileMetadata_1.FileMetadata)) {
-            throw core_1.TransportErrors.files.invalidMetadata(response.id).logWith(this._log);
+            throw core_1.TransportErrors.files.invalidMetadata(response.id);
         }
-        // TODO: JSSNMSHDD-2486 (check signature)
         const cachedFile = CachedFile_1.CachedFile.fromBackbone(response, plaintextMetadata);
         return cachedFile;
     }
@@ -5585,7 +5534,7 @@ class FileController extends TransportController_1.TransportController {
         const id = idOrFile instanceof core_1.CoreId ? idOrFile.toString() : idOrFile.id.toString();
         const fileDoc = await this.files.read(id);
         if (!fileDoc) {
-            throw core_1.TransportErrors.general.recordNotFound(File_1.File, id.toString()).logWith(this._log);
+            throw core_1.TransportErrors.general.recordNotFound(File_1.File, id.toString());
         }
         const file = File_1.File.from(fileDoc);
         file.setMetadata(metadata);
@@ -5660,34 +5609,51 @@ class FileController extends TransportController_1.TransportController {
     async downloadFileContent(idOrFile) {
         const file = idOrFile instanceof File_1.File ? idOrFile : await this.getFile(idOrFile);
         if (!file) {
-            throw core_1.TransportErrors.general.recordNotFound(File_1.File, idOrFile.toString()).logWith(this._log);
+            throw core_1.TransportErrors.general.recordNotFound(File_1.File, idOrFile.toString());
         }
         if (!file.cache) {
-            throw core_1.TransportErrors.general.cacheEmpty(File_1.File, file.id.toString()).logWith(this._log);
+            throw core_1.TransportErrors.general.cacheEmpty(File_1.File, file.id.toString());
         }
         const downloadResponse = (await this.client.downloadFile(file.id.toString())).value;
         const buffer = crypto_1.CoreBuffer.fromObject(downloadResponse);
         const hash = await crypto_1.CryptoHash.hash(buffer, 2 /* CryptoHashAlgorithm.SHA512 */);
         const hashb64 = hash.toBase64URL();
         if (hashb64 !== file.cache.cipherHash.hash) {
-            throw core_1.TransportErrors.files.cipherMismatch().logWith(this._log);
-        }
-        /*
-        // TODO: JSSNMSHDD-2486 (verify owner signature)
-        const valid = await Crypto.verify(parcel.cipher.cipher, parcel.ownerSignature, owner.signing)
-        if (!valid) {
-            throw CoreErrors.General.SignatureNotValid("file").logWith(this._log)
+            throw core_1.TransportErrors.files.cipherMismatch();
         }
-        */
         const cipher = crypto_1.CryptoCipher.fromBase64(buffer.toBase64URL());
         const decrypt = await core_1.CoreCrypto.decrypt(cipher, file.cache.cipherKey);
         const plaintextHashesMatch = await file.cache.plaintextHash.verify(decrypt, 2 /* CryptoHashAlgorithm.SHA512 */);
         if (!plaintextHashesMatch) {
-            throw core_1.TransportErrors.files.plaintextHashMismatch().logWith(this._log);
+            throw core_1.TransportErrors.files.plaintextHashMismatch();
         }
         return decrypt;
     }
 }
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Object]),
+    __metadata("design:returntype", Promise)
+], FileController.prototype, "updateCacheOfExistingFileInDb", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, crypto_1.CryptoSecretKey]),
+    __metadata("design:returntype", Promise)
+], FileController.prototype, "decryptFile", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", Promise)
+], FileController.prototype, "setFileMetadata", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], FileController.prototype, "downloadFileContent", null);
 exports.FileController = FileController;
 //# sourceMappingURL=FileController.js.map
 
@@ -6258,9 +6224,9 @@ __exportStar(__webpack_require__(/*! ./messages/local/CachedMessage */ "./dist/m
 __exportStar(__webpack_require__(/*! ./messages/local/Message */ "./dist/modules/messages/local/Message.js"), exports);
 __exportStar(__webpack_require__(/*! ./messages/local/SendMessageParameters */ "./dist/modules/messages/local/SendMessageParameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./messages/MessageController */ "./dist/modules/messages/MessageController.js"), exports);
+__exportStar(__webpack_require__(/*! ./messages/transmission/MessageContentWrapper */ "./dist/modules/messages/transmission/MessageContentWrapper.js"), exports);
 __exportStar(__webpack_require__(/*! ./messages/transmission/MessageEnvelope */ "./dist/modules/messages/transmission/MessageEnvelope.js"), exports);
 __exportStar(__webpack_require__(/*! ./messages/transmission/MessageEnvelopeRecipient */ "./dist/modules/messages/transmission/MessageEnvelopeRecipient.js"), exports);
-__exportStar(__webpack_require__(/*! ./messages/transmission/MessagePlain */ "./dist/modules/messages/transmission/MessagePlain.js"), exports);
 __exportStar(__webpack_require__(/*! ./messages/transmission/MessageSignature */ "./dist/modules/messages/transmission/MessageSignature.js"), exports);
 __exportStar(__webpack_require__(/*! ./messages/transmission/MessageSigned */ "./dist/modules/messages/transmission/MessageSigned.js"), exports);
 __exportStar(__webpack_require__(/*! ./relationships/backbone/BackboneGetRelationships */ "./dist/modules/relationships/backbone/BackboneGetRelationships.js"), exports);
@@ -6279,10 +6245,10 @@ __exportStar(__webpack_require__(/*! ./relationships/transmission/changes/Relati
 __exportStar(__webpack_require__(/*! ./relationships/transmission/changes/RelationshipChangeType */ "./dist/modules/relationships/transmission/changes/RelationshipChangeType.js"), exports);
 __exportStar(__webpack_require__(/*! ./relationships/transmission/RelationshipStatus */ "./dist/modules/relationships/transmission/RelationshipStatus.js"), exports);
 __exportStar(__webpack_require__(/*! ./relationships/transmission/requests/RelationshipCreationChangeRequestCipher */ "./dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestCipher.js"), exports);
-__exportStar(__webpack_require__(/*! ./relationships/transmission/requests/RelationshipCreationChangeRequestContent */ "./dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestContent.js"), exports);
+__exportStar(__webpack_require__(/*! ./relationships/transmission/requests/RelationshipCreationChangeRequestContentWrapper */ "./dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestContentWrapper.js"), exports);
 __exportStar(__webpack_require__(/*! ./relationships/transmission/requests/RelationshipCreationChangeRequestSigned */ "./dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestSigned.js"), exports);
 __exportStar(__webpack_require__(/*! ./relationships/transmission/responses/RelationshipCreationChangeResponseCipher */ "./dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseCipher.js"), exports);
-__exportStar(__webpack_require__(/*! ./relationships/transmission/responses/RelationshipCreationChangeResponseContent */ "./dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseContent.js"), exports);
+__exportStar(__webpack_require__(/*! ./relationships/transmission/responses/RelationshipCreationChangeResponseContentWrapper */ "./dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseContentWrapper.js"), exports);
 __exportStar(__webpack_require__(/*! ./relationships/transmission/responses/RelationshipCreationChangeResponseSigned */ "./dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseSigned.js"), exports);
 __exportStar(__webpack_require__(/*! ./relationshipTemplates/backbone/BackboneGetRelationshipTemplates */ "./dist/modules/relationshipTemplates/backbone/BackboneGetRelationshipTemplates.js"), exports);
 __exportStar(__webpack_require__(/*! ./relationshipTemplates/backbone/BackbonePostRelationshipTemplates */ "./dist/modules/relationshipTemplates/backbone/BackbonePostRelationshipTemplates.js"), exports);
@@ -6291,7 +6257,7 @@ __exportStar(__webpack_require__(/*! ./relationshipTemplates/local/CachedRelatio
 __exportStar(__webpack_require__(/*! ./relationshipTemplates/local/RelationshipTemplate */ "./dist/modules/relationshipTemplates/local/RelationshipTemplate.js"), exports);
 __exportStar(__webpack_require__(/*! ./relationshipTemplates/local/SendRelationshipTemplateParameters */ "./dist/modules/relationshipTemplates/local/SendRelationshipTemplateParameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./relationshipTemplates/RelationshipTemplateController */ "./dist/modules/relationshipTemplates/RelationshipTemplateController.js"), exports);
-__exportStar(__webpack_require__(/*! ./relationshipTemplates/transmission/RelationshipTemplateContent */ "./dist/modules/relationshipTemplates/transmission/RelationshipTemplateContent.js"), exports);
+__exportStar(__webpack_require__(/*! ./relationshipTemplates/transmission/RelationshipTemplateContentWrapper */ "./dist/modules/relationshipTemplates/transmission/RelationshipTemplateContentWrapper.js"), exports);
 __exportStar(__webpack_require__(/*! ./relationshipTemplates/transmission/RelationshipTemplatePublicKey */ "./dist/modules/relationshipTemplates/transmission/RelationshipTemplatePublicKey.js"), exports);
 __exportStar(__webpack_require__(/*! ./relationshipTemplates/transmission/RelationshipTemplateReference */ "./dist/modules/relationshipTemplates/transmission/RelationshipTemplateReference.js"), exports);
 __exportStar(__webpack_require__(/*! ./relationshipTemplates/transmission/RelationshipTemplateSigned */ "./dist/modules/relationshipTemplates/transmission/RelationshipTemplateSigned.js"), exports);
@@ -6334,12 +6300,22 @@ __exportStar(__webpack_require__(/*! ./tokens/transmission/TokenReference */ "./
 /*!****************************************************!*\
   !*** ./dist/modules/messages/MessageController.js ***!
   \****************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "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);
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.MessageController = void 0;
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 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");
@@ -6353,9 +6329,9 @@ const MessageClient_1 = __webpack_require__(/*! ./backbone/MessageClient */ "./d
 const CachedMessage_1 = __webpack_require__(/*! ./local/CachedMessage */ "./dist/modules/messages/local/CachedMessage.js");
 const Message_1 = __webpack_require__(/*! ./local/Message */ "./dist/modules/messages/local/Message.js");
 const SendMessageParameters_1 = __webpack_require__(/*! ./local/SendMessageParameters */ "./dist/modules/messages/local/SendMessageParameters.js");
+const MessageContentWrapper_1 = __webpack_require__(/*! ./transmission/MessageContentWrapper */ "./dist/modules/messages/transmission/MessageContentWrapper.js");
 const MessageEnvelope_1 = __webpack_require__(/*! ./transmission/MessageEnvelope */ "./dist/modules/messages/transmission/MessageEnvelope.js");
 const MessageEnvelopeRecipient_1 = __webpack_require__(/*! ./transmission/MessageEnvelopeRecipient */ "./dist/modules/messages/transmission/MessageEnvelopeRecipient.js");
-const MessagePlain_1 = __webpack_require__(/*! ./transmission/MessagePlain */ "./dist/modules/messages/transmission/MessagePlain.js");
 const MessageSignature_1 = __webpack_require__(/*! ./transmission/MessageSignature */ "./dist/modules/messages/transmission/MessageSignature.js");
 const MessageSigned_1 = __webpack_require__(/*! ./transmission/MessageSigned */ "./dist/modules/messages/transmission/MessageSigned.js");
 class MessageController extends TransportController_1.TransportController {
@@ -6385,7 +6361,7 @@ class MessageController extends TransportController_1.TransportController {
     async getMessagesByAddress(address) {
         const relationship = await this.parent.relationships.getActiveRelationshipToIdentity(address);
         if (!relationship) {
-            throw core_1.TransportErrors.messages.noMatchingRelationship(address.toString()).logWith(this._log);
+            throw core_1.TransportErrors.messages.noMatchingRelationship(address.toString());
         }
         return await this.getMessagesByRelationshipId(relationship.id);
     }
@@ -6425,7 +6401,7 @@ class MessageController extends TransportController_1.TransportController {
     async updateCacheOfExistingMessageInDb(id, response) {
         const messageDoc = await this.messages.read(id);
         if (!messageDoc) {
-            throw core_1.TransportErrors.general.recordNotFound(Message_1.Message, id).logWith(this._log);
+            throw core_1.TransportErrors.general.recordNotFound(Message_1.Message, id);
         }
         const message = Message_1.Message.from(messageDoc);
         await this.updateCacheOfMessage(message, response);
@@ -6447,7 +6423,7 @@ class MessageController extends TransportController_1.TransportController {
         const envelope = this.getEnvelopeFromBackboneGetMessagesResponse(response);
         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);
+            throw core_1.TransportErrors.general.recordNotFound(Relationship_1.Relationship, envelope.id.toString());
         }
         const message = Message_1.Message.from({
             id: envelope.id,
@@ -6485,7 +6461,7 @@ class MessageController extends TransportController_1.TransportController {
         const id = idOrMessage instanceof core_1.CoreId ? idOrMessage.toString() : idOrMessage.id.toString();
         const messageDoc = await this.messages.read(id);
         if (!messageDoc) {
-            throw core_1.TransportErrors.general.recordNotFound(Message_1.Message, id.toString()).logWith(this._log);
+            throw core_1.TransportErrors.general.recordNotFound(Message_1.Message, id.toString());
         }
         const message = Message_1.Message.from(messageDoc);
         message.setMetadata(metadata);
@@ -6503,7 +6479,7 @@ class MessageController extends TransportController_1.TransportController {
         for (const recipient of parameters.recipients) {
             const relationship = await this.relationships.getActiveRelationshipToIdentity(core_1.CoreAddress.from(recipient));
             if (!relationship) {
-                throw core_1.TransportErrors.general.recordNotFound(Relationship_1.Relationship, recipient.toString()).logWith(this._log);
+                throw core_1.TransportErrors.general.recordNotFound(Relationship_1.Relationship, recipient.toString());
             }
             const cipherForRecipient = await this.secrets.encrypt(relationship.relationshipSecretId, serializedSecret);
             envelopeRecipients.push(MessageEnvelopeRecipient_1.MessageEnvelopeRecipient.from({
@@ -6519,7 +6495,7 @@ class MessageController extends TransportController_1.TransportController {
             fileReferences.push(file.toFileReference());
             publicAttachmentArray.push(file.id);
         }
-        const plaintext = MessagePlain_1.MessagePlain.from({
+        const plaintext = MessageContentWrapper_1.MessageContentWrapper.from({
             content: parameters.content,
             recipients: addressArray,
             createdAt: core_1.CoreDate.utc(),
@@ -6532,7 +6508,7 @@ class MessageController extends TransportController_1.TransportController {
         for (const recipient of parameters.recipients) {
             const relationship = await this.relationships.getActiveRelationshipToIdentity(core_1.CoreAddress.from(recipient));
             if (!relationship) {
-                throw core_1.TransportErrors.general.recordNotFound(Relationship_1.Relationship, recipient.toString()).logWith(this._log);
+                throw core_1.TransportErrors.general.recordNotFound(Relationship_1.Relationship, recipient.toString());
             }
             const signature = await this.secrets.sign(relationship.relationshipSecretId, plaintextBuffer);
             const messageSignature = MessageSignature_1.MessageSignature.from({
@@ -6589,14 +6565,14 @@ class MessageController extends TransportController_1.TransportController {
         this.log.trace(`Decrypting own envelope with id ${envelope.id.toString()}...`);
         const plaintextMessageBuffer = await core_1.CoreCrypto.decrypt(envelope.cipher, secretKey);
         const signedMessage = MessageSigned_1.MessageSigned.deserialize(plaintextMessageBuffer.toUtf8());
-        const messagePlain = MessagePlain_1.MessagePlain.from(JSON.parse(signedMessage.message));
+        const messagePlain = MessageContentWrapper_1.MessageContentWrapper.from(JSON.parse(signedMessage.message));
         return messagePlain;
     }
     async decryptPeerEnvelope(envelope, relationship) {
         var _a, _b;
         const ownKeyCipher = (_a = envelope.recipients.find((r) => this.parent.identity.isMe(r.address))) === null || _a === void 0 ? void 0 : _a.encryptedKey;
         if (!ownKeyCipher) {
-            throw core_1.TransportErrors.messages.ownAddressNotInList(envelope.id.toString()).logWith(this._log);
+            throw core_1.TransportErrors.messages.ownAddressNotInList(envelope.id.toString());
         }
         const plaintextKeyBuffer = await this.secrets.decryptPeer(relationship.relationshipSecretId, ownKeyCipher, true);
         const plaintextKey = crypto_1.CryptoSecretKey.deserialize(plaintextKeyBuffer.toUtf8());
@@ -6604,16 +6580,16 @@ class MessageController extends TransportController_1.TransportController {
         const signedMessage = MessageSigned_1.MessageSigned.deserialize(plaintextMessageBuffer.toUtf8());
         const signature = (_b = signedMessage.signatures.find((s) => this.parent.identity.isMe(s.recipient))) === null || _b === void 0 ? void 0 : _b.signature;
         if (!signature) {
-            throw core_1.TransportErrors.messages.signatureListMismatch(envelope.id.toString()).logWith(this._log);
+            throw core_1.TransportErrors.messages.signatureListMismatch(envelope.id.toString());
         }
-        const messagePlain = MessagePlain_1.MessagePlain.from(JSON.parse(signedMessage.message));
+        const messagePlain = MessageContentWrapper_1.MessageContentWrapper.from(JSON.parse(signedMessage.message));
         if (signedMessage.signatures.length !== messagePlain.recipients.length) {
             this.log.debug(`Number of signatures does not match number of recipients from envelope ${envelope.id}.`);
         }
         const plainMessageBuffer = crypto_1.CoreBuffer.fromUtf8(signedMessage.message);
         const validSignature = await this.secrets.verifyPeer(relationship.relationshipSecretId, plainMessageBuffer, signature);
         if (!validSignature) {
-            throw core_1.TransportErrors.messages.signatureNotValid().logWith(this._log);
+            throw core_1.TransportErrors.messages.signatureNotValid();
         }
         if (messagePlain.recipients.length !== envelope.recipients.length) {
             this.log.debug(`Number of signed recipients within the message does not match number of recipients from envelope ${envelope.id}.`);
@@ -6623,7 +6599,7 @@ class MessageController extends TransportController_1.TransportController {
         }
         const recipientFound = messagePlain.recipients.some((r) => this.parent.identity.isMe(r));
         if (!recipientFound) {
-            throw core_1.TransportErrors.messages.plaintextMismatch(envelope.id.toString()).logWith(this._log);
+            throw core_1.TransportErrors.messages.plaintextMismatch(envelope.id.toString());
         }
         return [messagePlain, plaintextKey];
     }
@@ -6634,7 +6610,7 @@ class MessageController extends TransportController_1.TransportController {
         let relationship;
         if (this.parent.identity.isMe(envelope.createdBy)) {
             if (!secretKey) {
-                throw core_1.TransportErrors.messages.noSecretKeyForOwnMessage(envelope.id.toString()).logWith(this._log);
+                throw new Error(`The own message (${envelope.id.toString()}) could not be decrypted, because no secret key was passed for it.`);
             }
             messageKey = secretKey;
             plainMessage = await this.decryptOwnEnvelope(envelope, secretKey);
@@ -6642,7 +6618,7 @@ class MessageController extends TransportController_1.TransportController {
         else {
             relationship = await this.relationships.getActiveRelationshipToIdentity(envelope.createdBy);
             if (!relationship) {
-                throw core_1.TransportErrors.messages.noMatchingRelationship(envelope.createdBy.toString()).logWith(this._log);
+                throw core_1.TransportErrors.messages.noMatchingRelationship(envelope.createdBy.toString());
             }
             const [peerMessage, peerKey] = await this.decryptPeerEnvelope(envelope, relationship);
             plainMessage = peerMessage;
@@ -6669,6 +6645,50 @@ class MessageController extends TransportController_1.TransportController {
         return [cachedMessage, messageKey, relationship];
     }
 }
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.CoreAddress]),
+    __metadata("design:returntype", Promise)
+], MessageController.prototype, "getMessagesByAddress", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Object]),
+    __metadata("design:returntype", Promise)
+], MessageController.prototype, "updateCacheOfExistingMessageInDb", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.CoreId]),
+    __metadata("design:returntype", Promise)
+], MessageController.prototype, "loadPeerMessage", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", Promise)
+], MessageController.prototype, "setMessageMetadata", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], MessageController.prototype, "sendMessage", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [MessageEnvelope_1.MessageEnvelope,
+        Relationship_1.Relationship]),
+    __metadata("design:returntype", Promise)
+], MessageController.prototype, "decryptPeerEnvelope", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [MessageEnvelope_1.MessageEnvelope,
+        crypto_1.CryptoSecretKey]),
+    __metadata("design:returntype", Promise)
+], MessageController.prototype, "decryptMessage", null);
 exports.MessageController = MessageController;
 //# sourceMappingURL=MessageController.js.map
 
@@ -6955,6 +6975,83 @@ exports.SendMessageParameters = SendMessageParameters;
 
 /***/ }),
 
+/***/ "./dist/modules/messages/transmission/MessageContentWrapper.js":
+/*!*********************************************************************!*\
+  !*** ./dist/modules/messages/transmission/MessageContentWrapper.js ***!
+  \*********************************************************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"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);
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.MessageContentWrapper = void 0;
+const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
+const core_1 = __webpack_require__(/*! ../../../core */ "./dist/core/index.js");
+const CoreAddress_1 = __webpack_require__(/*! ../../../core/types/CoreAddress */ "./dist/core/types/CoreAddress.js");
+const CoreDate_1 = __webpack_require__(/*! ../../../core/types/CoreDate */ "./dist/core/types/CoreDate.js");
+const FileReference_1 = __webpack_require__(/*! ../../files/transmission/FileReference */ "./dist/modules/files/transmission/FileReference.js");
+/**
+ * MessageContentWrapper is a container for the actual message as [[IMessage]], its creationDate and
+ * the list of recipients as [[IAddress]]. This container instance is then digitally signed
+ * by the sender via an [[MessageSigned]] object.
+ *
+ * Insofar, the sender digitally signs the date of creation of this message (which could act as a
+ * legal proof). Additionally, all recipients can - and must - check if they are addressed by
+ * the sender. If a recipient is not in the signed list of recipients, the message needs to be
+ * ignored (as the whole message could have been forwarded by bad party to a wrong recipient).
+ */
+let MessageContentWrapper = class MessageContentWrapper extends core_1.CoreSerializable {
+    constructor() {
+        super(...arguments);
+        this.attachments = [];
+    }
+    static preFrom(value) {
+        if (typeof value.attachments === "undefined") {
+            value.attachments = [];
+        }
+        return value;
+    }
+    static from(value) {
+        return this.fromAny(value);
+    }
+};
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)({ type: FileReference_1.FileReference }),
+    __metadata("design:type", Array)
+], MessageContentWrapper.prototype, "attachments", void 0);
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", ts_serval_1.Serializable)
+], MessageContentWrapper.prototype, "content", void 0);
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", CoreDate_1.CoreDate)
+], MessageContentWrapper.prototype, "createdAt", void 0);
+__decorate([
+    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.serialize)({ type: CoreAddress_1.CoreAddress }),
+    __metadata("design:type", Array)
+], MessageContentWrapper.prototype, "recipients", void 0);
+MessageContentWrapper = __decorate([
+    (0, ts_serval_1.type)("MessageContentWrapper")
+], MessageContentWrapper);
+exports.MessageContentWrapper = MessageContentWrapper;
+//# sourceMappingURL=MessageContentWrapper.js.map
+
+/***/ }),
+
 /***/ "./dist/modules/messages/transmission/MessageEnvelope.js":
 /*!***************************************************************!*\
   !*** ./dist/modules/messages/transmission/MessageEnvelope.js ***!
@@ -7101,83 +7198,6 @@ exports.MessageEnvelopeRecipient = MessageEnvelopeRecipient;
 
 /***/ }),
 
-/***/ "./dist/modules/messages/transmission/MessagePlain.js":
-/*!************************************************************!*\
-  !*** ./dist/modules/messages/transmission/MessagePlain.js ***!
-  \************************************************************/
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
-
-"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);
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.MessagePlain = void 0;
-const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
-const core_1 = __webpack_require__(/*! ../../../core */ "./dist/core/index.js");
-const CoreAddress_1 = __webpack_require__(/*! ../../../core/types/CoreAddress */ "./dist/core/types/CoreAddress.js");
-const CoreDate_1 = __webpack_require__(/*! ../../../core/types/CoreDate */ "./dist/core/types/CoreDate.js");
-const FileReference_1 = __webpack_require__(/*! ../../files/transmission/FileReference */ "./dist/modules/files/transmission/FileReference.js");
-/**
- * MessagePlain is a container for the actual message as [[IMessage]], its creationDate and
- * the list of recipients as [[IAddress]]. This container instance is then digitally signed
- * by the sender via an [[MessageSigned]] object.
- *
- * Insofar, the sender digitally signs the date of creation of this message (which could act as a
- * legal proof). Additionally, all recipients can - and must - check if they are addressed by
- * the sender. If a recipient is not in the signed list of recipients, the message needs to be
- * ignored (as the whole message could have been forwarded by bad party to a wrong recipient).
- */
-let MessagePlain = class MessagePlain extends core_1.CoreSerializable {
-    constructor() {
-        super(...arguments);
-        this.attachments = [];
-    }
-    static preFrom(value) {
-        if (typeof value.attachments === "undefined") {
-            value.attachments = [];
-        }
-        return value;
-    }
-    static from(value) {
-        return this.fromAny(value);
-    }
-};
-__decorate([
-    (0, ts_serval_1.validate)(),
-    (0, ts_serval_1.serialize)({ type: FileReference_1.FileReference }),
-    __metadata("design:type", Array)
-], MessagePlain.prototype, "attachments", void 0);
-__decorate([
-    (0, ts_serval_1.validate)(),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", ts_serval_1.Serializable)
-], MessagePlain.prototype, "content", void 0);
-__decorate([
-    (0, ts_serval_1.validate)(),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", CoreDate_1.CoreDate)
-], MessagePlain.prototype, "createdAt", void 0);
-__decorate([
-    (0, ts_serval_1.validate)(),
-    (0, ts_serval_1.serialize)({ type: CoreAddress_1.CoreAddress }),
-    __metadata("design:type", Array)
-], MessagePlain.prototype, "recipients", void 0);
-MessagePlain = __decorate([
-    (0, ts_serval_1.type)("MessagePlain")
-], MessagePlain);
-exports.MessagePlain = MessagePlain;
-//# sourceMappingURL=MessagePlain.js.map
-
-/***/ }),
-
 /***/ "./dist/modules/messages/transmission/MessageSignature.js":
 /*!****************************************************************!*\
   !*** ./dist/modules/messages/transmission/MessageSignature.js ***!
@@ -7275,12 +7295,22 @@ exports.MessageSigned = MessageSigned;
 /*!******************************************************************************!*\
   !*** ./dist/modules/relationshipTemplates/RelationshipTemplateController.js ***!
   \******************************************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "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);
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RelationshipTemplateController = void 0;
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
 const DbCollectionName_1 = __webpack_require__(/*! ../../core/DbCollectionName */ "./dist/core/DbCollectionName.js");
@@ -7290,7 +7320,7 @@ const RelationshipTemplateClient_1 = __webpack_require__(/*! ./backbone/Relation
 const CachedRelationshipTemplate_1 = __webpack_require__(/*! ./local/CachedRelationshipTemplate */ "./dist/modules/relationshipTemplates/local/CachedRelationshipTemplate.js");
 const RelationshipTemplate_1 = __webpack_require__(/*! ./local/RelationshipTemplate */ "./dist/modules/relationshipTemplates/local/RelationshipTemplate.js");
 const SendRelationshipTemplateParameters_1 = __webpack_require__(/*! ./local/SendRelationshipTemplateParameters */ "./dist/modules/relationshipTemplates/local/SendRelationshipTemplateParameters.js");
-const RelationshipTemplateContent_1 = __webpack_require__(/*! ./transmission/RelationshipTemplateContent */ "./dist/modules/relationshipTemplates/transmission/RelationshipTemplateContent.js");
+const RelationshipTemplateContentWrapper_1 = __webpack_require__(/*! ./transmission/RelationshipTemplateContentWrapper */ "./dist/modules/relationshipTemplates/transmission/RelationshipTemplateContentWrapper.js");
 const RelationshipTemplateReference_1 = __webpack_require__(/*! ./transmission/RelationshipTemplateReference */ "./dist/modules/relationshipTemplates/transmission/RelationshipTemplateReference.js");
 const RelationshipTemplateSigned_1 = __webpack_require__(/*! ./transmission/RelationshipTemplateSigned */ "./dist/modules/relationshipTemplates/transmission/RelationshipTemplateSigned.js");
 class RelationshipTemplateController extends TransportController_1.TransportController {
@@ -7306,11 +7336,8 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
     }
     async sendRelationshipTemplate(parameters) {
         parameters = SendRelationshipTemplateParameters_1.SendRelationshipTemplateParameters.from(parameters);
-        if (parameters.maxNumberOfRelationships) {
-            this.log.warn("`maxNumberOfRelationships` is deprecated and will be removed in the future. Please use `maxNumberOfAllocations` instead.");
-        }
         const templateKey = await this.secrets.createTemplateKey();
-        const templateContent = RelationshipTemplateContent_1.RelationshipTemplateContent.from({
+        const templateContent = RelationshipTemplateContentWrapper_1.RelationshipTemplateContentWrapper.from({
             content: parameters.content,
             identity: this.parent.identity.identity,
             templateKey: templateKey
@@ -7328,7 +7355,6 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
         const backboneResponse = (await this.client.createRelationshipTemplate({
             expiresAt: parameters.expiresAt.toString(),
             maxNumberOfAllocations: parameters.maxNumberOfAllocations,
-            maxNumberOfRelationships: parameters.maxNumberOfRelationships,
             content: cipher.toBase64()
         })).value;
         const templateCache = CachedRelationshipTemplate_1.CachedRelationshipTemplate.from({
@@ -7339,7 +7365,6 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
             expiresAt: parameters.expiresAt,
             identity: this.parent.identity.identity,
             maxNumberOfAllocations: parameters.maxNumberOfAllocations,
-            maxNumberOfRelationships: parameters.maxNumberOfRelationships,
             templateKey: templateKey
         });
         const template = RelationshipTemplate_1.RelationshipTemplate.from({
@@ -7364,7 +7389,6 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
         if (ids.length < 1) {
             return [];
         }
-        // TODO: JSSNMSHDD-2820 (check for items that couldn't be fetched e.g. because it is expired)
         const resultItems = (await this.client.getRelationshipTemplates({ ids })).value;
         const promises = [];
         for await (const resultItem of resultItems) {
@@ -7386,7 +7410,7 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
     async updateCacheOfExistingTemplateInDb(id, response) {
         const templateDoc = await this.templates.read(id);
         if (!templateDoc) {
-            throw core_1.TransportErrors.general.recordNotFound(RelationshipTemplate_1.RelationshipTemplate, id).logWith(this._log);
+            throw core_1.TransportErrors.general.recordNotFound(RelationshipTemplate_1.RelationshipTemplate, id);
         }
         const template = RelationshipTemplate_1.RelationshipTemplate.from(templateDoc);
         await this.updateCacheOfTemplate(template, response);
@@ -7403,14 +7427,14 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
         template.isOwn = this.parent.identity.isMe(cachedTemplate.createdBy);
     }
     async decryptRelationshipTemplate(response, secretKey) {
-        var _a, _b;
+        var _a;
         const cipher = crypto_1.CryptoCipher.fromBase64(response.content);
         const signedTemplateBuffer = await this.secrets.decryptTemplate(cipher, secretKey);
         const signedTemplate = RelationshipTemplateSigned_1.RelationshipTemplateSigned.deserialize(signedTemplateBuffer.toUtf8());
-        const templateContent = RelationshipTemplateContent_1.RelationshipTemplateContent.deserialize(signedTemplate.serializedTemplate);
+        const templateContent = RelationshipTemplateContentWrapper_1.RelationshipTemplateContentWrapper.deserialize(signedTemplate.serializedTemplate);
         const templateSignatureValid = await this.secrets.verifyTemplate(crypto_1.CoreBuffer.fromUtf8(signedTemplate.serializedTemplate), signedTemplate.deviceSignature, templateContent.identity.publicKey);
         if (!templateSignatureValid) {
-            throw core_1.TransportErrors.general.signatureNotValid("template").logWith(this._log);
+            throw core_1.TransportErrors.general.signatureNotValid("template");
         }
         const cachedTemplate = CachedRelationshipTemplate_1.CachedRelationshipTemplate.from({
             content: templateContent.content,
@@ -7420,7 +7444,6 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
             expiresAt: response.expiresAt ? core_1.CoreDate.from(response.expiresAt) : undefined,
             identity: templateContent.identity,
             maxNumberOfAllocations: (_a = response.maxNumberOfAllocations) !== null && _a !== void 0 ? _a : undefined,
-            maxNumberOfRelationships: (_b = response.maxNumberOfRelationships) !== null && _b !== void 0 ? _b : undefined,
             templateKey: templateContent.templateKey
         });
         return cachedTemplate;
@@ -7436,7 +7459,7 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
         const id = idOrTemplate instanceof core_1.CoreId ? idOrTemplate.toString() : idOrTemplate.id.toString();
         const templateDoc = await this.templates.read(id);
         if (!templateDoc) {
-            throw core_1.TransportErrors.general.recordNotFound(RelationshipTemplate_1.RelationshipTemplate, id.toString()).logWith(this._log);
+            throw core_1.TransportErrors.general.recordNotFound(RelationshipTemplate_1.RelationshipTemplate, id.toString());
         }
         const template = RelationshipTemplate_1.RelationshipTemplate.from(templateDoc);
         template.setMetadata(metadata);
@@ -7468,6 +7491,24 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
         return relationshipTemplate;
     }
 }
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Object]),
+    __metadata("design:returntype", Promise)
+], RelationshipTemplateController.prototype, "updateCacheOfExistingTemplateInDb", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, crypto_1.CryptoSecretKey]),
+    __metadata("design:returntype", Promise)
+], RelationshipTemplateController.prototype, "decryptRelationshipTemplate", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", Promise)
+], RelationshipTemplateController.prototype, "setRelationshipTemplateMetadata", null);
 exports.RelationshipTemplateController = RelationshipTemplateController;
 //# sourceMappingURL=RelationshipTemplateController.js.map
 
@@ -7547,7 +7588,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.validateMaxNumberOfAllocations = exports.validateMaxNumberOfRelationships = exports.CachedRelationshipTemplate = void 0;
+exports.validateMaxNumberOfAllocations = exports.CachedRelationshipTemplate = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const core_1 = __webpack_require__(/*! ../../../core */ "./dist/core/index.js");
 const CoreId_1 = __webpack_require__(/*! ../../../core/types/CoreId */ "./dist/core/types/CoreId.js");
@@ -7598,24 +7639,10 @@ __decorate([
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", Number)
 ], CachedRelationshipTemplate.prototype, "maxNumberOfAllocations", void 0);
-__decorate([
-    (0, ts_serval_1.validate)({ nullable: true, customValidator: validateMaxNumberOfRelationships }),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", Number)
-], CachedRelationshipTemplate.prototype, "maxNumberOfRelationships", void 0);
 CachedRelationshipTemplate = __decorate([
     (0, ts_serval_1.type)("CachedRelationshipTemplate")
 ], CachedRelationshipTemplate);
 exports.CachedRelationshipTemplate = CachedRelationshipTemplate;
-function validateMaxNumberOfRelationships(value) {
-    if (value === undefined)
-        return;
-    if (value <= 0) {
-        return "maxNumberOfRelationships must be greater than 0";
-    }
-    return;
-}
-exports.validateMaxNumberOfRelationships = validateMaxNumberOfRelationships;
 function validateMaxNumberOfAllocations(value) {
     if (value === undefined)
         return;
@@ -7745,22 +7772,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var SendRelationshipTemplateParameters_1;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SendRelationshipTemplateParameters = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
-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 CachedRelationshipTemplate_1 = __webpack_require__(/*! ./CachedRelationshipTemplate */ "./dist/modules/relationshipTemplates/local/CachedRelationshipTemplate.js");
-let SendRelationshipTemplateParameters = SendRelationshipTemplateParameters_1 = class SendRelationshipTemplateParameters extends core_1.CoreSerializable {
-    static postFrom(value) {
-        if (!(value instanceof SendRelationshipTemplateParameters_1))
-            throw new Error("this should never happen");
-        if (value.maxNumberOfAllocations && value.maxNumberOfRelationships) {
-            throw new ts_serval_1.ValidationError(SendRelationshipTemplateParameters_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.maxNumberOfAllocations), `You cannot specify both ${(0, ts_simple_nameof_1.nameof)((x) => x.maxNumberOfAllocations)} and ${(0, ts_simple_nameof_1.nameof)((x) => x.maxNumberOfRelationships)}.`);
-        }
-        return value;
-    }
+let SendRelationshipTemplateParameters = class SendRelationshipTemplateParameters extends core_1.CoreSerializable {
     static from(value) {
         return this.fromAny(value);
     }
@@ -7780,12 +7797,7 @@ __decorate([
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", Number)
 ], SendRelationshipTemplateParameters.prototype, "maxNumberOfAllocations", void 0);
-__decorate([
-    (0, ts_serval_1.validate)({ nullable: true, customValidator: CachedRelationshipTemplate_1.validateMaxNumberOfRelationships }),
-    (0, ts_serval_1.serialize)(),
-    __metadata("design:type", Number)
-], SendRelationshipTemplateParameters.prototype, "maxNumberOfRelationships", void 0);
-SendRelationshipTemplateParameters = SendRelationshipTemplateParameters_1 = __decorate([
+SendRelationshipTemplateParameters = __decorate([
     (0, ts_serval_1.type)("SendRelationshipTemplateParameters")
 ], SendRelationshipTemplateParameters);
 exports.SendRelationshipTemplateParameters = SendRelationshipTemplateParameters;
@@ -7793,10 +7805,10 @@ exports.SendRelationshipTemplateParameters = SendRelationshipTemplateParameters;
 
 /***/ }),
 
-/***/ "./dist/modules/relationshipTemplates/transmission/RelationshipTemplateContent.js":
-/*!****************************************************************************************!*\
-  !*** ./dist/modules/relationshipTemplates/transmission/RelationshipTemplateContent.js ***!
-  \****************************************************************************************/
+/***/ "./dist/modules/relationshipTemplates/transmission/RelationshipTemplateContentWrapper.js":
+/*!***********************************************************************************************!*\
+  !*** ./dist/modules/relationshipTemplates/transmission/RelationshipTemplateContentWrapper.js ***!
+  \***********************************************************************************************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -7811,12 +7823,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.RelationshipTemplateContent = void 0;
+exports.RelationshipTemplateContentWrapper = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const core_1 = __webpack_require__(/*! ../../../core */ "./dist/core/index.js");
 const Identity_1 = __webpack_require__(/*! ../../accounts/data/Identity */ "./dist/modules/accounts/data/Identity.js");
 const RelationshipTemplatePublicKey_1 = __webpack_require__(/*! ./RelationshipTemplatePublicKey */ "./dist/modules/relationshipTemplates/transmission/RelationshipTemplatePublicKey.js");
-let RelationshipTemplateContent = class RelationshipTemplateContent extends core_1.CoreSerializable {
+let RelationshipTemplateContentWrapper = class RelationshipTemplateContentWrapper extends core_1.CoreSerializable {
     static from(value) {
         return this.fromAny(value);
     }
@@ -7825,22 +7837,22 @@ __decorate([
     (0, ts_serval_1.validate)(),
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", Identity_1.Identity)
-], RelationshipTemplateContent.prototype, "identity", void 0);
+], RelationshipTemplateContentWrapper.prototype, "identity", void 0);
 __decorate([
     (0, ts_serval_1.validate)(),
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", RelationshipTemplatePublicKey_1.RelationshipTemplatePublicKey)
-], RelationshipTemplateContent.prototype, "templateKey", void 0);
+], RelationshipTemplateContentWrapper.prototype, "templateKey", void 0);
 __decorate([
     (0, ts_serval_1.validate)(),
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", ts_serval_1.Serializable)
-], RelationshipTemplateContent.prototype, "content", void 0);
-RelationshipTemplateContent = __decorate([
-    (0, ts_serval_1.type)("RelationshipTemplateContent")
-], RelationshipTemplateContent);
-exports.RelationshipTemplateContent = RelationshipTemplateContent;
-//# sourceMappingURL=RelationshipTemplateContent.js.map
+], RelationshipTemplateContentWrapper.prototype, "content", void 0);
+RelationshipTemplateContentWrapper = __decorate([
+    (0, ts_serval_1.type)("RelationshipTemplateContentWrapper")
+], RelationshipTemplateContentWrapper);
+exports.RelationshipTemplateContentWrapper = RelationshipTemplateContentWrapper;
+//# sourceMappingURL=RelationshipTemplateContentWrapper.js.map
 
 /***/ }),
 
@@ -7990,17 +8002,28 @@ exports.RelationshipTemplateSigned = RelationshipTemplateSigned;
 /*!********************************************************************!*\
   !*** ./dist/modules/relationships/RelationshipSecretController.js ***!
   \********************************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "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);
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RelationshipSecretController = void 0;
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
 const CoreUtil_1 = __webpack_require__(/*! ../../core/CoreUtil */ "./dist/core/CoreUtil.js");
 const TransportErrors_1 = __webpack_require__(/*! ../../core/TransportErrors */ "./dist/core/TransportErrors.js");
 const TransportIds_1 = __webpack_require__(/*! ../../core/TransportIds */ "./dist/core/TransportIds.js");
+const CachedRelationshipTemplate_1 = __webpack_require__(/*! ../relationshipTemplates/local/CachedRelationshipTemplate */ "./dist/modules/relationshipTemplates/local/CachedRelationshipTemplate.js");
 const RelationshipTemplatePublicKey_1 = __webpack_require__(/*! ../relationshipTemplates/transmission/RelationshipTemplatePublicKey */ "./dist/modules/relationshipTemplates/transmission/RelationshipTemplatePublicKey.js");
 const SecretController_1 = __webpack_require__(/*! ../secrets/SecretController */ "./dist/modules/secrets/SecretController.js");
 class RelationshipSecretController extends SecretController_1.SecretController {
@@ -8016,13 +8039,11 @@ class RelationshipSecretController extends SecretController_1.SecretController {
         }
         const secretContainer = await this.loadActiveSecretByName(secretIdAsString);
         if (!secretContainer) {
-            throw TransportErrors_1.TransportErrors.general
-                .recordNotFound("CryptoRelationshipRequestSecrets | CryptoRelationshipSecrets", secretIdAsString)
-                .logWith(this._log);
+            throw TransportErrors_1.TransportErrors.general.recordNotFound("CryptoRelationshipRequestSecrets | CryptoRelationshipSecrets", secretIdAsString);
         }
         if (!(secretContainer.secret instanceof crypto_1.CryptoRelationshipRequestSecrets) &&
             !(secretContainer.secret instanceof crypto_1.CryptoRelationshipSecrets)) {
-            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(secretIdAsString).logWith(this._log);
+            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(secretIdAsString);
         }
         const secret = secretContainer.secret;
         this.cache.set(relationshipSecretId, secret);
@@ -8038,10 +8059,10 @@ class RelationshipSecretController extends SecretController_1.SecretController {
         const templateKeyId = template.templateKey.id.toString();
         const exchangeKeypairContainer = await this.loadActiveSecretByName(templateKeyId);
         if (!exchangeKeypairContainer) {
-            throw TransportErrors_1.TransportErrors.general.recordNotFound(crypto_1.CryptoExchangeKeypair, templateKeyId).logWith(this._log);
+            throw TransportErrors_1.TransportErrors.general.recordNotFound(crypto_1.CryptoExchangeKeypair, templateKeyId);
         }
         if (!(exchangeKeypairContainer.secret instanceof crypto_1.CryptoExchangeKeypair)) {
-            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(templateKeyId).logWith(this._log);
+            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(templateKeyId);
         }
         const exchangeKeypair = exchangeKeypairContainer.secret;
         const secrets = await crypto_1.CryptoRelationshipSecrets.fromRelationshipRequest(publicRequestCrypto, exchangeKeypair);
@@ -8051,12 +8072,10 @@ class RelationshipSecretController extends SecretController_1.SecretController {
     async getPublicResponse(relationshipSecretId) {
         const secret = await this.loadActiveSecretByName(relationshipSecretId.toString());
         if (!secret) {
-            throw TransportErrors_1.TransportErrors.general
-                .recordNotFound(crypto_1.CryptoRelationshipSecrets, relationshipSecretId.toString())
-                .logWith(this._log);
+            throw TransportErrors_1.TransportErrors.general.recordNotFound(crypto_1.CryptoRelationshipSecrets, relationshipSecretId.toString());
         }
         if (!(secret.secret instanceof crypto_1.CryptoRelationshipSecrets)) {
-            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(secret.id.toString()).logWith(this._log);
+            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(secret.id.toString());
         }
         const publicResponse = secret.secret.toPublicResponse();
         return publicResponse;
@@ -8064,7 +8083,7 @@ class RelationshipSecretController extends SecretController_1.SecretController {
     async convertSecrets(relationshipSecretId, response) {
         const request = await this.getSecret(relationshipSecretId);
         if (request instanceof crypto_1.CryptoRelationshipSecrets) {
-            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType().logWith(this._log);
+            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType();
         }
         const secrets = await crypto_1.CryptoRelationshipSecrets.fromRelationshipResponse(response, request);
         const container = await this.succeedSecretWithName(secrets, relationshipSecretId.toString());
@@ -8089,7 +8108,7 @@ class RelationshipSecretController extends SecretController_1.SecretController {
         const buffer = CoreUtil_1.CoreUtil.toBuffer(content);
         const secrets = await this.getSecret(relationshipSecretId);
         if (!(secrets instanceof crypto_1.CryptoRelationshipRequestSecrets)) {
-            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(secrets.id).logWith(this._log);
+            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(secrets.id);
         }
         return await secrets.encryptRequest(buffer);
     }
@@ -8097,14 +8116,14 @@ class RelationshipSecretController extends SecretController_1.SecretController {
         const buffer = CoreUtil_1.CoreUtil.toBuffer(content);
         const secrets = await this.getSecret(relationshipSecretId);
         if (!(secrets instanceof crypto_1.CryptoRelationshipSecrets)) {
-            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(secrets.id).logWith(this._log);
+            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(secrets.id);
         }
         return await secrets.encrypt(buffer);
     }
     async decryptRequest(relationshipSecretId, cipher) {
         const secrets = await this.getSecret(relationshipSecretId);
         if (!(secrets instanceof crypto_1.CryptoRelationshipRequestSecrets) && !(secrets instanceof crypto_1.CryptoRelationshipSecrets)) {
-            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(relationshipSecretId.toString()).logWith(this._log);
+            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(relationshipSecretId.toString());
         }
         return await secrets.decryptRequest(cipher);
     }
@@ -8121,7 +8140,7 @@ class RelationshipSecretController extends SecretController_1.SecretController {
     async decryptPeer(relationshipSecretId, cipher, omitCounterCheck = false) {
         const secrets = await this.getSecret(relationshipSecretId);
         if (!(secrets instanceof crypto_1.CryptoRelationshipSecrets)) {
-            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(secrets.id).logWith(this._log);
+            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(secrets.id);
         }
         return await secrets.decryptPeer(cipher, omitCounterCheck);
     }
@@ -8132,7 +8151,7 @@ class RelationshipSecretController extends SecretController_1.SecretController {
     async decryptOwn(relationshipSecretId, cipher) {
         const secrets = await this.getSecret(relationshipSecretId);
         if (!(secrets instanceof crypto_1.CryptoRelationshipSecrets)) {
-            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(secrets.id).logWith(this._log);
+            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(secrets.id);
         }
         return await secrets.decryptOwn(cipher);
     }
@@ -8150,12 +8169,76 @@ class RelationshipSecretController extends SecretController_1.SecretController {
         const bufferToVerify = CoreUtil_1.CoreUtil.toBuffer(content);
         const secrets = await this.getSecret(relationshipSecretId);
         if (secrets instanceof crypto_1.CryptoRelationshipRequestSecrets) {
-            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(secrets.id).logWith(this._log);
+            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(secrets.id);
         }
         const valid = await secrets.verifyPeer(bufferToVerify, signature);
         return valid;
     }
 }
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.CoreId]),
+    __metadata("design:returntype", Promise)
+], RelationshipSecretController.prototype, "getSecret", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.CoreId,
+        CachedRelationshipTemplate_1.CachedRelationshipTemplate,
+        crypto_1.CryptoRelationshipPublicRequest]),
+    __metadata("design:returntype", Promise)
+], RelationshipSecretController.prototype, "createTemplatorSecrets", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.CoreId]),
+    __metadata("design:returntype", Promise)
+], RelationshipSecretController.prototype, "getPublicResponse", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.CoreId,
+        crypto_1.CryptoRelationshipPublicResponse]),
+    __metadata("design:returntype", Promise)
+], RelationshipSecretController.prototype, "convertSecrets", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.CoreId, Object]),
+    __metadata("design:returntype", Promise)
+], RelationshipSecretController.prototype, "encryptRequest", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.CoreId, Object]),
+    __metadata("design:returntype", Promise)
+], RelationshipSecretController.prototype, "encrypt", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.CoreId, crypto_1.CryptoCipher]),
+    __metadata("design:returntype", Promise)
+], RelationshipSecretController.prototype, "decryptRequest", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.CoreId,
+        crypto_1.CryptoCipher, Object]),
+    __metadata("design:returntype", Promise)
+], RelationshipSecretController.prototype, "decryptPeer", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.CoreId, crypto_1.CryptoCipher]),
+    __metadata("design:returntype", Promise)
+], RelationshipSecretController.prototype, "decryptOwn", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [core_1.CoreId, Object, crypto_1.CryptoSignature]),
+    __metadata("design:returntype", Promise)
+], RelationshipSecretController.prototype, "verifyPeer", null);
 exports.RelationshipSecretController = RelationshipSecretController;
 //# sourceMappingURL=RelationshipSecretController.js.map
 
@@ -8165,12 +8248,22 @@ exports.RelationshipSecretController = RelationshipSecretController;
 /*!***************************************************************!*\
   !*** ./dist/modules/relationships/RelationshipsController.js ***!
   \***************************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "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);
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RelationshipsController = void 0;
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 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");
@@ -8190,10 +8283,10 @@ const RelationshipChangeStatus_1 = __webpack_require__(/*! ./transmission/change
 const RelationshipChangeType_1 = __webpack_require__(/*! ./transmission/changes/RelationshipChangeType */ "./dist/modules/relationships/transmission/changes/RelationshipChangeType.js");
 const RelationshipStatus_1 = __webpack_require__(/*! ./transmission/RelationshipStatus */ "./dist/modules/relationships/transmission/RelationshipStatus.js");
 const RelationshipCreationChangeRequestCipher_1 = __webpack_require__(/*! ./transmission/requests/RelationshipCreationChangeRequestCipher */ "./dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestCipher.js");
-const RelationshipCreationChangeRequestContent_1 = __webpack_require__(/*! ./transmission/requests/RelationshipCreationChangeRequestContent */ "./dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestContent.js");
+const RelationshipCreationChangeRequestContentWrapper_1 = __webpack_require__(/*! ./transmission/requests/RelationshipCreationChangeRequestContentWrapper */ "./dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestContentWrapper.js");
 const RelationshipCreationChangeRequestSigned_1 = __webpack_require__(/*! ./transmission/requests/RelationshipCreationChangeRequestSigned */ "./dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestSigned.js");
 const RelationshipCreationChangeResponseCipher_1 = __webpack_require__(/*! ./transmission/responses/RelationshipCreationChangeResponseCipher */ "./dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseCipher.js");
-const RelationshipCreationChangeResponseContent_1 = __webpack_require__(/*! ./transmission/responses/RelationshipCreationChangeResponseContent */ "./dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseContent.js");
+const RelationshipCreationChangeResponseContentWrapper_1 = __webpack_require__(/*! ./transmission/responses/RelationshipCreationChangeResponseContentWrapper */ "./dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseContentWrapper.js");
 const RelationshipCreationChangeResponseSigned_1 = __webpack_require__(/*! ./transmission/responses/RelationshipCreationChangeResponseSigned */ "./dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseSigned.js");
 class RelationshipsController extends core_1.TransportController {
     constructor(parent, secrets) {
@@ -8237,9 +8330,8 @@ class RelationshipsController extends core_1.TransportController {
     }
     async updateCacheOfExistingRelationshipInDb(id, response) {
         const relationshipDoc = await this.relationships.read(id);
-        if (!relationshipDoc) {
-            throw TransportErrors_1.TransportErrors.general.recordNotFound(Relationship_1.Relationship, id).logWith(this._log);
-        }
+        if (!relationshipDoc)
+            throw TransportErrors_1.TransportErrors.general.recordNotFound(Relationship_1.Relationship, id);
         const relationship = Relationship_1.Relationship.from(relationshipDoc);
         await this.updateCacheOfRelationship(relationship, response);
         await this.relationships.update(relationshipDoc, relationship);
@@ -8281,7 +8373,7 @@ class RelationshipsController extends core_1.TransportController {
         parameters = SendRelationshipParameters_1.SendRelationshipParameters.from(parameters);
         const template = parameters.template;
         if (!template.cache) {
-            throw TransportErrors_1.TransportErrors.general.cacheEmpty(RelationshipTemplate_1.RelationshipTemplate, template.id.toString()).logWith(this._log);
+            throw TransportErrors_1.TransportErrors.general.cacheEmpty(RelationshipTemplate_1.RelationshipTemplate, template.id.toString());
         }
         const secretId = await TransportIds_1.TransportIds.relationshipSecret.generate();
         const { requestCipher, requestContent } = await this.prepareRequest(secretId, template, parameters.content);
@@ -8297,18 +8389,14 @@ class RelationshipsController extends core_1.TransportController {
     async setRelationshipMetadata(idOrRelationship, metadata) {
         const id = idOrRelationship instanceof core_1.CoreId ? idOrRelationship.toString() : idOrRelationship.id.toString();
         const relationshipDoc = await this.relationships.read(id);
-        if (!relationshipDoc) {
-            throw TransportErrors_1.TransportErrors.general.recordNotFound(Relationship_1.Relationship, id.toString()).logWith(this._log);
-        }
+        if (!relationshipDoc)
+            throw TransportErrors_1.TransportErrors.general.recordNotFound(Relationship_1.Relationship, id.toString());
         const relationship = Relationship_1.Relationship.from(relationshipDoc);
         relationship.metadata = metadata;
         relationship.metadataModifiedAt = core_1.CoreDate.utc();
         await this.relationships.update(relationshipDoc, relationship);
         return relationship;
     }
-    requestTermination() {
-        throw TransportErrors_1.TransportErrors.general.notImplemented();
-    }
     async acceptChange(change, content) {
         return await this.completeChange(RelationshipChangeStatus_1.RelationshipChangeStatus.Accepted, change, content);
     }
@@ -8352,10 +8440,10 @@ class RelationshipsController extends core_1.TransportController {
     }
     async prepareRequest(relationshipSecretId, template, content) {
         if (!template.cache) {
-            throw TransportErrors_1.TransportErrors.general.cacheEmpty(RelationshipTemplate_1.RelationshipTemplate, template.id.toString()).logWith(this._log);
+            throw TransportErrors_1.TransportErrors.general.cacheEmpty(RelationshipTemplate_1.RelationshipTemplate, template.id.toString());
         }
         const requestPublic = await this.secrets.createRequestorSecrets(template.cache, relationshipSecretId);
-        const requestContent = RelationshipCreationChangeRequestContent_1.RelationshipCreationChangeRequestContent.from({
+        const requestContent = RelationshipCreationChangeRequestContentWrapper_1.RelationshipCreationChangeRequestContentWrapper.from({
             content: content,
             identity: this.parent.identity.identity,
             templateId: template.id
@@ -8387,11 +8475,10 @@ class RelationshipsController extends core_1.TransportController {
             case RelationshipChangeType_1.RelationshipChangeType.Creation:
                 return await this.applyCreationChange(change);
             case RelationshipChangeType_1.RelationshipChangeType.Termination:
-                return await this.applyTerminationChange(change);
             case RelationshipChangeType_1.RelationshipChangeType.TerminationCancellation:
-                return await this.applyTerminationCancellationChange(change);
+                throw TransportErrors_1.TransportErrors.general.notSupported();
             default:
-                throw TransportErrors_1.TransportErrors.general.incompatibleBackbone().logWith(this._log);
+                throw TransportErrors_1.TransportErrors.general.incompatibleBackbone();
         }
     }
     async applyCreationChange(change) {
@@ -8415,9 +8502,8 @@ class RelationshipsController extends core_1.TransportController {
         return newRelationship;
     }
     async parseCreationChange(change, relationshipSecretId, templateId) {
-        if (change.type !== RelationshipChangeType_1.RelationshipChangeType.Creation) {
-            throw TransportErrors_1.TransportErrors.relationships.wrongChangeType(change.type).logWith(this._log);
-        }
+        if (change.type !== RelationshipChangeType_1.RelationshipChangeType.Creation)
+            this.throwWrongChangeType(change.type);
         const promises = [];
         promises.push(this.decryptCreationChangeRequest(change.request, relationshipSecretId, templateId));
         const hasRelationshipSecret = await this.secrets.hasCryptoRelationshipSecrets(relationshipSecretId);
@@ -8429,9 +8515,8 @@ class RelationshipsController extends core_1.TransportController {
         return creationChange;
     }
     async decryptCreationChangeRequest(change, secretId, templateId) {
-        if (!change.content) {
-            throw TransportErrors_1.TransportErrors.relationships.emptyOrInvalidContent().logWith(this._log);
-        }
+        if (!change.content)
+            throw this.newEmptyOrInvalidContentError();
         const isOwnChange = this.parent.identity.isMe(core_1.CoreAddress.from(change.createdBy));
         const requestCipher = RelationshipCreationChangeRequestCipher_1.RelationshipCreationChangeRequestCipher.fromBase64(change.content);
         const signedRequestBuffer = await this.secrets.decryptRequest(secretId, requestCipher.cipher);
@@ -8444,23 +8529,21 @@ class RelationshipsController extends core_1.TransportController {
             relationshipSignatureValid = await this.secrets.verifyPeer(secretId, crypto_1.CoreBuffer.fromUtf8(signedRequest.serializedRequest), signedRequest.relationshipSignature);
         }
         if (!relationshipSignatureValid) {
-            throw TransportErrors_1.TransportErrors.general.signatureNotValid("relationshipRequest").logWith(this._log);
+            throw TransportErrors_1.TransportErrors.general.signatureNotValid("relationshipRequest");
         }
-        const requestContent = RelationshipCreationChangeRequestContent_1.RelationshipCreationChangeRequestContent.deserialize(signedRequest.serializedRequest);
-        if (requestContent.templateId.toString() !== templateId.toString()) {
-            throw TransportErrors_1.TransportErrors.relationships.requestContainsWrongTemplateId().logWith(this._log);
+        const requestContent = RelationshipCreationChangeRequestContentWrapper_1.RelationshipCreationChangeRequestContentWrapper.deserialize(signedRequest.serializedRequest);
+        if (!requestContent.templateId.equals(templateId)) {
+            throw new Error("The relationship request contains a wrong template id.");
         }
         return requestContent;
     }
     async decryptCreationChangeResponse(change, relationshipSecretId) {
-        if (!change.response) {
-            throw TransportErrors_1.TransportErrors.relationships.changeResponseMissing(change.id).logWith(this._log);
-        }
-        if (change.type !== RelationshipChangeType_1.RelationshipChangeType.Creation) {
-            throw TransportErrors_1.TransportErrors.relationships.wrongChangeType(change.type).logWith(this._log);
-        }
+        if (!change.response)
+            throw this.newChangeResponseMissingError(change.id);
+        if (change.type !== RelationshipChangeType_1.RelationshipChangeType.Creation)
+            this.throwWrongChangeType(change.type);
         if (!change.response.content) {
-            throw TransportErrors_1.TransportErrors.relationships.emptyOrInvalidContent(change).logWith(this._log);
+            throw this.newEmptyOrInvalidContentError(change);
         }
         const isOwnChange = this.parent.identity.isMe(core_1.CoreAddress.from(change.response.createdBy));
         const cipher = RelationshipCreationChangeResponseCipher_1.RelationshipCreationChangeResponseCipher.fromBase64(change.response.content);
@@ -8485,11 +8568,11 @@ class RelationshipsController extends core_1.TransportController {
             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);
+            throw TransportErrors_1.TransportErrors.general.signatureNotValid("relationshipResponse");
         }
-        const responseContent = RelationshipCreationChangeResponseContent_1.RelationshipCreationChangeResponseContent.deserialize(signedResponse.serializedResponse);
-        if (responseContent.relationshipId.toString() !== change.relationshipId.toString()) {
-            throw TransportErrors_1.TransportErrors.relationships.responseContainsWrongRequestId().logWith(this._log);
+        const responseContent = RelationshipCreationChangeResponseContentWrapper_1.RelationshipCreationChangeResponseContentWrapper.deserialize(signedResponse.serializedResponse);
+        if (!responseContent.relationshipId.equals(change.relationshipId)) {
+            throw new Error("The relationship response contains a wrong relationship id.");
         }
         return responseContent;
     }
@@ -8502,16 +8585,15 @@ class RelationshipsController extends core_1.TransportController {
         if (!relationship.cache) {
             await this.updateCacheOfRelationship(relationship, undefined);
         }
-        if (!change.response) {
-            throw TransportErrors_1.TransportErrors.relationships.changeResponseMissing(change.id).logWith(this._log);
-        }
+        if (!change.response)
+            throw this.newChangeResponseMissingError(change.id);
         if (!change.response.content) {
-            throw TransportErrors_1.TransportErrors.relationships.emptyOrInvalidContent(change).logWith(this._log);
+            throw this.newEmptyOrInvalidContentError(change);
         }
         const cipher = RelationshipCreationChangeResponseCipher_1.RelationshipCreationChangeResponseCipher.fromBase64(change.response.content);
         if (change.status !== RelationshipChangeStatus_1.RelationshipChangeStatus.Revoked) {
             if (!cipher.publicResponseCrypto) {
-                throw TransportErrors_1.TransportErrors.relationships.responseCryptoIsMissing().logWith(this._log);
+                throw new Error("The response crypto is missing.");
             }
             await this.secrets.convertSecrets(relationship.relationshipSecretId, cipher.publicResponseCrypto);
         }
@@ -8532,7 +8614,7 @@ class RelationshipsController extends core_1.TransportController {
                 relationship.toRevoked(response);
                 break;
             default:
-                throw TransportErrors_1.TransportErrors.general.incompatibleBackbone().logWith(this._log);
+                throw TransportErrors_1.TransportErrors.general.incompatibleBackbone();
         }
         await this.relationships.update(relationshipDoc, relationship);
         return relationship;
@@ -8541,15 +8623,12 @@ class RelationshipsController extends core_1.TransportController {
         const backboneRelationship = (await this.client.getRelationship(change.relationshipId)).value;
         const templateId = core_1.CoreId.from(backboneRelationship.relationshipTemplateId);
         const template = await this.parent.relationshipTemplates.getRelationshipTemplate(templateId);
-        if (!template) {
-            throw TransportErrors_1.TransportErrors.general.recordNotFound(RelationshipTemplate_1.RelationshipTemplate, templateId.toString()).logWith(this._log);
-        }
-        if (!template.cache) {
-            throw TransportErrors_1.TransportErrors.general.cacheEmpty(RelationshipTemplate_1.RelationshipTemplate, template.id.toString()).logWith(this._log);
-        }
-        if (!change.request.content) {
-            throw TransportErrors_1.TransportErrors.relationships.emptyOrInvalidContent(change).logWith(this._log);
-        }
+        if (!template)
+            throw TransportErrors_1.TransportErrors.general.recordNotFound(RelationshipTemplate_1.RelationshipTemplate, templateId.toString());
+        if (!template.cache)
+            throw TransportErrors_1.TransportErrors.general.cacheEmpty(RelationshipTemplate_1.RelationshipTemplate, template.id.toString());
+        if (!change.request.content)
+            throw this.newEmptyOrInvalidContentError(change);
         const secretId = await TransportIds_1.TransportIds.relationshipSecret.generate();
         const requestCipher = RelationshipCreationChangeRequestCipher_1.RelationshipCreationChangeRequestCipher.fromBase64(change.request.content);
         await this.secrets.createTemplatorSecrets(secretId, template.cache, requestCipher.publicRequestCrypto);
@@ -8559,18 +8638,10 @@ class RelationshipsController extends core_1.TransportController {
         await this.relationships.create(relationship);
         return relationship;
     }
-    applyTerminationChange(_change) {
-        throw TransportErrors_1.TransportErrors.general.notImplemented();
-    }
-    applyTerminationCancellationChange(_change) {
-        throw TransportErrors_1.TransportErrors.general.notImplemented();
-    }
     async completeChange(targetStatus, change, content) {
         const relationshipDoc = await this.relationships.read(change.relationshipId.toString());
         if (!relationshipDoc) {
-            throw TransportErrors_1.TransportErrors.general
-                .recordNotFound(Relationship_1.Relationship, change.relationshipId.toString())
-                .logWith(this._log);
+            throw TransportErrors_1.TransportErrors.general.recordNotFound(Relationship_1.Relationship, change.relationshipId.toString());
         }
         const relationship = Relationship_1.Relationship.from(relationshipDoc);
         if (!relationship.cache) {
@@ -8581,10 +8652,10 @@ class RelationshipsController extends core_1.TransportController {
         }
         const queriedChange = relationship.cache.changes.find((r) => r.id.toString() === change.id.toString());
         if (!queriedChange) {
-            throw TransportErrors_1.TransportErrors.general.recordNotFound(RelationshipChange_1.RelationshipChange, change.id.toString()).logWith(this._log);
+            throw TransportErrors_1.TransportErrors.general.recordNotFound(RelationshipChange_1.RelationshipChange, change.id.toString());
         }
         if (queriedChange.status !== RelationshipChangeStatus_1.RelationshipChangeStatus.Pending) {
-            throw TransportErrors_1.TransportErrors.relationships.wrongChangeStatus(queriedChange.status).logWith(this._log);
+            throw TransportErrors_1.TransportErrors.relationships.wrongChangeStatus(queriedChange.status);
         }
         let encryptedContent;
         if (content) {
@@ -8616,7 +8687,7 @@ class RelationshipsController extends core_1.TransportController {
         return relationship;
     }
     async encryptRevokeContent(relationship, content) {
-        const responseContent = RelationshipCreationChangeResponseContent_1.RelationshipCreationChangeResponseContent.from({
+        const responseContent = RelationshipCreationChangeResponseContentWrapper_1.RelationshipCreationChangeResponseContentWrapper.from({
             relationshipId: relationship.id,
             content: content
         });
@@ -8639,7 +8710,7 @@ class RelationshipsController extends core_1.TransportController {
     }
     async encryptAcceptRejectContent(relationship, content) {
         const publicResponseCrypto = await this.secrets.getPublicResponse(relationship.relationshipSecretId);
-        const responseContent = RelationshipCreationChangeResponseContent_1.RelationshipCreationChangeResponseContent.from({
+        const responseContent = RelationshipCreationChangeResponseContentWrapper_1.RelationshipCreationChangeResponseContentWrapper.from({
             relationshipId: relationship.id,
             content: content
         });
@@ -8661,7 +8732,72 @@ class RelationshipsController extends core_1.TransportController {
         });
         return responseCipher.toBase64();
     }
-}
+    throwWrongChangeType(type) {
+        throw new Error(`The relationship change has the wrong type (${type}) to run this operation`);
+    }
+    newChangeResponseMissingError(changeId) {
+        return new Error(`The response of the relationship change (${changeId}) is missing`);
+    }
+    newEmptyOrInvalidContentError(change) {
+        return new Error(`The content property of the relationship change ${change === null || change === void 0 ? void 0 : change.id} is missing or invalid`);
+    }
+}
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Object]),
+    __metadata("design:returntype", Promise)
+], RelationshipsController.prototype, "updateCacheOfExistingRelationshipInDb", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", Promise)
+], RelationshipsController.prototype, "setRelationshipMetadata", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], RelationshipsController.prototype, "applyChange", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, core_1.CoreId,
+        core_1.CoreId]),
+    __metadata("design:returntype", Promise)
+], RelationshipsController.prototype, "parseCreationChange", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, core_1.CoreId,
+        core_1.CoreId]),
+    __metadata("design:returntype", Promise)
+], RelationshipsController.prototype, "decryptCreationChangeRequest", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, core_1.CoreId]),
+    __metadata("design:returntype", Promise)
+], RelationshipsController.prototype, "decryptCreationChangeResponse", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", Promise)
+], RelationshipsController.prototype, "updatePendingRelationshipWithPeerResponse", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], RelationshipsController.prototype, "createNewRelationshipByIncomingCreationChange", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, RelationshipChange_1.RelationshipChange, Object]),
+    __metadata("design:returntype", Promise)
+], RelationshipsController.prototype, "completeChange", null);
 exports.RelationshipsController = RelationshipsController;
 //# sourceMappingURL=RelationshipsController.js.map
 
@@ -9329,10 +9465,10 @@ exports.RelationshipCreationChangeRequestCipher = RelationshipCreationChangeRequ
 
 /***/ }),
 
-/***/ "./dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestContent.js":
-/*!******************************************************************************************************!*\
-  !*** ./dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestContent.js ***!
-  \******************************************************************************************************/
+/***/ "./dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestContentWrapper.js":
+/*!*************************************************************************************************************!*\
+  !*** ./dist/modules/relationships/transmission/requests/RelationshipCreationChangeRequestContentWrapper.js ***!
+  \*************************************************************************************************************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -9347,11 +9483,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.RelationshipCreationChangeRequestContent = void 0;
+exports.RelationshipCreationChangeRequestContentWrapper = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const core_1 = __webpack_require__(/*! ../../../../core */ "./dist/core/index.js");
 const Identity_1 = __webpack_require__(/*! ../../../accounts/data/Identity */ "./dist/modules/accounts/data/Identity.js");
-let RelationshipCreationChangeRequestContent = class RelationshipCreationChangeRequestContent extends core_1.CoreSerializable {
+let RelationshipCreationChangeRequestContentWrapper = class RelationshipCreationChangeRequestContentWrapper extends core_1.CoreSerializable {
     static from(value) {
         return this.fromAny(value);
     }
@@ -9360,22 +9496,22 @@ __decorate([
     (0, ts_serval_1.validate)(),
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", Identity_1.Identity)
-], RelationshipCreationChangeRequestContent.prototype, "identity", void 0);
+], RelationshipCreationChangeRequestContentWrapper.prototype, "identity", void 0);
 __decorate([
     (0, ts_serval_1.validate)(),
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", ts_serval_1.Serializable)
-], RelationshipCreationChangeRequestContent.prototype, "content", void 0);
+], RelationshipCreationChangeRequestContentWrapper.prototype, "content", void 0);
 __decorate([
     (0, ts_serval_1.validate)(),
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", core_1.CoreId)
-], RelationshipCreationChangeRequestContent.prototype, "templateId", void 0);
-RelationshipCreationChangeRequestContent = __decorate([
-    (0, ts_serval_1.type)("RelationshipCreationChangeRequestContent")
-], RelationshipCreationChangeRequestContent);
-exports.RelationshipCreationChangeRequestContent = RelationshipCreationChangeRequestContent;
-//# sourceMappingURL=RelationshipCreationChangeRequestContent.js.map
+], RelationshipCreationChangeRequestContentWrapper.prototype, "templateId", void 0);
+RelationshipCreationChangeRequestContentWrapper = __decorate([
+    (0, ts_serval_1.type)("RelationshipCreationChangeRequestContentWrapper")
+], RelationshipCreationChangeRequestContentWrapper);
+exports.RelationshipCreationChangeRequestContentWrapper = RelationshipCreationChangeRequestContentWrapper;
+//# sourceMappingURL=RelationshipCreationChangeRequestContentWrapper.js.map
 
 /***/ }),
 
@@ -9477,10 +9613,10 @@ exports.RelationshipCreationChangeResponseCipher = RelationshipCreationChangeRes
 
 /***/ }),
 
-/***/ "./dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseContent.js":
-/*!********************************************************************************************************!*\
-  !*** ./dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseContent.js ***!
-  \********************************************************************************************************/
+/***/ "./dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseContentWrapper.js":
+/*!***************************************************************************************************************!*\
+  !*** ./dist/modules/relationships/transmission/responses/RelationshipCreationChangeResponseContentWrapper.js ***!
+  \***************************************************************************************************************/
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -9495,10 +9631,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.RelationshipCreationChangeResponseContent = void 0;
+exports.RelationshipCreationChangeResponseContentWrapper = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const core_1 = __webpack_require__(/*! ../../../../core */ "./dist/core/index.js");
-let RelationshipCreationChangeResponseContent = class RelationshipCreationChangeResponseContent extends core_1.CoreSerializable {
+let RelationshipCreationChangeResponseContentWrapper = class RelationshipCreationChangeResponseContentWrapper extends core_1.CoreSerializable {
     static from(value) {
         return this.fromAny(value);
     }
@@ -9507,17 +9643,17 @@ __decorate([
     (0, ts_serval_1.validate)(),
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", ts_serval_1.Serializable)
-], RelationshipCreationChangeResponseContent.prototype, "content", void 0);
+], RelationshipCreationChangeResponseContentWrapper.prototype, "content", void 0);
 __decorate([
     (0, ts_serval_1.validate)(),
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", core_1.CoreId)
-], RelationshipCreationChangeResponseContent.prototype, "relationshipId", void 0);
-RelationshipCreationChangeResponseContent = __decorate([
-    (0, ts_serval_1.type)("RelationshipCreationChangeResponseContent")
-], RelationshipCreationChangeResponseContent);
-exports.RelationshipCreationChangeResponseContent = RelationshipCreationChangeResponseContent;
-//# sourceMappingURL=RelationshipCreationChangeResponseContent.js.map
+], RelationshipCreationChangeResponseContentWrapper.prototype, "relationshipId", void 0);
+RelationshipCreationChangeResponseContentWrapper = __decorate([
+    (0, ts_serval_1.type)("RelationshipCreationChangeResponseContentWrapper")
+], RelationshipCreationChangeResponseContentWrapper);
+exports.RelationshipCreationChangeResponseContentWrapper = RelationshipCreationChangeResponseContentWrapper;
+//# sourceMappingURL=RelationshipCreationChangeResponseContentWrapper.js.map
 
 /***/ }),
 
@@ -9575,13 +9711,23 @@ exports.RelationshipCreationChangeResponseSigned = RelationshipCreationChangeRes
 /*!**************************************************!*\
   !*** ./dist/modules/secrets/SecretController.js ***!
   \**************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "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);
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SecretController = exports.SecretBaseKeyType = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
 const DbCollectionName_1 = __webpack_require__(/*! ../../core/DbCollectionName */ "./dist/core/DbCollectionName.js");
@@ -9714,7 +9860,6 @@ class SecretController extends TransportController_1.TransportController {
     async createExchangeKey(name = "", description = "", validTo) {
         const exchangeKeypair = await core_1.CoreCrypto.generateExchangeKeypair();
         const secretContainer = await this.storeSecret(exchangeKeypair, name, description, validTo);
-        // TODO: JSSNMSHDD-2485 (wipe private key)
         return [exchangeKeypair.publicKey, secretContainer];
     }
     async getBaseKey() {
@@ -9726,9 +9871,7 @@ class SecretController extends TransportController_1.TransportController {
             this.baseKey = baseKey.secret;
         }
         else {
-            throw core_1.TransportErrors.general
-                .recordNotFound(crypto_1.CryptoSecretKey, DeviceSecretController_1.DeviceSecretType.SharedSecretBaseKey)
-                .logWith(this._log);
+            throw core_1.TransportErrors.general.recordNotFound(crypto_1.CryptoSecretKey, DeviceSecretController_1.DeviceSecretType.SharedSecretBaseKey);
         }
         return this.baseKey;
     }
@@ -9738,13 +9881,19 @@ class SecretController extends TransportController_1.TransportController {
         return nextNonce;
     }
 }
-exports.SecretController = SecretController;
 /**
  * Context of the secret derivation function. Doesn't have to be secret.
  * Must be 8 characters long.
  */
 SecretController.secretContext = "SECRET01";
 SecretController.secretNonceKey = "secret_lastnonce";
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], SecretController.prototype, "getBaseKey", null);
+exports.SecretController = SecretController;
 //# sourceMappingURL=SecretController.js.map
 
 /***/ }),
@@ -10040,11 +10189,21 @@ exports.DatawalletModificationMapper = DatawalletModificationMapper;
 
 "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;
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const lodash_1 = __importDefault(__webpack_require__(/*! lodash */ "./node_modules/lodash/lodash.js"));
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
 const DbCollectionName_1 = __webpack_require__(/*! ../../core/DbCollectionName */ "./dist/core/DbCollectionName.js");
@@ -10076,6 +10235,9 @@ class DatawalletModificationsProcessor {
         const totalItems = this.creates.length + this.updates.length + this.deletes.length + this.cacheChanges.length;
         this.syncStep = reporter.createStep(SyncCallback_1.SyncStep.DatawalletSyncProcessing, totalItems);
     }
+    get log() {
+        return this.logger;
+    }
     async execute() {
         await this.applyCreates();
         await this.applyUpdates();
@@ -10164,9 +10326,7 @@ class DatawalletModificationsProcessor {
         const uniqueCollections = [...new Set(collections)];
         const collectionsWithUncacheableItems = uniqueCollections.filter((c) => !this.collectionsWithCacheableItems.includes(c));
         if (collectionsWithUncacheableItems.length > 0) {
-            throw core_1.TransportErrors.datawallet
-                .unsupportedModification("unsupportedCacheChangedModificationCollection", collectionsWithUncacheableItems)
-                .logWith(this.logger);
+            throw core_1.TransportErrors.datawallet.unsupportedModification("unsupportedCacheChangedModificationCollection", collectionsWithUncacheableItems);
         }
     }
     groupCacheChangesByCollection(cacheChanges) {
@@ -10202,6 +10362,12 @@ class DatawalletModificationsProcessor {
         }
     }
 }
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], DatawalletModificationsProcessor.prototype, "ensureAllItemsAreCacheable", null);
 exports.DatawalletModificationsProcessor = DatawalletModificationsProcessor;
 class CacheFetcher {
     constructor(fileController, messageController, relationshipTemplateController, relationshipController, tokenController) {
@@ -10385,12 +10551,22 @@ var SyncStep;
 /*!*********************************************!*\
   !*** ./dist/modules/sync/SyncController.js ***!
   \*********************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "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);
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SyncController = void 0;
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
 const StartSyncRun_1 = __webpack_require__(/*! ./backbone/StartSyncRun */ "./dist/modules/sync/backbone/StartSyncRun.js");
 const SyncClient_1 = __webpack_require__(/*! ./backbone/SyncClient */ "./dist/modules/sync/backbone/SyncClient.js");
@@ -10466,7 +10642,7 @@ class SyncController extends core_1.TransportController {
             throw new core_1.CoreError("error.transport.errorWhileApplyingExternalEvents", externalEventSyncResult.externalEventResults
                 .filter((r) => r.errorCode !== undefined)
                 .map((r) => r.errorCode)
-                .join(" | ")).logWith(this.log);
+                .join(" | "));
         }
         syncStep.finish();
         if (this.datawalletEnabled && (await this.unpushedDatawalletModifications.exists())) {
@@ -10496,9 +10672,7 @@ class SyncController extends core_1.TransportController {
         if (this.config.supportedDatawalletVersion < identityDatawalletVersion) {
             // This means that the datawallet of the identity was upgraded by another device with a higher version.
             // It is necesssary to update the current device.
-            throw core_1.TransportErrors.datawallet
-                .insufficientSupportedDatawalletVersion(this.config.supportedDatawalletVersion, identityDatawalletVersion)
-                .logWith(this.log);
+            throw core_1.TransportErrors.datawallet.insufficientSupportedDatawalletVersion(this.config.supportedDatawalletVersion, identityDatawalletVersion);
         }
         this.log.trace("Synchronization of Datawallet events started...");
         try {
@@ -10510,9 +10684,7 @@ class SyncController extends core_1.TransportController {
             const outdatedErrorCode = "error.platform.validation.datawallet.insufficientSupportedDatawalletVersion";
             if (!(e instanceof core_1.RequestError) || e.code !== outdatedErrorCode)
                 throw e;
-            throw core_1.TransportErrors.datawallet
-                .insufficientSupportedDatawalletVersion(this.config.supportedDatawalletVersion, identityDatawalletVersion)
-                .logWith(this.log);
+            throw core_1.TransportErrors.datawallet.insufficientSupportedDatawalletVersion(this.config.supportedDatawalletVersion, identityDatawalletVersion);
         }
         this.log.trace("Synchronization of Datawallet events ended...");
         await this.checkDatawalletVersion(identityDatawalletVersion);
@@ -10520,9 +10692,7 @@ class SyncController extends core_1.TransportController {
     async checkDatawalletVersion(identityDatawalletVersion) {
         var _a;
         if (this.config.supportedDatawalletVersion < identityDatawalletVersion) {
-            throw core_1.TransportErrors.datawallet
-                .insufficientSupportedDatawalletVersion(this.config.supportedDatawalletVersion, identityDatawalletVersion)
-                .logWith(this.log);
+            throw core_1.TransportErrors.datawallet.insufficientSupportedDatawalletVersion(this.config.supportedDatawalletVersion, identityDatawalletVersion);
         }
         if (this.config.supportedDatawalletVersion > identityDatawalletVersion) {
             await this.upgradeIdentityDatawalletVersion(identityDatawalletVersion, this.config.supportedDatawalletVersion);
@@ -10536,21 +10706,17 @@ class SyncController extends core_1.TransportController {
         if (identityDatawalletVersion === targetDatawalletVersion)
             return;
         if (this.config.supportedDatawalletVersion < targetDatawalletVersion) {
-            throw core_1.TransportErrors.datawallet
-                .insufficientSupportedDatawalletVersion(targetDatawalletVersion, identityDatawalletVersion)
-                .logWith(this.log);
+            throw core_1.TransportErrors.datawallet.insufficientSupportedDatawalletVersion(targetDatawalletVersion, identityDatawalletVersion);
         }
         if (identityDatawalletVersion > targetDatawalletVersion) {
-            throw core_1.TransportErrors.datawallet
-                .currentBiggerThanTarget(identityDatawalletVersion, targetDatawalletVersion)
-                .logWith(this.log);
+            throw core_1.TransportErrors.datawallet.currentBiggerThanTarget(identityDatawalletVersion, targetDatawalletVersion);
         }
         while (identityDatawalletVersion < targetDatawalletVersion) {
             identityDatawalletVersion++;
             await this.startDatawalletVersionUpgradeSyncRun();
             const migrationFunction = this.identityMigrations[`v${identityDatawalletVersion}`];
             if (!migrationFunction) {
-                throw core_1.TransportErrors.datawallet.noMigrationAvailable(identityDatawalletVersion).logWith(this.log);
+                throw this.newNoMigrationAvailableError(identityDatawalletVersion);
             }
             await migrationFunction.call(this.identityMigrations);
             await this.finalizeDatawalletVersionUpgradeSyncRun(identityDatawalletVersion);
@@ -10560,20 +10726,16 @@ class SyncController extends core_1.TransportController {
         if (deviceDatawalletVersion === targetDatawalletVersion)
             return;
         if (this.config.supportedDatawalletVersion < targetDatawalletVersion) {
-            throw core_1.TransportErrors.datawallet
-                .insufficientSupportedDatawalletVersion(targetDatawalletVersion, deviceDatawalletVersion)
-                .logWith(this.log);
+            throw core_1.TransportErrors.datawallet.insufficientSupportedDatawalletVersion(targetDatawalletVersion, deviceDatawalletVersion);
         }
         if (deviceDatawalletVersion > targetDatawalletVersion) {
-            throw core_1.TransportErrors.datawallet
-                .currentBiggerThanTarget(deviceDatawalletVersion, targetDatawalletVersion)
-                .logWith(this.log);
+            throw core_1.TransportErrors.datawallet.currentBiggerThanTarget(deviceDatawalletVersion, targetDatawalletVersion);
         }
         while (deviceDatawalletVersion < targetDatawalletVersion) {
             deviceDatawalletVersion++;
             const migrationFunction = this.deviceMigrations[`v${deviceDatawalletVersion}`];
             if (!migrationFunction) {
-                throw core_1.TransportErrors.datawallet.noMigrationAvailable(deviceDatawalletVersion).logWith(this.log);
+                throw this.newNoMigrationAvailableError(deviceDatawalletVersion);
             }
             await migrationFunction.call(this.deviceMigrations);
             await this.parent.activeDevice.update({ datawalletVersion: deviceDatawalletVersion });
@@ -10750,7 +10912,40 @@ class SyncController extends core_1.TransportController {
     async setLastCompletedDatawalletSyncTime() {
         await this.setSyncTimeByName("Datawallet");
     }
+    newNoMigrationAvailableError(version) {
+        return new Error(`There is no migration available for the datawallet version '${version}'.`);
+    }
 }
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, SyncCallback_1.SyncProgressReporter]),
+    __metadata("design:returntype", Promise)
+], SyncController.prototype, "_sync", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [SyncCallback_1.SyncProgressReporter]),
+    __metadata("design:returntype", Promise)
+], SyncController.prototype, "syncDatawallet", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number]),
+    __metadata("design:returntype", Promise)
+], SyncController.prototype, "checkDatawalletVersion", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number, Number]),
+    __metadata("design:returntype", Promise)
+], SyncController.prototype, "upgradeIdentityDatawalletVersion", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number, Number]),
+    __metadata("design:returntype", Promise)
+], SyncController.prototype, "upgradeDeviceDatawalletVersion", null);
 exports.SyncController = SyncController;
 function descending(modification1, modification2) {
     return modification2.index - modification1.index;
@@ -11293,13 +11488,23 @@ exports.AnonymousTokenController = AnonymousTokenController;
 /*!************************************************!*\
   !*** ./dist/modules/tokens/TokenController.js ***!
   \************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "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);
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TokenController = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
 const DbCollectionName_1 = __webpack_require__(/*! ../../core/DbCollectionName */ "./dist/core/DbCollectionName.js");
@@ -11356,7 +11561,7 @@ class TokenController extends TransportController_1.TransportController {
         const id = idOrToken instanceof core_1.CoreId ? idOrToken.toString() : idOrToken.id.toString();
         const tokenDoc = await this.tokens.read(id);
         if (!tokenDoc) {
-            throw core_1.TransportErrors.general.recordNotFound(Token_1.Token, id.toString()).logWith(this._log);
+            throw core_1.TransportErrors.general.recordNotFound(Token_1.Token, id.toString());
         }
         const token = Token_1.Token.from(tokenDoc);
         token.setMetadata(metadata);
@@ -11371,7 +11576,6 @@ class TokenController extends TransportController_1.TransportController {
         if (ids.length < 1) {
             return [];
         }
-        // TODO: JSSNMSHDD-2820 (check for items that couldn't be fetched e.g. because it is expired)
         const resultItems = (await this.client.getTokens({ ids })).value;
         const promises = [];
         for await (const resultItem of resultItems) {
@@ -11394,7 +11598,7 @@ class TokenController extends TransportController_1.TransportController {
     async updateCacheOfExistingTokenInDb(id, response) {
         const tokenDoc = await this.tokens.read(id);
         if (!tokenDoc) {
-            core_1.TransportErrors.general.recordNotFound(Token_1.Token, id).logWith(this._log);
+            core_1.TransportErrors.general.recordNotFound(Token_1.Token, id);
             return;
         }
         const token = Token_1.Token.from(tokenDoc);
@@ -11417,7 +11621,7 @@ class TokenController extends TransportController_1.TransportController {
         const plaintextTokenBuffer = await core_1.CoreCrypto.decrypt(cipher, secretKey);
         const plaintextTokenContent = core_1.CoreSerializable.deserializeUnknown(plaintextTokenBuffer.toUtf8());
         if (!(plaintextTokenContent instanceof ts_serval_1.Serializable)) {
-            throw core_1.TransportErrors.tokens.invalidTokenContent(response.id).logWith(this._log);
+            throw core_1.TransportErrors.tokens.invalidTokenContent(response.id);
         }
         const cachedToken = CachedToken_1.CachedToken.from({
             createdAt: core_1.CoreDate.from(response.createdAt),
@@ -11461,6 +11665,24 @@ class TokenController extends TransportController_1.TransportController {
         return token;
     }
 }
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", Promise)
+], TokenController.prototype, "setTokenMetadata", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Object]),
+    __metadata("design:returntype", Promise)
+], TokenController.prototype, "updateCacheOfExistingTokenInDb", null);
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, crypto_1.CryptoSecretKey]),
+    __metadata("design:returntype", Promise)
+], TokenController.prototype, "decryptToken", null);
 exports.TokenController = TokenController;
 //# sourceMappingURL=TokenController.js.map
 
@@ -11923,7 +12145,6 @@ exports.TokenReference = TokenReference;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.PasswordGenerator = void 0;
-const TransportErrors_1 = __webpack_require__(/*! ../core/TransportErrors */ "./dist/core/TransportErrors.js");
 const Random_1 = __webpack_require__(/*! ./Random */ "./dist/util/Random.js");
 const defaultPasswordRange = Random_1.RandomCharacterRange.AlphanumericEase + Random_1.RandomCharacterRange.SpecialCharacters;
 class PasswordGenerator {
@@ -11947,7 +12168,7 @@ class PasswordGenerator {
         if (minLength > maxLength)
             maxLength = minLength;
         if (minLength < 8) {
-            throw TransportErrors_1.TransportErrors.util.passwordMinLengthTooShort();
+            throw new Error("Minimum password length for a strong password should be 8 characters.");
         }
         const specialCharacterBucket = {
             minLength: 1,
@@ -12114,7 +12335,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Random = exports.RandomCharacterRange = void 0;
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const uuid_1 = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/commonjs-browser/index.js");
-const TransportErrors_1 = __webpack_require__(/*! ../core/TransportErrors */ "./dist/core/TransportErrors.js");
 var RandomCharacterRange;
 (function (RandomCharacterRange) {
     RandomCharacterRange["Digit"] = "0123456789";
@@ -12138,7 +12358,7 @@ class Random {
     }
     static async int(length) {
         if (length > 21 || length <= 0) {
-            throw TransportErrors_1.TransportErrors.util.random.intLength();
+            throw new Error("Length must be between 1 and 21.");
         }
         return parseInt(await this.string(length, RandomCharacterRange.Digit));
     }
@@ -12161,12 +12381,12 @@ class Random {
     }
     static async intBetween(min, max) {
         if (max <= min) {
-            throw TransportErrors_1.TransportErrors.util.random.mnBiggerThatMax();
+            throw new Error("Max must be larger than min.");
         }
         const diff = max - min + 1;
         const bitLength = Math.abs(Math.ceil(Math.log2(diff)));
         if (bitLength > 32) {
-            throw TransportErrors_1.TransportErrors.util.random.rangeTooBig();
+            throw new Error("The range between the numbers is too big, 32 bit is the maximum -> 4294967296");
         }
         const byteLength = Math.ceil(bitLength / 8);
         const bitMask = Math.pow(2, bitLength) - 1;
@@ -12185,7 +12405,7 @@ class Random {
     }
     static async intRandomLength(minLength, maxLength) {
         if (maxLength > 21) {
-            TransportErrors_1.TransportErrors.util.random.maxTooHigh();
+            throw new Error("Max must be below 22.");
         }
         return parseInt(await this.stringRandomLength(minLength, maxLength, RandomCharacterRange.Digit));
     }
@@ -12204,7 +12424,7 @@ class Random {
         if (length <= 0)
             return "";
         if (allowedChars.length > 256) {
-            throw TransportErrors_1.TransportErrors.util.random.inputTooLong();
+            throw new Error("Input exceeds maximum length of 256.");
         }
         const ar = [];
         const inputLength = allowedChars.length;
@@ -12227,10 +12447,10 @@ class Random {
     }
     static async stringRandomLength(minLength, maxLength, allowedChars) {
         if (minLength > maxLength) {
-            throw TransportErrors_1.TransportErrors.util.random.mnBiggerThatMax();
+            throw new Error("maxLength must be larger than minLength.");
         }
         if (minLength < 0) {
-            throw TransportErrors_1.TransportErrors.util.random.minLessThanZero();
+            throw new Error("minlength must not be less than zero.");
         }
         const length = maxLength > minLength ? await this.intBetween(minLength, maxLength) : maxLength;
         return await this.string(length, allowedChars);
@@ -12711,29 +12931,50 @@ __exportStar(__webpack_require__(/*! ./sleep */ "./node_modules/@js-soft/ts-util
 /*!*************************************************************!*\
   !*** ./node_modules/@js-soft/ts-utils/dist/logDecorator.js ***!
   \*************************************************************/
-/***/ ((__unused_webpack_module, exports) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
 
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.log = void 0;
-/* eslint-disable no-console */
-function log(_target, propertyName, propertyDesciptor) {
-    const method = propertyDesciptor.value;
-    propertyDesciptor.value = function (...args) {
-        const params = args.map((a) => JSON.stringify(a)).join();
-        try {
-            const result = method.apply(this, args);
-            const r = JSON.stringify(result);
-            console.log(`Call: ${propertyName}(${params}) => ${r}`);
-            return result;
-        }
-        catch (error) {
-            console.log(error);
-            throw error;
-        }
+const json_stringify_safe_1 = __importDefault(__webpack_require__(/*! json-stringify-safe */ "./node_modules/json-stringify-safe/stringify.js"));
+function log(params) {
+    return function (_target, propertyName, propertyDescriptorDoNotChangeMyNamePlease) {
+        const method = propertyDescriptorDoNotChangeMyNamePlease.value;
+        propertyDescriptorDoNotChangeMyNamePlease.value = function (...args) {
+            const thisT = this;
+            try {
+                if (params?.logParams) {
+                    thisT.log.trace(`Calling ${propertyName}(${args.map((a) => (0, json_stringify_safe_1.default)(a)).join(", ")})`);
+                }
+                else {
+                    thisT.log.trace(`Calling ${propertyName}`);
+                }
+                const returnValue = method.apply(this, args);
+                if (params?.logReturnValue) {
+                    thisT.log.trace(`Returning from ${propertyName} with: ${(0, json_stringify_safe_1.default)(returnValue)}`);
+                }
+                else {
+                    thisT.log.trace(`Returning from ${propertyName}`);
+                }
+                return returnValue;
+            }
+            catch (error) {
+                if (error instanceof Error && error.stack) {
+                    error.stack = error.stack
+                        .split("\n")
+                        .filter((s) => !s.includes(".propertyDescriptorDoNotChangeMyNamePlease.value"))
+                        .join("\n");
+                }
+                thisT.log.error(`Error in ${propertyName}:`, error);
+                throw error;
+            }
+        };
+        return propertyDescriptorDoNotChangeMyNamePlease;
     };
-    return propertyDesciptor;
 }
 exports.log = log;
 //# sourceMappingURL=logDecorator.js.map
@@ -39240,7 +39481,7 @@ function dayDiff(earlier, later) {
 }
 
 function highOrderDiffs(cursor, later, units) {
-  const differs = [["years", (a, b) => b.year - a.year], ["quarters", (a, b) => b.quarter - a.quarter], ["months", (a, b) => b.month - a.month + (b.year - a.year) * 12], ["weeks", (a, b) => {
+  const differs = [["years", (a, b) => b.year - a.year], ["quarters", (a, b) => b.quarter - a.quarter + (b.year - a.year) * 4], ["months", (a, b) => b.month - a.month + (b.year - a.year) * 12], ["weeks", (a, b) => {
     const days = dayDiff(a, b);
     return (days - days % 7) / 7;
   }], ["days", dayDiff]];
@@ -42429,7 +42670,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-const VERSION = "3.0.3";
+const VERSION = "3.0.4";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;