@nmshd/runtime 2.3.6 → 2.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/dist/buildInformation.js +4 -4
  2. package/dist/events/consumption/RelationshipTemplateProcessedEvent.d.ts +19 -4
  3. package/dist/events/consumption/RelationshipTemplateProcessedEvent.js +3 -3
  4. package/dist/events/consumption/RelationshipTemplateProcessedEvent.js.map +1 -1
  5. package/dist/modules/DeciderModule.js +17 -3
  6. package/dist/modules/DeciderModule.js.map +1 -1
  7. package/dist/modules/RequestModule.js +26 -13
  8. package/dist/modules/RequestModule.js.map +1 -1
  9. package/dist/useCases/index.d.ts +1 -0
  10. package/dist/useCases/index.js +1 -0
  11. package/dist/useCases/index.js.map +1 -1
  12. package/lib-web/nmshd.runtime.js +51 -23
  13. package/lib-web/nmshd.runtime.js.map +1 -1
  14. package/lib-web/nmshd.runtime.min.js +1 -1
  15. package/lib-web/nmshd.runtime.min.js.map +1 -1
  16. package/package.json +5 -5
package/dist/buildInformation.js CHANGED
@@ -7,10 +7,10 @@ const content_1 = require("@nmshd/content");
7
7
  const crypto_1 = require("@nmshd/crypto");
8
8
  const transport_1 = require("@nmshd/transport");
