incyclist-services 1.7.111 → 1.7.113

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

@@ -279,6 +279,18 @@ let WorkoutRide = (() => {
                 ? this.currentLimits?.targetPower < this.currentLimits?.maxPower
                 : this.currentLimits?.targetPower > this.currentLimits?.minPower;
         }
+        isPowerLocked(power) {
+            return power?.locked ?? this.workout?.lockedPowerTargets ?? false;
+        }
+        isWattFallbackAdjustment() {
+            const power = this.currentStep?.power;
+            return power?.type === 'watt' && !this.isPowerLocked(power);
+        }
+        trackTargetToBoundary(increase) {
+            if (this.currentLimits?.maxPower === undefined)
+                return;
+            this.currentLimits.targetPower = increase ? this.currentLimits.maxPower : this.currentLimits.minPower;
+        }
         getPowerRangeDeltaVal(magnitude) {
             if (!this.settings?.ftp)
                 return magnitude;
@@ -308,9 +320,11 @@ let WorkoutRide = (() => {
             const label = (magnitude, increase) => {
                 const sign = increase ? '+' : '-';
                 const delta = increase ? magnitude : -magnitude;
-                return this.isPowerRangeAdjustable(delta)
-                    ? `${sign}${this.getPowerRangeAdjustmentWatts(magnitude, increase)}W`
-                    : `${sign}${magnitude}%`;
+                if (this.isPowerRangeAdjustable(delta))
+                    return `${sign}${this.getPowerRangeAdjustmentWatts(magnitude, increase)}W`;
+                if (this.isWattFallbackAdjustment())
+                    return `${sign}${magnitude}W`;
+                return `${sign}${magnitude}%`;
             };
             return {
                 inc5: label(5, true),
@@ -339,17 +353,22 @@ let WorkoutRide = (() => {
                     this.emit('update', this.getDashboardDisplayProperties());
                     return { type: 'targetPower', value: this.currentLimits.targetPower };
                 }
-                let adjustedFtp;
-                if (this.settings?.ftp) {
-                    this.settings.ftp = this.settings.ftp * (1 + delta / 100);
+                const wattFallback = this.isWattFallbackAdjustment();
+                if (wattFallback)
+                    this.manualPowerOffset += delta;
+                else {
+                    this.settings.ftp = (this.settings.ftp ?? DEFAULT_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.trackTargetToBoundary(true);
                 this.emit('update', this.getDashboardDisplayProperties());
-                return adjustedFtp !== undefined ? { type: 'ftp', value: adjustedFtp } : undefined;
+                if (wattFallback) {
+                    this.logEvent({ message: 'workout target power adjusted', targetPower: this.currentLimits.targetPower });
+                    return { type: 'targetPower', value: this.currentLimits.targetPower };
+                }
+                return { type: 'ftp', value: Math.round(this.settings.ftp) };
             }
             catch (err) {
                 this.logError(err, 'powerUp');
@@ -374,17 +393,22 @@ let WorkoutRide = (() => {
                     this.emit('update', this.getDashboardDisplayProperties());
                     return { type: 'targetPower', value: this.currentLimits.targetPower };
                 }
-                let adjustedFtp;
-                if (this.settings?.ftp) {
-                    this.settings.ftp = this.settings.ftp / (1 + delta / 100);
+                const wattFallback = this.isWattFallbackAdjustment();
+                if (wattFallback)
+                    this.manualPowerOffset -= delta;
+                else {
+                    this.settings.ftp = (this.settings.ftp ?? DEFAULT_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.trackTargetToBoundary(false);
                 this.emit('update', this.getDashboardDisplayProperties());
-                return adjustedFtp !== undefined ? { type: 'ftp', value: adjustedFtp } : undefined;
+                if (wattFallback) {
+                    this.logEvent({ message: 'workout target power adjusted', targetPower: this.currentLimits.targetPower });
+                    return { type: 'targetPower', value: this.currentLimits.targetPower };
+                }
+                return { type: 'ftp', value: Math.round(this.settings.ftp) };
             }
             catch (err) {
                 this.logError(err, 'powerDown');
@@ -633,9 +657,10 @@ let WorkoutRide = (() => {
             if (power.type === 'pct of FTP') {
                 const pct = val;
                 const ftp = this.settings.ftp ?? DEFAULT_FTP;
-                const ftpVal = this.settings.ftp ?? ftp + this.manualPowerOffset;
-                return Math.round(pct * ftpVal / 100);
+                return Math.round(pct * ftp / 100);
             }
+            if (this.isPowerLocked(power))
+                return Math.round(val);
             return Math.round(val + this.manualPowerOffset);
         }
         getFtpFromUserSettings() {

package/lib/esm/activities/base/utils/helpers.js

@@ -19,9 +19,9 @@ export const buildSummary = (activity, proposedName) => {
     }
     if (name === undefined && fileName !== undefined) {
         const parts = fileName.split(/[/\\]/);
-        const match = /([^\\/]+)\.json/.exec(parts.at(-1));
-        if (match?.[1])
-            name = match[1];
+        const last = parts.at(-1);
+        if (last?.endsWith('.json'))
+            name = last.slice(0, -5);
     }
     let startTime;
     if (startTimeUTC)

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

@@ -741,7 +741,7 @@ let ActivityRideService = (() => {
         calculateTimeGap(sameDistance, current) {
             const s = sameDistance.distance - current.distance;
             const v = sameDistance.speed / 3.6;
-            const t = v === 0 ? Infinity : s / v;
+            const t = Math.abs(v) < 1e-6 ? Infinity : s / v;
             sameDistance.time -= t;
             const timeDelta = sameDistance.time - current.time;
             const prefix = Math.sign(timeDelta) > 0 ? '+' : '-';
@@ -1124,7 +1124,7 @@ let ActivityRideService = (() => {
                 const distance = v * t;
                 this.activity.distance += distance;
                 this.current.routeDistance += distance;
-                if (distance !== 0 && this.activity.routeType !== 'None') {
+                if (Math.abs(distance) > 1e-6 && this.activity.routeType !== 'None') {
                     const prev = this.current.position;
                     if (!this.current?.route?.points && !this.current.pointsErrorLogged) {
                         this.logEvent({ message: 'error', error: 'route does not have any points', route: this.current.route });

package/lib/esm/autoupdate/api.js

@@ -164,7 +164,7 @@ let IncyclistUpdatesApi = (() => {
                 if (!lines?.length)
                     return;
                 const final = lines[lines.length - 1];
-                const versionMatch = /.* incyclist-(.*)-full.nupkg/.exec(final);
+                const versionMatch = / incyclist-([^\s]+)-full\.nupkg/.exec(final);
                 const version = versionMatch?.length === 2 ? versionMatch[1] : undefined;
                 const path = `incyclist-${version}-setup.exe`;
                 const downloadUrl = `${this.getBaseUrl()}/download/app/latest/win64/${path}`;

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

@@ -782,9 +782,7 @@ let DeviceConfigurationService = (() => {
             this.verifyCapabilityExists(IncyclistCapability.HeartRate);
             this.verifyCapabilityExists(IncyclistCapability.Speed);
             this.verifyCapabilityExists(IncyclistCapability.Cadence);
-            if (this.hasFTControllers()) {
-                this.verifyCapabilityExists(IncyclistCapability.AppControl);
-            }
+            this.verifyCapabilityExists(IncyclistCapability.AppControl);
             if (bikeCapIdx !== -1) {
                 capabilities.splice(bikeCapIdx, 1);
             }
@@ -824,9 +822,6 @@ let DeviceConfigurationService = (() => {
             if (isEnabled('wifi') && !isConfigured('wifi'))
                 this.initWifiInterface();
         }
-        hasFTControllers() {
-            return this.getUserSettings().getValue('CONTROLLERS', false);
-        }
         doesAppSupportsWifi() {
             const features = this.getAppState().getAppFeatures();
             const isEnabled = (i) => {