dualsense-ts 6.1.0 → 6.1.2

package/README.md

@@ -37,13 +37,15 @@ If the device disconnects, `dualsense-ts` will quietly wait for it to come back.
 
 ```typescript
 controller.connection.on("change", ({ active }) => {
-  console.log(`controller ${active ? '' : 'dis'}connected`)
+  console.log(`controller ${active ? "" : "dis"}connected`);
 });
 
-controller.connection.active // returns true while the controller is available
-controller.wireless // returns true while connected over bluetooth
+controller.connection.active; // returns true while the controller is available
+controller.wireless; // returns true while connected over bluetooth
 ```
 
+When the user switches from wired to wireless or vice versa, `dualsense-ts` will reconnect to the same device seamlessly.
+
 ### Input APIs
 
 `dualsense-ts` provides several interfaces for reading input:
@@ -361,9 +363,9 @@ If something seems wrong, use the debugger to view the report buffer. Collect a
 
 ## Other Dualsense Variants
 
-The Dualsense FlexStrike and Dualsense Access controllers are not yet supported. This functionality is on the roadmap.
+The DualSense FlexStrike, DualSense Edge, and DualSense Access controllers are not yet supported. This functionality is on the roadmap.
 
-The PS4 Dualshock controller is not supported.
+The PS4 DualShock controller is not supported.
 
 ## Multiplayer
 

package/dist/hid/node_hid_provider.d.ts

