incyclist-devices 2.0.15 → 2.0.17

package/lib/adapters.js

@@ -45,5 +45,5 @@ class AdapterFactory {
         return adapter;
     }
 }
-exports.default = AdapterFactory;
 AdapterFactory.adapters = [];
+exports.default = AdapterFactory;

package/lib/antv2/adapter.d.ts

@@ -28,10 +28,10 @@ export default class AntAdapter<TDeviceData extends BaseDeviceData, TData> exten
     };
     onDataFn: (data: TData) => void;
     startupRetryPause: number;
-    protected ivDataTimeout: NodeJS.Timer;
+    protected ivDataTimeout: NodeJS.Timeout;
     protected lastDataTS: number;
     protected dataMsgCount: number;
-    protected ivWaitForData: NodeJS.Timer;
+    protected ivWaitForData: NodeJS.Timeout;
     constructor(settings: AntDeviceSettings, props?: DeviceProperties);
     createSensor(settings: AntDeviceSettings): ISensor;
     isEqual(settings: AntDeviceSettings): boolean;

package/lib/antv2/ant-interface.js

@@ -280,6 +280,6 @@ class AntInterface extends events_1.default {
         return (this.activeScan === undefined || this.activeScan === null);
     }
 }
-exports.default = AntInterface;
 AntInterface._instance = undefined;
 AntInterface.INTERFACE_NAME = 'ant';
+exports.default = AntInterface;

package/lib/antv2/fe/adapter.js

@@ -352,6 +352,6 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
         });
     }
 }
-exports.default = AntFEAdapter;
 AntFEAdapter.INCYCLIST_PROFILE_NAME = 'Smart Trainer';
 AntFEAdapter.ANT_PROFILE_NAME = 'FE';
+exports.default = AntFEAdapter;

package/lib/antv2/hr/adapter.js

@@ -71,6 +71,6 @@ class AntHrAdapter extends adapter_1.default {
         return this.deviceData.ComputedHeartRate !== undefined && this.deviceData.ComputedHeartRate !== null;
     }
 }
-exports.default = AntHrAdapter;
 AntHrAdapter.INCYCLIST_PROFILE_NAME = 'Heartrate Monitor';
 AntHrAdapter.ANT_PROFILE_NAME = 'HR';
+exports.default = AntHrAdapter;

package/lib/antv2/modes/ant-fe-erg-mode.js

@@ -10,5 +10,5 @@ class AntFeERGCyclingMode extends ble_erg_mode_1.default {
         this.initLogger('AntERGMode');
     }
 }
-exports.default = AntFeERGCyclingMode;
 AntFeERGCyclingMode.isERG = true;
+exports.default = AntFeERGCyclingMode;

package/lib/antv2/pwr/adapter.js

@@ -136,6 +136,6 @@ class AntPwrAdapter extends adapter_1.ControllableAntAdapter {
             TimeStamp !== undefined || TimeStamp !== null;
     }
 }
-exports.default = AntPwrAdapter;
 AntPwrAdapter.INCYCLIST_PROFILE_NAME = 'Power Meter';
 AntPwrAdapter.ANT_PROFILE_NAME = 'PWR';
+exports.default = AntPwrAdapter;

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

@@ -42,7 +42,7 @@ export declare class StaticWriteCharacteristic extends MockCharacteristic {
 }
 export declare abstract class StaticNotifyCharacteristic extends MockCharacteristic {
     cntSubscriptions: number;
-    iv: NodeJS.Timer;
+    iv: NodeJS.Timeout;
     notifyFrequency: number;
     constructor(uuid: string, description: string);
     subscribe(callback: (err: Error | undefined) => void): void;

package/lib/ble/cp/comm.js

@@ -118,8 +118,8 @@ class BleCyclingPowerDevice extends comms_1.BleComms {
         this.prevCrankData = undefined;
     }
 }
