From 968b9c3a0fd4dde5547feb53c0f57fa185a66cd5 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Sat, 21 Oct 2023 14:16:52 +0100
Subject: [PATCH] update collaboration

---
 client/package.json                                |  2 +-
 server/package.json                                |  4 ++--
 .../src/collaboration/adapter/collab-ws.adapter.ts | 14 +++++++++-----
 server/src/collaboration/collaboration.gateway.ts  |  2 +-
 server/src/collaboration/collaboration.module.ts   |  4 ++--
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/client/package.json b/client/package.json
index 9e245c82..1aa51ca0 100644
--- a/client/package.json
+++ b/client/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview --port 3000"
   },
   "dependencies": {
-    "@hocuspocus/provider": "^2.7.0",
+    "@hocuspocus/provider": "^2.7.1",
     "@mantine/core": "^7.1.5",
     "@mantine/form": "^7.1.5",
     "@mantine/hooks": "^7.1.5",
diff --git a/server/package.json b/server/package.json
index 2630c2f0..8b013f87 100644
--- a/server/package.json
+++ b/server/package.json
@@ -29,8 +29,8 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.431.0",
     "@aws-sdk/s3-request-presigner": "^3.431.0",
-    "@hocuspocus/server": "^2.7.0",
-    "@hocuspocus/transformer": "^2.7.0",
+    "@hocuspocus/server": "^2.7.1",
+    "@hocuspocus/transformer": "^2.7.1",
     "@nestjs/common": "^10.2.7",
     "@nestjs/config": "^3.1.1",
     "@nestjs/core": "^10.2.7",
diff --git a/server/src/collaboration/adapter/collab-ws.adapter.ts b/server/src/collaboration/adapter/collab-ws.adapter.ts
index 8a821ba9..b13005f4 100644
--- a/server/src/collaboration/adapter/collab-ws.adapter.ts
+++ b/server/src/collaboration/adapter/collab-ws.adapter.ts
@@ -30,10 +30,14 @@ export class CollabWsAdapter {
     return this.wss;
   }
 
-  public close() {
-    this.wss.clients.forEach((client) => {
-      client.terminate();
-    });
-    this.wss.close();
+  public destroy() {
+    try {
+      this.wss.clients.forEach((client) => {
+        client.terminate();
+      });
+      this.wss.close();
+    } catch (err) {
+      console.error(err);
+    }
   }
 }
diff --git a/server/src/collaboration/collaboration.gateway.ts b/server/src/collaboration/collaboration.gateway.ts
index 983d7d3d..e6af562c 100644
--- a/server/src/collaboration/collaboration.gateway.ts
+++ b/server/src/collaboration/collaboration.gateway.ts
@@ -22,7 +22,7 @@ export class CollaborationGateway {
     this.hocuspocus.handleConnection(client, request);
   }
 
-  handleDestroy() {
+  destroy() {
     this.hocuspocus.destroy();
   }
 }
diff --git a/server/src/collaboration/collaboration.module.ts b/server/src/collaboration/collaboration.module.ts
index 3b607883..7966ec72 100644
--- a/server/src/collaboration/collaboration.module.ts
+++ b/server/src/collaboration/collaboration.module.ts
@@ -39,7 +39,7 @@ export class CollaborationModule implements OnModuleInit, OnModuleDestroy {
   }
 
   onModuleDestroy(): any {
-    this.collaborationGateway.handleDestroy();
-    this.collabWsAdapter.close();
+    this.collaborationGateway.destroy();
+    this.collabWsAdapter.destroy();
   }
 }