@nmshd/transport 2.0.0-beta.6 → 2.0.0-beta.8

package/lib-web/nmshd.transport.js

@@ -15,10 +15,10 @@ 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.6",
-    build: "37",
-    date: "2022-09-28T09:23:28+00:00",
-    commit: "3c28b2ad382a88645bc80f45ea3d3b6739218e2b",
+    version: "2.0.0-beta.8",
+    build: "39",
+    date: "2022-09-29T06:39:51+00:00",
+    commit: "0f2238798e431a2714819655de1ab59674528345",
     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,
@@ -40,7 +40,8 @@ exports.buildInformation = {
 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 PasswordGenerator_1 = __webpack_require__(/*! ../util/PasswordGenerator */ "./dist/util/PasswordGenerator.js");
+const TransportError_1 = __webpack_require__(/*! ./TransportError */ "./dist/core/TransportError.js");
 const TransportVersion_1 = __webpack_require__(/*! ./types/TransportVersion */ "./dist/core/types/TransportVersion.js");
 class CoreCrypto {
     /**
@@ -126,7 +127,7 @@ class CoreCrypto {
             buffer = secret;
         }
         else {
-            throw new Error("The secret type is invalid.");
+            throw new TransportError_1.TransportError("The secret type is invalid.");
         }
         return await crypto_1.CryptoDerivation.deriveKeyFromBase(buffer, keyId, context, keyAlgorithm);
     }
@@ -235,10 +236,10 @@ class CoreCrypto {
         return await crypto_1.CryptoRandom.bytes(size);
     }
     static async createAccountPassword() {
-        return await util_1.PasswordGenerator.createStrongPassword(100, 100);
+        return await PasswordGenerator_1.PasswordGenerator.createStrongPassword(100, 100);
     }
     static invalidVersion(version) {
-        return new Error(`The version ${version} is not supported.`);
+        return new TransportError_1.TransportError(`The version ${version} is not supported.`);
     }
 }
 exports.CoreCrypto = CoreCrypto;
@@ -319,6 +320,154 @@ exports.CoreError = CoreError;
 
 /***/ }),
 
