incyclist-services 1.3.12 → 1.3.14

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

@@ -18,6 +18,7 @@ export declare class DeviceRideService extends EventEmitter {
     protected simulatorEnforced: boolean;
     protected logger: EventLogger;
     protected debug: any;
+    protected promiseSendUpdate: Promise<UpdateRequest | void>[];
     protected deviceDataHandler: any;
     static getInstance(): DeviceRideService;
     constructor();
@@ -26,6 +27,7 @@ export declare class DeviceRideService extends EventEmitter {
     protected waitForInit(): Promise<void>;
     lazyInit(): Promise<void>;
     getAdapterStateInfo(adapterInfo: AdapterInfo): AdapterStateInfo;
+    getData(): DeviceData;
     protected getAdapterList(onlySelected?: boolean): AdapterRideInfo[];
     prepareEppRoute(props: RideServiceDeviceProperties): PreparedRoute;
     waitForPreviousStartToFinish(): Promise<boolean>;
@@ -53,7 +55,9 @@ export declare class DeviceRideService extends EventEmitter {
     protected verifySelected(selectedDevices: any, capability: IncyclistCapability): void;
     onData(deviceSettings: DeviceSettings, data: DeviceData): void;
     private getEnabledCapabilities;
-    sendUpdate(request: UpdateRequest): void;
+    isUpdateBusy(): boolean;
+    waitForUpdateFinish(): Promise<void>;
+    sendUpdate(request: UpdateRequest): Promise<void>;
     getCyclingMode(udid?: string): CyclingMode;
     resetCyclingMode(sendInit?: boolean): Promise<void>;
     onCyclingModeChanged(udid: string, mode: string, settings: any): Promise<void>;

package/lib/devices/ride/service.js

@@ -80,6 +80,9 @@ class DeviceRideService extends events_1.default {
         const isStarted = adapter.isStarted();
         return { udid, name, isControl, capabilities, isStarted };
     }
+    getData() {
+        return this.data;
+    }
     getAdapterList(onlySelected = true) {
         var _a;
         if (onlySelected) {
@@ -830,13 +833,32 @@ class DeviceRideService extends events_1.default {
         }
         return { enabledCapabilities, toBeReplaced };
     }
-    sendUpdate(request) {
-        const adapters = this.getAdapterList();
-        adapters === null || adapters === void 0 ? void 0 : adapters.forEach(ai => {
-            if (ai.adapter && ai.adapter.isControllable()) {
-                const d = ai.adapter;
-                d.sendUpdate(request);
+    isUpdateBusy() {
+        return this.promiseSendUpdate !== undefined && this.promiseSendUpdate !== null;
+    }
+    waitForUpdateFinish() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.promiseSendUpdate) {
+                try {
+                    yield Promise.allSettled(this.promiseSendUpdate);
+                }
+                catch (_a) { }
             }
+            return;
+        });
+    }
+    sendUpdate(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const adapters = this.getAdapterList();
+            this.promiseSendUpdate = [];
+            adapters === null || adapters === void 0 ? void 0 : adapters.forEach(ai => {
+                if (ai.adapter && ai.adapter.isControllable()) {
+                    const d = ai.adapter;
+                    this.promiseSendUpdate.push(d.sendUpdate(request));
+                }
+            });
+            yield this.waitForUpdateFinish();
+            this.promiseSendUpdate = undefined;
         });
     }
     getCyclingMode(udid) {

package/lib/routes/base/parsers/incyclist.js

@@ -29,10 +29,14 @@ class IncyclistXMLParser extends xml_1.XMLParser {
             const gpxFile = Object.assign({}, fileInfo);
             const xmlName = fileInfo.name;
             const fileName = data['gpx-file-path'] || xmlName.replace('xml', 'gpx');
-            if (fileName.startsWith('http') || fileName.startsWith('file') || fileName.startsWith('/') || fileName.startsWith('\\') || fileName.startsWith('.')) {
+            if (fileName.startsWith('file') || fileName.startsWith('/') || fileName.startsWith('\\') || fileName.startsWith('.')) {
                 gpxFile.type = 'file';
                 gpxFile.filename = fileName;
             }
+            else if (fileName.startsWith('http')) {
+                gpxFile.type = 'url';
+                gpxFile.url = fileName;
+            }
             else {
                 if (fileInfo.type === 'url') {
                     gpxFile.url = gpxFile.url.replace(xmlName, fileName);

package/lib/workouts/ride/service.d.ts

@@ -38,6 +38,7 @@ export declare class WorkoutRide extends IncyclistService {
     getWorkout(): Workout;
     getObserver(): Observer;
     protected update(startIfInitialized?: boolean): void;
+    protected resetLimits(): Promise<void>;
     protected resetTimes(): void;
     protected setCurrentLimits(trainingTime?: number): void;
     protected getZoomParameters(time: number): {

package/lib/workouts/ride/service.js

@@ -33,6 +33,15 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
     }
     return useValue ? value : void 0;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __setFunctionName = (this && this.__setFunctionName) || function (f, name, prefix) {
     if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
     return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
@@ -42,6 +51,7 @@ exports.getWorkoutRide = exports.useWorkoutRide = exports.WorkoutRide = void 0;
 const service_1 = require("../../base/service");
 const types_1 = require("../../base/types");
 const observer_1 = require("../../base/types/observer");
+const devices_1 = require("../../devices");
 const settings_1 = require("../../settings");
 const utils_1 = require("../../utils");
 const valid_1 = require("../../utils/valid");
@@ -97,6 +107,7 @@ let WorkoutRide = (() => {
                     this.tsCurrent = ts;
                 this.offset = 0;
                 this.manualTimeOffset = 0;
+                this.currentLimits = undefined;
                 this.emit('started');
                 this.logEvent({ message: 'workout started', settings: this.settings });
                 if (!this.updateInterval) {
@@ -314,6 +325,28 @@ let WorkoutRide = (() => {
                 this.logError(err, 'update');
             }
         }
+        resetLimits() {
+            return __awaiter(this, void 0, void 0, function* () {
+                const rideService = (0, devices_1.useDeviceRide)();
+                rideService.resetCyclingMode();
+                const mode = rideService.getCyclingMode();
+                const data = rideService.getData();
+                const isERG = mode ? mode.constructor.supportsERGMode() : false;
+                if (!this.currentLimits || !mode)
+                    return;
+                yield rideService.waitForUpdateFinish();
+                if (isERG) {
+                    rideService.sendUpdate({ targetPower: data.power });
+                }
+                else if (data.slope !== undefined) {
+                    rideService.sendUpdate({ slope: data.slope });
+                }
+                else {
+                    const initRequests = mode.getBikeInitRequest();
+                    rideService.sendUpdate(initRequests);
+                }
+            });
+        }
         resetTimes() {
             this.manualTimeOffset = 0;
             this.tsStart = undefined;
@@ -412,7 +445,7 @@ let WorkoutRide = (() => {
             this.state = 'idle';
             this.resetTimes();
             this.manualPowerOffset = 0;
-            this.currentLimits = undefined;
+            this.resetLimits();
         }
         emit(eventName, ...args) {
             if (!this.observer)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.3.12",
+  "version": "1.3.14",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },
@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "axios": "^1.6.1",
-    "incyclist-devices": "^2.2.1",
+    "incyclist-devices": "^2.2.2",
     "promise.any": "^2.0.6",
     "tcx-builder": "^1.1.1",
     "uuid": "^9.0.0",