incyclist-services 1.7.86 → 1.7.87

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

@@ -235,13 +235,18 @@ let DeviceConfigurationService = (() => {
         }
         add(deviceSettings, props) {
             let udid = this.getUdid(deviceSettings);
+            udid ??= this.getUdidForWifiAddressChange(deviceSettings);
             const { legacy = false } = props || {};
             const deviceAlreadyExists = udid !== undefined;
             let adapter;
             const updateWifiSettings = (udid) => {
                 const settingIdx = this.settings.devices.findIndex(d => d.udid === udid);
                 if (settingIdx !== -1 && this.settings.devices[settingIdx]?.settings?.interface === 'wifi') {
-                    this.settings.devices[settingIdx].settings = { ...this.settings.devices[settingIdx].settings, ...deviceSettings };
+                    const merged = { ...this.settings.devices[settingIdx].settings, ...deviceSettings };
+                    this.settings.devices[settingIdx].settings = merged;
+                    if (this.adapters[udid]) {
+                        this.adapters[udid].settings = merged;
+                    }
                 }
             };
             if (deviceAlreadyExists && this.adapters[udid]) {
@@ -255,7 +260,7 @@ let DeviceConfigurationService = (() => {
                     this.logEvent({ message: 'could not create adapter' });
                     return;
                 }
-                udid = this.settings.devices?.find(d => adapter.isEqual(d.settings))?.udid;
+                udid = this.settings.devices?.find(d => adapter.isEqual(d.settings))?.udid ?? this.getUdidForWifiAddressChange(deviceSettings);
                 if (udid) {
                     updateWifiSettings(udid);
                 }
@@ -338,6 +343,24 @@ let DeviceConfigurationService = (() => {
             const udid = udids.find(key => this.adapters[key]?.isEqual(deviceSettings));
             return udid;
         }
+        getUdidForWifiAddressChange(deviceSettings) {
+            const settings = deviceSettings;
+            if (settings?.interface !== 'wifi' || !settings.name)
+                return undefined;
+            const dc = this.getDirectConnectInterface();
+            if (typeof dc?.hasNameCollision === 'function' && dc.hasNameCollision(settings.name))
+                return undefined;
+            return this.settings.devices?.find(d => {
+                const s = d.settings;
+                return s?.interface === 'wifi' && s.name === settings.name;
+            })?.udid;
+        }
+        isEqualDeviceSettings(a, b) {
+            if (!a || !b)
+                return false;
+            const adapter = this.getAdapterFromSetting(a);
+            return adapter?.isEqual(b) ?? false;
+        }
         setDisplayName(deviceSettings, displayName) {
             const udid = this.getUdid(deviceSettings);
             if (!udid)

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

@@ -833,7 +833,7 @@ let DevicePairingService = (() => {
                     return;
                 }
                 const deletedCapabilities = (this.state.deleted || [])
-                    .filter(e => e.udid === udid)
+                    .filter(e => e.udid === udid || (e.settings && this.getDeviceConfiguration().isEqualDeviceSettings(e.settings, deviceSettings)))
                     .map(e => e.capability);
                 deletedCapabilities.forEach(capability => {
                     this.getDeviceConfiguration().delete(udid, capability, true);
@@ -1417,8 +1417,9 @@ let DevicePairingService = (() => {
                 c.value = undefined;
                 c.connectState = undefined;
             }
+            const settings = this.getDeviceAdapter(udid)?.getSettings?.();
             this.getDeviceConfiguration().delete(udid, capability, true);
-            this.addToDeletedList(capability, udid);
+            this.addToDeletedList(capability, udid, settings);
             this.emitStateChange({ capabilities: this.state.capabilities });
         }
         isScanning() {
@@ -1446,11 +1447,11 @@ let DevicePairingService = (() => {
         numberOfSelectedCababilities(udid) {
             return (this.state.capabilities || []).map(c => c.selected === udid ? 1 : 0).reduce((a, c) => a + c, 0);
         }
-        addToDeletedList(capability, udid) {
+        addToDeletedList(capability, udid, settings) {
             if (this.isOnDeletedList(capability, udid))
                 return;
             const c = this.getCapability(capability);
-            this.state.deleted.push({ capability: c.capability, udid });
+            this.state.deleted.push({ capability: c.capability, udid, settings });
         }
         isOnDeletedList(c, udid) {
             const capability = this.getCapability(c);

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

@@ -167,7 +167,7 @@ let WorkoutRidePageService = (() => {
                 const current = this.getRideDisplay().getDisplayProperties().workout;
                 return {
                     ...base,
-                    title: wo.title ?? '',
+                    title: this.getMobileStepTitle(wo),
                     graph: this.buildGraphPlan(current, wo.ftp),
                     steps: this.buildUpcomingSteps(current, wo.ftp),
                     dashboard: this.buildDashboardLine(wo),
@@ -326,12 +326,13 @@ let WorkoutRidePageService = (() => {
         adjustLoad(deltaPct) {
             try {
                 if (deltaPct >= 0)
-                    this.getWorkoutRide().powerUp(deltaPct);
+                    return this.getWorkoutRide().powerUp(deltaPct);
                 else
-                    this.getWorkoutRide().powerDown(-deltaPct);
+                    return this.getWorkoutRide().powerDown(-deltaPct);
             }
             catch (err) {
                 this.logError(err, 'adjustLoad');
+                return undefined;
             }
         }
         onRideStateUpdate(state) {
@@ -451,9 +452,15 @@ let WorkoutRidePageService = (() => {
             const hasMore = currentIndex + 1 + UPCOMING_STEPS_COUNT < flattened.length;
             return { previous, current: currentStep, upcoming, hasMore };
         }
+        getMobileStepTitle(wo) {
+            const title = wo.title ?? '';
+            const name = wo.workout?.name;
+            const prefix = name ? `${name}: ` : '';
+            return prefix && title.startsWith(prefix) ? title.slice(prefix.length) : title;
+        }
         buildDashboardLine(wo) {
             const limits = this.getWorkoutRide().getCurrentLimits();
-            const title = wo.title ?? '';
+            const title = this.getMobileStepTitle(wo);
             if (!limits)
                 return { text: title, mode: wo.mode ?? null };
             const target = (0, graph_1.getStepTargetText)(limits.step ?? {}, wo.ftp);

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

@@ -280,19 +280,23 @@ let WorkoutRide = (() => {
                     this.currentLimits.targetPower = Math.min(this.currentLimits.targetPower + deltaVal, this.currentLimits.maxPower);
                     this.logEvent({ message: 'workout target power adjusted', targetPower: this.currentLimits.targetPower });
                     this.emit('update', this.getDashboardDisplayProperties());
-                    return;
+                    return { type: 'targetPower', value: this.currentLimits.targetPower };
                 }
+                let adjustedFtp;
                 if (this.settings?.ftp) {
                     this.settings.ftp = this.settings.ftp * (1 + delta / 100);
                     this.workoutList.setStartSettings(this.settings);
                     this.logEvent({ message: 'workout FTP adjusted', ftp: this.settings.ftp });
+                    adjustedFtp = Math.round(this.settings.ftp);
                 }
                 this.manualPowerOffset += delta;
                 this.setCurrentLimits();
                 this.emit('update', this.getDashboardDisplayProperties());
+                return adjustedFtp !== undefined ? { type: 'ftp', value: adjustedFtp } : undefined;
             }
             catch (err) {
                 this.logError(err, 'powerUp');
+                return undefined;
             }
         }
         powerDown(delta) {
@@ -306,19 +310,23 @@ let WorkoutRide = (() => {
                     this.currentLimits.targetPower = Math.max(this.currentLimits.targetPower - deltaVal, this.currentLimits.minPower);
                     this.logEvent({ message: 'workout target power adjusted', targetPower: this.currentLimits.targetPower });
                     this.emit('update', this.getDashboardDisplayProperties());
-                    return;
+                    return { type: 'targetPower', value: this.currentLimits.targetPower };
                 }
+                let adjustedFtp;
                 if (this.settings?.ftp) {
                     this.settings.ftp = this.settings.ftp / (1 + delta / 100);
                     this.workoutList.setStartSettings(this.settings);
                     this.logEvent({ message: 'workout FTP adjusted', ftp: this.settings.ftp });
+                    adjustedFtp = Math.round(this.settings.ftp);
                 }
                 this.manualPowerOffset -= delta;
                 this.setCurrentLimits();
                 this.emit('update', this.getDashboardDisplayProperties());
+                return adjustedFtp !== undefined ? { type: 'ftp', value: adjustedFtp } : undefined;
             }
             catch (err) {
                 this.logError(err, 'powerDown');
+                return undefined;
             }
         }
         toggleCyclingMode() {

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

@@ -229,13 +229,18 @@ let DeviceConfigurationService = (() => {
         }
         add(deviceSettings, props) {
             let udid = this.getUdid(deviceSettings);
+            udid ??= this.getUdidForWifiAddressChange(deviceSettings);
             const { legacy = false } = props || {};
             const deviceAlreadyExists = udid !== undefined;
             let adapter;
             const updateWifiSettings = (udid) => {
                 const settingIdx = this.settings.devices.findIndex(d => d.udid === udid);
                 if (settingIdx !== -1 && this.settings.devices[settingIdx]?.settings?.interface === 'wifi') {
-                    this.settings.devices[settingIdx].settings = { ...this.settings.devices[settingIdx].settings, ...deviceSettings };
+                    const merged = { ...this.settings.devices[settingIdx].settings, ...deviceSettings };
+                    this.settings.devices[settingIdx].settings = merged;
+                    if (this.adapters[udid]) {
+                        this.adapters[udid].settings = merged;
+                    }
                 }
             };
             if (deviceAlreadyExists && this.adapters[udid]) {
@@ -249,7 +254,7 @@ let DeviceConfigurationService = (() => {
                     this.logEvent({ message: 'could not create adapter' });
                     return;
                 }
-                udid = this.settings.devices?.find(d => adapter.isEqual(d.settings))?.udid;
+                udid = this.settings.devices?.find(d => adapter.isEqual(d.settings))?.udid ?? this.getUdidForWifiAddressChange(deviceSettings);
                 if (udid) {
                     updateWifiSettings(udid);
                 }
@@ -332,6 +337,24 @@ let DeviceConfigurationService = (() => {
             const udid = udids.find(key => this.adapters[key]?.isEqual(deviceSettings));
             return udid;
         }
+        getUdidForWifiAddressChange(deviceSettings) {
+            const settings = deviceSettings;
+            if (settings?.interface !== 'wifi' || !settings.name)
+                return undefined;
+            const dc = this.getDirectConnectInterface();
+            if (typeof dc?.hasNameCollision === 'function' && dc.hasNameCollision(settings.name))
+                return undefined;
+            return this.settings.devices?.find(d => {
+                const s = d.settings;
+                return s?.interface === 'wifi' && s.name === settings.name;
+            })?.udid;
+        }
+        isEqualDeviceSettings(a, b) {
+            if (!a || !b)
+                return false;
+            const adapter = this.getAdapterFromSetting(a);
+            return adapter?.isEqual(b) ?? false;
+        }
         setDisplayName(deviceSettings, displayName) {
             const udid = this.getUdid(deviceSettings);
             if (!udid)

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

@@ -827,7 +827,7 @@ let DevicePairingService = (() => {
                     return;
                 }
                 const deletedCapabilities = (this.state.deleted || [])
-                    .filter(e => e.udid === udid)
+                    .filter(e => e.udid === udid || (e.settings && this.getDeviceConfiguration().isEqualDeviceSettings(e.settings, deviceSettings)))
                     .map(e => e.capability);
                 deletedCapabilities.forEach(capability => {
                     this.getDeviceConfiguration().delete(udid, capability, true);
@@ -1411,8 +1411,9 @@ let DevicePairingService = (() => {
                 c.value = undefined;
                 c.connectState = undefined;
             }
+            const settings = this.getDeviceAdapter(udid)?.getSettings?.();
             this.getDeviceConfiguration().delete(udid, capability, true);
-            this.addToDeletedList(capability, udid);
+            this.addToDeletedList(capability, udid, settings);
             this.emitStateChange({ capabilities: this.state.capabilities });
         }
         isScanning() {
@@ -1440,11 +1441,11 @@ let DevicePairingService = (() => {
         numberOfSelectedCababilities(udid) {
             return (this.state.capabilities || []).map(c => c.selected === udid ? 1 : 0).reduce((a, c) => a + c, 0);
         }
-        addToDeletedList(capability, udid) {
+        addToDeletedList(capability, udid, settings) {
             if (this.isOnDeletedList(capability, udid))
                 return;
             const c = this.getCapability(capability);
-            this.state.deleted.push({ capability: c.capability, udid });
+            this.state.deleted.push({ capability: c.capability, udid, settings });
         }
         isOnDeletedList(c, udid) {
             const capability = this.getCapability(c);

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

@@ -164,7 +164,7 @@ let WorkoutRidePageService = (() => {
                 const current = this.getRideDisplay().getDisplayProperties().workout;
                 return {
                     ...base,
-                    title: wo.title ?? '',
+                    title: this.getMobileStepTitle(wo),
                     graph: this.buildGraphPlan(current, wo.ftp),
                     steps: this.buildUpcomingSteps(current, wo.ftp),
                     dashboard: this.buildDashboardLine(wo),
@@ -323,12 +323,13 @@ let WorkoutRidePageService = (() => {
         adjustLoad(deltaPct) {
             try {
                 if (deltaPct >= 0)
-                    this.getWorkoutRide().powerUp(deltaPct);
+                    return this.getWorkoutRide().powerUp(deltaPct);
                 else
-                    this.getWorkoutRide().powerDown(-deltaPct);
+                    return this.getWorkoutRide().powerDown(-deltaPct);
             }
             catch (err) {
                 this.logError(err, 'adjustLoad');
+                return undefined;
             }
         }
         onRideStateUpdate(state) {
@@ -448,9 +449,15 @@ let WorkoutRidePageService = (() => {
             const hasMore = currentIndex + 1 + UPCOMING_STEPS_COUNT < flattened.length;
             return { previous, current: currentStep, upcoming, hasMore };
         }
+        getMobileStepTitle(wo) {
+            const title = wo.title ?? '';
+            const name = wo.workout?.name;
+            const prefix = name ? `${name}: ` : '';
+            return prefix && title.startsWith(prefix) ? title.slice(prefix.length) : title;
+        }
         buildDashboardLine(wo) {
             const limits = this.getWorkoutRide().getCurrentLimits();
-            const title = wo.title ?? '';
+            const title = this.getMobileStepTitle(wo);
             if (!limits)
                 return { text: title, mode: wo.mode ?? null };
             const target = getStepTargetText(limits.step ?? {}, wo.ftp);

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

@@ -277,19 +277,23 @@ let WorkoutRide = (() => {
                     this.currentLimits.targetPower = Math.min(this.currentLimits.targetPower + deltaVal, this.currentLimits.maxPower);
                     this.logEvent({ message: 'workout target power adjusted', targetPower: this.currentLimits.targetPower });
                     this.emit('update', this.getDashboardDisplayProperties());
-                    return;
+                    return { type: 'targetPower', value: this.currentLimits.targetPower };
                 }
+                let adjustedFtp;
                 if (this.settings?.ftp) {
                     this.settings.ftp = this.settings.ftp * (1 + delta / 100);
                     this.workoutList.setStartSettings(this.settings);
                     this.logEvent({ message: 'workout FTP adjusted', ftp: this.settings.ftp });
+                    adjustedFtp = Math.round(this.settings.ftp);
                 }
                 this.manualPowerOffset += delta;
                 this.setCurrentLimits();
                 this.emit('update', this.getDashboardDisplayProperties());
+                return adjustedFtp !== undefined ? { type: 'ftp', value: adjustedFtp } : undefined;
             }
             catch (err) {
                 this.logError(err, 'powerUp');
+                return undefined;
             }
         }
         powerDown(delta) {
@@ -303,19 +307,23 @@ let WorkoutRide = (() => {
                     this.currentLimits.targetPower = Math.max(this.currentLimits.targetPower - deltaVal, this.currentLimits.minPower);
                     this.logEvent({ message: 'workout target power adjusted', targetPower: this.currentLimits.targetPower });
                     this.emit('update', this.getDashboardDisplayProperties());
-                    return;
+                    return { type: 'targetPower', value: this.currentLimits.targetPower };
                 }
+                let adjustedFtp;
                 if (this.settings?.ftp) {
                     this.settings.ftp = this.settings.ftp / (1 + delta / 100);
                     this.workoutList.setStartSettings(this.settings);
                     this.logEvent({ message: 'workout FTP adjusted', ftp: this.settings.ftp });
+                    adjustedFtp = Math.round(this.settings.ftp);
                 }
                 this.manualPowerOffset -= delta;
                 this.setCurrentLimits();
                 this.emit('update', this.getDashboardDisplayProperties());
+                return adjustedFtp !== undefined ? { type: 'ftp', value: adjustedFtp } : undefined;
             }
             catch (err) {
                 this.logError(err, 'powerDown');
+                return undefined;
             }
         }
         toggleCyclingMode() {

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

@@ -39,6 +39,8 @@ export declare class DeviceConfigurationService extends IncyclistService {
     }): string;
     delete(udid: string, capability?: ExtendedIncyclistCapability, forceSingle?: boolean): void;
     getUdid(deviceSettings: IncyclistDeviceSettings): string;
+    protected getUdidForWifiAddressChange(deviceSettings: IncyclistDeviceSettings): string | undefined;
+    isEqualDeviceSettings(a: IncyclistDeviceSettings, b: IncyclistDeviceSettings): boolean;
     setDisplayName(deviceSettings: IncyclistDeviceSettings, displayName?: string): void;
     getAdapter(udid: string): IncyclistDeviceAdapter;
     canStartRide(): boolean;

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

@@ -1,7 +1,7 @@
 import { DeviceData, DeviceSettings, IncyclistCapability, IncyclistDeviceAdapter } from "incyclist-devices";
 import { EnrichedInterfaceSetting } from "../access";
 import { RideServiceCheckFilter } from "../ride";
-import { AdapterInfo } from "../configuration";
+import { AdapterInfo, IncyclistDeviceSettings } from "../configuration";
 export interface DevicePairingData {
     udid: string;
     name: string;
@@ -41,6 +41,7 @@ export interface PairingState {
 export interface DeleteListEntry {
     capability: IncyclistCapability;
     udid: string;
+    settings?: IncyclistDeviceSettings;
 }
 export interface InternalPairingState extends PairingState {
     initialized: boolean;

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

@@ -136,7 +136,7 @@ export declare class DevicePairingService extends IncyclistService {
     protected isPairingWaiting(): NodeJS.Timeout;
     protected _stopDeviceSelection(changed: boolean): Promise<void>;
     private numberOfSelectedCababilities;
-    protected addToDeletedList(capability: IncyclistCapability | CapabilityData, udid: string): void;
+    protected addToDeletedList(capability: IncyclistCapability | CapabilityData, udid: string, settings?: IncyclistDeviceSettings): void;
     protected isOnDeletedList(c: IncyclistCapability | CapabilityData, udid: string): boolean;
     mappedCapability(c: CapabilityInformation): CapabilityData;
     protected mappedCapabilities(capabilities: DeviceConfigurationInfo): Array<CapabilityData>;

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

@@ -1,7 +1,7 @@
 import { IncyclistPageService } from "../../../base/pages";
 import type { IObserver } from "../../../base/typedefs";
 import type { CurrentRideState, RideType } from "../../../types";
-import type { WorkoutDisplayProperties } from "../types";
+import type { PowerAdjustmentResult, WorkoutDisplayProperties } from "../types";
 import type { Workout } from "../../base/model";
 import type { StepDefinition } from "../../base/model/types";
 import type { IWorkoutRidePageService, WorkoutDashboardLine, WorkoutGestureHint, WorkoutGraphActuals, WorkoutGraphPlan, WorkoutRideMenuProps, WorkoutRidePageDisplayProps, WorkoutUpcomingSteps } from "./types";
@@ -37,7 +37,7 @@ export declare class WorkoutRidePageService extends IncyclistPageService impleme
         dontShowAgain: boolean;
     }): void;
     onCancelStart(): void;
-    adjustLoad(deltaPct: number): void;
+    adjustLoad(deltaPct: number): PowerAdjustmentResult | undefined;
     protected onRideStateUpdate(state: CurrentRideState): void;
     protected onWorkoutUpdate(): void;
     protected onWorkoutFinished(): void;
@@ -57,6 +57,7 @@ export declare class WorkoutRidePageService extends IncyclistPageService impleme
     protected getLoadIncrement(): number;
     protected buildGraphPlan(current: Workout | undefined, ftp: number): WorkoutGraphPlan;
     protected buildUpcomingSteps(current: Workout | undefined, ftp: number): WorkoutUpcomingSteps;
+    protected getMobileStepTitle(wo: WorkoutDisplayProperties): string;
     protected buildDashboardLine(wo: WorkoutDisplayProperties): WorkoutDashboardLine;
     protected getStepAbsolutePower(step: StepDefinition, ftp?: number): number | null;
     protected getStepFlags(): {

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

@@ -4,7 +4,7 @@ import { Workout } from "../base/model";
 import { CurrentStep, PowerLimit, StepDefinition } from "../base/model/types";
 import { WorkoutListService } from "../list";
 import { WorkoutSettings } from "../list/cards/types";
-import { ActiveWorkoutLimit, WorkoutDisplayProperties } from "./types";
+import { ActiveWorkoutLimit, PowerAdjustmentResult, WorkoutDisplayProperties } from "./types";
 export declare class WorkoutRide extends IncyclistService {
     protected manualTimeOffset: number;
     protected manualPowerOffset: number;
@@ -33,8 +33,8 @@ export declare class WorkoutRide extends IncyclistService {
     }): void;
     forward(): void;
     backward(): void;
-    powerUp(delta: number): void;
-    powerDown(delta: number): void;
+    powerUp(delta: number): PowerAdjustmentResult | undefined;
+    powerDown(delta: number): PowerAdjustmentResult | undefined;
     toggleCyclingMode(): void;
     getDashboardDisplayProperties(): WorkoutDisplayProperties;
     getCurrentLimits(): ActiveWorkoutLimit;

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

@@ -15,6 +15,10 @@ export interface ActiveWorkoutLimit extends WorkoutRequest {
     remaining: number;
     step?: StepDefinition;
 }
+export interface PowerAdjustmentResult {
+    type: 'ftp' | 'targetPower';
+    value: number;
+}
 export interface WorkoutDisplayProperties {
     workout?: Workout;
     title?: string;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.86",
+  "version": "1.7.87",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },
   "dependencies": {
     "@garmin/fitsdk": "^21.200.0",
     "axios": "^1.15.2",
-    "incyclist-devices": "^3.0.24",
+    "incyclist-devices": "^3.0.25",
     "promise.any": "^2.0.6",
     "semver": "^7.7.4",
     "tcx-builder": "^1.1.1",
@@ -42,7 +42,8 @@
     "test:all": "npx jest",
     "test:e2e": "npx jest --coverage -c jest.e2e-config.cjs  --coverageDirectory coverage.e2e",
     "test:unit": "npx jest --coverage -c jest.unit-config.cjs  ",
-    "test": "npx jest --coverage -c jest.unit-config.cjs  ",
+    "test": "npx jest -c jest.unit-config.cjs",
+    "coverage": "npx jest --coverage -c jest.unit-config.cjs",
     "dev": "tsc -p tsconfig.esm.json --watch",
     "docgen": "typedoc --options typedoc.json",
     "docgen1": "typedoc --readme none --excludeProtected --excludePrivate --plugin typedoc-plugin-no-inherit --plugin  typedoc-plugin-markdown src/index.ts",