incyclist-devices 2.1.5 → 2.1.7

package/lib/antv2/base/adapter.js

@@ -120,8 +120,8 @@ class AntAdapter extends adpater_1.default {
                 this.emit('device-info', this.getSettings(), { manufacturer: (0, utils_2.getBrand)(deviceData.ManId) });
             }
             const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData']);
-            this.logEvent({ message: 'onDeviceData', data: logData, paused: this.paused });
-            if (!this.started || this.isStopped() || !this.canEmitData())
+            this.logEvent({ message: 'onDeviceData', data: logData, paused: this.paused, started: this.started, canEmit: this.canEmitData() });
+            if (this.isStopped() || !this.canEmitData())
                 return;
             if (this.isControllable()) {
                 let incyclistData = this.mapData(deviceData);
@@ -333,9 +333,12 @@ class AntAdapter extends adpater_1.default {
             try {
                 this.sensorConnected = yield this.startSensor();
                 if (this.sensorConnected) {
-                    this.logEvent({ message: 'sensor started', props });
+                    this.logEvent({ message: 'sensor started', device: this.getName(), props });
                     this.startStatus.sensorStarted = true;
                 }
+                else {
+                    this.logEvent({ message: 'start sensor failed', device: this.getName(), reason: 'unknown', props });
+                }
             }
             catch (err) {
                 this.logEvent({ message: 'start sensor failed', device: this.getName(), reason: err.message, props });
@@ -402,7 +405,6 @@ class AntAdapter extends adpater_1.default {
             this.promiseWaitForData = null;
             if (this.startStatus) {
                 this.startStatus.interrupted = true;
-                console.log('~~~ still starting');
                 yield (0, utils_1.sleep)(20);
             }
             try {

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

@@ -15,6 +15,7 @@ export default class AntFEAdapter extends AntAdapter<FitnessEquipmentSensorState
     protected distanceInternal?: number;
     protected startProps: AntDeviceProperties;
     protected promiseReconnect: Promise<boolean>;
+    protected promiseSendUpdate: Promise<boolean>;
     constructor(settings: AntDeviceSettings, props?: AntDeviceProperties);
     getDisplayName(): string;
     isReconnecting(): boolean;

package/lib/antv2/fe/adapter.js

@@ -40,19 +40,26 @@ class AntFEAdapter extends adapter_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             if ((this.paused || this.isReconnecting()) && !forced)
                 return;
+            if (this.promiseSendUpdate) {
+                this.logEvent({ message: 'send bike update skipped', device: this.getName(), request, reason: 'busy' });
+                return;
+            }
             let isReset = request.reset && Object.keys(request).length === 1;
             const update = isReset ? this.getCyclingMode().getBikeInitRequest() : this.getCyclingMode().sendBikeUpdate(request);
             this.logEvent({ message: 'send bike update requested', device: this.getName(), update, request });
             try {
                 const fe = this.sensor;
                 if (update.slope !== undefined) {
-                    yield fe.sendTrackResistance(update.slope);
+                    this.promiseSendUpdate = fe.sendTrackResistance(update.slope);
                 }
                 if (update.targetPower !== undefined) {
-                    yield fe.sendTargetPower(update.targetPower);
+                    this.promiseSendUpdate = fe.sendTargetPower(update.targetPower);
                 }
+                yield this.promiseSendUpdate;
+                delete this.promiseSendUpdate;
             }
             catch (err) {
+                delete this.promiseSendUpdate;
                 if (err.message && err.message.toLowerCase() === 'timeout') {
                     this.emit('timeout');
                     if (this.startProps.automaticReconnect) {

package/lib/ble/base/comms.js

@@ -176,9 +176,9 @@ class BleComms extends events_1.default {
     }
     initDevice() {
         this.logEvent({ message: 'get device info' });
-        return this.getDeviceInfo().then(() => {
-            this.emit('deviceInfo', this.deviceInfo);
-            this.logEvent(Object.assign({ message: 'device init done' }, this.deviceInfo));
+        return this.getDeviceInfo().then((info) => {
+            this.emit('deviceInfo', info);
+            this.logEvent(Object.assign({ message: 'device init done' }, info));
             this.isInitialized = true;
             return true;
         });

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

@@ -35,7 +35,7 @@ export default class BleFitnessMachineDevice extends BleComms {
     getWindSpeed(): number;
     parseIndoorBikeData(_data: Uint8Array): IndoorBikeData;
     parseFitnessMachineStatus(_data: Uint8Array): IndoorBikeData;
-    getFitnessMachineFeatures(): Promise<IndoorBikeFeatures>;
+    getFitnessMachineFeatures(): Promise<IndoorBikeFeatures | undefined>;
     onData(characteristic: string, data: Buffer): boolean;
     writeFtmsMessage(requestedOpCode: any, data: any, props?: BleWriteProps): Promise<number>;
     requestControl(): Promise<boolean>;

package/lib/ble/fm/comms.js

@@ -76,7 +76,7 @@ class BleFitnessMachineDevice extends comms_1.BleComms {
         this.cw = 0.6;
         this.windSpeed = 0;
         this.wheelSize = 2100;
-        this.data = {};
+        this.reset();
         this.services = BleFitnessMachineDevice.services;
     }
     static isMatching(characteristics) {
@@ -310,6 +310,7 @@ class BleFitnessMachineDevice extends comms_1.BleComms {
             }
             catch (err) {
                 this.logEvent({ message: 'could not read FitnessMachineFeatures', error: err.message, stack: err.stack });
+                return undefined;
             }
         });
     }

package/lib/ble/tacx/comms.js

@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const _1 = require(".");
 const consts_1 = require("../consts");
 const comms_1 = __importDefault(require("../fm/comms"));
 const utils_1 = require("../utils");
@@ -88,7 +87,7 @@ class TacxAdvancedFitnessMachineDevice extends comms_1.default {
         return 'Smart Trainer';
     }
     getProtocol() {
-        return _1.BleTacxComms.protocol;
+        return TacxAdvancedFitnessMachineDevice.protocol;
     }
     getServiceUUids() {
         return TacxAdvancedFitnessMachineDevice.services;

package/lib/serial/daum/classic/comms.d.ts

@@ -5,6 +5,7 @@ import { SerialCommProps } from '../../types';
 import { DeviceType, IncyclistBikeData, User } from '../../../types';
 export default class Daum8008 extends SerialPortComms<DaumClassicCommsState, DaumClassicRequest, DaumClassicResponse> implements DaumSerialComms {
     protected bikeNo: number;
+    protected prevFailedPayload: any;
     constructor(props: SerialCommProps);
     validatePath(path: string): string;
     getDefaultLoggerName(): string;

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

@@ -17,7 +17,7 @@ const comms_1 = __importDefault(require("../../base/comms"));
 const utils_2 = require("./utils");
 const types_1 = require("../types");
 const ByteLength = require('@serialport/parser-byte-length');
-const TIMEOUT_SEND = 2000;
+const TIMEOUT_SEND = 5000;
 class Daum8008 extends comms_1.default {
     constructor(props) {
         super(props);
@@ -65,11 +65,12 @@ class Daum8008 extends comms_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             this.initForResponse(expected);
             yield this.write(Buffer.from(payload));
-            const response = yield this.waitForResponse();
+            let response = yield this.waitForResponse();
             if (response.type === 'Error')
                 throw response.error;
             if (response.data[0] !== payload[0]) {
                 this.portFlush();
+                this.logEvent({ message: "sendCommand:received:", port: this.path, hex: Buffer.from(response.data).toString('hex') });
                 throw new Error('illegal response');
             }
             return response;
@@ -91,11 +92,13 @@ class Daum8008 extends comms_1.default {
                     const res = yield this.doSend(expected, payload);
                     this.logEvent(Object.assign(Object.assign({ message: "sendCommand:received:" }, logPayload), { hex: Buffer.from(res.data).toString('hex') }));
                     this.sendCmdPromise = null;
+                    this.prevFailedPayload = null;
                     resolve(res);
                 }
                 catch (err) {
                     this.logEvent(Object.assign(Object.assign({ message: "sendCommand:error:" }, logPayload), { error: err.message }));
                     this.sendCmdPromise = null;
+                    this.prevFailedPayload = payload;
                     reject(err);
                 }
             }));

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

@@ -569,7 +569,7 @@ class Daum8i extends comms_1.default {
                 }
             }
             catch (err) {
-                this.logEvent({ message: 'error', fn: 'programUpload', error: err.message, stack: err.stack });
+                this.logEvent({ message: 'programUpload failed', reason: err.message });
                 return false;
             }
         });

package/package.json

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