From 608a76e1409497c404ff3264ca6abfb39b2bc91e Mon Sep 17 00:00:00 2001
From: clemos <cl3mos@gmail.com>
Date: Fri, 23 Jun 2023 09:44:02 +0200
Subject: [PATCH] bump ws to 8.13.0

---
 bin/server.js     |  7 +++----
 package-lock.json | 21 ++++++++++++---------
 package.json      |  2 +-
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/bin/server.js b/bin/server.js
index 485f2ca..7d9c585 100755
--- a/bin/server.js
+++ b/bin/server.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import ws from 'ws'
+import { WebSocketServer } from 'ws'
 import http from 'http'
 import * as map from 'lib0/map'
 
@@ -12,8 +12,7 @@ const wsReadyStateClosed = 3 // eslint-disable-line
 const pingTimeout = 30000
 
 const port = process.env.PORT || 4444
-// @ts-ignore
-const wss = new ws.Server({ noServer: true })
+const wss = new WebSocketServer({ noServer: true })
 
 const server = http.createServer((request, response) => {
   response.writeHead(200, { 'Content-Type': 'text/plain' })
@@ -81,7 +80,7 @@ const onconnection = conn => {
     closed = true
   })
   conn.on('message', /** @param {object} message */ message => {
-    if (typeof message === 'string') {
+    if (typeof message === 'string' || message instanceof Buffer) {
       message = JSON.parse(message)
     }
     if (message && message.type && !closed) {
diff --git a/package-lock.json b/package-lock.json
index 637f18a..64d0252 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,7 +37,10 @@
         "url": "https://github.com/sponsors/dmonad"
       },
       "optionalDependencies": {
-        "ws": "^7.2.0"
+        "ws": "^8.13.0"
+      },
+      "peerDependencies": {
+        "yjs": "^13.5.6"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -3991,16 +3994,16 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
       "optional": true,
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -7113,9 +7116,9 @@
       }
     },
     "ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
       "optional": true,
       "requires": {}
     },
diff --git a/package.json b/package.json
index 2ec16dd..16141a5 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "yjs": "^13.5.6"
   },
   "optionalDependencies": {
-    "ws": "^7.2.0"
+    "ws": "^8.13.0"
   },
   "engines": {
     "node": ">=12"