Merge pull request #175 from nmshd/release/v5

Release v5
nmshd · Aug 30, 2024 · 21fa1ba · 21fa1ba
2 parents fcd86b3 + 9836926
commit 21fa1ba
Show file tree

Hide file tree

Showing 95 changed files with 2,973 additions and 3,518 deletions.
diff --git a/.ci/runChecks.sh b/.ci/runChecks.sh
@@ -11,4 +11,4 @@ npm run lint:prettier
 
 # auditing
 npx license-check --ignoreRegex @nmshd/connector
-npx better-npm-audit audit --exclude 1093639,1096302
+npx better-npm-audit audit --exclude 1096302,1098681,1093639
diff --git a/.dev/.env.local b/.dev/.env.local
@@ -1,5 +1,6 @@
 # required - the information below is used to connect to the backbone
 transportLibrary__baseUrl="http://host.docker.internal:8090"
+transportLibrary__addressGenerationHostnameOverride="localhost"
 transportLibrary__platformClientId="test"
 transportLibrary__platformClientSecret="test"
 

diff --git a/.dev/appsettings.override.json b/.dev/appsettings.override.json
@@ -53,6 +53,9 @@
                         }
                     }
                 }
+            },
+            "Application": {
+                "didDomainName": "localhost"
             }
         },
         "Files": {
@@ -73,6 +76,9 @@
                     "Provider": "Postgres",
                     "ConnectionString": "User ID=messages;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;"
                 }
+            },
+            "Application": {
+                "didDomainName": "localhost"
             }
         },
         "Relationships": {
@@ -81,6 +87,9 @@
                     "Provider": "Postgres",
                     "ConnectionString": "User ID=relationships;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;"
                 }
+            },
+            "Application": {
+                "didDomainName": "localhost"
             }
         },
         "Synchronization": {

diff --git a/.dev/compose.backbone.env b/.dev/compose.backbone.env
@@ -1 +1 @@
-BACKBONE_VERSION=5.9.1
+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/compose.yml b/.dev/compose.yml
@@ -14,6 +14,7 @@ services:
       - SYNC_ENABLED=${SYNC_ENABLED:-false}
       - DATABASE_NAME=${DATABASE_NAME_PREFIX:-connector}-1
       - transportLibrary__baseUrl
+      - transportLibrary__addressGenerationHostnameOverride
       - transportLibrary__platformClientId
       - transportLibrary__platformClientSecret
       - modules__sse__enabled=${modules__sse__enabled:-false}
@@ -42,6 +43,7 @@ services:
       - SYNC_ENABLED=${SYNC_ENABLED:-false}
       - DATABASE_NAME=${DATABASE_NAME_PREFIX:-connector}-2
       - transportLibrary__baseUrl
+      - transportLibrary__addressGenerationHostnameOverride
       - transportLibrary__platformClientId
       - transportLibrary__platformClientSecret
       - modules__sse__enabled=${modules__sse__enabled:-false}

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/.vscode/settings.json b/.vscode/settings.json
@@ -29,5 +29,6 @@
     "jest.runMode": "on-demand",
     "jest.nodeEnv": {
         "DATABASE_CONNECTION_STRING": "mongodb://localhost:27018"
-    }
+    },
+    "typescript.tsdk": "node_modules/typescript/lib"
 }
diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,6 @@ RUN npm run build
 RUN .ci/writeBuildInformation.sh
 
 FROM node:22.7.0-alpine
-ENV NODE_CONFIG_ENV=prod
 RUN apk add --no-cache tini
 RUN apk add libcap && setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/node && apk del libcap
 

diff --git a/config.schema.json b/config.schema.json
@@ -85,14 +85,23 @@
                     },
                     "type": "object"
                 },
-                "autoAcceptRelationshipCreationChanges": {
+                "autoAcceptPendingRelationships": {
                     "additionalProperties": false,
                     "properties": {
                         "enabled": {
                             "type": "boolean",
                             "default": false
-                        },
-                        "responseContent": {}
+                        }
+                    },
+                    "type": "object"
+                },
+                "autoDecomposeDeletionProposedRelationships": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean",
+                            "default": false
+                        }
                     },
                     "type": "object"
                 },

diff --git a/config/default.json b/config/default.json
@@ -68,12 +68,15 @@
             "displayName": "Attribute Listener",
             "location": "@nmshd/runtime:AttributeListenerModule"
         },
-        "autoAcceptRelationshipCreationChanges": {
-            "displayName": "Auto Accept Relationship Creation Changes",
-            "location": "autoAcceptRelationshipCreationChanges/AutoAcceptRelationshipCreationChangesModule",
-            "enabled": false,
-
-            "responseContent": {}
+        "autoAcceptPendingRelationships": {
+            "displayName": "Auto Accept Pending Relationships",
+            "location": "autoAcceptPendingRelationships/AutoAcceptPendingRelationshipsModule",
+            "enabled": false
+        },
+        "autoDecomposeDeletionProposedRelationships": {
+            "displayName": "Auto Decompose DeletionProposed Relationships",
+            "location": "autoDecomposeDeletionProposedRelationships/AutoDecomposeDeletionProposedRelationshipsModule",
+            "enabled": false
         },
         "coreHttpApi": {
             "displayName": "Core HTTP API",
@@ -96,19 +99,6 @@
             "targets": {},
             "webhooks": []
         },
-        "amqpPublisher": {
-            "enabled": false,
-            "displayName": "AMQP Publisher",
-            "location": "amqpPublisher/AMQPPublisherModule"
-        },
-        "PubSubPublisher": {
-            "enabled": false,
-            "displayName": "PubSub Publisher",
-            "location": "pubSubPublisher/PubSubPublisherModule",
-            "projectId": "",
-            "topic": "",
-            "keyFile": ""
-        },
         "messageBrokerPublisher": {
             "enabled": false,
             "displayName": "Message Broker Publisher",

diff --git a/config/prod.json b/config/prod.json