incyclist-devices 2.1.1 → 2.1.3

package/lib/ble/elite/adapter.js

@@ -109,14 +109,8 @@ class BleEliteAdapter extends adapter_1.default {
             }
         });
     }
-    sendUpdate(request) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.paused)
-                return;
-            this.getCyclingMode().sendBikeUpdate(request);
-        });
-    }
 }
+BleEliteAdapter.INCYCLIST_PROFILE_NAME = 'Smart Trainer';
 BleEliteAdapter.controllers = {
     modes: [power_meter_1.default],
     default: power_meter_1.default

package/lib/ble/fm/adapter.d.ts

@@ -1,16 +1,17 @@
+import BleFitnessMachineDevice from './comms';
 import BleAdapter from '../base/adapter';
 import ICyclingMode, { CyclingMode } from '../../modes/types';
 import { IndoorBikeData } from './types';
 import { BleDeviceProperties, BleDeviceSettings, BleStartProperties } from '../types';
 import { IAdapter, IncyclistAdapterData, IncyclistBikeData } from '../../types';
-export default class BleFmAdapter extends BleAdapter {
+import { LegacyProfile } from '../../antv2/types';
+export default class BleFmAdapter extends BleAdapter<IndoorBikeData, BleFitnessMachineDevice> {
+    protected static INCYCLIST_PROFILE_NAME: LegacyProfile;
     distanceInternal: number;
     connectPromise: Promise<boolean>;
     constructor(settings: BleDeviceSettings, props?: BleDeviceProperties);
     isSame(device: IAdapter): boolean;
-    getProfile(): string;
     getName(): string;
-    getDisplayName(): string;
     isControllable(): boolean;
     getSupportedCyclingModes(): Array<typeof CyclingMode>;
     getDefaultCyclingMode(): ICyclingMode;

package/lib/ble/fm/adapter.js

@@ -40,15 +40,9 @@ class BleFmAdapter extends adapter_1.default {
             return false;
         return this.isEqual(device.settings);
     }
-    getProfile() {
-        return 'Smart Trainer';
-    }
     getName() {
         return `${this.device.name}`;
     }
-    getDisplayName() {
-        return this.getName();
-    }
     isControllable() {
         return true;
     }
@@ -258,4 +252,5 @@ class BleFmAdapter extends adapter_1.default {
         });
     }
 }
+BleFmAdapter.INCYCLIST_PROFILE_NAME = 'Smart Trainer';
 exports.default = BleFmAdapter;

package/lib/ble/hr/adapter.d.ts

@@ -1,12 +1,14 @@
 import BleAdapter from '../base/adapter';
+import BleHrmDevice from './comm';
 import { IncyclistAdapterData, IAdapter, DeviceProperties } from '../../types';
 import { BleDeviceSettings } from '../types';
 import { HrmData } from './types';
