incyclist-devices 1.5.16 → 1.5.18

package/lib/antv2/ant-device.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { Device } from '../protocol';
 import { IChannel, ISensor } from 'incyclist-ant-plus';
 import AntProtocol from './incyclist-protocol';
@@ -28,6 +29,8 @@ export default class AntAdapter extends IncyclistDevice implements Device {
     selected: boolean;
     settings: any;
     onDataFn: OnDeviceDataCallback;
+    protected ivDataTimeout: NodeJS.Timer;
+    protected lastDataTS: number;
     constructor(sensor: ISensor, protocol: AntProtocol, settings?: any);
     isBike(): boolean;
     isPower(): boolean;
@@ -45,6 +48,8 @@ export default class AntAdapter extends IncyclistDevice implements Device {
     setIgnorePower(ignore: any): void;
     pause(): Promise<boolean>;
     resume(): Promise<boolean>;
+    startDataTimeoutCheck(): void;
+    stopDataTimeoutCheck(): void;
     start(props?: any): Promise<any>;
     stop(): Promise<boolean>;
     isStopped(): boolean;

package/lib/antv2/ant-device.js

@@ -17,6 +17,7 @@ const incyclist_protocol_1 = require("./incyclist-protocol");
 const ant_interface_1 = __importDefault(require("./ant-interface"));
 const device_1 = __importDefault(require("../device"));
 exports.DEFAULT_UPDATE_FREQUENCY = 1000;
+const NO_DATA_TIMEOUT = 5000;
 class AntAdapter extends device_1.default {
     constructor(sensor, protocol, settings) {
         super(protocol, settings);
@@ -92,6 +93,24 @@ class AntAdapter extends device_1.default {
             resolve(true);
         });
     }
+    startDataTimeoutCheck() {
+        if (this.ivDataTimeout)
+            return;
+        this.ivDataTimeout = setInterval(() => {
+            console.log('~~~ check', this.lastDataTS);
+            if (!this.lastDataTS)
+                return;
+            if (this.lastDataTS + NO_DATA_TIMEOUT < Date.now()) {
+                this.emit('disconnected', Date.now() - this.lastDataTS);
+            }
+        }, 1000);
+    }
+    stopDataTimeoutCheck() {
+        if (!this.ivDataTimeout)
+            return;
+        clearInterval(this.ivDataTimeout);
+        this.ivDataTimeout = undefined;
+    }
     start(props) {
         return __awaiter(this, void 0, void 0, function* () {
             if (props && props.user)
@@ -104,6 +123,7 @@ class AntAdapter extends device_1.default {
     }
     stop() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.stopDataTimeoutCheck();
             this.stopped = true;
             return true;
         });

package/lib/antv2/fe.js

@@ -112,6 +112,9 @@ class AntFEAdapter extends ant_device_1.default {
         if (!this.started || this.isStopped())
             return;
         this.deviceData = deviceData;
+        this.lastDataTS = Date.now();
+        if (!this.ivDataTimeout)
+            this.startDataTimeoutCheck();
         try {
             const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData']);
             this.logger.logEvent({ message: 'onDeviceData', data: logData });

package/lib/antv2/hr.js

@@ -40,6 +40,9 @@ class AntHrAdapter extends ant_device_1.default {
         if (!this.started)
             return;
         this.deviceData = deviceData;
+        this.lastDataTS = Date.now();
+        if (!this.ivDataTimeout)
+            this.startDataTimeoutCheck();
         try {
             if (this.onDataFn && !this.ignoreHrm && !this.paused) {
                 if (this.lastUpdate === undefined || (Date.now() - this.lastUpdate) > this.updateFrequency) {

package/lib/antv2/pwr.js

@@ -58,7 +58,9 @@ class AntPwrAdapter extends ant_device_1.default {
         if (!this.started)
             return;
         this.deviceData = deviceData;
-        this.deviceData = deviceData;
+        this.lastDataTS = Date.now();
+        if (!this.ivDataTimeout)
+            this.startDataTimeoutCheck();
         try {
             if (this.onDataFn && !(this.ignoreBike && this.ignorePower) && !this.paused) {
                 if (!this.lastUpdate || (Date.now() - this.lastUpdate) > this.updateFrequency) {

package/lib/ble/fm.js

@@ -554,7 +554,7 @@ class FmAdapter extends device_1.default {
         if (this.device)
             this.device.setLogger(this.logger);
     }
-    isBike() { return this.device.isBike(); }
+    isBike() { return this.device.isBike() || this.device.isPower(); }
     isHrm() { return this.device.isHrm(); }
     isPower() { return this.device.isPower(); }
     isSame(device) {
@@ -708,6 +708,7 @@ class FmAdapter extends device_1.default {
                     bleDevice.on('data', (data) => {
                         this.onDeviceData(data);
                     });
+                    bleDevice.on('disconnected', this.emit);
                     return true;
                 }
             }

package/lib/daum/DaumAdapter.js

@@ -204,6 +204,8 @@ class DaumAdapterBase extends device_1.default {
         this.logger.logEvent(event);
     }
     stop() {
+        if (this.stopped)
+            return Promise.resolve(true);
         this.logEvent({ message: 'stop request' });
         this.stopped = true;
         return new Promise((resolve, reject) => {
@@ -241,7 +243,7 @@ class DaumAdapterBase extends device_1.default {
     }
     sendUpdate(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.paused)
+            if (this.paused || this.stopped)
                 return;
             this.logEvent({ message: 'sendUpdate', request, waiting: this.requests.length });
             return yield this.processClientRequest(request);
@@ -253,6 +255,8 @@ class DaumAdapterBase extends device_1.default {
     }
     update() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.stopped)
+                return;
             this.updateBusy = true;
             this.getCurrentBikeData()
                 .then(bikeData => {
@@ -271,6 +275,8 @@ class DaumAdapterBase extends device_1.default {
     }
     sendRequests() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.stopped)
+                return;
             if (this.requests.length > 0) {
                 const processing = [...this.requests];
                 const cnt = processing.length;
@@ -294,7 +300,7 @@ class DaumAdapterBase extends device_1.default {
     }
     bikeSync() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.paused) {
+            if (this.paused || this.stopped) {
                 return;
             }
             if (this.updateBusy || this.requestBusy) {

package/lib/daum/classic/DaumClassicAdapter.d.ts

@@ -22,6 +22,6 @@ export default class DaumClassicAdapter extends DaumAdapter {
         user?: any;
         bikeSettings?: any;
         gear?: any;
-    }): Promise<unknown>;
+    }, isRelaunch?: boolean): Promise<unknown>;
     getCurrentBikeData(): any;
 }

package/lib/daum/classic/DaumClassicAdapter.js

@@ -121,7 +121,8 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
                 if (!isRelaunch) {
                     try {
                         const version = yield this.bike.getVersion();
-                        this.logEvent({ message: 'device info', deviceInfo: version });
+                        const { serialNo, cockpit } = version || {};
+                        this.logEvent({ message: 'device info', deviceInfo: { serialNo, cockpit } });
                     }
                     catch (_a) { }
                 }
@@ -136,7 +137,7 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
             }
         });
     }
-    performStart(props = {}) {
+    performStart(props = {}, isRelaunch = false) {
         this.stop();
         const { user, bikeSettings } = props;
         if (user && user.weight)
@@ -147,7 +148,7 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
         let startState = {};
         return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
             try {
-                if (!this.bike.isConnected())
+                if (!isRelaunch && !this.bike.isConnected())
                     yield this.bike.saveConnect();
                 yield this.getBike().resetDevice();
                 if (!startState.setProg) {

package/lib/daum/classic/bike.js

@@ -76,10 +76,12 @@ class Daum8008 {
         return 10;
     }
     connect() {
-        this.logEvent({ message: "connect()", port: this.getPort(), sp: (this.sp !== undefined), });
+        this.logEvent({ message: "connect()", port: this.getPort(), isConnected: this.connected, sp: (this.sp !== undefined), });
         if (this.closing || this.opening) {
             return;
         }
+        if (this.connected)
+            return;
         try {
             if (this.sp === undefined) {
                 const settings = this.settings.port || {};

package/lib/device.d.ts

@@ -1,5 +1,7 @@
+/// <reference types="node" />
 import { DeviceProtocol, Device } from './protocol';
 import CyclingMode from './cycling-mode';
+import EventEmitter from 'events';
 export declare const DEFAULT_BIKE_WEIGHT = 10;
 export declare const DEFAULT_USER_WEIGHT = 75;
 export declare type DeviceData = {
@@ -50,7 +52,7 @@ export interface DeviceAdapter extends Device {
     sendUpdate(request: any): void;
     onData(callback: OnDeviceDataCallback): void;
 }
-export default class IncyclistDevice implements DeviceAdapter {
+export default class IncyclistDevice extends EventEmitter implements DeviceAdapter {
     protocol: DeviceProtocol;
     detected: boolean;
     selected: boolean;

package/lib/device.js

@@ -1,10 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_USER_WEIGHT = exports.DEFAULT_BIKE_WEIGHT = void 0;
+const events_1 = __importDefault(require("events"));
 exports.DEFAULT_BIKE_WEIGHT = 10;
 exports.DEFAULT_USER_WEIGHT = 75;
-class IncyclistDevice {
+class IncyclistDevice extends events_1.default {
     constructor(proto, settings) {
+        super();
         this.protocol = proto;
         this.detected = false;
         this.selected = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "1.5.16",
+  "version": "1.5.18",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",