incyclist-devices 1.5.0 → 1.5.2

package/lib/antv2/ant-interface.js

@@ -226,7 +226,7 @@ class AntInterface extends events_1.default {
             if (!this.isConnected || !this.device)
                 return true;
             const channel = sensor.getChannel();
-            this.removeAllListeners('data');
+            channel.removeAllListeners('data');
             if (channel)
                 return yield channel.stopSensor(sensor);
         });

package/lib/antv2/fe.d.ts

@@ -8,6 +8,7 @@ export default class AntFEAdapter extends AntAdapter {
     protected logger: EventLogger;
     protected cyclingMode: CyclingMode;
     protected distanceInternal?: number;
+    protected msgCount: number;
     constructor(sensor: ISensor, protocol: AntProtocol);
     isBike(): boolean;
     isHrm(): boolean;

package/lib/antv2/fe.js

@@ -28,6 +28,7 @@ class AntFEAdapter extends ant_device_1.default {
         this.deviceData = {
             DeviceID: sensor.getDeviceID()
         };
+        this.msgCount = 0;
         this.logger = new gd_eventlog_1.EventLogger('Ant+FE');
     }
     isBike() { return true; }
@@ -112,10 +113,10 @@ class AntFEAdapter extends ant_device_1.default {
             return;
         this.deviceData = deviceData;
         try {
+            const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData']);
+            this.logger.logEvent({ message: 'onDeviceData', data: logData });
             if (this.onDataFn && !(this.ignoreHrm && this.ignoreBike && this.ignorePower) && !this.paused) {
                 if (!this.lastUpdate || (Date.now() - this.lastUpdate) > this.updateFrequency) {
-                    const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData']);
-                    this.logger.logEvent({ message: 'onDeviceData', data: logData });
                     let incyclistData = this.mapData(deviceData);
                     incyclistData = this.getCyclingMode().updateData(incyclistData);
                     const data = this.transformData(incyclistData);
@@ -125,6 +126,7 @@ class AntFEAdapter extends ant_device_1.default {
             }
         }
         catch (err) {
+            this.logger.logEvent({ message: 'error', fn: 'onDeviceData()', error: err.message || err, stack: err.stack });
         }
     }
     mapData(deviceData) {
@@ -171,7 +173,7 @@ class AntFEAdapter extends ant_device_1.default {
         if (this.ignoreBike) {
             data = { heartrate: data.heartrate };
         }
-        if (this.ignoreHrm)
+        if (this.ignoreHrm || !this.isHrm())
             delete data.heartrate;
         return data;
     }
@@ -181,21 +183,38 @@ class AntFEAdapter extends ant_device_1.default {
         });
         return __awaiter(this, void 0, void 0, function* () {
             _super.start.call(this, props);
+            this.logger.logEvent({ message: 'start', props });
+            this.msgCount = 0;
             const opts = props || {};
             const { args = {}, user = {} } = opts;
             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                const { timeout } = props || {};
-                let to;
+                const { timeout = 20000 } = props || {};
+                let start = Date.now();
+                let startTimeout = start + timeout;
+                const status = { userSent: false, slopeSent: false };
+                let iv;
+                const stopInterval = () => {
+                    if (iv)
+                        clearInterval(iv);
+                    iv = undefined;
+                };
                 if (timeout) {
-                    to = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-                        yield this.stop();
-                        reject(new Error(`could not start device, reason:timeout`));
-                    }), timeout);
+                    iv = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+                        if (Date.now() > startTimeout) {
+                            stopInterval();
+                            yield this.stop();
+                            reject(new Error(`could not start device, reason:timeout`));
+                        }
+                        if (this.started && this.msgCount > 1 && status.userSent) {
+                            this.logger.logEvent({ message: 'start success' });
+                            stopInterval();
+                        }
+                    }), 100);
                 }
                 this.started = yield this.ant.startSensor(this.sensor, this.onDeviceData.bind(this));
-                if (to)
-                    clearTimeout(to);
                 if (!this.started) {
+                    stopInterval();
+                    this.stop();
                     return reject(new Error(`could not start device`));
                 }
                 try {
@@ -205,15 +224,19 @@ class AntFEAdapter extends ant_device_1.default {
                     const defaultBikeWeight = bikeType === 'mountain' ? DEFAULT_BIKE_WEIGHT_MOUNTAIN : DEFAULT_BIKE_WEIGHT;
                     const userWeight = args.userWeight || user.weight || DEFAULT_USER_WEIGHT;
                     const bikeWeight = args.bikeWeight || defaultBikeWeight;
-                    const status = { userSent: false, slopeSent: false };
                     let i = 0;
                     while (i < 3 && !status.userSent && !status.slopeSent) {
                         status.userSent = status.userSent || (yield fe.sendUserConfiguration(userWeight, bikeWeight, args.wheelDiameter, args.gearRatio));
                         status.slopeSent = status.slopeSent || (yield fe.sendTrackResistance(0.0));
                         i++;
                     }
-                    if (status.userSent)
+                    stopInterval();
+                    if (status.userSent) {
+                        this.logger.logEvent({ message: 'start success' });
                         return resolve(true);
+                    }
+                    this.logger.logEvent({ message: 'start failure' });
+                    this.stop();
                     return reject(new Error(`could not start device, reason: could not send commands`));
                 }
                 catch (error) {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "incyclist-devices",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",
     "@types/serialport": "^8.0.1",
     "gd-ant-plus": "^0.0.33",
-    "incyclist-ant-plus": "^0.1.2",
+    "incyclist-ant-plus": "^0.1.3",
     "win32filetime": "^1.0.2"
   },
   "peerDependencies": {