@companion-surface/base 1.0.0 → 1.1.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.1.0](https://github.com/bitfocus/companion-surface-api/compare/companion-surface-base-v1.0.0...companion-surface-base-v1.1.0) (2026-01-05)
+
+
+### Features
+
+* refine surfaceId generation ([#33](https://github.com/bitfocus/companion-surface-api/issues/33)) ([8f23f82](https://github.com/bitfocus/companion-surface-api/commit/8f23f8265fad79f31b243a2d67412b21935eadc2))
+
+
+### Bug Fixes
+
+* remove unused StableDeviceIdGenerator ([b237c01](https://github.com/bitfocus/companion-surface-api/commit/b237c01c2ff702c709c674444adce1a3fd8df271))
+
 ## [1.0.0](https://github.com/bitfocus/companion-surface-api/compare/companion-surface-base-v0.7.0...companion-surface-base-v1.0.0) (2025-12-15)
 
 

package/dist/surface-api/detection.d.ts

@@ -1,8 +1,13 @@
 import type EventEmitter from 'node:events';
-import type { DiscoveredSurfaceInfo } from './plugin.js';
+import type { DetectionSurfaceInfo } from './plugin.js';
 export interface SurfacePluginDetectionEvents<TInfo> {
     /** Emitted when surfaces are detected */
-    surfacesAdded: [surfaceInfos: DiscoveredSurfaceInfo<TInfo>[]];
+    surfacesAdded: [surfaceInfos: DetectionSurfaceInfo<TInfo>[]];
+    /**
+     * Emitted when discovered surfaces are lost
+     * Note: This is important to call, to allow the id to be reused by a newly detected surface later on
+     */
+    surfacesRemoved: [deviceHandles: string[]];
 }
 /**
  * For some plugins which only support using a builtin detection mechanism, this can be used to provide the detection info
@@ -18,6 +23,6 @@ export interface SurfacePluginDetection<TInfo> extends EventEmitter<SurfacePlugi
      * You can use this to cleanup any resources/handles for this surface, as it will not be used further
      * @param surfaceInfo The info about the surface which was rejected
      */
-    rejectSurface(surfaceInfo: DiscoveredSurfaceInfo<TInfo>): void;
+    rejectSurface(surfaceInfo: DetectionSurfaceInfo<TInfo>): void;
 }
 //# sourceMappingURL=detection.d.ts.map

package/dist/surface-api/detection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"detection.d.ts","sourceRoot":"","sources":["../../src/surface-api/detection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,aAAa,CAAA;AAC3C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAExD,MAAM,WAAW,4BAA4B,CAAC,KAAK;IAClD,yCAAyC;IACzC,aAAa,EAAE,CAAC,YAAY,EAAE,qBAAqB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;CAE7D;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB,CAAC,KAAK,CAAE,SAAQ,YAAY,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC;IACvG;;;OAGG;IACH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAE5B;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,qBAAqB,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;CAC9D"}
+{"version":3,"file":"detection.d.ts","sourceRoot":"","sources":["../../src/surface-api/detection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,aAAa,CAAA;AAC3C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAEvD,MAAM,WAAW,4BAA4B,CAAC,KAAK;IAClD,yCAAyC;IACzC,aAAa,EAAE,CAAC,YAAY,EAAE,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAC5D;;;OAGG;IACH,eAAe,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,CAAA;CAC1C;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB,CAAC,KAAK,CAAE,SAAQ,YAAY,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC;IACvG;;;OAGG;IACH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAE5B;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,oBAAoB,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;CAC7D"}

package/dist/surface-api/plugin.d.ts

@@ -44,7 +44,7 @@ export interface SurfacePlugin<TInfo> {
      * Perform a scan for devices, but not open them
      * Note: This should only be used if the plugin uses a protocol where we don't have other handling for
      */
-    scanForSurfaces?: () => Promise<DiscoveredSurfaceInfo<TInfo>[]>;
+    scanForSurfaces?: () => Promise<DetectionSurfaceInfo<TInfo>[]>;
     /**
      * Open a discovered/known surface
      * This can be called for multiple surfaces in parallel
@@ -60,9 +60,16 @@ export interface SurfacePlugin<TInfo> {
  */
 export interface DiscoveredSurfaceInfo<TInfo> {
     /**
-     * Unique id of the surface. Typically a serialnumber
+     * Desired id of the surface. Typically a serialnumber.
+     * It may not be opened with this id, as collisions may be resolved by the host
+     * This does not have to be unique, if collisions are found it will be given a suffix to make it unique
      */
     surfaceId: string;
+    /**
+     * Set this to true if the surface id is known to not be unique and should always be given a suffix
+     * Otherwise, a suffix will only be added if a collision is detected
+     */
+    surfaceIdIsNotUnique?: boolean;
     /**
      * Human friendly description of the surface. Typically a model name
      */
@@ -72,4 +79,21 @@ export interface DiscoveredSurfaceInfo<TInfo> {
      */
     pluginInfo: TInfo;
 }
+/**
+ * Information about a surface discovered via a detection/remote mechanism.
+ * Extends {@link DiscoveredSurfaceInfo} with a stable tracking handle (`deviceHandle`)
+ * that can be used to re-identify the same physical device between scans.
+ */
+export interface DetectionSurfaceInfo<TInfo> extends DiscoveredSurfaceInfo<TInfo> {
+    /**
+     * A stable unique identifier for the device.
+     * This is used to identify the same physical device between scans and operations, until it is disconnected. It is not shown to the user
+     *
+     * This is the same logical concept that other interfaces may refer to as `devicePath`,
+     * but is named `deviceHandle` here because, depending on the transport or platform,
+     * it may not literally be a filesystem path. For USB devices it will typically be the
+     * device path, while for other transports it can be another stable identifier.
+     */
+    deviceHandle: string;
+}
 //# sourceMappingURL=plugin.d.ts.map

package/dist/surface-api/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/surface-api/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAEjD;;GAEG;AACH,MAAM,WAAW,aAAa,CAAC,KAAK;IACnC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,sBAAsB,CAAC,KAAK,CAAC,CAAA;IAElD;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAA;IAE5C;;;;OAIG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAErB;;;;OAIG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAExB;;;;;OAKG;IACH,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,qBAAqB,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;IAEnF;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,OAAO,CAAC,qBAAqB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAE/D;;;;;;;OAOG;IACH,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAA;CAC1G;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB,CAAC,KAAK;IAC3C;;OAEG;IACH,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;OAEG;IACH,UAAU,EAAE,KAAK,CAAA;CACjB"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/surface-api/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAEjD;;GAEG;AACH,MAAM,WAAW,aAAa,CAAC,KAAK;IACnC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,sBAAsB,CAAC,KAAK,CAAC,CAAA;IAElD;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAA;IAE5C;;;;OAIG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAErB;;;;OAIG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAExB;;;;;OAKG;IACH,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,qBAAqB,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;IAEnF;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAE9D;;;;;;;OAOG;IACH,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAA;CAC1G;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB,CAAC,KAAK;IAC3C;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAA;IACjB;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAE9B;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;OAEG;IACH,UAAU,EAAE,KAAK,CAAA;CACjB;AAED;;;;GAIG;AACH,MAAM,WAAW,oBAAoB,CAAC,KAAK,CAAE,SAAQ,qBAAqB,CAAC,KAAK,CAAC;IAChF;;;;;;;;OAQG;IACH,YAAY,EAAE,MAAM,CAAA;CACpB"}

package/dist/surface-api/remote.d.ts

@@ -1,9 +1,9 @@
 import type EventEmitter from 'node:events';
 import type { OptionsObject, SomeCompanionInputField } from './input.js';
 import type { RemoteSurfaceConnectionInfo } from './types.js';
-import type { DiscoveredSurfaceInfo } from './plugin.js';
+import type { DetectionSurfaceInfo } from './plugin.js';
 export interface SurfacePluginRemoteEvents<TInfo> {
-    surfacesConnected: [surfaceInfos: DiscoveredSurfaceInfo<TInfo>[]];
+    surfacesConnected: [surfaceInfos: DetectionSurfaceInfo<TInfo>[]];
     /**
      * Fired when surface discovery detects new surfaces
      * This is used as suggestions in the ui of remote surfaces the user can setup
@@ -49,7 +49,7 @@ export interface SurfacePluginRemote<TInfo> extends EventEmitter<SurfacePluginRe
      * You can use this to cleanup any resources/handles for this surface, as it will not be used further
      * @param surfaceInfo The info about the surface which was rejected
      */
-    rejectSurface(surfaceInfo: DiscoveredSurfaceInfo<TInfo>): void;
+    rejectSurface(surfaceInfo: DetectionSurfaceInfo<TInfo>): void;
 }
 export interface DiscoveredRemoteSurfaceInfo {
     /**

package/dist/surface-api/remote.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../src/surface-api/remote.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,aAAa,CAAA;AAC3C,OAAO,KAAK,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAA;AACxE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAExD,MAAM,WAAW,yBAAyB,CAAC,KAAK;IAC/C,iBAAiB,EAAE,CAAC,YAAY,EAAE,qBAAqB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAGjE;;;OAGG;IACH,gBAAgB,EAAE,CAAC,eAAe,EAAE,2BAA2B,EAAE,CAAC,CAAA;IAClE;;;OAGG;IACH,oBAAoB,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,CAAA;CAC/C;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB,CAAC,KAAK,CAAE,SAAQ,YAAY,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;IACjG;;;;OAIG;IACH,QAAQ,CAAC,YAAY,EAAE,uBAAuB,EAAE,CAAA;IAEhD;;;;;;;OAOG;IACH,QAAQ,CAAC,4BAA4B,EAAE,MAAM,GAAG,IAAI,CAAA;IAEpD;;;OAGG;IACH,gBAAgB,CAAC,eAAe,EAAE,2BAA2B,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAE/E;;;OAGG;IACH,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAEvD;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,qBAAqB,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;CAC9D;AAED,MAAM,WAAW,2BAA2B;IAC3C;;OAEG;IACH,EAAE,EAAE,MAAM,CAAA;IACV;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IAKnB;;;OAGG;IACH,MAAM,EAAE,aAAa,CAAA;CACrB"}
+{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../src/surface-api/remote.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,aAAa,CAAA;AAC3C,OAAO,KAAK,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAA;AACxE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAEvD,MAAM,WAAW,yBAAyB,CAAC,KAAK;IAC/C,iBAAiB,EAAE,CAAC,YAAY,EAAE,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAGhE;;;OAGG;IACH,gBAAgB,EAAE,CAAC,eAAe,EAAE,2BAA2B,EAAE,CAAC,CAAA;IAClE;;;OAGG;IACH,oBAAoB,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,CAAA;CAC/C;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB,CAAC,KAAK,CAAE,SAAQ,YAAY,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;IACjG;;;;OAIG;IACH,QAAQ,CAAC,YAAY,EAAE,uBAAuB,EAAE,CAAA;IAEhD;;;;;;;OAOG;IACH,QAAQ,CAAC,4BAA4B,EAAE,MAAM,GAAG,IAAI,CAAA;IAEpD;;;OAGG;IACH,gBAAgB,CAAC,eAAe,EAAE,2BAA2B,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAE/E;;;OAGG;IACH,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAEvD;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,oBAAoB,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;CAC7D;AAED,MAAM,WAAW,2BAA2B;IAC3C;;OAEG;IACH,EAAE,EAAE,MAAM,CAAA;IACV;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IAKnB;;;OAGG;IACH,MAAM,EAAE,aAAa,CAAA;CACrB"}

package/dist/util.d.ts

@@ -5,25 +5,4 @@ export interface RgbColor {
     b: number;
 }
 export declare function parseColor(color: string | undefined): RgbColor;
-/**
- * Generator for stable fake serial numbers for usb devices without hardware serials.
- *
- * Generates deterministic serials by hashing just the uniqueness key and an index.
- */
-export declare class StableDeviceIdGenerator {
-    #private;
-    /**
-     * Generate a stable serial number for a device without a hardware serial.
-     *
-     * @param uniquenessKey - Identifier for the device type (e.g., "vendorId:productId")
-     * @param path - Device path (e.g., "/dev/hidraw0")
-     * @returns A stable fake serial number
-     */
-    generateId(uniquenessKey: string, devicePath: string): string;
-    /**
-     * Prune cache entries for devices that were not seen during the current scan.
-     * This should be called once after processing all devices in a scan.
-     */
-    pruneNotSeen(): void;
-}
 //# sourceMappingURL=util.d.ts.map

package/dist/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAEA,wBAAgB,WAAW,CAAC,EAAE,EAAE,KAAK,GAAG,IAAI,CAE3C;AAED,MAAM,WAAW,QAAQ;IACxB,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACT;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,CAM9D;AAED;;;;GAIG;AACH,qBAAa,uBAAuB;;IAiBnC;;;;;;OAMG;IACH,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAqB7D;;;OAGG;IACH,YAAY,IAAI,IAAI;CAiBpB"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,EAAE,EAAE,KAAK,GAAG,IAAI,CAE3C;AAED,MAAM,WAAW,QAAQ;IACxB,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACT;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,CAM9D"}

package/dist/util.js

@@ -1,4 +1,3 @@
-import { createHash } from 'node:crypto';
 export function assertNever(_v) {
     // Nothing to do
 }
@@ -8,69 +7,4 @@ export function parseColor(color) {
     const b = color ? parseInt(color.substr(5, 2), 16) : 0;
     return { r, g, b };
 }
-/**
- * Generator for stable fake serial numbers for usb devices without hardware serials.
- *
- * Generates deterministic serials by hashing just the uniqueness key and an index.
- */
-export class StableDeviceIdGenerator {
-    /**
-     * Cache of device info to fake serial
-     * Map: `${uniquenessKey}||${devicePath}` -> string
-     */
-    #previousForDevicePath = new Map();
-    /**
-     * Track which device paths were seen during the current scan
-     * Set of keys: `${uniquenessKey}||${devicePath}`
-     */
-    #seenThisScan = new Set();
-    /**
-     * Track which serialnumbers were returned during this scan
-     */
-    #returnedThisScan = new Set();
-    /**
-     * Generate a stable serial number for a device without a hardware serial.
-     *
-     * @param uniquenessKey - Identifier for the device type (e.g., "vendorId:productId")
-     * @param path - Device path (e.g., "/dev/hidraw0")
-     * @returns A stable fake serial number
-     */
-    generateId(uniquenessKey, devicePath) {
-        const pathCacheKey = `${uniquenessKey}||${devicePath}`;
-        // Mark as seen during this scan
-        this.#seenThisScan.add(pathCacheKey);
-        // If there is something cached against the devicePath, use that
-        const cachedSerial = this.#previousForDevicePath.get(pathCacheKey);
-        if (cachedSerial)
-            return cachedSerial;
-        // Loop until we find a non-colliding ID
-        for (let i = 0;; i++) {
-            const fakeSerial = createHash('sha1').update(`${uniquenessKey}||${i}`).digest('hex');
-            if (!this.#returnedThisScan.has(fakeSerial)) {
-                this.#returnedThisScan.add(fakeSerial);
-                this.#previousForDevicePath.set(pathCacheKey, fakeSerial);
-                return fakeSerial;
-            }
-        }
-    }
-    /**
-     * Prune cache entries for devices that were not seen during the current scan.
-     * This should be called once after processing all devices in a scan.
-     */
-    pruneNotSeen() {
-        // Remove path cache entries that weren't seen
-        for (const [key] of this.#previousForDevicePath.entries()) {
-            if (!this.#seenThisScan.has(key)) {
-                this.#previousForDevicePath.delete(key);
-            }
-        }
-        // Clear the seen set for the next scan
-        this.#seenThisScan.clear();
-        this.#returnedThisScan.clear();
-        // Prepopulate the returned set with existing serials to avoid collisions
-        for (const serial of this.#previousForDevicePath.values()) {
-            this.#returnedThisScan.add(serial);
-        }
-    }
-}
 //# sourceMappingURL=util.js.map

package/dist/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC,MAAM,UAAU,WAAW,CAAC,EAAS;IACpC,gBAAgB;AACjB,CAAC;AAQD,MAAM,UAAU,UAAU,CAAC,KAAyB;IACnD,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACtD,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACtD,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAEtD,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAA;AACnB,CAAC;AAED;;;;GAIG;AACH,MAAM,OAAO,uBAAuB;IACnC;;;OAGG;IACH,sBAAsB,GAAG,IAAI,GAAG,EAAkB,CAAA;IAElD;;;OAGG;IACH,aAAa,GAAG,IAAI,GAAG,EAAU,CAAA;IACjC;;OAEG;IACH,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAA;IAErC;;;;;;OAMG;IACH,UAAU,CAAC,aAAqB,EAAE,UAAkB;QACnD,MAAM,YAAY,GAAG,GAAG,aAAa,KAAK,UAAU,EAAE,CAAA;QAEtD,gCAAgC;QAChC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAEpC,gEAAgE;QAChE,MAAM,YAAY,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAClE,IAAI,YAAY;YAAE,OAAO,YAAY,CAAA;QAErC,wCAAwC;QACxC,KAAK,IAAI,CAAC,GAAG,CAAC,GAAI,CAAC,EAAE,EAAE,CAAC;YACvB,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,aAAa,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACpF,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC7C,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;gBACtC,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAA;gBACzD,OAAO,UAAU,CAAA;YAClB,CAAC;QACF,CAAC;IACF,CAAC;IAED;;;OAGG;IACH,YAAY;QACX,8CAA8C;QAC9C,KAAK,MAAM,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,EAAE,CAAC;YAC3D,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAClC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YACxC,CAAC;QACF,CAAC;QAED,uCAAuC;QACvC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAA;QAC1B,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAA;QAE9B,yEAAyE;QACzE,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,EAAE,CAAC;YAC3D,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACnC,CAAC;IACF,CAAC;CACD"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CAAC,EAAS;IACpC,gBAAgB;AACjB,CAAC;AAQD,MAAM,UAAU,UAAU,CAAC,KAAyB;IACnD,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACtD,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACtD,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAEtD,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAA;AACnB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@companion-surface/base",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "type": "module",
   "license": "MIT",
   "repository": "https://github.com/bitfocus/companion-surface-api",

package/dist/__tests__/util.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=util.test.d.ts.map

package/dist/__tests__/util.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"util.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/util.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/util.test.js

@@ -1,213 +0,0 @@
-import { describe, expect, test } from 'vitest';
-import { StableDeviceIdGenerator } from '../util.js';
-describe('StableDeviceIdGenerator', () => {
-    test('generates different IDs for different uniqueness keys', () => {
-        const generator = new StableDeviceIdGenerator();
-        const id1 = generator.generateId('1234:5678', '/dev/hidraw0');
-        const id2 = generator.generateId('1234:9999', '/dev/hidraw1');
-        expect(id1).not.toBe(id2);
-        expect(id1).toHaveLength(40); // SHA1 hex digest length
-        expect(id2).toHaveLength(40);
-    });
-    test('generates different IDs for same uniqueness key with different paths', () => {
-        const generator = new StableDeviceIdGenerator();
-        const id1 = generator.generateId('1234:5678', '/dev/hidraw0');
-        const id2 = generator.generateId('1234:5678', '/dev/hidraw1');
-        expect(id1).not.toBe(id2);
-    });
-    test('returns same ID for same device path on repeated calls', () => {
-        const generator = new StableDeviceIdGenerator();
-        const id1 = generator.generateId('1234:5678', '/dev/hidraw0');
-        const id2 = generator.generateId('1234:5678', '/dev/hidraw0');
-        expect(id1).toBe(id2);
-    });
-    test('generates stable IDs with counter increment', () => {
-        const generator = new StableDeviceIdGenerator();
-        const id1 = generator.generateId('1234:5678', '/dev/hidraw0');
-        const id2 = generator.generateId('1234:5678', '/dev/hidraw1');
-        const id3 = generator.generateId('1234:5678', '/dev/hidraw2');
-        // All should be unique
-        expect(new Set([id1, id2, id3]).size).toBe(3);
-    });
-    test('separate instances have independent state', () => {
-        const generator1 = new StableDeviceIdGenerator();
-        const generator2 = new StableDeviceIdGenerator();
-        const id1 = generator1.generateId('1234:5678', '/dev/hidraw0');
-        const id2 = generator2.generateId('1234:5678', '/dev/hidraw1');
-        // Same inputs in different instances should produce same ID
-        expect(id1).toBe(id2);
-    });
-    test('handles multiple devices with same uniqueness key in batch', () => {
-        const generator = new StableDeviceIdGenerator();
-        // Simulate 3 identical devices (same vendor/product) with different paths
-        const ids = [
-            generator.generateId('1234:5678', '/dev/hidraw0'),
-            generator.generateId('1234:5678', '/dev/hidraw1'),
-            generator.generateId('1234:5678', '/dev/hidraw2'),
-        ];
-        // All should be unique
-        expect(new Set(ids).size).toBe(3);
-        // Requesting same path again should return cached ID
-        expect(generator.generateId('1234:5678', '/dev/hidraw1')).toBe(ids[1]);
-    });
-    test('generates valid hex SHA1 hashes', () => {
-        const generator = new StableDeviceIdGenerator();
-        const id = generator.generateId('1234:5678', '/dev/hidraw0');
-        // Should be 40 character hex string
-        expect(id).toMatch(/^[0-9a-f]{40}$/);
-    });
-    test('deduplicates multiple endpoints of same device', () => {
-        const generator = new StableDeviceIdGenerator();
-        // Simulate same device with multiple HID endpoints (same path)
-        const id1 = generator.generateId('1234:5678', '/dev/hidraw0');
-        const id2 = generator.generateId('1234:5678', '/dev/hidraw0');
-        const id3 = generator.generateId('1234:5678', '/dev/hidraw0');
-        expect(id1).toBe(id2);
-        expect(id2).toBe(id3);
-    });
-    test('handles empty uniqueness key', () => {
-        const generator = new StableDeviceIdGenerator();
-        const id1 = generator.generateId('', '/dev/hidraw0');
-        const id2 = generator.generateId('', '/dev/hidraw1');
-        expect(id1).not.toBe(id2);
-        expect(id1).toHaveLength(40);
-    });
-    test('real-world scenario: 2 identical Stream Decks', () => {
-        const generator = new StableDeviceIdGenerator();
-        // Same vendor:product, different USB paths
-        const deck1 = generator.generateId('4057:96', '/dev/hidraw0');
-        const deck2 = generator.generateId('4057:96', '/dev/hidraw1');
-        expect(deck1).not.toBe(deck2);
-        expect(deck1).toHaveLength(40);
-        expect(deck2).toHaveLength(40);
-        // Re-enumerating same devices should return same IDs
-        expect(generator.generateId('4057:96', '/dev/hidraw0')).toBe(deck1);
-        expect(generator.generateId('4057:96', '/dev/hidraw1')).toBe(deck2);
-    });
-    test('pruneNotSeen removes devices not seen in current scan', () => {
-        const generator = new StableDeviceIdGenerator();
-        // First scan: 3 devices
-        const id1 = generator.generateId('1234:5678', '/dev/hidraw0');
-        const id2 = generator.generateId('1234:5678', '/dev/hidraw1');
-        const id3 = generator.generateId('1234:5678', '/dev/hidraw2');
-        generator.pruneNotSeen();
-        // Second scan: only 2 devices (hidraw1 disconnected)
-        const id1Again = generator.generateId('1234:5678', '/dev/hidraw0');
-        const id3Again = generator.generateId('1234:5678', '/dev/hidraw2');
-        // IDs should be preserved for devices still present
-        expect(id1Again).toBe(id1);
-        expect(id3Again).toBe(id3);
-        generator.pruneNotSeen();
-        // Third scan: hidraw1 reconnects, should get a NEW ID (not cached)
-        const id1Third = generator.generateId('1234:5678', '/dev/hidraw0');
-        const id2Reconnect = generator.generateId('1234:5678', '/dev/hidraw1');
-        const id3Third = generator.generateId('1234:5678', '/dev/hidraw2');
-        expect(id1Third).toBe(id1);
-        expect(id3Third).toBe(id3);
-        // id2Reconnect can reuse the same hash since it was pruned and counter is deterministic
-        // It gets index 1 again which produces the same hash as before
-        expect(id2Reconnect).toBe(id2);
-    });
-    test('pruneNotSeen clears scan tracking sets', () => {
-        const generator = new StableDeviceIdGenerator();
-        // First scan
-        const id1 = generator.generateId('1234:5678', '/dev/hidraw0');
-        const id2 = generator.generateId('1234:5678', '/dev/hidraw1');
-        generator.pruneNotSeen();
-        // Second scan - should be able to reuse index 0, 1 etc
-        const id3 = generator.generateId('5678:1234', '/dev/hidraw3');
-        const id4 = generator.generateId('5678:1234', '/dev/hidraw4');
-        // All should be unique
-        expect(new Set([id1, id2, id3, id4]).size).toBe(4);
-    });
-    test('state preserved across multiple scan cycles', () => {
-        const generator = new StableDeviceIdGenerator();
-        // Scan 1: 3 devices
-        const scan1_dev0 = generator.generateId('1234:5678', '/dev/hidraw0');
-        const scan1_dev1 = generator.generateId('1234:5678', '/dev/hidraw1');
-        const scan1_dev2 = generator.generateId('1234:5678', '/dev/hidraw2');
-        generator.pruneNotSeen();
-        // Scan 2: same 3 devices
-        const scan2_dev0 = generator.generateId('1234:5678', '/dev/hidraw0');
-        const scan2_dev1 = generator.generateId('1234:5678', '/dev/hidraw1');
-        const scan2_dev2 = generator.generateId('1234:5678', '/dev/hidraw2');
-        generator.pruneNotSeen();
-        // Scan 3: same 3 devices
-        const scan3_dev0 = generator.generateId('1234:5678', '/dev/hidraw0');
-        const scan3_dev1 = generator.generateId('1234:5678', '/dev/hidraw1');
-        const scan3_dev2 = generator.generateId('1234:5678', '/dev/hidraw2');
-        generator.pruneNotSeen();
-        // All scans should return identical IDs for same paths
-        expect(scan2_dev0).toBe(scan1_dev0);
-        expect(scan2_dev1).toBe(scan1_dev1);
-        expect(scan2_dev2).toBe(scan1_dev2);
-        expect(scan3_dev0).toBe(scan1_dev0);
-        expect(scan3_dev1).toBe(scan1_dev1);
-        expect(scan3_dev2).toBe(scan1_dev2);
-    });
-    test('device reconnection at different path reuses counter', () => {
-        const generator = new StableDeviceIdGenerator();
-        // Scan 1: device at hidraw0
-        const id1 = generator.generateId('1234:5678', '/dev/hidraw0');
-        generator.pruneNotSeen();
-        // Scan 2: device disconnected (not seen)
-        generator.pruneNotSeen();
-        // Scan 3: same device type reconnects at different path
-        const id2 = generator.generateId('1234:5678', '/dev/hidraw5');
-        generator.pruneNotSeen();
-        // Gets same ID because counter resets and it's index 0 again for this uniqueness key
-        expect(id2).toBe(id1);
-        // But now if we add another device of same type, it gets different ID
-        const id3 = generator.generateId('1234:5678', '/dev/hidraw6');
-        expect(id3).not.toBe(id2);
-    });
-    test('handles partial device changes between scans', () => {
-        const generator = new StableDeviceIdGenerator();
-        // Scan 1: 4 devices
-        const dev0_scan1 = generator.generateId('1234:5678', '/dev/hidraw0');
-        const _dev1_scan1 = generator.generateId('1234:5678', '/dev/hidraw1');
-        const _dev2_scan1 = generator.generateId('1234:5678', '/dev/hidraw2');
-        const dev3_scan1 = generator.generateId('1234:5678', '/dev/hidraw3');
-        generator.pruneNotSeen();
-        // Scan 2: hidraw1 and hidraw2 removed, hidraw4 added
-        const dev0_scan2 = generator.generateId('1234:5678', '/dev/hidraw0');
-        const dev3_scan2 = generator.generateId('1234:5678', '/dev/hidraw3');
-        const dev4_scan2 = generator.generateId('1234:5678', '/dev/hidraw4');
-        generator.pruneNotSeen();
-        // Persistent devices keep their IDs
-        expect(dev0_scan2).toBe(dev0_scan1);
-        expect(dev3_scan2).toBe(dev3_scan1);
-        // New device gets next available counter index (reuses counter after reset)
-        // After reset, counter 0 goes to dev0, counter 1 goes to dev3, counter 2 goes to dev4
-        expect(dev4_scan2).not.toBe(dev0_scan1);
-        expect(dev4_scan2).not.toBe(dev3_scan1);
-        // All current IDs are unique
-        expect(new Set([dev0_scan2, dev3_scan2, dev4_scan2]).size).toBe(3);
-    });
-    test('multiple device types tracked independently', () => {
-        const generator = new StableDeviceIdGenerator();
-        // Scan 1: different device types
-        const typeA_dev0 = generator.generateId('1111:2222', '/dev/hidraw0');
-        const typeB_dev1 = generator.generateId('3333:4444', '/dev/hidraw1');
-        const _typeA_dev2 = generator.generateId('1111:2222', '/dev/hidraw2');
-        generator.pruneNotSeen();
-        // Scan 2: one device of each type removed
-        const typeA_dev0_s2 = generator.generateId('1111:2222', '/dev/hidraw0');
-        const typeB_dev1_s2 = generator.generateId('3333:4444', '/dev/hidraw1');
-        generator.pruneNotSeen();
-        // IDs should be preserved
-        expect(typeA_dev0_s2).toBe(typeA_dev0);
-        expect(typeB_dev1_s2).toBe(typeB_dev1);
-        // Scan 3: add another typeA device at new path
-        const typeA_dev0_s3 = generator.generateId('1111:2222', '/dev/hidraw0');
-        const typeB_dev1_s3 = generator.generateId('3333:4444', '/dev/hidraw1');
-        const typeA_dev3_s3 = generator.generateId('1111:2222', '/dev/hidraw3');
-        expect(typeA_dev0_s3).toBe(typeA_dev0);
-        expect(typeB_dev1_s3).toBe(typeB_dev1);
-        // New path for typeA gets next counter index (different from dev0)
-        expect(typeA_dev3_s3).not.toBe(typeA_dev0);
-        // All current devices have unique IDs
-        expect(new Set([typeA_dev0_s3, typeB_dev1_s3, typeA_dev3_s3]).size).toBe(3);
-    });
-});
-//# sourceMappingURL=util.test.js.map

package/dist/__tests__/util.test.js.map

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