@nmshd/consumption 2.0.0-beta.2 → 2.0.0-beta.20

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.2",
-    build: "52",
-    date: "2022-07-21T12:41:03+00:00",
-    commit: "5ae49a7cb3ded2b90958e44e4f3e03599ba6cc9c",
+    version: "2.0.0-beta.20",
+    build: "72",
+    date: "2022-09-14T14:15:16+00:00",
+    commit: "66e8b413537746ca0d7476ac6c73064d0c3b0c84",
     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";
@@ -168,6 +169,7 @@ var ConsumptionControllerName;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ConsumptionErrors = 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 {
     attributeExists(id) {
@@ -178,16 +180,42 @@ class Attributes {
     }
 }
 class Requests {
+    constructor() {
+        this.decideValidation = new Requests._decideValidation();
+    }
     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)'");
+        return new transport_1.CoreError("error.consumption.requests.unexpectedErrorDuringRequestItemProcessing", error instanceof Error ? error.message : "Unknown error: '${JSON.stringify(e)'", undefined, undefined, error);
+    }
+    servalErrorDuringRequestItemProcessing(error) {
+        return new transport_1.CoreError("error.consumption.requests.servalErrorDuringRequestItemProcessing", error instanceof Error ? error.message : "Serval error: '${JSON.stringify(e)'", undefined, undefined, error);
     }
     invalidRequestItem(message) {
         return new transport_1.CoreError("error.consumption.requests.invalidRequestItem", message);
     }
 }
+Requests._decideValidation = class {
+    invalidRequestId() {
+        return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidRequestId", "The id of the Request does not match the id of the Response");
+    }
+    invalidNumberOfItems(message) {
+        return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidNumberOfItems", message);
+    }
+    itemAcceptedButParentNotAccepted(message) {
+        return new ts_utils_1.ApplicationError("error.requests.decide.validation.itemAcceptedButParentNotAccepted", message);
+    }
+    mustBeAcceptedItemNotAccepted(message) {
+        return new ts_utils_1.ApplicationError("error.requests.decide.validation.mustBeAcceptedItemNotAccepted", message);
+    }
+    requestItemAnsweredAsRequestItemGroup() {
+        return new ts_utils_1.ApplicationError("error.requests.decide.validation.requestItemAnsweredAsRequestItemGroup", "The RequestItem was answered as a RequestItemGroup.");
+    }
+    requestItemGroupAnsweredAsRequestItem() {
+        return new ts_utils_1.ApplicationError("error.requests.decide.validation.requestItemGroupAnsweredAsRequestItem", "The RequestItemGroup was answered as a RequestItem.");
+    }
+};
 class RelationshipInfo {
     relationshipInfoExists(relationshipId) {
         return new transport_1.CoreError("error.consumption.relationshipInfos.relationshipInfoExists", `RelationshipInfo for Relationship ${relationshipId} already exists.`);
@@ -230,6 +258,7 @@ 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
 
 /***/ }),
@@ -296,16 +325,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.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.LocalAttributesController = void 0;
+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 +581,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,24 +649,36 @@ 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 ? attributes[0] : undefined;
+        return attribute === undefined ? undefined : LocalAttribute_1.LocalAttribute.from(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 ? attributes[0] : undefined;
+        return attribute ?? LocalAttribute_1.LocalAttribute.from(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);
@@ -457,6 +734,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) {
@@ -483,8 +761,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 +908,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 ***!
@@ -913,7 +1227,7 @@ 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");
@@ -985,11 +1299,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 +1309,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,7 +1509,7 @@ 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({
@@ -1180,6 +1538,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 +1670,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
 
 /***/ }),
@@ -1498,19 +1841,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"));
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.invalidRequestId());
         }
         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.ConsumptionErrors.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 +1866,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.ConsumptionErrors.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.ConsumptionErrors.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.ConsumptionErrors.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.ConsumptionErrors.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.ConsumptionErrors.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.ConsumptionErrors.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.ConsumptionErrors.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 +1909,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");