-exports.default = BleCyclingPowerDevice;
 BleCyclingPowerDevice.protocol = 'cp';
 BleCyclingPowerDevice.services = [consts_1.CSP];
 BleCyclingPowerDevice.characteristics = [consts_1.CSP_MEASUREMENT, consts_1.CSP_FEATURE, '2a5d', '2a3c'];
 BleCyclingPowerDevice.detectionPriority = 1;
+exports.default = BleCyclingPowerDevice;

package/lib/ble/elite/comms.js

@@ -119,8 +119,8 @@ class BleEliteDevice extends comms_1.BleComms {
         this.prevCrankData = undefined;
     }
 }
-exports.default = BleEliteDevice;
 BleEliteDevice.protocol = 'elite';
 BleEliteDevice.services = [consts_1.ELITE_TRAINER_SVC];
 BleEliteDevice.characteristics = [consts_1.CSP_MEASUREMENT, consts_1.CSP_FEATURE, '2a5d', '2a3c'];
 BleEliteDevice.detectionPriority = 10;
+exports.default = BleEliteDevice;

package/lib/ble/fm/comms.js

@@ -496,8 +496,8 @@ class BleFitnessMachineDevice extends comms_1.BleComms {
         this.data = {};
     }
 }
-exports.default = BleFitnessMachineDevice;
 BleFitnessMachineDevice.protocol = 'fm';
 BleFitnessMachineDevice.services = [consts_1.FTMS];
 BleFitnessMachineDevice.characteristics = ['2acc', consts_1.INDOOR_BIKE_DATA, '2ad6', '2ad8', consts_1.FTMS_CP, consts_1.FTMS_STATUS];
 BleFitnessMachineDevice.detectionPriority = 100;
+exports.default = BleFitnessMachineDevice;

package/lib/ble/hr/comm.js

@@ -49,8 +49,8 @@ class BleHrmDevice extends comms_1.BleComms {
         return true;
     }
 }
-exports.default = BleHrmDevice;
 BleHrmDevice.protocol = 'hr';
 BleHrmDevice.services = ['180d'];
 BleHrmDevice.characteristics = ['2a37', '2a38', '2a39', '2a3c'];
 BleHrmDevice.detectionPriority = 1;
+exports.default = BleHrmDevice;

package/lib/ble/tacx/comms.js

@@ -625,9 +625,9 @@ class TacxAdvancedFitnessMachineDevice extends comms_1.default {
         this.data = {};
     }
 }
-exports.default = TacxAdvancedFitnessMachineDevice;
 TacxAdvancedFitnessMachineDevice.protocol = 'tacx';
 TacxAdvancedFitnessMachineDevice.services = [consts_1.TACX_FE_C_BLE];
 TacxAdvancedFitnessMachineDevice.characteristics = ['2acc', '2ad2', '2ad6', '2ad8', '2ad9', '2ada', consts_1.TACX_FE_C_RX, consts_1.TACX_FE_C_TX];
 TacxAdvancedFitnessMachineDevice.PROFILE = PROFILE_ID;
 TacxAdvancedFitnessMachineDevice.detectionPriority = 10;
+exports.default = TacxAdvancedFitnessMachineDevice;

package/lib/ble/wahoo/comms.js

@@ -391,8 +391,8 @@ class BleWahooDevice extends comms_1.default {
         this.simModeSettings = undefined;
     }
 }
-exports.default = BleWahooDevice;
 BleWahooDevice.protocol = 'wahoo';
 BleWahooDevice.services = [consts_1.CSP];
 BleWahooDevice.characteristics = ['2acc', '2ad2', '2ad6', '2ad8', '2ad9', '2ada', consts_1.WAHOO_ADVANCED_TRAINER_CP];
 BleWahooDevice.detectionPriority = 5;
+exports.default = BleWahooDevice;

package/lib/index.d.ts

@@ -8,8 +8,9 @@ import { IncyclistCapability } from './types/capabilities';
 import { DeviceData } from './types/data';
 import { DeviceSettings } from './types/device';
 import CyclingMode from './modes/cycling-mode';
+import calc from './utils/calculations';
 export * from './modes/cycling-mode';
 export * from './serial';
 export * from './ble';
 export * from './antv2';
