incyclist-devices 2.1.33 → 2.1.35

package/lib/antv2/base/adapter.d.ts

@@ -1,9 +1,11 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { IChannel, ISensor, Profile } from 'incyclist-ant-plus';
 import AntInterface from './interface';
 import IncyclistDevice from '../../base/adpater';
 import { AntDeviceProperties, AntDeviceSettings, LegacyProfile, BaseDeviceData, AdapterStartStatus } from '../types';
 import { IAdapter, IncyclistAdapterData, IncyclistBikeData, IncyclistCapability } from '../../types';
+import EventEmitter from 'events';
 export default class AntAdapter<TDeviceData extends BaseDeviceData> extends IncyclistDevice<AntDeviceProperties> {
     sensor: ISensor;
     data: IncyclistAdapterData;
@@ -26,6 +28,7 @@ export default class AntAdapter<TDeviceData extends BaseDeviceData> extends Incy
     protected sensorConnected: boolean;
     protected startStatus: AdapterStartStatus;
     protected startupRetryPause: number;
+    protected internalEmitter: EventEmitter;
     constructor(settings: AntDeviceSettings, props?: AntDeviceProperties);
     getProfileName(): Profile;
     getLegacyProfileName(): LegacyProfile;

package/lib/antv2/base/adapter.js

@@ -21,12 +21,14 @@ const utils_2 = require("../utils");
 const consts_1 = require("../consts");
 const sensor_factory_1 = __importDefault(require("../factories/sensor-factory"));
 const gd_eventlog_1 = require("gd-eventlog");
+const events_1 = __importDefault(require("events"));
 const INTERFACE_NAME = 'ant';
 const MAX_RETRIES = 3;
 class AntAdapter extends adpater_1.default {
     constructor(settings, props) {
         super(settings, props);
         this.startupRetryPause = 1000;
+        this.internalEmitter = new events_1.default();
         const profile = this.getProfileName();
         if (settings.protocol && settings.profile !== this.getLegacyProfileName())
             throw new Error('Incorrect Profile');
@@ -126,7 +128,7 @@ class AntAdapter extends adpater_1.default {
             if (!ManId && deviceData.ManId) {
                 this.emit('device-info', this.getSettings(), { manufacturer: (0, utils_2.getBrand)(deviceData.ManId) });
             }
-            const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData']);
+            const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData', '_RawData']);
             this.logEvent({ message: 'onDeviceData', data: logData, paused: this.paused, started: this.started, canEmit: this.canEmitData() });
             if (this.isStopped() || !this.canEmitData())
                 return;
@@ -331,6 +333,7 @@ class AntAdapter extends adpater_1.default {
         });
     }
     initSensor(props) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             this.startStatus.sensorStarted = this.sensorConnected;
             if (this.startStatus.sensorStarted || this.startStatus.sensorStarted)
@@ -339,7 +342,7 @@ class AntAdapter extends adpater_1.default {
             try {
                 this.sensorConnected = yield this.startSensor();
                 if (this.sensorConnected) {
-                    this.logEvent({ message: 'sensor started', device: this.getName(), props });
+                    this.logEvent({ message: 'sensor started', device: this.getName(), channel: (_b = (_a = this.sensor) === null || _a === void 0 ? void 0 : _a.getChannel()) === null || _b === void 0 ? void 0 : _b.getChannelNo(), props });
                     this.startStatus.sensorStarted = true;
                 }
                 else {
@@ -390,8 +393,15 @@ class AntAdapter extends adpater_1.default {
                 this.reportStartStatus();
                 return this.started;
             });
+            const checkInterrupt = () => new Promise(done => {
+                this.internalEmitter.on('stop', () => {
+                    this.started = false;
+                    this.startStatus.interrupted = true;
+                    done(false);
+                });
+            });
             try {
-                yield (0, utils_1.runWithTimeout)(doStart(), totalTimeout);
+                yield (0, utils_1.runWithTimeout)(Promise.race([doStart(), checkInterrupt()]), totalTimeout);
             }
             catch (err) {
                 if (err.message === 'Timeout') {
@@ -409,6 +419,7 @@ class AntAdapter extends adpater_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             let stopped;
             this.logger.logEvent({ message: 'stopping device', device: this.getName() });
+            this.internalEmitter.emit('stop');
             this.promiseWaitForData = null;
             if (this.startStatus) {
                 this.startStatus.interrupted = true;
@@ -431,7 +442,7 @@ class AntAdapter extends adpater_1.default {
     }
     startSensor() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.ant.startSensor(this.sensor, this.onDeviceData.bind(this));
+            return yield this.ant.startSensor(this.sensor, this.onDeviceData.bind(this));
         });
     }
     stopSensor() {

package/lib/base/adpater.js

@@ -67,9 +67,12 @@ class IncyclistDevice extends events_1.default {
     }
     restart(pause) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.logger.logEvent({ message: 'restarting device', device: this.getName() });
             const stopped = yield this.stop();
-            if (!stopped)
+            if (!stopped && !this.isStopped()) {
+                this.logger.logEvent({ message: 'restarting device - stop failed', device: this.getName() });
                 return false;
+            }
             if (pause)
                 yield (0, utils_1.sleep)(pause);
             return yield this.start();

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

@@ -160,7 +160,7 @@ class DaumPremiumAdapter extends DaumAdapter_1.default {
                     }
                     const user = this.getUser();
                     const { route, onStatusUpdate, gear } = props;
-                    if (this.requiresProgramUpload()) {
+                    if (route && this.requiresProgramUpload()) {
                         const bikeType = this.getCyclingMode().getSetting('bikeType');
                         if (!info.upload) {
                             info.upload = yield this.getComms().programUpload(bikeType, route, onStatusUpdate);

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "incyclist-devices",
-  "version": "2.1.33",
+  "version": "2.1.35",
   "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",
+    "incyclist-ant-plus": "^0.3.0",
     "win32filetime": "^1.0.2"
   },
   "peerDependencies": {