@nmshd/consumption 2.0.0-beta.3 → 2.0.0-beta.30

package/lib-web/nmshd.consumption.js

@@ -17,10 +17,10 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 exports.buildInformation = {
-    version: "2.0.0-beta.3",
-    build: "53",
-    date: "2022-07-22T10:49:10+00:00",
-    commit: "7af5e3a24a7d729403577ed228905468f1fccddc",
+    version: "2.0.0-beta.30",
+    build: "84",
+    date: "2022-10-20T11:54:08+00:00",
+    commit: "7ef6f5c38ee66eebc8e417df0ee86fd8983bd478",
     dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,
@@ -58,9 +58,8 @@ class ConsumptionBaseController {
     init() {
         return Promise.resolve(this);
     }
-    async parseArray(values, type) {
-        const parsePromises = values.map((v) => type.from(v));
-        return await Promise.all(parsePromises);
+    parseArray(values, type) {
+        return values.map((v) => type.fromAny(v));
     }
 }
 exports.ConsumptionBaseController = ConsumptionBaseController;
@@ -80,12 +79,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ConsumptionController = void 0;
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const modules_1 = __webpack_require__(/*! ../modules */ "./dist/modules/index.js");
-const LocalAttributesController_1 = __webpack_require__(/*! ../modules/attributes/LocalAttributesController */ "./dist/modules/attributes/LocalAttributesController.js");
-const DraftsController_1 = __webpack_require__(/*! ../modules/drafts/DraftsController */ "./dist/modules/drafts/DraftsController.js");
-const IncomingRequestsController_1 = __webpack_require__(/*! ../modules/requests/incoming/IncomingRequestsController */ "./dist/modules/requests/incoming/IncomingRequestsController.js");
-const RequestItemProcessorRegistry_1 = __webpack_require__(/*! ../modules/requests/itemProcessors/RequestItemProcessorRegistry */ "./dist/modules/requests/itemProcessors/RequestItemProcessorRegistry.js");
-const OutgoingRequestsController_1 = __webpack_require__(/*! ../modules/requests/outgoing/OutgoingRequestsController */ "./dist/modules/requests/outgoing/OutgoingRequestsController.js");
-const SettingsController_1 = __webpack_require__(/*! ../modules/settings/SettingsController */ "./dist/modules/settings/SettingsController.js");
 class ConsumptionController {
     constructor(transport, accountController) {
         this.transport = transport;
@@ -106,24 +99,31 @@ class ConsumptionController {
     get settings() {
         return this._settings;
     }
+    get attributeListeners() {
+        return this._attributeListeners;
+    }
     async init(requestItemProcessorOverrides = new Map()) {
-        this._attributes = await new LocalAttributesController_1.LocalAttributesController(this, this.transport.eventBus, this.accountController.identity).init();
-        this._drafts = await new DraftsController_1.DraftsController(this).init();
-        const processorRegistry = new RequestItemProcessorRegistry_1.RequestItemProcessorRegistry(this, this.getDefaultProcessors());
+        this._attributes = await new modules_1.AttributesController(this, this.transport.eventBus, this.accountController.identity).init();
+        this._drafts = await new modules_1.DraftsController(this).init();
+        const processorRegistry = new modules_1.RequestItemProcessorRegistry(this, this.getDefaultProcessors());
         for (const [itemConstructor, processorConstructor] of requestItemProcessorOverrides) {
             processorRegistry.registerOrReplaceProcessor(itemConstructor, processorConstructor);
         }
-        this._outgoingRequests = await new OutgoingRequestsController_1.OutgoingRequestsController(await this.accountController.getSynchronizedCollection("Requests"), processorRegistry, this, this.transport.eventBus, this.accountController.identity).init();
-        this._incomingRequests = await new IncomingRequestsController_1.IncomingRequestsController(await this.accountController.getSynchronizedCollection("Requests"), processorRegistry, this, this.transport.eventBus, this.accountController.identity).init();
-        this._settings = await new SettingsController_1.SettingsController(this).init();
+        this._outgoingRequests = await new modules_1.OutgoingRequestsController(await this.accountController.getSynchronizedCollection("Requests"), processorRegistry, this, this.transport.eventBus, this.accountController.identity).init();
+        this._incomingRequests = await new modules_1.IncomingRequestsController(await this.accountController.getSynchronizedCollection("Requests"), processorRegistry, this, this.transport.eventBus, this.accountController.identity).init();
+        this._settings = await new modules_1.SettingsController(this).init();
+        this._attributeListeners = await new modules_1.AttributeListenersController(this, this.transport.eventBus, this.accountController.identity).init();
         return this;
     }
     getDefaultProcessors() {
         return new Map([
+            [content_1.ShareAttributeRequestItem, modules_1.ShareAttributeRequestItemProcessor],
             [content_1.CreateAttributeRequestItem, modules_1.CreateAttributeRequestItemProcessor],
             [content_1.ReadAttributeRequestItem, modules_1.ReadAttributeRequestItemProcessor],
             [content_1.ProposeAttributeRequestItem, modules_1.ProposeAttributeRequestItemProcessor],
-            [content_1.ShareAttributeRequestItem, modules_1.ShareAttributeRequestItemProcessor]
+            [content_1.ConsentRequestItem, modules_1.GenericRequestItemProcessor],
+            [content_1.AuthenticationRequestItem, modules_1.GenericRequestItemProcessor],
+            [content_1.RegisterAttributeListenerRequestItem, modules_1.RegisterAttributeListenerRequestItemProcessor]
         ]);
     }
 }
@@ -144,7 +144,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ConsumptionControllerName = void 0;
 var ConsumptionControllerName;
 (function (ConsumptionControllerName) {
-    ConsumptionControllerName["LocalAttributesController"] = "LocalAttributesController";
+    ConsumptionControllerName["AttributesController"] = "AttributesController";
+    ConsumptionControllerName["AttributeListenersController"] = "AttributeListenersController";
     ConsumptionControllerName["DraftsController"] = "DraftsController";
     ConsumptionControllerName["RelationshipInfoController"] = "RelationshipInfoController";
     ConsumptionControllerName["SingleRelationshipController"] = "SingleRelationshipController";
@@ -158,57 +159,20 @@ var ConsumptionControllerName;
 
 /***/ }),
 
-/***/ "./dist/consumption/ConsumptionErrors.js":
-/*!***********************************************!*\
-  !*** ./dist/consumption/ConsumptionErrors.js ***!
-  \***********************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ "./dist/consumption/ConsumptionError.js":
+/*!**********************************************!*\
+  !*** ./dist/consumption/ConsumptionError.js ***!
+  \**********************************************/
+/***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.ConsumptionErrors = void 0;
-const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
-class Attributes {
-    attributeExists(id) {
-        return new transport_1.CoreError("error.consumption.attributes.attributeExists", `Attribute with id '${id}' already exists. Please use succeed instead.`);
-    }
-    predecessorNotFound(id) {
-        return new transport_1.CoreError("error.consumption.attributes.predecessorNotFound", `Attribute with id '${id}' does not exist. Please use create instead.`);
-    }
+exports.ConsumptionError = void 0;
+class ConsumptionError extends Error {
 }
-class Requests {
-    requestExists(id) {
-        return new transport_1.CoreError("error.consumption.requests.requestExists", `Request with id ${id} already exists and can't be created.`);
-    }
-    unexpectedErrorDuringRequestItemProcessing(error) {
-        return new transport_1.CoreError("error.consumption.requests.unexpectedErrorDuringRequestItemProcessing", error instanceof Error ? error.message : "Unknown error: '${JSON.stringify(e)'");
-    }
-    invalidRequestItem(message) {
-        return new transport_1.CoreError("error.consumption.requests.invalidRequestItem", message);
-    }
-}
-class RelationshipInfo {
-    relationshipInfoExists(relationshipId) {
-        return new transport_1.CoreError("error.consumption.relationshipInfos.relationshipInfoExists", `RelationshipInfo for Relationship ${relationshipId} already exists.`);
-    }
-}
-class Onboarding {
-    attributeNotSet(attributeName) {
-        return new transport_1.CoreError("error.consumption.onboarding.attributeNotSet", `No attribute with name ${attributeName} set but was required to be shared.`);
-    }
-    wrongTemplate() {
-        return new transport_1.CoreError("error.consumption.onboarding.wrongTemplate", "The given template is in the wrong format.");
-    }
-}
-class ConsumptionErrors {
-}
-exports.ConsumptionErrors = ConsumptionErrors;
-ConsumptionErrors.attributes = new Attributes();
-ConsumptionErrors.requests = new Requests();
-ConsumptionErrors.relationshipInfo = new RelationshipInfo();
-ConsumptionErrors.onboarding = new Onboarding();
-//# sourceMappingURL=ConsumptionErrors.js.map
+exports.ConsumptionError = ConsumptionError;
+//# sourceMappingURL=ConsumptionError.js.map
 
 /***/ }),
 
@@ -230,10 +194,68 @@ ConsumptionIds.draft = new transport_1.CoreIdHelper("LCLDRF");
 ConsumptionIds.setting = new transport_1.CoreIdHelper("LCLSET");
 ConsumptionIds.attribute = new transport_1.CoreIdHelper("ATT");
 ConsumptionIds.request = new transport_1.CoreIdHelper("REQ");
+ConsumptionIds.attributeListener = new transport_1.CoreIdHelper("ATL");
 //# sourceMappingURL=ConsumptionIds.js.map
 
 /***/ }),
 
+/***/ "./dist/consumption/CoreErrors.js":
+/*!****************************************!*\
+  !*** ./dist/consumption/CoreErrors.js ***!
+  \****************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CoreErrors = void 0;
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
+const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+class Attributes {
+    cannotSucceedAttributesWithAParent(parentId) {
+        return new transport_1.CoreError("error.consumption.attributes.cannotSucceedAttributesWithAParent", `The Attribute you want to succeed has a parent (id: ${parentId.toString()}). You cannot succeed Attributes with a parent. Instead, succeed the parent, which will implicitly succeed all its children.`);
+    }
+}
+class Requests {
+    constructor() {
+        this.decideValidation = new Requests._decideValidation();
+    }
+    unexpectedErrorDuringRequestItemProcessing(error) {
+        return new transport_1.CoreError("error.consumption.requests.unexpectedErrorDuringRequestItemProcessing", error instanceof Error ? error.message : `Unknown error: '${JSON.stringify(error)}'`, undefined, undefined, error);
+    }
+    servalErrorDuringRequestItemProcessing(error) {
+        return new transport_1.CoreError("error.consumption.requests.servalErrorDuringRequestItemProcessing", error instanceof Error ? error.message : `Serval error: '${JSON.stringify(error)}'`, undefined, undefined, error);
+    }
+    invalidRequestItem(message) {
+        return new transport_1.CoreError("error.consumption.requests.invalidRequestItem", message);
+    }
+}
+Requests._decideValidation = class {
+    invalidNumberOfItems(message) {
+        return new ts_utils_1.ApplicationError("error.consumption.requests.decide.validation.invalidNumberOfItems", message);
+    }
+    itemAcceptedButParentNotAccepted(message) {
+        return new ts_utils_1.ApplicationError("error.consumption.requests.decide.validation.itemAcceptedButParentNotAccepted", message);
+    }
+    mustBeAcceptedItemNotAccepted(message) {
+        return new ts_utils_1.ApplicationError("error.consumption.requests.decide.validation.mustBeAcceptedItemNotAccepted", message);
+    }
+    requestItemAnsweredAsRequestItemGroup() {
+        return new ts_utils_1.ApplicationError("error.consumption.requests.decide.validation.requestItemAnsweredAsRequestItemGroup", "The RequestItem was answered as a RequestItemGroup.");
+    }
+    requestItemGroupAnsweredAsRequestItem() {
+        return new ts_utils_1.ApplicationError("error.consumption.requests.decide.validation.requestItemGroupAnsweredAsRequestItem", "The RequestItemGroup was answered as a RequestItem.");
+    }
+};
+class CoreErrors {
+}
+exports.CoreErrors = CoreErrors;
+CoreErrors.attributes = new Attributes();
+CoreErrors.requests = new Requests();
+//# sourceMappingURL=CoreErrors.js.map
+
+/***/ }),
+
 /***/ "./dist/consumption/index.js":
 /*!***********************************!*\
   !*** ./dist/consumption/index.js ***!
@@ -259,8 +281,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 __exportStar(__webpack_require__(/*! ./ConsumptionBaseController */ "./dist/consumption/ConsumptionBaseController.js"), exports);
 __exportStar(__webpack_require__(/*! ./ConsumptionControllerName */ "./dist/consumption/ConsumptionControllerName.js"), exports);
-__exportStar(__webpack_require__(/*! ./ConsumptionErrors */ "./dist/consumption/ConsumptionErrors.js"), exports);
+__exportStar(__webpack_require__(/*! ./ConsumptionError */ "./dist/consumption/ConsumptionError.js"), exports);
 __exportStar(__webpack_require__(/*! ./ConsumptionIds */ "./dist/consumption/ConsumptionIds.js"), exports);
+__exportStar(__webpack_require__(/*! ./CoreErrors */ "./dist/consumption/CoreErrors.js"), exports);
 //# sourceMappingURL=index.js.map
 
 /***/ }),
@@ -296,16 +319,252 @@ __exportStar(__webpack_require__(/*! ./modules */ "./dist/modules/index.js"), ex
 
 /***/ }),
 