9
9
  exports.buildInformation = {
10
- version: "2.3.6",
11
- build: "142",
12
- date: "2023-02-01T13:14:08+00:00",
13
- commit: "5d1818683ad689eff5f0c71744d4b54e626b70b1",
10
+ version: "2.4.1",
11
+ build: "144",
12
+ date: "2023-02-17T15:36:34+00:00",
13
+ commit: "0a8ae8c748cd3fcb2998e9d89420b8b634530d44",
14
14
  dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.7","@js-soft/ts-utils":"^2.3.1","@nmshd/consumption":"3.1.1","@nmshd/content":"2.3.1","@nmshd/crypto":"2.0.3","@nmshd/transport":"2.0.3","ajv":"^8.12.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^3.2.1","qrcode":"1.5.1","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
15
15
  libraries: {
16
16
  serval: ts_serval_1.buildInformation,
package/dist/events/consumption/RelationshipTemplateProcessedEvent.d.ts CHANGED
@@ -2,7 +2,7 @@ import { RelationshipTemplateDTO } from "../../types";
2
2
  import { DataEvent } from "../DataEvent";
3
3
  export declare class RelationshipTemplateProcessedEvent extends DataEvent<RelationshipTemplateProcessedEventData> {
4
4
  static readonly namespace = "consumption.relationshipTemplateProcessed";
5
- constructor(eventTargetAddress: string, template: RelationshipTemplateDTO, result: RelationshipTemplateProcessedResult);
5
+ constructor(eventTargetAddress: string, data: RelationshipTemplateProcessedEventData);
6
6
  }
7
7
  export declare enum RelationshipTemplateProcessedResult {
8
8
  ManualRequestDecisionRequired = "ManualRequestDecisionRequired",
@@ -11,7 +11,22 @@ export declare enum RelationshipTemplateProcessedResult {
11
11
  NoRequest = "NoRequest",
12
12
  Error = "Error"
13
13
  }
14
- export interface RelationshipTemplateProcessedEventData {
14
+ export type RelationshipTemplateProcessedEventData = {
15
15
  template: RelationshipTemplateDTO;
16
- result: RelationshipTemplateProcessedResult;
17
- }
16
+ result: RelationshipTemplateProcessedResult.ManualRequestDecisionRequired;
17
+ requestId: string;
18
+ } | {
19
+ template: RelationshipTemplateDTO;
20
+ result: RelationshipTemplateProcessedResult.NonCompletedRequestExists;
21
+ requestId: string;
22
+ } | {
23
+ template: RelationshipTemplateDTO;
24
+ result: RelationshipTemplateProcessedResult.RelationshipExists;
25
+ relationshipId: string;
26
+ } | {
27
+ template: RelationshipTemplateDTO;
28
+ result: RelationshipTemplateProcessedResult.NoRequest;
29
+ } | {
30
+ template: RelationshipTemplateDTO;
31
+ result: RelationshipTemplateProcessedResult.Error;
32
+ };
package/dist/events/consumption/RelationshipTemplateProcessedEvent.js CHANGED
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.RelationshipTemplateProcessedResult = exports.RelationshipTemplateProcessedEvent = void 0;
4
4
  const DataEvent_1 = require("../DataEvent");
5
5
  class RelationshipTemplateProcessedEvent extends DataEvent_1.DataEvent {
6
- constructor(eventTargetAddress, template, result) {
7
- super(RelationshipTemplateProcessedEvent.namespace, eventTargetAddress, { template, result });
8
- if (template.isOwn)
6
+ constructor(eventTargetAddress, data) {
7
+ super(RelationshipTemplateProcessedEvent.namespace, eventTargetAddress, data);
8
+ if (data.template.isOwn)
9
9
  throw new Error("Cannot create this event for an own Relationship Template.");
10
10
  }
11
11
  }
package/dist/events/consumption/RelationshipTemplateProcessedEvent.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RelationshipTemplateProcessedEvent.js","sourceRoot":"","sources":["../../../src/events/consumption/RelationshipTemplateProcessedEvent.ts"],"names":[],"mappings":";;;AACA,4CAAyC;AAEzC,MAAa,kCAAmC,SAAQ,qBAAiD;IAGrG,YAAmB,kBAA0B,EAAE,QAAiC,EAAE,MAA2C;QACzH,KAAK,CAAC,kCAAkC,CAAC,SAAS,EAAE,kBAAkB,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAE9F,IAAI,QAAQ,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IACtG,CAAC;;AAPL,gFAQC;AAP0B,4CAAS,GAAG,2CAA2C,CAAC;AASnF,IAAY,mCAMX;AAND,WAAY,mCAAmC;IAC3C,sGAA+D,CAAA;IAC/D,8FAAuD,CAAA;IACvD,gFAAyC,CAAA;IACzC,8DAAuB,CAAA;IACvB,sDAAe,CAAA;AACnB,CAAC,EANW,mCAAmC,GAAnC,2CAAmC,KAAnC,2CAAmC,QAM9C"}
1
+ {"version":3,"file":"RelationshipTemplateProcessedEvent.js","sourceRoot":"","sources":["../../../src/events/consumption/RelationshipTemplateProcessedEvent.ts"],"names":[],"mappings":";;;AACA,4CAAyC;AAEzC,MAAa,kCAAmC,SAAQ,qBAAiD;IAGrG,YAAmB,kBAA0B,EAAE,IAA4C;QACvF,KAAK,CAAC,kCAAkC,CAAC,SAAS,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;QAE9E,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAC3G,CAAC;;AAPL,gFAQC;AAP0B,4CAAS,GAAG,2CAA2C,CAAC;AASnF,IAAY,mCAMX;AAND,WAAY,mCAAmC;IAC3C,sGAA+D,CAAA;IAC/D,8FAAuD,CAAA;IACvD,gFAAyC,CAAA;IACzC,8DAAuB,CAAA;IACvB,sDAAe,CAAA;AACnB,CAAC,EANW,mCAAmC,GAAnC,2CAAmC,KAAnC,2CAAmC,QAM9C"}
package/dist/modules/DeciderModule.js CHANGED
@@ -27,15 +27,29 @@ class DeciderModule extends extensibility_1.RuntimeModule {
27
27
  await this.publishEvent(event, services, "Error");
28
28
  return;
29
29
  }
30
- await this.publishEvent(event, services, "ManualRequestDecisionRequired");
30
+ await this.publishEvent(event, services, "ManualRequestDecisionRequired", request.id);
31
31
  }
32
- async publishEvent(event, services, result) {
32
+ async publishEvent(event, services, result, requestId) {
33
33
  const request = event.data.request;
34
34
  switch (request.source.type) {
35
35
  case "RelationshipTemplate":
36
36
  const getTemplateResult = await services.transportServices.relationshipTemplates.getRelationshipTemplate({ id: request.source.reference });
37
37
  const template = getTemplateResult.value;
38
- this.runtime.eventBus.publish(new events_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, template, result));
38
+ if (result === "NoRequest" || result === "Error") {
39
+ this.runtime.eventBus.publish(new events_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, {
40
+ template,
41
+ result: result
42
+ }));
43
+ }
44
+ if (result === "ManualRequestDecisionRequired") {
45
+ if (!requestId)
46
+ throw new Error("Request ID is required for manual decision required result.");
47
+ this.runtime.eventBus.publish(new events_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, {
48
+ template,
49
+ result: result,
50
+ requestId
51
+ }));
52
+ }
39
53
  break;
40
54
  case "Message":
41
55
  const getMessageResult = await services.transportServices.messages.getMessage({ id: request.source.reference });
package/dist/modules/DeciderModule.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DeciderModule.js","sourceRoot":"","sources":["../../src/modules/DeciderModule.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DeciderModule.js","sourceRoot":"","sources":["../../src/modules/DeciderModule.ts"],"names":[],"mappings":"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"}
package/dist/modules/RequestModule.js CHANGED
@@ -21,41 +21,54 @@ class RequestModule extends RuntimeModule_1.RuntimeModule {
21
21
  async handlePeerRelationshipTemplateLoaded(event) {
22
22
  const template = event.data;
23
23
  if (template.content["@type"] !== "RelationshipTemplateContent") {
24
- this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, template, RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.NoRequest));
24
+ this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, { template, result: RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.NoRequest }));
25
25
  return;
26
26
  }
27
27
  const body = template.content;
28
28
  const services = await this.runtime.getServices(event.eventTargetAddress);
29
29
  const existingRequestsFromTemplate = (await services.consumptionServices.incomingRequests.getRequests({ query: { "source.reference": template.id } })).value;
30
- const nonCompletedRequestExists = existingRequestsFromTemplate.some((r) => r.status !== consumption_1.LocalRequestStatus.Completed);
31
- if (nonCompletedRequestExists) {
30
+ const nonCompletedRequests = existingRequestsFromTemplate.filter((r) => r.status !== consumption_1.LocalRequestStatus.Completed);
31
+ if (nonCompletedRequests.length !== 0) {
32
32
  this.logger.info(`There is already an open Request for the RelationshipTemplate '${template.id}'.`);
33
- this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, template, RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.NonCompletedRequestExists));
33
+ this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, {
34
+ template,
35
+ result: RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.NonCompletedRequestExists,
36
+ requestId: nonCompletedRequests[0].id
37
+ }));
34
38
  return;
