Update Runtime (#247)

* chore: update runtime

* refactor: use content in sdk

* fix: adapt to runtime changes

* fix: update tests

* fix: add peer deletion info

* ci: correct audit exclude

.ci/runChecks.sh

@@ -11,4 +11,4 @@ npm run lint:prettier
 
 # auditing
 npx license-check --ignoreRegex @nmshd/connector
-npx better-npm-audit audit --exclude 1096302,1098618,1093639
+npx better-npm-audit audit --exclude 1096302,1098681,1093639

package.json

@@ -84,8 +84,7 @@
         "@js-soft/docdb-access-mongo": "1.1.8",
         "@js-soft/node-logger": "1.2.0",
         "@js-soft/ts-utils": "^2.3.3",
-        "@nmshd/iql": "^1.0.2",
-        "@nmshd/runtime": "5.1.0",
+        "@nmshd/runtime": "5.3.0",
         "agentkeepalive": "4.5.0",
         "amqplib": "^0.10.4",
         "axios": "^1.7.5",
@@ -96,7 +95,7 @@
         "helmet": "7.1.0",
         "json-stringify-safe": "5.0.1",
         "jsonschema": "1.4.1",
-        "mqtt": "^5.10.0",
+        "mqtt": "^5.10.1",
         "multer": "^1.4.5-lts.1",
         "nconf": "0.12.1",
         "on-headers": "1.0.2",
@@ -114,6 +113,8 @@
         "@js-soft/eslint-config-ts": "1.6.9",
         "@js-soft/license-check": "1.0.9",
         "@nmshd/connector-sdk": "*",
+        "@nmshd/content": "^5.3.0",
+        "@nmshd/core-types": "^5.3.0",
         "@types/amqplib": "^0.10.5",
         "@types/compression": "^1.7.5",
         "@types/cors": "^2.8.17",
@@ -125,7 +126,7 @@
         "@types/lodash": "^4.17.7",
         "@types/luxon": "^3.4.2",
         "@types/nconf": "^0.10.7",
-        "@types/node": "^22.5.0",
+        "@types/node": "^22.5.1",
         "@types/on-headers": "^1.0.3",
         "@types/swagger-ui-express": "^4.1.6",
         "@types/yamljs": "^0.2.34",

packages/sdk/_examples/messages.ts

@@ -8,7 +8,7 @@ async function run() {
 
     const sentMessage = await client.messages.sendMessage({
         recipients: ["id1343523509859032455"],
-        content: { A: "B" }
+        content: { "@type": "Mail", to: [""], subject: "Hello", body: "Hello World!" }
     });
 }
 

packages/sdk/package.json

@@ -30,6 +30,7 @@
         "build:schemas:watch": "npx nodemon -e ts -w 'src/types' --exec 'npm run build:schemas'"
     },
     "dependencies": {
+        "@nmshd/content": "^5.3.0",
         "axios": "^1.7.5",
         "form-data": "^4.0.0",
         "qs": "^6.13.0"

packages/sdk/src/types/attributes/ConnectorAttribute.ts

@@ -1,8 +1,10 @@
+import { IdentityAttributeJSON, RelationshipAttributeJSON } from "@nmshd/content";
+
 export interface ConnectorAttribute {
     id: string;
     parentId?: string;
     createdAt: string;
-    content: ConnectorIdentityAttribute | ConnectorRelationshipAttribute;
+    content: IdentityAttributeJSON | RelationshipAttributeJSON;
     succeeds?: string;
     succeededBy?: string;
     deletionInfo?: ConnectorAttributeDeletionInfo;
@@ -37,29 +39,3 @@ export interface ConnectorAttributeShareInfoForNotification {
 }
 
 export type ConnectorAttributeShareInfo = ConnectorAttributeShareInfoForNotification | ConnectorAttributeShareInfoForRequest;
-
-export interface ConnectorBaseAttribute {
-    "@type": string;
-    owner: string;
-    validFrom?: string;
-    validTo?: string;
-}
-
-export interface ConnectorIdentityAttribute extends ConnectorBaseAttribute {
-    "@type": "IdentityAttribute";
-    value: ConnectorAttributeValue;
-    tags?: string[];
-}
-
-export interface ConnectorRelationshipAttribute extends ConnectorBaseAttribute {
-    "@type": "RelationshipAttribute";
-    value: ConnectorAttributeValue;
-    key: string;
-    isTechnical?: boolean;
-    confidentiality: "public" | "private" | "protected";
-}
-
-export interface ConnectorAttributeValue {
-    "@type": string;
-    [key: string]: unknown;
-}

packages/sdk/src/types/attributes/requests/CreateRepositoryAttributeRequest.ts

@@ -1,8 +1,8 @@
-import { ConnectorAttributeValue } from "../ConnectorAttribute";
+import { AttributeValues } from "@nmshd/content";
 
 export interface CreateRepositoryAttributeRequest {
     content: {
-        value: ConnectorAttributeValue;
+        value: AttributeValues.Identity.Json;
         tags?: string[];
         validFrom?: string;
         validTo?: string;

packages/sdk/src/types/attributes/requests/SucceedAttributeRequest.ts

@@ -1,8 +1,8 @@
-import { ConnectorAttributeValue } from "../ConnectorAttribute";
+import { AttributeValues } from "@nmshd/content";
 
 export interface SucceedAttributeRequest {
     successorContent: {
-        value: ConnectorAttributeValue;
+        value: AttributeValues.Identity.Json | AttributeValues.Relationship.Json;
         tags?: string[];
         validFrom?: string;
         validTo?: string;

packages/sdk/src/types/messages/ConnectorMessage.ts

@@ -1,9 +1,9 @@
-import { ConnectorMessageContentDerivation } from "./ConnectorMessageContentDerivation";
+import { ArbitraryMessageContentJSON, MailJSON, NotificationJSON, RequestJSON, ResponseWrapperJSON } from "@nmshd/content";
 import { ConnectorMessageRecipient } from "./ConnectorMessageRecipient";
 
 export interface ConnectorMessage {
     id: string;
-    content: ConnectorMessageContentDerivation;
+    content: MailJSON | ResponseWrapperJSON | RequestJSON | NotificationJSON | ArbitraryMessageContentJSON;
     createdBy: string;
     createdByDevice: string;
     recipients: ConnectorMessageRecipient[];