incyclist-devices 2.3.15-beta.1 → 2.3.16

package/lib/ble/base/interface.js

@@ -391,7 +391,6 @@ class BleInterface extends events_1.default {
         if (announcement.name.includes('KICKR')) {
             const supported = announcement.serviceUUIDs.map(s => (0, utils_1.beautifyUUID)(s));
             if (supported.length === 1 && (supported[0] === '1818' || supported[0] === 'FC82')) {
-                this.logEvent({ message: 'wahoo enhancement detected', name: announcement.name, supported });
                 return true;
             }
         }
@@ -533,7 +532,6 @@ class BleInterface extends events_1.default {
     }
     addService(service) {
         try {
-            this.logEvent({ message: 'ble peripheral announced', service });
             const isSuported = this.isSupportedPeripheral(service);
             if (!isSuported) {
                 return;

package/lib/ble/fm/sensor.js

@@ -217,10 +217,16 @@ class BleFitnessMachineDevice extends sensor_1.TBleSensor {
             const OpCode = data.readUInt8(0);
             switch (OpCode) {
                 case 8:
-                    this.data.targetPower = data.readInt16LE(1);
+                    if (data.length >= 3)
+                        this.data.targetPower = data.readInt16LE(1);
+                    else
+                        this.logEvent({ message: 'warning', fn: 'parseFitnessMachineStatus()', warning: 'invalid message - message too short', data: data.toString('hex') });
                     break;
                 case 6:
-                    this.data.targetInclination = data.readInt16LE(1) / 10;
+                    if (data.length >= 3)
+                        this.data.targetInclination = data.readInt16LE(1) / 10;
+                    else
+                        this.logEvent({ message: 'warning', fn: 'parseFitnessMachineStatus()', warning: 'invalid message - message too short', data: data.toString('hex') });
                     break;
                 case 4:
                     this.data.status = "STARTED";
@@ -230,7 +236,7 @@ class BleFitnessMachineDevice extends sensor_1.TBleSensor {
                     this.data.status = "STOPPED";
                     break;
                 case 20:
-                    {
+                    if (data.length >= 2) {
                         const spinDownStatus = data.readUInt8(1);
                         switch (spinDownStatus) {
                             case 1:
@@ -248,10 +254,14 @@ class BleFitnessMachineDevice extends sensor_1.TBleSensor {
                             default: break;
                         }
                     }
+                    else {
+                        this.logEvent({ message: 'warning', fn: 'parseFitnessMachineStatus()', warning: 'invalid message - message too short', data: data.toString('hex') });
+                    }
+                    break;
             }
         }
         catch (err) {
-            this.logEvent({ message: 'error', fn: 'parseFitnessMachineStatus()', error: err.message | err, stack: err.stack });
+            this.logEvent({ message: 'error', fn: 'parseFitnessMachineStatus()', error: err.message, data: data.toString('hex'), stack: err.stack });
         }
         return Object.assign(Object.assign({}, this.data), { raw: `2ada:${data.toString('hex')}` });
     }

package/lib/direct-connect/base/interface.js

@@ -238,7 +238,6 @@ class DirectConnectInterface extends events_1.default {
         try {
             service.transport = this.getName();
             const existing = this.find(service);
-            this.logEvent({ message: 'wifi service announced', device: service.name, announcement: service, source, existing, interface: 'wifi' });
             if (existing) {
                 const idx = this.services.indexOf(existing);
                 this.services[idx] = { ts: Date.now(), service };

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

@@ -52,7 +52,7 @@ export default class DaumAdapter<S extends SerialDeviceSettings, P extends Devic
     logEvent(event: any): void;
     stop(): Promise<boolean>;
     sendUpdate(request: any): Promise<UpdateRequest | void>;
-    update(): Promise<void>;
+    update(): void;
     sendRequests(): Promise<void>;
     bikeSync(): Promise<void>;
     updateData(bikeData: IncyclistBikeData): IncyclistBikeData;

package/lib/serial/daum/DaumAdapter.js

@@ -131,13 +131,13 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
             const resumed = yield _super.resume.call(this);
             (_a = this.comms) === null || _a === void 0 ? void 0 : _a.resume();
             if (startUpdatePull)
-                yield this.startUpdatePull();
+                this.startUpdatePull();
             return resumed;
         });
     }
     waitForPrevCheckFinished() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.checkPromise) {
+            if (this.checkPromise !== undefined && this.checkPromise !== null) {
                 this.logEvent({ message: "waiting for previous check device", port: this.getPort() });
                 try {
                     yield this.checkPromise;
@@ -173,7 +173,7 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
     }
     waitForPrevStartFinished() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.startPromise) {
+            if (this.startPromise !== undefined && this.startPromise !== null) {
                 this.logEvent({ message: "waiting for previous device launch", port: this.getPort() });
                 try {
                     yield this.startPromise;
@@ -239,10 +239,7 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
             return;
         this.logEvent({ message: 'start update pull', port: this.getPort() });
         const ivSync = setInterval(() => {
-            try {
-                this.bikeSync();
-            }
-            catch (_a) { }
+            this.bikeSync().catch();
         }, this.pullFrequency);
         const ivUpdate = setInterval(() => {
             try {
@@ -273,7 +270,8 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
     }
     stopUpdatePull() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.iv || !this.iv.emitter)
+            var _a;
+            if (!((_a = this.iv) === null || _a === void 0 ? void 0 : _a.emitter))
                 return;
             return new Promise(done => {
                 this.iv.emitter.on('stop-done', () => {
@@ -373,26 +371,24 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
         });
     }
     update() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.canEmitData() || this.updateBusy)
-                return;
-            this.updateBusy = true;
+        if (!this.canEmitData() || this.updateBusy)
+            return;
+        this.updateBusy = true;
+        this.getCurrentBikeData()
+            .then(bikeData => {
+            const incyclistData = this.updateData(bikeData);
+            const data = this.transformData(incyclistData);
+            this.updateBusy = false;
+            this.emitData(data);
+        })
+            .catch(err => {
             try {
-                const bikeData = yield this.getCurrentBikeData();
-                const incyclistData = this.updateData(bikeData);
-                const data = this.transformData(incyclistData);
-                this.updateBusy = false;
-                this.emitData(data);
-            }
-            catch (err) {
-                try {
-                    this.logEvent({ message: 'bike update error', port: this.getPort(), error: err.message, stack: err.stack });
-                    const incyclistData = this.updateData(this.deviceData);
-                    this.transformData(incyclistData, false);
-                }
-                catch (_a) { }
-                this.updateBusy = false;
+                this.logEvent({ message: 'bike update error', port: this.getPort(), error: err.message, stack: err.stack });
+                const incyclistData = this.updateData(this.deviceData);
+                this.transformData(incyclistData, false);
             }
+            catch (_a) { }
+            this.updateBusy = false;
         });
     }
     sendRequests() {
@@ -428,7 +424,7 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
             if (!((_a = this.iv) === null || _a === void 0 ? void 0 : _a.stopRequested))
                 yield this.sendRequests();
             if (!((_b = this.iv) === null || _b === void 0 ? void 0 : _b.stopRequested))
-                yield this.update();
+                this.update();
             if ((_c = this.iv) === null || _c === void 0 ? void 0 : _c.stopRequested) {
                 this.iv.emitter.emit('stop-done', 'bikeSync');
             }
@@ -518,12 +514,15 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
         if (request.slope !== undefined) {
             this.deviceData.slope = request.slope;
         }
-        return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
-            let bikeRequest = this.getCyclingMode().sendBikeUpdate(request);
-            this.logEvent({ message: 'add request', request: bikeRequest });
-            this.requests.push(bikeRequest);
-            resolve(bikeRequest);
-        }));
+        return new Promise((resolve) => {
+            const fn = () => __awaiter(this, void 0, void 0, function* () {
+                let bikeRequest = this.getCyclingMode().sendBikeUpdate(request);
+                this.logEvent({ message: 'add request', request: bikeRequest });
+                this.requests.push(bikeRequest);
+                resolve(bikeRequest);
+            });
+            fn();
+        });
     }
     getDeviceInfo() {
         return __awaiter(this, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.3.15-beta.1",
+  "version": "2.3.16",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",