dualsense-ts 6.2.0 → 6.4.0

package/dist/hid/web_hid_provider.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebHIDProvider = void 0;
 const hid_provider_1 = require("./hid_provider");
+const bt_checksum_1 = require("./bt_checksum");
 class WebHIDProvider extends hid_provider_1.HIDProvider {
     constructor(options = {}) {
         super();
@@ -11,7 +12,8 @@ class WebHIDProvider extends hid_provider_1.HIDProvider {
         this.targetDevice = options.device;
         navigator.hid.addEventListener("disconnect", ({ device }) => {
             if (device === this.device) {
-                this.device = undefined;
+                // Let disconnect() → reset() handle nulling this.device so that
+                // reset() can detect the device was attached and fire onDisconnect.
                 this.disconnect();
             }
         });
@@ -66,15 +68,11 @@ class WebHIDProvider extends hid_provider_1.HIDProvider {
     }
     attach(device) {
         const key = WebHIDProvider.deviceKey(device);
-        if (hid_provider_1.HIDProvider.claimedDevices.has(key)) {
-            return; // Already claimed by another instance
-        }
-        device
-            .open()
+        const openPromise = device.opened ? Promise.resolve() : device.open();
+        openPromise
             .then(() => {
             this.device = device;
             this.deviceId = key;
-            hid_provider_1.HIDProvider.claimedDevices.add(key);
             this.detectConnectionType();
             // Enable accelerometer, gyro, touchpad
             return this.device.receiveFeatureReport(0x05);
@@ -86,12 +84,36 @@ class WebHIDProvider extends hid_provider_1.HIDProvider {
                 this.buffer = data;
                 this.onData(this.process({ reportId, buffer: data }));
             });
+            this.onConnect();
         })
             .catch((err) => {
             this.onError(err);
             this.disconnect();
         });
     }
+    /**
+     * Detach the current HIDDevice (if any) and attach a different one in place.
+     * Used by the manager to transplant a freshly-discovered device into an
+     * existing slot's provider after identity matching, so the consumer's
+     * Dualsense reference survives reconnection.
+     *
+     * The new device must already be open (or openable) — we close the old one,
+     * release its claim, and run the standard attach() flow on the new one.
+     */
+    replaceDevice(device) {
+        // Tear down the existing device without firing the disconnect cascade
+        // (we don't want subscribers to see a disconnect/reconnect blip).
+        if (this.device) {
+            const old = this.device;
+            const oldKey = this.deviceId;
+            this.device = undefined;
+            if (oldKey)
+                hid_provider_1.HIDProvider.claimedDevices.delete(oldKey);
+            // Best-effort close; failures are non-fatal.
+            old.close().catch(() => { });
+        }
+        this.attach(device);
+    }
     /**
      * You need to get HID device permissions from an interactive
      * component, like a button. This returns a callback for triggering
@@ -157,12 +179,61 @@ class WebHIDProvider extends hid_provider_1.HIDProvider {
     }
     disconnect() {
         if (this.device) {
-            this.device.close().finally(() => this.reset());
+            const dev = this.device;
+            // Reset synchronously so claimedDevices is freed immediately —
+            // otherwise a rapid disconnect/reconnect can race: the browser's
+            // connect event arrives before close() resolves, and attach() sees
+            // the key still claimed and silently bails out.
+            this.reset();
+            dev.close().catch(() => { });
         }
         else {
             this.reset();
         }
     }
+    async readFeatureReport(reportId) {
+        if (!this.device)
+            throw new Error("No device connected");
+        const view = await this.device.receiveFeatureReport(reportId);
+        return new Uint8Array(view.buffer, view.byteOffset, view.byteLength);
+    }
+    async sendFeatureReport(reportId, data) {
+        if (!this.device)
+            return;
+        // WebHID sendFeatureReport takes the report ID separately.
+        // data[0] is the report ID (for node-hid compat); strip it for WebHID.
+        const rawPayload = data.slice(1);
+        // Pad to the expected payload length from the HID descriptor
+        const expectedLength = this.getFeatureReportLength(reportId);
+        const payload = expectedLength > 0 && rawPayload.length < expectedLength
+            ? new Uint8Array(expectedLength)
+            : new Uint8Array(rawPayload);
+        if (expectedLength > rawPayload.length) {
+            payload.set(rawPayload);
+        }
+        // Bluetooth requires CRC-32 in the last 4 bytes of the payload
+        if (this.wireless) {
+            const crc = (0, bt_checksum_1.computeFeatureReportChecksum)(reportId, payload);
+            const off = payload.length - 4;
+            payload[off] = crc & 0xff;
+            payload[off + 1] = (crc >>> 8) & 0xff;
+            payload[off + 2] = (crc >>> 16) & 0xff;
+            payload[off + 3] = (crc >>> 24) & 0xff;
+        }
+        await this.device.sendFeatureReport(reportId, payload);
+    }
+    /** Query the HID descriptor for the expected payload length of a feature report */
+    getFeatureReportLength(reportId) {
+        if (!this.device)
+            return 0;
+        for (const c of this.device.collections) {
+            const report = (c.featureReports ?? []).find((r) => r.reportId === reportId);
+            if (report) {
+                return (report.items ?? []).reduce((sum, item) => sum + Math.ceil(((item.reportSize ?? 0) * (item.reportCount ?? 0)) / 8), 0);
+            }
+        }
+        return 0;
+    }
     async write(data) {
         if (!this.device)
             return;

package/dist/hid/web_hid_provider.js.map

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

package/dist/id.d.ts

@@ -45,6 +45,10 @@ export declare const enum InputId {
     BatteryLevel = "BatteryLevel",
     BatteryStatus = "BatteryStatus",
     MuteLed = "MuteLed",
+    /** Whether a microphone is connected to the controller */
+    Microphone = "Microphone",
+    /** Whether headphones are connected to the controller */
+    Headphone = "Headphone",
     /** For placeholder inputs */
     Unknown = "Unknown"
 }

package/dist/id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"id.d.ts","sourceRoot":"","sources":["../src/id.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,0BAAkB,OAAO;IACvB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,WAAW,gBAAgB;IAC3B,IAAI,SAAS;IACb,uCAAuC;IACvC,MAAM,WAAW;IAEjB,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,MAAM,WAAW;IAEjB,IAAI,SAAS;IACb,EAAE,OAAO;IACT,IAAI,SAAS;IACb,IAAI,SAAS;IACb,KAAK,UAAU;IAEf,WAAW,gBAAgB;IAE3B,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,aAAa,kBAAkB;IAC/B,QAAQ,aAAa;IAErB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,aAAa,kBAAkB;IAC/B,QAAQ,aAAa;IAErB,gBAAgB,OAAO;IACvB,iBAAiB,OAAO;IAExB,WAAW,OAAO;IAClB,YAAY,OAAO;IACnB,iBAAiB,aAAa;IAC9B,kBAAkB,aAAa;IAE/B,UAAU,OAAO;IACjB,WAAW,OAAO;IAElB,WAAW,OAAO;IAClB,WAAW,OAAO;IAClB,YAAY,OAAO;IACnB,YAAY,OAAO;IAEnB,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IAEf,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IAEjB,YAAY,iBAAiB;IAC7B,aAAa,kBAAkB;IAC/B,OAAO,YAAY;IAEnB,6BAA6B;IAC7B,OAAO,YAAY;CACpB"}
+{"version":3,"file":"id.d.ts","sourceRoot":"","sources":["../src/id.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,0BAAkB,OAAO;IACvB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,WAAW,gBAAgB;IAC3B,IAAI,SAAS;IACb,uCAAuC;IACvC,MAAM,WAAW;IAEjB,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,MAAM,WAAW;IAEjB,IAAI,SAAS;IACb,EAAE,OAAO;IACT,IAAI,SAAS;IACb,IAAI,SAAS;IACb,KAAK,UAAU;IAEf,WAAW,gBAAgB;IAE3B,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,aAAa,kBAAkB;IAC/B,QAAQ,aAAa;IAErB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,aAAa,kBAAkB;IAC/B,QAAQ,aAAa;IAErB,gBAAgB,OAAO;IACvB,iBAAiB,OAAO;IAExB,WAAW,OAAO;IAClB,YAAY,OAAO;IACnB,iBAAiB,aAAa;IAC9B,kBAAkB,aAAa;IAE/B,UAAU,OAAO;IACjB,WAAW,OAAO;IAElB,WAAW,OAAO;IAClB,WAAW,OAAO;IAClB,YAAY,OAAO;IACnB,YAAY,OAAO;IAEnB,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;IAEf,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IAEjB,YAAY,iBAAiB;IAC7B,aAAa,kBAAkB;IAC/B,OAAO,YAAY;IAEnB,0DAA0D;IAC1D,UAAU,eAAe;IACzB,yDAAyD;IACzD,SAAS,cAAc;IAEvB,6BAA6B;IAC7B,OAAO,YAAY;CACpB"}

package/dist/manager.d.ts

@@ -31,15 +31,22 @@ export declare class DualsenseManager extends Input<DualsenseManagerState> {
     private readonly playerPatterns;
     /** All controller slots, indexed by slot number */
     private readonly slots;
-    /** Map from serial number to slot index, for reconnection matching */
+    /** Map from node-hid serial to slot index — best-effort, used as a fallback */
     private readonly serialToSlot;
+    /** Map from canonical hardware identity to slot index — preferred when available */
+    private readonly identityToSlot;
     /** Discovery polling timer (Node.js only) */
     private discoveryTimer?;
     /** Whether we're running in a browser environment */
     private readonly isBrowser;
     constructor(params?: DualsenseManagerParams);
     get active(): boolean;
-    /** All managed controller instances (including disconnected ones awaiting reconnection) */
+    /**
+     * All managed controller instances (including disconnected ones awaiting
+     * reconnection). Excludes provisional slots whose identity is still being
+     * resolved — those become visible only after firmware info loads, to
+     * avoid surfacing controllers that may be merged into an existing slot.
+     */
     get controllers(): readonly Dualsense[];
     /** Number of managed controllers (including disconnected ones awaiting reconnection) */
     get count(): number;
@@ -47,6 +54,14 @@ export declare class DualsenseManager extends Input<DualsenseManagerState> {
     get(index: number): Dualsense | undefined;
     /** Iterate over all managed controllers */
     [Symbol.iterator](): IterableIterator<Dualsense>;
+    /** Slots that are visible to the consumer (i.e. identity has been resolved) */
+    private publicSlots;
+    /**
+     * True while at least one controller has been discovered but is still
+     * waiting for firmware info to load. Useful for showing a "connecting"
+     * state in the UI without surfacing the unresolved slot itself.
+     */
+    get pending(): boolean;
     /**
      * Override the player LED pattern for a given slot index.
      * @param index Slot index (0-based)
@@ -75,14 +90,52 @@ export declare class DualsenseManager extends Input<DualsenseManagerState> {
      * allowing the user to select multiple controllers at once.
      */
     getRequest(): () => Promise<void>;
+    /** Previous state snapshot, for deduplication */
+    private lastActive;
+    private lastPlayerCount;
+    /** Fingerprint of the last published player set (slot indices + connected flags) */
+    private lastPlayerKey;
     /** Build a new state snapshot and push it through InputSet */
     private updateState;
-    /** Create a Dualsense instance and register it in a slot */
+    /**
+     * Create a Dualsense instance and register it in a (provisional) slot.
+     * The caller is responsible for opening the device on the provider — the
+     * manager treats this as the *only* path that opens new devices, so
+     * identity matching can run before the slot becomes visible.
+     *
+     * Note: identity is the sole reconnection key. We do NOT key on node-hid's
+     * serialNumber because it's frequently missing or wrong (especially over
+     * Bluetooth on Linux). Path is tracked only so we can re-target the same
+     * device on transplant.
+     */
     private createSlot;
+    /**
+     * Called when a slot's HID layer has finished reading firmware/factory info.
+     * If the resolved identity matches a *different* (disconnected) slot, the
+     * underlying device is transplanted into that slot's existing provider so
+     * the consumer's Dualsense reference is preserved across reconnect.
+     */
+    private handleSlotReady;
+    /** Mark a slot as visible to consumers and publish state */
+    private promoteSlot;
+    /**
+     * Move the device handle from `from` into `into`'s existing provider so
+     * the existing Dualsense instance reconnects in place. Then remove `from`.
+     */
+    private transplant;
+    /** Remove a slot without firing the player-LED reshuffle */
+    private dropSlot;
     private startNodeDiscovery;
-    /** Handle a newly discovered device from enumeration */
+    /**
+     * Handle a newly discovered device from enumeration. Opens the device on
+     * a fresh provider, which adds it to `claimedDevices` so subsequent polls
+     * skip it. Identity matching (and any merge into a disconnected slot)
+     * happens later, once firmware info has been read.
+     */
     private processDiscoveredDevice;
     private startWebDiscovery;
+    /** HIDDevice objects we've already handed to a provider */
+    private readonly knownWebDevices;
     private addWebDevice;
 }
 //# sourceMappingURL=manager.d.ts.map

package/dist/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,KAAK,EAAY,WAAW,EAAE,MAAM,SAAS,CAAC;AAmBvD,mEAAmE;AACnE,MAAM,WAAW,qBAAqB;IACpC,gDAAgD;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,mEAAmE;IACnE,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACzC;AA4CD,wCAAwC;AACxC,MAAM,WAAW,sBAAuB,SAAQ,WAAW;IACzD,kFAAkF;IAClF,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,yEAAyE;IACzE,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED;;;;;;;GAOG;AACH,qBAAa,gBAAiB,SAAQ,KAAK,CAAC,qBAAqB,CAAC;IAChE,yDAAyD;IAClD,KAAK,EAAE,qBAAqB,CAGjC;IAEF,+DAA+D;IACxD,oBAAoB,EAAE,OAAO,CAAC;IAErC,gEAAgE;IAChE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA0C;IAEzE,mDAAmD;IACnD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAwB;IAE9C,sEAAsE;IACtE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA6B;IAE1D,6CAA6C;IAC7C,OAAO,CAAC,cAAc,CAAC,CAAiC;IAExD,qDAAqD;IACrD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA0C;gBAExD,MAAM,GAAE,sBAA2B;IAgB/C,IAAW,MAAM,IAAI,OAAO,CAE3B;IAED,2FAA2F;IAC3F,IAAW,WAAW,IAAI,SAAS,SAAS,EAAE,CAE7C;IAED,wFAAwF;IACxF,IAAW,KAAK,IAAI,MAAM,CAEzB;IAED,qCAAqC;IAC9B,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAIhD,2CAA2C;IAC3C,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,SAAS,CAAC;IAIhD;;;;OAIG;IACI,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAU7D,wDAAwD;IACjD,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAI9C;;;;OAIG;IACI,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IA+BnC;;;OAGG;IACI,mBAAmB,IAAI,IAAI;IASlC;;OAEG;IACI,OAAO,IAAI,IAAI;IAYtB;;;OAGG;IACI,UAAU,IAAI,MAAM,OAAO,CAAC,IAAI,CAAC;IAYxC,8DAA8D;IAC9D,OAAO,CAAC,WAAW;IAcnB,4DAA4D;IAC5D,OAAO,CAAC,UAAU;IA8DlB,OAAO,CAAC,kBAAkB;IAkB1B,wDAAwD;IACxD,OAAO,CAAC,uBAAuB;IA8B/B,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,YAAY;CAUrB"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,KAAK,EAAY,WAAW,EAAE,MAAM,SAAS,CAAC;AAmCvD,mEAAmE;AACnE,MAAM,WAAW,qBAAqB;IACpC,gDAAgD;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,mEAAmE;IACnE,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACzC;AA4CD,wCAAwC;AACxC,MAAM,WAAW,sBAAuB,SAAQ,WAAW;IACzD,kFAAkF;IAClF,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,yEAAyE;IACzE,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED;;;;;;;GAOG;AACH,qBAAa,gBAAiB,SAAQ,KAAK,CAAC,qBAAqB,CAAC;IAChE,yDAAyD;IAClD,KAAK,EAAE,qBAAqB,CAGjC;IAEF,+DAA+D;IACxD,oBAAoB,EAAE,OAAO,CAAC;IAErC,gEAAgE;IAChE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA0C;IAEzE,mDAAmD;IACnD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAwB;IAE9C,+EAA+E;IAC/E,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA6B;IAE1D,oFAAoF;IACpF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6B;IAE5D,6CAA6C;IAC7C,OAAO,CAAC,cAAc,CAAC,CAAiC;IAExD,qDAAqD;IACrD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA0C;gBAExD,MAAM,GAAE,sBAA2B;IAgB/C,IAAW,MAAM,IAAI,OAAO,CAE3B;IAED;;;;;OAKG;IACH,IAAW,WAAW,IAAI,SAAS,SAAS,EAAE,CAE7C;IAED,wFAAwF;IACxF,IAAW,KAAK,IAAI,MAAM,CAEzB;IAED,qCAAqC;IAC9B,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAMhD,2CAA2C;IAC3C,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,SAAS,CAAC;IAIhD,+EAA+E;IAC/E,OAAO,CAAC,WAAW;IAInB;;;;OAIG;IACH,IAAW,OAAO,IAAI,OAAO,CAE5B;IAED;;;;OAIG;IACI,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAU7D,wDAAwD;IACjD,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAI9C;;;;OAIG;IACI,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAqCnC;;;OAGG;IACI,mBAAmB,IAAI,IAAI;IASlC;;OAEG;IACI,OAAO,IAAI,IAAI;IAYtB;;;OAGG;IACI,UAAU,IAAI,MAAM,OAAO,CAAC,IAAI,CAAC;IAYxC,iDAAiD;IACjD,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,eAAe,CAAK;IAC5B,oFAAoF;IACpF,OAAO,CAAC,aAAa,CAAM;IAE3B,8DAA8D;IAC9D,OAAO,CAAC,WAAW;IA4BnB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,UAAU;IAuDlB;;;;;OAKG;IACH,OAAO,CAAC,eAAe;IAoDvB,4DAA4D;IAC5D,OAAO,CAAC,WAAW;IASnB;;;OAGG;IACH,OAAO,CAAC,UAAU;IA8ClB,4DAA4D;IAC5D,OAAO,CAAC,QAAQ;IAsBhB,OAAO,CAAC,kBAAkB;IAkB1B;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IAmB/B,OAAO,CAAC,iBAAiB;IAsBzB,2DAA2D;IAC3D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA4B;IAE5D,OAAO,CAAC,YAAY;CAWrB"}