-export { IncyclistInterface, INTERFACE, InterfaceFactory, InterfaceProps, DeviceSettings, CyclingMode, AdapterFactory, IncyclistDeviceAdapter, Controllable, ControllableDeviceAdapter, DeviceData, IncyclistCapability, };
+export { IncyclistInterface, INTERFACE, InterfaceFactory, InterfaceProps, DeviceSettings, CyclingMode, AdapterFactory, IncyclistDeviceAdapter, Controllable, ControllableDeviceAdapter, DeviceData, IncyclistCapability, calc, };

package/lib/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IncyclistCapability = exports.ControllableDeviceAdapter = exports.AdapterFactory = exports.InterfaceFactory = exports.INTERFACE = void 0;
+exports.calc = exports.IncyclistCapability = exports.ControllableDeviceAdapter = exports.AdapterFactory = exports.InterfaceFactory = exports.INTERFACE = void 0;
 const device_1 = require("./types/device");
 Object.defineProperty(exports, "INTERFACE", { enumerable: true, get: function () { return device_1.INTERFACE; } });
 const interfaces_1 = __importDefault(require("./interfaces"));
@@ -28,6 +28,8 @@ const adpater_1 = require("./base/adpater");
 Object.defineProperty(exports, "ControllableDeviceAdapter", { enumerable: true, get: function () { return adpater_1.ControllableDevice; } });
 const capabilities_1 = require("./types/capabilities");
 Object.defineProperty(exports, "IncyclistCapability", { enumerable: true, get: function () { return capabilities_1.IncyclistCapability; } });
+const calculations_1 = __importDefault(require("./utils/calculations"));
+exports.calc = calculations_1.default;
 __exportStar(require("./modes/cycling-mode"), exports);
 __exportStar(require("./serial"), exports);
 __exportStar(require("./ble"), exports);

package/lib/modes/ble-erg-mode.js

@@ -144,5 +144,5 @@ class BleERGCyclingMode extends power_base_1.default {
         return data;
     }
 }
-exports.default = BleERGCyclingMode;
 BleERGCyclingMode.isERG = true;
+exports.default = BleERGCyclingMode;

package/lib/modes/cycling-mode.js

@@ -9,7 +9,7 @@ var CyclingModeProperyType;
     CyclingModeProperyType["String"] = "String";
     CyclingModeProperyType["SingleSelect"] = "SingleSelect";
     CyclingModeProperyType["MultiSelect"] = "MultiSelect";
-})(CyclingModeProperyType = exports.CyclingModeProperyType || (exports.CyclingModeProperyType = {}));
+})(CyclingModeProperyType || (exports.CyclingModeProperyType = CyclingModeProperyType = {}));
 class CyclingModeBase {
     constructor(adapter, props) {
         this.settings = {};

package/lib/modes/simulator.js

@@ -136,5 +136,5 @@ class SimulatorCyclingMode extends power_base_1.default {
         return data;
     }
 }
-exports.default = SimulatorCyclingMode;
 SimulatorCyclingMode.isERG = true;
+exports.default = SimulatorCyclingMode;

package/lib/serial/bindings/tcp.js

@@ -16,6 +16,7 @@ exports.TCPPortBinding = exports.TCPBinding = exports.getSubnets = exports.scanS
 const gd_eventlog_1 = require("gd-eventlog");
 const os_1 = require("os");
 const net_1 = __importDefault(require("net"));
+const DEFAULT_TIMEOUT = 3000;
 function resolveNextTick() {
     return new Promise(resolve => process.nextTick(() => resolve()));
 }
@@ -123,8 +124,7 @@ exports.TCPBinding = {
                         return reject(new TypeError('"path" is not valid'));
                     }
                     const socket = new net_1.default.Socket();
-                    if (options.timeout)
-                        socket.setTimeout(options.timeout);
+                    socket.setTimeout(options.timeout || DEFAULT_TIMEOUT);
                     socket.once('timeout', () => { reject(new Error('timeout')); });
                     socket.once('error', (err) => { reject(err); });
                     socket.once('connect', () => { resolve(socket); });
@@ -145,6 +145,7 @@ class TCPPortBinding {
         this.pendingRead = null;
         this.writeOperation = null;
         this.data = null;
+        this.socket.removeAllListeners();
         this.socket.on('data', this.onData.bind(this));
         this.socket.on('error', this.onError.bind(this));
         this.socket.on('close', () => { this.close(); });
@@ -175,14 +176,20 @@ class TCPPortBinding {
             if (!this.isOpen)
                 return;
             this.data = Buffer.alloc(0);
-            const socket = this.socket;
-            socket.removeAllListeners();
-            socket.destroy();
-            socket.on('error', () => { });
-            setTimeout(() => { socket.removeAllListeners(); }, 500);
-            this.socket = null;
-            if (this.pendingRead) {
-                this.pendingRead(new CanceledError('port is closed'));
+            const close = () => __awaiter(this, void 0, void 0, function* () {
+                return new Promise(done => {
+                    const socket = this.socket;
+                    socket.on('error', () => { done(false); });
+                    socket.on('close', () => { socket.removeAllListeners(); done(true); });
+                    socket.destroy();
+                });
+            });
+            const closed = yield close();
+            if (closed) {
+                this.socket = null;
+                if (this.pendingRead) {
+                    this.pendingRead(new CanceledError('port is closed'));
+                }
             }
         });
     }

package/lib/serial/daum/ERGCyclingMode.js

@@ -206,5 +206,5 @@ class ERGCyclingMode extends power_base_1.default {
         return target;
     }
 }
