incyclist-devices 2.1.7 → 2.1.8

package/lib/ble/types.d.ts

@@ -10,6 +10,7 @@ export interface BleBinding extends EventEmitter {
     stopScanning(callback?: () => void): void;
     pauseLogging(): any;
     resumeLogging(): any;
+    setServerDebug(enabled: boolean): any;
     _bindings: any;
     state: BleInterfaceState;
     on(eventName: string | symbol, listener: (...args: any[]) => void): this;

package/lib/ble/wahoo/comms.js

@@ -34,8 +34,9 @@ class BleWahooDevice extends comms_1.default {
     static isMatching(characteristics) {
         if (!characteristics)
             return false;
-        const hasWahooCP = characteristics.find(c => (0, utils_1.matches)(c, consts_2.WAHOO_ADVANCED_TRAINER_CP)) !== undefined;
-        const hasFTMS = characteristics.find(c => (0, utils_1.matches)(c, consts_2.FTMS_CP)) !== undefined;
+        const announced = characteristics.map(c => (0, utils_1.uuid)(c));
+        const hasWahooCP = announced.find(c => (0, utils_1.matches)(c, consts_2.WAHOO_ADVANCED_TRAINER_CP)) !== undefined;
+        const hasFTMS = announced.find(c => (0, utils_1.matches)(c, consts_2.FTMS_CP)) !== undefined;
         return hasWahooCP && !hasFTMS;
     }
     init() {

package/package.json

@@ -1,51 +1,51 @@
-{
-  "name": "incyclist-devices",
-  "version": "2.1.7",
-  "dependencies": {
-    "@serialport/bindings-interface": "^1.2.2",
-    "@serialport/parser-byte-length": "^9.0.1",
-    "@serialport/parser-delimiter": "^9.0.1",
-    "@serialport/parser-readline": "^10.5.0",
-    "@serialport/stream": "^10.5.0",
-    "incyclist-ant-plus": "^0.2.0",
-    "win32filetime": "^1.0.2"
-  },
-  "peerDependencies": {
-    "gd-eventlog": "^0.1.24"
-  },
-  "devDependencies": {
-    "@serialport/binding-mock": "^10.2.2",
-    "@serialport/bindings-cpp": "^10.8.0",
-    "@types/jest": "^29.5.3",
-    "@types/node": "^20.5.0",
-    "eslint": "^8.47.0",
-    "eslint-config-react-app": "^7.0.1",
-    "jest": "^29.6.2",
-    "ts-jest": "^29.1.1",
-    "typescript": "^5.1.6"
-  },
-  "scripts": {
-    "lint": "eslint . --ext .ts",
-    "build": "tsc",
-    "test": "npx jest --coverage",
-    "test:ci": "npx jest --coverage --forceExit",
-    "dev": "tsc --watch",
-    "postversion": "git push && git push --tags"
-  },
-  "files": [
-    "lib/"
-  ],
-  "main": "lib/index.js",
-  "directories": {
-    "example": "./sample",
-    "lib": "./src"
-  },
-  "eslintConfig": {
-    "extends": "react-app",
-    "rules": {
-      "jsx-a11y/anchor-is-valid": [
-        "off"
-      ]
-    }
-  }
-}
+{
+  "name": "incyclist-devices",
+  "version": "2.1.8",
+  "dependencies": {
+    "@serialport/bindings-interface": "^1.2.2",
+    "@serialport/parser-byte-length": "^9.0.1",
+    "@serialport/parser-delimiter": "^9.0.1",
+    "@serialport/parser-readline": "^10.5.0",
+    "@serialport/stream": "^10.5.0",
+    "incyclist-ant-plus": "^0.2.0",
+    "win32filetime": "^1.0.2"
+  },
+  "peerDependencies": {
+    "gd-eventlog": "^0.1.24"
+  },
+  "devDependencies": {
+    "@serialport/binding-mock": "^10.2.2",
+    "@serialport/bindings-cpp": "^10.8.0",
+    "@types/jest": "^29.5.3",
+    "@types/node": "^20.5.0",
+    "eslint": "^8.47.0",
+    "eslint-config-react-app": "^7.0.1",
+    "jest": "^29.6.2",
+    "ts-jest": "^29.1.1",
+    "typescript": "^5.1.6"
+  },
+  "scripts": {
+    "lint": "eslint . --ext .ts",
+    "build": "tsc",
+    "test": "npx jest --coverage",
+    "test:ci": "npx jest --coverage --forceExit",
+    "dev": "tsc --watch",
+    "postversion": "git push && git push --tags"
+  },
+  "files": [
+    "lib/"
+  ],
+  "main": "lib/index.js",
+  "directories": {
+    "example": "./sample",
+    "lib": "./src"
+  },
+  "eslintConfig": {
+    "extends": "react-app",
+    "rules": {
+      "jsx-a11y/anchor-is-valid": [
+        "off"
+      ]
+    }
+  }
+}

package/lib/adapters.d.ts

@@ -1,7 +0,0 @@
-import { IncyclistDeviceAdapter } from "./base/adpater";
-import { DeviceProperties, DeviceSettings } from "./types/device";
-export default class AdapterFactory {
-    static adapters: IncyclistDeviceAdapter[];
-    static reset(): void;
-    static create(settings: DeviceSettings, props?: DeviceProperties): any;
-}

package/lib/adapters.js

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const antv2_1 = require("./antv2");
-const ble_1 = require("./ble");
-const serial_1 = require("./serial");
-const Simulator_1 = require("./simulator/Simulator");
-const device_1 = require("./types/device");
-class AdapterFactory {
-    static reset() {
-        AdapterFactory.adapters = [];
-        ble_1.BleAdapterFactory.getInstance().instances = [];
-    }
-    static create(settings, props) {
-        const adapters = AdapterFactory.adapters;
-        if (!settings.interface && settings.protocol === 'Simulator') {
-            const adapter = new Simulator_1.Simulator(settings);
-            if (adapter) {
-                adapters.push(adapter);
-            }
-            return adapter;
-        }
-        const existing = adapters.find(a => a.isEqual(settings));
-        if (existing)
-            return existing;
-        const ifaceName = typeof settings.interface === 'string' ? settings.interface : settings.interface.getName();
-        let adapter;
-        switch (ifaceName) {
-            case device_1.INTERFACE.SERIAL:
-            case device_1.INTERFACE.TCPIP:
-                adapter = serial_1.SerialAdapterFactory.getInstance().createInstance(settings, props);
-                break;
-            case device_1.INTERFACE.ANT:
-                adapter = antv2_1.AntAdapterFactory.getInstance().createInstance(settings, props);
-                break;
-            case device_1.INTERFACE.BLE:
-                adapter = ble_1.BleAdapterFactory.getInstance().createInstance(settings, props);
-                break;
-            case device_1.INTERFACE.SIMULATOR:
-                adapter = new Simulator_1.Simulator(settings, props);
-                break;
-        }
-        if (adapter) {
-            adapters.push(adapter);
-        }
-        return adapter;
-    }
-}
-AdapterFactory.adapters = [];
-exports.default = AdapterFactory;

package/lib/antv2/adapter-factory.d.ts

@@ -1,14 +0,0 @@
-import { Profile } from "incyclist-ant-plus";
-import AntAdapter from "./base/adapter";
-import { AntDeviceProperties, AntDeviceSettings, LegacyProfile, BaseDeviceData } from "./types";
-import { AntAdapterInfo, AdapterQuery } from "./types";
-export default class AntAdapterFactory {
-    static _instance: AntAdapterFactory;
-    adapters: AntAdapterInfo[];
-    static getInstance(): AntAdapterFactory;
-    constructor();
-    register<TDeviceData extends BaseDeviceData>(antProfile: Profile, incyclistProfile: LegacyProfile, Adapter: typeof AntAdapter<TDeviceData>): void;
-    getAdapter(query?: AdapterQuery): any;
-    createInstance(settings: AntDeviceSettings, props?: AntDeviceProperties): any;
-    createFromDetected(profile: Profile, deviceID: number, props?: AntDeviceProperties): any;
-}

package/lib/antv2/adapter-factory.js

@@ -1,65 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class AntAdapterFactory {
-    static getInstance() {
-        if (!AntAdapterFactory._instance)
-            AntAdapterFactory._instance = new AntAdapterFactory();
-        return AntAdapterFactory._instance;
-    }
-    constructor() {
-        this.adapters = [];
-    }
-    register(antProfile, incyclistProfile, Adapter) {
-        const info = Object.assign({}, { antProfile, incyclistProfile, Adapter });
-        const existing = this.adapters.findIndex(a => a.antProfile === antProfile);
-        if (existing !== -1)
-            this.adapters[existing] = info;
-        else
-            this.adapters.push(info);
-    }
-    getAdapter(query) {
-        const { antProfile, incyclistProfile } = query;
-        if (!antProfile && !incyclistProfile)
-            throw new Error('Illegal arguments: either "antProfile" or "incyclistProfile" must be set');
-        let found;
-        if (antProfile)
-            found = this.adapters.find(a => a.antProfile === antProfile);
-        if (incyclistProfile)
-            found = this.adapters.find(a => a.incyclistProfile === incyclistProfile);
-        return found;
-    }
-    createInstance(settings, props) {
-        let info;
-        const { profile, protocol } = settings;
-        let isLegacy = false;
-        if (protocol) {
-            try {
-                const incyclistProfile = profile;
-                info = this.getAdapter({ incyclistProfile });
-                isLegacy = true;
-            }
-            catch (_a) {
-                isLegacy = false;
-            }
-        }
-        if (!isLegacy) {
-            const antProfile = profile;
-            info = this.getAdapter({ antProfile });
-        }
-        if (info && info.Adapter)
-            return new info.Adapter(settings, props);
-    }
-    createFromDetected(profile, deviceID, props) {
-        const info = this.getAdapter({ antProfile: profile });
-        if (!info || !info.Adapter)
-            return;
-        const settings = Object.assign({}, {
-            profile: info.incyclistProfile,
-            deviceID: deviceID.toString(),
-            interface: 'ant',
-            protocol: 'Ant'
-        });
-        return new info.Adapter(settings, props);
-    }
-}
-exports.default = AntAdapterFactory;