+/***/ "./dist/core/CoreErrors.js":
+/*!*********************************!*\
+  !*** ./dist/core/CoreErrors.js ***!
+  \*********************************/
+/***/ (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.CoreErrors = 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 Relationships {
+    wrongChangeStatus(status) {
+        return new CoreError_1.CoreError("error.transport.relationships.wrongChangeStatus", `The relationship change has the wrong status (${status}) to run this operation`);
+    }
+}
+class Device {
+    alreadyOnboarded() {
+        return new CoreError_1.CoreError("error.transport.devices.alreadyOnboarded", "The device has already been onboarded.");
+    }
+}
+class Messages {
+    plaintextMismatch(ownAddress) {
+        return new CoreError_1.CoreError("error.transport.messages.plaintextMismatch", `The own address ${ownAddress} was not named as a recipient within the signed MessagePlaintext. A replay attack might be the cause of this.`);
+    }
+    signatureListMismatch(address) {
+        return new CoreError_1.CoreError("error.transport.messages.signatureListMismatch", `The signature list didn't contain an entry for address ${address}.`);
+    }
+    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.");
+    }
+    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.`);
+    }
+}
+class Secrets {
+    wrongSecretType(secretId) {
+        return new CoreError_1.CoreError("error.transport.secrets.wrongBaseKeyType", "Given Secret type is not supported!", {
+            secretId: secretId
+        });
+    }
+    secretNotFound(type) {
+        return new CoreError_1.CoreError("error.transport.secrets.secretNotFound", `secret "${type}" not found`);
+    }
+}
+class Challenges {
+    challengeTypeRequiresRelationship() {
+        return new CoreError_1.CoreError("error.transport.challenges.challengeTypeRequiresRelationship", "The challenge type Relationship requires a relationship.");
+    }
+}
+class Datawallet {
+    encryptedPayloadIsNoCipher() {
+        return new CoreError_1.CoreError("error.transport.datawallet.encryptedPayloadIsNoCipher", "The given encrypted payload is no cipher.");
+    }
+    unsupportedModification(type, data) {
+        const errorCode = "error.transport.datawallet.unsupportedModification";
+        const formattedData = data ? (0, json_stringify_safe_1.default)(data) : "";
+        switch (type) {
+            case "unsupportedCacheChangedModificationCollection":
+                return new CoreError_1.CoreError(errorCode, `The following collections were received in CacheChanged datawallet modifications but are not supported by the current version of this library: ${formattedData}.`);
+            default:
+                throw new Error(`Given type '${type}' is not supported.`);
+        }
+    }
+    insufficientSupportedDatawalletVersion(supportedVersion, requiredVersion) {
+        return new CoreError_1.CoreError("error.transport.datawallet.insufficientSupportedDatawalletVersion", `The SupportedDatawalletVersion '${supportedVersion}' is too low. A minimum version of '${requiredVersion}' is required.`);
+    }
+    currentBiggerThanTarget(current, target) {
+        return new CoreError_1.CoreError("error.transport.datawallet.currentBiggerThanTarget", `The current datawallet version '${current}' is bigger than the target version '${target}'.`);
+    }
+}
+class Files {
+    plaintextHashMismatch() {
+        return new CoreError_1.CoreError("error.transport.files.plaintextHashMismatch", "The actual hash of the plaintext does not match the given plaintextHash. Something went wrong while encrypting/decrypting the file.");
+    }
+    cipherMismatch() {
+        return new CoreError_1.CoreError("error.transport.files.cipherMismatch", "The actual hash of the cipher does not match the given cipherHash. Something went wrong while storing/transmitting the file.");
+    }
+    invalidMetadata(id) {
+        return new CoreError_1.CoreError("error.transport.files.invalidMetadata", `The metadata of file id "${id}" is invalid.`);
+    }
+    fileContentUndefined() {
+        return new CoreError_1.CoreError("error.transport.files.fileContentUndefined", "The given file content is undefined.");
+    }
+    maxFileSizeExceeded(fileSize, platformMaxFileSize) {
+        return new CoreError_1.CoreError("error.transport.files.maxFileSizeExceeded", `The given file content size (${fileSize}) exceeds the max file size the backbone accepts (${platformMaxFileSize}).`);
+    }
+}
+class Tokens {
+    invalidTokenContent(id) {
+        return new CoreError_1.CoreError("error.transport.tokens.invalidTokenContent", `The content of token ${id} is not of type TokenContent`);
+    }
+}
+class General {
+    baseUrlNotSet() {
+        return new CoreError_1.CoreError("error.transport.general.baseUrlNotSet", "The baseUrl was not set.");
+    }
+    platformClientIdNotSet() {
+        return new CoreError_1.CoreError("error.transport.general.platformClientNotSet", "The platform clientSecret was not set.");
+    }
+    platformClientSecretNotSet() {
+        return new CoreError_1.CoreError("error.transport.general.platformClientNotSet", "The platform clientId was not set.");
+    }
+    platformClientInvalid() {
+        return new CoreError_1.CoreError("error.transport.general.platformClientInvalid", "The combination of platform clientId and clientSecret is invalid.");
+    }
+    incompatibleBackbone() {
+        return new CoreError_1.CoreError("error.transport.incompatibleBackbone", "The backbone sent an invalid payload.");
+    }
+    signatureNotValid(type) {
+        return new CoreError_1.CoreError("error.transport.signatureNotValid", `The ${type ? `${type}-` : ""}signature is not valid.`);
+    }
+    recordNotFound(entityName, entityId) {
+        return new CoreError_1.CoreError("error.transport.recordNotFound", `'${entityName instanceof Function ? entityName.name : entityName}' not found.`, entityId);
+    }
+    notSupported() {
+        return new CoreError_1.CoreError("error.transport.notSupported", "The method is not yet supported.");
+    }
+    realmLength() {
+        return new CoreError_1.CoreError("error.transport.identity.realmLength", "Realm must be of length 3.");
+    }
+    invalidTruncatedReference() {
+        return new CoreError_1.CoreError("error.transport.files.invalidTruncatedReference", "invalid truncated reference");
+    }
+}
+class CoreErrors {
+}
+exports.CoreErrors = CoreErrors;
+CoreErrors.relationships = new Relationships();
+CoreErrors.general = new General();
+CoreErrors.messages = new Messages();
+CoreErrors.secrets = new Secrets();
+CoreErrors.device = new Device();
+CoreErrors.files = new Files();
+CoreErrors.challenges = new Challenges();
+CoreErrors.datawallet = new Datawallet();
+CoreErrors.tokens = new Tokens();
+//# sourceMappingURL=CoreErrors.js.map
+
+/***/ }),
+
 /***/ "./dist/core/CoreIdHelper.js":
 /*!***********************************!*\
   !*** ./dist/core/CoreIdHelper.js ***!
@@ -330,6 +479,7 @@ exports.CoreError = CoreError;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.CoreIdHelper = void 0;
 const Random_1 = __webpack_require__(/*! ../util/Random */ "./dist/util/Random.js");
+const TransportError_1 = __webpack_require__(/*! ./TransportError */ "./dist/core/TransportError.js");
 const CoreId_1 = __webpack_require__(/*! ./types/CoreId */ "./dist/core/types/CoreId.js");
 class CoreIdHelper {
     constructor(prefix, validateOnly = false) {
@@ -339,7 +489,7 @@ class CoreIdHelper {
     }
     async generate() {
         if (this.validateOnly) {
-            throw new Error("This CoreIdHelper is set up for validation only.");
+            throw new TransportError_1.TransportError("This CoreIdHelper is set up for validation only.");
         }
         return await CoreId_1.CoreId.generate(this.prefix);
     }
@@ -504,6 +654,7 @@ 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 TransportError_1 = __webpack_require__(/*! ./TransportError */ "./dist/core/TransportError.js");
 class CoreUtil {
     static toBuffer(content, verbose = false) {
         let buffer;
@@ -520,7 +671,7 @@ class CoreUtil {
             buffer = new crypto_1.CoreBuffer(content);
         }
         else {
-            throw new Error("The given content cannot be transformed to buffer.");
+            throw new TransportError_1.TransportError("The given content cannot be transformed to buffer.");
         }
         return buffer;
     }
@@ -654,7 +805,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Reference = 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");
+const CoreErrors_1 = __webpack_require__(/*! ./CoreErrors */ "./dist/core/CoreErrors.js");
 const CoreId_1 = __webpack_require__(/*! ./types/CoreId */ "./dist/core/types/CoreId.js");
 class Reference extends ts_serval_1.Serializable {
     truncate() {
@@ -665,7 +816,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.general.invalidTruncatedReference();
+            throw CoreErrors_1.CoreErrors.general.invalidTruncatedReference();
         }
         try {
             const id = CoreId_1.CoreId.from(splitted[0]);
@@ -681,7 +832,7 @@ class Reference extends ts_serval_1.Serializable {
             });
         }
         catch (e) {
-            throw TransportErrors_1.TransportErrors.general.invalidTruncatedReference();
+            throw CoreErrors_1.CoreErrors.general.invalidTruncatedReference();
         }
     }
     static validateId(value, helper) {
@@ -729,8 +880,9 @@ const simple_logger_1 = __webpack_require__(/*! @js-soft/simple-logger */ "./nod
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const lodash_1 = __importDefault(__webpack_require__(/*! lodash */ "./node_modules/lodash/lodash.js"));
 const Identity_1 = __webpack_require__(/*! ../modules/accounts/data/Identity */ "./dist/modules/accounts/data/Identity.js");
+const CoreErrors_1 = __webpack_require__(/*! ./CoreErrors */ "./dist/core/CoreErrors.js");
 const TransportContext_1 = __webpack_require__(/*! ./TransportContext */ "./dist/core/TransportContext.js");
-const TransportErrors_1 = __webpack_require__(/*! ./TransportErrors */ "./dist/core/TransportErrors.js");
+const TransportError_1 = __webpack_require__(/*! ./TransportError */ "./dist/core/TransportError.js");
 const TransportLoggerFactory_1 = __webpack_require__(/*! ./TransportLoggerFactory */ "./dist/core/TransportLoggerFactory.js");
 let log;
 class Transport {
@@ -741,19 +893,19 @@ class Transport {
         TransportLoggerFactory_1.TransportLoggerFactory.init(loggerFactory);
         log = TransportLoggerFactory_1.TransportLoggerFactory.getLogger(Transport);
         if (!this._config.platformClientId) {
-            throw TransportErrors_1.TransportErrors.general.platformClientIdNotSet().logWith(log);
+            throw CoreErrors_1.CoreErrors.general.platformClientIdNotSet().logWith(log);
         }
         if (!this._config.platformClientSecret) {
-            throw TransportErrors_1.TransportErrors.general.platformClientSecretNotSet().logWith(log);
+            throw CoreErrors_1.CoreErrors.general.platformClientSecretNotSet().logWith(log);
         }
         if (!this._config.baseUrl) {
-            throw TransportErrors_1.TransportErrors.general.baseUrlNotSet().logWith(log);
+            throw CoreErrors_1.CoreErrors.general.baseUrlNotSet().logWith(log);
         }
         if (this._config.supportedDatawalletVersion < 1) {
-            throw new Error("The given identity version is invalid. The value must be 0 or higher.");
+            throw new TransportError_1.TransportError("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();
+            throw CoreErrors_1.CoreErrors.general.realmLength();
         }
     }
     get config() {
@@ -849,6 +1001,7 @@ var TransportContext;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TransportController = exports.ControllerName = void 0;
+const TransportError_1 = __webpack_require__(/*! ./TransportError */ "./dist/core/TransportError.js");
 const TransportLoggerFactory_1 = __webpack_require__(/*! ./TransportLoggerFactory */ "./dist/core/TransportLoggerFactory.js");
 var ControllerName;
 (function (ControllerName) {
@@ -914,7 +1067,7 @@ class TransportController {
     }
     init(..._args) {
         if (this._initialized) {
-            throw new Error(`The controller ${this.controllerName} is already initialized.`);
+            throw new TransportError_1.TransportError(`The controller ${this.controllerName} is already initialized.`);
         }
         this._initialized = true;
         return Promise.resolve(this);
@@ -922,160 +1075,29 @@ class TransportController {
     parseArray(values, type) {
         return values.map((v) => type.fromAny(v));
     }
+    newCacheEmptyError(entityName, id) {
+        return new TransportError_1.TransportError(`The cache of ${entityName instanceof Function ? entityName.name : entityName} with id "${id}" is empty.`);
+    }
 }
 exports.TransportController = TransportController;
 //# sourceMappingURL=TransportController.js.map
 
 /***/ }),
 
-/***/ "./dist/core/TransportErrors.js":
-/*!**************************************!*\
-  !*** ./dist/core/TransportErrors.js ***!
-  \**************************************/
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+/***/ "./dist/core/TransportError.js":
+/*!*************************************!*\
+  !*** ./dist/core/TransportError.js ***!
+  \*************************************/
+/***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 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 Relationships {
-    wrongChangeStatus(status) {
-        return new CoreError_1.CoreError("error.transport.relationships.wrongChangeStatus", `The relationship change has the wrong status (${status}) to run this operation`);
-    }
-}
-class Device {
-    alreadyOnboarded() {
-        return new CoreError_1.CoreError("error.transport.devices.alreadyOnboarded", "The device has already been onboarded.");
-    }
-}
-class Messages {
-    plaintextMismatch(ownAddress) {
-        return new CoreError_1.CoreError("error.transport.messages.plaintextMismatch", `The own address ${ownAddress} was not named as a recipient within the signed MessagePlaintext. A replay attack might be the cause of this.`);
-    }
-    signatureListMismatch(address) {
-        return new CoreError_1.CoreError("error.transport.messages.signatureListMismatch", `The signature list didn't contain an entry for address ${address}.`);
-    }
-    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.");
-    }
-    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.`);
-    }
-}
-class Secrets {
-    wrongSecretType(secretId) {
-        return new CoreError_1.CoreError("error.transport.secrets.wrongBaseKeyType", "Given Secret type is not supported!", {
-            secretId: secretId
-        });
-    }
-    secretNotFound(type) {
-        return new CoreError_1.CoreError("error.transport.secrets.secretNotFound", `secret "${type}" not found`);
-    }
+exports.TransportError = void 0;
+class TransportError extends Error {
 }
-class Challenges {
-    challengeTypeRequiresRelationship() {
-        return new CoreError_1.CoreError("error.transport.challenges.challengeTypeRequiresRelationship", "The challenge type Relationship requires a relationship.");
-    }
-}
-class Datawallet {
-    encryptedPayloadIsNoCipher() {
-        return new CoreError_1.CoreError("error.transport.datawallet.encryptedPayloadIsNoCipher", "The given encrypted payload is no cipher.");
-    }
-    unsupportedModification(type, data) {
-        const errorCode = "error.transport.datawallet.unsupportedModification";
-        const formattedData = data ? (0, json_stringify_safe_1.default)(data) : "";
-        switch (type) {
-            case "unsupportedCacheChangedModificationCollection":
-                return new CoreError_1.CoreError(errorCode, `The following collections were received in CacheChanged datawallet modifications but are not supported by the current version of this library: ${formattedData}.`);
-            default:
-                throw new Error(`Given type '${type}' is not supported.`);
-        }
-    }
-    insufficientSupportedDatawalletVersion(supportedVersion, requiredVersion) {
-        return new CoreError_1.CoreError("error.transport.datawallet.insufficientSupportedDatawalletVersion", `The SupportedDatawalletVersion '${supportedVersion}' is too low. A minimum version of '${requiredVersion}' is required.`);
-    }
-    currentBiggerThanTarget(current, target) {
-        return new CoreError_1.CoreError("error.transport.datawallet.currentBiggerThanTarget", `The current datawallet version '${current}' is bigger than the target version '${target}'.`);
-    }
-}
-class Files {
-    plaintextHashMismatch() {
-        return new CoreError_1.CoreError("error.transport.files.plaintextHashMismatch", "The actual hash of the plaintext does not match the given plaintextHash. Something went wrong while encrypting/decrypting the file.");
-    }
-    cipherMismatch() {
-        return new CoreError_1.CoreError("error.transport.files.cipherMismatch", "The actual hash of the cipher does not match the given cipherHash. Something went wrong while storing/transmitting the file.");
-    }
-    invalidMetadata(id) {
-        return new CoreError_1.CoreError("error.transport.files.invalidMetadata", `The metadata of file id "${id}" is invalid.`);
-    }
-    fileContentUndefined() {
-        return new CoreError_1.CoreError("error.transport.files.fileContentUndefined", "The given file content is undefined.");
-    }
-    maxFileSizeExceeded(fileSize, platformMaxFileSize) {
-        return new CoreError_1.CoreError("error.transport.files.maxFileSizeExceeded", `The given file content size (${fileSize}) exceeds the max file size the backbone accepts (${platformMaxFileSize}).`);
-    }
-}
-class Tokens {
-    invalidTokenContent(id) {
-        return new CoreError_1.CoreError("error.transport.tokens.invalidTokenContent", `The content of token ${id} is not of type TokenContent`);
-    }
-}
-class General {
-    baseUrlNotSet() {
-        return new CoreError_1.CoreError("error.transport.general.baseUrlNotSet", "The baseUrl was not set.");
-    }
-    platformClientIdNotSet() {
-        return new CoreError_1.CoreError("error.transport.general.platformClientNotSet", "The platform clientSecret was not set.");
-    }
-    platformClientSecretNotSet() {
-        return new CoreError_1.CoreError("error.transport.general.platformClientNotSet", "The platform clientId was not set.");
-    }
-    platformClientInvalid() {
-        return new CoreError_1.CoreError("error.transport.general.platformClientInvalid", "The combination of platform clientId and clientSecret is invalid.");
-    }
-    cacheEmpty(entityName, 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.");
-    }
-    signatureNotValid(type) {
-        return new CoreError_1.CoreError("error.transport.signatureNotValid", `The ${type ? `${type}-` : ""}signature is not valid.`);
-    }
-    recordNotFound(entityName, entityId) {
-        return new CoreError_1.CoreError("error.transport.recordNotFound", `'${entityName instanceof Function ? entityName.name : entityName}' not found.`, entityId);
-    }
-    notSupported() {
-        return new CoreError_1.CoreError("error.transport.notSupported", "The method is not yet supported.");
-    }
-    realmLength() {
-        return new CoreError_1.CoreError("error.transport.identity.realmLength", "Realm must be of length 3.");
-    }
-    invalidTruncatedReference() {
-        return new CoreError_1.CoreError("error.transport.files.invalidTruncatedReference", "invalid truncated reference");
-    }
-}
-class TransportErrors {
-}
-exports.TransportErrors = TransportErrors;
-TransportErrors.relationships = new Relationships();
-TransportErrors.general = new General();
-TransportErrors.messages = new Messages();
-TransportErrors.secrets = new Secrets();
-TransportErrors.device = new Device();
-TransportErrors.files = new Files();
-TransportErrors.challenges = new Challenges();
-TransportErrors.datawallet = new Datawallet();
-TransportErrors.tokens = new Tokens();
-//# sourceMappingURL=TransportErrors.js.map
+exports.TransportError = TransportError;
+//# sourceMappingURL=TransportError.js.map
 
 /***/ }),
 
@@ -1106,19 +1128,20 @@ TransportIds.datawalletModification = new CoreIdHelper_1.CoreIdHelper("TRPDWM");
 /*!*********************************************!*\
   !*** ./dist/core/TransportLoggerFactory.js ***!
   \*********************************************/
-/***/ ((__unused_webpack_module, exports) => {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TransportLoggerFactory = void 0;
+const TransportError_1 = __webpack_require__(/*! ./TransportError */ "./dist/core/TransportError.js");
 class TransportLoggerFactory {
     static init(instance) {
         this.instance = instance;
     }
     static getLogger(name) {
         if (!this.isInitialized()) {
-            throw new Error("The logger factory is not yet initialized. Call TransportLoggerFactory.init() first.");
+            throw new TransportError_1.TransportError("The logger factory is not yet initialized. Call TransportLoggerFactory.init() first.");
         }
         if (typeof name === "function") {
             return this.instance.getLogger(`Transport.${name.name}`);
@@ -1298,17 +1321,18 @@ BackboneIds.device = new CoreIdHelper_1.CoreIdHelper("DVC", true);
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ClientResult = void 0;
+const TransportError_1 = __webpack_require__(/*! ../TransportError */ "./dist/core/TransportError.js");
 const CoreDate_1 = __webpack_require__(/*! ../types/CoreDate */ "./dist/core/types/CoreDate.js");
 class ClientResult {
     constructor(isSuccess, value, error, platformParameters) {
         if (isSuccess && error) {
-            throw new Error("InvalidOperation: A result cannot be successful and contain an error");
+            throw new TransportError_1.TransportError("InvalidOperation: A result cannot be successful and contain an error");
         }
         if (!isSuccess && !error) {
-            throw new Error("InvalidOperation: A failing result needs to contain an error");
+            throw new TransportError_1.TransportError("InvalidOperation: A failing result needs to contain an error");
         }
         if (value !== undefined && !isSuccess) {
-            throw new Error("InvalidOperation: A value is only useful in case of a success.");
+            throw new TransportError_1.TransportError("InvalidOperation: A value is only useful in case of a success.");
         }
         this._value = value;
         this._isSuccess = isSuccess;
@@ -1334,7 +1358,7 @@ class ClientResult {
     }
     get error() {
         if (this._isSuccess) {
-            throw new Error("Can't get the error of an succeeded result. Use 'value' instead.");
+            throw new TransportError_1.TransportError("Can't get the error of an succeeded result. Use 'value' instead.");
         }
         return this._error;
     }
@@ -2116,6 +2140,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 __exportStar(__webpack_require__(/*! ./backbone */ "./dist/core/backbone/index.js"), exports);
 __exportStar(__webpack_require__(/*! ./CoreCrypto */ "./dist/core/CoreCrypto.js"), exports);
 __exportStar(__webpack_require__(/*! ./CoreError */ "./dist/core/CoreError.js"), exports);
+__exportStar(__webpack_require__(/*! ./CoreErrors */ "./dist/core/CoreErrors.js"), exports);
 __exportStar(__webpack_require__(/*! ./CoreIdHelper */ "./dist/core/CoreIdHelper.js"), exports);
 __exportStar(__webpack_require__(/*! ./CoreSerializable */ "./dist/core/CoreSerializable.js"), exports);
 __exportStar(__webpack_require__(/*! ./CoreSerializableAsync */ "./dist/core/CoreSerializableAsync.js"), exports);
@@ -2127,7 +2152,7 @@ __exportStar(__webpack_require__(/*! ./Reference */ "./dist/core/Reference.js"),
 __exportStar(__webpack_require__(/*! ./Transport */ "./dist/core/Transport.js"), exports);
 __exportStar(__webpack_require__(/*! ./TransportContext */ "./dist/core/TransportContext.js"), exports);
 __exportStar(__webpack_require__(/*! ./TransportController */ "./dist/core/TransportController.js"), exports);
-__exportStar(__webpack_require__(/*! ./TransportErrors */ "./dist/core/TransportErrors.js"), exports);
+__exportStar(__webpack_require__(/*! ./TransportError */ "./dist/core/TransportError.js"), exports);
 __exportStar(__webpack_require__(/*! ./TransportIds */ "./dist/core/TransportIds.js"), exports);
 __exportStar(__webpack_require__(/*! ./TransportLoggerFactory */ "./dist/core/TransportLoggerFactory.js"), exports);
 __exportStar(__webpack_require__(/*! ./types */ "./dist/core/types/index.js"), exports);
@@ -2218,6 +2243,7 @@ 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 TransportError_1 = __webpack_require__(/*! ../TransportError */ "./dist/core/TransportError.js");
 let CoreDate = CoreDate_1 = class CoreDate extends CoreSerializable_1.CoreSerializable {
     constructor(dateTime = luxon_1.DateTime.utc()) {
         super();
@@ -2330,12 +2356,12 @@ let CoreDate = CoreDate_1 = class CoreDate extends CoreSerializable_1.CoreSerial
     }
     static preFrom(value) {
         if (typeof value === "undefined") {
-            throw new Error("The provided object is undefined and cannot be deserialized.");
+            throw new TransportError_1.TransportError("The provided object is undefined and cannot be deserialized.");
         }
         if (typeof value === "object") {
             if (typeof value.date === "undefined") {
                 if (typeof value.toISOString !== "function") {
-                    throw new Error("The provided object doesn't have an 'toISOString' string method.");
+                    throw new TransportError_1.TransportError("The provided object doesn't have an 'toISOString' string method.");
                 }
                 const iso = value.toISOString();
                 return luxon_1.DateTime.fromISO(iso, { zone: "utc" });
@@ -2348,7 +2374,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 new Error("The provided object is invalid cannot be deserialized.");
+        throw new TransportError_1.TransportError("The provided object is invalid cannot be deserialized.");
     }
     static from(value) {
         return this.fromAny(value);
@@ -2470,6 +2496,7 @@ 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 TransportError_1 = __webpack_require__(/*! ../TransportError */ "./dist/core/TransportError.js");
 /**
  * A CoreId is any kind of identifier we have in the system.
  */
@@ -2482,7 +2509,7 @@ let CoreId = class CoreId extends CoreSerializable_1.CoreSerializable {
     }
     static async generate(prefix = "") {
         if (prefix.length > 6) {
-            throw new Error(`The prefix "${prefix}" is too long. It must not be longer than 6 characters.`);
+            throw new TransportError_1.TransportError(`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);
@@ -2843,7 +2870,7 @@ class AccountController {
     }
     get activeDevice() {
         if (!this._activeDevice) {
-            throw new Error("The DeviceController is not initialized yet.");
+            throw new core_1.TransportError("The DeviceController is not initialized yet.");
         }
         return this._activeDevice;
     }
