incyclist-devices 2.0.0-beta.1 → 2.0.1

package/lib/ble/wahoo/adapter.js

@@ -46,34 +46,36 @@ class BleWahooAdapter extends fm_1.BleFmAdapter {
                     this.logger.logEvent({ message: 'stop previous scan', isScanning: this.ble.isScanning() });
                     yield this.ble.stopScan();
                 }
-                const bleDevice = yield this.ble.connectDevice(this.device);
-                if (bleDevice) {
-                    this.device = bleDevice;
+                const connected = yield this.connect();
+                if (!connected)
+                    throw new Error(`could not start device, reason:could not connect`);
+                const comms = this.device;
+                if (comms) {
                     const mode = this.getCyclingMode();
                     if (mode && mode.getSetting('bikeType')) {
                         const bikeType = mode.getSetting('bikeType').toLowerCase();
-                        bleDevice.setCrr(fm_1.cRR);
+                        comms.setCrr(fm_1.cRR);
                         switch (bikeType) {
                             case 'race':
-                                bleDevice.setCw(fm_1.cwABike.race);
+                                comms.setCw(fm_1.cwABike.race);
                                 break;
                             case 'triathlon':
-                                bleDevice.setCw(fm_1.cwABike.triathlon);
+                                comms.setCw(fm_1.cwABike.triathlon);
                                 break;
                             case 'mountain':
-                                bleDevice.setCw(fm_1.cwABike.mountain);
+                                comms.setCw(fm_1.cwABike.mountain);
                                 break;
                         }
                     }
                     const { user, bikeWeight = adpater_1.DEFAULT_BIKE_WEIGHT } = props || {};
                     const weight = (user && user.weight ? Number(user.weight) : adpater_1.DEFAULT_USER_WEIGHT) + bikeWeight;
-                    yield bleDevice.setSimMode(weight, bleDevice.getCrr(), bleDevice.getCw());
+                    yield comms.setSimMode(weight, comms.getCrr(), comms.getCw());
                     const startRequest = this.getCyclingMode().getBikeInitRequest();
                     yield this.sendUpdate(startRequest);
-                    bleDevice.on('data', (data) => {
+                    comms.on('data', (data) => {
                         this.onDeviceData(data);
                     });
-                    if (bleDevice.isHrm() && !this.hasCapability(capabilities_1.IncyclistCapability.HeartRate)) {
+                    if (comms.features.heartrate && !this.hasCapability(capabilities_1.IncyclistCapability.HeartRate)) {
                         this.capabilities.push(capabilities_1.IncyclistCapability.HeartRate);
                     }
                     this.resetData();

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

@@ -1,8 +1,9 @@
 /// <reference types="node" />
+import { LegacyProfile } from "../../antv2/types";
 import { CrankData } from "../cp";
 import { IndoorBikeData } from "../fm";
 import BleFitnessMachineDevice from "../fm/comms";
-import { BleWriteProps } from "../types";
+import { BleProtocol, BleWriteProps, IBlePeripheralConnector } from "../types";
 export declare const enum OpCode {
     unlock = 32,
     setResistanceMode = 64,
@@ -16,6 +17,7 @@ export declare const enum OpCode {
     setWheelCircumference = 72
 }
 export default class BleWahooDevice extends BleFitnessMachineDevice {
+    static protocol: BleProtocol;
     static services: string[];
     static characteristics: string[];
     static detectionPriority: number;
@@ -34,20 +36,19 @@ export default class BleWahooDevice extends BleFitnessMachineDevice {
         cw: number;
     };
     constructor(props?: any);
-    isMatching(characteristics: string[]): boolean;
+    static isMatching(characteristics: string[]): boolean;
     init(): Promise<boolean>;
     setCharacteristicUUIDs(uuids: string[]): void;
-    getProfile(): string;
+    getProfile(): LegacyProfile;
+    getProtocol(): BleProtocol;
     getServiceUUids(): string[];
-    isBike(): boolean;
-    isPower(): boolean;
-    isHrm(): boolean;
     parseCrankData(crankData: any): {
         rpm: number;
         time: any;
     };
     parsePower(_data: Buffer): IndoorBikeData;
     onData(characteristic: string, data: Buffer): boolean;
+    subscribeAll(conn?: IBlePeripheralConnector): Promise<void>;
     writeWahooFtmsMessage(requestedOpCode: number, data: Buffer, props?: BleWriteProps): Promise<boolean>;
     requestControl(): Promise<boolean>;
     setPowerAdjusting(): void;

package/lib/ble/wahoo/comms.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const _1 = require(".");
 const adpater_1 = require("../../base/adpater");
 const consts_1 = require("../consts");
 const comms_1 = __importDefault(require("../fm/comms"));
@@ -30,7 +31,7 @@ class BleWahooDevice extends comms_1.default {
         this.data = {};
         this.wahooCP = consts_1.WAHOO_ADVANCED_TRAINER_CP;
     }
-    isMatching(characteristics) {
+    static isMatching(characteristics) {
         if (!characteristics)
             return false;
         const hasWahooCP = characteristics.find(c => (0, utils_1.matches)(c, consts_1.WAHOO_ADVANCED_TRAINER_CP)) !== undefined;
@@ -50,8 +51,7 @@ class BleWahooDevice extends comms_1.default {
                 }
                 catch (err) {
                 }
-                yield _super.initDevice.call(this);
-                return true;
+                return yield _super.initDevice.call(this);
             }
             catch (err) {
                 this.logEvent({ message: 'error', fn: 'WahooAdvancedFitnessMachineDevice.init()', error: err.message || err, stack: err.stack });
@@ -67,20 +67,14 @@ class BleWahooDevice extends comms_1.default {
         });
     }
     getProfile() {
-        return 'Wahoo Smart Trainer';
+        return 'Smart Trainer';
+    }
+    getProtocol() {
+        return _1.BleWahooComms.protocol;
     }
     getServiceUUids() {
         return BleWahooDevice.services;
     }
-    isBike() {
-        return true;
-    }
-    isPower() {
-        return true;
-    }
-    isHrm() {
-        return this.hasService('180d');
-    }
     parseCrankData(crankData) {
         if (!this.prevCrankData)
             this.prevCrankData = { revolutions: 0, time: 0, cntUpdateMissing: -1 };
@@ -149,16 +143,16 @@ class BleWahooDevice extends comms_1.default {
         const uuid = characteristic.toLowerCase();
         let res = undefined;
         switch (uuid) {
-            case '2a63':
+            case consts_1.CSP_MEASUREMENT:
                 res = this.parsePower(data);
                 break;
-            case '2ad2':
+            case consts_1.INDOOR_BIKE_DATA:
                 res = this.parseIndoorBikeData(data);
                 break;
-            case '2a37':
+            case consts_1.HR_MEASUREMENT:
                 res = this.parseHrm(data);
                 break;
-            case '2ada':
+            case consts_1.FTMS_STATUS:
                 res = this.parseFitnessMachineStatus(data);
                 break;
             default:
@@ -171,6 +165,9 @@ class BleWahooDevice extends comms_1.default {
         }
         return true;
     }
+    subscribeAll(conn) {
+        return this.subscribeMultiple([consts_1.CSP_MEASUREMENT, consts_1.INDOOR_BIKE_DATA, consts_1.HR_MEASUREMENT, consts_1.FTMS_STATUS, this.wahooCP], conn);
+    }
     writeWahooFtmsMessage(requestedOpCode, data, props) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -395,6 +392,7 @@ class BleWahooDevice extends comms_1.default {
     }
 }
 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;

package/lib/index.d.ts

@@ -1,12 +1,15 @@
 import { INTERFACE } from './types/device';
 import InterfaceFactory from './interfaces';
 import AdapterFactory from './adapters';
-import { IncyclistInterface } from './types/interface';
-import { IncyclistDeviceAdapter } from './types/adapter';
+import { IncyclistInterface, InterfaceProps } from './types/interface';
+import { IncyclistDeviceAdapter, Bike as Controllable } from './types/adapter';
+import { ControllableDevice as ControllableDeviceAdapter } from './base/adpater';
 import { IncyclistCapability } from './types/capabilities';
 import { DeviceData } from './types/data';
-import { SerialPortProvider, useSerialPortProvider, SerialInterface, TCPBinding, DaumPremiumAdapter, DaumClassicAdapter, KettlerRacerAdapter } from './serial';
-import { AntAdapterFactory, AntFEAdapter, AntHrAdapter, AntPwrAdapter, AntDeviceSettings, AntScanProps, AntInterface } from './antv2';
-import { BleAdapterFactory, BleInterface, BleHrmAdapter, BlePwrAdapter, BleFmAdapter, BleWahooAdapter, BleTacxAdapter } from './ble';
-import { CyclingModeProperyType } from './modes/cycling-mode';
-export { IncyclistInterface, INTERFACE, InterfaceFactory, AdapterFactory, IncyclistDeviceAdapter, DeviceData, IncyclistCapability, AntAdapterFactory, AntFEAdapter, AntHrAdapter, AntPwrAdapter, AntDeviceSettings, AntScanProps, AntInterface, CyclingModeProperyType, BleAdapterFactory, BleInterface, BleHrmAdapter, BlePwrAdapter, BleFmAdapter, BleWahooAdapter, BleTacxAdapter, SerialPortProvider, useSerialPortProvider, SerialInterface, TCPBinding, DaumClassicAdapter, DaumPremiumAdapter, KettlerRacerAdapter };
+import { DeviceSettings } from './types/device';
+import CyclingMode from './modes/cycling-mode';
+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, };

package/lib/index.js

@@ -1,38 +1,34 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KettlerRacerAdapter = exports.DaumPremiumAdapter = exports.DaumClassicAdapter = exports.TCPBinding = exports.SerialInterface = exports.useSerialPortProvider = exports.SerialPortProvider = exports.BleTacxAdapter = exports.BleWahooAdapter = exports.BleFmAdapter = exports.BlePwrAdapter = exports.BleHrmAdapter = exports.BleInterface = exports.BleAdapterFactory = exports.CyclingModeProperyType = exports.AntInterface = exports.AntPwrAdapter = exports.AntHrAdapter = exports.AntFEAdapter = exports.AntAdapterFactory = exports.IncyclistCapability = exports.AdapterFactory = exports.InterfaceFactory = exports.INTERFACE = void 0;
+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"));
 exports.InterfaceFactory = interfaces_1.default;
 const adapters_1 = __importDefault(require("./adapters"));
 exports.AdapterFactory = adapters_1.default;
+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 serial_1 = require("./serial");
-Object.defineProperty(exports, "SerialPortProvider", { enumerable: true, get: function () { return serial_1.SerialPortProvider; } });
-Object.defineProperty(exports, "useSerialPortProvider", { enumerable: true, get: function () { return serial_1.useSerialPortProvider; } });
-Object.defineProperty(exports, "SerialInterface", { enumerable: true, get: function () { return serial_1.SerialInterface; } });
-Object.defineProperty(exports, "TCPBinding", { enumerable: true, get: function () { return serial_1.TCPBinding; } });
-Object.defineProperty(exports, "DaumPremiumAdapter", { enumerable: true, get: function () { return serial_1.DaumPremiumAdapter; } });
-Object.defineProperty(exports, "DaumClassicAdapter", { enumerable: true, get: function () { return serial_1.DaumClassicAdapter; } });
-Object.defineProperty(exports, "KettlerRacerAdapter", { enumerable: true, get: function () { return serial_1.KettlerRacerAdapter; } });
-const antv2_1 = require("./antv2");
-Object.defineProperty(exports, "AntAdapterFactory", { enumerable: true, get: function () { return antv2_1.AntAdapterFactory; } });
-Object.defineProperty(exports, "AntFEAdapter", { enumerable: true, get: function () { return antv2_1.AntFEAdapter; } });
-Object.defineProperty(exports, "AntHrAdapter", { enumerable: true, get: function () { return antv2_1.AntHrAdapter; } });
-Object.defineProperty(exports, "AntPwrAdapter", { enumerable: true, get: function () { return antv2_1.AntPwrAdapter; } });
-Object.defineProperty(exports, "AntInterface", { enumerable: true, get: function () { return antv2_1.AntInterface; } });
-const ble_1 = require("./ble");
-Object.defineProperty(exports, "BleAdapterFactory", { enumerable: true, get: function () { return ble_1.BleAdapterFactory; } });
-Object.defineProperty(exports, "BleInterface", { enumerable: true, get: function () { return ble_1.BleInterface; } });
-Object.defineProperty(exports, "BleHrmAdapter", { enumerable: true, get: function () { return ble_1.BleHrmAdapter; } });
-Object.defineProperty(exports, "BlePwrAdapter", { enumerable: true, get: function () { return ble_1.BlePwrAdapter; } });
-Object.defineProperty(exports, "BleFmAdapter", { enumerable: true, get: function () { return ble_1.BleFmAdapter; } });
-Object.defineProperty(exports, "BleWahooAdapter", { enumerable: true, get: function () { return ble_1.BleWahooAdapter; } });
-Object.defineProperty(exports, "BleTacxAdapter", { enumerable: true, get: function () { return ble_1.BleTacxAdapter; } });
-const cycling_mode_1 = require("./modes/cycling-mode");
-Object.defineProperty(exports, "CyclingModeProperyType", { enumerable: true, get: function () { return cycling_mode_1.CyclingModeProperyType; } });
+__exportStar(require("./modes/cycling-mode"), exports);
+__exportStar(require("./serial"), exports);
+__exportStar(require("./ble"), exports);
+__exportStar(require("./antv2"), exports);

package/lib/interfaces.d.ts

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

package/lib/interfaces.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const serial_1 = require("./serial");
 const ant_interface_1 = __importDefault(require("./antv2/ant-interface"));
 const device_1 = require("./types/device");
+const ble_1 = require("./ble");
 class InterfaceFactory {
     static create(ifaceName, props) {
         switch (ifaceName) {
@@ -17,6 +18,9 @@ class InterfaceFactory {
             case device_1.INTERFACE.ANT:
                 const antProps = props;
                 return ant_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

@@ -35,6 +35,10 @@ class PowerBasedCyclingModeBase extends cycling_mode_1.CyclingModeBase {
         const vPrev = (prevData.speed || 0) / 3.6;
         const EkinPrev = 1 / 2 * m * vPrev * vPrev;
         let powerToMaintainSpeed = calculations_1.default.calculatePower(m, vPrev, slope, props);
+        if (t >= 30) {
+            const speed = calculations_1.default.calculateSpeed(m, power, slope, props);
+            return { speed, distance: 0 };
+        }
         const powerDelta = powerToMaintainSpeed - power;
         const Ekin = EkinPrev - powerDelta * t;
         if (Ekin > 0) {

package/lib/serial/adapter.d.ts

@@ -8,9 +8,14 @@ export interface SerialDeviceSettings extends DeviceSettings {
     interface: string | SerialInterface;
 }
 export declare class SerialIncyclistDevice extends ControllableDevice {
+    pullFrequency: number;
     check(): Promise<boolean>;
     constructor(settings: SerialDeviceSettings, props?: DeviceProperties);
     isEqual(settings: SerialDeviceSettings): boolean;
     getPort(): string;
+    getUniqueName(): string;
     getInterface(): string;
+    setMaxUpdateFrequency(ms: number): void;
+    setPullFrequency(ms: number): void;
+    getPullFrequency(): number;
 }

package/lib/serial/adapter.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SerialIncyclistDevice = void 0;
 const adpater_1 = require("../base/adpater");
+const DEFAULT_PULL_FREQUENCY = 1000;
 class SerialIncyclistDevice extends adpater_1.ControllableDevice {
     check() {
         return __awaiter(this, void 0, void 0, function* () { throw new Error('not implemnted'); });
@@ -18,6 +19,7 @@ class SerialIncyclistDevice extends adpater_1.ControllableDevice {
     ;
     constructor(settings, props) {
         super(settings, props);
+        this.pullFrequency = DEFAULT_PULL_FREQUENCY;
     }
     isEqual(settings) {
         if (settings.interface !== this.getInterface())
@@ -35,8 +37,25 @@ class SerialIncyclistDevice extends adpater_1.ControllableDevice {
         const settings = this.settings;
         return settings.port;
     }
+    getUniqueName() {
+        return `${this.getName()} (${this.getPort()})`;
+    }
     getInterface() {
         return 'serial';
     }
+    setMaxUpdateFrequency(ms) {
+        if (ms <= this.pullFrequency)
+            this.updateFrequency = -1;
+        else
+            this.updateFrequency = ms;
+    }
+    setPullFrequency(ms) {
+        this.pullFrequency = ms;
+        if (this.updateFrequency <= this.pullFrequency)
+            this.updateFrequency = -1;
+    }
+    getPullFrequency() {
+        return this.pullFrequency;
+    }
 }
 exports.SerialIncyclistDevice = SerialIncyclistDevice;

package/lib/serial/bindings/tcp.d.ts

@@ -21,12 +21,13 @@ export declare class TCPPortBinding implements BindingPortInterface {
     openOptions: Required<OpenOptions>;
     socket: any;
     logger: EventLogger;
-    writeOperation: null | Promise<void>;
+    writeOperation: null | Promise<any>;
     data: Buffer;
     private pendingRead;
     constructor(socket: net.Socket, options: Required<OpenOptions>);
     get isOpen(): boolean;
     onData(data: Buffer): void;
+    onError(err: Error): void;
     close(): Promise<void>;
     read(buffer: Buffer, offset: number, length: number): Promise<{
         buffer: Buffer;

package/lib/serial/bindings/tcp.js

@@ -146,6 +146,10 @@ class TCPPortBinding {
         this.writeOperation = null;
         this.data = null;
         this.socket.on('data', this.onData.bind(this));
+        this.socket.on('error', this.onError.bind(this));
+        this.socket.on('close', () => { this.close(); });
+        this.socket.on('end', () => { this.close(); });
+        this.socket.on('timeout', () => { this.onError(new Error('socket timeout')); });
     }
     get isOpen() {
         return this.socket !== null;
@@ -153,12 +157,19 @@ class TCPPortBinding {
     onData(data) {
         if (!this.data)
             this.data = Buffer.alloc(0);
-        this.data = Buffer.concat([this.data, data]);
+        const buffer = Buffer.from(data);
+        this.data = Buffer.concat([this.data, buffer]);
         if (this.pendingRead) {
             process.nextTick(this.pendingRead);
             this.pendingRead = null;
         }
     }
+    onError(err) {
+        if (this.pendingRead) {
+            this.pendingRead(err);
+            this.socket = null;
+        }
+    }
     close() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.isOpen)
@@ -169,10 +180,10 @@ class TCPPortBinding {
             socket.destroy();
             socket.on('error', () => { });
             setTimeout(() => { socket.removeAllListeners(); }, 500);
+            this.socket = null;
             if (this.pendingRead) {
                 this.pendingRead(new CanceledError('port is closed'));
             }
-            this.socket = null;
         });
     }
     read(buffer, offset, length) {
@@ -207,6 +218,7 @@ class TCPPortBinding {
             const toCopy = this.data.slice(0, lengthToRead);
             const bytesRead = toCopy.copy(buffer, offset);
             this.data = this.data.slice(lengthToRead);
+            this.pendingRead = null;
             return ({ buffer, bytesRead });
         });
     }
@@ -214,10 +226,12 @@ class TCPPortBinding {
         if (!this.isOpen) {
             throw new Error('Port is not open');
         }
-        this.writeOperation = (() => __awaiter(this, void 0, void 0, function* () {
+        this.writeOperation = new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             yield resolveNextTick();
-            this.socket.write(buffer);
-        }))();
+            this.socket.write(buffer, () => {
+                resolve();
+            });
+        }));
         return this.writeOperation;
     }
     update(options) {

package/lib/serial/daum/DaumAdapter.d.ts

@@ -43,8 +43,8 @@ export default class DaumAdapterBase extends SerialIncyclistDevice implements Da
     close(): Promise<boolean>;
     logEvent(event: any): void;
     stop(): Promise<boolean>;
+    canSendUpdate(): boolean;
     sendUpdate(request: any): Promise<unknown>;
-    sendData(): void;
     update(): Promise<void>;
     sendRequests(): Promise<void>;
     bikeSync(): Promise<void>;

package/lib/serial/daum/DaumAdapter.js

@@ -81,9 +81,10 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
     isEqual(settings) {
         const as = this.settings;
         if (settings.interface !== this.getInterface())
-            return;
+            return false;
         if (settings.protocol !== as.protocol || settings.port !== as.port)
             return false;
+        return true;
     }
     isSame(device) {
         if (!(device instanceof DaumAdapterBase))
@@ -133,11 +134,11 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
             return;
         const ivSync = setInterval(() => {
             this.bikeSync();
-        }, 1000);
+        }, this.pullFrequency);
         const ivUpdate = setInterval(() => {
-            this.sendData();
+            this.emitData(this.deviceData);
             this.refreshRequests();
-        }, 1000);
+        }, this.pullFrequency);
         this.iv = {
             sync: ivSync,
             update: ivUpdate
@@ -182,7 +183,8 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
                         clearInterval(this.iv.update);
                     this.iv = undefined;
                 }
-                this.bike.stopWorker();
+                if (this.bike.stopWorker && typeof this.bike.stopWorker === 'function')
+                    this.bike.stopWorker();
                 this.logEvent({ message: 'stop request completed' });
                 this.paused = undefined;
                 resolve(true);
@@ -193,6 +195,11 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
             }
         });
     }
+    canSendUpdate() {
+        if (this.paused || this.stopped)
+            return false;
+        return super.canSendUpdate();
+    }
     sendUpdate(request) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.paused || this.stopped)
@@ -201,10 +208,6 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
             return yield this.processClientRequest(request);
         });
     }
-    sendData() {
-        if (this.onDataFn)
-            this.onDataFn(this.deviceData);
-    }
     update() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.stopped)
@@ -212,9 +215,11 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
             this.updateBusy = true;
             this.getCurrentBikeData()
                 .then(bikeData => {
+                console.log('~~~ bike data', bikeData);
                 this.updateData(this.cyclingData, bikeData);
-                this.transformData();
+                const data = this.transformData();
                 this.updateBusy = false;
+                this.emitData(data);
             })
                 .catch(err => {
                 this.logEvent({ message: 'bike update error', error: err.message, stack: err.stack });
@@ -310,6 +315,7 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
             data = { heartrate: data.heartrate };
         }
         this.deviceData = data;
+        return data;
     }
     sendRequest(request) {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/serial/daum/premium/adapter.d.ts

@@ -9,6 +9,7 @@ export default class DaumPremiumAdapter extends DaumAdapter {
     _startRetryTimeout: number;
     constructor(settings: SerialDeviceSettings, props?: DeviceProperties);
     getName(): string;
+    getUniqueName(): string;
     getPort(): any;
     getInterface(): string;
     getProtocolName(): string;

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

@@ -63,6 +63,14 @@ class DaumPremiumAdapter extends DaumAdapter_1.default {
     getName() {
         return 'Daum8i';
     }
+    getUniqueName() {
+        if (this.getInterface() === 'tcpip') {
+            const port = this.getPort();
+            const [host] = port.split(':');
+            return `${this.getName()} (${host})`;
+        }
+        return super.getUniqueName();
+    }
     getPort() {
         return this.bike.getPort();
     }
@@ -93,8 +101,6 @@ class DaumPremiumAdapter extends DaumAdapter_1.default {
     check() {
         return __awaiter(this, void 0, void 0, function* () {
             var info = {};
-            if (this.isStopped())
-                return false;
             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
                 this.logger.logEvent({ message: "checking device", port: this.getPort() });
                 try {
@@ -179,6 +185,7 @@ class DaumPremiumAdapter extends DaumAdapter_1.default {
                     if (!info.version) {
                         info.version = yield this.bike.getProtocolVersion();
                     }
+                    console.log('~~~~ starting Daum8i', this.getCyclingMode().getName(), this.getCyclingMode().getModeProperty('eppSupport'));
                     if (this.getCyclingMode().getModeProperty('eppSupport')) {
                         const bikeType = this.getCyclingMode().getSetting('bikeType');
                         if (!info.upload) {

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

@@ -41,7 +41,7 @@ class Daum8i {
         const { logger, serial, path } = props;
         this.serial = serial;
         this.path = validatePath(path);
-        this.logger = logger || process.env.DEBUG ? DEBUG_LOGGER : new gd_eventlog_1.EventLogger('DaumPremium');
+        this.logger = logger || (process.env.DEBUG ? DEBUG_LOGGER : new gd_eventlog_1.EventLogger('DaumPremium'));
         this.isLoggingPaused = false;
         this.connected = false;
         this.blocked = false;
@@ -147,7 +147,11 @@ class Daum8i {
     }
     onPortClose() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.close();
+            this.connected = false;
+            if (this.sp) {
+                this.sp.removeAllListeners();
+                this.sp = null;
+            }
         });
     }
     onPortError(error) {
@@ -425,7 +429,10 @@ class Daum8i {
                         done();
                     });
                 }
-                catch (err) { }
+                catch (err) {
+                    this.state.writeBusy = false;
+                    done();
+                }
             });
         });
     }

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

@@ -279,7 +279,6 @@ class Daum8iMockBinding extends binding_mock_1.MockPortBinding {
     }
     onPersonSet(payload) {
         this.simulator.person = (0, utils_2.parsePersonData)(payload);
-        console.log('~~~ person', this.simulator.person);
         this.emitData(this.createResponse('M70', Buffer.from('07000000', 'hex')));
     }
     onPersonGet() {

package/lib/serial/index.d.ts

@@ -1,9 +1,9 @@
 import SerialPortProvider, { useSerialPortProvider } from './serialport';
-import SerialInterface from './serial-interface';
+import SerialInterface, { SerialInterfaceProps } from './serial-interface';
 import SerialAdapterFactory from './adapter-factory';
-export { TCPBinding } from './bindings/tcp';
 import { SerialIncyclistDevice, SerialDeviceSettings } from './adapter';
 import DaumClassicAdapter from './daum/classic/adapter';
 import DaumPremiumAdapter from './daum/premium/adapter';
 import KettlerRacerAdapter from './kettler/ergo-racer/adapter';
-export { SerialPortProvider, useSerialPortProvider, SerialInterface, SerialDeviceSettings, SerialAdapterFactory, DaumClassicAdapter, DaumPremiumAdapter, KettlerRacerAdapter, SerialIncyclistDevice };
+export { TCPBinding } from './bindings/tcp';
+export { SerialPortProvider, useSerialPortProvider, SerialInterface, SerialInterfaceProps, SerialDeviceSettings, SerialAdapterFactory, DaumClassicAdapter, DaumPremiumAdapter, KettlerRacerAdapter, SerialIncyclistDevice };