35
39
  }
36
40
  const relationshipsToPeer = (await services.transportServices.relationships.getRelationships({ query: { peer: template.createdBy } })).value;
37
- const pendingRelationshipExists = relationshipsToPeer.some((r) => r.status === types_1.RelationshipStatus.Pending);
38
- if (pendingRelationshipExists) {
41
+ const pendingRelationships = relationshipsToPeer.filter((r) => r.status === types_1.RelationshipStatus.Pending);
42
+ if (pendingRelationships.length !== 0) {
39
43
  this.logger.info(`There is already a pending Relationship for the RelationshipTemplate '${template.id}'. Skipping creation of a new request.`);
40
- this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, template, RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.RelationshipExists));
44
+ this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, {
45
+ template,
46
+ result: RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.RelationshipExists,
47
+ relationshipId: pendingRelationships[0].id
48
+ }));
41
49
  return;
42
50
  }
43
- const activeRelationshipExists = relationshipsToPeer.some((r) => r.status === types_1.RelationshipStatus.Active);
44
- if (activeRelationshipExists) {
51
+ const activeRelationships = relationshipsToPeer.filter((r) => r.status === types_1.RelationshipStatus.Active);
52
+ if (activeRelationships.length !== 0) {
45
53
  if (body.onExistingRelationship) {
46
54
  const requestCreated = await this.createIncomingRequest(services, body.onExistingRelationship, template.id);
47
55
  if (!requestCreated) {
48
- this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, template, RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.Error));
56
+ this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, { template, result: RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.Error }));
49
57
  }