@@ -2853,7 +2880,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);
@@ -2888,7 +2914,7 @@ class AccountController {
         else if (!deviceSharedSecret && availableIdentityDoc && availableDeviceDoc) {
             // Login
             if (!availableBaseKeyDoc) {
-                throw core_1.TransportErrors.secrets.secretNotFound("BaseKey");
+                throw core_1.CoreErrors.secrets.secretNotFound("BaseKey");
             }
             const [availableIdentity, availableDevice, availableBaseKey] = await Promise.all([
                 Identity_1.Identity.from(availableIdentityDoc),
@@ -2902,7 +2928,7 @@ class AccountController {
             this.deviceAuthClient = new DeviceAuthClient_1.DeviceAuthClient(this.config, this.authenticator);
         }
         else {
-            throw new Error("The combination of deviceSharedSecret, existing identity or device is not allowed.");
+            throw new core_1.TransportError("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();
@@ -2998,13 +3024,13 @@ class AccountController {
         if (deviceResponseResult.isError) {
             const error = deviceResponseResult.error;
             if (error.code === "error.platform.unauthorized") {
-                throw core_1.TransportErrors.general.platformClientInvalid();
+                throw core_1.CoreErrors.general.platformClientInvalid();
             }
         }
         const deviceResponse = deviceResponseResult.value;
         this._log.trace(`Registered identity with address ${deviceResponse.address}, device id is ${deviceResponse.device.id}.`);
         if (!localAddress.equals(deviceResponse.address)) {
-            throw new Error("The backbone address does not match the local address.");
+            throw new core_1.TransportError("The backbone address does not match the local address.");
         }
         const identity = Identity_1.Identity.from({
             address: core_1.CoreAddress.from(deviceResponse.address),
@@ -3043,7 +3069,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) {
@@ -3186,7 +3211,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);
+            throw core_1.CoreErrors.secrets.secretNotFound(DeviceSecretController_1.DeviceSecretType.IdentitySignature);
         }
         const privateKey = privateKeyContainer.secret;
         const signature = await core_1.CoreCrypto.sign(content, privateKey);
@@ -3230,7 +3255,7 @@ const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
 class IdentityUtil {
     static async createAddress(publicKey, realm) {
         if (realm.length !== 3)
-            throw core_1.TransportErrors.general.realmLength();
+            throw core_1.CoreErrors.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));
@@ -3328,7 +3353,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";
@@ -3336,14 +3360,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);
     }
@@ -3363,30 +3379,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);
@@ -4304,7 +4296,7 @@ class ChallengeController extends TransportController_1.TransportController {
             return { isValid: false };
         const relationship = await this.parent.relationships.getActiveRelationshipToIdentity(challenge.createdBy);
         if (!relationship) {
-            throw core_1.TransportErrors.general.recordNotFound(Relationship_1.Relationship, challenge.createdBy.toString());
+            throw core_1.CoreErrors.general.recordNotFound(Relationship_1.Relationship, challenge.createdBy.toString());
         }
         const challengeBuffer = crypto_1.CoreBuffer.fromUtf8(signedChallenge.challenge);
         let isValid = false;
@@ -4313,7 +4305,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.notSupported();
+                throw core_1.CoreErrors.general.notSupported();
             case Challenge_1.ChallengeType.Relationship:
                 isValid = await this.parent.relationships.verify(relationship, challengeBuffer, signedChallenge.signature);
                 break;
@@ -4332,8 +4324,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 };
         }
@@ -4357,7 +4347,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.challengeTypeRequiresRelationship();
+            throw core_1.CoreErrors.challenges.challengeTypeRequiresRelationship();
         }
         const backboneResponse = (await this.authClient.createChallenge()).value;
         const challenge = Challenge_1.Challenge.from({
@@ -4381,7 +4371,7 @@ class ChallengeController extends TransportController_1.TransportController {
                 break;
             case Challenge_1.ChallengeType.Relationship:
                 if (!relationship) {
-                    throw core_1.TransportErrors.challenges.challengeTypeRequiresRelationship();
+                    throw core_1.CoreErrors.challenges.challengeTypeRequiresRelationship();
                 }
                 signature = await this.parent.relationships.sign(relationship, challengeBuffer);
                 break;
@@ -4638,7 +4628,7 @@ class DeviceController extends core_1.TransportController {
     }
     get device() {
         if (!this._device)
-            throw new Error("The Device controller is not initialized.");
+            throw new core_1.TransportError("The Device controller is not initialized.");
         return this._device;
     }
     get deviceOrUndefined() {
@@ -4659,15 +4649,14 @@ class DeviceController extends core_1.TransportController {
         try {
             const credentialContainer = await this.secrets.loadSecret(DeviceSecretController_1.DeviceSecretType.DeviceCredentials);
             if (!credentialContainer) {
-                throw new Error("There was an error while accessing the device_credentials secret.");
+                throw new core_1.TransportError("There was an error while accessing the device_credentials secret.");
             }
             const credentials = credentialContainer.secret;
             credentials.password = newPassword;
             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;
         }
     }
@@ -4684,7 +4673,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);
+            throw core_1.CoreErrors.secrets.secretNotFound(DeviceSecretController_1.DeviceSecretType.DeviceSignature);
         }
         const privateKey = privateKeyContainer.secret;
         const signature = await core_1.CoreCrypto.sign(content, privateKey);
@@ -4693,21 +4682,21 @@ class DeviceController extends core_1.TransportController {
     }
     async verify(content, signature) {
         if (!this.publicKey) {
-            throw new Error("The device has no public key to verify a signature. This can happen if the device is not onboarded yet.");
+            throw new core_1.TransportError("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);
+            throw core_1.CoreErrors.secrets.secretNotFound(DeviceSecretController_1.DeviceSecretType.DeviceCredentials);
         }
         if (!(credentialContainer.secret instanceof DeviceSecretCredentials_1.DeviceSecretCredentials)) {
-            throw core_1.TransportErrors.secrets.wrongSecretType(DeviceSecretController_1.DeviceSecretType.DeviceCredentials);
+            throw core_1.CoreErrors.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);
+            throw core_1.CoreErrors.secrets.wrongSecretType(DeviceSecretController_1.DeviceSecretType.DeviceCredentials);
         }
         return {
             username: credentials.username,
@@ -4851,17 +4840,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");
+            throw core_1.CoreErrors.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");
+            throw core_1.CoreErrors.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");
+                throw core_1.CoreErrors.secrets.secretNotFound("IdentityKey");
             }
         }
         const deviceSharedSecret = DeviceSharedSecret_1.DeviceSharedSecret.from({
@@ -4878,7 +4867,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) {
@@ -4888,7 +4876,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);
+            throw core_1.CoreErrors.secrets.secretNotFound(DeviceSecretType.IdentitySynchronizationMaster);
         }
         const encryptionKey = await core_1.CoreCrypto.deriveKeyFromBase(privSync.secret, index, "DataSync");
         const cipher = await core_1.CoreCrypto.encrypt(serializedEvent, encryptionKey);
@@ -4902,7 +4890,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);
+            throw core_1.CoreErrors.secrets.secretNotFound(DeviceSecretType.IdentitySynchronizationMaster);
         }
         const decryptionKey = await core_1.CoreCrypto.deriveKeyFromBase(privSync.secret, index, "DataSync");
         const plaintext = await core_1.CoreCrypto.decrypt(payloadCipher, decryptionKey);
@@ -4912,7 +4900,7 @@ class DeviceSecretController extends TransportController_1.TransportController {
     }
     getBaseKey() {
         if (!this.baseKey) {
-            throw core_1.TransportErrors.general.recordNotFound(crypto_1.CryptoSecretKey, DeviceSecretType.SharedSecretBaseKey);
+            throw core_1.CoreErrors.general.recordNotFound(crypto_1.CryptoSecretKey, DeviceSecretType.SharedSecretBaseKey);
         }
         return this.baseKey;
     }
@@ -5022,12 +5010,12 @@ class DevicesController extends TransportController_1.TransportController {
     async getSharedSecret(id) {
         const deviceDoc = await this.devices.read(id.toString());
         if (!deviceDoc) {
-            throw core_1.TransportErrors.general.recordNotFound(Device_1.Device, id.toString());
+            throw core_1.CoreErrors.general.recordNotFound(Device_1.Device, id.toString());
         }
         const count = await this.devices.count();
         const device = Device_1.Device.from(deviceDoc);
         if (!device.initialPassword || device.publicKey || device.lastLoginAt) {
-            throw core_1.TransportErrors.device.alreadyOnboarded();
+            throw core_1.CoreErrors.device.alreadyOnboarded();
         }
         const isAdmin = device.isAdmin === true;
         const secret = await this.parent.activeDevice.secrets.createDeviceSharedSecret(device, count, isAdmin);
@@ -5036,7 +5024,7 @@ class DevicesController extends TransportController_1.TransportController {
     async update(device) {
         const deviceDoc = await this.devices.read(device.id.toString());
         if (!deviceDoc) {
-            throw core_1.TransportErrors.general.recordNotFound(Device_1.Device, device.id.toString());
+            throw core_1.CoreErrors.general.recordNotFound(Device_1.Device, device.id.toString());
         }
         await this.devices.update(deviceDoc, device);
     }
@@ -5509,7 +5497,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) {
@@ -5520,7 +5507,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);
+            throw core_1.CoreErrors.general.recordNotFound(File_1.File, id);
         }
         const file = File_1.File.from(fileDoc);
         await this.updateCacheOfFile(file, response);
@@ -5542,9 +5529,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);
+            throw core_1.CoreErrors.files.invalidMetadata(response.id);
         }
-        // TODO: JSSNMSHDD-2486 (check signature)
         const cachedFile = CachedFile_1.CachedFile.fromBackbone(response, plaintextMetadata);
         return cachedFile;
     }
