dualsense-ts 2.2.48 → 3.1.3

package/dist/input.js

@@ -1,63 +1,131 @@
 "use strict";
-var _a;
+var _a, _b, _c, _d;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Input = exports.InputIcon = exports.InputName = exports.InputSet = exports.InputChanged = void 0;
-const events_1 = require("events");
-const util_1 = require("util");
-const InputDefaults = {
-    name: "???",
-    icon: "???",
-    threshold: 0,
-};
-// Private properties
-const InputAdopt = Symbol("InputAdopt");
-const InputChildless = Symbol("InputChildless");
-const InputParent = Symbol("InputParent");
-const InputSetComparison = Symbol("InputSetComparison");
-const InputChangedPrimitive = Symbol("InputChangedPrimitive");
-const InputChangedThreshold = Symbol("InputChangedThreshold");
-const InputChangedVirtual = Symbol("InputChangedVirtual");
-// Optional abstract properties
+exports.Input = exports.InputIcon = exports.InputName = exports.InputSet = exports.InputChanged = exports.InputSetComparator = void 0;
+const comparators_1 = require("./comparators");
+/**
+ * Private utilities
+ */
+exports.InputSetComparator = Symbol("InputSetComparator");
 exports.InputChanged = Symbol("InputChanged");
-// Utilities
 exports.InputSet = Symbol("InputSet");
 exports.InputName = Symbol("InputName");
 exports.InputIcon = Symbol("InputIcon");
+/**
+ * Private properties
+ */
+const InputOns = Symbol("InputOns");
+const InputOnces = Symbol("InputOnces");
+const InputAdopt = Symbol("InputAdopt");
+const InputParents = Symbol("InputParents");
+const InputComparator = Symbol("InputComparator");
 /**
  * Input manages the state of a single device input,
  * a virtual input, or a group of Input children.
  */