@@ -1721,12 +2062,14 @@ 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) {
+            if (e instanceof ts_serval_1.ServalError) {
+                return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.servalErrorDuringRequestItemProcessing(e));
+            }
             return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.unexpectedErrorDuringRequestItemProcessing(e));
         }
     }
@@ -1815,20 +2158,17 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
             throw new Error("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 Error("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(), {
@@ -1947,7 +2287,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 +2500,70 @@ 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/AcceptCreateAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.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/AcceptShareAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/shareAttribute/AcceptShareAttributeRequestItemParameters.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 ***!
@@ -2400,64 +2804,63 @@ const GenericRequestItemProcessor_1 = __webpack_require__(/*! ../GenericRequestI
 const ValidationResult_1 = __webpack_require__(/*! ../ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
 class CreateAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
     canCreateOutgoingRequestItem(requestItem, _request, recipient) {
-        const recipientIsOwnerOfTheAttribute = requestItem.attribute.owner.equals(recipient);
-        // When the owner of the Attribute is not the recipient of the Request, this means that
-        // we need to set the sourceAttributeId, because we have to set shareInfo as soon as the
-        // RequestItem was accepted.
-        if (!recipientIsOwnerOfTheAttribute && !requestItem.sourceAttributeId) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("'sourceAttributeId' cannot be undefined when sending an attribute that is not owned by the 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 this.canCreateRequestItemWithRelationshipAttribute(requestItem);
-    }
-    canCreateRequestItemWithIdentityAttribute(requestItem) {
-        const iAmOwnerOfTheAttribute = this.accountController.identity.isMe(requestItem.attribute.owner);
-        if (!iAmOwnerOfTheAttribute) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem(`Cannot send Identity Attributes of which you are not the owner via ${content_1.CreateAttributeRequestItem.name}. Consider using a ${content_1.ProposeAttributeRequestItem.name} instead.`));
+            if (senderIsAttributeOwner) {
+                return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.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.ConsumptionErrors.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."));
         }
-        return ValidationResult_1.ValidationResult.success();
-    }
-    canCreateRequestItemWithRelationshipAttribute(requestItem) {
-        const iAmOwnerOfTheAttribute = this.accountController.identity.isMe(requestItem.attribute.owner);
-        if (!iAmOwnerOfTheAttribute) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot send Relationship Attributes of which you are not the owner."));
+        if (recipientIsAttributeOwner || senderIsAttributeOwner || ownerIsEmptyString || recipient === undefined) {
+            return ValidationResult_1.ValidationResult.success();
         }
-        return ValidationResult_1.ValidationResult.success();
+        return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.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 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
-        });
-    }
-    async applyIncomingResponseItem(responseItem, requestItem, requestInfo) {
-        if (!(responseItem instanceof content_1.CreateAttributeAcceptResponseItem)) {
-            return;
+        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;
@@ -2557,7 +2960,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.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.success();
     }
@@ -2567,7 +2970,7 @@ 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.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.success();
     }
@@ -2742,7 +3145,8 @@ class ReadAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.Ge
             if (!foundAttribute) {
                 return ValidationResult_1.ValidationResult.error(transport_1.TransportErrors.general.recordNotFound(LocalAttribute_1.LocalAttribute, requestInfo.id.toString()));
             }
-            if (!this.accountController.identity.isMe(foundAttribute.content.owner)) {
+            const ownerIsCurrentIdentity = this.accountController.identity.isMe(foundAttribute.content.owner);
+            if (!ownerIsCurrentIdentity) {
                 return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The given Attribute belongs to someone else. You can only share own Attributes."));
             }
         }
@@ -2804,6 +3208,35 @@ exports.ReadAttributeRequestItemProcessor = ReadAttributeRequestItemProcessor;
 
 /***/ }),
 
+/***/ "./dist/modules/requests/itemProcessors/registerAttributeListener/RegisterAttributeListenerRequestItemProcessor.js":
+/*!*************************************************************************************************************************!*\
+  !*** ./dist/modules/requests/itemProcessors/registerAttributeListener/RegisterAttributeListenerRequestItemProcessor.js ***!
+  \*************************************************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+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()
+        });
+    }
+}
+exports.RegisterAttributeListenerRequestItemProcessor = RegisterAttributeListenerRequestItemProcessor;
+//# sourceMappingURL=RegisterAttributeListenerRequestItemProcessor.js.map
+
+/***/ }),
+
 /***/ "./dist/modules/requests/itemProcessors/shareAttribute/AcceptShareAttributeRequestItemParameters.js":
 /*!**********************************************************************************************************!*\
   !*** ./dist/modules/requests/itemProcessors/shareAttribute/AcceptShareAttributeRequestItemParameters.js ***!
@@ -2845,91 +3278,53 @@ 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;
-        }
-        return ValidationResult_1.ValidationResult.success();
-    }
-    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;
+    canCreateOutgoingRequestItem(requestItem, _request, _recipient) {
+        if (requestItem.attribute instanceof content_1.IdentityAttribute) {
+            return this.canCreateWithIdentityAttribute(requestItem);
         }
-        return true;
+        return this.canCreateWithRelationshipAttribute(requestItem.attribute);
     }
-    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."));
-            }
-        }
-        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."));
-            }
+    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.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."));
         }
         return ValidationResult_1.ValidationResult.success();
     }
-    canAccept(_requestItem, _params, _requestInfo) {
+    canCreateWithRelationshipAttribute(attribute) {
+        if (attribute.confidentiality === content_1.RelationshipAttributeConfidentiality.Private) {
+            return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("The confidentiality of the given `attribute` is private. Therefore you are not allowed to share it."));
+        }
         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
         });
     }
 }
@@ -2951,14 +3346,14 @@ 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)) {
+    if (query instanceof content_1.ThirdPartyRelationshipAttributeQuery) {
+        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.thirdParty?.equals(recipient)) {
+        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.owner.equals(sender) && query.thirdParty !== undefined) {
+        if (query.owner.equals(sender)) {
             return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.invalidRequestItem("Cannot query own Attributes from a third party."));
         }
     }
@@ -3254,6 +3649,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 {
@@ -3265,7 +3661,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;
@@ -3469,6 +3865,11 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
         const requests = requestDocs.map((r) => LocalRequest_1.LocalRequest.from(r));
         return requests;
     }
+    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;
@@ -3593,6 +3994,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 ***!
@@ -3710,7 +4156,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({
@@ -3742,6 +4188,36 @@ exports.SettingsController = SettingsController;
 
 /***/ }),
 
