@nmshd/runtime 2.0.0-beta.6 → 2.0.0-beta.7
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.
- package/dist/buildInformation.js +4 -4
- package/dist/modules/DeciderModule.d.ts +3 -3
- package/dist/modules/RequestModule.d.ts +3 -3
- package/dist/modules/RequestModule.js +12 -5
- package/dist/modules/RequestModule.js.map +1 -1
- package/lib-web/nmshd.runtime.js +16 -9
- package/lib-web/nmshd.runtime.js.map +1 -1
- package/lib-web/nmshd.runtime.min.js +1 -1
- package/lib-web/nmshd.runtime.min.js.map +1 -1
- package/package.json +3 -3
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.0.0-beta.
|
|
11
|
-
build: "
|
|
12
|
-
date: "2022-07-
|
|
13
|
-
commit: "
|
|
10
|
+
version: "2.0.0-beta.7",
|
|
11
|
+
build: "93",
|
|
12
|
+
date: "2022-07-25T11:43:13+00:00",
|
|
13
|
+
commit: "f2c7c2dde8aac2392f34db84c2b4bc69297049a0",
|
|
14
14
|
dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.3","@js-soft/ts-utils":"^2.2.0","@nmshd/consumption":"2.0.0-beta.2","@nmshd/content":"2.0.0-alpha.45","@nmshd/crypto":"2.0.1","@nmshd/transport":"2.0.0-beta.1","ajv":"^8.11.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.3","json-stringify-safe":"^5.0.1","luxon":"^3.0.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,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { RuntimeModule } from "../extensibility";
|
|
2
2
|
export declare class DeciderModule extends RuntimeModule {
|
|
3
|
-
init(): void
|
|
4
|
-
start(): void
|
|
3
|
+
init(): void;
|
|
4
|
+
start(): void;
|
|
5
5
|
private handleIncomingRequestStatusChanged;
|
|
6
|
-
stop(): void
|
|
6
|
+
stop(): void;
|
|
7
7
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { RuntimeModule } from "../extensibility/modules/RuntimeModule";
|
|
2
2
|
export declare class RequestModule extends RuntimeModule {
|
|
3
|
-
init(): void
|
|
4
|
-
start(): void
|
|
3
|
+
init(): void;
|
|
4
|
+
start(): void;
|
|
5
5
|
private handlePeerRelationshipTemplateLoaded;
|
|
6
6
|
private handleMessageReceivedEvent;
|
|
7
7
|
private handleMessageSentEvent;
|
|
@@ -10,5 +10,5 @@ export declare class RequestModule extends RuntimeModule {
|
|
|
10
10
|
private handleIncomingRequestDecidedForRelationship;
|
|
11
11
|
private handleIncomingRequestDecidedForMessage;
|
|
12
12
|
private handleRelationshipChangedEvent;
|
|
13
|
-
stop(): void
|
|
13
|
+
stop(): void;
|
|
14
14
|
}
|
|
@@ -22,7 +22,6 @@ class RequestModule extends RuntimeModule_1.RuntimeModule {
|
|
|
22
22
|
if (template.content["@type"] !== "RelationshipTemplateBody")
|
|
23
23
|
return;
|
|
24
24
|
const body = template.content;
|
|
25
|
-
const request = body.onNewRelationship;
|
|
26
25
|
const services = this.runtime.getServices(event.eventTargetAddress);
|
|
27
26
|
const requestResult = await services.consumptionServices.incomingRequests.getRequests({ query: { "source.reference": template.id } });
|
|
28
27
|
if (requestResult.isError) {
|
|
@@ -39,13 +38,21 @@ class RequestModule extends RuntimeModule_1.RuntimeModule {
|
|
|
39
38
|
this.logger.error(`Could not get relationships for template '${template.id}'. Root error:`, getRelationshipsResult.error);
|
|
40
39
|
return;
|
|
41
40
|
}
|
|
42
|
-
if (getRelationshipsResult.
|
|
43
|
-
// TODO:
|
|
41
|
+
if (getRelationshipsResult.value.some((r) => r.status === types_1.RelationshipStatus.Pending)) {
|
|
42
|
+
// TODO: JSSNMSHDD-3111 (inform caller of `loadPeerRelationshipTemplate` about the Relationship)
|
|
43
|
+
this.logger.warn(`There is already a pending Relationship for the RelationshipTemplate '${template.id}'. Skipping creation of a new request.`);
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
if (getRelationshipsResult.value.some((r) => r.status === types_1.RelationshipStatus.Active)) {
|
|
47
|
+
if (body.onExistingRelationship) {
|
|
48
|
+
await this.createIncomingRequest(services, body.onExistingRelationship, template.id);
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
44
51
|
// TODO: JSSNMSHDD-3111 (inform caller of `loadPeerRelationshipTemplate` about the Relationship if body.onExistingRelationship not exists)
|
|
45
|
-
this.logger.warn(`There is already an open
|
|
52
|
+
this.logger.warn(`There is already an open Relationship for the RelationshipTemplate '${template.id}' and onExistingRelationship is not defined. Skipping creation of a new request.`);
|
|
46
53
|
return;
|
|
47
54
|
}
|
|
48
|
-
await this.createIncomingRequest(services,
|
|
55
|
+
await this.createIncomingRequest(services, body.onNewRelationship, template.id);
|
|
49
56
|
}
|
|
50
57
|
async handleMessageReceivedEvent(event) {
|
|
51
58
|
const services = this.runtime.getServices(event.eventTargetAddress);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestModule.js","sourceRoot":"","sources":["../../src/modules/RequestModule.ts"],"names":[],"mappings":";;;AAAA,oDAAwD;AACxD,4CAAgI;AAChI,sCAAqK;AACrK,0EAAuE;AAEvE,oCAA8C;AAE9C,MAAa,aAAc,SAAQ,6BAAa;IACrC,IAAI;QACP,qBAAqB;IACzB,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,gBAAgB,CAAC,4CAAmC,EAAE,IAAI,CAAC,oCAAoC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACjH,IAAI,CAAC,gBAAgB,CAAC,6BAAoB,EAAE,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACxF,IAAI,CAAC,gBAAgB,CAAC,yBAAgB,EAAE,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAChF,IAAI,CAAC,gBAAgB,CAAC,0CAAiC,EAAE,IAAI,CAAC,kCAAkC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7G,IAAI,CAAC,gBAAgB,CAAC,iCAAwB,EAAE,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACpG,CAAC;IAEO,KAAK,CAAC,oCAAoC,CAAC,KAA0C;QACzF,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC;QAC5B,IAAI,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,0BAA0B;YAAE,OAAO;QAErE,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"RequestModule.js","sourceRoot":"","sources":["../../src/modules/RequestModule.ts"],"names":[],"mappings":";;;AAAA,oDAAwD;AACxD,4CAAgI;AAChI,sCAAqK;AACrK,0EAAuE;AAEvE,oCAA8C;AAE9C,MAAa,aAAc,SAAQ,6BAAa;IACrC,IAAI;QACP,qBAAqB;IACzB,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,gBAAgB,CAAC,4CAAmC,EAAE,IAAI,CAAC,oCAAoC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACjH,IAAI,CAAC,gBAAgB,CAAC,6BAAoB,EAAE,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACxF,IAAI,CAAC,gBAAgB,CAAC,yBAAgB,EAAE,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAChF,IAAI,CAAC,gBAAgB,CAAC,0CAAiC,EAAE,IAAI,CAAC,kCAAkC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7G,IAAI,CAAC,gBAAgB,CAAC,iCAAwB,EAAE,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACpG,CAAC;IAEO,KAAK,CAAC,oCAAoC,CAAC,KAA0C;QACzF,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC;QAC5B,IAAI,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,0BAA0B;YAAE,OAAO;QAErE,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAuC,CAAC;QAE9D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAEpE,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,kBAAkB,EAAE,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACtI,IAAI,aAAa,CAAC,OAAO,EAAE;YACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wCAAwC,QAAQ,CAAC,EAAE,gBAAgB,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;YAC5G,OAAO;SACV;QAED,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,gCAAkB,CAAC,SAAS,CAAC,EAAE;YAC5E,2FAA2F;YAC3F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kEAAkE,QAAQ,CAAC,EAAE,wCAAwC,CAAC,CAAC;YACxI,OAAO;SACV;QAED,MAAM,sBAAsB,GAAG,MAAM,QAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAExI,IAAI,sBAAsB,CAAC,OAAO,EAAE;YAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,QAAQ,CAAC,EAAE,gBAAgB,EAAE,sBAAsB,CAAC,KAAK,CAAC,CAAC;YAC1H,OAAO;SACV;QAED,IAAI,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,0BAAkB,CAAC,OAAO,CAAC,EAAE;YACnF,gGAAgG;YAChG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yEAAyE,QAAQ,CAAC,EAAE,wCAAwC,CAAC,CAAC;YAC/I,OAAO;SACV;QAED,IAAI,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,0BAAkB,CAAC,MAAM,CAAC,EAAE;YAClF,IAAI,IAAI,CAAC,sBAAsB,EAAE;gBAC7B,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,sBAAsB,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACrF,OAAO;aACV;YAED,0IAA0I;YAC1I,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,uEAAuE,QAAQ,CAAC,EAAE,kFAAkF,CACvK,CAAC;YACF,OAAO;SACV;QAED,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;IACpF,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAC,KAA2B;QAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAEpE,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC;QAC3B,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpD,QAAQ,kBAAkB,EAAE;YACxB,KAAK,SAAS;gBACV,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAsB,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;gBACvF,MAAM;YACV,KAAK,UAAU;gBACX,MAAM,gBAAgB,GAAG,OAAO,CAAC,OAAuB,CAAC;gBACzD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,gBAAgB,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;gBACzH,IAAI,MAAM,CAAC,OAAO,EAAE;oBAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sDAAsD,OAAO,CAAC,EAAE,WAAW,MAAM,CAAC,KAAK,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;iBAC3I;gBACD,MAAM;SACb;IACL,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,KAAuB;QACxD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC;QAC3B,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,SAAS;YAAE,OAAO;QAEnD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACpE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAsB,CAAC;QAE/C,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,EAAG,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAClI,IAAI,aAAa,CAAC,OAAO,EAAE;YACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,OAAO,CAAC,EAAE,4BAA4B,OAAO,CAAC,EAAE,gBAAgB,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;YACpI,OAAO;SACV;IACL,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,QAAyB,EAAE,OAAoB,EAAE,eAAuB;QACxG,MAAM,qBAAqB,GAAG,MAAM,QAAQ,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;QAC1I,IAAI,qBAAqB,CAAC,OAAO,EAAE;YAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,OAAO,CAAC,EAAE,eAAe,EAAE,qBAAqB,CAAC,KAAK,CAAC,CAAC;YACvG,OAAO;SACV;QAED,MAAM,sBAAsB,GAAG,MAAM,QAAQ,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,EAAE,SAAS,EAAE,qBAAqB,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACrJ,IAAI,sBAAsB,CAAC,OAAO,EAAE;YAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,OAAO,CAAC,EAAE,eAAe,EAAE,sBAAsB,CAAC,KAAK,CAAC,CAAC;YACxH,OAAO;SACV;IACL,CAAC;IAEO,KAAK,CAAC,kCAAkC,CAAC,KAAwC;QACrF,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,gCAAkB,CAAC,OAAO;YAAE,OAAO;QAEhE,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;QACnC,QAAQ,OAAO,CAAC,MAAO,CAAC,IAAI,EAAE;YAC1B,KAAK,sBAAsB;gBACvB,MAAM,IAAI,CAAC,2CAA2C,CAAC,KAAK,CAAC,CAAC;gBAC9D,MAAM;YACV,KAAK,SAAS;gBACV,MAAM,IAAI,CAAC,sCAAsC,CAAC,KAAK,CAAC,CAAC;gBACzD,MAAM;YACV;gBACI,MAAM,IAAI,KAAK,CAAC,8BAA8B,OAAO,CAAC,MAAO,CAAC,IAAI,IAAI,CAAC,CAAC;SAC/E;IACL,CAAC;IAEO,KAAK,CAAC,2CAA2C,CAAC,KAAwC;QAC9F,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;QACnC,MAAM,UAAU,GAAG,OAAO,CAAC,MAAO,CAAC,SAAS,CAAC;QAE7C,IAAI,OAAO,CAAC,QAAS,CAAC,OAAO,CAAC,MAAM,KAAK,UAAU,EAAE;YACjD,4DAA4D;YAC5D,2BAA2B;YAC3B,OAAO;SACV;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACpE,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,uBAAuB,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QAC1H,IAAI,cAAc,CAAC,OAAO,EAAE;YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,UAAU,gBAAgB,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC;YACxG,oBAAoB;YACpB,OAAO;SACV;QAED,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC;QACtC,MAAM,kBAAkB,GAAG,+CAAqC,CAAC,IAAI,CAAC;YAClE,OAAO,EAAE,uCAAuC;YAChD,QAAQ,EAAE,OAAO,CAAC,QAAS,CAAC,OAAO;YACnC,uBAAuB,EAAE,QAAQ,CAAC,OAAO,CAAC,QAAQ;SACrD,CAAC,CAAC;QAEH,MAAM,wBAAwB,GAAG,MAAM,QAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,kBAAkB,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC,CAAC;QAChJ,IAAI,wBAAwB,CAAC,OAAO,EAAE;YAClC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iDAAiD,UAAU,gBAAgB,EAAE,wBAAwB,CAAC,KAAK,CAAC,CAAC;YAC/H,oBAAoB;YACpB,OAAO;SACV;QAED,MAAM,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC;QAC7B,MAAM,qBAAqB,GAAG,MAAM,QAAQ,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,QAAQ,CAAC;YACvF,SAAS;YACT,gBAAgB,EAAE,wBAAwB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE;SACjE,CAAC,CAAC;QACH,IAAI,qBAAqB,CAAC,OAAO,EAAE;YAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,SAAS,gBAAgB,EAAE,qBAAqB,CAAC,KAAK,CAAC,CAAC;YAC7G,OAAO;SACV;IACL,CAAC;IAEO,KAAK,CAAC,sCAAsC,CAAC,KAAwC;QACzF,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;QACnC,MAAM,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC;QAE7B,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAEpE,MAAM,iBAAiB,GAAG,MAAM,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAC,WAAW,CAAC;YAC5E,UAAU,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;YAC1B,OAAO,EAAE,OAAO,CAAC,QAAS,CAAC,OAAO;SACrC,CAAC,CAAC;QACH,IAAI,iBAAiB,CAAC,OAAO,EAAE;YAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iDAAiD,SAAS,IAAI,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAC3G,oBAAoB;YACpB,OAAO;SACV;QAED,MAAM,qBAAqB,GAAG,MAAM,QAAQ,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,QAAQ,CAAC;YACvF,SAAS;YACT,gBAAgB,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE;SAC/C,CAAC,CAAC;QACH,IAAI,qBAAqB,CAAC,OAAO,EAAE;YAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,SAAS,gBAAgB,EAAE,qBAAqB,CAAC,KAAK,CAAC,CAAC;YAC7G,OAAO;SACV;IACL,CAAC;IAEO,KAAK,CAAC,8BAA8B,CAAC,KAA+B;QACxE,4EAA4E;QAC5E,MAAM,mBAAmB,GAAG,KAAK,CAAC,IAAI,CAAC;QACvC,IAAI,mBAAmB,CAAC,MAAM,KAAK,0BAAkB,CAAC,OAAO,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,KAAK;YAAE,OAAO;QAE7G,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAEpE,MAAM,QAAQ,GAAG,mBAAmB,CAAC,QAAQ,CAAC;QAC9C,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAC;QAC/B,gEAAgE;QAChE,IAAI,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,0BAA0B;YAAE,OAAO;QAErE,MAAM,0BAA0B,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAClE,MAAM,oBAAoB,GAAG,0BAA0B,CAAC,EAAE,CAAC;QAC3D,uEAAuE;QACvE,IAAI,0BAA0B,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,uCAAuC;YAAE,OAAO;QAE5G,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,+CAA+C,CAAC,EAAE,UAAU,EAAE,oBAAoB,EAAE,CAAC,CAAC;QACzJ,IAAI,MAAM,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yDAAyD,UAAU,mBAAmB,oBAAoB,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5J,OAAO;SACV;IACL,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,wBAAwB,EAAE,CAAC;IACpC,CAAC;CACJ;AA7ND,sCA6NC"}
|
package/lib-web/nmshd.runtime.js
CHANGED
|
@@ -446,10 +446,10 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
|
|
|
446
446
|
const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
|
|
447
447
|
const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
|
|
448
448
|
exports.buildInformation = {
|
|
449
|
-
version: "2.0.0-beta.
|
|
450
|
-
build: "
|
|
451
|
-
date: "2022-07-
|
|
452
|
-
commit: "
|
|
449
|
+
version: "2.0.0-beta.7",
|
|
450
|
+
build: "93",
|
|
451
|
+
date: "2022-07-25T11:43:13+00:00",
|
|
452
|
+
commit: "f2c7c2dde8aac2392f34db84c2b4bc69297049a0",
|
|
453
453
|
dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.3","@js-soft/ts-utils":"^2.2.0","@nmshd/consumption":"2.0.0-beta.2","@nmshd/content":"2.0.0-alpha.45","@nmshd/crypto":"2.0.1","@nmshd/transport":"2.0.0-beta.1","ajv":"^8.11.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.3","json-stringify-safe":"^5.0.1","luxon":"^3.0.1","qrcode":"1.5.1","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
|
|
454
454
|
libraries: {
|
|
455
455
|
serval: ts_serval_1.buildInformation,
|
|
@@ -4233,7 +4233,6 @@ class RequestModule extends RuntimeModule_1.RuntimeModule {
|
|
|
4233
4233
|
if (template.content["@type"] !== "RelationshipTemplateBody")
|
|
4234
4234
|
return;
|
|
4235
4235
|
const body = template.content;
|
|
4236
|
-
const request = body.onNewRelationship;
|
|
4237
4236
|
const services = this.runtime.getServices(event.eventTargetAddress);
|
|
4238
4237
|
const requestResult = await services.consumptionServices.incomingRequests.getRequests({ query: { "source.reference": template.id } });
|
|
4239
4238
|
if (requestResult.isError) {
|
|
@@ -4250,13 +4249,21 @@ class RequestModule extends RuntimeModule_1.RuntimeModule {
|
|
|
4250
4249
|
this.logger.error(`Could not get relationships for template '${template.id}'. Root error:`, getRelationshipsResult.error);
|
|
4251
4250
|
return;
|
|
4252
4251
|
}
|
|
4253
|
-
if (getRelationshipsResult.
|
|
4254
|
-
// TODO:
|
|
4252
|
+
if (getRelationshipsResult.value.some((r) => r.status === types_1.RelationshipStatus.Pending)) {
|
|
4253
|
+
// TODO: JSSNMSHDD-3111 (inform caller of `loadPeerRelationshipTemplate` about the Relationship)
|
|
4254
|
+
this.logger.warn(`There is already a pending Relationship for the RelationshipTemplate '${template.id}'. Skipping creation of a new request.`);
|
|
4255
|
+
return;
|
|
4256
|
+
}
|
|
4257
|
+
if (getRelationshipsResult.value.some((r) => r.status === types_1.RelationshipStatus.Active)) {
|
|
4258
|
+
if (body.onExistingRelationship) {
|
|
4259
|
+
await this.createIncomingRequest(services, body.onExistingRelationship, template.id);
|
|
4260
|
+
return;
|
|
4261
|
+
}
|
|
4255
4262
|
// TODO: JSSNMSHDD-3111 (inform caller of `loadPeerRelationshipTemplate` about the Relationship if body.onExistingRelationship not exists)
|
|
4256
|
-
this.logger.warn(`There is already an open
|
|
4263
|
+
this.logger.warn(`There is already an open Relationship for the RelationshipTemplate '${template.id}' and onExistingRelationship is not defined. Skipping creation of a new request.`);
|
|
4257
4264
|
return;
|
|
4258
4265
|
}
|
|
4259
|
-
await this.createIncomingRequest(services,
|
|
4266
|
+
await this.createIncomingRequest(services, body.onNewRelationship, template.id);
|
|
4260
4267
|
}
|
|
4261
4268
|
async handleMessageReceivedEvent(event) {
|
|
4262
4269
|
const services = this.runtime.getServices(event.eventTargetAddress);
|