@@ -6,6 +6,7 @@ export declare class NodeHIDProvider extends HIDProvider {
     device?: HID;
     wireless?: boolean;
     buffer?: Buffer;
+    private connecting;
     connect(): Promise<void>;
     write(data: Uint8Array): Promise<void>;
     get connected(): boolean;

package/dist/hid/node_hid_provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node_hid_provider.d.ts","sourceRoot":"","sources":["../../src/hid/node_hid_provider.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEhE,qBAAa,eAAgB,SAAQ,WAAW;IACvC,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEjB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgD9B,KAAK,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAMtC,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,UAAU,IAAI,IAAI;IAQlB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB;CAY3C"}
+{"version":3,"file":"node_hid_provider.d.ts","sourceRoot":"","sources":["../../src/hid/node_hid_provider.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEhE,qBAAa,eAAgB,SAAQ,WAAW;IACvC,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEvB,OAAO,CAAC,UAAU,CAAS;IAErB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA8D9B,KAAK,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAMtC,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,UAAU,IAAI,IAAI;IAQlB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB;CAY3C"}

package/dist/hid/node_hid_provider.js

@@ -26,11 +26,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeHIDProvider = void 0;
 const hid_provider_1 = require("./hid_provider");
 class NodeHIDProvider extends hid_provider_1.HIDProvider {
+    constructor() {
+        super(...arguments);
+        this.connecting = false;
+    }
     async connect() {
+        if (this.connecting)
+            return;
         if (typeof window !== "undefined")
             return this.onError(new Error("Attempted to use node-hid in browser environment"));
-        return Promise.resolve().then(() => __importStar(require("node-hid"))).then(({ HID, devices }) => {
+        this.connecting = true;
+        let nodeHid;
+        try {
+            nodeHid = await Promise.resolve().then(() => __importStar(require("node-hid")));
+        }
+        catch (err) {
+            this.connecting = false;
+            return this.onError(new Error(`Could not import 'node-hid'. Did you add it?\nError: ${err instanceof Error ? err.message : "???"}`));
+        }
+        try {
             this.disconnect();
+            const { HID, devices } = nodeHid;
             const controllers = devices(hid_provider_1.HIDProvider.vendorId, hid_provider_1.HIDProvider.productId);
             if (controllers.length === 0 || !controllers[0].path) {
                 return this.onError(new Error(`No controllers (${devices().length} other devices)`));
@@ -45,13 +61,17 @@ class NodeHIDProvider extends hid_provider_1.HIDProvider {
                 this.onData(this.process(arg));
             });
             device.on("error", (err) => {
+                this.disconnect();
                 this.onError(err);
             });
             this.device = device;
-        })
-            .catch((err) => {
-            this.onError(new Error(`Could not import 'node-hid'. Did you add it?\nError: ${err instanceof Error ? err.message : "???"}`));
-        });
+        }
+        catch (err) {
+            this.onError(err instanceof Error ? err : new Error(String(err)));
+        }
+        finally {
+            this.connecting = false;
+        }
     }
     write(data) {
         if (!this.device)

package/dist/hid/node_hid_provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"node_hid_provider.js","sourceRoot":"","sources":["../../src/hid/node_hid_provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"node_hid_provider.js","sourceRoot":"","sources":["../../src/hid/node_hid_provider.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dualsense-ts",
-  "version": "6.1.0",
+  "version": "6.1.2",
   "description": "A natural interface for your DualSense controller, with Typescript",
   "keywords": [
     "dualsense",

package/src/hid/node_hid_provider.ts

@@ -7,52 +7,68 @@ export class NodeHIDProvider extends HIDProvider {
   public wireless?: boolean;
   public buffer?: Buffer;
 
+  private connecting = false;
+
   async connect(): Promise<void> {
+    if (this.connecting) return;
     if (typeof window !== "undefined")
       return this.onError(
         new Error("Attempted to use node-hid in browser environment")
       );
 
-    return import("node-hid")
-      .then(({ HID, devices }) => {
-        this.disconnect();
-        const controllers = devices(
-          HIDProvider.vendorId,
-          HIDProvider.productId
-        );
-        if (controllers.length === 0 || !controllers[0].path) {
-          return this.onError(
-            new Error(`No controllers (${devices().length} other devices)`)
-          );
-        }
+    this.connecting = true;
+    let nodeHid: typeof import("node-hid");
+    try {
+      nodeHid = await import("node-hid");
+    } catch (err) {
+      this.connecting = false;
+      return this.onError(
+        new Error(
+          `Could not import 'node-hid'. Did you add it?\nError: ${
+            err instanceof Error ? err.message : "???"
+          }`
+        )
+      );
+    }
 
-        // Detect connection type
-        this.wireless = controllers[0].interface === -1;
+    try {
+      this.disconnect();
+      const { HID, devices } = nodeHid;
+      const controllers = devices(
+        HIDProvider.vendorId,
+        HIDProvider.productId
+      );
+      if (controllers.length === 0 || !controllers[0].path) {
+        return this.onError(
+          new Error(`No controllers (${devices().length} other devices)`)
+        );
+      }
 
-        const device = new HID(controllers[0].path);
+      // Detect connection type
+      this.wireless = controllers[0].interface === -1;
 
-        // Enable accelerometer, gyro, touchpad
-        device.getFeatureReport(0x05, 41);
+      const device = new HID(controllers[0].path);
 
-        device.on("data", (arg: Buffer) => {
-          this.buffer = arg;
-          this.onData(this.process(arg));
-        });
-        device.on("error", (err: Error) => {
-          this.onError(err);
-        });
+      // Enable accelerometer, gyro, touchpad
+      device.getFeatureReport(0x05, 41);
 
-        this.device = device;
-      })
-      .catch((err) => {
-        this.onError(
-          new Error(
-            `Could not import 'node-hid'. Did you add it?\nError: ${
-              err instanceof Error ? err.message : "???"
-            }`
-          )
-        );
+      device.on("data", (arg: Buffer) => {
+        this.buffer = arg;
+        this.onData(this.process(arg));
+      });
+      device.on("error", (err: Error) => {
+        this.disconnect();
+        this.onError(err);
       });
+
+      this.device = device;
+    } catch (err) {
+      this.onError(
+        err instanceof Error ? err : new Error(String(err))
+      );
+    } finally {
+      this.connecting = false;
+    }
   }
 
   write(data: Uint8Array): Promise<void> {

package/webhid_example/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/dualsense-ts/static/css/main.9393bbb9.css",
-    "main.js": "/dualsense-ts/static/js/main.53ce5f89.js",
+    "main.js": "/dualsense-ts/static/js/main.cc2a5794.js",
     "blueprint-icons-all-paths-loader.js": "/dualsense-ts/static/js/blueprint-icons-all-paths-loader.53883a20.chunk.js",
     "blueprint-icons-split-paths-by-size-loader.js": "/dualsense-ts/static/js/blueprint-icons-split-paths-by-size-loader.6d8a31ce.chunk.js",
     "static/js/787.b12b0301.chunk.js": "/dualsense-ts/static/js/787.b12b0301.chunk.js",
@@ -18,7 +18,7 @@
     "static/media/blueprint-icons-16.woff2?": "/dualsense-ts/static/media/blueprint-icons-16.582f87288ff1d1f0dfae.woff2",
     "index.html": "/dualsense-ts/index.html",
     "main.9393bbb9.css.map": "/dualsense-ts/static/css/main.9393bbb9.css.map",
-    "main.53ce5f89.js.map": "/dualsense-ts/static/js/main.53ce5f89.js.map",
+    "main.cc2a5794.js.map": "/dualsense-ts/static/js/main.cc2a5794.js.map",
     "blueprint-icons-all-paths-loader.53883a20.chunk.js.map": "/dualsense-ts/static/js/blueprint-icons-all-paths-loader.53883a20.chunk.js.map",
     "blueprint-icons-split-paths-by-size-loader.6d8a31ce.chunk.js.map": "/dualsense-ts/static/js/blueprint-icons-split-paths-by-size-loader.6d8a31ce.chunk.js.map",
     "787.b12b0301.chunk.js.map": "/dualsense-ts/static/js/787.b12b0301.chunk.js.map",
@@ -28,6 +28,6 @@
   },
   "entrypoints": [
     "static/css/main.9393bbb9.css",
-    "static/js/main.53ce5f89.js"
+    "static/js/main.cc2a5794.js"
   ]
 }

package/webhid_example/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/dualsense-ts/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/dualsense-ts/manifest.json"/><script type="text/javascript">!function(n){if("/"===n.search[1]){var a=n.search.slice(1).split("&").map((function(n){return n.replace(/~and~/g,"&")})).join("?");window.history.replaceState(null,null,n.pathname.slice(0,-1)+a+n.hash)}}(window.location)</script><title>dualsense-ts</title><script defer="defer" src="/dualsense-ts/static/js/main.53ce5f89.js"></script><link href="/dualsense-ts/static/css/main.9393bbb9.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/dualsense-ts/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/dualsense-ts/manifest.json"/><script type="text/javascript">!function(n){if("/"===n.search[1]){var a=n.search.slice(1).split("&").map((function(n){return n.replace(/~and~/g,"&")})).join("?");window.history.replaceState(null,null,n.pathname.slice(0,-1)+a+n.hash)}}(window.location)</script><title>dualsense-ts</title><script defer="defer" src="/dualsense-ts/static/js/main.cc2a5794.js"></script><link href="/dualsense-ts/static/css/main.9393bbb9.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>