@@ -5575,7 +5561,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());
+            throw core_1.CoreErrors.general.recordNotFound(File_1.File, id.toString());
         }
         const file = File_1.File.from(fileDoc);
         file.setMetadata(metadata);
@@ -5587,7 +5573,7 @@ class FileController extends TransportController_1.TransportController {
         const content = input.buffer;
         const fileSize = content.length;
         if (fileSize > this.config.platformMaxUnencryptedFileSize) {
-            throw core_1.TransportErrors.files.maxFileSizeExceeded(fileSize, this.config.platformMaxUnencryptedFileSize);
+            throw core_1.CoreErrors.files.maxFileSizeExceeded(fileSize, this.config.platformMaxUnencryptedFileSize);
         }
         const plaintextHashBuffer = await crypto_1.CryptoHash.hash(content, 2 /* CryptoHashAlgorithm.SHA512 */);
         const plaintextHash = core_1.CoreHash.from(plaintextHashBuffer.toBase64URL());
@@ -5650,30 +5636,22 @@ 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());
-        }
-        if (!file.cache) {
-            throw core_1.TransportErrors.general.cacheEmpty(File_1.File, file.id.toString());
+            throw core_1.CoreErrors.general.recordNotFound(File_1.File, idOrFile.toString());
         }
+        if (!file.cache)
+            throw this.newCacheEmptyError(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();
-        }
-        /*
-        // 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")
+            throw core_1.CoreErrors.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();
+            throw core_1.CoreErrors.files.plaintextHashMismatch();
         }
         return decrypt;
     }
@@ -6272,9 +6250,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);
@@ -6293,10 +6271,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);
@@ -6305,7 +6283,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);
@@ -6377,9 +6355,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 {
@@ -6409,7 +6387,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());
+            throw core_1.CoreErrors.messages.noMatchingRelationship(address.toString());
         }
         return await this.getMessagesByRelationshipId(relationship.id);
     }
@@ -6449,7 +6427,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);
+            throw core_1.CoreErrors.general.recordNotFound(Message_1.Message, id);
         }
         const message = Message_1.Message.from(messageDoc);
         await this.updateCacheOfMessage(message, response);
@@ -6471,7 +6449,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());
+            throw core_1.CoreErrors.general.recordNotFound(Relationship_1.Relationship, envelope.id.toString());
         }
         const message = Message_1.Message.from({
             id: envelope.id,
@@ -6509,7 +6487,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());
+            throw core_1.CoreErrors.general.recordNotFound(Message_1.Message, id.toString());
         }
         const message = Message_1.Message.from(messageDoc);
         message.setMetadata(metadata);
@@ -6527,7 +6505,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());
+                throw core_1.CoreErrors.general.recordNotFound(Relationship_1.Relationship, recipient.toString());
             }
             const cipherForRecipient = await this.secrets.encrypt(relationship.relationshipSecretId, serializedSecret);
             envelopeRecipients.push(MessageEnvelopeRecipient_1.MessageEnvelopeRecipient.from({
@@ -6543,7 +6521,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(),
@@ -6556,7 +6534,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());
+                throw core_1.CoreErrors.general.recordNotFound(Relationship_1.Relationship, recipient.toString());
             }
             const signature = await this.secrets.sign(relationship.relationshipSecretId, plaintextBuffer);
             const messageSignature = MessageSignature_1.MessageSignature.from({
@@ -6613,14 +6591,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());
+            throw core_1.CoreErrors.messages.ownAddressNotInList(envelope.id.toString());
         }
         const plaintextKeyBuffer = await this.secrets.decryptPeer(relationship.relationshipSecretId, ownKeyCipher, true);
         const plaintextKey = crypto_1.CryptoSecretKey.deserialize(plaintextKeyBuffer.toUtf8());
@@ -6628,16 +6606,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());
+            throw core_1.CoreErrors.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();
+            throw core_1.CoreErrors.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}.`);
@@ -6647,7 +6625,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());
+            throw core_1.CoreErrors.messages.plaintextMismatch(envelope.id.toString());
         }
         return [messagePlain, plaintextKey];
     }
@@ -6658,7 +6636,7 @@ class MessageController extends TransportController_1.TransportController {
         let relationship;
         if (this.parent.identity.isMe(envelope.createdBy)) {
             if (!secretKey) {
-                throw new Error(`The own message (${envelope.id.toString()}) could not be decrypted, because no secret key was passed for it.`);
+                throw new core_1.TransportError(`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);
@@ -6666,7 +6644,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());
+                throw core_1.CoreErrors.messages.noMatchingRelationship(envelope.createdBy.toString());
             }
             const [peerMessage, peerKey] = await this.decryptPeerEnvelope(envelope, relationship);
             plainMessage = peerMessage;
@@ -7023,6 +7001,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 ***!
@@ -7169,83 +7224,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 ***!
@@ -7368,7 +7346,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 {
@@ -7384,11 +7362,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
@@ -7406,7 +7381,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({
@@ -7417,7 +7391,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({
@@ -7442,7 +7415,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) {
@@ -7464,7 +7436,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);
+            throw core_1.CoreErrors.general.recordNotFound(RelationshipTemplate_1.RelationshipTemplate, id);
         }
         const template = RelationshipTemplate_1.RelationshipTemplate.from(templateDoc);
         await this.updateCacheOfTemplate(template, response);
@@ -7481,14 +7453,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");
+            throw core_1.CoreErrors.general.signatureNotValid("template");
         }
         const cachedTemplate = CachedRelationshipTemplate_1.CachedRelationshipTemplate.from({
             content: templateContent.content,
@@ -7498,7 +7470,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;
@@ -7514,7 +7485,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());
+            throw core_1.CoreErrors.general.recordNotFound(RelationshipTemplate_1.RelationshipTemplate, id.toString());
         }
         const template = RelationshipTemplate_1.RelationshipTemplate.from(templateDoc);
         template.setMetadata(metadata);
@@ -7643,7 +7614,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");
@@ -7694,24 +7665,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;
@@ -7841,22 +7798,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);
     }
@@ -7876,12 +7823,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;
@@ -7889,10 +7831,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";
@@ -7907,12 +7849,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);
     }
@@ -7921,22 +7863,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
 
 /***/ }),
 