-class Input extends events_1.EventEmitter {
-    constructor(params) {
-        super();
+class Input {
+    constructor(params = {}) {
+        this.id = "Unknown" /* InputId.Unknown */;
         /**
-         * Timestamp of the last received input that changed the state.
+         * For numeric inputs, ignore state changes smaller than this threshold.
          */
-        this.lastChange = Date.now();
+        this.threshold = 0;
         /**
-         * Timestamp of the last received input, even if it didn't change the state.
+         * Stores event listeners.
          */
-        this.lastInput = Date.now();
+        this[_a] = new Map();
         /**
-         * For numeric inputs, ignore state changes smaller than this threshold.
+         * Stores callbacks waiting for one-time events.
          */
-        this.threshold = 0;
-        this[_a] = true;
-        const { icon, name, parent, threshold } = {
-            ...InputDefaults,
-            ...(params || {}),
+        this[_b] = new Map();
+        /**
+         * Returns true if the provided state is worth an event
+         */
+        this[_c] = comparators_1.BasicComparator;
+        /**
+         * Other Inputs that contain this one.
+         */
+        this[_d] = new Set();
+        const { name, icon, threshold } = {
+            icon: "???",
+            name: "Nameless Input",
+            threshold: 0,
+            ...params,
         };
         this[exports.InputName] = name;
         this[exports.InputIcon] = icon;
-        this[InputParent] = parent;
         this.threshold = threshold;
-        this.id = Symbol(this[exports.InputName]);
-        this[exports.InputChanged] = this[InputSetComparison]();
-        setImmediate(() => {
-            this[InputAdopt]();
-            this[exports.InputChanged] = this[InputSetComparison]();
+        setTimeout(() => {
+            this[exports.InputSetComparator]();
+            Object.values(this).forEach((value) => {
+                if (value === this)
+                    return;
+                if (value instanceof Input)
+                    value[InputAdopt](this);
+            });
         });
     }
+    /**
+     * Register a callback to recieve state updates from this Input.
+     */
+    on(event, listener) {
+        const listeners = this[InputOns].get(event);
+        if (!listeners) {
+            this[InputOns].set(event, []);
+            return this.on(event, listener);
+        }
+        listeners.push(listener);
+        return this;
+    }
+    /**
+     * Register a callback to recieve the next specified update.
+     */
+    once(event, listener) {
+        const listeners = this[InputOnces].get(event);
+        if (!listeners) {
+            this[InputOnces].set(event, []);
+            return this.once(event, listener);
+        }
+        listeners.push(listener);
+        return this;
+    }
+    /**
+     * Notify listeners and parents of a state change.
+     */
+    emit(event, changed) {
+        const listeners = this[InputOns].get(event) || [];
+        listeners.forEach((callback) => {
+            callback(this, changed);
+        });
+        if (event !== "input") {
+            this.emitOnce(event, changed);
+            this[InputParents].forEach((input) => {
+                input.emit(event, changed);
+            });
+        }
+    }
+    /**
+     * Notify one-time listeners of a state change.
+     */
+    emitOnce(event, changed = this) {
+        const listeners = this[InputOnces].get(event) || [];
+        this[InputOnces].set(event, []);
+        listeners.forEach((callback) => {
+            callback(this, changed);
+        });
+    }
+    /**
+     * Register a callback to recieve state updates from this Input.
+     */
+    addEventListener(event, listener, { once } = { once: false }) {
+        if (once) {
+            if (event === "input") {
+                throw new Error("Can't listen once to `input` events");
+            }
+            return this.once(event, listener);
+        }
+        return this.on(event, listener);
+    }
     /**
      * Resolves on the next change to this input's state.
      */
@@ -77,18 +145,12 @@ class Input extends events_1.EventEmitter {
         });
     }
     /**
-     * Render a convenient debugging string.
+     * Render a debugging string.
      */
     toString() {
         return `${this[exports.InputIcon]} [${this.active ? "X" : "_"}]`;
     }
-    // TODO Support params for nested inputs
-    [util_1.inspect.custom]() {
-        return `${this[exports.InputName]} ${this[exports.InputIcon]}: ${JSON.stringify(this.state instanceof Input && this.state.id === this.id
-            ? "virtual"
-            : this.state)}`;
-    }
-    [Symbol.asyncIterator]() {
+    [(_a = InputOns, _b = InputOnces, _c = InputComparator, Symbol.asyncIterator)]() {
         return this;
     }
     [Symbol.toPrimitive](hint) {
@@ -102,65 +164,36 @@ class Input extends events_1.EventEmitter {
         return this.toString();
     }
     /**
-     * Cascade events from nested Inputs.
-     * And decide if this is the root Input.
+     * Links Inputs to bubble up events.
      */
-    [(_a = InputChildless, InputAdopt)]() {
-        Object.values(this).forEach((value) => {
-            if (value === this)
-                return;
-            if (value instanceof Input) {
-                this[InputChildless] = false;
-                if (!value[InputChildless])
-                    return;
-                value.on("change", (that, value) => {
-                    that;
-                    this.emit("change", this, value);
-                });
-                value.on("input", (that, value) => {
-                    that;
-                    this.emit("input", this, value);
-                });
-            }
-        });
+    [(_d = InputParents, InputAdopt)](parent) {
+        this[InputParents].add(parent);
     }
-    [InputChangedVirtual]() {
-        return true;
-    }
-    [InputChangedPrimitive](state, newState) {
-        return state !== newState;
-    }
-    [InputChangedThreshold](state, newState) {
-        return Math.abs(state - newState) > this.threshold;
-    }
-    // Sets a default comparison type for the Input based on the generic type.
-    [InputSetComparison]() {
+    /**
+     * Sets a default comparison type for the Input by discovering the generic type.
+     */
+    [exports.InputSetComparator]() {
         if (typeof this.state === "number") {
-            return this[InputChangedThreshold];
+            this[InputComparator] = comparators_1.ThresholdComparator.bind(this, this.threshold);
         }
         else if (this.state instanceof Input) {
-            return this[InputChangedVirtual];
+            this[InputComparator] = comparators_1.VirtualComparator;
         }
         else {
-            return this[InputChangedPrimitive];
+            this[InputComparator] = comparators_1.BasicComparator;
         }
     }
     /**
      * Update the input's state and trigger all necessary callbacks.
      */
     [exports.InputSet](state) {
-        this.lastInput = Date.now();
-        if (this[exports.InputChanged](this.state, state)) {
+        if (this[InputComparator](this.state, state)) {
             this.state = state;
-            this.lastChange = Date.now();
-            this.emit("change", this, this);
-            if (typeof state === "boolean") {
-                state
-                    ? this.emit("press", this, this)
-                    : this.emit("release", this, this);
-            }
+            this.emit("change", this);
+            if (typeof state === "boolean")
+                this.emit(state ? "press" : "release", this);
         }
-        this.emit("input", this, this);
+        this.emit("input", this);
     }
 }
 exports.Input = Input;

package/dist/input.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dualsense-ts",
-  "version": "2.2.48",
+  "version": "3.1.3",
   "description": "A natural interface for your DualSense controller, with Typescript",
   "keywords": [
     "dualsense",
@@ -29,22 +29,22 @@
   "license": "GPL-3.0",
   "private": false,
   "main": "dist/index.js",
+  "browser": "dist/main.js",
   "types": "dist/index.d.ts",
+  "sideEffects": false,
   "scripts": {
     "prebuild": "yarn barrels",
     "build": "tsc --project tsconfig.build.json",
     "build:watch": "tsc --project tsconfig.build.json --pretty --watch",
+    "start": "webpack serve --open",
     "lint": "eslint src",
-    "lint:watch": "nodemon eslint src",
     "test": "jest src --verbose",
     "test:watch": "jest src --verbose --watch",
     "coverage": "jest src --coverage --verbose",
     "coverage:watch": "jest src --coverage --verbose --watch",
     "barrels": "barrelsby -d src -D -l replace -e 'spec.ts$'",
-    "barrels:watch": "nodemon yarn barrels",
     "docs": "typedoc src/index.ts",
-    "docs:watch": "nodemon yarn docs",
-    "debug": "nodemon -e ts,json --exec \"node --inspect --enable-source-maps --experimental-specifier-resolution=node --loader ts-node/esm ./util/debug.ts\""
+    "debug": "node --inspect --enable-source-maps --experimental-specifier-resolution=node --loader ts-node/esm ./util/debug.ts"
   },
   "dependencies": {
     "node-hid": "^2.1.1"
@@ -53,21 +53,26 @@
     "@types/jest": "^27.5.0",
     "@types/node": "^18.0.0",
     "@types/node-hid": "^1.3.1",
+    "@types/w3c-web-hid": "^1.0.3",
     "@typescript-eslint/eslint-plugin": "^5.23.0",
     "@typescript-eslint/parser": "^5.23.0",
     "barrelsby": "^2.3.4",
     "eslint": "^8.15.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.26.0",
+    "html-webpack-plugin": "^5.5.0",
     "jest": "^27.5.1",
-    "nodemon": "^2.0.16",
     "prettier": "^2.3.2",
     "ts-jest": "^27.1.3",
+    "ts-loader": "^9.3.1",
     "ts-node": "^10.7.0",
     "typedoc": "^0.23.1",
     "typedoc-github-wiki-theme": "^1.0.1",
     "typedoc-plugin-markdown": "^3.12.1",
-    "typescript": "^4.6.4"
+    "typescript": "^4.6.4",
+    "webpack": "^5.73.0",
+    "webpack-cli": "^4.10.0",
+    "webpack-dev-server": "^4.9.3"
   },
   "eslintConfig": {
     "parser": "@typescript-eslint/parser",
@@ -92,7 +97,8 @@
       "plugin:@typescript-eslint/recommended-requiring-type-checking"
     ],
     "rules": {
-      "@typescript-eslint/no-inferrable-types": 0
+      "@typescript-eslint/no-inferrable-types": 0,
+      "@typescript-eslint/no-empty-function": 0
     }
   },
   "jest": {

package/src/comparators.ts

@@ -0,0 +1,26 @@
+/**
+ * Input state change checker that always returns true.
+ */
+export function VirtualComparator(): boolean {
+  return true;
+}
+
+/**
+ * Input state change checker that considers a numeric threshold.
+ */
+export function ThresholdComparator(
+  threshold: number,
+  state: unknown,
+  newState: unknown
+): boolean {
+  if (typeof state !== "number" || typeof newState !== "number")
+    throw new Error("Bad threshold comparison");
+  return Math.abs(state - newState) > threshold;
+}
+
+/**
+ * Input state change checker for most values.
+ */
+export function BasicComparator(state: unknown, newState: unknown): boolean {
+  return state !== newState;
+}

package/src/dualsense.ts

@@ -8,12 +8,19 @@ import {
   Touchpad,
 } from "./elements";
 import { Input, InputSet, InputParams } from "./input";
-import { DualsenseHID, InputId } from "./hid";
+import {
+  DualsenseHIDState,
+  DualsenseHID,
+  PlatformHIDProvider,
+  InputId,
+} from "./hid";
 
 export interface DualsenseParams extends InputParams {
+  /**
+   * Sets the source of HID events for the controller interface.
+   */
   hid?: DualsenseHID | null;
 
-  // Input param overrides
   ps?: InputParams;
   mute?: InputParams;
   options?: InputParams;
@@ -28,6 +35,9 @@ export interface DualsenseParams extends InputParams {
   touchpad?: InputParams;
 }
 
+/**
+ * Represents a Dualsense controller.
+ */
 export class Dualsense extends Input<Dualsense> {
   public readonly state: Dualsense = this;
 
@@ -49,12 +59,11 @@ export class Dualsense extends Input<Dualsense> {
 
   public readonly touchpad: Touchpad;
 
-  public readonly hid: DualsenseHID | null = null;
+  public readonly hid: DualsenseHID;
 
   public get active(): boolean {
     return Object.values(this).some(
-      (input: unknown) =>
-        input instanceof Input && input !== this && input.active
+      (input) => input !== this && input instanceof Input && input.active
     );
   }
 
@@ -122,61 +131,55 @@ export class Dualsense extends Input<Dualsense> {
       ...(params.touchpad || {}),
     });
 
-    const { hid } = params;
-    if (hid !== null) this.hid = hid ? hid : new DualsenseHID();
+    this.hid = params.hid || new DualsenseHID(new PlatformHIDProvider());
+    this.hid.register((state: DualsenseHIDState) => {
+      this.processHID(state);
+    });
 
-    if (this.hid) {
-      this.hid.on("input", () => {
-        this.processHID();
-      });
-    }
+    if (params.hid !== null) this.hid.provider.connect();
   }
 
-  private processHID() {
-    if (!this.hid) return;
-    this.ps[InputSet](this.hid.state[InputId.Playstation]);
-    this.options[InputSet](this.hid.state[InputId.Options]);
-    this.create[InputSet](this.hid.state[InputId.Create]);
-
-    this.mute[InputSet](this.hid.state[InputId.Mute]);
-    this.mute.status[InputSet](this.hid.state[InputId.Status]);
-
-    this.triangle[InputSet](this.hid.state[InputId.Triangle]);
-    this.circle[InputSet](this.hid.state[InputId.Circle]);
-    this.cross[InputSet](this.hid.state[InputId.Cross]);
-    this.square[InputSet](this.hid.state[InputId.Square]);
-
-    this.dpad.up[InputSet](this.hid.state[InputId.Up]);
-    this.dpad.down[InputSet](this.hid.state[InputId.Down]);
-    this.dpad.right[InputSet](this.hid.state[InputId.Right]);
-    this.dpad.left[InputSet](this.hid.state[InputId.Left]);
-
-    this.touchpad.button[InputSet](this.hid.state[InputId.TouchButton]);
-    this.touchpad.left.x[InputSet](this.hid.state[InputId.TouchX0]);
-    this.touchpad.left.y[InputSet](this.hid.state[InputId.TouchY0]);
-    this.touchpad.left.contact[InputSet](this.hid.state[InputId.TouchContact0]);
-    this.touchpad.left.tracker[InputSet](this.hid.state[InputId.TouchId0]);
-    this.touchpad.right.x[InputSet](this.hid.state[InputId.TouchX1]);
-    this.touchpad.right.y[InputSet](this.hid.state[InputId.TouchY1]);
-    this.touchpad.right.contact[InputSet](
-      this.hid.state[InputId.TouchContact1]
-    );
-    this.touchpad.right.tracker[InputSet](this.hid.state[InputId.TouchId1]);
-
-    this.left.analog.x[InputSet](this.hid.state[InputId.LeftAnalogX]);
-    this.left.analog.y[InputSet](this.hid.state[InputId.LeftAnalogY]);
-    this.left.bumper[InputSet](this.hid.state[InputId.LeftBumper]);
-    this.left.trigger[InputSet](this.hid.state[InputId.LeftTrigger]);
-    this.left.trigger.button[InputSet](
-      this.hid.state[InputId.LeftTriggerButton]
-    );
-
-    this.right.analog.x[InputSet](this.hid.state[InputId.RightAnalogX]);
-    this.right.analog.y[InputSet](this.hid.state[InputId.RightAnalogY]);
-    this.right.bumper[InputSet](this.hid.state[InputId.RightBumper]);
-    this.right.trigger[InputSet](this.hid.state[InputId.RightTrigger]);
-    this.right.trigger.button[InputSet](
-      this.hid.state[InputId.RightTriggerButton]
-    );
+  /**
+   * Distributes input values to various elements.
+   */
+  private processHID(state: DualsenseHIDState): void {
+    this.ps[InputSet](state[InputId.Playstation]);
+    this.options[InputSet](state[InputId.Options]);
+    this.create[InputSet](state[InputId.Create]);
+
+    this.mute[InputSet](state[InputId.Mute]);
+    this.mute.status[InputSet](state[InputId.Status]);
+
+    this.triangle[InputSet](state[InputId.Triangle]);
+    this.circle[InputSet](state[InputId.Circle]);
+    this.cross[InputSet](state[InputId.Cross]);
+    this.square[InputSet](state[InputId.Square]);
+
+    this.dpad.up[InputSet](state[InputId.Up]);
+    this.dpad.down[InputSet](state[InputId.Down]);
+    this.dpad.right[InputSet](state[InputId.Right]);
+    this.dpad.left[InputSet](state[InputId.Left]);
+
+    this.touchpad.button[InputSet](state[InputId.TouchButton]);
+    this.touchpad.left.x[InputSet](state[InputId.TouchX0]);
+    this.touchpad.left.y[InputSet](state[InputId.TouchY0]);
+    this.touchpad.left.contact[InputSet](state[InputId.TouchContact0]);
+    this.touchpad.left.tracker[InputSet](state[InputId.TouchId0]);
+    this.touchpad.right.x[InputSet](state[InputId.TouchX1]);
+    this.touchpad.right.y[InputSet](state[InputId.TouchY1]);
+    this.touchpad.right.contact[InputSet](state[InputId.TouchContact1]);
+    this.touchpad.right.tracker[InputSet](state[InputId.TouchId1]);
+
+    this.left.analog.x[InputSet](state[InputId.LeftAnalogX]);
+    this.left.analog.y[InputSet](state[InputId.LeftAnalogY]);
+    this.left.bumper[InputSet](state[InputId.LeftBumper]);
+    this.left.trigger[InputSet](state[InputId.LeftTrigger]);
+    this.left.trigger.button[InputSet](state[InputId.LeftTriggerButton]);
+
+    this.right.analog.x[InputSet](state[InputId.RightAnalogX]);
+    this.right.analog.y[InputSet](state[InputId.RightAnalogY]);
+    this.right.bumper[InputSet](state[InputId.RightBumper]);
+    this.right.trigger[InputSet](state[InputId.RightTrigger]);
+    this.right.trigger.button[InputSet](state[InputId.RightTriggerButton]);
   }
 }

package/src/elements/analog.spec.ts

@@ -25,8 +25,8 @@ describe("Analog", () => {
     expect(analog.active).toEqual(false);
   });
 
-  it("should utilize `threshold`", () => {
-    const analog = new Analog({ threshold: 0.5 });
+  it("should utilize `deadzone`", () => {
+    const analog = new Analog({ deadzone: 0.5 });
     expect(analog.active).toEqual(false);
     analog.x[InputSet](0.4);
     expect(analog.active).toEqual(false);
@@ -42,19 +42,6 @@ describe("Analog", () => {
     expect(analog.active).toEqual(false);
   });
 
-  it("children inherit `threshold`", () => {
-    const analog = new Analog({ threshold: 0.5 });
-    expect(analog.x.active).toEqual(false);
-    analog.x[InputSet](0.4);
-    expect(analog.x.active).toEqual(false);
-    analog.x[InputSet](0.5);
-    expect(analog.x.active).toEqual(false);
-    analog.x[InputSet](0.6);
-    expect(analog.x.active).toEqual(true);
-    analog.x[InputSet](0);
-    expect(analog.x.active).toEqual(false);
-  });
-
   it("should return good directions", () => {
     const analog = new Analog();
     expect(analog.radians).toBeCloseTo(0);