incyclist-devices 3.0.8 → 3.0.10

package/lib/cjs/antv2/base/interface.js

@@ -144,6 +144,9 @@ class AntInterface extends node_events_1.EventEmitter {
         this.connected = false;
         return closed;
     }
+    async terminate() {
+        await this.disconnect();
+    }
     onError(profile, error) {
         this.logEvent({ message: 'ANT+ERROR:', profile, error });
     }

package/lib/cjs/bindings/crypto/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/bindings/index.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BindingsFactory = void 0;
+class BindingsFactory {
+    static instance;
+    binding;
+    static getInstance() {
+        this.instance = this.instance ?? new BindingsFactory();
+        return this.instance;
+    }
+    getBinding() {
+        return this.binding;
+    }
+    setBinding(binding) {
+        this.binding = binding;
+    }
+}
+exports.BindingsFactory = BindingsFactory;

package/lib/cjs/bindings/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/ble/base/interface.js

@@ -115,7 +115,6 @@ class BleInterface extends node_events_1.EventEmitter {
             return false;
         }
         if (this.isConnecting()) {
-            this.logEvent({ message: 'BLE connect - already connecting' });
             return this.connectTask.getPromise();
         }
         this.logEvent({ message: 'BLE connect request' });
@@ -184,6 +183,9 @@ class BleInterface extends node_events_1.EventEmitter {
         const success = await this.disconnectTask.run().catch(() => false);
         return success;
     }
+    async terminate() {
+        await this.disconnect();
+    }
     isConnected() {
         return this.confirmedBleState === 'poweredOn';
     }