-exports.default = ERGCyclingMode;
 ERGCyclingMode.isERG = true;
+exports.default = ERGCyclingMode;

package/lib/serial/daum/SmartTrainerCyclingMode.js

@@ -24,7 +24,7 @@ var direction;
 (function (direction) {
     direction["up"] = "up";
     direction["down"] = "down";
-})(direction = exports.direction || (exports.direction = {}));
+})(direction || (exports.direction = direction = {}));
 class SmartTrainerCyclingMode extends cycling_mode_1.CyclingModeBase {
     constructor(adapter, props) {
         super(adapter, props);

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

@@ -246,5 +246,5 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
         return this.getBike().runData();
     }
 }
-exports.default = DaumClassicAdapter;
 DaumClassicAdapter.NAME = PROTOCOL_NAME;
+exports.default = DaumClassicAdapter;

package/lib/serial/daum/premium/adapter.js

@@ -243,5 +243,5 @@ class DaumPremiumAdapter extends DaumAdapter_1.default {
         });
     }
 }
-exports.default = DaumPremiumAdapter;
 DaumPremiumAdapter.NAME = PROTOCOL_NAME;
+exports.default = DaumPremiumAdapter;

package/lib/serial/daum/premium/utils.js

@@ -183,13 +183,13 @@ var ReservedCommands;
     ReservedCommands[ReservedCommands["RELAX_GET_DATA"] = 15] = "RELAX_GET_DATA";
     ReservedCommands[ReservedCommands["KEY_PRESSED"] = 16] = "KEY_PRESSED";
     ReservedCommands[ReservedCommands["PROGRAM_CONTROL"] = 17] = "PROGRAM_CONTROL";