-export default class HrmAdapter extends BleAdapter {
+import { LegacyProfile } from '../../antv2/types';
+export default class HrmAdapter extends BleAdapter<HrmData, BleHrmDevice> {
+    protected static INCYCLIST_PROFILE_NAME: LegacyProfile;
     ignore: boolean;
     constructor(settings: BleDeviceSettings, props?: DeviceProperties);
     isSame(device: IAdapter): boolean;
-    getProfile(): string;
     getName(): string;
     getDisplayName(): string;
     mapData(deviceData: HrmData): IncyclistAdapterData;

package/lib/ble/hr/adapter.js

@@ -25,9 +25,6 @@ class HrmAdapter extends adapter_1.default {
             return false;
         return this.isEqual(device.settings);
     }
-    getProfile() {
-        return 'Heartrate Monitor';
-    }
     getName() {
         return `${this.device.name}`;
     }
@@ -42,4 +39,5 @@ class HrmAdapter extends adapter_1.default {
         return { heartrate };
     }
 }
+HrmAdapter.INCYCLIST_PROFILE_NAME = 'Heartrate Monitor';
 exports.default = HrmAdapter;

package/lib/ble/peripheral-cache.d.ts

@@ -1,4 +1,6 @@
 import BleAdapter from "./base/adapter";
+import { BleComms } from "./base/comms";
+import { BleDeviceData } from "./base/types";
 import BlePeripheralConnector from "./ble-peripheral";
 import { BleCharacteristic, BlePeripheral } from "./types";
 export interface PeripheralState {
@@ -18,7 +20,7 @@ export interface PeripheralCacheItem {
 }
 export default class BlePeripheralCache {
     peripherals: PeripheralCacheItem[];
-    findAdapter(adapter: BleAdapter): PeripheralCacheItem;
+    findAdapter(adapter: BleAdapter<BleDeviceData, BleComms>): PeripheralCacheItem;
     getConnector(peripheral: BlePeripheral): BlePeripheralConnector;
     getPeripheral(query: {
         id?: string;

package/lib/ble/tacx/adapter.d.ts

@@ -1,9 +1,11 @@
 import { BleFmAdapter } from '../fm';
 import { BleDeviceSettings, BleStartProperties } from '../types';
 import { DeviceProperties, IAdapter } from '../../types';
+import { LegacyProfile } from '../../antv2/types';
 export default class BleTacxFEAdapter extends BleFmAdapter {
+    protected static INCYCLIST_PROFILE_NAME: LegacyProfile;
     constructor(settings: BleDeviceSettings, props?: DeviceProperties);
     isSame(device: IAdapter): boolean;
-    getProfile(): string;
+    getProfile(): LegacyProfile;
     start(props?: BleStartProperties): Promise<any>;
 }

package/lib/ble/tacx/adapter.js

@@ -102,4 +102,5 @@ class BleTacxFEAdapter extends fm_1.BleFmAdapter {
         });
     }
 }
+BleTacxFEAdapter.INCYCLIST_PROFILE_NAME = 'Smart Trainer';
 exports.default = BleTacxFEAdapter;

package/lib/ble/wahoo/adapter.d.ts

@@ -1,9 +1,11 @@
 import { BleFmAdapter } from '../fm';
 import { BleDeviceProperties, BleDeviceSettings, BleStartProperties } from '../types';
 import { IAdapter } from '../../types';
+import { LegacyProfile } from '../../antv2/types';
 export default class BleWahooAdapter extends BleFmAdapter {
+    protected static INCYCLIST_PROFILE_NAME: LegacyProfile;
     constructor(settings: BleDeviceSettings, props?: BleDeviceProperties);
     isSame(device: IAdapter): boolean;
-    getProfile(): string;
+    getProfile(): LegacyProfile;
     start(props?: BleStartProperties): Promise<any>;
 }

package/lib/ble/wahoo/adapter.js

@@ -97,4 +97,5 @@ class BleWahooAdapter extends fm_1.BleFmAdapter {
         });
     }
 }
+BleWahooAdapter.INCYCLIST_PROFILE_NAME = 'Smart Trainer';
 exports.default = BleWahooAdapter;

package/lib/factories/interfaces.d.ts

@@ -1,6 +1,6 @@
 import { InterfaceProps } from "../types/interface";
 import { SerialInterface } from "../serial";
