incyclist-devices 2.4.0 → 2.4.3

package/lib/ble/base/adapter.js

@@ -356,6 +356,10 @@ class BleAdapter extends adpater_1.default {
     }
     onDisconnectDone() {
         return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.getBle().removeAllListeners('disconnect-done');
+            }
+            catch (_a) { }
             this.logEvent({ message: 'disconnecting device', device: this.getName(), interface: this.getInterface() });
             if (this.isStarting()) {
                 yield this.startTask.stop();
@@ -365,6 +369,7 @@ class BleAdapter extends adpater_1.default {
             const sensor = this.getSensor();
             try {
                 stopped = yield sensor.stopSensor();
+                this.logEvent({ message: 'disconnecting device completed', device: this.getName(), interface: this.getInterface() });
             }
             catch (err) {
                 reason = err.message;

package/lib/ble/base/peripheral.js

@@ -52,6 +52,11 @@ class BlePeripheral {
             }
             this.connectPromise = new Promise((done) => {
                 const peripheral = this.getPeripheral();
+                this.connected = false;
+                this.ble.unregisterConnected(peripheral.id);
+                if (!this.ble.isConnected()) {
+                    return done();
+                }
                 this.logEvent({ message: 'connect peripheral', address: peripheral.address });
                 peripheral.connectAsync().then(() => {
                     this.ble.registerConnected(this, peripheral.id);
@@ -92,6 +97,9 @@ class BlePeripheral {
                 }
                 peripheral.removeAllListeners();
             }
+            else {
+                delete this.onDisconnectHandler;
+            }
             this.ble.unregisterConnected(peripheral.id);
             this.connected = false;
             this.disconnecting = false;

package/lib/ble/base/sensor.js

@@ -117,6 +117,7 @@ class TBleSensor extends events_1.default {
     }
     reconnectSensor() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.logEvent({ message: 'reconnect sensor' });
             let connected = false;
             let subscribed = false;
             let success = false;

package/lib/ble/fm/sensor.js

@@ -396,13 +396,14 @@ class BleFitnessMachineDevice extends sensor_1.TBleSensor {
     }
     writeFtmsMessage(requestedOpCode, data, props) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             try {
                 this.logEvent({ message: 'fmts:write', device: this.getName(), data: data.toString('hex') });
                 let res;
                 let tsStart = Date.now();
                 if (props === null || props === void 0 ? void 0 : props.timeout) {
                     res = yield new task_1.InteruptableTask(this.write(consts_1.FTMS_CP, data, props), {
-                        timeout: 800,
+                        timeout: (_a = props.timeout) !== null && _a !== void 0 ? _a : 800,
                         errorOnTimeout: true
                     }).run();
                 }

package/lib/modes/antble-smarttrainer.js

@@ -72,21 +72,33 @@ class SmartTrainerCyclingMode extends power_base_1.default {
     }
     getConfig() {
         const config = super.getConfig();
-        if (!this.getFeatureToogle().has('VirtualShifting')) {
-            return config;
-        }
+        const virtShiftEnabled = this.getFeatureToogle().has('VirtualShifting');
         let virtshift = config.properties.find(p => p.key === 'virtshift');
         let startGear = config.properties.find(p => p.key === 'startGear');
-        if (!virtshift) {
-            virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: types_1.CyclingModeProperyType.SingleSelect, options: ['Disabled', 'Incyclist', 'Mixed'], default: 'Disabled' };
+        if (!virtshift && !this.adapter.supportsVirtualShifting()) {
+            const options = virtShiftEnabled ? [
+                'Disabled',
+                { key: 'Incyclist', display: 'App only (beta)' },
+                { key: 'Mixed', display: 'App + Bike' }
+            ] :
+                [
+                    'Disabled',
+                    { key: 'Mixed', display: 'Enabled' }
+                ];
+            virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: types_1.CyclingModeProperyType.SingleSelect, options, default: 'Disabled' };
             config.properties.push(virtshift);
         }
-        if (this.adapter.supportsVirtualShifting()) {
+        if (!virtshift && virtShiftEnabled && this.adapter.supportsVirtualShifting()) {
             virtshift.default = 'Enabled';
-            virtshift.options = ['Disabled', 'Incyclist', 'SmartTrainer', 'Mixed'];
+            virtshift.options = [
+                'Disabled',
+                { key: 'Incyclist', display: 'App only (beta)' },
+                { key: 'Mixed', display: 'App + Bike' },
+                { key: 'SmartTrainer', display: 'SmartTreiner (beta)' }
+            ];
             virtshift.default = 'SmartTrainer';
         }
-        if (!startGear) {
+        if (virtshift && !startGear) {
             startGear = { key: 'startGear', name: 'Initial Gear', description: 'Initial Gear', type: types_1.CyclingModeProperyType.Integer, default: 12, min: 1, max: 24, condition: (s) => (s === null || s === void 0 ? void 0 : s.virtshift) === 'Incyclist' || (s === null || s === void 0 ? void 0 : s.virtshift) === 'SmartTrainer' };
             config.properties.push(startGear);
         }

package/lib/simulator/Simulator.js

@@ -59,7 +59,7 @@ class Simulator extends adpater_1.default {
                 this.setBikeProps(props);
             return new Promise((resolve) => {
                 if (!this.isBot)
-                    this.logEvent({ message: 'starting device', device: this.getName(), props });
+                    this.logEvent({ message: 'starting device', device: this.getName() });
                 if (this.started) {
                     return resolve(true);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.4.0",
+  "version": "2.4.3",
   "dependencies": {
     "@protobuf-ts/runtime": "^2.11.1",
     "@serialport/bindings-interface": "^1.2.2",