50
58
  return;
51
59
  }
52
60
  this.logger.info(`There is already an open Relationship for the RelationshipTemplate '${template.id}' and onExistingRelationship is not defined. Skipping creation of a new request.`);
53
- this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, template, RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.RelationshipExists));
61
+ this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, {
62
+ template,
63
+ result: RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.RelationshipExists,
64
+ relationshipId: activeRelationships[0].id
65
+ }));
54
66
  return;
55
67
  }
56
68
  const requestCreated = await this.createIncomingRequest(services, body.onNewRelationship, template.id);
57
- if (!requestCreated)
58
- this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, template, RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.Error));
69
+ if (!requestCreated) {
70
+ this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, { template, result: RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.Error }));
71
+ }
59
72
  }
60
73
  async handleMessageReceivedEvent(event) {
61
74
  const services = await this.runtime.getServices(event.eventTargetAddress);
package/dist/modules/RequestModule.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RequestModule.js","sourceRoot":"","sources":["../../src/modules/RequestModule.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RequestModule.js","sourceRoot":"","sources":["../../src/modules/RequestModule.ts"],"names":[],"mappings":"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"}
package/dist/useCases/index.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  export * from "./anonymous";
2
+ export * from "./common/Base64ForIdPrefix";
2
3
  export * from "./common/OwnerRestriction";
3
4
  export * from "./common/RuntimeErrors";
4
5
  export * from "./consumption";
package/dist/useCases/index.js CHANGED
@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./anonymous"), exports);
18
+ __exportStar(require("./common/Base64ForIdPrefix"), exports);
18
19
  __exportStar(require("./common/OwnerRestriction"), exports);
19
20
  __exportStar(require("./common/RuntimeErrors"), exports);
20
21
  __exportStar(require("./consumption"), exports);
package/dist/useCases/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/useCases/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,4DAA0C;AAC1C,yDAAuC;AACvC,gDAA8B;AAC9B,8CAA4B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/useCases/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,6DAA2C;AAC3C,4DAA0C;AAC1C,yDAAuC;AACvC,gDAA8B;AAC9B,8CAA4B"}
package/lib-web/nmshd.runtime.js CHANGED
@@ -548,10 +548,10 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
548
548
  const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
549
549
  const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
550
550
  exports.buildInformation = {
551
- version: "2.3.6",
552
- build: "142",
553
- date: "2023-02-01T13:14:08+00:00",
554
- commit: "5d1818683ad689eff5f0c71744d4b54e626b70b1",
551
+ version: "2.4.1",
552
+ build: "144",
553
+ date: "2023-02-17T15:36:34+00:00",
554
+ commit: "0a8ae8c748cd3fcb2998e9d89420b8b634530d44",
555
555
  dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.7","@js-soft/ts-utils":"^2.3.1","@nmshd/consumption":"3.1.1","@nmshd/content":"2.3.1","@nmshd/crypto":"2.0.3","@nmshd/transport":"2.0.3","ajv":"^8.12.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^3.2.1","qrcode":"1.5.1","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
556
556
  libraries: {
557
557
  serval: ts_serval_1.buildInformation,
@@ -2958,9 +2958,9 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
2958
2958
  exports.RelationshipTemplateProcessedResult = exports.RelationshipTemplateProcessedEvent = void 0;
2959
2959
  const DataEvent_1 = __webpack_require__(/*! ../DataEvent */ "./dist/events/DataEvent.js");
2960
2960
  class RelationshipTemplateProcessedEvent extends DataEvent_1.DataEvent {
2961
- constructor(eventTargetAddress, template, result) {
2962
- super(RelationshipTemplateProcessedEvent.namespace, eventTargetAddress, { template, result });
2963
- if (template.isOwn)
2961
+ constructor(eventTargetAddress, data) {
2962
+ super(RelationshipTemplateProcessedEvent.namespace, eventTargetAddress, data);
2963
+ if (data.template.isOwn)
2964
2964
  throw new Error("Cannot create this event for an own Relationship Template.");
2965
2965
  }
2966
2966
  }
@@ -5038,15 +5038,29 @@ class DeciderModule extends extensibility_1.RuntimeModule {
5038
5038
  await this.publishEvent(event, services, "Error");
5039
5039
  return;
5040
5040
  }
5041
- await this.publishEvent(event, services, "ManualRequestDecisionRequired");
5041
+ await this.publishEvent(event, services, "ManualRequestDecisionRequired", request.id);
5042
5042
  }
5043
- async publishEvent(event, services, result) {
5043
+ async publishEvent(event, services, result, requestId) {
5044
5044
  const request = event.data.request;
5045
5045
  switch (request.source.type) {
5046
5046
  case "RelationshipTemplate":
5047
5047
  const getTemplateResult = await services.transportServices.relationshipTemplates.getRelationshipTemplate({ id: request.source.reference });
5048
5048
  const template = getTemplateResult.value;
5049
- this.runtime.eventBus.publish(new events_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, template, result));
5049
+ if (result === "NoRequest" || result === "Error") {
5050
+ this.runtime.eventBus.publish(new events_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, {
5051
+ template,
5052
+ result: result
5053
+ }));
5054
+ }
5055
+ if (result === "ManualRequestDecisionRequired") {
5056
+ if (!requestId)
5057
+ throw new Error("Request ID is required for manual decision required result.");
5058
+ this.runtime.eventBus.publish(new events_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, {
5059
+ template,
5060
+ result: result,
5061
+ requestId
5062
+ }));
5063
+ }
5050
5064
  break;
5051
5065
  case "Message":
5052
5066
  const getMessageResult = await services.transportServices.messages.getMessage({ id: request.source.reference });
@@ -5153,41 +5167,54 @@ class RequestModule extends RuntimeModule_1.RuntimeModule {
5153
5167
  async handlePeerRelationshipTemplateLoaded(event) {
5154
5168
  const template = event.data;
5155
5169
  if (template.content["@type"] !== "RelationshipTemplateContent") {
5156
- this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, template, RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.NoRequest));
5170
+ this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, { template, result: RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.NoRequest }));
5157
5171
  return;
5158
5172
  }
5159
5173
  const body = template.content;
5160
5174
  const services = await this.runtime.getServices(event.eventTargetAddress);
5161
5175
  const existingRequestsFromTemplate = (await services.consumptionServices.incomingRequests.getRequests({ query: { "source.reference": template.id } })).value;
5162
- const nonCompletedRequestExists = existingRequestsFromTemplate.some((r) => r.status !== consumption_1.LocalRequestStatus.Completed);
5163
- if (nonCompletedRequestExists) {
5176
+ const nonCompletedRequests = existingRequestsFromTemplate.filter((r) => r.status !== consumption_1.LocalRequestStatus.Completed);
5177
+ if (nonCompletedRequests.length !== 0) {
5164
5178
  this.logger.info(`There is already an open Request for the RelationshipTemplate '${template.id}'.`);
5165
- this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, template, RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.NonCompletedRequestExists));
5179
+ this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, {
5180
+ template,
5181
+ result: RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.NonCompletedRequestExists,
5182
+ requestId: nonCompletedRequests[0].id
5183
+ }));
5166
5184
  return;