-import AntInterface from "../antv2/base/ant-interface";
+import AntInterface from "../antv2/base/interface";
 import { BleInterface } from "../ble";
 export default class InterfaceFactory {
     static create(ifaceName: string, props?: InterfaceProps): AntInterface | BleInterface | SerialInterface;

package/lib/factories/interfaces.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const serial_1 = require("../serial");
-const ant_interface_1 = __importDefault(require("../antv2/base/ant-interface"));
+const interface_1 = __importDefault(require("../antv2/base/interface"));
 const device_1 = require("../types/device");
 const ble_1 = require("../ble");
 class InterfaceFactory {
@@ -17,7 +17,7 @@ class InterfaceFactory {
                 return serial_1.SerialInterface.getInstance(serialProps);
             case device_1.INTERFACE.ANT:
                 const antProps = props;
-                return ant_interface_1.default.getInstance(antProps);
+                return interface_1.default.getInstance(antProps);
             case device_1.INTERFACE.BLE:
                 const bleProps = props;
                 return ble_1.BleInterface.getInstance(bleProps);

package/lib/modes/power-base.js

@@ -22,10 +22,7 @@ class PowerBasedCyclingModeBase extends base_1.CyclingModeBase {
         return slope || 0;
     }
     initLogger(defaultLogName) {
-        const a = this.adapter;
-        this.logger = a.getLogger();
-        if (!this.logger)
-            this.logger = new gd_eventlog_1.EventLogger(defaultLogName);
+        this.logger = new gd_eventlog_1.EventLogger(defaultLogName);
     }
     getWeight() {
         const a = this.adapter;

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

@@ -65,7 +65,7 @@ class SerialInterface extends events_1.default {
             this.logger.logEvent(event);
         }
         const w = global.window;
-        if ((w === null || w === void 0 ? void 0 : w.DEVICE_DEBUG) || process.env.BLE_DEBUG) {
+        if ((w === null || w === void 0 ? void 0 : w.DEVICE_DEBUG) || process.env.SERIAL_DEBUG || process.env.ANT_DEBUG || process.env.BLE_DEBUG) {
             console.log('~~~ Serial', event);
         }
     }

package/lib/serial/base/serial-scanner.js

@@ -32,7 +32,7 @@ class SinglePathScanner {
             this.logger.logEvent(event);
         }
         const w = global.window;
-        if ((w === null || w === void 0 ? void 0 : w.DEVICE_DEBUG) || process.env.BLE_DEBUG) {
+        if ((w === null || w === void 0 ? void 0 : w.DEVICE_DEBUG) || process.env.BLE_DEBUG || process.env.ANT_DEBUG || process.env.SERIAL_DEBUG) {
             console.log('~~~ SerialScanner', event);
         }
     }
@@ -67,7 +67,7 @@ class SinglePathScanner {
                         }
                         const adapterSettings = { interface: this.serial.getName(), host, port, protocol };
                         const adapter = adapter_factory_1.default.getInstance().createInstance(adapterSettings);
-                        found = yield adapter.check();
+                        found = yield (adapter === null || adapter === void 0 ? void 0 : adapter.check());
                         if (found) {
                             this.isFound = true;
                             const name = adapter.getName();

package/lib/serial/daum/classic/mock.js

@@ -65,7 +65,7 @@ class DaumClassicMockImpl {
     }
     list() {
         return __awaiter(this, void 0, void 0, function* () {
-            return binding_mock_1.MockBinding.list();
+            return yield binding_mock_1.MockBinding.list();
         });
     }
     open(options) {

package/lib/utils/utils.d.ts

@@ -4,6 +4,7 @@ export declare function runWithRetries(fn: any, maxRetries: any, timeBetween: an
 export declare function floatVal(d?: number | string): number;
 export declare function intVal(d?: number | string): number;
 export declare function hexstr(arr: any, start?: any, len?: any): string;
+export declare function isTrue(value: any): boolean;
 export declare class Queue<T> {
     protected data: Array<T>;
     constructor(values?: Array<T>);

package/lib/utils/utils.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.waitWithTimeout = exports.runWithTimeout = exports.Queue = exports.hexstr = exports.intVal = exports.floatVal = exports.runWithRetries = exports.resolveNextTick = exports.sleep = void 0;
+exports.waitWithTimeout = exports.runWithTimeout = exports.Queue = exports.isTrue = exports.hexstr = exports.intVal = exports.floatVal = exports.runWithRetries = exports.resolveNextTick = exports.sleep = void 0;
 const sleep = (ms) => {
     return new Promise(resolve => setTimeout(resolve, ms));
 };
@@ -92,6 +92,23 @@ function hexstr(arr, start, len) {
     return str;
 }
 exports.hexstr = hexstr;
+function isTrue(value) {
+    if (typeof (value) === 'string') {
+        value = value.trim().toLowerCase();
+    }
+    switch (value) {
+        case true:
+        case "true":
+        case 1:
+        case "1":
+        case "on":
+        case "yes":
+            return true;
+        default:
+            return false;
+    }
+}
+exports.isTrue = isTrue;
 class Queue {
     constructor(values) {
         this.data = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",