@@ -8104,8 +8046,8 @@ 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 CoreErrors_1 = __webpack_require__(/*! ../../core/CoreErrors */ "./dist/core/CoreErrors.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");
@@ -8123,11 +8065,11 @@ class RelationshipSecretController extends SecretController_1.SecretController {
         }
         const secretContainer = await this.loadActiveSecretByName(secretIdAsString);
         if (!secretContainer) {
-            throw TransportErrors_1.TransportErrors.general.recordNotFound("CryptoRelationshipRequestSecrets | CryptoRelationshipSecrets", secretIdAsString);
+            throw CoreErrors_1.CoreErrors.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);
+            throw CoreErrors_1.CoreErrors.secrets.wrongSecretType(secretIdAsString);
         }
         const secret = secretContainer.secret;
         this.cache.set(relationshipSecretId, secret);
@@ -8143,10 +8085,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);
+            throw CoreErrors_1.CoreErrors.general.recordNotFound(crypto_1.CryptoExchangeKeypair, templateKeyId);
         }
         if (!(exchangeKeypairContainer.secret instanceof crypto_1.CryptoExchangeKeypair)) {
-            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(templateKeyId);
+            throw CoreErrors_1.CoreErrors.secrets.wrongSecretType(templateKeyId);
         }
         const exchangeKeypair = exchangeKeypairContainer.secret;
         const secrets = await crypto_1.CryptoRelationshipSecrets.fromRelationshipRequest(publicRequestCrypto, exchangeKeypair);
