incyclist-services 1.4.3 → 1.4.5

package/lib/activities/ride/service.js

@@ -254,7 +254,7 @@ let ActivityRideService = (() => {
             const powerDetails = { value: (0, utils_1.formatNumber)((_c = stats === null || stats === void 0 ? void 0 : stats.power) === null || _c === void 0 ? void 0 : _c.max, 0), label: 'max' };
             const heartrateDetails = { value: (0, utils_1.formatNumber)((_d = stats === null || stats === void 0 ? void 0 : stats.hrm) === null || _d === void 0 ? void 0 : _d.max, 0), label: 'max' };
             const cadenceDetails = { value: (0, utils_1.formatNumber)((_e = stats === null || stats === void 0 ? void 0 : stats.cadence) === null || _e === void 0 ? void 0 : _e.max, 0), label: 'max' };
-            const elevationGain = { value: (0, utils_1.formatNumber)((_f = this.current.elevationGainDisplay) !== null && _f !== void 0 ? _f : 0, 0), label: 'elev gain', unit: 'm' };
+            const elevationGain = { value: (0, utils_1.formatNumber)((_f = this.current.elevationGainDisplay) !== null && _f !== void 0 ? _f : 0, 0), label: 'elev. done', unit: 'm' };
             return { speedDetails, powerDetails, heartrateDetails, cadenceDetails, elevationGain };
         }
         getMaximumValues() {
@@ -269,8 +269,8 @@ let ActivityRideService = (() => {
                 elevationGainRemaining = undefined;
             if (elevationGainRemaining < 0)
                 elevationGainRemaining = 0;
-            const value = elevationGainRemaining !== undefined ? `-${(0, utils_1.formatNumber)(elevationGainRemaining, 0)}` : undefined;
-            const elevationGain = { value, label: 'elev gain', unit: 'm' };
+            const value = elevationGainRemaining !== undefined ? `${(0, utils_1.formatNumber)(elevationGainRemaining, 0)}` : undefined;
+            const elevationGain = { value, label: 'elev. todo', unit: 'm' };
             return { speedDetails, powerDetails, heartrateDetails, cadenceDetails, elevationGain };
         }
         getActivitySummaryDisplayProperties() {

package/lib/devices/pairing/service.d.ts

@@ -37,6 +37,7 @@ export declare class DevicePairingService extends IncyclistService {
     protected initConfigHandlers(): void;
     protected removeConfigHandlers(): void;
     stop(adapterFilter?: Array<string>): Promise<void>;
+    prepareStart(adapterFilter?: Array<string>): Promise<void>;
     startDeviceSelection(capability: IncyclistCapability, onDeviceSelectStateChanged: (newState: DeviceSelectState) => void): DeviceSelectState;
     stopDeviceSelection(): Promise<void>;
     selectDevice(capability: IncyclistCapability, udid: string, addAll?: boolean): Promise<void>;

package/lib/devices/pairing/service.js

@@ -113,7 +113,7 @@ class DevicePairingService extends service_2.IncyclistService {
     }
     stop() {
         return __awaiter(this, arguments, void 0, function* (adapterFilter = []) {
-            this.logEvent({ message: 'Stop Pairing' });
+            this.logEvent({ message: 'Stop Pairing (Skip)' });
             try {
                 this.state.stopRequested = true;
                 yield this._stop();
@@ -132,6 +132,34 @@ class DevicePairingService extends service_2.IncyclistService {
             }
         });
     }
+    prepareStart() {
+        return __awaiter(this, arguments, void 0, function* (adapterFilter = []) {
+            const stillPairing = this.isPairing();
+            const stillScanning = this.isScanning();
+            this.logEvent({ message: 'Stop Pairing (OK)', stillPairing, stillScanning });
+            try {
+                this.pauseAdapters(this.state.adapters.filter(a => !adapterFilter.includes(a.udid)));
+                if (this.isPairing()) {
+                    this.removePairingCallbacks();
+                }
+                if (this.isScanning()) {
+                    this.state.stopRequested = true;
+                    yield this._stop();
+                }
+                this.removeConfigHandlers();
+                this.settings = {};
+                this.state.initialized = false;
+                this.state.waiting = false;
+                this.state.check = null;
+                this.state.scan = null;
+                this.state.stopRequested = false;
+                this.state.stopped = true;
+            }
+            catch (err) {
+                this.logError(err, 'prepareStart');
+            }
+        });
+    }
     startDeviceSelection(capability, onDeviceSelectStateChanged) {
         try {
             const capabilityData = this.getCapability(capability);
@@ -760,6 +788,7 @@ class DevicePairingService extends service_2.IncyclistService {
             const prev = this.state.canStartRide;
             const canStartRide = this.checkPairingSuccess();
             if (canStartRide !== prev) {
+                this.state.canStartRide = canStartRide;
                 this.emitStartStatus();
             }
         }

package/lib/devices/ride/service.js

@@ -592,6 +592,7 @@ let DeviceRideService = (() => {
         }
         prepareReconnect(unhealthy) {
             return __awaiter(this, void 0, void 0, function* () {
+                this.logEvent({ message: 'prepareReconnect', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData });
                 if (unhealthy.isRestarting)
                     return;
                 yield (0, sleep_1.sleep)(UNHEALTHY_THRESHOLD - NO_DATA_THRESHOLD - 5000);
@@ -612,6 +613,15 @@ let DeviceRideService = (() => {
             return __awaiter(this, void 0, void 0, function* () {
                 if (ifName === 'simulator')
                     return;
+                if (ifName === 'ble') {
+                    try {
+                        throw new Error('ble interface restart request');
+                    }
+                    catch (err) {
+                        this.logError(err, 'reconnectInterface');
+                    }
+                    return;
+                }
                 this.logger.logEvent({ message: 'restart interface', interface: ifName });
                 let stopRequested = false;
                 this.once('stop-ride', () => { stopRequested = true; });
@@ -646,9 +656,11 @@ let DeviceRideService = (() => {
         performInterfaceReconnect(ifName) {
             return __awaiter(this, void 0, void 0, function* () {
                 const i = incyclist_devices_1.InterfaceFactory.create(ifName);
-                yield i.disconnect();
-                yield (0, sleep_1.sleep)(1000);
-                yield i.connect();
+                if (ifName !== 'ble') {
+                    yield i.disconnect();
+                    yield (0, sleep_1.sleep)(1000);
+                    yield i.connect();
+                }
             });
         }
         stopAdapters(adapters) {

package/lib/utils/index.js

@@ -18,13 +18,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.math = exports.geo = void 0;
 __exportStar(require("./logging"), exports);

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "incyclist-services",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.9.0",
-    "@typescript-eslint/eslint-plugin": "^8.16.0",
-    "@typescript-eslint/parser": "^8.15.0",
+    "@types/node": "^22.10.2",
+    "@typescript-eslint/eslint-plugin": "^8.19.0",
+    "@typescript-eslint/parser": "^8.18.2",
     "dotenv": "^16.4.7",
     "eslint": "^9.15.0",
     "formdata-node": "^6.0.3",
@@ -18,7 +18,7 @@
     "typedoc": "^0.27.4",
     "typedoc-plugin-markdown": "^4.3.2",
     "typedoc-plugin-no-inherit": "^1.4.0",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   },
   "scripts": {
     "lint": "eslint . --ext .ts",
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "axios": "^1.7.7",
-    "incyclist-devices": "^2.3.2",
+    "incyclist-devices": "^2.3.6",
     "promise.any": "^2.0.6",
     "semver": "^7.6.3",
     "tcx-builder": "^1.1.1",