-/***/ "./dist/modules/attributes/LocalAttributesController.js":
-/*!**************************************************************!*\
-  !*** ./dist/modules/attributes/LocalAttributesController.js ***!
-  \**************************************************************/
+/***/ "./dist/modules/attributeListeners/AttributeListenersController.js":
+/*!*************************************************************************!*\
+  !*** ./dist/modules/attributeListeners/AttributeListenersController.js ***!
+  \*************************************************************************/
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.LocalAttributesController = void 0;
+exports.AttributeListenersController = void 0;
+const consumption_1 = __webpack_require__(/*! ../../consumption */ "./dist/consumption/index.js");
+const ConsumptionBaseController_1 = __webpack_require__(/*! ../../consumption/ConsumptionBaseController */ "./dist/consumption/ConsumptionBaseController.js");
+const ConsumptionControllerName_1 = __webpack_require__(/*! ../../consumption/ConsumptionControllerName */ "./dist/consumption/ConsumptionControllerName.js");
+const events_1 = __webpack_require__(/*! ./events */ "./dist/modules/attributeListeners/events/index.js");
+const CreateLocalAttributeListenerParams_1 = __webpack_require__(/*! ./local/CreateLocalAttributeListenerParams */ "./dist/modules/attributeListeners/local/CreateLocalAttributeListenerParams.js");
+const LocalAttributeListener_1 = __webpack_require__(/*! ./local/LocalAttributeListener */ "./dist/modules/attributeListeners/local/LocalAttributeListener.js");
+class AttributeListenersController extends ConsumptionBaseController_1.ConsumptionBaseController {
+    constructor(parent, eventBus, identity) {
+        super(ConsumptionControllerName_1.ConsumptionControllerName.AttributeListenersController, parent);
+        this.eventBus = eventBus;
+        this.identity = identity;
+    }
+    async init() {
+        await super.init();
+        this.attributeListeners = await this.parent.accountController.getSynchronizedCollection("AttributeListeners");
+        return this;
+    }
+    async getAttributeListeners(query) {
+        const items = await this.attributeListeners.find(query);
+        return this.parseArray(items, LocalAttributeListener_1.LocalAttributeListener);
+    }
+    async getAttributeListener(id) {
+        const listener = await this.attributeListeners.read(id.toString());
+        if (!listener)
+            return;
+        return LocalAttributeListener_1.LocalAttributeListener.from(listener);
+    }
+    async createAttributeListener(params) {
+        const parsedParams = CreateLocalAttributeListenerParams_1.CreateLocalAttributeListenerParams.from(params);
+        const listener = LocalAttributeListener_1.LocalAttributeListener.from({
+            id: await consumption_1.ConsumptionIds.attributeListener.generate(),
+            query: parsedParams.query,
+            peer: parsedParams.peer
+        });
+        await this.attributeListeners.create(listener);
+        this.eventBus.publish(new events_1.AttributeListenerCreatedEvent(this.identity.address.toString(), listener));
+        return listener;
+    }
+}
+exports.AttributeListenersController = AttributeListenersController;
+//# sourceMappingURL=AttributeListenersController.js.map
+
+/***/ }),
+
+/***/ "./dist/modules/attributeListeners/events/AttributeListenerCreatedEvent.js":
+/*!*********************************************************************************!*\
+  !*** ./dist/modules/attributeListeners/events/AttributeListenerCreatedEvent.js ***!
+  \*********************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.AttributeListenerCreatedEvent = void 0;
+const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+class AttributeListenerCreatedEvent extends transport_1.TransportDataEvent {
+    constructor(eventTargetAddress, data) {
+        super(AttributeListenerCreatedEvent.namespace, eventTargetAddress, data);
+    }
+}
+exports.AttributeListenerCreatedEvent = AttributeListenerCreatedEvent;
+AttributeListenerCreatedEvent.namespace = "consumption.attributeListenerCreated";
+//# sourceMappingURL=AttributeListenerCreatedEvent.js.map
+
+/***/ }),
+
+/***/ "./dist/modules/attributeListeners/events/index.js":
+/*!*********************************************************!*\
+  !*** ./dist/modules/attributeListeners/events/index.js ***!
+  \*********************************************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+__exportStar(__webpack_require__(/*! ./AttributeListenerCreatedEvent */ "./dist/modules/attributeListeners/events/AttributeListenerCreatedEvent.js"), exports);
+//# sourceMappingURL=index.js.map
+
+/***/ }),
+
+/***/ "./dist/modules/attributeListeners/index.js":
+/*!**************************************************!*\
+  !*** ./dist/modules/attributeListeners/index.js ***!
+  \**************************************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+__exportStar(__webpack_require__(/*! ./AttributeListenersController */ "./dist/modules/attributeListeners/AttributeListenersController.js"), exports);
+__exportStar(__webpack_require__(/*! ./events */ "./dist/modules/attributeListeners/events/index.js"), exports);
+__exportStar(__webpack_require__(/*! ./local/CreateLocalAttributeListenerParams */ "./dist/modules/attributeListeners/local/CreateLocalAttributeListenerParams.js"), exports);
+__exportStar(__webpack_require__(/*! ./local/LocalAttributeListener */ "./dist/modules/attributeListeners/local/LocalAttributeListener.js"), exports);
+//# sourceMappingURL=index.js.map
+
+/***/ }),
+
+/***/ "./dist/modules/attributeListeners/local/CreateLocalAttributeListenerParams.js":
+/*!*************************************************************************************!*\
+  !*** ./dist/modules/attributeListeners/local/CreateLocalAttributeListenerParams.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.CreateLocalAttributeListenerParams = void 0;
+const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
+const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
+const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+let CreateLocalAttributeListenerParams = class CreateLocalAttributeListenerParams extends ts_serval_1.Serializable {
+    static from(value) {
+        return this.fromAny(value);
+    }
+};
+__decorate([
+    (0, ts_serval_1.serialize)({ unionTypes: [content_1.IdentityAttributeQuery, content_1.ThirdPartyRelationshipAttributeQuery] }),
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", Object)
+], CreateLocalAttributeListenerParams.prototype, "query", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", transport_1.CoreAddress)
+], CreateLocalAttributeListenerParams.prototype, "peer", void 0);
+CreateLocalAttributeListenerParams = __decorate([
+    (0, ts_serval_1.type)("CreateLocalAttributeListenerParams")
+], CreateLocalAttributeListenerParams);
+exports.CreateLocalAttributeListenerParams = CreateLocalAttributeListenerParams;
+//# sourceMappingURL=CreateLocalAttributeListenerParams.js.map
+
+/***/ }),
+
+/***/ "./dist/modules/attributeListeners/local/LocalAttributeListener.js":
+/*!*************************************************************************!*\
+  !*** ./dist/modules/attributeListeners/local/LocalAttributeListener.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.LocalAttributeListener = void 0;
+const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
+const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
+const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
+let LocalAttributeListener = class LocalAttributeListener extends transport_1.CoreSynchronizable {
+    constructor() {
+        super(...arguments);
+        this.userdataProperties = [
+            (0, ts_simple_nameof_1.nameof)((r) => r.query),
+            (0, ts_simple_nameof_1.nameof)((r) => r.peer)
+        ];
+    }
+    static from(value) {
+        return this.fromAny(value);
+    }
+    toJSON() {
+        return super.toJSON();
+    }
+};
+__decorate([
+    (0, ts_serval_1.serialize)({ unionTypes: [content_1.IdentityAttributeQuery, content_1.ThirdPartyRelationshipAttributeQuery] }),
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", Object)
+], LocalAttributeListener.prototype, "query", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", transport_1.CoreAddress)
+], LocalAttributeListener.prototype, "peer", void 0);
+LocalAttributeListener = __decorate([
+    (0, ts_serval_1.type)("LocalAttributeListener")
+], LocalAttributeListener);
+exports.LocalAttributeListener = LocalAttributeListener;
+//# sourceMappingURL=LocalAttributeListener.js.map
+
+/***/ }),
+
+/***/ "./dist/modules/attributes/AttributesController.js":
+/*!*********************************************************!*\
+  !*** ./dist/modules/attributes/AttributesController.js ***!
+  \*********************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.AttributesController = void 0;
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
@@ -316,9 +575,9 @@ const LocalAttribute_1 = __webpack_require__(/*! ./local/LocalAttribute */ "./di
 const LocalAttributeShareInfo_1 = __webpack_require__(/*! ./local/LocalAttributeShareInfo */ "./dist/modules/attributes/local/LocalAttributeShareInfo.js");
 const QueryTranslator_1 = __webpack_require__(/*! ./local/QueryTranslator */ "./dist/modules/attributes/local/QueryTranslator.js");
 const SucceedLocalAttributeParams_1 = __webpack_require__(/*! ./local/SucceedLocalAttributeParams */ "./dist/modules/attributes/local/SucceedLocalAttributeParams.js");