@@ -8156,10 +8098,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());
+            throw CoreErrors_1.CoreErrors.general.recordNotFound(crypto_1.CryptoRelationshipSecrets, relationshipSecretId.toString());
         }
         if (!(secret.secret instanceof crypto_1.CryptoRelationshipSecrets)) {
-            throw TransportErrors_1.TransportErrors.secrets.wrongSecretType(secret.id.toString());
+            throw CoreErrors_1.CoreErrors.secrets.wrongSecretType(secret.id.toString());
         }
         const publicResponse = secret.secret.toPublicResponse();
         return publicResponse;
@@ -8167,7 +8109,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();
+            throw CoreErrors_1.CoreErrors.secrets.wrongSecretType();
         }
         const secrets = await crypto_1.CryptoRelationshipSecrets.fromRelationshipResponse(response, request);
         const container = await this.succeedSecretWithName(secrets, relationshipSecretId.toString());
@@ -8192,7 +8134,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);
+            throw CoreErrors_1.CoreErrors.secrets.wrongSecretType(secrets.id);
         }
         return await secrets.encryptRequest(buffer);
     }
@@ -8200,14 +8142,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);
+            throw CoreErrors_1.CoreErrors.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());
+            throw CoreErrors_1.CoreErrors.secrets.wrongSecretType(relationshipSecretId.toString());
         }
         return await secrets.decryptRequest(cipher);
     }
@@ -8224,7 +8166,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);
+            throw CoreErrors_1.CoreErrors.secrets.wrongSecretType(secrets.id);
         }
         return await secrets.decryptPeer(cipher, omitCounterCheck);
     }
@@ -8235,7 +8177,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);
+            throw CoreErrors_1.CoreErrors.secrets.wrongSecretType(secrets.id);
         }
         return await secrets.decryptOwn(cipher);
     }
@@ -8253,7 +8195,7 @@ 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);
+            throw CoreErrors_1.CoreErrors.secrets.wrongSecretType(secrets.id);
         }
         const valid = await secrets.verifyPeer(bufferToVerify, signature);
         return valid;
@@ -8351,9 +8293,9 @@ const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
 const core_1 = __webpack_require__(/*! ../../core */ "./dist/core/index.js");
+const CoreErrors_1 = __webpack_require__(/*! ../../core/CoreErrors */ "./dist/core/CoreErrors.js");
 const CoreUtil_1 = __webpack_require__(/*! ../../core/CoreUtil */ "./dist/core/CoreUtil.js");
 const DbCollectionName_1 = __webpack_require__(/*! ../../core/DbCollectionName */ "./dist/core/DbCollectionName.js");
-const TransportErrors_1 = __webpack_require__(/*! ../../core/TransportErrors */ "./dist/core/TransportErrors.js");
 const TransportIds_1 = __webpack_require__(/*! ../../core/TransportIds */ "./dist/core/TransportIds.js");
 const events_1 = __webpack_require__(/*! ../../events */ "./dist/events/index.js");
 const RelationshipTemplate_1 = __webpack_require__(/*! ../relationshipTemplates/local/RelationshipTemplate */ "./dist/modules/relationshipTemplates/local/RelationshipTemplate.js");
@@ -8367,10 +8309,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) {
@@ -8415,7 +8357,7 @@ 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);
+            throw CoreErrors_1.CoreErrors.general.recordNotFound(Relationship_1.Relationship, id);
         const relationship = Relationship_1.Relationship.from(relationshipDoc);
         await this.updateCacheOfRelationship(relationship, response);
         await this.relationships.update(relationshipDoc, relationship);
@@ -8457,7 +8399,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());
+            throw this.newCacheEmptyError(RelationshipTemplate_1.RelationshipTemplate, template.id.toString());
         }
         const secretId = await TransportIds_1.TransportIds.relationshipSecret.generate();
         const { requestCipher, requestContent } = await this.prepareRequest(secretId, template, parameters.content);
@@ -8474,7 +8416,7 @@ class RelationshipsController extends core_1.TransportController {
         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());
+            throw CoreErrors_1.CoreErrors.general.recordNotFound(Relationship_1.Relationship, id.toString());
         const relationship = Relationship_1.Relationship.from(relationshipDoc);
         relationship.metadata = metadata;
         relationship.metadataModifiedAt = core_1.CoreDate.utc();
@@ -8502,7 +8444,7 @@ class RelationshipsController extends core_1.TransportController {
         this._log.trace(`Parsing relationship template ${templateId} for ${response.id}...`);
         const template = await this.parent.relationshipTemplates.getRelationshipTemplate(templateId);
         if (!template) {
-            throw TransportErrors_1.TransportErrors.general.recordNotFound(RelationshipTemplate_1.RelationshipTemplate, templateId.toString());
+            throw CoreErrors_1.CoreErrors.general.recordNotFound(RelationshipTemplate_1.RelationshipTemplate, templateId.toString());
         }
         this._log.trace(`Parsing relationship changes of ${response.id}...`);
         const changesPromises = [];
@@ -8524,10 +8466,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());
+            throw this.newCacheEmptyError(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
@@ -8560,9 +8502,9 @@ class RelationshipsController extends core_1.TransportController {
                 return await this.applyCreationChange(change);
             case RelationshipChangeType_1.RelationshipChangeType.Termination:
             case RelationshipChangeType_1.RelationshipChangeType.TerminationCancellation:
-                throw TransportErrors_1.TransportErrors.general.notSupported();
+                throw CoreErrors_1.CoreErrors.general.notSupported();
             default:
-                throw TransportErrors_1.TransportErrors.general.incompatibleBackbone();
+                throw CoreErrors_1.CoreErrors.general.incompatibleBackbone();
         }
     }
     async applyCreationChange(change) {
@@ -8613,11 +8555,11 @@ 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");
+            throw CoreErrors_1.CoreErrors.general.signatureNotValid("relationshipRequest");
         }
-        const requestContent = RelationshipCreationChangeRequestContent_1.RelationshipCreationChangeRequestContent.deserialize(signedRequest.serializedRequest);
+        const requestContent = RelationshipCreationChangeRequestContentWrapper_1.RelationshipCreationChangeRequestContentWrapper.deserialize(signedRequest.serializedRequest);
         if (!requestContent.templateId.equals(templateId)) {
-            throw new Error("The relationship request contains a wrong template id.");
+            throw new core_1.TransportError("The relationship request contains a wrong template id.");
         }
         return requestContent;
     }
@@ -8652,11 +8594,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");
+            throw CoreErrors_1.CoreErrors.general.signatureNotValid("relationshipResponse");
         }
-        const responseContent = RelationshipCreationChangeResponseContent_1.RelationshipCreationChangeResponseContent.deserialize(signedResponse.serializedResponse);
+        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.");
+            throw new core_1.TransportError("The relationship response contains a wrong relationship id.");
         }
         return responseContent;
     }