+/***/ "./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 ***!
@@ -4184,12 +4660,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);
@@ -4209,7 +4692,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);
@@ -4273,7 +4756,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];
@@ -4342,7 +4829,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];
@@ -4367,7 +4858,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];
@@ -4492,6 +4987,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
@@ -4537,7 +5035,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;
     }
@@ -4563,7 +5061,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];
@@ -4705,7 +5207,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;
@@ -8882,7 +9384,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);
 }
@@ -8921,7 +9424,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}.
@@ -8937,10 +9440,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
@@ -8961,7 +9470,7 @@ class Duration {
      * @access private
      */
 
-    this.matrix = accurate ? accurateMatrix : casualMatrix;
+    this.matrix = matrix;
     /**
      * @access private
      */
@@ -9000,7 +9509,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}
    */
 
@@ -9013,7 +9523,8 @@ class Duration {
     return new Duration({
       values: normalizeObject(obj, Duration.normalizeUnit),
       loc: Locale.fromObject(opts),
-      conversionAccuracy: opts.conversionAccuracy
+      conversionAccuracy: opts.conversionAccuracy,
+      matrix: opts.matrix
     });
   }
   /**
@@ -9045,7 +9556,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 }
@@ -9069,7 +9581,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 }
@@ -9400,7 +9913,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}
    */
 
@@ -9458,20 +9971,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);
   }
   /**
@@ -9745,10 +10256,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}.
  */
@@ -11189,7 +11700,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)),
@@ -11785,7 +12295,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.
@@ -12324,6 +12834,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
 
   /**
@@ -13016,8 +13539,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'
@@ -13054,7 +13577,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'
@@ -13759,7 +14282,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-const VERSION = "3.0.1";
+const VERSION = "3.0.3";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;