Upgrade runtime (#227)

* chore: upgrade runtime * chore: fix tests * fix: npm i * refactor: remove comment * chore: upgrade backbone * refactor: isDefault true * fix: use syncUntil in test * chore: bump runtime to real v5 * chore: undo unnecessary formatting change * fix: update test * refactor: rename ConnectorResponse to Response * refactor: Response -> ConnectorHttpResponse * refactor: update sdk types * refactor: update tests * chore: bump local backbone * ci: audit exclude * chore: rm comment * fix: specify atTypes * fix: do not use runtime in connector tests * fix: more issues * chore: remove relic * fix: naming * fix: make only optional where necessary --------- Co-authored-by: Sebastian Mahr <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Julian König <[email protected]>
nmshd · Aug 15, 2024 · 1738600 · 1738600
1 parent 3181bbc
commit 1738600
Show file tree

Hide file tree

Showing 52 changed files with 372 additions and 288 deletions.
diff --git a/.dev/compose.backbone.env b/.dev/compose.backbone.env
@@ -1 +1 @@
-BACKBONE_VERSION=6.2.0
+BACKBONE_VERSION=6.5.1
diff --git a/.dev/compose.backbone.yml b/.dev/compose.backbone.yml
@@ -98,7 +98,7 @@ services:
     image: postgres
     environment:
       - PGPASSWORD=Passw0rd
-    command: /bin/bash -c 'env && apt update -y && apt install -y wget && wget https://raw.githubusercontent.com/nmshd/backbone/${BACKBONE_VERSION}/setup-db/setup-postgres.sql -O /setup-postgres.sql && psql -h postgres -U postgres -d enmeshed -f /setup-postgres.sql'
+    command: /bin/bash -c 'env && apt update -y && apt install -y wget && wget https://raw.githubusercontent.com/nmshd/backbone/${BACKBONE_VERSION}/scripts/sql/postgres/setup.sql -O /setup-postgres.sql && psql -h postgres -U postgres -d enmeshed -f /setup-postgres.sql'
     depends_on:
       database:
         condition: service_healthy

diff --git a/.dev/scripts/establishRelationshipAndSpamMessages.ts b/.dev/scripts/establishRelationshipAndSpamMessages.ts
@@ -15,10 +15,10 @@ async function run() {
     const { connector1Address, connector2Address } = await establishOrReturnRelationship(connector1, connector2);
 
     while (true) {
-        await connector1.messages.sendMessage({ recipients: [connector2Address], content: {} });
+        await connector1.messages.sendMessage({ recipients: [connector2Address], content: { "@type": "ArbitraryMessageContent", value: {} } });
         await sleep(2000);
 
-        await connector2.messages.sendMessage({ recipients: [connector1Address], content: {} });
+        await connector2.messages.sendMessage({ recipients: [connector1Address], content: { "@type": "ArbitraryMessageContent", value: {} } });
         await sleep(2000);
     }
 }
@@ -29,8 +29,8 @@ async function establishOrReturnRelationship(connector1: ConnectorClient, connec
     const relationships = (await connector1.relationships.getRelationships()).result;
 
     if (relationships.length > 0) {
-        if (relationships[0].status === ConnectorRelationshipStatus.PENDING) {
-            await connector1.relationships.acceptRelationshipChange(relationships[0].id, relationships[0].changes[0].id);
+        if (relationships[0].status === ConnectorRelationshipStatus.Pending) {
+            await connector1.relationships.acceptRelationship(relationships[0].id);
         }
 
         return {
@@ -39,15 +39,26 @@ async function establishOrReturnRelationship(connector1: ConnectorClient, connec
         };
     }
 
-    const template = (await connector1.relationshipTemplates.createOwnRelationshipTemplate({ expiresAt: "2099", maxNumberOfAllocations: 1, content: {} })).result;
+    const template = (
+        await connector1.relationshipTemplates.createOwnRelationshipTemplate({
+            expiresAt: "2099",
+            maxNumberOfAllocations: 1,
+            content: { "@type": "ArbitraryRelationshipTemplateContent", value: {} }
+        })
+    ).result;
 
     await connector2.relationshipTemplates.loadPeerRelationshipTemplate({ reference: template.truncatedReference });
 
-    const relationship = (await connector2.relationships.createRelationship({ templateId: template.id, content: {} })).result;
+    const relationship = (
+        await connector2.relationships.createRelationship({
+            templateId: template.id,
+            creationContent: { "@type": "ArbitraryRelationshipCreationContent", value: {} }
+        })
+    ).result;
 
     await connector1.account.sync();
 
-    const accepted = (await connector1.relationships.acceptRelationshipChange(relationship.id, relationship.changes[0].id)).result;
+    const accepted = (await connector1.relationships.acceptRelationship(relationship.id)).result;
     console.log(accepted);
 
     await connector2.account.sync();

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -85,7 +85,7 @@
         "@js-soft/node-logger": "1.2.0",
         "@js-soft/ts-utils": "^2.3.3",
         "@nmshd/iql": "^1.0.2",
-        "@nmshd/runtime": "5.0.0-alpha.9",
+        "@nmshd/runtime": "5.0.0",
         "agentkeepalive": "4.5.0",
         "amqplib": "^0.10.4",
         "axios": "^1.7.4",

diff --git a/packages/sdk/_examples/relationships.ts b/packages/sdk/_examples/relationships.ts
@@ -8,17 +8,17 @@ async function run() {
 
     const createdRelationship = await client.relationships.createRelationship({
         templateId: "RLT_________________",
-        content: {
-            prop1: "value",
-            prop2: 1
+        creationContent: {
+            "@type": "ArbitraryRelationshipCreationContent",
+            value: {
+                prop1: "value",
+                prop2: 1
+            }
         }
     });
     console.log(createdRelationship);
 
-    const syncedRelationships = await client.account.sync();
-    const relationship = syncedRelationships.result!.relationships[0];
-
-    const acceptedRelationship = await client.relationships.acceptRelationshipChange(relationship.id, relationship.changes[0].id, { content: { a: "b" } });
+    const acceptedRelationship = await client.relationships.acceptRelationship("REL_________________");
     console.log(acceptedRelationship);
 }
 

diff --git a/packages/sdk/src/endpoints/AccountEndpoint.ts b/packages/sdk/src/endpoints/AccountEndpoint.ts
@@ -1,16 +1,16 @@
-import { ConnectorResponse, ConnectorSyncInfo, IdentityInfo } from "../types";
+import { ConnectorHttpResponse, ConnectorSyncInfo, IdentityInfo } from "../types";
 import { Endpoint } from "./Endpoint";
 
 export class AccountEndpoint extends Endpoint {
-    public async getIdentityInfo(): Promise<ConnectorResponse<IdentityInfo>> {
+    public async getIdentityInfo(): Promise<ConnectorHttpResponse<IdentityInfo>> {
         return await this.get("/api/v2/Account/IdentityInfo");
     }
 
-    public async sync(): Promise<ConnectorResponse<void>> {
+    public async sync(): Promise<ConnectorHttpResponse<void>> {
         return await this.post("/api/v2/Account/Sync", undefined, 204);
     }
 
-    public async getSyncInfo(): Promise<ConnectorResponse<ConnectorSyncInfo>> {
+    public async getSyncInfo(): Promise<ConnectorHttpResponse<ConnectorSyncInfo>> {
         return await this.get("/api/v2/Account/SyncInfo");
     }
 }