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

package/lib-web/nmshd.consumption.js

@@ -17,10 +17,10 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 exports.buildInformation = {
-    version: "2.0.0-beta.3",
-    build: "53",
-    date: "2022-07-22T10:49:10+00:00",
-    commit: "7af5e3a24a7d729403577ed228905468f1fccddc",
+    version: "2.0.0-beta.6",
+    build: "56",
+    date: "2022-08-03T08:10:05+00:00",
+    commit: "5b68e1cbedaab1e529c76a8afebca1ffccba5cf4",
     dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,
@@ -123,7 +123,8 @@ class ConsumptionController {
             [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.ShareAttributeRequestItem, modules_1.ShareAttributeRequestItemProcessor],
+            [content_1.ConsentRequestItem, modules_1.GenericRequestItemProcessor]
         ]);
     }
 }
@@ -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.`);
@@ -1498,19 +1526,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 +1551,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 +1594,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 +1747,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 +1843,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 +1972,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;
@@ -4173,12 +4198,19 @@ __webpack_require__(/*! reflect-metadata */ "./node_modules/reflect-metadata/Ref
 const EventBus_1 = __webpack_require__(/*! ../EventBus */ "./node_modules/@js-soft/ts-utils/dist/eventBus/EventBus.js");
 const SubscriptionTargetInfo_1 = __webpack_require__(/*! ../SubscriptionTargetInfo */ "./node_modules/@js-soft/ts-utils/dist/eventBus/SubscriptionTargetInfo.js");
 class EventEmitter2EventBus {
+    errorCallback;
     emitter;
     listeners = new Map();
     nextId = 0;
     invocationPromises = [];
-    constructor(options) {
-        this.emitter = new eventemitter2_1.EventEmitter2({ ...options, wildcard: true, maxListeners: 50, verboseMemoryLeak: true });
+    constructor(errorCallback, eventEmitter2Options) {
+        this.errorCallback = errorCallback;
+        this.emitter = new eventemitter2_1.EventEmitter2({
+            maxListeners: 50,
+            verboseMemoryLeak: true,
+            ...eventEmitter2Options,
+            wildcard: true
+        });
     }
     subscribe(subscriptionTarget, handler) {
         return this.registerHandler(subscriptionTarget, handler);
@@ -4198,7 +4230,7 @@ class EventEmitter2EventBus {
             }
             const invocationPromise = (async () => await handler(event))();
             this.invocationPromises.push(invocationPromise);
-            await invocationPromise;
+            await invocationPromise.catch((e) => this.errorCallback(e, subscriptionTargetInfo.namespace));
             this.invocationPromises = this.invocationPromises.filter((p) => p !== invocationPromise);
             if (isOneTimeHandler)
                 this.listeners.delete(listenerId);
@@ -4262,7 +4294,11 @@ exports.EventEmitter2EventBus = EventEmitter2EventBus;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -4331,7 +4367,11 @@ exports.Event = Event;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -4356,7 +4396,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];
@@ -4481,6 +4525,9 @@ class ApplicationError extends Error {
     equals(error) {
         return this.code === error.code;
     }
+    toString() {
+        return JSON.stringify({ code: this.code, message: this.message, data: this.data }, undefined, 2);
+    }
 }
 exports.ApplicationError = ApplicationError;
 //# sourceMappingURL=ApplicationError.js.map
@@ -4526,7 +4573,7 @@ class Result {
     }
     get value() {
         if (!this.isSuccess) {
-            throw new Error("Can't get the value of an error result. Use 'error' instead.");
+            throw new Error(`Can't get the value of an error result. Use 'error' instead. Root error: \r\n${this.error}`);
         }
         return this._value;
     }
@@ -4552,7 +4599,11 @@ exports.Result = Result;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -4694,7 +4745,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;