buttplug 3.2.1 → 3.2.2

package/.yarnrc.yml

@@ -1 +1,5 @@
+compressionLevel: mixed
+
+enableGlobalCache: false
+
 nodeLinker: node-modules

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v3.2.2 (2024/03/02)
+
+## Bugfixes
+
+- Actually throw exceptions when there are websocket connection issues. (#257)
+
 # v3.2.1 (2023/09/23)
 
 ## Bugfixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "buttplug",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "Buttplug Client Implementation for Typescript/Javascript",
   "homepage": "https://github.com/buttplugio/buttplug-js/",
   "repository": {
@@ -32,38 +32,38 @@
   "dependencies": {
     "class-transformer": "^0.5.1",
     "eventemitter3": "^5.0.1",
-    "reflect-metadata": "^0.1.13",
-    "ws": "^8.14.2"
+    "reflect-metadata": "^0.2.1",
+    "ws": "^8.16.0"
   },
   "devDependencies": {
     "@types/commander": "^2.12.2",
-    "@types/expect-puppeteer": "^5.0.4",
-    "@types/jest": "^29.5.5",
-    "@types/jest-environment-puppeteer": "^5.0.4",
-    "@types/node": "^20.6.3",
-    "@types/uuid-parse": "^1.0.0",
-    "@types/ws": "^8.5.5",
-    "@typescript-eslint/eslint-plugin": "^6.7.2",
-    "@typescript-eslint/parser": "^6.7.2",
+    "@types/expect-puppeteer": "^5.0.6",
+    "@types/jest": "^29.5.12",
+    "@types/jest-environment-puppeteer": "^5.0.6",
+    "@types/node": "^20.11.24",
+    "@types/uuid-parse": "^1.0.2",
+    "@types/ws": "^8.5.10",
+    "@typescript-eslint/eslint-plugin": "^7.1.0",
+    "@typescript-eslint/parser": "^7.1.0",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.50.0",
+    "eslint": "^8.57.0",
     "eslint-plugin-node": "^11.1.0",
-    "gts": "^5.0.1",
+    "gts": "^5.2.0",
     "jest": "^29.7.0",
     "mock-socket": "^9.3.1",
     "pkg": "^5.8.1",
-    "tmp": "^0.2.1",
+    "tmp": "^0.2.3",
     "trash": "^8.1.1",
     "trash-cli": "^5.0.0",
-    "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.1",
+    "ts-jest": "^29.1.2",
+    "ts-node": "^10.9.2",
     "tslib": "^2.6.2",
-    "typedoc": "^0.25.1",
-    "typescript": "^5.2.2",
-    "vite": "^4.4.9",
-    "vite-plugin-dts": "^3.5.4",
-    "yarn": "^1.22.19"
+    "typedoc": "^0.25.9",
+    "typescript": "^5.3.3",
+    "vite": "^5.1.4",
+    "vite-plugin-dts": "^3.7.3",
+    "yarn": "^1.22.21"
   },
   "jest": {
     "moduleFileExtensions": [

package/src/utils/ButtplugBrowserWebsocketConnector.ts

@@ -25,35 +25,32 @@ export class ButtplugBrowserWebsocketConnector extends EventEmitter {
   }
 
   public connect = async (): Promise<void> => {
-    const ws = new (this._websocketConstructor ?? WebSocket)(this._url);
-    let res;
-    let rej;
-    const p = new Promise<void>((resolve, reject) => {
-      res = resolve;
-      rej = reject;
-    });
-    // In websockets, our error rarely tells us much, as for security reasons
-    // browsers usually only throw Error Code 1006. It's up to those using this
-    // library to state what the problem might be.
-    const conErrorCallback = () => rej();
-    ws.addEventListener('open', async () => {
-      this._ws = ws;
-      try {
-        await this.initialize();
-        this._ws.addEventListener('message', (msg) => {
-          this.parseIncomingMessage(msg);
-        });
-        this._ws.removeEventListener('close', conErrorCallback);
-        this._ws.addEventListener('close', this.disconnect);
-        // TODO This doesn't really communicate the chain why our initializer failed
-        res();
-      } catch (e) {
-        console.log(e);
-        rej();
-      }
+    return new Promise<void>((resolve, reject) => {
+      const ws = new (this._websocketConstructor ?? WebSocket)(this._url);
+      const onErrorCallback = (event: Event) => {reject(event)}
+      const onCloseCallback = (event: CloseEvent) => reject(event.reason)
+      ws.addEventListener('open', async () => {
+        this._ws = ws;
+        try {
+          await this.initialize();
+          this._ws.addEventListener('message', (msg) => {
+            this.parseIncomingMessage(msg);
+          });
+          this._ws.removeEventListener('close', onCloseCallback);
+          this._ws.removeEventListener('error', onErrorCallback);
+          this._ws.addEventListener('close', this.disconnect);
+          resolve();
+        } catch (e) {
+          reject(e);
+        }
+      });
+      // In websockets, our error rarely tells us much, as for security reasons
+      // browsers usually only throw Error Code 1006. It's up to those using this
+      // library to state what the problem might be.
+
+      ws.addEventListener('error', onErrorCallback)
+      ws.addEventListener('close', onCloseCallback);
     });
-    ws.addEventListener('close', conErrorCallback);
-    return p;
   };
 
   public disconnect = async (): Promise<void> => {