5167
5185
  }
5168
5186
  const relationshipsToPeer = (await services.transportServices.relationships.getRelationships({ query: { peer: template.createdBy } })).value;
5169
- const pendingRelationshipExists = relationshipsToPeer.some((r) => r.status === types_1.RelationshipStatus.Pending);
5170
- if (pendingRelationshipExists) {
5187
+ const pendingRelationships = relationshipsToPeer.filter((r) => r.status === types_1.RelationshipStatus.Pending);
5188
+ if (pendingRelationships.length !== 0) {
5171
5189
  this.logger.info(`There is already a pending Relationship for the RelationshipTemplate '${template.id}'. Skipping creation of a new request.`);
5172
- this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, template, RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.RelationshipExists));
5190
+ this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, {
5191
+ template,
5192
+ result: RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.RelationshipExists,
5193
+ relationshipId: pendingRelationships[0].id
5194
+ }));
5173
5195
  return;
5174
5196
  }
5175
- const activeRelationshipExists = relationshipsToPeer.some((r) => r.status === types_1.RelationshipStatus.Active);
5176
- if (activeRelationshipExists) {
5197
+ const activeRelationships = relationshipsToPeer.filter((r) => r.status === types_1.RelationshipStatus.Active);
5198
+ if (activeRelationships.length !== 0) {
5177
5199
  if (body.onExistingRelationship) {
5178
5200
  const requestCreated = await this.createIncomingRequest(services, body.onExistingRelationship, template.id);
5179
5201
  if (!requestCreated) {
5180
- this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, template, RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.Error));
5202
+ this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, { template, result: RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.Error }));
5181
5203
  }