@@ -8677,14 +8619,14 @@ class RelationshipsController extends core_1.TransportController {
         const cipher = RelationshipCreationChangeResponseCipher_1.RelationshipCreationChangeResponseCipher.fromBase64(change.response.content);
         if (change.status !== RelationshipChangeStatus_1.RelationshipChangeStatus.Revoked) {
             if (!cipher.publicResponseCrypto) {
-                throw new Error("The response crypto is missing.");
+                throw new core_1.TransportError("The response crypto is missing.");
             }
             await this.secrets.convertSecrets(relationship.relationshipSecretId, cipher.publicResponseCrypto);
         }
         const responseContent = await this.decryptCreationChangeResponse(change, relationship.relationshipSecretId);
         const response = RelationshipChangeResponse_1.RelationshipChangeResponse.fromBackbone(change.response, responseContent.content);
         if (!relationship.cache) {
-            throw TransportErrors_1.TransportErrors.general.cacheEmpty(Relationship_1.Relationship, relationship.id.toString());
+            throw this.newCacheEmptyError(Relationship_1.Relationship, relationship.id.toString());
         }
         relationship.cache.changes[0].status = change.status;
         switch (change.status) {
@@ -8698,7 +8640,7 @@ class RelationshipsController extends core_1.TransportController {
                 relationship.toRevoked(response);
                 break;
             default:
-                throw TransportErrors_1.TransportErrors.general.incompatibleBackbone();
+                throw CoreErrors_1.CoreErrors.general.incompatibleBackbone();
         }
         await this.relationships.update(relationshipDoc, relationship);
         return relationship;
@@ -8708,9 +8650,9 @@ class RelationshipsController extends core_1.TransportController {
         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());
+            throw CoreErrors_1.CoreErrors.general.recordNotFound(RelationshipTemplate_1.RelationshipTemplate, templateId.toString());
         if (!template.cache)
-            throw TransportErrors_1.TransportErrors.general.cacheEmpty(RelationshipTemplate_1.RelationshipTemplate, template.id.toString());
+            throw this.newCacheEmptyError(RelationshipTemplate_1.RelationshipTemplate, template.id.toString());
         if (!change.request.content)
             throw this.newEmptyOrInvalidContentError(change);
         const secretId = await TransportIds_1.TransportIds.relationshipSecret.generate();
@@ -8725,21 +8667,21 @@ class RelationshipsController extends core_1.TransportController {
     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());
+            throw CoreErrors_1.CoreErrors.general.recordNotFound(Relationship_1.Relationship, change.relationshipId.toString());
         }
         const relationship = Relationship_1.Relationship.from(relationshipDoc);
         if (!relationship.cache) {
             await this.updateCacheOfRelationship(relationship);
         }
         if (!relationship.cache) {
-            throw TransportErrors_1.TransportErrors.general.cacheEmpty(Relationship_1.Relationship, relationship.id.toString());
+            throw this.newCacheEmptyError(Relationship_1.Relationship, relationship.id.toString());
         }
         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());
+            throw CoreErrors_1.CoreErrors.general.recordNotFound(RelationshipChange_1.RelationshipChange, change.id.toString());
         }
         if (queriedChange.status !== RelationshipChangeStatus_1.RelationshipChangeStatus.Pending) {
-            throw TransportErrors_1.TransportErrors.relationships.wrongChangeStatus(queriedChange.status);
+            throw CoreErrors_1.CoreErrors.relationships.wrongChangeStatus(queriedChange.status);
         }
         let encryptedContent;
         if (content) {
@@ -8760,7 +8702,7 @@ class RelationshipsController extends core_1.TransportController {
                 backboneResponse = (await this.client.revokeRelationshipChange(relationship.id.toString(), change.id.toString(), encryptedContent)).value;
                 break;
             default:
-                throw new Error("target change status not supported");
+                throw new core_1.TransportError("target change status not supported");
         }
         const backboneChange = backboneResponse.changes[backboneResponse.changes.length - 1];
         queriedChange.response = RelationshipChangeResponse_1.RelationshipChangeResponse.fromBackbone(backboneResponse.changes[backboneResponse.changes.length - 1].response, content);
@@ -8771,7 +8713,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
         });
@@ -8794,7 +8736,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
         });