@@ -404,7 +406,7 @@ class BleInterface extends node_events_1.EventEmitter {
         this.addService(announcement);
     }
     checkForWahooEnhancement(announcement) {
-        if (announcement.name.includes('KICKR')) {
+        if (announcement.name.includes('KICKR') || announcement.name.includes('Zwift')) {
             const supported = announcement.serviceUUIDs.map(s => (0, utils_js_1.beautifyUUID)(s));
             if (supported.length === 1 && (supported[0] === '1818' || supported[0] === 'FC82')) {
                 return true;
@@ -629,6 +631,9 @@ class BleInterface extends node_events_1.EventEmitter {
         });
     }
     onError(err) {
+        if (typeof err === 'string') {
+            this.logError(new Error(err), 'BLE connect');
+        }
         this.logError(err, 'BLE connect');
     }
     async onConnected() {

package/lib/cjs/ble/zwift/play/sensor.js

@@ -4,8 +4,8 @@ exports.BleZwiftPlaySensor = void 0;
 const zwift_hub_js_1 = require("../../../proto/zwift_hub.js");
 const sensor_js_1 = require("../../base/sensor.js");
 const utils_js_1 = require("../../utils.js");
-const node_crypto_1 = require("node:crypto");
 const node_events_1 = require("node:events");
+const index_js_1 = require("../../../bindings/index.js");
 class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
     static profile = 'Controller';
     static protocol = 'zwift-play';
@@ -479,11 +479,19 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
     }
     reset() {
     }
+    getCrypto() {
+        let crypto = index_js_1.BindingsFactory.getInstance()?.getBinding()?.crypto;
+        if (!crypto)
+            crypto = require('node:crypto');
+        return crypto;
+    }
     encryptedSupported() {
-        return node_crypto_1.generateKeyPairSync !== undefined && typeof (node_crypto_1.generateKeyPairSync) === 'function';
+        const crypto = this.getCrypto();
+        return crypto?.generateKeyPairSync !== undefined && typeof (crypto?.generateKeyPairSync) === 'function';
     }
     createKeyPair() {
-        return (0, node_crypto_1.generateKeyPairSync)('ec', {
+        const crypto = this.getCrypto();
+        return crypto.generateKeyPairSync('ec', {
             namedCurve: 'prime256v1',
             publicKeyEncoding: { type: 'spki', format: 'der' },
             privateKeyEncoding: { type: 'pkcs8', format: 'der' }

package/lib/cjs/direct-connect/base/interface.js

@@ -144,13 +144,16 @@ class DirectConnectInterface extends node_events_1.EventEmitter {
             return true;
         this.logEvent({ message: 'Disconnecting from Direct Connect' });
         await this.stopScan();
+        return true;
+    }
+    async terminate() {
+        await this.disconnect();
         this.getBinding()?.mdns?.disconnect();
         this.internalEvents.removeAllListeners();
         this.connected = false;
         const disconnected = !this.isConnected();
         if (disconnected)
             this.emit('disconnect');
-        return disconnected;
     }
     isConnected() {
         return this.connected && this.getBinding()?.mdns !== undefined && this.binding.mdns !== null;
@@ -159,7 +162,7 @@ class DirectConnectInterface extends node_events_1.EventEmitter {
         this.logDisabled = false;
         if (this.isScanning()) {
             this.logEvent({ message: 'starting scan - already scanning' });
-            await this.scanTask.getPromise();
+            await this.scanTask?.getPromise();
         }
         this.logEvent({ message: 'starting scan ..' });
         await this.reconnect();
@@ -177,7 +180,7 @@ class DirectConnectInterface extends node_events_1.EventEmitter {
         if (!this.isScanning())
             return true;
         this.logEvent({ message: 'stopping scan ...', interface: 'wifi' });
-        const res = await this.scanTask.stop();
+        const res = await this.scanTask?.stop();
         delete this.scanTask;
         return (res === true);
     }

package/lib/cjs/index.js

@@ -49,3 +49,4 @@ __exportStar(require("./antv2/index.js"), exports);
 __exportStar(require("./direct-connect/index.js"), exports);
 __exportStar(require("./features/index.js"), exports);
 __exportStar(require("./proto/zwift_hub.js"), exports);
+__exportStar(require("./bindings/index.js"), exports);

package/lib/cjs/serial/base/serial-interface.js

@@ -118,6 +118,9 @@ class SerialInterface extends node_events_1.EventEmitter {
         this.connected = false;
         return true;
     }
+    async terminate() {
+        await this.disconnect();
+    }
     async openPort(path) {
         this.logEvent({ message: 'opening port', port: path });
         const existing = this.ports.findIndex(p => p.path === path);

package/lib/esm/antv2/base/interface.js

@@ -139,6 +139,9 @@ export default class AntInterface extends EventEmitter {
         this.connected = false;
         return closed;
     }
+    async terminate() {
+        await this.disconnect();
+    }
     onError(profile, error) {
         this.logEvent({ message: 'ANT+ERROR:', profile, error });
     }

package/lib/esm/bindings/crypto/index.js

@@ -0,0 +1,14 @@
+export class BindingsFactory {
+    static instance;
+    binding;
+    static getInstance() {
+        this.instance = this.instance ?? new BindingsFactory();
+        return this.instance;
+    }
+    getBinding() {
+        return this.binding;
+    }
+    setBinding(binding) {
+        this.binding = binding;
+    }
+}

package/lib/esm/bindings/crypto/types.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/bindings/index.js

@@ -0,0 +1,14 @@
+export class BindingsFactory {
+    static instance;
+    binding;
+    static getInstance() {
+        this.instance = this.instance ?? new BindingsFactory();
+        return this.instance;
+    }
+    getBinding() {
+        return this.binding;
+    }
+    setBinding(binding) {
+        this.binding = binding;
+    }
+}

package/lib/esm/bindings/types.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/ble/base/interface.js

@@ -112,7 +112,6 @@ export class BleInterface extends EventEmitter {
             return false;
         }
         if (this.isConnecting()) {
-            this.logEvent({ message: 'BLE connect - already connecting' });
             return this.connectTask.getPromise();
         }
         this.logEvent({ message: 'BLE connect request' });
@@ -181,6 +180,9 @@ export class BleInterface extends EventEmitter {
         const success = await this.disconnectTask.run().catch(() => false);
         return success;
     }
+    async terminate() {
+        await this.disconnect();
+    }
     isConnected() {
         return this.confirmedBleState === 'poweredOn';
     }
@@ -401,7 +403,7 @@ export class BleInterface extends EventEmitter {
         this.addService(announcement);
     }
     checkForWahooEnhancement(announcement) {
-        if (announcement.name.includes('KICKR')) {
+        if (announcement.name.includes('KICKR') || announcement.name.includes('Zwift')) {
             const supported = announcement.serviceUUIDs.map(s => beautifyUUID(s));
             if (supported.length === 1 && (supported[0] === '1818' || supported[0] === 'FC82')) {
                 return true;
@@ -626,6 +628,9 @@ export class BleInterface extends EventEmitter {
         });
     }
     onError(err) {
+        if (typeof err === 'string') {
+            this.logError(new Error(err), 'BLE connect');
+        }
         this.logError(err, 'BLE connect');
     }
     async onConnected() {

package/lib/esm/ble/bindings/crypto/types.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/ble/zwift/play/sensor.js

@@ -1,8 +1,8 @@
 import { ClickKeyPadStatus, DeviceDataEnvelope, DeviceInformationContent, DeviceSettings, HubCommand, HubRequest, HubRidingData, Idle, PlayButtonStatus, TrainerResponse } from "../../../proto/zwift_hub.js";
 import { TBleSensor } from "../../base/sensor.js";
 import { beautifyUUID, fullUUID } from "../../utils.js";
-import { generateKeyPairSync } from 'node:crypto';
 import { EventEmitter } from "node:events";
+import { BindingsFactory } from "../../../bindings/index.js";
 export class BleZwiftPlaySensor extends TBleSensor {
     static profile = 'Controller';
     static protocol = 'zwift-play';
@@ -476,11 +476,19 @@ export class BleZwiftPlaySensor extends TBleSensor {
     }
     reset() {
     }
+    getCrypto() {
+        let crypto = BindingsFactory.getInstance()?.getBinding()?.crypto;
+        if (!crypto)
+            crypto = require('node:crypto');
+        return crypto;
+    }
     encryptedSupported() {
-        return generateKeyPairSync !== undefined && typeof (generateKeyPairSync) === 'function';
+        const crypto = this.getCrypto();
+        return crypto?.generateKeyPairSync !== undefined && typeof (crypto?.generateKeyPairSync) === 'function';
     }
     createKeyPair() {
-        return generateKeyPairSync('ec', {
+        const crypto = this.getCrypto();
+        return crypto.generateKeyPairSync('ec', {
             namedCurve: 'prime256v1',
             publicKeyEncoding: { type: 'spki', format: 'der' },
             privateKeyEncoding: { type: 'pkcs8', format: 'der' }

package/lib/esm/direct-connect/base/interface.js

@@ -141,13 +141,16 @@ export default class DirectConnectInterface extends EventEmitter {
             return true;
         this.logEvent({ message: 'Disconnecting from Direct Connect' });
         await this.stopScan();
+        return true;
+    }
+    async terminate() {
+        await this.disconnect();
         this.getBinding()?.mdns?.disconnect();
         this.internalEvents.removeAllListeners();
         this.connected = false;
         const disconnected = !this.isConnected();
         if (disconnected)
             this.emit('disconnect');
-        return disconnected;
     }
     isConnected() {
         return this.connected && this.getBinding()?.mdns !== undefined && this.binding.mdns !== null;
@@ -156,7 +159,7 @@ export default class DirectConnectInterface extends EventEmitter {
         this.logDisabled = false;
         if (this.isScanning()) {
             this.logEvent({ message: 'starting scan - already scanning' });
-            await this.scanTask.getPromise();
+            await this.scanTask?.getPromise();
         }
         this.logEvent({ message: 'starting scan ..' });
         await this.reconnect();
@@ -174,7 +177,7 @@ export default class DirectConnectInterface extends EventEmitter {
         if (!this.isScanning())
             return true;
         this.logEvent({ message: 'stopping scan ...', interface: 'wifi' });
-        const res = await this.scanTask.stop();
+        const res = await this.scanTask?.stop();
         delete this.scanTask;
         return (res === true);
     }

package/lib/esm/index.js

@@ -15,4 +15,5 @@ export * from './antv2/index.js';
 export * from './direct-connect/index.js';
 export * from './features/index.js';
 export * from './proto/zwift_hub.js';
+export * from './bindings/index.js';
 export { IncyclistDevice, AdapterFactory, InterfaceFactory, INTERFACE, IncyclistCapability, calc, MockBinding, BleHrMock, DaumClassicMock, DaumClassicSimulator, DaumClassicMockImpl, DaumPremiumMock, DaumPremiumMockImpl, DaumPremiumMockSimulator };

package/lib/esm/serial/base/serial-interface.js

@@ -113,6 +113,9 @@ export default class SerialInterface extends EventEmitter {
         this.connected = false;
         return true;
     }
+    async terminate() {
+        await this.disconnect();
+    }
     async openPort(path) {
         this.logEvent({ message: 'opening port', port: path });
         const existing = this.ports.findIndex(p => p.path === path);

package/lib/types/antv2/base/interface.d.ts

@@ -39,6 +39,7 @@ export default class AntInterface extends EventEmitter implements IncyclistInter
     isConnected(): boolean;
     connect(): Promise<boolean>;
     disconnect(): Promise<boolean>;
+    terminate(): Promise<void>;
     onError(profile: any, error: any): void;
     onData(profile: any, id: any, data: any, tag: any): void;
     getReconnectPause(): number;

package/lib/types/bindings/crypto/index.d.ts

@@ -0,0 +1,8 @@
+import { IDeviceBinding } from "../types";
+export declare class BindingsFactory {
+    protected static instance: BindingsFactory;
+    protected binding: IDeviceBinding | undefined;
+    protected static getInstance(): BindingsFactory;
+    getBinding(): IDeviceBinding | undefined;
+    setBinding(binding: IDeviceBinding): void;
+}

package/lib/types/bindings/crypto/types.d.ts

@@ -0,0 +1,45 @@
+export type KeyFormat = 'pem' | 'der';
+export type KeyType = 'rsa' | 'rsa-pss' | 'dsa' | 'ec' | 'ed25519' | 'ed448' | 'x25519' | 'x448';
+export interface KeyEncodingOptions {
+    type: 'pkcs1' | 'pkcs8' | 'spki' | 'sec1';
+    format: KeyFormat;
+}
+export interface GenerateKeyPairOptions {
+    modulusLength?: number;
+    publicExponent?: number;
+    namedCurve?: string;
+    publicKeyEncoding: KeyEncodingOptions;
+    privateKeyEncoding: KeyEncodingOptions;
+}
+export interface KeyPair {
+    publicKey: string | Buffer<ArrayBufferLike>;
+    privateKey: string | Buffer<ArrayBufferLike>;
+}
+export interface IHash {
+    update(data: string | Buffer<ArrayBufferLike>): IHash;
+    digest(encoding: 'hex' | 'base64'): string;
+    digest(): Buffer<ArrayBufferLike>;
+}
+export interface IHmac {
+    update(data: string | Buffer<ArrayBufferLike>): IHmac;
+    digest(encoding: 'hex' | 'base64'): string;
+    digest(): Buffer<ArrayBufferLike>;
+}
+export interface ICipher {
+    update(data: Buffer<ArrayBufferLike>): Buffer<ArrayBufferLike>;
+    final(): Buffer<ArrayBufferLike>;
+    setAutoPadding(autoPadding?: boolean): ICipher;
+}
+export interface IDecipher {
+    update(data: Buffer<ArrayBufferLike>): Buffer<ArrayBufferLike>;
+    final(): Buffer<ArrayBufferLike>;
+    setAutoPadding(autoPadding?: boolean): IDecipher;
+}
+export interface ICryptoBinding {
+    randomBytes(size: number): Buffer<ArrayBufferLike>;
+    createHash(algorithm: string): IHash;
+    createHmac(algorithm: string, key: string | Buffer<ArrayBufferLike>): IHmac;
+    createCipheriv(algorithm: string, key: Buffer<ArrayBufferLike>, iv: Buffer<ArrayBufferLike>): ICipher;
+    createDecipheriv(algorithm: string, key: Buffer<ArrayBufferLike>, iv: Buffer<ArrayBufferLike>): IDecipher;
+    generateKeyPairSync(type: KeyType, options: GenerateKeyPairOptions): KeyPair;
+}

package/lib/types/bindings/index.d.ts

@@ -0,0 +1,8 @@
+import { IDeviceBinding } from "./types";
+export declare class BindingsFactory {
+    protected static instance: BindingsFactory;
+    protected binding: IDeviceBinding | undefined;
+    static getInstance(): BindingsFactory;
+    getBinding(): IDeviceBinding | undefined;
+    setBinding(binding: IDeviceBinding): void;
+}

package/lib/types/bindings/types.d.ts

@@ -0,0 +1,4 @@
+import { ICryptoBinding } from "./crypto/types";
+export interface IDeviceBinding {
+    crypto: ICryptoBinding;
+}

package/lib/types/ble/base/interface.d.ts

@@ -54,6 +54,7 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     connect(reconnect?: boolean): Promise<boolean>;
     connectInternal(reconnect?: boolean): Promise<boolean>;
     disconnect(connectionLost?: boolean): Promise<boolean>;
+    terminate(): Promise<void>;
     isConnected(): boolean;
     registerConnected(peripheral: IBlePeripheral, id: string): void;
     unregisterConnected(id: string): void;
@@ -101,7 +102,7 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     addKnownDevice(_settings: BleDeviceSettings): void;
     protected connectBle(): Promise<boolean>;
     protected waitForBleConnected(): Promise<boolean>;
-    protected onError(err: Error): void;
+    protected onError(err: Error | string): void;
     protected onConnected(): Promise<void>;
     protected onDisconnected(): Promise<void>;
     protected onBleStateChange(state: BleInterfaceState): Promise<void>;

package/lib/types/ble/bindings/crypto/types.d.ts

@@ -0,0 +1,45 @@
+export type KeyFormat = 'pem' | 'der';
+export type KeyType = 'rsa' | 'rsa-pss' | 'dsa' | 'ec' | 'ed25519' | 'ed448' | 'x25519' | 'x448';
+export interface KeyEncodingOptions {
+    type: 'pkcs1' | 'pkcs8' | 'spki' | 'sec1';
+    format: KeyFormat;
+}
+export interface GenerateKeyPairOptions {
+    modulusLength?: number;
+    publicExponent?: number;
+    namedCurve?: string;
+    publicKeyEncoding: KeyEncodingOptions;
+    privateKeyEncoding: KeyEncodingOptions;
+}
+export interface KeyPair {
+    publicKey: string | Buffer<ArrayBufferLike>;
+    privateKey: string | Buffer<ArrayBufferLike>;
+}
+export interface IHash {
+    update(data: string | Buffer<ArrayBufferLike>): IHash;
+    digest(encoding: 'hex' | 'base64'): string;
+    digest(): Buffer<ArrayBufferLike>;
+}
+export interface IHmac {
+    update(data: string | Buffer<ArrayBufferLike>): IHmac;
+    digest(encoding: 'hex' | 'base64'): string;
+    digest(): Buffer<ArrayBufferLike>;
+}
+export interface ICipher {
+    update(data: Buffer<ArrayBufferLike>): Buffer<ArrayBufferLike>;
+    final(): Buffer<ArrayBufferLike>;
+    setAutoPadding(autoPadding?: boolean): ICipher;
+}
+export interface IDecipher {
+    update(data: Buffer<ArrayBufferLike>): Buffer<ArrayBufferLike>;
+    final(): Buffer<ArrayBufferLike>;
+    setAutoPadding(autoPadding?: boolean): IDecipher;
+}
+export interface ICryptoBinding {
+    randomBytes(size: number): Buffer<ArrayBufferLike>;
+    createHash(algorithm: string): IHash;
+    createHmac(algorithm: string, key: string | Buffer<ArrayBufferLike>): IHmac;
+    createCipheriv(algorithm: string, key: Buffer<ArrayBufferLike>, iv: Buffer<ArrayBufferLike>): ICipher;
+    createDecipheriv(algorithm: string, key: Buffer<ArrayBufferLike>, iv: Buffer<ArrayBufferLike>): IDecipher;
+    generateKeyPairSync(type: KeyType, options: GenerateKeyPairOptions): KeyPair;
+}

package/lib/types/ble/zwift/play/sensor.d.ts

@@ -4,6 +4,7 @@ import { DeviceSettingsSubContent, HubCommand, HubRequest, SimulationParam } fro
 import { TBleSensor } from "../../base/sensor.js";
 import { BleProtocol, IBlePeripheral } from "../../types.js";
 import { EventEmitter } from "node:events";
+import { ICryptoBinding } from "../../../bindings/crypto/types.js";
 type ButtonState = {
     pressed: boolean;
     timestamp: number;
@@ -62,6 +63,7 @@ export declare class BleZwiftPlaySensor extends TBleSensor {
     read(characteristic: string, ignoreErrors?: boolean): Promise<Buffer | null>;
     pair(): Promise<boolean>;
     reset(): void;
+    protected getCrypto(): ICryptoBinding;
     protected encryptedSupported(): boolean;
     protected createKeyPair(): any;
     protected setInitialState(): void;

package/lib/types/direct-connect/base/interface.d.ts

@@ -24,7 +24,7 @@ export default class DirectConnectInterface extends EventEmitter implements IBle
     protected logDisabled: boolean;
     protected internalEvents: EventEmitter;
     protected services: Announcement[];
-    protected scanTask: InteruptableTask<TaskState, DeviceSettings[]>;
+    protected scanTask: InteruptableTask<TaskState, DeviceSettings[]> | undefined;
     protected matching?: Array<string>;
     protected instance: number;
     protected connected: boolean;
@@ -43,6 +43,7 @@ export default class DirectConnectInterface extends EventEmitter implements IBle
     autoConnect(): void;
     connect(reconnect?: boolean): Promise<boolean>;
     disconnect(): Promise<boolean>;
+    terminate(): Promise<void>;
     isConnected(): boolean;
     scan(props: DirectConnectScanProps): Promise<DeviceSettings[]>;
     stopScan(): Promise<boolean>;

package/lib/types/index.d.ts

@@ -19,4 +19,5 @@ export * from './antv2/index.js';
 export * from './direct-connect/index.js';
 export * from './features/index.js';
 export * from './proto/zwift_hub.js';
+export * from './bindings/index.js';
 export { IAdapter, IncyclistDevice, IncyclistDeviceAdapter, DeviceSettings, DeviceProperties, AdapterFactory, InterfaceFactory, IncyclistInterface, INTERFACE, InterfaceProps, ICyclingMode, IncyclistAdapterData as DeviceData, IncyclistCapability, calc, MockBinding, BleHrMock, DaumClassicMock, DaumClassicSimulator, DaumClassicMockImpl, DaumPremiumMock, DaumPremiumMockImpl, DaumPremiumMockSimulator };

package/lib/types/serial/base/serial-interface.d.ts

@@ -26,6 +26,7 @@ export default class SerialInterface extends EventEmitter implements IncyclistIn
     releaseInUse(path: string): void;
     connect(): Promise<boolean>;
     disconnect(): Promise<boolean>;
+    terminate(): Promise<void>;
     openPort(path: string): Promise<SerialPortStream | null>;
     closePort(path: string): Promise<boolean>;
     scan(props: SerialScannerProps): Promise<SerialDeviceSettings[]>;

package/lib/types/types/interface.d.ts

@@ -12,6 +12,7 @@ export interface IncyclistInterface extends EventEmitter {
     setBinding(binding: any): void;
     connect(): Promise<boolean>;
     disconnect(): Promise<boolean>;
+    terminate(): Promise<void>;
     isConnected(): boolean;
     scan(props: IncyclistScanProps): Promise<DeviceSettings[]>;
     stopScan(): Promise<boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "incyclist-devices",
-    "version": "3.0.8",
+    "version": "3.0.10",
     "scripts": {
         "lint": "eslint . --ext .ts",
         "build": "npm run build:esm && npm run build:cjs",