5182
5204
  return;
5183
5205
  }
5184
5206
  this.logger.info(`There is already an open Relationship for the RelationshipTemplate '${template.id}' and onExistingRelationship is not defined. Skipping creation of a new request.`);
5185
- this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, template, RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.RelationshipExists));
5207
+ this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, {
5208
+ template,
5209
+ result: RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.RelationshipExists,
5210
+ relationshipId: activeRelationships[0].id
5211
+ }));
5186
5212
  return;
5187
5213
  }
5188
5214
  const requestCreated = await this.createIncomingRequest(services, body.onNewRelationship, template.id);
5189
- if (!requestCreated)
5190
- this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, template, RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.Error));
5215
+ if (!requestCreated) {
5216
+ this.runtime.eventBus.publish(new RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedEvent(event.eventTargetAddress, { template, result: RelationshipTemplateProcessedEvent_1.RelationshipTemplateProcessedResult.Error }));
5217
+ }
5191
5218
  }
5192
5219
  async handleMessageReceivedEvent(event) {
5193
5220
  const services = await this.runtime.getServices(event.eventTargetAddress);
@@ -32318,6 +32345,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
32318
32345
  };
32319
32346
  Object.defineProperty(exports, "__esModule", ({ value: true }));
32320
32347
  __exportStar(__webpack_require__(/*! ./anonymous */ "./dist/useCases/anonymous/index.js"), exports);
32348
+ __exportStar(__webpack_require__(/*! ./common/Base64ForIdPrefix */ "./dist/useCases/common/Base64ForIdPrefix.js"), exports);
32321
32349
  __exportStar(__webpack_require__(/*! ./common/OwnerRestriction */ "./dist/useCases/common/OwnerRestriction.js"), exports);
32322
32350
  __exportStar(__webpack_require__(/*! ./common/RuntimeErrors */ "./dist/useCases/common/RuntimeErrors.js"), exports);
32323
32351
  __exportStar(__webpack_require__(/*! ./consumption */ "./dist/useCases/consumption/index.js"), exports);