incyclist-devices 3.0.9 → 3.0.10

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

@@ -406,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;

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/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/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

@@ -403,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;

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/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/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/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/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/package.json

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