incyclist-services 1.7.84 → 1.7.86

package/lib/cjs/devices/page/service.js

@@ -273,7 +273,8 @@ let DevicesPageService = (() => {
                 value: d.value,
                 interface: d.interface,
                 isSelected: d.selected,
-                onClick: (addAll) => { this.onDeviceSelected(d, addAll); }
+                onClick: (addAll) => { this.onDeviceSelected(d, addAll); },
+                onDelete: () => { this.onDeviceDelete(d); }
             }));
             const disabled = devices.length > 0 && !devices.some(d => d.isSelected);
             return {
@@ -313,6 +314,12 @@ let DevicesPageService = (() => {
             this.getDevicePairing().selectDevice(capability, d.udid, addAll);
             this.updatePage();
         }
+        onDeviceDelete(d) {
+            const capability = this.openedCapability;
+            this.logEvent({ message: 'device delete requested', capability, device: d.name });
+            this.getDevicePairing().deleteDevice(capability, d.udid);
+            this.updatePage();
+        }
         async closeDeviceSelection(enabled) {
             this.logEvent({ message: 'capability closed', capability: this.openedCapability });
             if (!enabled) {

package/lib/cjs/devices/pairing/service.js

@@ -832,6 +832,12 @@ let DevicePairingService = (() => {
                     this.logEvent({ message: 'device could not be added', reason: 'add() failed' });
                     return;
                 }
+                const deletedCapabilities = (this.state.deleted || [])
+                    .filter(e => e.udid === udid)
+                    .map(e => e.capability);
+                deletedCapabilities.forEach(capability => {
+                    this.getDeviceConfiguration().delete(udid, capability, true);
+                });
                 const adapter = this.getDeviceConfiguration().getAdapter(udid);
                 if (adapter) {
                     adapter.onScanStart();
@@ -1411,7 +1417,7 @@ let DevicePairingService = (() => {
                 c.value = undefined;
                 c.connectState = undefined;
             }
-            this.getDeviceConfiguration().delete(udid, capability, shouldEmit);
+            this.getDeviceConfiguration().delete(udid, capability, true);
             this.addToDeletedList(capability, udid);
             this.emitStateChange({ capabilities: this.state.capabilities });
         }
@@ -1446,13 +1452,6 @@ let DevicePairingService = (() => {
             const c = this.getCapability(capability);
             this.state.deleted.push({ capability: c.capability, udid });
         }
-        removeFromDeletedList(capability, udid) {
-            const c = this.getCapability(capability);
-            const idx = this.state.deleted.findIndex(e => e.capability === c.capability && e.udid === udid);
-            if (idx === -1)
-                return;
-            this.state.deleted.splice(idx, 1);
-        }
         isOnDeletedList(c, udid) {
             const capability = this.getCapability(c);
             return this.state.deleted.some(e => e.capability === capability.capability && e.udid === udid);

package/lib/cjs/maps/MapArea/utils.js

@@ -134,11 +134,13 @@ function concatPaths(path, path2, position, wayId) {
     }
     if (position === 'after') {
         append.shift();
-        path.push(...append);
+        append.forEach(p => path.push(p));
     }
     else {
         path.shift();
-        path.unshift(...append);
+        const newPath = append.concat(path);
+        path.length = 0;
+        newPath.forEach(p => path.push(p));
     }
 }
 function splitAtPointInfo(way, split) {

package/lib/cjs/ride/display/service.js

@@ -139,7 +139,7 @@ let RideDisplayService = (() => {
                     interface: this.getBikeInterface()
                 });
                 if (!this.getRideType()) {
-                    this.observer.emit('start-error', new Error('No active ride'));
+                    this.observer?.emit('start-error', new Error('No active ride'));
                     this.setState('Error');
                 }
                 this.startDevices();

package/lib/cjs/ride/page/service.js

@@ -97,14 +97,24 @@ let RidePageService = (() => {
                 super.openPage();
                 try {
                     const service = this.getRideDisplay();
+                    const registerAndStart = () => {
+                        this.registerEventHandlers();
+                        service.start(simulate);
+                        (0, sleep_1.sleep)(5).then(() => {
+                            this.updatePageDisplay();
+                        });
+                    };
                     if (!this.isInitialized) {
-                        service.init();
+                        service.init()
+                            .then(() => {
+                            this.isInitialized = true;
+                            registerAndStart();
+                        })
+                            .catch((err) => { this.logError(err, 'openPage'); });
+                    }
+                    else {
+                        registerAndStart();
                     }
-                    this.registerEventHandlers();
-                    service.start(simulate);
-                    (0, sleep_1.sleep)(5).then(() => {
-                        this.updatePageDisplay();
-                    });
                 }
                 catch (err) {
                     this.logError(err, 'openPage');

package/lib/cjs/routes/list/service.js

@@ -637,11 +637,11 @@ let RouteListService = (() => {
         unselect() {
             this.selectedRoute = null;
             this.startSettings = null;
-            this.observer.emit('selected', null);
+            this.observer?.emit('selected', null);
         }
         select(route) {
             this.selectedRoute = route;
-            this.observer.emit('selected', route);
+            this.observer?.emit('selected', route);
         }
         selectCard(card) {
             this.selectedRoute = card.getData();

package/lib/cjs/workouts/base/graph/series.js

@@ -115,8 +115,8 @@ function formatRange(low, high, unit, rangePrefix = '') {
     const v = high ?? low;
     return v === undefined ? '' : `${Math.round(v)}${unit}`;
 }
-function getStepTargetText(step, ftp, powerOverrideWatts) {
-    const { min: minPower, max: maxPower } = powerOverrideWatts ?? resolvePowerWatts(step.power, ftp);
+function getStepTargetText(step, ftp) {
+    const { min: minPower, max: maxPower } = resolvePowerWatts(step.power, ftp);
     const ascending = step.steady || step.cooldown === false;
     const lowPower = ascending ? minPower : maxPower;
     const highPower = ascending ? maxPower : minPower;

package/lib/cjs/workouts/list/service.js

@@ -426,7 +426,7 @@ let WorkoutListService = (() => {
         }
         selectCard(card) {
             if (this.selectedWorkout) {
-                const selectedCard = this.findCard(this.selectedWorkout)?.card;
+                const selectedCard = this.findCard(this.selectedWorkout, { includeScheduled: true })?.card;
                 if (selectedCard)
                     selectedCard.unselect();
             }
@@ -563,7 +563,7 @@ let WorkoutListService = (() => {
             }
             return this.myWorkouts;
         }
-        findCard(target) {
+        findCard(target, opts) {
             let id;
             if (typeof target === 'string') {
                 id = target;
@@ -572,9 +572,13 @@ let WorkoutListService = (() => {
                 const item = target;
                 id = item.id;
             }
-            let res;
+            const includeScheduled = opts?.includeScheduled ?? false;
             const lists = this.getLists(false) || [];
-            lists.forEach(list => {
+            const regularLists = lists.filter(l => l.getId() !== 'scheduled');
+            const scheduledLists = includeScheduled ? lists.filter(l => l.getId() === 'scheduled') : [];
+            const orderedLists = [...regularLists, ...scheduledLists];
+            let res;
+            orderedLists.forEach(list => {
                 if (res)
                     return;
                 const card = list.getCards().find(c => c.getData()?.id === id);

package/lib/cjs/workouts/page/service.js

@@ -146,7 +146,7 @@ let WorkoutListPageService = (() => {
         }
         getWorkoutDetailsProps(id) {
             try {
-                const card = this.findWorkoutCard(id);
+                const card = this.findWorkoutCard(id, { includeScheduled: true });
                 if (!card)
                     return null;
                 const workout = card.getData();
@@ -266,7 +266,7 @@ let WorkoutListPageService = (() => {
         }
         onStart(id, opts) {
             try {
-                const card = this.findWorkoutCard(id);
+                const card = this.findWorkoutCard(id, { includeScheduled: true });
                 if (!card)
                     return;
                 const service = this.getWorkoutList();
@@ -285,7 +285,7 @@ let WorkoutListPageService = (() => {
         }
         onMarkForRoute(id) {
             try {
-                const card = this.findWorkoutCard(id);
+                const card = this.findWorkoutCard(id, { includeScheduled: true });
                 if (!card)
                     return;
                 const settings = this.getWorkoutList().getStartSettings();
@@ -425,9 +425,13 @@ let WorkoutListPageService = (() => {
             });
             return items;
         }
-        findWorkoutCard(id) {
+        findWorkoutCard(id, opts) {
+            const includeScheduled = opts?.includeScheduled ?? false;
             const lists = this.getWorkoutList().getLists(false) ?? [];
-            for (const list of lists) {
+            const regularLists = lists.filter(l => l.getId() !== 'scheduled');
+            const scheduledLists = includeScheduled ? lists.filter(l => l.getId() === 'scheduled') : [];
+            const orderedLists = [...regularLists, ...scheduledLists];
+            for (const list of orderedLists) {
                 const card = list.getCards().find(c => c.getId() === id);
                 if (card)
                     return card;

package/lib/cjs/workouts/ride/page/service.js

@@ -267,10 +267,10 @@ let WorkoutRidePageService = (() => {
             }
         }
         onIncreaseLoad() {
-            this.adjustLoad(DEFAULT_LOAD_INCREMENT);
+            this.adjustLoad(this.getLoadIncrement());
         }
         onDecreaseLoad() {
-            this.adjustLoad(-DEFAULT_LOAD_INCREMENT);
+            this.adjustLoad(-this.getLoadIncrement());
         }
         onSetLoadIncrement(value) {
             try {
@@ -427,7 +427,7 @@ let WorkoutRidePageService = (() => {
             if (!limits)
                 return empty;
             const currentStep = {
-                label: (0, graph_1.getStepTargetText)(limits.step ?? {}, ftp, { min: limits.minPower, max: limits.maxPower }),
+                label: (0, graph_1.getStepTargetText)(limits.step ?? {}, ftp),
                 targetPower: limits.targetPower ?? null,
                 duration: limits.duration,
                 remaining: limits.remaining,
@@ -456,7 +456,7 @@ let WorkoutRidePageService = (() => {
             const title = wo.title ?? '';
             if (!limits)
                 return { text: title, mode: wo.mode ?? null };
-            const target = (0, graph_1.getStepTargetText)(limits.step ?? {}, wo.ftp, { min: limits.minPower, max: limits.maxPower });
+            const target = (0, graph_1.getStepTargetText)(limits.step ?? {}, wo.ftp);
             const duration = (0, graph_1.getStepDuration)({ duration: limits.duration });
             const text = title ? `${target} for ${duration} - ${title}` : `${target} for ${duration}`;
             return { text, mode: wo.mode ?? null };

package/lib/esm/devices/page/service.js

@@ -270,7 +270,8 @@ let DevicesPageService = (() => {
                 value: d.value,
                 interface: d.interface,
                 isSelected: d.selected,
-                onClick: (addAll) => { this.onDeviceSelected(d, addAll); }
+                onClick: (addAll) => { this.onDeviceSelected(d, addAll); },
+                onDelete: () => { this.onDeviceDelete(d); }
             }));
             const disabled = devices.length > 0 && !devices.some(d => d.isSelected);
             return {
@@ -310,6 +311,12 @@ let DevicesPageService = (() => {
             this.getDevicePairing().selectDevice(capability, d.udid, addAll);
             this.updatePage();
         }
+        onDeviceDelete(d) {
+            const capability = this.openedCapability;
+            this.logEvent({ message: 'device delete requested', capability, device: d.name });
+            this.getDevicePairing().deleteDevice(capability, d.udid);
+            this.updatePage();
+        }
         async closeDeviceSelection(enabled) {
             this.logEvent({ message: 'capability closed', capability: this.openedCapability });
             if (!enabled) {

package/lib/esm/devices/pairing/service.js

@@ -826,6 +826,12 @@ let DevicePairingService = (() => {
                     this.logEvent({ message: 'device could not be added', reason: 'add() failed' });
                     return;
                 }
+                const deletedCapabilities = (this.state.deleted || [])
+                    .filter(e => e.udid === udid)
+                    .map(e => e.capability);
+                deletedCapabilities.forEach(capability => {
+                    this.getDeviceConfiguration().delete(udid, capability, true);
+                });
                 const adapter = this.getDeviceConfiguration().getAdapter(udid);
                 if (adapter) {
                     adapter.onScanStart();
@@ -1405,7 +1411,7 @@ let DevicePairingService = (() => {
                 c.value = undefined;
                 c.connectState = undefined;
             }
-            this.getDeviceConfiguration().delete(udid, capability, shouldEmit);
+            this.getDeviceConfiguration().delete(udid, capability, true);
             this.addToDeletedList(capability, udid);
             this.emitStateChange({ capabilities: this.state.capabilities });
         }
@@ -1440,13 +1446,6 @@ let DevicePairingService = (() => {
             const c = this.getCapability(capability);
             this.state.deleted.push({ capability: c.capability, udid });
         }
-        removeFromDeletedList(capability, udid) {
-            const c = this.getCapability(capability);
-            const idx = this.state.deleted.findIndex(e => e.capability === c.capability && e.udid === udid);
-            if (idx === -1)
-                return;
-            this.state.deleted.splice(idx, 1);
-        }
         isOnDeletedList(c, udid) {
             const capability = this.getCapability(c);
             return this.state.deleted.some(e => e.capability === capability.capability && e.udid === udid);

package/lib/esm/maps/MapArea/utils.js

@@ -98,11 +98,13 @@ export function concatPaths(path, path2, position, wayId) {
     }
     if (position === 'after') {
         append.shift();
-        path.push(...append);
+        append.forEach(p => path.push(p));
     }
     else {
         path.shift();
-        path.unshift(...append);
+        const newPath = append.concat(path);
+        path.length = 0;
+        newPath.forEach(p => path.push(p));
     }
 }
 export function splitAtPointInfo(way, split) {

package/lib/esm/ride/display/service.js

@@ -136,7 +136,7 @@ let RideDisplayService = (() => {
                     interface: this.getBikeInterface()
                 });
                 if (!this.getRideType()) {
-                    this.observer.emit('start-error', new Error('No active ride'));
+                    this.observer?.emit('start-error', new Error('No active ride'));
                     this.setState('Error');
                 }
                 this.startDevices();

package/lib/esm/ride/page/service.js

@@ -94,14 +94,24 @@ let RidePageService = (() => {
                 super.openPage();
                 try {
                     const service = this.getRideDisplay();
+                    const registerAndStart = () => {
+                        this.registerEventHandlers();
+                        service.start(simulate);
+                        sleep(5).then(() => {
+                            this.updatePageDisplay();
+                        });
+                    };
                     if (!this.isInitialized) {
-                        service.init();
+                        service.init()
+                            .then(() => {
+                            this.isInitialized = true;
+                            registerAndStart();
+                        })
+                            .catch((err) => { this.logError(err, 'openPage'); });
+                    }
+                    else {
+                        registerAndStart();
                     }
-                    this.registerEventHandlers();
-                    service.start(simulate);
-                    sleep(5).then(() => {
-                        this.updatePageDisplay();
-                    });
                 }
                 catch (err) {
                     this.logError(err, 'openPage');

package/lib/esm/routes/list/service.js

@@ -631,11 +631,11 @@ let RouteListService = (() => {
         unselect() {
             this.selectedRoute = null;
             this.startSettings = null;
-            this.observer.emit('selected', null);
+            this.observer?.emit('selected', null);
         }
         select(route) {
             this.selectedRoute = route;
-            this.observer.emit('selected', route);
+            this.observer?.emit('selected', route);
         }
         selectCard(card) {
             this.selectedRoute = card.getData();

package/lib/esm/workouts/base/graph/series.js

@@ -107,8 +107,8 @@ function formatRange(low, high, unit, rangePrefix = '') {
     const v = high ?? low;
     return v === undefined ? '' : `${Math.round(v)}${unit}`;
 }
-export function getStepTargetText(step, ftp, powerOverrideWatts) {
-    const { min: minPower, max: maxPower } = powerOverrideWatts ?? resolvePowerWatts(step.power, ftp);
+export function getStepTargetText(step, ftp) {
+    const { min: minPower, max: maxPower } = resolvePowerWatts(step.power, ftp);
     const ascending = step.steady || step.cooldown === false;
     const lowPower = ascending ? minPower : maxPower;
     const highPower = ascending ? maxPower : minPower;

package/lib/esm/workouts/list/service.js

@@ -423,7 +423,7 @@ let WorkoutListService = (() => {
         }
         selectCard(card) {
             if (this.selectedWorkout) {
-                const selectedCard = this.findCard(this.selectedWorkout)?.card;
+                const selectedCard = this.findCard(this.selectedWorkout, { includeScheduled: true })?.card;
                 if (selectedCard)
                     selectedCard.unselect();
             }
@@ -560,7 +560,7 @@ let WorkoutListService = (() => {
             }
             return this.myWorkouts;
         }
-        findCard(target) {
+        findCard(target, opts) {
             let id;
             if (typeof target === 'string') {
                 id = target;
@@ -569,9 +569,13 @@ let WorkoutListService = (() => {
                 const item = target;
                 id = item.id;
             }
-            let res;
+            const includeScheduled = opts?.includeScheduled ?? false;
             const lists = this.getLists(false) || [];
-            lists.forEach(list => {
+            const regularLists = lists.filter(l => l.getId() !== 'scheduled');
+            const scheduledLists = includeScheduled ? lists.filter(l => l.getId() === 'scheduled') : [];
+            const orderedLists = [...regularLists, ...scheduledLists];
+            let res;
+            orderedLists.forEach(list => {
                 if (res)
                     return;
                 const card = list.getCards().find(c => c.getData()?.id === id);

package/lib/esm/workouts/page/service.js

@@ -143,7 +143,7 @@ let WorkoutListPageService = (() => {
         }
         getWorkoutDetailsProps(id) {
             try {
-                const card = this.findWorkoutCard(id);
+                const card = this.findWorkoutCard(id, { includeScheduled: true });
                 if (!card)
                     return null;
                 const workout = card.getData();
@@ -263,7 +263,7 @@ let WorkoutListPageService = (() => {
         }
         onStart(id, opts) {
             try {
-                const card = this.findWorkoutCard(id);
+                const card = this.findWorkoutCard(id, { includeScheduled: true });
                 if (!card)
                     return;
                 const service = this.getWorkoutList();
@@ -282,7 +282,7 @@ let WorkoutListPageService = (() => {
         }
         onMarkForRoute(id) {
             try {
-                const card = this.findWorkoutCard(id);
+                const card = this.findWorkoutCard(id, { includeScheduled: true });
                 if (!card)
                     return;
                 const settings = this.getWorkoutList().getStartSettings();
@@ -422,9 +422,13 @@ let WorkoutListPageService = (() => {
             });
             return items;
         }
-        findWorkoutCard(id) {
+        findWorkoutCard(id, opts) {
+            const includeScheduled = opts?.includeScheduled ?? false;
             const lists = this.getWorkoutList().getLists(false) ?? [];
-            for (const list of lists) {
+            const regularLists = lists.filter(l => l.getId() !== 'scheduled');
+            const scheduledLists = includeScheduled ? lists.filter(l => l.getId() === 'scheduled') : [];
+            const orderedLists = [...regularLists, ...scheduledLists];
+            for (const list of orderedLists) {
                 const card = list.getCards().find(c => c.getId() === id);
                 if (card)
                     return card;

package/lib/esm/workouts/ride/page/service.js

@@ -264,10 +264,10 @@ let WorkoutRidePageService = (() => {
             }
         }
         onIncreaseLoad() {
-            this.adjustLoad(DEFAULT_LOAD_INCREMENT);
+            this.adjustLoad(this.getLoadIncrement());
         }
         onDecreaseLoad() {
-            this.adjustLoad(-DEFAULT_LOAD_INCREMENT);
+            this.adjustLoad(-this.getLoadIncrement());
         }
         onSetLoadIncrement(value) {
             try {
@@ -424,7 +424,7 @@ let WorkoutRidePageService = (() => {
             if (!limits)
                 return empty;
             const currentStep = {
-                label: getStepTargetText(limits.step ?? {}, ftp, { min: limits.minPower, max: limits.maxPower }),
+                label: getStepTargetText(limits.step ?? {}, ftp),
                 targetPower: limits.targetPower ?? null,
                 duration: limits.duration,
                 remaining: limits.remaining,
@@ -453,7 +453,7 @@ let WorkoutRidePageService = (() => {
             const title = wo.title ?? '';
             if (!limits)
                 return { text: title, mode: wo.mode ?? null };
-            const target = getStepTargetText(limits.step ?? {}, wo.ftp, { min: limits.minPower, max: limits.maxPower });
+            const target = getStepTargetText(limits.step ?? {}, wo.ftp);
             const duration = getStepDuration({ duration: limits.duration });
             const text = title ? `${target} for ${duration} - ${title}` : `${target} for ${duration}`;
             return { text, mode: wo.mode ?? null };

package/lib/types/devices/page/service.d.ts

@@ -36,6 +36,7 @@ export declare class DevicesPageService extends IncyclistPageService {
     protected onEnableCapability(enabled: boolean): void;
     protected openDeviceSelection(cap: IncyclistCapability): void;
     protected onDeviceSelected(d: DevicePairingData, addAll?: boolean): void;
+    protected onDeviceDelete(d: DevicePairingData): void;
     protected closeDeviceSelection(enabled: boolean): Promise<void>;
     protected getButtonsDisplayProps(): PairingButtonProps;
     protected getTCapability(capabability: IncyclistCapability): TIncyclistCapability;

package/lib/types/devices/page/types.d.ts

@@ -31,8 +31,8 @@ export type DeviceSelectionItemProps = {
     deviceName: string;
     value: number;
     interface: string;
-    onClick?: any;
-    onDelete?: any;
+    onClick?: (addAll?: boolean) => void;
+    onDelete?: () => void;
 };
 export type CapabilityDisplayProps = {
     title: string;

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

@@ -137,7 +137,6 @@ export declare class DevicePairingService extends IncyclistService {
     protected _stopDeviceSelection(changed: boolean): Promise<void>;
     private numberOfSelectedCababilities;
     protected addToDeletedList(capability: IncyclistCapability | CapabilityData, udid: string): void;
-    protected removeFromDeletedList(capability: IncyclistCapability | CapabilityData, udid: string): void;
     protected isOnDeletedList(c: IncyclistCapability | CapabilityData, udid: string): boolean;
     mappedCapability(c: CapabilityInformation): CapabilityData;
     protected mappedCapabilities(capabilities: DeviceConfigurationInfo): Array<CapabilityData>;

package/lib/types/workouts/base/graph/series.d.ts

@@ -4,10 +4,7 @@ import { WorkoutGraphPlanBar, WorkoutGraphSeriesOptions } from "./types";
 export declare const WORKOUT_ZONE_COLORS: string[];
 export declare function getStepDuration(step: StepDefinition): string;
 export declare function getStepPower(step: StepDefinition, ftp?: number): string;
-export declare function getStepTargetText(step: StepDefinition, ftp?: number, powerOverrideWatts?: {
-    min?: number;
-    max?: number;
-}): string;
+export declare function getStepTargetText(step: StepDefinition, ftp?: number): string;
 export interface FlattenedStep {
     step: Step;
     start: number;

package/lib/types/workouts/list/service.d.ts

@@ -68,7 +68,9 @@ export declare class WorkoutListService extends IncyclistService implements ILis
     protected addItem(item: WP): Card<WP>;
     protected updateItem(item: WP): Promise<void>;
     protected selectList(item: WP): CardList<WP>;
-    protected findCard(target: WP | string): {
+    protected findCard(target: WP | string, opts?: {
+        includeScheduled?: boolean;
+    }): {
         card: Card<WP>;
         list: CardList<WP>;
     };

package/lib/types/workouts/page/service.d.ts

@@ -45,7 +45,9 @@ export declare class WorkoutListPageService extends IncyclistPageService impleme
     protected getGroupFilterProps(): GroupFilterProps;
     protected getKnownGroups(): string[];
     protected getAllWorkoutItems(): WorkoutListItemProps[];
-    protected findWorkoutCard(id: string): WorkoutCard | undefined;
+    protected findWorkoutCard(id: string, opts?: {
+        includeScheduled?: boolean;
+    }): WorkoutCard | undefined;
     protected getLastUsedImportGroup(): string;
     protected persistLastUsedImportGroup(group: string): void;
     protected formatDuration(duration: number): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.84",
+  "version": "1.7.86",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },