incyclist-services 1.7.31 → 1.7.33

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

@@ -61,6 +61,8 @@ const utils_2 = require("../base/utils");
 const decorators_1 = require("../../base/decorators");
 const i18n_1 = require("../../i18n");
 const utils_3 = require("../list/utils");
+const sleep_1 = require("../../utils/sleep");
+const node_events_1 = require("node:events");
 const SAVE_INTERVAL = 5000;
 let ActivityRideService = (() => {
     let _classDecorators = [types_1.Singleton];
@@ -69,12 +71,15 @@ let ActivityRideService = (() => {
     let _classThis;
     let _classSuper = service_1.IncyclistService;
     let _instanceExtraInitializers = [];
+    let _getBindings_decorators;
     let _getUnitConverter_decorators;
     var ActivityRideService = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getBindings_decorators = [decorators_1.Injectable];
             _getUnitConverter_decorators = [decorators_1.Injectable];
+            __esDecorate(this, null, _getBindings_decorators, { kind: "method", name: "getBindings", static: false, private: false, access: { has: obj => "getBindings" in obj, get: obj => obj.getBindings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getUnitConverter_decorators, { kind: "method", name: "getUnitConverter", static: false, private: false, access: { has: obj => "getUnitConverter" in obj, get: obj => obj.getUnitConverter }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             ActivityRideService = _classThis = _classDescriptor.value;
@@ -243,15 +248,17 @@ let ActivityRideService = (() => {
                 const display = Math.floor(time / 3) % 2;
                 const avgMaxStats = (display === 0) ? this.getAverageValues() : this.getMaximumValues();
                 const info = this.buildDashboardInfo(currentValues, avgMaxStats, display);
-                let showLog = true;
+                let showLog = this.state !== 'paused';
                 try {
                     const infoStr = JSON.stringify(info);
-                    showLog = infoStr !== this.current.info;
+                    showLog = (showLog || this.current.isAutoResume) && (infoStr !== this.current.info);
                     this.current.info = infoStr;
                 }
                 catch { }
-                if (showLog)
+                if (showLog) {
+                    console.log('# here', this.state);
                     this.logEvent({ message: 'Dashboard update', items: info.map(i => `${i.title}:${i.data[0]?.value ?? ''}:${i.data[1]?.value ?? ''}${i.data[1]?.label ? '(' + i.data[1]?.label + ')' : ''}`).join('|') });
+                }
                 return info;
             }
             catch (err) {
@@ -458,19 +465,36 @@ let ActivityRideService = (() => {
                     this.saveObserver.emit(event, ...args);
             };
             const run = async () => {
+                let cntCompleted = 0;
                 let success = false;
+                const localEmitter = new node_events_1.EventEmitter();
+                const incCompleted = () => {
+                    cntCompleted++;
+                    if (cntCompleted >= 2) {
+                        localEmitter.emit('completed');
+                    }
+                };
+                localEmitter.once('completed', () => {
+                    (0, sleep_1.sleep)(0).then(() => {
+                        delete this.saveObserver;
+                    });
+                });
                 try {
                     emit('start', success);
                     await this._save();
                     let format = undefined;
                     let uploadSuccess = false;
                     let convertSuccess = await this.convert('TCX');
+                    incCompleted();
                     if (convertSuccess) {
                         format = 'TCX';
-                        this.convert('FIT');
+                        this.convert('FIT')
+                            .then(incCompleted)
+                            .catch(incCompleted);
                     }
                     else {
                         convertSuccess = await this.convert('FIT');
+                        cntCompleted++;
                         if (convertSuccess)
                             format = 'FIT';
                     }
@@ -481,12 +505,10 @@ let ActivityRideService = (() => {
                     this.isSaveDone = true;
                 }
                 catch {
+                    cntCompleted++;
                     success = false;
                 }
                 emit('done', success);
-                (0, utils_1.waitNextTick)().then(() => {
-                    delete this.saveObserver;
-                });
                 return success;
             };
             this.saveObserver = new observer_1.PromiseObserver(run());
@@ -824,6 +846,18 @@ let ActivityRideService = (() => {
                 }
             }
         }
+        async getTargetFileName(format) {
+            let fileName = this.activity.fileName.replace('json', format);
+            if (fileName.startsWith('mmkv:/db_')) {
+                const fs = this.getFileSystemBinding();
+                const appDir = this.getBindings().appInfo.getAppDir();
+                const activitiesDir = this.getBindings().path.join(appDir, 'activities');
+                await fs.ensureDir(activitiesDir);
+                const baseName = fileName.split('/').pop();
+                fileName = this.getBindings().path.join(activitiesDir, baseName);
+            }
+            return fileName;
+        }
         async convert(format) {
             const emit = (event, ...args) => {
                 if (this.saveObserver)
@@ -844,19 +878,21 @@ let ActivityRideService = (() => {
                 data = await base_1.ActivityConverter.convert(this.activity, format);
                 emit('convert.done', format, true);
                 if (format.toLowerCase() === 'fit') {
-                    const fileName = this.activity.fileName.replace('json', 'fit');
+                    const fileName = await this.getTargetFileName('fit');
                     await fs.writeFile(fileName, Buffer.from(data));
                     this.activity.fitFileName = fileName;
                 }
                 if (format.toLowerCase() === 'tcx') {
-                    const fileName = this.activity.fileName.replace('json', 'tcx');
+                    const fileName = await this.getTargetFileName('tcx');
                     await fs.writeFile(fileName, Buffer.from(data));
                     this.activity.tcxFileName = fileName;
                 }
                 await this._save();
+                emit('save.done', format, true);
                 return true;
             }
             catch (err) {
+                console.log('# convert error', err.message);
                 emit('convert.error', format, err);
                 return false;
             }
@@ -1236,6 +1272,9 @@ let ActivityRideService = (() => {
         getFileSystemBinding() {
             return (0, api_1.getBindings)().fs;
         }
+        getBindings() {
+            return (0, api_1.getBindings)();
+        }
         getUnitConversionShortcuts() {
             const c = this.getUnitConverter();
             const C = c.convert.bind(c);

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

@@ -540,6 +540,10 @@ let DeviceConfigurationService = (() => {
         confirmWifiInterface() {
             this.getUserSettings().set('wifiConfirmed', true);
         }
+        getEnabledInterfaces() {
+            const config = this.settings?.interfaces ?? [];
+            return config.filter(i => i?.enabled).map(i => i.name);
+        }
         getInterfaceSettings(ifName) {
             if (!this.settings)
                 this.settings = { interfaces: [] };

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

@@ -94,6 +94,7 @@ let DeviceRideService = (() => {
         lastDataInfo = {};
         reconnectBusy;
         prevUpdate;
+        logPaused = false;
         constructor() {
             super('DeviceRide');
             this.initizialized = false;
@@ -133,6 +134,32 @@ let DeviceRideService = (() => {
         getData() {
             return this.data;
         }
+        pauseLogging() {
+            console.log('# PAUSE LOGGING');
+            this.logPaused = true;
+            const interfaces = this.getEnabledInterfaces();
+            interfaces.forEach(i => i.pauseLogging());
+            this.getAllAdapters()
+                .map(ai => ai.adapter)
+                .filter(a => a !== undefined)
+                .forEach(a => a.pauseLogging());
+        }
+        resumeLogging() {
+            console.log('# RESUME LOGGING');
+            this.logPaused = false;
+            const interfaces = this.getEnabledInterfaces();
+            interfaces.forEach(i => i.resumeLogging());
+            this.getAllAdapters()
+                .map(ai => ai.adapter)
+                .filter(a => a !== undefined)
+                .forEach(a => a.resumeLogging());
+        }
+        getEnabledInterfaces() {
+            const config = this.getDeviceConfiguration();
+            const access = this.getDeviceAccess();
+            const names = config.getEnabledInterfaces() ?? [];
+            return names.map(i => access.getInterface(i)).filter(n => n !== undefined);
+        }
         getRideAdapters() {
             if (this.rideAdapters?.length)
                 return this.rideAdapters;
@@ -1302,6 +1329,11 @@ let DeviceRideService = (() => {
                 return true;
             return (0, settings_1.useUserSettings)().isNewUser();
         }
+        logEvent(event) {
+            if (this.logPaused)
+                return;
+            super.logEvent(event);
+        }
         cleanInternalCache() {
             delete this.rideAdapters;
         }

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

@@ -191,6 +191,7 @@ let RideDisplayService = (() => {
             }
         }
         pause(requester = 'user') {
+            console.log('# PAUSE', requester);
             try {
                 if (this.state !== 'Active')
                     return;
@@ -199,6 +200,7 @@ let RideDisplayService = (() => {
                 this.getCoaches().pauseRide();
                 if (requester === 'user') {
                     this.getActivityRide().pause(false);
+                    this.getDeviceRide().pauseLogging();
                 }
                 this.getWorkoutRide().pause();
                 this.displayService.pause();
@@ -219,6 +221,7 @@ let RideDisplayService = (() => {
                 this.getCoaches().resumeRide();
                 if (requester === 'user') {
                     this.getActivityRide().resume('user');
+                    this.getDeviceRide().resumeLogging();
                 }
                 this.getWorkoutRide().resume();
                 this.pauseReason = 'device';

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

@@ -55,6 +55,8 @@ import { buildSummary } from "../base/utils";
 import { Injectable } from "../../base/decorators";
 import { useUnitConverter } from "../../i18n";
 import { createUIActivityDetails } from "../list/utils";
+import { sleep } from "../../utils/sleep";
+import { EventEmitter } from "node:events";
 const SAVE_INTERVAL = 5000;
 let ActivityRideService = (() => {
     let _classDecorators = [Singleton];
@@ -63,12 +65,15 @@ let ActivityRideService = (() => {
     let _classThis;
     let _classSuper = IncyclistService;
     let _instanceExtraInitializers = [];
+    let _getBindings_decorators;
     let _getUnitConverter_decorators;
     var ActivityRideService = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getBindings_decorators = [Injectable];
             _getUnitConverter_decorators = [Injectable];
+            __esDecorate(this, null, _getBindings_decorators, { kind: "method", name: "getBindings", static: false, private: false, access: { has: obj => "getBindings" in obj, get: obj => obj.getBindings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getUnitConverter_decorators, { kind: "method", name: "getUnitConverter", static: false, private: false, access: { has: obj => "getUnitConverter" in obj, get: obj => obj.getUnitConverter }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             ActivityRideService = _classThis = _classDescriptor.value;
@@ -237,15 +242,17 @@ let ActivityRideService = (() => {
                 const display = Math.floor(time / 3) % 2;
                 const avgMaxStats = (display === 0) ? this.getAverageValues() : this.getMaximumValues();
                 const info = this.buildDashboardInfo(currentValues, avgMaxStats, display);
-                let showLog = true;
+                let showLog = this.state !== 'paused';
                 try {
                     const infoStr = JSON.stringify(info);
-                    showLog = infoStr !== this.current.info;
+                    showLog = (showLog || this.current.isAutoResume) && (infoStr !== this.current.info);
                     this.current.info = infoStr;
                 }
                 catch { }
-                if (showLog)
+                if (showLog) {
+                    console.log('# here', this.state);
                     this.logEvent({ message: 'Dashboard update', items: info.map(i => `${i.title}:${i.data[0]?.value ?? ''}:${i.data[1]?.value ?? ''}${i.data[1]?.label ? '(' + i.data[1]?.label + ')' : ''}`).join('|') });
+                }
                 return info;
             }
             catch (err) {
@@ -452,19 +459,36 @@ let ActivityRideService = (() => {
                     this.saveObserver.emit(event, ...args);
             };
             const run = async () => {
+                let cntCompleted = 0;
                 let success = false;
+                const localEmitter = new EventEmitter();
+                const incCompleted = () => {
+                    cntCompleted++;
+                    if (cntCompleted >= 2) {
+                        localEmitter.emit('completed');
+                    }
+                };
+                localEmitter.once('completed', () => {
+                    sleep(0).then(() => {
+                        delete this.saveObserver;
+                    });
+                });
                 try {
                     emit('start', success);
                     await this._save();
                     let format = undefined;
                     let uploadSuccess = false;
                     let convertSuccess = await this.convert('TCX');
+                    incCompleted();
                     if (convertSuccess) {
                         format = 'TCX';
-                        this.convert('FIT');
+                        this.convert('FIT')
+                            .then(incCompleted)
+                            .catch(incCompleted);
                     }
                     else {
                         convertSuccess = await this.convert('FIT');
+                        cntCompleted++;
                         if (convertSuccess)
                             format = 'FIT';
                     }
@@ -475,12 +499,10 @@ let ActivityRideService = (() => {
                     this.isSaveDone = true;
                 }
                 catch {
+                    cntCompleted++;
                     success = false;
                 }
                 emit('done', success);
-                waitNextTick().then(() => {
-                    delete this.saveObserver;
-                });
                 return success;
             };
             this.saveObserver = new PromiseObserver(run());
@@ -818,6 +840,18 @@ let ActivityRideService = (() => {
                 }
             }
         }
+        async getTargetFileName(format) {
+            let fileName = this.activity.fileName.replace('json', format);
+            if (fileName.startsWith('mmkv:/db_')) {
+                const fs = this.getFileSystemBinding();
+                const appDir = this.getBindings().appInfo.getAppDir();
+                const activitiesDir = this.getBindings().path.join(appDir, 'activities');
+                await fs.ensureDir(activitiesDir);
+                const baseName = fileName.split('/').pop();
+                fileName = this.getBindings().path.join(activitiesDir, baseName);
+            }
+            return fileName;
+        }
         async convert(format) {
             const emit = (event, ...args) => {
                 if (this.saveObserver)
@@ -838,19 +872,21 @@ let ActivityRideService = (() => {
                 data = await ActivityConverter.convert(this.activity, format);
                 emit('convert.done', format, true);
                 if (format.toLowerCase() === 'fit') {
-                    const fileName = this.activity.fileName.replace('json', 'fit');
+                    const fileName = await this.getTargetFileName('fit');
                     await fs.writeFile(fileName, Buffer.from(data));
                     this.activity.fitFileName = fileName;
                 }
                 if (format.toLowerCase() === 'tcx') {
-                    const fileName = this.activity.fileName.replace('json', 'tcx');
+                    const fileName = await this.getTargetFileName('tcx');
                     await fs.writeFile(fileName, Buffer.from(data));
                     this.activity.tcxFileName = fileName;
                 }
                 await this._save();
+                emit('save.done', format, true);
                 return true;
             }
             catch (err) {
+                console.log('# convert error', err.message);
                 emit('convert.error', format, err);
                 return false;
             }
@@ -1230,6 +1266,9 @@ let ActivityRideService = (() => {
         getFileSystemBinding() {
             return getBindings().fs;
         }
+        getBindings() {
+            return getBindings();
+        }
         getUnitConversionShortcuts() {
             const c = this.getUnitConverter();
             const C = c.convert.bind(c);

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

@@ -534,6 +534,10 @@ let DeviceConfigurationService = (() => {
         confirmWifiInterface() {
             this.getUserSettings().set('wifiConfirmed', true);
         }
+        getEnabledInterfaces() {
+            const config = this.settings?.interfaces ?? [];
+            return config.filter(i => i?.enabled).map(i => i.name);
+        }
         getInterfaceSettings(ifName) {
             if (!this.settings)
                 this.settings = { interfaces: [] };

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

@@ -88,6 +88,7 @@ let DeviceRideService = (() => {
         lastDataInfo = {};
         reconnectBusy;
         prevUpdate;
+        logPaused = false;
         constructor() {
             super('DeviceRide');
             this.initizialized = false;
@@ -127,6 +128,32 @@ let DeviceRideService = (() => {
         getData() {
             return this.data;
         }
+        pauseLogging() {
+            console.log('# PAUSE LOGGING');
+            this.logPaused = true;
+            const interfaces = this.getEnabledInterfaces();
+            interfaces.forEach(i => i.pauseLogging());
+            this.getAllAdapters()
+                .map(ai => ai.adapter)
+                .filter(a => a !== undefined)
+                .forEach(a => a.pauseLogging());
+        }
+        resumeLogging() {
+            console.log('# RESUME LOGGING');
+            this.logPaused = false;
+            const interfaces = this.getEnabledInterfaces();
+            interfaces.forEach(i => i.resumeLogging());
+            this.getAllAdapters()
+                .map(ai => ai.adapter)
+                .filter(a => a !== undefined)
+                .forEach(a => a.resumeLogging());
+        }
+        getEnabledInterfaces() {
+            const config = this.getDeviceConfiguration();
+            const access = this.getDeviceAccess();
+            const names = config.getEnabledInterfaces() ?? [];
+            return names.map(i => access.getInterface(i)).filter(n => n !== undefined);
+        }
         getRideAdapters() {
             if (this.rideAdapters?.length)
                 return this.rideAdapters;
@@ -1296,6 +1323,11 @@ let DeviceRideService = (() => {
                 return true;
             return useUserSettings().isNewUser();
         }
+        logEvent(event) {
+            if (this.logPaused)
+                return;
+            super.logEvent(event);
+        }
         cleanInternalCache() {
             delete this.rideAdapters;
         }

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

@@ -188,6 +188,7 @@ let RideDisplayService = (() => {
             }
         }
         pause(requester = 'user') {
+            console.log('# PAUSE', requester);
             try {
                 if (this.state !== 'Active')
                     return;
@@ -196,6 +197,7 @@ let RideDisplayService = (() => {
                 this.getCoaches().pauseRide();
                 if (requester === 'user') {
                     this.getActivityRide().pause(false);
+                    this.getDeviceRide().pauseLogging();
                 }
                 this.getWorkoutRide().pause();
                 this.displayService.pause();
@@ -216,6 +218,7 @@ let RideDisplayService = (() => {
                 this.getCoaches().resumeRide();
                 if (requester === 'user') {
                     this.getActivityRide().resume('user');
+                    this.getDeviceRide().resumeLogging();
                 }
                 this.getWorkoutRide().resume();
                 this.pauseReason = 'device';

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

@@ -175,6 +175,7 @@ export declare class ActivityRideService extends IncyclistService {
     protected _save(): Promise<void>;
     protected getSaveInterval(): number;
     protected updateRepo(): Promise<void>;
+    protected getTargetFileName(format: string): Promise<string>;
     protected convert(format: string): Promise<boolean>;
     protected upload(format: string): Promise<boolean>;
     protected getRepo(): ActivitiesRepository;
@@ -203,6 +204,7 @@ export declare class ActivityRideService extends IncyclistService {
     protected getActivityUploadFactory(): ActivityUploadFactory;
     protected getActivityConverterfactory(): ActivityConverterFactory;
     protected getFileSystemBinding(): import("../../api").IFileSystem;
+    protected getBindings(): import("../../api").IncyclistBindings;
     protected getUnitConversionShortcuts(): any[];
     protected getUnitConverter(): import("../../i18n").UnitConverterService;
 }

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

@@ -18,7 +18,7 @@ export declare class DeviceAccessService extends IncyclistService {
     getInterfaceInfo(ifaceName: string): InterfaceInfo;
     enrichWithAccessState(interfaces: InterfaceSetting[]): EnrichedInterfaceSetting[];
     initInterface(ifaceName: string, binding: any, props?: InterfaceAccessProps): void;
-    protected getInterface(ifaceName: string): IncyclistInterface;
+    getInterface(ifaceName: string): IncyclistInterface;
     connect(ifaceName?: string): Promise<boolean>;
     private getScanTimeout;
     disconnect(ifaceName?: string): Promise<boolean>;

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

@@ -56,6 +56,7 @@ export declare class DeviceConfigurationService extends IncyclistService {
     }>;
     initWifiInterface(): void;
     confirmWifiInterface(): void;
+    getEnabledInterfaces(): Array<string>;
     getInterfaceSettings(ifName: string): InterfaceSetting;
     isInterfaceEnabled(ifName: string): boolean;
     enableInterface(ifName: string): void;

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

@@ -1,6 +1,6 @@
 import { AdapterInfo, IncyclistDeviceSettings } from "../configuration";
 import { AdapterRideInfo, AdapterStateInfo, LegacyRoute, PreparedRoute, RideServiceCheckFilter, RideServiceDeviceProperties } from "./types";
-import { CyclingMode, DeviceData, DeviceSettings, ICyclingMode, IncyclistCapability, IncyclistDeviceAdapter, UpdateRequest } from "incyclist-devices";
+import { CyclingMode, DeviceData, DeviceSettings, ICyclingMode, IncyclistCapability, IncyclistDeviceAdapter, IncyclistInterface, UpdateRequest } from "incyclist-devices";
 import { IncyclistService } from "../../base/service";
 import { Route } from "../../routes/base/model/route";
 import { RouteApiDetail } from "../../routes/base/api/types";
@@ -24,11 +24,15 @@ export declare class DeviceRideService extends IncyclistService {
     protected lastDataInfo: Record<string, number>;
     protected reconnectBusy: boolean;
     protected prevUpdate: UpdateRequest;
+    protected logPaused: boolean;
     constructor();
     protected waitForInit(): Promise<void>;
     lazyInit(): Promise<void>;
     getAdapterStateInfo(adapterInfo: AdapterRideInfo): AdapterStateInfo;
     getData(): DeviceData;
+    pauseLogging(): void;
+    resumeLogging(): void;
+    protected getEnabledInterfaces(): Array<IncyclistInterface>;
     protected getRideAdapters(): AdapterRideInfo[];
     protected getAllAdapters(): AdapterRideInfo[];
     protected getConfiguredAdapters(onlySelected?: boolean): AdapterRideInfo[];
@@ -121,6 +125,7 @@ export declare class DeviceRideService extends IncyclistService {
     onDeviceDeleted(settings: IncyclistDeviceSettings): void;
     enforceSimulator(enforced?: boolean): void;
     canEnforceSimulator(): boolean;
+    logEvent(event: any): void;
     protected cleanInternalCache(): void;
     protected storeOriginalCyclingMode(): void;
     protected subscribeDeviceEvents(adapter: IncyclistDeviceAdapter): void;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.31",
+  "version": "1.7.33",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },
   "dependencies": {
     "axios": "^1.13.6",
-    "incyclist-devices": "^3.0.10",
+    "incyclist-devices": "^3.0.11",
     "promise.any": "^2.0.6",
     "semver": "^7.7.4",
     "tcx-builder": "^1.1.1",