-})(ReservedCommands = exports.ReservedCommands || (exports.ReservedCommands = {}));
+})(ReservedCommands || (exports.ReservedCommands = ReservedCommands = {}));
 var BikeType;
 (function (BikeType) {
     BikeType[BikeType["ALLROUND"] = 0] = "ALLROUND";
     BikeType[BikeType["RACE"] = 1] = "RACE";
     BikeType[BikeType["MOUNTAIN"] = 2] = "MOUNTAIN";
-})(BikeType = exports.BikeType || (exports.BikeType = {}));
+})(BikeType || (exports.BikeType = BikeType = {}));
 function getBikeType(bikeTypeStr) {
     if (bikeTypeStr === undefined || bikeTypeStr === null)
         return BikeType.RACE;

package/lib/serial/kettler/comms.js

@@ -32,13 +32,13 @@ var SerialCommsState;
     SerialCommsState[SerialCommsState["Disconnecting"] = 3] = "Disconnecting";
     SerialCommsState[SerialCommsState["Disconnected"] = 4] = "Disconnected";
     SerialCommsState[SerialCommsState["Error"] = 5] = "Error";
-})(SerialCommsState = exports.SerialCommsState || (exports.SerialCommsState = {}));
+})(SerialCommsState || (exports.SerialCommsState = SerialCommsState = {}));
 var SendState;
 (function (SendState) {
     SendState[SendState["Idle"] = 0] = "Idle";
     SendState[SendState["Sending"] = 1] = "Sending";
     SendState[SendState["Receiving"] = 2] = "Receiving";
-})(SendState = exports.SendState || (exports.SendState = {}));
+})(SendState || (exports.SendState = SendState = {}));
 const getBikeProps = (props) => {
     const { port, interface: ifaceName } = props;
     let serial;

package/lib/serial/kettler/ergo-racer/modes/erg.js

@@ -140,5 +140,5 @@ class ERGCyclingMode extends power_base_1.default {
         return data;
     }
 }
-exports.default = ERGCyclingMode;
 ERGCyclingMode.isERG = true;
+exports.default = ERGCyclingMode;

package/lib/serial/serial-interface.js

@@ -326,5 +326,5 @@ class SerialInterface extends events_1.default {
         });
     }
 }
-exports.default = SerialInterface;
 SerialInterface._instances = [];
+exports.default = SerialInterface;

package/lib/types/capabilities.js

@@ -9,4 +9,4 @@ var IncyclistCapability;
     IncyclistCapability["HeartRate"] = "heartrate";
     IncyclistCapability["Gear"] = "gear";
     IncyclistCapability["Control"] = "control";
-})(IncyclistCapability = exports.IncyclistCapability || (exports.IncyclistCapability = {}));
+})(IncyclistCapability || (exports.IncyclistCapability = IncyclistCapability = {}));

package/lib/types/route.js

@@ -6,4 +6,4 @@ var RouteType;
     RouteType["FREE_RIDE"] = "free ride";
     RouteType["FOLLOW_ROUTE"] = "follow route";
     RouteType["VIDEO"] = "video";
-})(RouteType = exports.RouteType || (exports.RouteType = {}));
+})(RouteType || (exports.RouteType = RouteType = {}));

package/lib/types/user.js

@@ -6,4 +6,4 @@ var Gender;
     Gender["MALE"] = "M";
     Gender["FEMALE"] = "F";
     Gender["OTHERS"] = "o";
-})(Gender = exports.Gender || (exports.Gender = {}));
+})(Gender || (exports.Gender = Gender = {}));

package/package.json

@@ -1,33 +1,34 @@
 {
   "name": "incyclist-devices",
-  "version": "2.0.15",
+  "version": "2.0.17",
   "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.1.18",
+    "incyclist-ant-plus": "^0.2.0",
     "win32filetime": "^1.0.2"
   },
   "peerDependencies": {
-    "gd-eventlog": "^0.1.22"
+    "gd-eventlog": "^0.1.24"
   },
   "devDependencies": {
     "@serialport/binding-mock": "^10.2.2",
     "@serialport/bindings-cpp": "^10.8.0",
-    "@types/jest": "^29.2.4",
-    "@types/node": "^18.11.18",
-    "eslint": "^8.30.0",
+    "@types/jest": "^29.5.3",
+    "@types/node": "^20.5.0",
+    "eslint": "^8.47.0",
     "eslint-config-react-app": "^7.0.1",
-    "jest": "^29.3.1",
-    "ts-jest": "^29.0.3",
-    "typescript": "^4.9.4"
+    "jest": "^29.6.2",
+    "ts-jest": "^29.1.1",
+    "typescript": "^5.1.6"
   },
   "scripts": {
     "lint": "eslint . --ext .ts",
     "build": "tsc",
     "test": "jest --coverage",
+    "test:ci": "jest --coverage --forceExit",
     "dev": "tsc --watch"
   },
   "files": [