From e48c2be14fb1474beb1993cd09e4f42aec51b1a8 Mon Sep 17 00:00:00 2001
From: RblSb <msrblsb@gmail.com>
Date: Sun, 19 Dec 2021 05:51:20 +0300
Subject: Update ws library and lockfile version

closes #34
---
 build/server.js    |  2 +-
 package-lock.json  | 39 +++++++++++++++++++++++++++++++++++----
 package.json       |  2 +-
 src/server/Main.hx |  4 ++--
 4 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/build/server.js b/build/server.js
index d256692..15e5106 100644
--- a/build/server.js
+++ b/build/server.js
@@ -4291,7 +4291,7 @@ server_Main.prototype = {
 		});
 		this.onMessage(client,{ type : "Connected"},true);
 		ws.on("message",function(data) {
-			var obj = _gthis.wsEventParser.fromJson(data);
+			var obj = _gthis.wsEventParser.fromJson(data.toString());
 			if(_gthis.wsEventParser.errors.length > 0 || _gthis.noTypeObj(obj)) {
 				var errors = "" + ("Wrong request for type \"" + obj.type + "\":") + "\n" + json2object_ErrorUtils.convertErrorArray(_gthis.wsEventParser.errors);
 				haxe_Log.trace(errors,{ fileName : "src/server/Main.hx", lineNumber : 376, className : "server.Main", methodName : "onConnect"});
diff --git a/package-lock.json b/package-lock.json
index 9c8dcb9..08020bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,13 +1,44 @@
 {
   "name": "synctube",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "synctube",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "ws": "^8.3.0"
+      }
+    },
+    "node_modules/ws": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.3.0.tgz",
+      "integrity": "sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    }
+  },
   "dependencies": {
     "ws": {
-      "version": "7.4.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
-      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.3.0.tgz",
+      "integrity": "sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==",
+      "requires": {}
     }
   }
 }
diff --git a/package.json b/package.json
index 8c8febb..4fbbc46 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,6 @@
   },
   "homepage": "https://github.com/RblSb/SyncTube#readme",
   "dependencies": {
-    "ws": "^7.4.6"
+    "ws": "^8.3.0"
   }
 }
diff --git a/src/server/Main.hx b/src/server/Main.hx
index 7a1b06a..bef889a 100644
--- a/src/server/Main.hx
+++ b/src/server/Main.hx
@@ -367,8 +367,8 @@ class Main {
 			type: Connected
 		}, true);
 
-		ws.on("message", data -> {
-			final obj = wsEventParser.fromJson(data);
+		ws.on("message", (data:js.node.Buffer) -> {
+			final obj = wsEventParser.fromJson(data.toString());
 			if (wsEventParser.errors.length > 0 || noTypeObj(obj)) {
 				final line = 'Wrong request for type "${obj.type}":';
 				final errorLines = ErrorUtils.convertErrorArray(wsEventParser.errors);
-- 
cgit v1.2.3