-class LocalAttributesController extends consumption_1.ConsumptionBaseController {
+class AttributesController extends consumption_1.ConsumptionBaseController {
     constructor(parent, eventBus, identity) {
-        super(consumption_1.ConsumptionControllerName.LocalAttributesController, parent);
+        super(consumption_1.ConsumptionControllerName.AttributesController, parent);
         this.eventBus = eventBus;
         this.identity = identity;
     }
@@ -384,46 +643,83 @@ class LocalAttributesController extends consumption_1.ConsumptionBaseController
     }
     async getLocalAttributes(query) {
         const attributes = await this.attributes.find(query);
-        return await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
+        return this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
     }
     async getValidLocalAttributes(query) {
         const attributes = await this.attributes.find(query);
-        const items = await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
+        const items = this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
         return this.filterCurrent(items);
     }
     async executeRelationshipAttributeQuery(query) {
         const parsedQuery = content_1.RelationshipAttributeQuery.from(query);
         const dbQuery = QueryTranslator_1.RelationshipAttributeQueryTranslator.translate(parsedQuery);
+        dbQuery["content.confidentiality"] = { $ne: "private" };
+        const attributes = await this.attributes.find(dbQuery);
+        const attribute = attributes.length > 0 ? LocalAttribute_1.LocalAttribute.from(attributes[0]) : undefined;
+        return attribute;
+    }
+    async executeThirdPartyRelationshipAttributeQuery(query) {
+        const parsedQuery = content_1.ThirdPartyRelationshipAttributeQuery.from(query);
+        const dbQuery = QueryTranslator_1.ThirdPartyRelationshipAttributeQueryTranslator.translate(parsedQuery);
+        dbQuery["content.confidentiality"] = { $ne: "private" };
         const attributes = await this.attributes.find(dbQuery);
-        return await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
+        const attribute = attributes.length > 0 ? LocalAttribute_1.LocalAttribute.from(attributes[0]) : undefined;
+        return attribute;
     }
     async executeIdentityAttributeQuery(query) {
         const parsedQuery = content_1.IdentityAttributeQuery.from(query);
         const dbQuery = QueryTranslator_1.IdentityAttributeQueryTranslator.translate(parsedQuery);
+        dbQuery["content.owner"] = this.identity.address.toString();
+        dbQuery["shareInfo"] = { $exists: false };
         const attributes = await this.attributes.find(dbQuery);
-        return await this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
+        return this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
     }
     async createLocalAttribute(params) {
-        const localAttribute = await LocalAttribute_1.LocalAttribute.fromAttribute(params.content);
+        const localAttribute = LocalAttribute_1.LocalAttribute.from({
+            id: await consumption_1.ConsumptionIds.attribute.generate(),
+            createdAt: transport_1.CoreDate.utc(),
+            content: params.content,
+            parentId: params.parentId
+        });
         await this.attributes.create(localAttribute);
+        if (localAttribute.content instanceof content_1.IdentityAttribute && // nested Local Attributes should only be created for Identity Attributes
+            localAttribute.content.value instanceof content_1.AbstractComplexValue) {
+            await this.createLocalAttributesForNestedAttributeValues(localAttribute);
+        }
         this.eventBus.publish(new events_1.AttributeCreatedEvent(this.identity.address.toString(), localAttribute));
         return localAttribute;
     }
+    async createLocalAttributesForNestedAttributeValues(localAttribute) {
+        if (!(localAttribute.content instanceof content_1.IdentityAttribute)) {
+            throw new consumption_1.ConsumptionError("Only Identity Attributes are allowed here");
+        }
+        const nestedAttributeValues = Object.values(localAttribute.content.value).filter((p) => p instanceof content_1.AbstractAttributeValue);
+        for (const propertyValue of nestedAttributeValues) {
+            const nestedAttribute = content_1.IdentityAttribute.from({
+                ...localAttribute.content.toJSON(),
+                value: propertyValue.toJSON()
+            });
+            await this.createLocalAttribute({ content: nestedAttribute, parentId: localAttribute.id });
+        }
+    }
     async succeedLocalAttribute(params) {
         const parsedParams = SucceedLocalAttributeParams_1.SucceedLocalAttributeParams.from(params);
-        const current = await this.attributes.findOne({
+        const currentAttributeDoc = await this.attributes.findOne({
             [(0, ts_simple_nameof_1.nameof)((c) => c.id)]: params.succeeds.toString()
         });
-        if (!current) {
-            throw consumption_1.ConsumptionErrors.attributes.predecessorNotFound(parsedParams.succeeds.toString());
+        const currentAttribute = LocalAttribute_1.LocalAttribute.from(currentAttributeDoc);
+        if (currentAttribute.parentId) {
+            throw consumption_1.CoreErrors.attributes.cannotSucceedAttributesWithAParent(parsedParams.succeeds.toString());
+        }
+        if (!currentAttributeDoc) {
+            throw transport_1.CoreErrors.general.recordNotFound(LocalAttribute_1.LocalAttribute, parsedParams.succeeds.toString());
         }
         if (!parsedParams.successorContent.validFrom) {
             parsedParams.successorContent.validFrom = transport_1.CoreDate.utc();
         }
         const validFrom = parsedParams.successorContent.validFrom;
-        const currentUpdated = LocalAttribute_1.LocalAttribute.from(current);
-        currentUpdated.content.validTo = validFrom.subtract(1);
-        await this.attributes.update(current, currentUpdated);
+        currentAttribute.content.validTo = validFrom.subtract(1);
+        await this.attributes.update(currentAttributeDoc, currentAttribute);
         const successor = await LocalAttribute_1.LocalAttribute.fromAttribute(parsedParams.successorContent, parsedParams.succeeds);
         await this.attributes.create(successor);
         this.eventBus.publish(new events_1.AttributeSucceededEvent(this.identity.address.toString(), successor));
@@ -433,7 +729,7 @@ class LocalAttributesController extends consumption_1.ConsumptionBaseController
         const parsedParams = CreateSharedLocalAttributeCopyParams_1.CreateSharedLocalAttributeCopyParams.from(params);
         const sourceAttribute = await this.getLocalAttribute(parsedParams.sourceAttributeId);
         if (!sourceAttribute) {
-            throw consumption_1.ConsumptionErrors.attributes.predecessorNotFound(parsedParams.sourceAttributeId.toString());
+            throw transport_1.CoreErrors.general.recordNotFound(LocalAttribute_1.LocalAttribute, parsedParams.sourceAttributeId.toString());
         }
         const shareInfo = LocalAttributeShareInfo_1.LocalAttributeShareInfo.from({
             peer: parsedParams.peer,
@@ -457,6 +753,7 @@ class LocalAttributesController extends consumption_1.ConsumptionBaseController
             createdAt: transport_1.CoreDate.utc()
         });
         await this.attributes.create(peerLocalAttribute);
+        this.eventBus.publish(new events_1.AttributeCreatedEvent(this.identity.address.toString(), peerLocalAttribute));
         return peerLocalAttribute;
     }
     async updateLocalAttribute(params) {
@@ -464,7 +761,7 @@ class LocalAttributesController extends consumption_1.ConsumptionBaseController
             [(0, ts_simple_nameof_1.nameof)((c) => c.id)]: params.id.toString()
         });
         if (!current) {
-            throw transport_1.TransportErrors.general.recordNotFound(LocalAttribute_1.LocalAttribute, params.id.toString());
+            throw transport_1.CoreErrors.general.recordNotFound(LocalAttribute_1.LocalAttribute, params.id.toString());
         }
         const updatedLocalAttribute = LocalAttribute_1.LocalAttribute.from({
             id: current.id,
@@ -483,8 +780,8 @@ class LocalAttributesController extends consumption_1.ConsumptionBaseController
         this.eventBus.publish(new events_1.AttributeDeletedEvent(this.identity.address.toString(), attribute));
     }
 }
-exports.LocalAttributesController = LocalAttributesController;
-//# sourceMappingURL=LocalAttributesController.js.map
+exports.AttributesController = AttributesController;
+//# sourceMappingURL=AttributesController.js.map
 
 /***/ }),
 
@@ -630,6 +927,42 @@ __exportStar(__webpack_require__(/*! ./SharedAttributeCopyCreatedEvent */ "./dis
 
 /***/ }),
 
+/***/ "./dist/modules/attributes/index.js":
+/*!******************************************!*\
+  !*** ./dist/modules/attributes/index.js ***!
+  \******************************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+__exportStar(__webpack_require__(/*! ./AttributesController */ "./dist/modules/attributes/AttributesController.js"), exports);
+__exportStar(__webpack_require__(/*! ./events */ "./dist/modules/attributes/events/index.js"), exports);
+__exportStar(__webpack_require__(/*! ./local/CreateLocalAttributeParams */ "./dist/modules/attributes/local/CreateLocalAttributeParams.js"), exports);
+__exportStar(__webpack_require__(/*! ./local/CreatePeerLocalAttributeParams */ "./dist/modules/attributes/local/CreatePeerLocalAttributeParams.js"), exports);
+__exportStar(__webpack_require__(/*! ./local/CreateSharedLocalAttributeCopyParams */ "./dist/modules/attributes/local/CreateSharedLocalAttributeCopyParams.js"), exports);
+__exportStar(__webpack_require__(/*! ./local/LocalAttribute */ "./dist/modules/attributes/local/LocalAttribute.js"), exports);
+__exportStar(__webpack_require__(/*! ./local/LocalAttributeShareInfo */ "./dist/modules/attributes/local/LocalAttributeShareInfo.js"), exports);
+__exportStar(__webpack_require__(/*! ./local/SucceedLocalAttributeParams */ "./dist/modules/attributes/local/SucceedLocalAttributeParams.js"), exports);
+__exportStar(__webpack_require__(/*! ./local/UpdateLocalAttributeParams */ "./dist/modules/attributes/local/UpdateLocalAttributeParams.js"), exports);
+//# sourceMappingURL=index.js.map
+
+/***/ }),
+
 /***/ "./dist/modules/attributes/local/CreateLocalAttributeParams.js":
 /*!*********************************************************************!*\
   !*** ./dist/modules/attributes/local/CreateLocalAttributeParams.js ***!
@@ -651,6 +984,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.CreateLocalAttributeParams = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
+const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 class CreateLocalAttributeParams extends ts_serval_1.Serializable {
     static from(value) {
         return this.fromAny(value);
@@ -661,6 +995,11 @@ __decorate([
     (0, ts_serval_1.validate)(),
     __metadata("design:type", Object)
 ], CreateLocalAttributeParams.prototype, "content", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)({ optional: true }),
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", transport_1.CoreId)
+], CreateLocalAttributeParams.prototype, "parentId", void 0);
 exports.CreateLocalAttributeParams = CreateLocalAttributeParams;
 //# sourceMappingURL=CreateLocalAttributeParams.js.map
 
@@ -809,19 +1148,35 @@ let LocalAttribute = class LocalAttribute extends transport_1.CoreSynchronizable
     isIdentityAttribute() {
         return this.content instanceof content_1.IdentityAttribute;
     }
+    isRelationshipAttribute() {
+        return this.content instanceof content_1.RelationshipAttribute;
+    }
     isOwnedBy(identity) {
         return this.content.owner.equals(identity);
     }
+    isRepositoryAttribute() {
+        return this.isIdentityAttribute() && !this.isShared();
+    }
+    isShared() {
+        return this.shareInfo !== undefined;
+    }
+    isSharedWith(address) {
+        if (!this.isShared()) {
+            return false;
+        }
+        return this.shareInfo.peer === address;
+    }
     static from(value) {
         return this.fromAny(value);
     }
-    static async fromAttribute(attribute, succeeds, shareInfo, id) {
+    static async fromAttribute(content, succeeds, shareInfo, id, parentId) {
         return this.from({
             id: id ?? (await consumption_1.ConsumptionIds.attribute.generate()),
-            content: attribute,
             createdAt: transport_1.CoreDate.utc(),
-            succeeds: succeeds,
-            shareInfo: shareInfo
+            content,
+            succeeds,
+            shareInfo,
+            parentId
         });
     }
 };
@@ -850,6 +1205,11 @@ __decorate([
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", LocalAttributeShareInfo_1.LocalAttributeShareInfo)
 ], LocalAttribute.prototype, "shareInfo", void 0);
+__decorate([
+    (0, ts_serval_1.validate)({ nullable: true }),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", transport_1.CoreId)
+], LocalAttribute.prototype, "parentId", void 0);
 LocalAttribute = __decorate([
     (0, ts_serval_1.type)("LocalAttribute")
 ], LocalAttribute);
@@ -913,10 +1273,11 @@ exports.LocalAttributeShareInfo = LocalAttributeShareInfo;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.RelationshipAttributeQueryTranslator = exports.IdentityAttributeQueryTranslator = void 0;
+exports.ThirdPartyRelationshipAttributeQueryTranslator = exports.RelationshipAttributeQueryTranslator = exports.IdentityAttributeQueryTranslator = void 0;
 const docdb_querytranslator_1 = __webpack_require__(/*! @js-soft/docdb-querytranslator */ "./node_modules/@js-soft/docdb-querytranslator/dist/index.js");
 const luxon_1 = __webpack_require__(/*! luxon */ "./node_modules/luxon/build/node/luxon.js");
 const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 class IdentityAttributeQueryTranslator {
     static translate(query) {
         return this.translator.parse({ ...query.toJSON(), attributeType: "IdentityAttribute" });
@@ -945,7 +1306,7 @@ IdentityAttributeQueryTranslator.translator = new docdb_querytranslator_1.QueryT
             if (!input)
                 return;
             if (!Array.isArray(input)) {
-                throw new Error("Invalid input: 'tags' must be an array");
+                throw new consumption_1.ConsumptionError("Invalid input: 'tags' must be an array");
             }
             const inputAsArray = input;
             query["$or"] = inputAsArray.map((t) => ({
@@ -985,11 +1346,9 @@ exports.RelationshipAttributeQueryTranslator = RelationshipAttributeQueryTransla
 RelationshipAttributeQueryTranslator.translator = new docdb_querytranslator_1.QueryTranslator({
     whitelist: {
         [(0, ts_simple_nameof_1.nameof)((x) => x.key)]: true,
-        [(0, ts_simple_nameof_1.nameof)((x) => x.valueType)]: true,
         [(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)]: true,
         [(0, ts_simple_nameof_1.nameof)((x) => x.validTo)]: true,
         [(0, ts_simple_nameof_1.nameof)((x) => x.owner)]: true,
-        [(0, ts_simple_nameof_1.nameof)((x) => x.thirdParty)]: true,
         attributeType: true
     },
     alias: {
@@ -997,9 +1356,55 @@ RelationshipAttributeQueryTranslator.translator = new docdb_querytranslator_1.Qu
         [(0, ts_simple_nameof_1.nameof)((x) => x.key)]: [
             `${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.key)}`
         ],
-        // @type of attributeValue
-        [(0, ts_simple_nameof_1.nameof)((x) => x.valueType)]: [
-            `${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.value)}.@type`
+        // @type of attribute
+        attributeType: [`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.@type`],
+        // owner
+        [(0, ts_simple_nameof_1.nameof)((x) => x.owner)]: [
+            `${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.owner)}`
+        ]
+    },
+    custom: {
+        // validFrom
+        [(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)]: (query, input) => {
+            if (!input) {
+                return;
+            }
+            const validFromUtcString = luxon_1.DateTime.fromISO(input).toUTC().toString();
+            query[`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)}`] = {
+                $gte: validFromUtcString
+            };
+        },
+        // validTo
+        [(0, ts_simple_nameof_1.nameof)((x) => x.validTo)]: (query, input) => {
+            if (!input) {
+                return;
+            }
+            const validToUtcString = luxon_1.DateTime.fromISO(input).toUTC().toString();
+            query[`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.validTo)}`] = {
+                $lte: validToUtcString
+            };
+        }
+    }
+});
+class ThirdPartyRelationshipAttributeQueryTranslator {
+    static translate(query) {
+        return this.translator.parse({ ...query.toJSON(), attributeType: "RelationshipAttribute" });
+    }
+}
+exports.ThirdPartyRelationshipAttributeQueryTranslator = ThirdPartyRelationshipAttributeQueryTranslator;
+ThirdPartyRelationshipAttributeQueryTranslator.translator = new docdb_querytranslator_1.QueryTranslator({
+    whitelist: {
+        [(0, ts_simple_nameof_1.nameof)((x) => x.key)]: true,
+        [(0, ts_simple_nameof_1.nameof)((x) => x.validFrom)]: true,
+        [(0, ts_simple_nameof_1.nameof)((x) => x.validTo)]: true,
+        [(0, ts_simple_nameof_1.nameof)((x) => x.owner)]: true,
+        [(0, ts_simple_nameof_1.nameof)((x) => x.thirdParty)]: true,
+        attributeType: true
+    },
+    alias: {
+        // key
+        [(0, ts_simple_nameof_1.nameof)((x) => x.key)]: [
+            `${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.${(0, ts_simple_nameof_1.nameof)((x) => x.key)}`
         ],
         // @type of attribute
         attributeType: [`${(0, ts_simple_nameof_1.nameof)((x) => x.content)}.@type`],
@@ -1151,12 +1556,12 @@ class DraftsController extends consumption_1.ConsumptionBaseController {
     }
     async getDrafts(query) {
         const items = await this.drafts.find(query);
-        return await this.parseArray(items, Draft_1.Draft);
+        return this.parseArray(items, Draft_1.Draft);
     }
     async createDraft(content, type = "") {
         const draft = Draft_1.Draft.from({
             id: await consumption_1.ConsumptionIds.draft.generate(),
-            content: content,
+            content,
             createdAt: new transport_1.CoreDate(),
             lastModifiedAt: new transport_1.CoreDate(),
             type: type
@@ -1167,7 +1572,7 @@ class DraftsController extends consumption_1.ConsumptionBaseController {
     async updateDraft(draft) {
         const oldDraft = await this.drafts.read(draft.id.toString());
         if (!oldDraft) {
-            throw new Error("Draft Not Found");
+            throw new consumption_1.ConsumptionError("Draft Not Found");
         }
         await this.drafts.update(oldDraft, draft);
     }
@@ -1180,6 +1585,35 @@ exports.DraftsController = DraftsController;
 
 /***/ }),
 
+/***/ "./dist/modules/drafts/index.js":
+/*!**************************************!*\
+  !*** ./dist/modules/drafts/index.js ***!
+  \**************************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+__exportStar(__webpack_require__(/*! ./DraftsController */ "./dist/modules/drafts/DraftsController.js"), exports);
+__exportStar(__webpack_require__(/*! ./local/Draft */ "./dist/modules/drafts/local/Draft.js"), exports);
+//# sourceMappingURL=index.js.map
+
+/***/ }),
+
 /***/ "./dist/modules/drafts/local/Draft.js":
 /*!********************************************!*\
   !*** ./dist/modules/drafts/local/Draft.js ***!
@@ -1283,55 +1717,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-__exportStar(__webpack_require__(/*! ./attributes/events */ "./dist/modules/attributes/events/index.js"), exports);
-__exportStar(__webpack_require__(/*! ./attributes/local/CreateLocalAttributeParams */ "./dist/modules/attributes/local/CreateLocalAttributeParams.js"), exports);
-__exportStar(__webpack_require__(/*! ./attributes/local/CreatePeerLocalAttributeParams */ "./dist/modules/attributes/local/CreatePeerLocalAttributeParams.js"), exports);
-__exportStar(__webpack_require__(/*! ./attributes/local/CreateSharedLocalAttributeCopyParams */ "./dist/modules/attributes/local/CreateSharedLocalAttributeCopyParams.js"), exports);
-__exportStar(__webpack_require__(/*! ./attributes/local/LocalAttribute */ "./dist/modules/attributes/local/LocalAttribute.js"), exports);
-__exportStar(__webpack_require__(/*! ./attributes/local/LocalAttributeShareInfo */ "./dist/modules/attributes/local/LocalAttributeShareInfo.js"), exports);
-__exportStar(__webpack_require__(/*! ./attributes/local/SucceedLocalAttributeParams */ "./dist/modules/attributes/local/SucceedLocalAttributeParams.js"), exports);
-__exportStar(__webpack_require__(/*! ./attributes/local/UpdateLocalAttributeParams */ "./dist/modules/attributes/local/UpdateLocalAttributeParams.js"), exports);
-__exportStar(__webpack_require__(/*! ./attributes/LocalAttributesController */ "./dist/modules/attributes/LocalAttributesController.js"), exports);
-__exportStar(__webpack_require__(/*! ./drafts/DraftsController */ "./dist/modules/drafts/DraftsController.js"), exports);
-__exportStar(__webpack_require__(/*! ./drafts/local/Draft */ "./dist/modules/drafts/local/Draft.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/events */ "./dist/modules/requests/events/index.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/incoming/checkPrerequisites/CheckPrerequisitesOfIncomingRequestParameters */ "./dist/modules/requests/incoming/checkPrerequisites/CheckPrerequisitesOfIncomingRequestParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/incoming/complete/CompleteIncomingRequestParameters */ "./dist/modules/requests/incoming/complete/CompleteIncomingRequestParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/incoming/decide/AcceptRequestItemParameters */ "./dist/modules/requests/incoming/decide/AcceptRequestItemParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/incoming/decide/DecideRequestItemGroupParameters */ "./dist/modules/requests/incoming/decide/DecideRequestItemGroupParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/incoming/decide/DecideRequestItemParameters */ "./dist/modules/requests/incoming/decide/DecideRequestItemParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/incoming/decide/DecideRequestParameters */ "./dist/modules/requests/incoming/decide/DecideRequestParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/incoming/decide/RejectRequestItemParameters */ "./dist/modules/requests/incoming/decide/RejectRequestItemParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/incoming/DecideRequestParametersValidator */ "./dist/modules/requests/incoming/DecideRequestParametersValidator.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/incoming/IncomingRequestsController */ "./dist/modules/requests/incoming/IncomingRequestsController.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/incoming/received/ReceivedIncomingRequestParameters */ "./dist/modules/requests/incoming/received/ReceivedIncomingRequestParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/incoming/requireManualDecision/RequireManualDecisionOfIncomingRequestParameters */ "./dist/modules/requests/incoming/requireManualDecision/RequireManualDecisionOfIncomingRequestParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/itemProcessors/AbstractRequestItemProcessor */ "./dist/modules/requests/itemProcessors/AbstractRequestItemProcessor.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/itemProcessors/GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/itemProcessors/IRequestItemProcessor */ "./dist/modules/requests/itemProcessors/IRequestItemProcessor.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/itemProcessors/ProcessorConstructor */ "./dist/modules/requests/itemProcessors/ProcessorConstructor.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/itemProcessors/proposeAttribute/AcceptProposeAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/proposeAttribute/AcceptProposeAttributeRequestItemParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/itemProcessors/proposeAttribute/ProposeAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/proposeAttribute/ProposeAttributeRequestItemProcessor.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/itemProcessors/RequestItemConstructor */ "./dist/modules/requests/itemProcessors/RequestItemConstructor.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/itemProcessors/RequestItemProcessorRegistry */ "./dist/modules/requests/itemProcessors/RequestItemProcessorRegistry.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/itemProcessors/shareAttribute/AcceptShareAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/shareAttribute/AcceptShareAttributeRequestItemParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/itemProcessors/ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/local/LocalRequest */ "./dist/modules/requests/local/LocalRequest.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/local/LocalRequestStatus */ "./dist/modules/requests/local/LocalRequestStatus.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/local/LocalRequestStatusLogEntry */ "./dist/modules/requests/local/LocalRequestStatusLogEntry.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/local/LocalResponse */ "./dist/modules/requests/local/LocalResponse.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/outgoing/completeOutgoingRequest/CompleteOutgoingRequestParameters */ "./dist/modules/requests/outgoing/completeOutgoingRequest/CompleteOutgoingRequestParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/outgoing/createFromRelationshipCreationChange/CreateOutgoingRequestFromRelationshipCreationChangeParameters */ "./dist/modules/requests/outgoing/createFromRelationshipCreationChange/CreateOutgoingRequestFromRelationshipCreationChangeParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/outgoing/createOutgoingRequest/CreateOutgoingRequestParameters */ "./dist/modules/requests/outgoing/createOutgoingRequest/CreateOutgoingRequestParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/outgoing/OutgoingRequestsController */ "./dist/modules/requests/outgoing/OutgoingRequestsController.js"), exports);
-__exportStar(__webpack_require__(/*! ./requests/outgoing/sentOutgoingRequest/SentOutgoingRequestParameters */ "./dist/modules/requests/outgoing/sentOutgoingRequest/SentOutgoingRequestParameters.js"), exports);
-__exportStar(__webpack_require__(/*! ./settings/local/CreateSettingParameter */ "./dist/modules/settings/local/CreateSettingParameter.js"), exports);
-__exportStar(__webpack_require__(/*! ./settings/local/Setting */ "./dist/modules/settings/local/Setting.js"), exports);
-__exportStar(__webpack_require__(/*! ./settings/SettingsController */ "./dist/modules/settings/SettingsController.js"), exports);
+__exportStar(__webpack_require__(/*! ./attributeListeners */ "./dist/modules/attributeListeners/index.js"), exports);
+__exportStar(__webpack_require__(/*! ./attributes */ "./dist/modules/attributes/index.js"), exports);
+__exportStar(__webpack_require__(/*! ./drafts */ "./dist/modules/drafts/index.js"), exports);
+__exportStar(__webpack_require__(/*! ./requests */ "./dist/modules/requests/index.js"), exports);
+__exportStar(__webpack_require__(/*! ./settings */ "./dist/modules/settings/index.js"), exports);
 //# sourceMappingURL=index.js.map
 
 /***/ }),
@@ -1347,11 +1737,12 @@ __exportStar(__webpack_require__(/*! ./settings/SettingsController */ "./dist/mo
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.IncomingRequestReceivedEvent = void 0;
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 class IncomingRequestReceivedEvent extends transport_1.TransportDataEvent {
     constructor(eventTargetAddress, data) {
         super(IncomingRequestReceivedEvent.namespace, eventTargetAddress, data);
         if (data.isOwn)
-            throw new Error("Cannot create this event for an outgoing Request");
+            throw new consumption_1.ConsumptionError("Cannot create this event for an outgoing Request");
     }
 }
 exports.IncomingRequestReceivedEvent = IncomingRequestReceivedEvent;
@@ -1371,11 +1762,12 @@ IncomingRequestReceivedEvent.namespace = "consumption.incomingRequestReceived";
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.IncomingRequestStatusChangedEvent = void 0;
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 class IncomingRequestStatusChangedEvent extends transport_1.TransportDataEvent {
     constructor(eventTargetAddress, data) {
         super(IncomingRequestStatusChangedEvent.namespace, eventTargetAddress, data);
         if (data.request.isOwn)
-            throw new Error("Cannot create this event for an outgoing Request");
+            throw new consumption_1.ConsumptionError("Cannot create this event for an outgoing Request");
     }
 }
 exports.IncomingRequestStatusChangedEvent = IncomingRequestStatusChangedEvent;
@@ -1395,11 +1787,12 @@ IncomingRequestStatusChangedEvent.namespace = "consumption.incomingRequestStatus
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.OutgoingRequestCreatedEvent = void 0;
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 class OutgoingRequestCreatedEvent extends transport_1.TransportDataEvent {
     constructor(eventTargetAddress, data) {
         super(OutgoingRequestCreatedEvent.namespace, eventTargetAddress, data);
         if (!data.isOwn)
-            throw new Error("Cannot create this event for an incoming Request");
+            throw new consumption_1.ConsumptionError("Cannot create this event for an incoming Request");
     }
 }
 exports.OutgoingRequestCreatedEvent = OutgoingRequestCreatedEvent;
@@ -1419,11 +1812,12 @@ OutgoingRequestCreatedEvent.namespace = "consumption.outgoingRequestCreated";
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.OutgoingRequestFromRelationshipCreationChangeCreatedAndCompletedEvent = void 0;
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 class OutgoingRequestFromRelationshipCreationChangeCreatedAndCompletedEvent extends transport_1.TransportDataEvent {
     constructor(eventTargetAddress, data) {
         super(OutgoingRequestFromRelationshipCreationChangeCreatedAndCompletedEvent.namespace, eventTargetAddress, data);
         if (!data.isOwn)
-            throw new Error("Cannot create this event for an incoming Request");
+            throw new consumption_1.ConsumptionError("Cannot create this event for an incoming Request");
     }
 }
 exports.OutgoingRequestFromRelationshipCreationChangeCreatedAndCompletedEvent = OutgoingRequestFromRelationshipCreationChangeCreatedAndCompletedEvent;
@@ -1443,11 +1837,12 @@ OutgoingRequestFromRelationshipCreationChangeCreatedAndCompletedEvent.namespace
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.OutgoingRequestStatusChangedEvent = void 0;
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 class OutgoingRequestStatusChangedEvent extends transport_1.TransportDataEvent {
     constructor(eventTargetAddress, data) {
         super(OutgoingRequestStatusChangedEvent.namespace, eventTargetAddress, data);
         if (!data.request.isOwn)
-            throw new Error("Cannot create this event for an incoming Request");
+            throw new consumption_1.ConsumptionError("Cannot create this event for an incoming Request");
     }
 }
 exports.OutgoingRequestStatusChangedEvent = OutgoingRequestStatusChangedEvent;
@@ -1498,19 +1893,19 @@ __exportStar(__webpack_require__(/*! ./OutgoingRequestStatusChangedEvent */ "./d
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DecideRequestParametersValidator = void 0;
-const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 const ValidationResult_1 = __webpack_require__(/*! ../itemProcessors/ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
 const DecideRequestItemGroupParameters_1 = __webpack_require__(/*! ./decide/DecideRequestItemGroupParameters */ "./dist/modules/requests/incoming/decide/DecideRequestItemGroupParameters.js");
 const DecideRequestItemParameters_1 = __webpack_require__(/*! ./decide/DecideRequestItemParameters */ "./dist/modules/requests/incoming/decide/DecideRequestItemParameters.js");
 class DecideRequestParametersValidator {
     validate(params, request) {
         if (!request.id.equals(transport_1.CoreId.from(params.requestId))) {
-            return ValidationResult_1.ValidationResult.error(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidRequestId", "The id of the Request does not match the id of the Response"));
+            throw new Error("The response is invalid because the id of the Request does not match the id of the Response.");
         }
         if (params.items.length !== request.content.items.length) {
-            return ValidationResult_1.ValidationResult.error(this.invalidNumberOfItemsError("Number of items in Request and Response do not match"));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.invalidNumberOfItems("Number of items in Request and Response do not match"));
         }
         const validationResults = request.content.items.map((requestItem, index) => this.checkItemOrGroup(requestItem, params.items[index], params.accept));
         return ValidationResult_1.ValidationResult.fromItems(validationResults);
@@ -1523,36 +1918,33 @@ class DecideRequestParametersValidator {
     }
     checkItem(requestItem, response, isParentAccepted) {
         if ((0, DecideRequestItemGroupParameters_1.isDecideRequestItemGroupParametersJSON)(response)) {
-            return ValidationResult_1.ValidationResult.error(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", "The RequestItem was answered as a RequestItemGroup."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.requestItemAnsweredAsRequestItemGroup());
         }
         if (!isParentAccepted && response.accept) {
-            return ValidationResult_1.ValidationResult.error(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", "The RequestItem was accepted, but the parent was not accepted."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.itemAcceptedButParentNotAccepted("The RequestItem was accepted, but the parent was not accepted."));
         }
         if (isParentAccepted && requestItem.mustBeAccepted && !response.accept) {
-            return ValidationResult_1.ValidationResult.error(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", "The RequestItem is flagged as 'mustBeAccepted', but it was not accepted."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.mustBeAcceptedItemNotAccepted("The RequestItem is flagged as 'mustBeAccepted', but it was not accepted."));
         }
         return ValidationResult_1.ValidationResult.success();
     }
     checkItemGroup(requestItemGroup, responseItemGroup, isParentAccepted) {
         if ((0, DecideRequestItemParameters_1.isDecideRequestItemParametersJSON)(responseItemGroup)) {
-            return ValidationResult_1.ValidationResult.error(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", "The RequestItemGroup was answered as a RequestItem."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.requestItemGroupAnsweredAsRequestItem());
         }
         if (responseItemGroup.items.length !== requestItemGroup.items.length) {
-            return ValidationResult_1.ValidationResult.error(this.invalidNumberOfItemsError("Number of items in RequestItemGroup and ResponseItemGroup do not match"));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.invalidNumberOfItems("Number of items in RequestItemGroup and ResponseItemGroup do not match"));
         }
         const isGroupAccepted = responseItemGroup.items.some((value) => value.accept);
         if (!isParentAccepted && isGroupAccepted) {
-            return ValidationResult_1.ValidationResult.error(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", "The RequestItemGroup was accepted, but the parent was not accepted."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.itemAcceptedButParentNotAccepted("The RequestItemGroup was accepted, but the parent was not accepted."));
         }
         if (isParentAccepted && requestItemGroup.mustBeAccepted && !isGroupAccepted) {
-            return ValidationResult_1.ValidationResult.error(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", "The RequestItemGroup is flagged as 'mustBeAccepted', but it was not accepted. Please accept all 'mustBeAccepted' items in this group."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.mustBeAcceptedItemNotAccepted("The RequestItemGroup is flagged as 'mustBeAccepted', but it was not accepted. Please accept all 'mustBeAccepted' items in this group."));
         }
         const validationResults = requestItemGroup.items.map((requestItem, index) => this.checkItem(requestItem, responseItemGroup.items[index], isGroupAccepted));
         return ValidationResult_1.ValidationResult.fromItems(validationResults);
     }
-    invalidNumberOfItemsError(message) {
-        return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidNumberOfItems", message);
-    }
 }
 exports.DecideRequestParametersValidator = DecideRequestParametersValidator;
 //# sourceMappingURL=DecideRequestParametersValidator.js.map
@@ -1569,6 +1961,7 @@ exports.DecideRequestParametersValidator = DecideRequestParametersValidator;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.IncomingRequestsController = void 0;
+const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
@@ -1617,7 +2010,7 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
     }
     extractInfoFromMessage(message) {
         if (message.isOwn)
-            throw new Error("Cannot create incoming Request from own Message");
+            throw new consumption_1.ConsumptionError("Cannot create incoming Request from own Message");
         return {
             peer: message.cache.createdBy,
             source: {
@@ -1628,7 +2021,7 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
     }
     extractInfoFromRelationshipTemplate(template) {
         if (template.isOwn)
-            throw new Error("Cannot create incoming Request from own Relationship Template");
+            throw new consumption_1.ConsumptionError("Cannot create incoming Request from own Relationship Template");
         return {
             peer: template.cache.createdBy,
             source: {
@@ -1721,26 +2114,28 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
     async canDecideItem(params, requestItem, request) {
         const processor = this.processorRegistry.getProcessorForItem(requestItem);
         try {
-            if (params.accept) {
+            if (params.accept)
                 return await processor.canAccept(requestItem, params, request);
-            }
             return await processor.canReject(requestItem, params, request);
         }
         catch (e) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.unexpectedErrorDuringRequestItemProcessing(e));
+            if (e instanceof ts_serval_1.ServalError) {
+                return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.servalErrorDuringRequestItemProcessing(e));
+            }
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.unexpectedErrorDuringRequestItemProcessing(e));
         }
     }
     async accept(params) {
         const canAccept = await this.canAccept(params);
         if (!canAccept.isSuccess()) {
-            throw new Error("Cannot accept the Request with the given parameters. Call 'canAccept' to get more information.");
+            throw new consumption_1.ConsumptionError("Cannot accept the Request with the given parameters. Call 'canAccept' to get more information.");
         }
         return await this.decide({ ...params, accept: true });
     }
     async reject(params) {
         const canReject = await this.canReject(params);
         if (!canReject.isSuccess()) {
-            throw new Error("Cannot reject the Request with the given parameters. Call 'canReject' to get more information.");
+            throw new consumption_1.ConsumptionError("Cannot reject the Request with the given parameters. Call 'canReject' to get more information.");
         }
         return await this.decide({ ...params, accept: false });
     }
@@ -1775,7 +2170,7 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
     }
     async decideGroup(groupItemParam, requestItemGroup, request) {
         const items = (await this.decideItems(groupItemParam.items, requestItemGroup.items, request));
-        const group = content_1.ResponseItemGroup.from({ items: items });
+        const group = content_1.ResponseItemGroup.from({ items });
         return group;
     }
     async decideItems(params, requestItems, request) {
@@ -1805,30 +2200,27 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
             if (e instanceof Error) {
                 details = ` Details: ${e.message}`;
             }
-            throw new Error(`An error occurred while processing a '${requestItem.constructor.name}'. You should contact the developer of this RequestItem.${details}}`);
+            throw new consumption_1.ConsumptionError(`An error occurred while processing a '${requestItem.constructor.name}'. You should contact the developer of this RequestItem.${details}}`);
         }
     }
     async complete(params) {
         const parsedParams = CompleteIncomingRequestParameters_1.CompleteIncomingRequestParameters.from(params);
         const request = await this.getOrThrow(parsedParams.requestId);
         if (request.isOwn) {
-            throw new Error("Cannot decide own Request");
+            throw new consumption_1.ConsumptionError("Cannot decide own Request");
         }
         this.assertRequestStatus(request, LocalRequestStatus_1.LocalRequestStatus.Decided);
-        let responseSource;
-        if (parsedParams.responseSourceObject instanceof transport_1.Message) {
-            responseSource = "Message";
-        }
-        else if (parsedParams.responseSourceObject instanceof transport_1.RelationshipChange) {
-            responseSource = "RelationshipChange";
+        const requestIsRejected = request.response.content.result === content_1.ResponseResult.Rejected;
+        const requestIsFromTemplate = request.source.type === "RelationshipTemplate";
+        if (parsedParams.responseSourceObject) {
+            request.response.source = LocalResponse_1.LocalResponseSource.from({
+                type: parsedParams.responseSourceObject instanceof transport_1.Message ? "Message" : "RelationshipChange",
+                reference: parsedParams.responseSourceObject.id
+            });
         }
-        else {
-            throw new Error("Unknown response source");
+        else if (!requestIsRejected || !requestIsFromTemplate) {
+            throw new consumption_1.ConsumptionError("A Request can only be completed without a responseSource if the Request is rejected and the Request is from a Relationship Template");
         }
-        request.response.source = LocalResponse_1.LocalResponseSource.from({
-            type: responseSource,
-            reference: parsedParams.responseSourceObject.id
-        });
         request.changeStatus(LocalRequestStatus_1.LocalRequestStatus.Completed);
         await this.update(request);
         this.eventBus.publish(new events_1.IncomingRequestStatusChangedEvent(this.identity.address.toString(), {
@@ -1839,36 +2231,45 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
         return request;
     }
     async getIncomingRequests(query) {
-        query ??= {};
-        query.isOwn = false;
-        const requestDocs = await this.localRequests.find(query);
-        const requests = requestDocs.map((r) => LocalRequest_1.LocalRequest.from(r));
-        return requests;
+        const requestDocs = await this.localRequests.find({
+            ...query,
+            isOwn: false
+        });
+        const requestPromises = requestDocs.map((r) => this.updateRequestExpiry(LocalRequest_1.LocalRequest.from(r)));
+        return await Promise.all(requestPromises);
     }
     async getIncomingRequest(idIncomingRequest) {
         const requestDoc = await this.localRequests.findOne({ id: idIncomingRequest.toString(), isOwn: false });
-        const request = requestDoc ? LocalRequest_1.LocalRequest.from(requestDoc) : undefined;
-        return request;
+        if (!requestDoc)
+            return;
+        const localRequest = LocalRequest_1.LocalRequest.from(requestDoc);
+        return await this.updateRequestExpiry(localRequest);
     }
     async getOrThrow(id) {
         const request = await this.getIncomingRequest(transport_1.CoreId.from(id));
         if (!request) {
-            throw transport_1.TransportErrors.general.recordNotFound(LocalRequest_1.LocalRequest, id.toString());
+            throw transport_1.CoreErrors.general.recordNotFound(LocalRequest_1.LocalRequest, id.toString());
         }
         return request;
     }
     async update(request) {
         const requestDoc = await this.localRequests.findOne({ id: request.id.toString(), isOwn: false });
         if (!requestDoc) {
-            throw transport_1.TransportErrors.general.recordNotFound(LocalRequest_1.LocalRequest, request.id.toString());
+            throw transport_1.CoreErrors.general.recordNotFound(LocalRequest_1.LocalRequest, request.id.toString());
         }
         await this.localRequests.update(requestDoc, request);
     }
     assertRequestStatus(request, ...status) {
         if (!status.includes(request.status)) {
-            throw new Error(`Local Request has to be in status '${status.join("/")}'.`);
+            throw new consumption_1.ConsumptionError(`Local Request has to be in status '${status.join("/")}'.`);
         }
     }
+    async updateRequestExpiry(request) {
+        const statusUpdated = request.updateStatusBasedOnExpiration();
+        if (statusUpdated)
+            await this.update(request);
+        return request;
+    }
 }
 exports.IncomingRequestsController = IncomingRequestsController;
 //# sourceMappingURL=IncomingRequestsController.js.map
@@ -1947,7 +2348,7 @@ __decorate([
 ], CompleteIncomingRequestParameters.prototype, "requestId", void 0);
 __decorate([
     (0, ts_serval_1.serialize)({ unionTypes: [transport_1.Message, transport_1.RelationshipChange] }),
-    (0, ts_serval_1.validate)(),
+    (0, ts_serval_1.validate)({ nullable: true }),
     __metadata("design:type", Object)
 ], CompleteIncomingRequestParameters.prototype, "responseSourceObject", void 0);
 exports.CompleteIncomingRequestParameters = CompleteIncomingRequestParameters;
@@ -2160,6 +2561,68 @@ exports.RequireManualDecisionOfIncomingRequestParameters = RequireManualDecision
 
 /***/ }),
 
+/***/ "./dist/modules/requests/index.js":
+/*!****************************************!*\
+  !*** ./dist/modules/requests/index.js ***!
+  \****************************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+__exportStar(__webpack_require__(/*! ./events */ "./dist/modules/requests/events/index.js"), exports);
+__exportStar(__webpack_require__(/*! ./incoming/checkPrerequisites/CheckPrerequisitesOfIncomingRequestParameters */ "./dist/modules/requests/incoming/checkPrerequisites/CheckPrerequisitesOfIncomingRequestParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./incoming/complete/CompleteIncomingRequestParameters */ "./dist/modules/requests/incoming/complete/CompleteIncomingRequestParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./incoming/decide/AcceptRequestItemParameters */ "./dist/modules/requests/incoming/decide/AcceptRequestItemParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./incoming/decide/DecideRequestItemGroupParameters */ "./dist/modules/requests/incoming/decide/DecideRequestItemGroupParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./incoming/decide/DecideRequestItemParameters */ "./dist/modules/requests/incoming/decide/DecideRequestItemParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./incoming/decide/DecideRequestParameters */ "./dist/modules/requests/incoming/decide/DecideRequestParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./incoming/decide/RejectRequestItemParameters */ "./dist/modules/requests/incoming/decide/RejectRequestItemParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./incoming/DecideRequestParametersValidator */ "./dist/modules/requests/incoming/DecideRequestParametersValidator.js"), exports);
+__exportStar(__webpack_require__(/*! ./incoming/IncomingRequestsController */ "./dist/modules/requests/incoming/IncomingRequestsController.js"), exports);
+__exportStar(__webpack_require__(/*! ./incoming/received/ReceivedIncomingRequestParameters */ "./dist/modules/requests/incoming/received/ReceivedIncomingRequestParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./incoming/requireManualDecision/RequireManualDecisionOfIncomingRequestParameters */ "./dist/modules/requests/incoming/requireManualDecision/RequireManualDecisionOfIncomingRequestParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./itemProcessors/AbstractRequestItemProcessor */ "./dist/modules/requests/itemProcessors/AbstractRequestItemProcessor.js"), exports);
+__exportStar(__webpack_require__(/*! ./itemProcessors/createAttribute/CreateAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js"), exports);
+__exportStar(__webpack_require__(/*! ./itemProcessors/GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js"), exports);
+__exportStar(__webpack_require__(/*! ./itemProcessors/IRequestItemProcessor */ "./dist/modules/requests/itemProcessors/IRequestItemProcessor.js"), exports);
+__exportStar(__webpack_require__(/*! ./itemProcessors/ProcessorConstructor */ "./dist/modules/requests/itemProcessors/ProcessorConstructor.js"), exports);
+__exportStar(__webpack_require__(/*! ./itemProcessors/proposeAttribute/AcceptProposeAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/proposeAttribute/AcceptProposeAttributeRequestItemParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./itemProcessors/proposeAttribute/ProposeAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/proposeAttribute/ProposeAttributeRequestItemProcessor.js"), exports);
+__exportStar(__webpack_require__(/*! ./itemProcessors/readAttribute/ReadAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.js"), exports);
+__exportStar(__webpack_require__(/*! ./itemProcessors/registerAttributeListener/RegisterAttributeListenerRequestItemProcessor */ "./dist/modules/requests/itemProcessors/registerAttributeListener/RegisterAttributeListenerRequestItemProcessor.js"), exports);
+__exportStar(__webpack_require__(/*! ./itemProcessors/RequestItemConstructor */ "./dist/modules/requests/itemProcessors/RequestItemConstructor.js"), exports);
+__exportStar(__webpack_require__(/*! ./itemProcessors/RequestItemProcessorRegistry */ "./dist/modules/requests/itemProcessors/RequestItemProcessorRegistry.js"), exports);
+__exportStar(__webpack_require__(/*! ./itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.js"), exports);
+__exportStar(__webpack_require__(/*! ./itemProcessors/ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js"), exports);
+__exportStar(__webpack_require__(/*! ./local/LocalRequest */ "./dist/modules/requests/local/LocalRequest.js"), exports);
+__exportStar(__webpack_require__(/*! ./local/LocalRequestStatus */ "./dist/modules/requests/local/LocalRequestStatus.js"), exports);
+__exportStar(__webpack_require__(/*! ./local/LocalRequestStatusLogEntry */ "./dist/modules/requests/local/LocalRequestStatusLogEntry.js"), exports);
+__exportStar(__webpack_require__(/*! ./local/LocalResponse */ "./dist/modules/requests/local/LocalResponse.js"), exports);
+__exportStar(__webpack_require__(/*! ./outgoing/completeOutgoingRequest/CompleteOutgoingRequestParameters */ "./dist/modules/requests/outgoing/completeOutgoingRequest/CompleteOutgoingRequestParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./outgoing/createFromRelationshipCreationChange/CreateOutgoingRequestFromRelationshipCreationChangeParameters */ "./dist/modules/requests/outgoing/createFromRelationshipCreationChange/CreateOutgoingRequestFromRelationshipCreationChangeParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./outgoing/createOutgoingRequest/CanCreateOutgoingRequestParameters */ "./dist/modules/requests/outgoing/createOutgoingRequest/CanCreateOutgoingRequestParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./outgoing/createOutgoingRequest/CreateOutgoingRequestParameters */ "./dist/modules/requests/outgoing/createOutgoingRequest/CreateOutgoingRequestParameters.js"), exports);
+__exportStar(__webpack_require__(/*! ./outgoing/OutgoingRequestsController */ "./dist/modules/requests/outgoing/OutgoingRequestsController.js"), exports);
+__exportStar(__webpack_require__(/*! ./outgoing/sentOutgoingRequest/SentOutgoingRequestParameters */ "./dist/modules/requests/outgoing/sentOutgoingRequest/SentOutgoingRequestParameters.js"), exports);
+//# sourceMappingURL=index.js.map
+
+/***/ }),
+
 /***/ "./dist/modules/requests/itemProcessors/AbstractRequestItemProcessor.js":
 /*!******************************************************************************!*\
   !*** ./dist/modules/requests/itemProcessors/AbstractRequestItemProcessor.js ***!
@@ -2270,12 +2733,13 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 /*!******************************************************************************!*\
   !*** ./dist/modules/requests/itemProcessors/RequestItemProcessorRegistry.js ***!
   \******************************************************************************/
-/***/ ((__unused_webpack_module, exports) => {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RequestItemProcessorRegistry = void 0;
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 class RequestItemProcessorRegistry {
     constructor(consumptionController, processors = new Map()) {
         this.consumptionController = consumptionController;
@@ -2283,7 +2747,7 @@ class RequestItemProcessorRegistry {
     }
     registerProcessor(itemConstructor, processorConstructor) {
         if (this.processors.has(itemConstructor)) {
-            throw new Error(`There is already a processor registered for '${itemConstructor.name}''. Use 'replaceProcessorForType' if you want to replace it.`);
+            throw new consumption_1.ConsumptionError(`There is already a processor registered for '${itemConstructor.name}''. Use 'replaceProcessorForType' if you want to replace it.`);
         }
         this.processors.set(itemConstructor, processorConstructor);
     }
@@ -2293,7 +2757,7 @@ class RequestItemProcessorRegistry {
     getProcessorForItem(item) {
         const constructor = this.processors.get(item.constructor);
         if (!constructor) {
-            throw new Error(`There was no processor registered for '${item.constructor.name}'.`);
+            throw new consumption_1.ConsumptionError(`There was no processor registered for '${item.constructor.name}'.`);
         }
         return new constructor(this.consumptionController);
     }
@@ -2354,36 +2818,6 @@ exports.ErrorValidationResult = ErrorValidationResult;
 
 /***/ }),
 
-/***/ "./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.js":
-/*!************************************************************************************************************!*\
-  !*** ./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.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;
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.AcceptCreateAttributeRequestItemParameters = void 0;
-const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
-let AcceptCreateAttributeRequestItemParameters = class AcceptCreateAttributeRequestItemParameters extends ts_serval_1.Serializable {
-    static from(value) {
-        return this.fromAny(value);
-    }
-};
-AcceptCreateAttributeRequestItemParameters = __decorate([
-    (0, ts_serval_1.type)("AcceptCreateAttributeRequestItemParameters")
-], AcceptCreateAttributeRequestItemParameters);
-exports.AcceptCreateAttributeRequestItemParameters = AcceptCreateAttributeRequestItemParameters;
-//# sourceMappingURL=AcceptCreateAttributeRequestItemParameters.js.map
-
-/***/ }),
-
 /***/ "./dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js":
 /*!*****************************************************************************************************!*\
   !*** ./dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js ***!
@@ -2399,54 +2833,64 @@ const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist
 const GenericRequestItemProcessor_1 = __webpack_require__(/*! ../GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js");
 const ValidationResult_1 = __webpack_require__(/*! ../ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
 class CreateAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
-    canCreateOutgoingRequestItem(requestItem, _request, _recipient) {
-        if (requestItem.attribute.owner.toString() !== "" &&
-            !requestItem.attribute.owner.equals(this.currentIdentityAddress)) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be an empty string. This is because you can only send Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
-        }
+    canCreateOutgoingRequestItem(requestItem, _request, recipient) {
+        const recipientIsAttributeOwner = requestItem.attribute.owner.equals(recipient);
+        const senderIsAttributeOwner = requestItem.attribute.owner.equals(this.currentIdentityAddress);
+        const ownerIsEmptyString = requestItem.attribute.owner.toString() === "";
         if (requestItem.attribute instanceof content_1.IdentityAttribute) {
-            return this.canCreateRequestItemWithIdentityAttribute(requestItem);
-        }
-        return ValidationResult_1.ValidationResult.success();
-    }
-    canCreateRequestItemWithIdentityAttribute(requestItem) {
-        if (!requestItem.sourceAttributeId) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("'sourceAttributeId' cannot be undefined when sending an Identity Attribute."));
-        }
-        return ValidationResult_1.ValidationResult.success();
-    }
-    async accept(requestItem, _params, requestInfo) {
-        const peerLocalAttribute = await this.consumptionController.attributes.createPeerLocalAttribute({
-            content: requestItem.attribute,
-            peer: requestInfo.peer,
-            requestReference: requestInfo.id
-        });
-        return content_1.CreateAttributeAcceptResponseItem.from({
-            attributeId: peerLocalAttribute.id,
-            result: content_1.ResponseItemResult.Accepted
-        });
+            if (senderIsAttributeOwner) {
+                return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot create own Attributes with a CreateAttributeRequestItem. Use a ShareAttributeRequestItem instead."));
+            }
+            if (recipientIsAttributeOwner || ownerIsEmptyString || recipient === undefined) {
+                return ValidationResult_1.ValidationResult.success();
+            }
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be the recipient's address or an empty string. The latter will default to the recipient's address."));
+        }
+        if (recipientIsAttributeOwner || senderIsAttributeOwner || ownerIsEmptyString || recipient === undefined) {
+            return ValidationResult_1.ValidationResult.success();
+        }
+        return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The owner of the given 'attribute' can only be the sender's address, the recipient's address or an empty string. The latter will default to the recipient's address."));
     }
-    async applyIncomingResponseItem(responseItem, requestItem, requestInfo) {
-        if (!(responseItem instanceof content_1.CreateAttributeAcceptResponseItem)) {
-            return;
+    async accept(requestItem, _params, requestInfo) {
+        if (requestItem.attribute.owner.toString() === "") {
+            requestItem.attribute.owner = this.currentIdentityAddress;
         }
-        if (requestItem.sourceAttributeId) {
-            const sourceAttribute = await this.consumptionController.attributes.getLocalAttribute(requestItem.sourceAttributeId);
-            await this.consumptionController.attributes.createSharedLocalAttributeCopy({
-                attributeId: responseItem.attributeId,
-                sourceAttributeId: sourceAttribute.id,
+        let sharedAttribute;
+        if (requestItem.attribute instanceof content_1.IdentityAttribute) {
+            const repositoryAttribute = await this.consumptionController.attributes.createLocalAttribute({
+                content: requestItem.attribute
+            });
+            sharedAttribute = await this.consumptionController.attributes.createSharedLocalAttributeCopy({
                 peer: requestInfo.peer,
-                requestReference: requestInfo.id
+                requestReference: requestInfo.id,
+                sourceAttributeId: repositoryAttribute.id
             });
         }
         else {
-            await this.consumptionController.attributes.createPeerLocalAttribute({
-                id: responseItem.attributeId,
+            sharedAttribute = await this.consumptionController.attributes.createPeerLocalAttribute({
                 content: requestItem.attribute,
                 peer: requestInfo.peer,
                 requestReference: requestInfo.id
             });
         }
+        return content_1.CreateAttributeAcceptResponseItem.from({
+            result: content_1.ResponseItemResult.Accepted,
+            attributeId: sharedAttribute.id
+        });
+    }
+    async applyIncomingResponseItem(responseItem, requestItem, requestInfo) {
+        if (!(responseItem instanceof content_1.CreateAttributeAcceptResponseItem)) {
+            return;
+        }
+        if (requestItem.attribute.owner.toString() === "") {
+            requestItem.attribute.owner = requestInfo.peer;
+        }
+        await this.consumptionController.attributes.createPeerLocalAttribute({
+            id: responseItem.attributeId,
+            content: requestItem.attribute,
+            peer: requestInfo.peer,
+            requestReference: requestInfo.id
+        });
     }
 }
 exports.CreateAttributeRequestItemProcessor = CreateAttributeRequestItemProcessor;
@@ -2478,16 +2922,25 @@ const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-s
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
+const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist/consumption/index.js");
 let AcceptProposeAttributeRequestItemParameters = AcceptProposeAttributeRequestItemParameters_1 = class AcceptProposeAttributeRequestItemParameters extends ts_serval_1.Serializable {
+    isWithExistingAttribute() {
+        return this.attributeId !== undefined;
+    }
+    isWithNewAttribute() {
+        return this.attribute !== undefined;
+    }
     static from(value) {
         return this.fromAny(value);
     }
     static postFrom(value) {
-        const typedValue = value;
-        if (typedValue.attributeId && typedValue.attribute) {
+        if (!(value instanceof AcceptProposeAttributeRequestItemParameters_1)) {
+            throw new consumption_1.ConsumptionError("this should never happen");
+        }
+        if (value.attributeId && value.attribute) {
             throw new ts_serval_1.ValidationError(AcceptProposeAttributeRequestItemParameters_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.attribute), `You cannot specify both ${(0, ts_simple_nameof_1.nameof)((x) => x.attribute)} and ${(0, ts_simple_nameof_1.nameof)((x) => x.attributeId)}.`);
         }
-        if (!typedValue.attributeId && !typedValue.attribute) {
+        if (!value.attributeId && !value.attribute) {
             throw new ts_serval_1.ValidationError(AcceptProposeAttributeRequestItemParameters_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.attribute), `You have to specify either ${(0, ts_simple_nameof_1.nameof)((x) => x.attribute)} or ${(0, ts_simple_nameof_1.nameof)((x) => x.attributeId)}.`);
         }
         return value;
@@ -2546,7 +2999,7 @@ class ProposeAttributeRequestItemProcessor extends GenericRequestItemProcessor_1
     }
     validateAttribute(attribute) {
         if (attribute.owner.toString() !== "") {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be an empty string. This is because you can only propose Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be an empty string. This is because you can only propose Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
         }
         return ValidationResult_1.ValidationResult.success();
     }
@@ -2556,29 +3009,29 @@ class ProposeAttributeRequestItemProcessor extends GenericRequestItemProcessor_1
             return commonQueryValidationResult;
         }
         if (requestItem.query instanceof content_1.RelationshipAttributeQuery && requestItem.query.owner.toString() !== "") {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The owner of the given `query` can only be an empty string. This is because you can only propose Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The owner of the given `query` can only be an empty string. This is because you can only propose Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
         }
         return ValidationResult_1.ValidationResult.success();
     }
     async canAccept(_requestItem, params, requestInfo) {
         const parsedParams = AcceptProposeAttributeRequestItemParameters_1.AcceptProposeAttributeRequestItemParameters.from(params);
         let attribute = parsedParams.attribute;
-        if (parsedParams.attributeId) {
+        if (parsedParams.isWithExistingAttribute()) {
             const localAttribute = await this.consumptionController.attributes.getLocalAttribute(parsedParams.attributeId);
             if (!localAttribute) {
-                return ValidationResult_1.ValidationResult.error(transport_1.TransportErrors.general.recordNotFound(LocalAttribute_1.LocalAttribute, requestInfo.id.toString()));
+                return ValidationResult_1.ValidationResult.error(transport_1.CoreErrors.general.recordNotFound(LocalAttribute_1.LocalAttribute, requestInfo.id.toString()));
             }
             attribute = localAttribute.content;
         }
         if (!attribute.owner.equals(this.currentIdentityAddress)) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The given Attribute belongs to someone else. You can only share own Attributes."));
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The given Attribute belongs to someone else. You can only share own Attributes."));
         }
         return ValidationResult_1.ValidationResult.success();
     }
     async accept(_requestItem, params, requestInfo) {
         const parsedParams = AcceptProposeAttributeRequestItemParameters_1.AcceptProposeAttributeRequestItemParameters.from(params);
         let sharedLocalAttribute;
-        if (parsedParams.attributeId) {
+        if (parsedParams.isWithExistingAttribute()) {
             sharedLocalAttribute = await this.copyExistingAttribute(parsedParams.attributeId, requestInfo);
         }
         else {
@@ -2655,6 +3108,7 @@ const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-s
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
+const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist/consumption/index.js");
 let AcceptReadAttributeRequestItemParameters = AcceptReadAttributeRequestItemParameters_1 = class AcceptReadAttributeRequestItemParameters extends ts_serval_1.Serializable {
     isWithExistingAttribute() {
         return this.existingAttributeId !== undefined;
@@ -2666,8 +3120,9 @@ let AcceptReadAttributeRequestItemParameters = AcceptReadAttributeRequestItemPar
         return this.fromAny(value);
     }
     static postFrom(value) {
-        if (!(value instanceof AcceptReadAttributeRequestItemParameters_1))
-            throw new Error("this should never happen");
+        if (!(value instanceof AcceptReadAttributeRequestItemParameters_1)) {
+            throw new consumption_1.ConsumptionError("this should never happen");
+        }
         if (value.existingAttributeId && value.newAttribute) {
             throw new ts_serval_1.ValidationError(AcceptReadAttributeRequestItemParameters_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.newAttribute), `You cannot specify both ${(0, ts_simple_nameof_1.nameof)((x) => x.newAttribute)} and ${(0, ts_simple_nameof_1.nameof)((x) => x.existingAttributeId)}.`);
         }
@@ -2729,10 +3184,11 @@ class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.Ge
         if (parsedParams.isWithExistingAttribute()) {
             const foundAttribute = await this.consumptionController.attributes.getLocalAttribute(parsedParams.existingAttributeId);
             if (!foundAttribute) {
-                return ValidationResult_1.ValidationResult.error(transport_1.TransportErrors.general.recordNotFound(LocalAttribute_1.LocalAttribute, requestInfo.id.toString()));
+                return ValidationResult_1.ValidationResult.error(transport_1.CoreErrors.general.recordNotFound(LocalAttribute_1.LocalAttribute, requestInfo.id.toString()));
             }
-            if (!this.accountController.identity.isMe(foundAttribute.content.owner)) {
-                return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The given Attribute belongs to someone else. You can only share own Attributes."));
+            const ownerIsCurrentIdentity = this.accountController.identity.isMe(foundAttribute.content.owner);
+            if (!ownerIsCurrentIdentity) {
+                return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The given Attribute belongs to someone else. You can only share own Attributes."));
             }
         }
         return ValidationResult_1.ValidationResult.success();
@@ -2793,33 +3249,32 @@ exports.ReadAttributeRequestItemProcessor = ReadAttributeRequestItemProcessor;
 
 /***/ }),
 
-/***/ "./dist/modules/requests/itemProcessors/shareAttribute/AcceptShareAttributeRequestItemParameters.js":
-/*!**********************************************************************************************************!*\
-  !*** ./dist/modules/requests/itemProcessors/shareAttribute/AcceptShareAttributeRequestItemParameters.js ***!
-  \**********************************************************************************************************/
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+/***/ "./dist/modules/requests/itemProcessors/registerAttributeListener/RegisterAttributeListenerRequestItemProcessor.js":
+/*!*************************************************************************************************************************!*\
+  !*** ./dist/modules/requests/itemProcessors/registerAttributeListener/RegisterAttributeListenerRequestItemProcessor.js ***!
+  \*************************************************************************************************************************/
+/***/ ((__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;
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.AcceptShareAttributeRequestItemParameters = void 0;
-const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
-let AcceptShareAttributeRequestItemParameters = class AcceptShareAttributeRequestItemParameters extends ts_serval_1.Serializable {
-    static from(value) {
-        return this.fromAny(value);
+exports.RegisterAttributeListenerRequestItemProcessor = void 0;
+const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
+const GenericRequestItemProcessor_1 = __webpack_require__(/*! ../GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js");
+class RegisterAttributeListenerRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
+    async accept(requestItem, _params, requestInfo) {
+        const listener = await this.consumptionController.attributeListeners.createAttributeListener({
+            peer: requestInfo.peer,
+            query: requestItem.query
+        });
+        return content_1.RegisterAttributeListenerAcceptResponseItem.from({
+            result: content_1.ResponseItemResult.Accepted,
+            listenerId: listener.id.toString()
+        });
     }
-};
-AcceptShareAttributeRequestItemParameters = __decorate([
-    (0, ts_serval_1.type)("AcceptShareAttributeRequestItemParameters")
-], AcceptShareAttributeRequestItemParameters);
-exports.AcceptShareAttributeRequestItemParameters = AcceptShareAttributeRequestItemParameters;
-//# sourceMappingURL=AcceptShareAttributeRequestItemParameters.js.map
+}
+exports.RegisterAttributeListenerRequestItemProcessor = RegisterAttributeListenerRequestItemProcessor;
+//# sourceMappingURL=RegisterAttributeListenerRequestItemProcessor.js.map
 
 /***/ }),
 
@@ -2834,91 +3289,56 @@ exports.AcceptShareAttributeRequestItemParameters = AcceptShareAttributeRequestI
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ShareAttributeRequestItemProcessor = void 0;
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
-const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist/consumption/index.js");
 const GenericRequestItemProcessor_1 = __webpack_require__(/*! ../GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js");
 const ValidationResult_1 = __webpack_require__(/*! ../ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
 class ShareAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
-    async canCreateOutgoingRequestItem(requestItem, _request, recipient) {
-        const attribute = await this.consumptionController.attributes.getLocalAttribute(requestItem.attributeId);
-        if (!attribute) {
-            return ValidationResult_1.ValidationResult.error(transport_1.TransportErrors.general.recordNotFound(content_1.Attribute, requestItem.attributeId.toString()));
-        }
-        const attributeOwnerValidationResult = this.validateAttributeOwner(attribute.content, this.currentIdentityAddress, recipient);
-        if (attributeOwnerValidationResult.isError()) {
-            return attributeOwnerValidationResult;
+    canCreateOutgoingRequestItem(requestItem, _request, recipient) {
+        if (requestItem.attribute instanceof content_1.IdentityAttribute) {
+            return this.canCreateWithIdentityAttribute(requestItem);
         }
-        return ValidationResult_1.ValidationResult.success();
+        return this.canCreateWithRelationshipAttribute(requestItem.attribute, recipient);
     }
-    async checkPrerequisitesOfIncomingRequestItem(requestItem, requestInfo) {
-        const relationshipToShareWith = await this.accountController.relationships.getRelationshipToIdentity(requestItem.shareWith);
-        if (!relationshipToShareWith) {
-            return false; // Should the containing Request move to Error state?
-        }
-        const attribute = await this.consumptionController.attributes.getLocalAttribute(requestItem.attributeId);
-        if (!attribute) {
-            return false; // Should the containing Request move to Error state?
-        }
-        if (this.validateAttributeOwner(attribute.content, requestInfo.peer, this.currentIdentityAddress).isError()) {
-            return false;
+    canCreateWithIdentityAttribute(requestItem) {
+        const ownerIsEmpty = requestItem.attribute.owner.toString() === "";
+        const ownerIsCurrentIdentity = requestItem.attribute.owner.equals(this.currentIdentityAddress);
+        if (!ownerIsEmpty && !ownerIsCurrentIdentity) {
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be an empty string. This is because you can only send Attributes where the recipient of the Request is the owner anyway. And in order to avoid mistakes, the owner will be automatically filled for you."));
         }
-        return true;
+        return ValidationResult_1.ValidationResult.success();
     }
-    validateAttributeOwner(attribute, sender, recipient) {
-        const attributeOwner = attribute.owner;
-        if (attribute instanceof content_1.IdentityAttribute) {
-            if (!attributeOwner.equals(recipient)) {
-                return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Can only request sharing of identity attributes owned by the recipient."));
-            }
+    canCreateWithRelationshipAttribute(attribute, recipient) {
+        if (attribute.confidentiality === content_1.RelationshipAttributeConfidentiality.Private) {
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("The confidentiality of the given `attribute` is private. Therefore you are not allowed to share it."));
         }
-        if (attribute instanceof content_1.RelationshipAttribute) {
-            if (!attributeOwner.equals(recipient) && !attributeOwner.equals(sender)) {
-                return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot request sharing of relationship attributes not owned by recipient or sender."));
-            }
+        if (attribute.owner.equals(recipient)) {
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("It doesn't make sense to share a RelationshipAttribute with its owner."));
         }
         return ValidationResult_1.ValidationResult.success();
     }
-    canAccept(_requestItem, _params, _requestInfo) {
-        return ValidationResult_1.ValidationResult.success();
-    }
-    async accept(requestItem, _params, _requestInfo) {
-        const attribute = (await this.consumptionController.attributes.getLocalAttribute(requestItem.attributeId));
-        if (!(await this.isAttributeAlreadyShared(attribute, requestItem.shareWith))) {
-            await this.shareAttribute(attribute, requestItem.shareWith);
+    async accept(requestItem, _params, requestInfo) {
+        if (requestItem.attribute.owner.toString() === "") {
+            requestItem.attribute.owner = requestInfo.peer;
         }
-        return content_1.AcceptResponseItem.from({ result: content_1.ResponseItemResult.Accepted });
-    }
-    async isAttributeAlreadyShared(attribute, shareWith) {
-        if (attribute.content instanceof content_1.IdentityAttribute) {
-            return ((await this.consumptionController.attributes.getLocalAttributes({
-                "shareInfo.sourceAttribute": attribute.shareInfo.sourceAttribute.toString(),
-                "shareInfo.peer": shareWith.toString()
-            })).length > 0);
-        }
-        return ((await this.consumptionController.attributes.getLocalAttributes({
-            "shareInfo.sourceAttribute": attribute.id.toString(),
-            "shareInfo.peer": shareWith.toString()
-        })).length > 0);
-    }
-    async shareAttribute(attribute, shareWith) {
-        const createAttributeRequestItem = content_1.CreateAttributeRequestItem.from({
-            attribute: attribute.content,
-            mustBeAccepted: true,
-            sourceAttributeId: attribute.id
-        });
-        const createAttributeRequest = await this.consumptionController.outgoingRequests.create({
-            peer: shareWith,
-            content: content_1.Request.from({
-                items: [createAttributeRequestItem]
-            })
+        const localAttribute = await this.consumptionController.attributes.createPeerLocalAttribute({
+            content: requestItem.attribute,
+            peer: requestInfo.peer,
+            requestReference: requestInfo.id
         });
-        const message = await this.accountController.messages.sendMessage({
-            recipients: [shareWith],
-            content: createAttributeRequest.content
+        return content_1.ShareAttributeAcceptResponseItem.from({
+            attributeId: localAttribute.id,
+            result: content_1.ResponseItemResult.Accepted
         });
-        await this.consumptionController.outgoingRequests.sent({
-            requestId: createAttributeRequest.id,
-            requestSourceObject: message
+    }
+    async applyIncomingResponseItem(responseItem, requestItem, requestInfo) {
+        if (!(responseItem instanceof content_1.ShareAttributeAcceptResponseItem)) {
+            return;
+        }
+        await this.consumptionController.attributes.createSharedLocalAttributeCopy({
+            attributeId: responseItem.attributeId,
+            sourceAttributeId: requestItem.sourceAttributeId,
+            peer: requestInfo.peer,
+            requestReference: requestInfo.id
         });
     }
 }
@@ -2940,15 +3360,15 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist/consumption/index.js");
 const ValidationResult_1 = __webpack_require__(/*! ../ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
 function validateQuery(query, sender, recipient) {
-    if (query instanceof content_1.RelationshipAttributeQuery) {
-        if (query.thirdParty?.equals(sender)) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot query an Attribute with the own address as third party."));
+    if (query instanceof content_1.ThirdPartyRelationshipAttributeQuery) {
+        if (query.thirdParty.equals(sender)) {
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot query an Attribute with the own address as third party."));
         }
-        if (query.thirdParty?.equals(recipient)) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot query an Attribute with the recipient's address as third party."));
+        if (query.thirdParty.equals(recipient)) {
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot query an Attribute with the recipient's address as third party."));
         }
-        if (query.owner.equals(sender) && query.thirdParty !== undefined) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot query own Attributes from a third party."));
+        if (query.owner.equals(sender)) {
+            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.invalidRequestItem("Cannot query own Attributes from a third party."));
         }
     }
     return ValidationResult_1.ValidationResult.success();
@@ -2980,6 +3400,7 @@ exports.LocalRequest = exports.LocalRequestSource = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
 const LocalRequestStatus_1 = __webpack_require__(/*! ./LocalRequestStatus */ "./dist/modules/requests/local/LocalRequestStatus.js");
 const LocalRequestStatusLogEntry_1 = __webpack_require__(/*! ./LocalRequestStatusLogEntry */ "./dist/modules/requests/local/LocalRequestStatusLogEntry.js");
 const LocalResponse_1 = __webpack_require__(/*! ./LocalResponse */ "./dist/modules/requests/local/LocalResponse.js");
@@ -3004,6 +3425,8 @@ LocalRequestSource = __decorate([
 exports.LocalRequestSource = LocalRequestSource;
 let LocalRequest = class LocalRequest extends transport_1.CoreSynchronizable {
     changeStatus(newStatus) {
+        if (this.status === newStatus)
+            throw new consumption_1.ConsumptionError("cannot change status to the same status");
         const logEntry = LocalRequestStatusLogEntry_1.LocalRequestStatusLogEntry.from({
             createdAt: transport_1.CoreDate.utc(),
             oldStatus: this.status,
@@ -3014,7 +3437,7 @@ let LocalRequest = class LocalRequest extends transport_1.CoreSynchronizable {
     }
     sent(source) {
         if (this.status !== LocalRequestStatus_1.LocalRequestStatus.Draft) {
-            throw new Error("Local Request has to be in status 'Draft'.");
+            throw new consumption_1.ConsumptionError("Local Request has to be in status 'Draft'.");
         }
         this.source = source;
         this.changeStatus(LocalRequestStatus_1.LocalRequestStatus.Open);
@@ -3022,6 +3445,20 @@ let LocalRequest = class LocalRequest extends transport_1.CoreSynchronizable {
     static from(value) {
         return this.fromAny(value);
     }
+    isExpired(comparisonDate = transport_1.CoreDate.utc()) {
+        if (!this.content.expiresAt)
+            return false;
+        return comparisonDate.isAfter(this.content.expiresAt.add({ seconds: 10 }));
+    }
+    updateStatusBasedOnExpiration(comparisonDate = transport_1.CoreDate.utc()) {
+        if (this.status === LocalRequestStatus_1.LocalRequestStatus.Completed || this.status === LocalRequestStatus_1.LocalRequestStatus.Expired)
+            return false;
+        if (this.isExpired(comparisonDate)) {
+            this.changeStatus(LocalRequestStatus_1.LocalRequestStatus.Expired);
+            return true;
+        }
+        return false;
+    }
 };
 __decorate([
     (0, ts_serval_1.serialize)(),
@@ -3089,6 +3526,7 @@ var LocalRequestStatus;
     LocalRequestStatus["ManualDecisionRequired"] = "ManualDecisionRequired";
     LocalRequestStatus["Decided"] = "Decided";
     LocalRequestStatus["Completed"] = "Completed";
+    LocalRequestStatus["Expired"] = "Expired";
 })(LocalRequestStatus = exports.LocalRequestStatus || (exports.LocalRequestStatus = {}));
 //# sourceMappingURL=LocalRequestStatus.js.map
 
@@ -3243,6 +3681,7 @@ const LocalRequestStatus_1 = __webpack_require__(/*! ../local/LocalRequestStatus
 const LocalResponse_1 = __webpack_require__(/*! ../local/LocalResponse */ "./dist/modules/requests/local/LocalResponse.js");
 const CompleteOutgoingRequestParameters_1 = __webpack_require__(/*! ./completeOutgoingRequest/CompleteOutgoingRequestParameters */ "./dist/modules/requests/outgoing/completeOutgoingRequest/CompleteOutgoingRequestParameters.js");
 const CreateOutgoingRequestFromRelationshipCreationChangeParameters_1 = __webpack_require__(/*! ./createFromRelationshipCreationChange/CreateOutgoingRequestFromRelationshipCreationChangeParameters */ "./dist/modules/requests/outgoing/createFromRelationshipCreationChange/CreateOutgoingRequestFromRelationshipCreationChangeParameters.js");
+const CanCreateOutgoingRequestParameters_1 = __webpack_require__(/*! ./createOutgoingRequest/CanCreateOutgoingRequestParameters */ "./dist/modules/requests/outgoing/createOutgoingRequest/CanCreateOutgoingRequestParameters.js");
 const CreateOutgoingRequestParameters_1 = __webpack_require__(/*! ./createOutgoingRequest/CreateOutgoingRequestParameters */ "./dist/modules/requests/outgoing/createOutgoingRequest/CreateOutgoingRequestParameters.js");
 const SentOutgoingRequestParameters_1 = __webpack_require__(/*! ./sentOutgoingRequest/SentOutgoingRequestParameters */ "./dist/modules/requests/outgoing/sentOutgoingRequest/SentOutgoingRequestParameters.js");
 class OutgoingRequestsController extends consumption_1.ConsumptionBaseController {
@@ -3254,7 +3693,7 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
         this.identity = identity;
     }
     async canCreate(params) {
-        const parsedParams = CreateOutgoingRequestParameters_1.CreateOutgoingRequestParameters.from(params);
+        const parsedParams = CanCreateOutgoingRequestParameters_1.CanCreateOutgoingRequestParameters.from(params);
         const innerResults = await this.canCreateItems(parsedParams.content, parsedParams.peer);
         const result = ValidationResult_1.ValidationResult.fromItems(innerResults);
         return result;
@@ -3295,16 +3734,13 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
         return request;
     }
     async _create(id, content, peer) {
-        const canCreateResult = await this.canCreate({
-            content,
-            peer
-        });
+        const canCreateResult = await this.canCreate({ content, peer });
         if (canCreateResult.isError()) {
             throw canCreateResult.error;
         }
         const request = LocalRequest_1.LocalRequest.from({
             id: id,
-            content: content,
+            content,
             createdAt: transport_1.CoreDate.utc(),
             isOwn: true,
             peer: peer,
@@ -3317,17 +3753,16 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
     async createFromRelationshipCreationChange(params) {
         const parsedParams = CreateOutgoingRequestFromRelationshipCreationChangeParameters_1.CreateOutgoingRequestFromRelationshipCreationChangeParameters.from(params);
         const peer = parsedParams.creationChange.request.createdBy;
-        const requestBody = parsedParams.creationChange.request.content;
-        if (!(requestBody instanceof content_1.RelationshipCreationChangeRequestBody)) {
-            throw new Error("the body of the request is not supported as is is not type of RelationshipCreationChangeRequestBody");
+        const requestContent = parsedParams.creationChange.request.content;
+        if (!(requestContent instanceof content_1.RelationshipCreationChangeRequestContent)) {
+            throw new consumption_1.ConsumptionError("The content of the request is not supported as it is not type of RelationshipCreationChangeRequestContent.");
         }
-        const receivedResponse = requestBody.response;
+        const receivedResponse = requestContent.response;
         const id = receivedResponse.requestId;
         const templateContent = parsedParams.template.cache.content;
-        if (!(templateContent instanceof content_1.RelationshipTemplateBody)) {
-            throw new Error("the body of the template is not supported as is is not type of RelationshipTemplateBody");
+        if (!(templateContent instanceof content_1.RelationshipTemplateContent)) {
+            throw new consumption_1.ConsumptionError("The content of the template is not supported as it is not type of RelationshipTemplateContent.");
         }
-        // TODO: is this the correct request (=> could be RelationshipTemplateBody#existingRelationshipRequest)
         await this._create(id, templateContent.onNewRelationship, peer);
         await this._sent(id, parsedParams.template);
         const request = await this._complete(id, parsedParams.creationChange, receivedResponse);
@@ -3358,17 +3793,17 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
     getSourceType(sourceObject) {
         if (sourceObject instanceof transport_1.Message) {
             if (!sourceObject.isOwn) {
-                throw new Error("Cannot create outgoing Request from a peer Message");
+                throw new consumption_1.ConsumptionError("Cannot create outgoing Request from a peer Message");
             }
             return "Message";
         }
         else if (sourceObject instanceof transport_1.RelationshipTemplate) {
             if (!sourceObject.isOwn) {
-                throw new Error("Cannot create outgoing Request from a peer Relationship Template");
+                throw new consumption_1.ConsumptionError("Cannot create outgoing Request from a peer Relationship Template");
             }
             return "RelationshipTemplate";
         }
-        throw new Error("The given sourceObject is not of a valid type. Valid types are 'Message' and 'RelationshipTemplate'.");
+        throw new consumption_1.ConsumptionError("The given sourceObject is not of a valid type. Valid types are 'Message' and 'RelationshipTemplate'.");
     }
     async complete(params) {
         const parsedParams = CompleteOutgoingRequestParameters_1.CompleteOugoingRequestParameters.from(params);
@@ -3382,7 +3817,13 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
     }
     async _complete(requestId, responseSourceObject, receivedResponse) {
         const request = await this.getOrThrow(requestId);
-        this.assertRequestStatus(request, LocalRequestStatus_1.LocalRequestStatus.Open);
+        this.assertRequestStatus(request, LocalRequestStatus_1.LocalRequestStatus.Open, LocalRequestStatus_1.LocalRequestStatus.Expired);
+        const responseSourceObjectCreationDate = responseSourceObject instanceof transport_1.Message
+            ? responseSourceObject.cache.createdAt
+            : responseSourceObject.request.createdAt;
+        if (request.status === LocalRequestStatus_1.LocalRequestStatus.Expired && request.isExpired(responseSourceObjectCreationDate)) {
+            throw new consumption_1.ConsumptionError("Cannot complete an expired request with a response that was created before the expiration date");
+        }
         const canComplete = await this.canComplete(request, receivedResponse);
         if (canComplete.isError()) {
             throw canComplete.error;
@@ -3396,7 +3837,7 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
             responseSource = "RelationshipChange";
         }
         else {
-            throw new Error("Invalid responseSourceObject");
+            throw new consumption_1.ConsumptionError("Invalid responseSourceObject");
         }
         const localResponse = LocalResponse_1.LocalResponse.from({
             content: receivedResponse,
@@ -3452,36 +3893,50 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
         await processor.applyIncomingResponseItem(responseItem, requestItem, request);
     }
     async getOutgoingRequests(query) {
-        query ??= {};
-        query.isOwn = true;
-        const requestDocs = await this.localRequests.find(query);
-        const requests = requestDocs.map((r) => LocalRequest_1.LocalRequest.from(r));
-        return requests;
+        const requestDocs = await this.localRequests.find({
+            ...query,
+            isOwn: true
+        });
+        const requestPromises = requestDocs.map((r) => this.updateRequestExpiry(LocalRequest_1.LocalRequest.from(r)));
+        return await Promise.all(requestPromises);
+    }
+    async discardOutgoingRequest(id) {
+        const request = await this.getOrThrow(id);
+        this.assertRequestStatus(request, LocalRequestStatus_1.LocalRequestStatus.Draft);
+        await this.localRequests.delete(request);
     }
     async getOutgoingRequest(id) {
         const requestDoc = await this.localRequests.findOne({ id: id.toString(), isOwn: true });
-        const request = requestDoc ? LocalRequest_1.LocalRequest.from(requestDoc) : undefined;
-        return request;
+        if (!requestDoc)
+            return;
+        const localRequest = LocalRequest_1.LocalRequest.from(requestDoc);
+        return await this.updateRequestExpiry(localRequest);
     }
     async getOrThrow(id) {
         const request = await this.getOutgoingRequest(id);
         if (!request) {
-            throw transport_1.TransportErrors.general.recordNotFound(LocalRequest_1.LocalRequest, id.toString());
+            throw transport_1.CoreErrors.general.recordNotFound(LocalRequest_1.LocalRequest, id.toString());
         }
         return request;
     }
     async update(request) {
         const requestDoc = await this.localRequests.findOne({ id: request.id.toString(), isOwn: true });
         if (!requestDoc) {
-            throw transport_1.TransportErrors.general.recordNotFound(LocalRequest_1.LocalRequest, request.id.toString());
+            throw transport_1.CoreErrors.general.recordNotFound(LocalRequest_1.LocalRequest, request.id.toString());
         }
         await this.localRequests.update(requestDoc, request);
     }
     assertRequestStatus(request, ...status) {
         if (!status.includes(request.status)) {
-            throw new Error(`Local Request has to be in status '${status.join("/")}'.`);
+            throw new consumption_1.ConsumptionError(`Local Request has to be in status '${status.join("/")}'.`);
         }
     }
+    async updateRequestExpiry(request) {
+        const statusUpdated = request.updateStatusBasedOnExpiration();
+        if (statusUpdated)
+            await this.update(request);
+        return request;
+    }
 }
 exports.OutgoingRequestsController = OutgoingRequestsController;
 //# sourceMappingURL=OutgoingRequestsController.js.map
@@ -3582,6 +4037,51 @@ exports.CreateOutgoingRequestFromRelationshipCreationChangeParameters = CreateOu
 
 /***/ }),
 
+/***/ "./dist/modules/requests/outgoing/createOutgoingRequest/CanCreateOutgoingRequestParameters.js":
+/*!****************************************************************************************************!*\
+  !*** ./dist/modules/requests/outgoing/createOutgoingRequest/CanCreateOutgoingRequestParameters.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.CanCreateOutgoingRequestParameters = void 0;
+const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
+const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
+const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+let CanCreateOutgoingRequestParameters = class CanCreateOutgoingRequestParameters extends ts_serval_1.Serializable {
+    static from(value) {
+        return this.fromAny(value);
+    }
+};
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", content_1.Request)
+], CanCreateOutgoingRequestParameters.prototype, "content", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)(),
+    (0, ts_serval_1.validate)({ nullable: true }),
+    __metadata("design:type", transport_1.CoreAddress)
+], CanCreateOutgoingRequestParameters.prototype, "peer", void 0);
+CanCreateOutgoingRequestParameters = __decorate([
+    (0, ts_serval_1.type)("CanCreateOutgoingRequestParameters")
+], CanCreateOutgoingRequestParameters);
+exports.CanCreateOutgoingRequestParameters = CanCreateOutgoingRequestParameters;
+//# sourceMappingURL=CanCreateOutgoingRequestParameters.js.map
+
+/***/ }),
+
 /***/ "./dist/modules/requests/outgoing/createOutgoingRequest/CreateOutgoingRequestParameters.js":
 /*!*************************************************************************************************!*\
   !*** ./dist/modules/requests/outgoing/createOutgoingRequest/CreateOutgoingRequestParameters.js ***!
@@ -3675,12 +4175,22 @@ exports.SentOutgoingRequestParameters = SentOutgoingRequestParameters;
 /*!*****************************************************!*\
   !*** ./dist/modules/settings/SettingsController.js ***!
   \*****************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
 
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SettingsController = void 0;
+const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const consumption_1 = __webpack_require__(/*! ../../consumption */ "./dist/consumption/index.js");
 const Setting_1 = __webpack_require__(/*! ./local/Setting */ "./dist/modules/settings/local/Setting.js");
@@ -3699,7 +4209,7 @@ class SettingsController extends consumption_1.ConsumptionBaseController {
     }
     async getSettings(query) {
         const items = await this.settings.find(query);
-        return await this.parseArray(items, Setting_1.Setting);
+        return this.parseArray(items, Setting_1.Setting);
     }
     async createSetting(parameters) {
         const setting = Setting_1.Setting.from({
@@ -3717,20 +4227,55 @@ class SettingsController extends consumption_1.ConsumptionBaseController {
     }
     async updateSetting(setting) {
         const oldSetting = await this.settings.read(setting.id.toString());
-        if (!oldSetting) {
-            throw transport_1.TransportErrors.general.recordNotFound(Setting_1.Setting, setting.id.toString()).logWith(this._log);
-        }
+        if (!oldSetting)
+            throw transport_1.CoreErrors.general.recordNotFound(Setting_1.Setting, setting.id.toString());
         await this.settings.update(oldSetting, setting);
     }
     async deleteSetting(setting) {
         await this.settings.delete(setting);
     }
 }
+__decorate([
+    (0, ts_utils_1.log)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Setting_1.Setting]),
+    __metadata("design:returntype", Promise)
+], SettingsController.prototype, "updateSetting", null);
 exports.SettingsController = SettingsController;
 //# sourceMappingURL=SettingsController.js.map
 
 /***/ }),
 
+/***/ "./dist/modules/settings/index.js":
+/*!****************************************!*\
+  !*** ./dist/modules/settings/index.js ***!
+  \****************************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+__exportStar(__webpack_require__(/*! ./local/CreateSettingParameter */ "./dist/modules/settings/local/CreateSettingParameter.js"), exports);
+__exportStar(__webpack_require__(/*! ./local/Setting */ "./dist/modules/settings/local/Setting.js"), exports);
+__exportStar(__webpack_require__(/*! ./SettingsController */ "./dist/modules/settings/SettingsController.js"), exports);
+//# sourceMappingURL=index.js.map
+
+/***/ }),
+
 /***/ "./dist/modules/settings/local/CreateSettingParameter.js":
 /*!***************************************************************!*\
   !*** ./dist/modules/settings/local/CreateSettingParameter.js ***!
@@ -4173,12 +4718,19 @@ __webpack_require__(/*! reflect-metadata */ "./node_modules/reflect-metadata/Ref
 const EventBus_1 = __webpack_require__(/*! ../EventBus */ "./node_modules/@js-soft/ts-utils/dist/eventBus/EventBus.js");
 const SubscriptionTargetInfo_1 = __webpack_require__(/*! ../SubscriptionTargetInfo */ "./node_modules/@js-soft/ts-utils/dist/eventBus/SubscriptionTargetInfo.js");
 class EventEmitter2EventBus {
+    errorCallback;
     emitter;
     listeners = new Map();
     nextId = 0;
     invocationPromises = [];
-    constructor(options) {
-        this.emitter = new eventemitter2_1.EventEmitter2({ ...options, wildcard: true, maxListeners: 50, verboseMemoryLeak: true });
+    constructor(errorCallback, eventEmitter2Options) {
+        this.errorCallback = errorCallback;
+        this.emitter = new eventemitter2_1.EventEmitter2({
+            maxListeners: 50,
+            verboseMemoryLeak: true,
+            ...eventEmitter2Options,
+            wildcard: true
+        });
     }
     subscribe(subscriptionTarget, handler) {
         return this.registerHandler(subscriptionTarget, handler);
@@ -4198,7 +4750,7 @@ class EventEmitter2EventBus {
             }
             const invocationPromise = (async () => await handler(event))();
             this.invocationPromises.push(invocationPromise);
-            await invocationPromise;
+            await invocationPromise.catch((e) => this.errorCallback(e, subscriptionTargetInfo.namespace));
             this.invocationPromises = this.invocationPromises.filter((p) => p !== invocationPromise);
             if (isOneTimeHandler)
                 this.listeners.delete(listenerId);
@@ -4262,7 +4814,11 @@ exports.EventEmitter2EventBus = EventEmitter2EventBus;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -4331,7 +4887,11 @@ exports.Event = Event;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -4356,7 +4916,11 @@ __exportStar(__webpack_require__(/*! ./Event */ "./node_modules/@js-soft/ts-util
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -4381,29 +4945,50 @@ __exportStar(__webpack_require__(/*! ./sleep */ "./node_modules/@js-soft/ts-util
 /*!*************************************************************!*\
   !*** ./node_modules/@js-soft/ts-utils/dist/logDecorator.js ***!
   \*************************************************************/
-/***/ ((__unused_webpack_module, exports) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
 
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.log = void 0;
-/* eslint-disable no-console */
-function log(_target, propertyName, propertyDesciptor) {
-    const method = propertyDesciptor.value;
-    propertyDesciptor.value = function (...args) {
-        const params = args.map((a) => JSON.stringify(a)).join();
-        try {
-            const result = method.apply(this, args);
-            const r = JSON.stringify(result);
-            console.log(`Call: ${propertyName}(${params}) => ${r}`);
-            return result;
-        }
-        catch (error) {
-            console.log(error);
-            throw error;
-        }
+const json_stringify_safe_1 = __importDefault(__webpack_require__(/*! json-stringify-safe */ "./node_modules/json-stringify-safe/stringify.js"));
+function log(params) {
+    return function (_target, propertyName, propertyDescriptorDoNotChangeMyNamePlease) {
+        const method = propertyDescriptorDoNotChangeMyNamePlease.value;
+        propertyDescriptorDoNotChangeMyNamePlease.value = function (...args) {
+            const thisT = this;
+            try {
+                if (params?.logParams) {
+                    thisT.log.trace(`Calling ${propertyName}(${args.map((a) => (0, json_stringify_safe_1.default)(a)).join(", ")})`);
+                }
+                else {
+                    thisT.log.trace(`Calling ${propertyName}`);
+                }
+                const returnValue = method.apply(this, args);
+                if (params?.logReturnValue) {
+                    thisT.log.trace(`Returning from ${propertyName} with: ${(0, json_stringify_safe_1.default)(returnValue)}`);
+                }
+                else {
+                    thisT.log.trace(`Returning from ${propertyName}`);
+                }
+                return returnValue;
+            }
+            catch (error) {
+                if (error instanceof Error && error.stack) {
+                    error.stack = error.stack
+                        .split("\n")
+                        .filter((s) => !s.includes(".propertyDescriptorDoNotChangeMyNamePlease.value"))
+                        .join("\n");
+                }
+                thisT.log.error(`Error in ${propertyName}:`, error);
+                throw error;
+            }
+        };
+        return propertyDescriptorDoNotChangeMyNamePlease;
     };
-    return propertyDesciptor;
 }
 exports.log = log;
 //# sourceMappingURL=logDecorator.js.map
@@ -4481,6 +5066,9 @@ class ApplicationError extends Error {
     equals(error) {
         return this.code === error.code;
     }
+    toString() {
+        return JSON.stringify({ code: this.code, message: this.message, data: this.data }, undefined, 2);
+    }
 }
 exports.ApplicationError = ApplicationError;
 //# sourceMappingURL=ApplicationError.js.map
@@ -4526,7 +5114,7 @@ class Result {
     }
     get value() {
         if (!this.isSuccess) {
-            throw new Error("Can't get the value of an error result. Use 'error' instead.");
+            throw new Error(`Can't get the value of an error result. Use 'error' instead. Root error: \r\n${this.error}`);
         }
         return this._value;
     }
@@ -4552,7 +5140,11 @@ exports.Result = Result;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -4694,7 +5286,7 @@ var __WEBPACK_AMD_DEFINE_RESULT__;/*!
     var obj = {};
     var key;
     var len = keys.length;
-    var valuesCount = values ? value.length : 0;
+    var valuesCount = values ? values.length : 0;
     for (var i = 0; i < len; i++) {
       key = keys[i];
       obj[key] = i < valuesCount ? values[i] : undefined;
@@ -6217,6 +6809,43 @@ var __WEBPACK_AMD_DEFINE_RESULT__;/*!
 }();
 
 
+/***/ }),
+
+/***/ "./node_modules/json-stringify-safe/stringify.js":
+/*!*******************************************************!*\
+  !*** ./node_modules/json-stringify-safe/stringify.js ***!
+  \*******************************************************/
+/***/ ((module, exports) => {
+
+exports = module.exports = stringify
+exports.getSerialize = serializer
+
+function stringify(obj, replacer, spaces, cycleReplacer) {
+  return JSON.stringify(obj, serializer(replacer, cycleReplacer), spaces)
+}
+
+function serializer(replacer, cycleReplacer) {
+  var stack = [], keys = []
+
+  if (cycleReplacer == null) cycleReplacer = function(key, value) {
+    if (stack[0] === value) return "[Circular ~]"
+    return "[Circular ~." + keys.slice(0, stack.indexOf(value)).join(".") + "]"
+  }
+
+  return function(key, value) {
+    if (stack.length > 0) {
+      var thisPos = stack.indexOf(this)
+      ~thisPos ? stack.splice(thisPos + 1) : stack.push(this)
+      ~thisPos ? keys.splice(thisPos, Infinity, key) : keys.push(key)
+      if (~stack.indexOf(value)) value = cycleReplacer.call(this, key, value)
+    }
+    else stack.push(value)
+
+    return replacer == null ? value : replacer.call(this, key, value)
+  }
+}
+
+
 /***/ }),
 
 /***/ "./node_modules/luxon/build/node/luxon.js":
@@ -8871,7 +9500,8 @@ function clone$1(dur, alts, clear = false) {
       ...(alts.values || {})
     },
     loc: dur.loc.clone(alts.loc),
-    conversionAccuracy: alts.conversionAccuracy || dur.conversionAccuracy
+    conversionAccuracy: alts.conversionAccuracy || dur.conversionAccuracy,
+    matrix: alts.matrix || dur.matrix
   };
   return new Duration(conf);
 }
@@ -8910,7 +9540,7 @@ function normalizeValues(matrix, vals) {
  *
  * Here is a brief overview of commonly used methods and getters in Duration:
  *
- * * **Creation** To create a Duration, use {@link Duration#fromMillis}, {@link Duration#fromObject}, or {@link Duration#fromISO}.
+ * * **Creation** To create a Duration, use {@link Duration.fromMillis}, {@link Duration.fromObject}, or {@link Duration.fromISO}.
  * * **Unit values** See the {@link Duration#years}, {@link Duration#months}, {@link Duration#weeks}, {@link Duration#days}, {@link Duration#hours}, {@link Duration#minutes}, {@link Duration#seconds}, {@link Duration#milliseconds} accessors.
  * * **Configuration** See  {@link Duration#locale} and {@link Duration#numberingSystem} accessors.
  * * **Transformation** To create new Durations out of old ones use {@link Duration#plus}, {@link Duration#minus}, {@link Duration#normalize}, {@link Duration#set}, {@link Duration#reconfigure}, {@link Duration#shiftTo}, and {@link Duration#negate}.
@@ -8926,10 +9556,16 @@ class Duration {
    */
   constructor(config) {
     const accurate = config.conversionAccuracy === "longterm" || false;
+    let matrix = accurate ? accurateMatrix : casualMatrix;
+
+    if (config.matrix) {
+      matrix = config.matrix;
+    }
     /**
      * @access private
      */
 
+
     this.values = config.values;
     /**
      * @access private
@@ -8950,7 +9586,7 @@ class Duration {
      * @access private
      */
 
-    this.matrix = accurate ? accurateMatrix : casualMatrix;
+    this.matrix = matrix;
     /**
      * @access private
      */
@@ -8989,7 +9625,8 @@ class Duration {
    * @param {Object} [opts=[]] - options for creating this Duration
    * @param {string} [opts.locale='en-US'] - the locale to use
    * @param {string} opts.numberingSystem - the numbering system to use
-   * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use
+   * @param {string} [opts.conversionAccuracy='casual'] - the preset conversion system to use
+   * @param {string} [opts.matrix=Object] - the custom conversion system to use
    * @return {Duration}
    */
 
@@ -9002,7 +9639,8 @@ class Duration {
     return new Duration({
       values: normalizeObject(obj, Duration.normalizeUnit),
       loc: Locale.fromObject(opts),
-      conversionAccuracy: opts.conversionAccuracy
+      conversionAccuracy: opts.conversionAccuracy,
+      matrix: opts.matrix
     });
   }
   /**
@@ -9034,7 +9672,8 @@ class Duration {
    * @param {Object} opts - options for parsing
    * @param {string} [opts.locale='en-US'] - the locale to use
    * @param {string} opts.numberingSystem - the numbering system to use
-   * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use
+   * @param {string} [opts.conversionAccuracy='casual'] - the preset conversion system to use
+   * @param {string} [opts.matrix=Object] - the preset conversion system to use
    * @see https://en.wikipedia.org/wiki/ISO_8601#Durations
    * @example Duration.fromISO('P3Y6M1W4DT12H30M5S').toObject() //=> { years: 3, months: 6, weeks: 1, days: 4, hours: 12, minutes: 30, seconds: 5 }
    * @example Duration.fromISO('PT23H').toObject() //=> { hours: 23 }
@@ -9058,7 +9697,8 @@ class Duration {
    * @param {Object} opts - options for parsing
    * @param {string} [opts.locale='en-US'] - the locale to use
    * @param {string} opts.numberingSystem - the numbering system to use
-   * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use
+   * @param {string} [opts.conversionAccuracy='casual'] - the preset conversion system to use
+   * @param {string} [opts.matrix=Object] - the conversion system to use
    * @see https://en.wikipedia.org/wiki/ISO_8601#Times
    * @example Duration.fromISOTime('11:22:33.444').toObject() //=> { hours: 11, minutes: 22, seconds: 33, milliseconds: 444 }
    * @example Duration.fromISOTime('11:00').toObject() //=> { hours: 11, minutes: 0, seconds: 0 }
@@ -9389,7 +10029,7 @@ class Duration {
    * Scale this Duration by the specified amount. Return a newly-constructed Duration.
    * @param {function} fn - The function to apply to each unit. Arity is 1 or 2: the value of the unit and, optionally, the unit name. Must return a number.
    * @example Duration.fromObject({ hours: 1, minutes: 30 }).mapUnits(x => x * 2) //=> { hours: 2, minutes: 60 }
-   * @example Duration.fromObject({ hours: 1, minutes: 30 }).mapUnits((x, u) => u === "hour" ? x * 2 : x) //=> { hours: 2, minutes: 30 }
+   * @example Duration.fromObject({ hours: 1, minutes: 30 }).mapUnits((x, u) => u === "hours" ? x * 2 : x) //=> { hours: 2, minutes: 30 }
    * @return {Duration}
    */
 
@@ -9447,20 +10087,18 @@ class Duration {
   reconfigure({
     locale,
     numberingSystem,
-    conversionAccuracy
+    conversionAccuracy,
+    matrix
   } = {}) {
     const loc = this.loc.clone({
       locale,
       numberingSystem
-    }),
-          opts = {
-      loc
+    });
+    const opts = {
+      loc,
+      matrix,
+      conversionAccuracy
     };
-
-    if (conversionAccuracy) {
-      opts.conversionAccuracy = conversionAccuracy;
-    }
-
     return clone$1(this, opts);
   }
   /**
@@ -9734,10 +10372,10 @@ function validateStartEnd(start, end) {
  *
  * Here is a brief overview of the most commonly used methods and getters in Interval:
  *
- * * **Creation** To create an Interval, use {@link Interval#fromDateTimes}, {@link Interval#after}, {@link Interval#before}, or {@link Interval#fromISO}.
+ * * **Creation** To create an Interval, use {@link Interval.fromDateTimes}, {@link Interval.after}, {@link Interval.before}, or {@link Interval.fromISO}.
  * * **Accessors** Use {@link Interval#start} and {@link Interval#end} to get the start and end.
  * * **Interrogation** To analyze the Interval, use {@link Interval#count}, {@link Interval#length}, {@link Interval#hasSame}, {@link Interval#contains}, {@link Interval#isAfter}, or {@link Interval#isBefore}.
- * * **Transformation** To create other Intervals out of this one, use {@link Interval#set}, {@link Interval#splitAt}, {@link Interval#splitBy}, {@link Interval#divideEqually}, {@link Interval#merge}, {@link Interval#xor}, {@link Interval#union}, {@link Interval#intersection}, or {@link Interval#difference}.
+ * * **Transformation** To create other Intervals out of this one, use {@link Interval#set}, {@link Interval#splitAt}, {@link Interval#splitBy}, {@link Interval#divideEqually}, {@link Interval.merge}, {@link Interval.xor}, {@link Interval#union}, {@link Interval#intersection}, or {@link Interval#difference}.
  * * **Comparison** To compare this Interval to another one, use {@link Interval#equals}, {@link Interval#overlaps}, {@link Interval#abutsStart}, {@link Interval#abutsEnd}, {@link Interval#engulfs}
  * * **Output** To convert the Interval into other representations, see {@link Interval#toString}, {@link Interval#toISO}, {@link Interval#toISODate}, {@link Interval#toISOTime}, {@link Interval#toFormat}, and {@link Interval#toDuration}.
  */
@@ -10571,7 +11209,7 @@ function dayDiff(earlier, later) {
 }
 
 function highOrderDiffs(cursor, later, units) {
-  const differs = [["years", (a, b) => b.year - a.year], ["quarters", (a, b) => b.quarter - a.quarter], ["months", (a, b) => b.month - a.month + (b.year - a.year) * 12], ["weeks", (a, b) => {
+  const differs = [["years", (a, b) => b.year - a.year], ["quarters", (a, b) => b.quarter - a.quarter + (b.year - a.year) * 4], ["months", (a, b) => b.month - a.month + (b.year - a.year) * 12], ["weeks", (a, b) => {
     const days = dayDiff(a, b);
     return (days - days % 7) / 7;
   }], ["days", dayDiff]];
@@ -11178,7 +11816,6 @@ function expandMacroTokens(tokens, locale) {
  * @private
  */
 
-
 function explainFromTokens(locale, input, format) {
   const tokens = expandMacroTokens(Formatter.parseFormat(format), locale),
         units = tokens.map(t => unitForToken(t, locale)),
@@ -11774,7 +12411,7 @@ function lastOpts(argList) {
  *
  * Here is a brief overview of the most commonly used functionality it provides:
  *
- * * **Creation**: To create a DateTime from its components, use one of its factory class methods: {@link DateTime#local}, {@link DateTime#utc}, and (most flexibly) {@link DateTime#fromObject}. To create one from a standard string format, use {@link DateTime#fromISO}, {@link DateTime#fromHTTP}, and {@link DateTime#fromRFC2822}. To create one from a custom string format, use {@link DateTime#fromFormat}. To create one from a native JS date, use {@link DateTime#fromJSDate}.
+ * * **Creation**: To create a DateTime from its components, use one of its factory class methods: {@link DateTime.local}, {@link DateTime.utc}, and (most flexibly) {@link DateTime.fromObject}. To create one from a standard string format, use {@link DateTime.fromISO}, {@link DateTime.fromHTTP}, and {@link DateTime.fromRFC2822}. To create one from a custom string format, use {@link DateTime.fromFormat}. To create one from a native JS date, use {@link DateTime.fromJSDate}.
  * * **Gregorian calendar and time**: To examine the Gregorian properties of a DateTime individually (i.e as opposed to collectively through {@link DateTime#toObject}), use the {@link DateTime#year}, {@link DateTime#month},
  * {@link DateTime#day}, {@link DateTime#hour}, {@link DateTime#minute}, {@link DateTime#second}, {@link DateTime#millisecond} accessors.
  * * **Week calendar**: For ISO week calendar attributes, see the {@link DateTime#weekYear}, {@link DateTime#weekNumber}, and {@link DateTime#weekday} accessors.
@@ -12313,6 +12950,19 @@ class DateTime {
   static parseFormatForOpts(formatOpts, localeOpts = {}) {
     const tokenList = formatOptsToTokens(formatOpts, Locale.fromObject(localeOpts));
     return !tokenList ? null : tokenList.map(t => t ? t.val : null).join("");
+  }
+  /**
+   * Produce the the fully expanded format token for the locale
+   * Does NOT quote characters, so quoted tokens will not round trip correctly
+   * @param fmt
+   * @param localeOpts
+   * @returns {string}
+   */
+
+
+  static expandFormat(fmt, localeOpts = {}) {
+    const expanded = expandMacroTokens(Formatter.parseFormat(fmt), Locale.fromObject(localeOpts));
+    return expanded.map(t => t.val).join("");
   } // INFO
 
   /**
@@ -13005,8 +13655,8 @@ class DateTime {
    * @param {Object} opts - opts to override the configuration options on this DateTime
    * @example DateTime.now().toLocaleString(); //=> 4/20/2017
    * @example DateTime.now().setLocale('en-gb').toLocaleString(); //=> '20/04/2017'
-   * @example DateTime.now().toLocaleString({ locale: 'en-gb' }); //=> '20/04/2017'
    * @example DateTime.now().toLocaleString(DateTime.DATE_FULL); //=> 'April 20, 2017'
+   * @example DateTime.now().toLocaleString(DateTime.DATE_FULL, { locale: 'fr' }); //=> '28 août 2022'
    * @example DateTime.now().toLocaleString(DateTime.TIME_SIMPLE); //=> '11:32 AM'
    * @example DateTime.now().toLocaleString(DateTime.DATETIME_SHORT); //=> '4/20/2017, 11:32 AM'
    * @example DateTime.now().toLocaleString({ weekday: 'long', month: 'long', day: '2-digit' }); //=> 'Thursday, April 20'
@@ -13043,7 +13693,7 @@ class DateTime {
    * @param {boolean} [opts.suppressMilliseconds=false] - exclude milliseconds from the format if they're 0
    * @param {boolean} [opts.suppressSeconds=false] - exclude seconds from the format if they're 0
    * @param {boolean} [opts.includeOffset=true] - include the offset, such as 'Z' or '-04:00'
-   * @param {boolean} [opts.extendedZone=true] - add the time zone format extension
+   * @param {boolean} [opts.extendedZone=false] - add the time zone format extension
    * @param {string} [opts.format='extended'] - choose between the basic and extended format
    * @example DateTime.utc(1983, 5, 25).toISO() //=> '1982-05-25T00:00:00.000Z'
    * @example DateTime.now().toISO() //=> '2017-04-22T20:47:05.335-04:00'
@@ -13748,7 +14398,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-const VERSION = "3.0.1";
+const VERSION = "3.0.4";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;