@@ -8817,13 +8759,13 @@ 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`);
+        throw new core_1.TransportError(`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`);
+        return new core_1.TransportError(`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`);
+        return new core_1.TransportError(`The content property of the relationship change ${change === null || change === void 0 ? void 0 : change.id} is missing or invalid`);
     }
 }
 __decorate([
@@ -9107,23 +9049,20 @@ let Relationship = Relationship_1 = class Relationship extends core_1.CoreSynchr
         });
     }
     toActive(response) {
-        if (!this.cache) {
-            throw core_1.TransportErrors.general.cacheEmpty(Relationship_1, this.id.toString());
-        }
+        if (!this.cache)
+            throw this.newCacheEmptyError();
         this.cache.changes[0].response = response;
         this.status = RelationshipStatus_1.RelationshipStatus.Active;
     }
     toRejected(response) {
-        if (!this.cache) {
-            throw core_1.TransportErrors.general.cacheEmpty(Relationship_1, this.id.toString());
-        }
+        if (!this.cache)
+            throw this.newCacheEmptyError();
         this.cache.changes[0].response = response;
         this.status = RelationshipStatus_1.RelationshipStatus.Rejected;
     }
     toRevoked(response) {
-        if (!this.cache) {
-            throw core_1.TransportErrors.general.cacheEmpty(Relationship_1, this.id.toString());
-        }
+        if (!this.cache)
+            throw this.newCacheEmptyError();
         this.cache.changes[0].response = response;
         this.status = RelationshipStatus_1.RelationshipStatus.Revoked;
     }
@@ -9140,6 +9079,9 @@ let Relationship = Relationship_1 = class Relationship extends core_1.CoreSynchr
         this.metadataModifiedAt = core_1.CoreDate.utc();
         return this;
     }
+    newCacheEmptyError() {
+        return new core_1.TransportError(`The cache of the Relationship with id "${this.id}" is empty.`);
+    }
 };
 __decorate([
     (0, ts_serval_1.validate)(),
@@ -9549,10 +9491,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";
@@ -9567,11 +9509,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);
     }
@@ -9580,22 +9522,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
 
 /***/ }),
 
@@ -9697,10 +9639,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";
@@ -9715,10 +9657,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);
     }
@@ -9727,17 +9669,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
 
 /***/ }),
 
@@ -9944,7 +9886,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() {
@@ -9956,7 +9897,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);
+            throw core_1.CoreErrors.general.recordNotFound(crypto_1.CryptoSecretKey, DeviceSecretController_1.DeviceSecretType.SharedSecretBaseKey);
         }
         return this.baseKey;
     }
@@ -10220,7 +10161,7 @@ class DatawalletModificationMapper {
                 type = DatawalletModification_1.DatawalletModificationType.CacheChanged;
                 break;
             default:
-                throw new Error("Unsupported DatawalletModificationType '${backboneDatawalletModification.type}'");
+                throw new core_1.TransportError("Unsupported DatawalletModificationType '${backboneDatawalletModification.type}'");
         }
         let payloadCategory;
         switch (backboneDatawalletModification.payloadCategory) {
@@ -10237,7 +10178,7 @@ class DatawalletModificationMapper {
                 payloadCategory = undefined;
                 break;
             default:
-                throw new Error(`Unsupported DatawalletModificationCategory '${backboneDatawalletModification.payloadCategory}'`);
+                throw new core_1.TransportError(`Unsupported DatawalletModificationCategory '${backboneDatawalletModification.payloadCategory}'`);
         }
         return DatawalletModification_1.DatawalletModification.from({
             localId: await core_1.TransportIds.datawalletModification.generate(),
@@ -10374,7 +10315,7 @@ class DatawalletModificationsProcessor {
             const targetCollection = await this.collectionProvider.getCollection(updateModification.collection);
             const oldDoc = await targetCollection.read(updateModification.objectIdentifier.toString());
             if (!oldDoc) {
-                throw new Error("Document to update was not found.");
+                throw new core_1.TransportError("Document to update was not found.");
             }
             const oldObject = core_1.CoreSerializable.fromUnknown(oldDoc);
             const newObject = { ...oldObject.toJSON(), ...updateModification.payload };
@@ -10411,7 +10352,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);
+            throw core_1.CoreErrors.datawallet.unsupportedModification("unsupportedCacheChangedModificationCollection", collectionsWithUncacheableItems);
         }
     }
     groupCacheChangesByCollection(cacheChanges) {
@@ -10534,7 +10475,7 @@ class ExternalEventsProcessor {
                         await this.applyRelationshipChangeCompletedEvent(externalEvent);
                         break;
                     default:
-                        throw new Error(`'${externalEvent.type}' is not a supported external event type.`);
+                        throw new core_1.TransportError(`'${externalEvent.type}' is not a supported external event type.`);
                 }
                 this.results.push({
                     externalEventId: externalEvent.id
@@ -10757,7 +10698,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);
+            throw core_1.CoreErrors.datawallet.insufficientSupportedDatawalletVersion(this.config.supportedDatawalletVersion, identityDatawalletVersion);
         }
         this.log.trace("Synchronization of Datawallet events started...");
         try {
@@ -10769,7 +10710,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);
+            throw core_1.CoreErrors.datawallet.insufficientSupportedDatawalletVersion(this.config.supportedDatawalletVersion, identityDatawalletVersion);
         }
         this.log.trace("Synchronization of Datawallet events ended...");
         await this.checkDatawalletVersion(identityDatawalletVersion);
@@ -10777,7 +10718,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);
+            throw core_1.CoreErrors.datawallet.insufficientSupportedDatawalletVersion(this.config.supportedDatawalletVersion, identityDatawalletVersion);
         }
         if (this.config.supportedDatawalletVersion > identityDatawalletVersion) {
             await this.upgradeIdentityDatawalletVersion(identityDatawalletVersion, this.config.supportedDatawalletVersion);
@@ -10791,10 +10732,10 @@ class SyncController extends core_1.TransportController {
         if (identityDatawalletVersion === targetDatawalletVersion)
             return;
         if (this.config.supportedDatawalletVersion < targetDatawalletVersion) {
-            throw core_1.TransportErrors.datawallet.insufficientSupportedDatawalletVersion(targetDatawalletVersion, identityDatawalletVersion);
+            throw core_1.CoreErrors.datawallet.insufficientSupportedDatawalletVersion(targetDatawalletVersion, identityDatawalletVersion);
         }
         if (identityDatawalletVersion > targetDatawalletVersion) {
-            throw core_1.TransportErrors.datawallet.currentBiggerThanTarget(identityDatawalletVersion, targetDatawalletVersion);
+            throw core_1.CoreErrors.datawallet.currentBiggerThanTarget(identityDatawalletVersion, targetDatawalletVersion);
         }
         while (identityDatawalletVersion < targetDatawalletVersion) {
             identityDatawalletVersion++;
@@ -10811,10 +10752,10 @@ class SyncController extends core_1.TransportController {
         if (deviceDatawalletVersion === targetDatawalletVersion)
             return;
         if (this.config.supportedDatawalletVersion < targetDatawalletVersion) {
-            throw core_1.TransportErrors.datawallet.insufficientSupportedDatawalletVersion(targetDatawalletVersion, deviceDatawalletVersion);
+            throw core_1.CoreErrors.datawallet.insufficientSupportedDatawalletVersion(targetDatawalletVersion, deviceDatawalletVersion);
         }
         if (deviceDatawalletVersion > targetDatawalletVersion) {
-            throw core_1.TransportErrors.datawallet.currentBiggerThanTarget(deviceDatawalletVersion, targetDatawalletVersion);
+            throw core_1.CoreErrors.datawallet.currentBiggerThanTarget(deviceDatawalletVersion, targetDatawalletVersion);
         }
         while (deviceDatawalletVersion < targetDatawalletVersion) {
             deviceDatawalletVersion++;
@@ -10941,7 +10882,7 @@ class SyncController extends core_1.TransportController {
     }
     async finalizeExternalEventsSyncRun(externalEventResults) {
         if (!this.currentSyncRun) {
-            throw new Error("There is no active sync run to finalize");
+            throw new core_1.TransportError("There is no active sync run to finalize");
         }
         const { backboneModifications, localModificationIds } = await this.prepareLocalDatawalletModificationsForPush();
         await this.client.finalizeExternalEventSync(this.currentSyncRun.id.toString(), {
@@ -10956,7 +10897,7 @@ class SyncController extends core_1.TransportController {
     }
     async finalizeDatawalletVersionUpgradeSyncRun(newDatawalletVersion) {
         if (!this.currentSyncRun) {
-            throw new Error("There is no active sync run to finalize");
+            throw new core_1.TransportError("There is no active sync run to finalize");
         }
         const { backboneModifications, localModificationIds } = await this.prepareLocalDatawalletModificationsForPush();
         await this.client.finalizeDatawalletVersionUpgrade(this.currentSyncRun.id.toString(), {
@@ -10998,7 +10939,7 @@ class SyncController extends core_1.TransportController {
         await this.setSyncTimeByName("Datawallet");
     }
     newNoMigrationAvailableError(version) {
-        return new Error(`There is no migration available for the datawallet version '${version}'.`);
+        return new core_1.TransportError(`There is no migration available for the datawallet version '${version}'.`);
     }
 }
 __decorate([
@@ -11546,7 +11487,7 @@ class AnonymousTokenController {
         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(id.toString());
+            throw core_1.CoreErrors.tokens.invalidTokenContent(id.toString());
         }
         const token = Token_1.Token.from({
             id: id,
@@ -11646,7 +11587,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());
+            throw core_1.CoreErrors.general.recordNotFound(Token_1.Token, id.toString());
         }
         const token = Token_1.Token.from(tokenDoc);
         token.setMetadata(metadata);
@@ -11661,7 +11602,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) {
@@ -11684,7 +11624,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);
+            core_1.CoreErrors.general.recordNotFound(Token_1.Token, id);
             return;
         }
         const token = Token_1.Token.from(tokenDoc);
@@ -11707,7 +11647,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);
+            throw core_1.CoreErrors.tokens.invalidTokenContent(response.id);
         }
         const cachedToken = CachedToken_1.CachedToken.from({
             createdAt: core_1.CoreDate.from(response.createdAt),
@@ -11735,7 +11675,7 @@ class TokenController extends TransportController_1.TransportController {
             token = await this.updateCacheOfExistingTokenInDb(id.toString());
             if (!token) {
                 // This should not happen, we only update the cache if we found the tokenDoc
-                throw new Error(`Tried to update a token (with ID: '${id.toString()}') that doesn't exist in the local database.`);
+                throw new core_1.TransportError(`Tried to update a token (with ID: '${id.toString()}') that doesn't exist in the local database.`);
             }
             return token;
         }
@@ -12231,6 +12171,7 @@ exports.TokenReference = TokenReference;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.PasswordGenerator = void 0;
+const TransportError_1 = __webpack_require__(/*! ../core/TransportError */ "./dist/core/TransportError.js");
 const Random_1 = __webpack_require__(/*! ./Random */ "./dist/util/Random.js");
 const defaultPasswordRange = Random_1.RandomCharacterRange.AlphanumericEase + Random_1.RandomCharacterRange.SpecialCharacters;
 class PasswordGenerator {
@@ -12254,7 +12195,7 @@ class PasswordGenerator {
         if (minLength > maxLength)
             maxLength = minLength;
         if (minLength < 8) {
-            throw new Error("Minimum password length for a strong password should be 8 characters.");
+            throw new TransportError_1.TransportError("Minimum password length for a strong password should be 8 characters.");
         }
         const specialCharacterBucket = {
             minLength: 1,
@@ -12421,6 +12362,7 @@ 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 TransportError_1 = __webpack_require__(/*! ../core/TransportError */ "./dist/core/TransportError.js");
 var RandomCharacterRange;
 (function (RandomCharacterRange) {
     RandomCharacterRange["Digit"] = "0123456789";
@@ -12444,7 +12386,7 @@ class Random {
     }
     static async int(length) {
         if (length > 21 || length <= 0) {
-            throw new Error("Length must be between 1 and 21.");
+            throw new TransportError_1.TransportError("Length must be between 1 and 21.");
         }
         return parseInt(await this.string(length, RandomCharacterRange.Digit));
     }
@@ -12467,12 +12409,12 @@ class Random {
     }
     static async intBetween(min, max) {
         if (max <= min) {
-            throw new Error("Max must be larger than min.");
+            throw new TransportError_1.TransportError("Max must be larger than min.");
         }
         const diff = max - min + 1;
         const bitLength = Math.abs(Math.ceil(Math.log2(diff)));
         if (bitLength > 32) {
-            throw new Error("The range between the numbers is too big, 32 bit is the maximum -> 4294967296");
+            throw new TransportError_1.TransportError("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;
@@ -12491,7 +12433,7 @@ class Random {
     }
     static async intRandomLength(minLength, maxLength) {
         if (maxLength > 21) {
-            throw new Error("Max must be below 22.");
+            throw new TransportError_1.TransportError("Max must be below 22.");
         }
         return parseInt(await this.stringRandomLength(minLength, maxLength, RandomCharacterRange.Digit));
     }
@@ -12510,7 +12452,7 @@ class Random {
         if (length <= 0)
             return "";
         if (allowedChars.length > 256) {
-            throw new Error("Input exceeds maximum length of 256.");
+            throw new TransportError_1.TransportError("Input exceeds maximum length of 256.");
         }
         const ar = [];
         const inputLength = allowedChars.length;
@@ -12533,10 +12475,10 @@ class Random {
     }
     static async stringRandomLength(minLength, maxLength, allowedChars) {
         if (minLength > maxLength) {
-            throw new Error("maxLength must be larger than minLength.");
+            throw new TransportError_1.TransportError("maxLength must be larger than minLength.");
         }
         if (minLength < 0) {
-            throw new Error("minlength must not be less than zero.");
+            throw new TransportError_1.TransportError("minlength must not be less than zero.");
         }
         const length = maxLength > minLength ? await this.intBetween(minLength, maxLength) : maxLength;
         return await this.string(length, allowedChars);