incyclist-services 1.0.72 → 1.0.74

package/lib/api/video/index.d.ts

@@ -0,0 +1,18 @@
+export interface IObserver {
+    on(event: string, callback: any): any;
+    off(event: string, callback: any): any;
+    once(event: string, callback: any): any;
+    stop(): any;
+}
+export type ScreenshotProps = {
+    outDir: string;
+    position: number | string;
+    size: string;
+};
+export type ConvertProps = {
+    outDir: string;
+};
+export interface IVideoProcessor {
+    screenshot(url: string, props?: any): Promise<string>;
+    convert(url: string, props?: any): Promise<IObserver>;
+}

package/lib/api/video/index.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -53,11 +53,13 @@ export declare class DevicePairingService extends IncyclistService {
     protected waitForInit(): Promise<void>;
     protected getExternaState(toEmit: PairingState): PairingState;
     protected emitStateChange(newState?: PairingState): void;
+    protected emitStartStatus(): void;
     protected onInterfaceConfigChanged(ifName: string, settings: InterfaceSetting): void;
     protected mergeState(current: any, newState: any): void;
     protected onConfigurationUpdate(newCapabilities: DeviceConfigurationInfo): void;
     protected onInterfaceStateChanged(ifName: any, ifDetails: any, interfacesNew?: any): Promise<any>;
     protected isInterfaceEnabled(target: string | InterfaceSetting): boolean;
+    protected isInterfaceInUse(target: string | InterfaceSetting): CapabilityData;
     protected logCapabilities(capabilities?: Array<CapabilityData>): CapabilityData[];
     protected initPairingCallbacks(): void;
     protected removePairingCallbacks(): void;
@@ -74,6 +76,7 @@ export declare class DevicePairingService extends IncyclistService {
     private markConnected;
     protected disconnectInterface(name: string): void;
     protected connectInterface(name: string): void;
+    protected updateCapabilityConfig(): void;
     protected checkCanStart(): boolean;
     protected checkPairingSuccess(): boolean;
     private stopScanning;

package/lib/devices/pairing/service.js

@@ -64,19 +64,22 @@ class DevicePairingService extends service_2.IncyclistService {
                 this.state.deleted = [];
             }
             try {
-                if (this.settings.onStateChanged) {
-                    this.settings.onStateChanged = onStateChanged;
+                yield this.loadConfiguration();
+                this.updateCapabilityConfig();
+                const alreadyInitialized = this.settings.onStateChanged !== undefined && this.settings.onStateChanged !== null;
+                this.settings.onStateChanged = onStateChanged;
+                if (alreadyInitialized) {
                     this.emitStateChange(this.state);
+                    this.emitStartStatus();
                     return;
                 }
-                yield this.loadConfiguration();
+                this.initConfigHandlers();
                 this.state.interfaces.forEach(i => {
                     if (!this.isInterfaceEnabled(i.name))
                         this.unselectOnInterface(i.name);
                 });
-                this.settings.onStateChanged = onStateChanged;
                 this.emitStateChange(this.state);
-                this.initConfigHandlers();
+                this.emitStartStatus();
                 this.run();
             }
             catch (err) {
@@ -88,8 +91,6 @@ class DevicePairingService extends service_2.IncyclistService {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.waitForInit();
             const { capabilities, interfaces } = this.configuration.load();
-            const state = Object.assign({}, this.state);
-            delete state.adapters;
             this.state.capabilities = this.mappedCapabilities(capabilities);
             this.state.interfaces = this.access.enrichWithAccessState(interfaces);
             this.state.canStartRide = this.configuration.canStartRide();
@@ -378,6 +379,13 @@ class DevicePairingService extends service_2.IncyclistService {
         if (onDeviceSelectStateChanged && typeof onDeviceSelectStateChanged === 'function')
             onDeviceSelectStateChanged(this.getDeviceSelectionState());
     }
+    emitStartStatus() {
+        const { onStateChanged } = this.settings || {};
+        const { canStartRide } = this.state;
+        if (onStateChanged && typeof onStateChanged === 'function') {
+            onStateChanged({ canStartRide });
+        }
+    }
     onInterfaceConfigChanged(ifName, settings) {
         this.logEvent({ message: 'Interface Config changed', interface: ifName, settings });
         const prev = this.state.interfaces;
@@ -488,7 +496,7 @@ class DevicePairingService extends service_2.IncyclistService {
                     else if (ifDetails.state !== 'unavailable' && current.state === 'unavailable') {
                         this.enableAdaptersOnInterface(ifName);
                     }
-                    else if (ifDetails.state === 'connected' && current.state !== 'connected' && !this.isPairing()) {
+                    else if (ifDetails.state === 'connected' && current.state !== 'connected' && !this.isPairing() && !this.state.canStartRide) {
                         restartScan = true;
                     }
                     else if (ifDetails.state === 'connected' && current.state !== 'connected' && this.isPairingWaiting()) {
@@ -498,9 +506,10 @@ class DevicePairingService extends service_2.IncyclistService {
                         prev[changedIdx].isScanning = ifDetails.isScanning;
                         prev[changedIdx].state = ifDetails.state;
                     }
-                    if (restartScan)
+                    if (restartScan) {
                         this.restart();
-                    if (restartPair) {
+                    }
+                    if (restartPair && this.isInterfaceInUse(ifName)) {
                         this.restartPair();
                     }
                     this.emitStateChange({ interfaces: this.state.interfaces });
@@ -518,6 +527,12 @@ class DevicePairingService extends service_2.IncyclistService {
         const { interfaces } = this.state;
         return interfaces.find(i => i.name === name && i.enabled && i.state !== 'unavailable') !== undefined;
     }
+    isInterfaceInUse(target) {
+        const name = (typeof target === 'string') ? target : target.name;
+        const { capabilities } = this.state;
+        const res = capabilities.find(c => c.interface === name);
+        return res;
+    }
     logCapabilities(capabilities) {
         const ci = capabilities || this.state.capabilities;
         ci.forEach(c => {
@@ -713,6 +728,19 @@ class DevicePairingService extends service_2.IncyclistService {
             this.logError(err, 'enableInterface');
         }
     }
+    updateCapabilityConfig() {
+        try {
+            const { capabilities } = this.state;
+            capabilities.forEach(c => {
+                var _a;
+                if (c.connectState !== 'connected' && c.selected && ((_a = this.getDeviceAdapter(c.selected)) === null || _a === void 0 ? void 0 : _a.isStarted()))
+                    c.connectState = 'connected';
+            });
+        }
+        catch (err) {
+            console.log(err);
+        }
+    }
     checkCanStart() {
         try {
             const prev = this.state.canStartRide;
@@ -725,8 +753,8 @@ class DevicePairingService extends service_2.IncyclistService {
             const power = this.getCapability(incyclist_devices_1.IncyclistCapability.Power);
             const canStartRide = ((control === null || control === void 0 ? void 0 : control.connectState) === 'connected' || (power === null || power === void 0 ? void 0 : power.connectState) === 'connected');
             this.state.canStartRide = canStartRide;
-            if (this.state.canStartRide !== prev) {
-                this.emitStateChange({ canStartRide });
+            if (canStartRide !== prev) {
+                this.emitStartStatus();
             }
         }
         catch (err) {
@@ -793,7 +821,10 @@ class DevicePairingService extends service_2.IncyclistService {
                 return;
             }
             if (configOKToStart && !this.deviceSelectState && !props.enforcedScan) {
-                yield this.startPairing(adapters, props);
+                if (!(this.checkPairingSuccess() === true))
+                    yield this.startPairing(adapters, props);
+                else
+                    this.emitStateChange();
             }
             else {
                 yield this.startScanning(adapters, props);
@@ -802,7 +833,7 @@ class DevicePairingService extends service_2.IncyclistService {
     }
     startPairing(adapters, props) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.isPairing())
+            if (this.isPairing() || this.checkPairingSuccess())
                 return;
             const preparing = DevicePairingService.checkCounter++;
             this.state.check = { preparing };
@@ -824,7 +855,7 @@ class DevicePairingService extends service_2.IncyclistService {
             this.processConnectedDevices(adapters);
             const selected = this.state.capabilities.map(c => c.selected);
             const target = adapters.filter(ai => selected.includes(ai.udid));
-            if (this.isPairing() && this.state.check.preparing !== preparing) {
+            if ((this.isPairing() && this.state.check.preparing !== preparing) || (this.checkPairingSuccess() === true)) {
                 return;
             }
             this.initPairingCallbacks();
@@ -834,6 +865,7 @@ class DevicePairingService extends service_2.IncyclistService {
             this.onPairingStarted();
             this.logEvent({ message: 'Start Pairing', adapters, props });
             yield this.state.check.promise;
+            this.checkCanStart();
             if (this.state.check)
                 delete this.state.check;
             this.emit('pairing-done');

package/lib/devices/ride/service.js

@@ -366,7 +366,6 @@ class DeviceRideService extends events_1.default {
             return duplicateAdapters;
         }
         catch (err) {
-            console.log('~~~~ ERROR', err);
             return [];
         }
     }
@@ -375,38 +374,37 @@ class DeviceRideService extends events_1.default {
             const { forceErgMode, startPos, realityFactor, rideMode, route } = props || {};
             const duplicates = this.checkAntSameDeviceID(adapters);
             this.startPromises = adapters === null || adapters === void 0 ? void 0 : adapters.map((ai) => __awaiter(this, void 0, void 0, function* () {
-                var _a;
+                var _a, _b, _c;
                 if (duplicates.find(dai => dai.info.udid === ai.udid))
                     return;
                 const startProps = (0, clone_1.default)(props || {});
+                let mode, settings, bike;
+                if ((_a = ai.adapter) === null || _a === void 0 ? void 0 : _a.isControllable()) {
+                    bike = ai.adapter;
+                    const modeInfo = this.configurationService.getModeSettings(ai.udid);
+                    mode = modeInfo.mode;
+                    settings = modeInfo.settings;
+                    if (!this.simulatorEnforced && forceErgMode) {
+                        const modes = bike.getSupportedCyclingModes().filter(C => C.supportsERGMode());
+                        if (modes.length > 0) {
+                            mode = new modes[0](bike);
+                            const modeInfo = this.configurationService.getModeSettings(ai.udid, mode);
+                            settings = modeInfo.settings;
+                        }
+                    }
+                    if (!mode)
+                        mode = bike.getDefaultCyclingMode();
+                    bike.setCyclingMode(mode, settings);
+                    console.log('~~~ mode', mode, 'settings', settings);
+                }
                 if (startType === 'check' || startType === 'pair') {
                     startProps.timeout = 10000;
                     if (ai.adapter.getSettings().interface === 'ble')
                         startProps.timeout = 30000;
                 }
                 if (startType === 'start') {
-                    if (ai.adapter && ai.adapter.isControllable()) {
-                        const d = ai.adapter;
-                        let mode, settings;
-                        if (!this.simulatorEnforced) {
-                            if (forceErgMode) {
-                                const modes = d.getSupportedCyclingModes().filter(C => C.supportsERGMode());
-                                if (modes.length > 0) {
-                                    mode = new modes[0](d);
-                                    const modeInfo = this.configurationService.getModeSettings(ai.udid, mode);
-                                    settings = modeInfo.settings;
-                                }
-                            }
-                            if (!mode) {
-                                const modeInfo = this.configurationService.getModeSettings(ai.udid);
-                                mode = modeInfo.mode;
-                                settings = modeInfo.settings;
-                            }
-                        }
-                        if (!mode)
-                            mode = d.getDefaultCyclingMode();
-                        d.setCyclingMode(mode, settings);
-                        if (d.getCyclingMode().getModeProperty('eppSupport')) {
+                    if ((_b = ai.adapter) === null || _b === void 0 ? void 0 : _b.isControllable()) {
+                        if (bike.getCyclingMode().getModeProperty('eppSupport')) {
                             startProps.route = this.prepareEppRoute({ route, startPos, realityFactor, rideMode });
                             startProps.onStatusUpdate = (completed, total) => {
                                 this.emit('start-update', this.getAdapterStateInfo(ai), completed, total);
@@ -419,8 +417,11 @@ class DeviceRideService extends events_1.default {
                 logProps[sType] = ai.adapter.getUniqueName();
                 logProps.cability = ai.adapter.getCapabilities().join('/');
                 logProps.interface = (0, logging_1.getLegacyInterface)(ai.adapter);
-                if (sType === 'bike')
-                    logProps.cyclingMode = (_a = ai.adapter.getCyclingMode()) === null || _a === void 0 ? void 0 : _a.getName();
+                if (sType === 'bike') {
+                    const bike = ai.adapter;
+                    logProps.cyclingMode = (_c = bike.getCyclingMode()) === null || _c === void 0 ? void 0 : _c.getName();
+                    logProps.bikeType = bike.getCyclingMode().getSetting('bikeType');
+                }
                 this.logEvent(Object.assign({ message: `${startType} ${sType} request` }, logProps));
                 return ai.adapter.start(startProps)
                     .then((success) => __awaiter(this, void 0, void 0, function* () {
@@ -499,7 +500,7 @@ class DeviceRideService extends events_1.default {
                 ai.dataStatus = 'red';
             if (ai.isHealthy && (isAmber || isRed)) {
                 ai.isHealthy = false;
-                this.logEvent({ message: 'device unhealthy', device: ai.adapter.getUniqueName(), udid: ai.udid });
+                this.logEvent({ message: 'device unhealthy', device: ai.adapter.getUniqueName(), udid: ai.udid, noDataSince: (tsNow - ai.tsLastData), tsLastData: ai.tsLastData });
                 this.prepareReconnect(ai);
             }
             else if (!ai.isHealthy && !isAmber && !isRed) {
@@ -544,6 +545,8 @@ class DeviceRideService extends events_1.default {
     }
     reconnectInterface(ifName, adapters) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (ifName === 'simulator')
+                return;
             this.logger.logEvent({ message: 'restart interface', interface: ifName });
             let stopRequested = false;
             this.once('stop-ride', () => { stopRequested = true; });
@@ -674,13 +677,23 @@ class DeviceRideService extends events_1.default {
     }
     cancelStart() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.startPromises)
+                return;
+            this.logEvent({ message: 'cancel start' });
             const adapters = this.getAdapterList();
+            const promises = [];
             adapters === null || adapters === void 0 ? void 0 : adapters.forEach(ai => {
                 const d = ai.adapter;
                 d.off('data', this.deviceDataHandler);
-                if (!ai.isStarted)
-                    d.stop();
+                if (!d.isStarted()) {
+                    this.logEvent({ message: 'cancel start of device', udid: ai.udid });
+                    promises.push(d.stop());
+                }
+                else {
+                    d.pause();
+                }
             });
+            yield Promise.allSettled(promises);
             this.startPromises = null;
             return true;
         });

package/lib/routes/list/service.d.ts

@@ -5,6 +5,7 @@ import { IncyclistService } from "../../base/service";
 import { FileInfo, IFileLoader, IJsonRepositoryBinding, JsonRepository } from "../../api";
 import { LatLng } from "../../utils/geo";
 import { IPathBinding } from "../../api/path";
+import { IVideoProcessor } from "../../api/video";
 type filterFn = (route: Route, idx: number, obj: Route[]) => boolean;
 export declare class RouteListService extends IncyclistService {
     protected static _instance: any;
@@ -17,11 +18,13 @@ export declare class RouteListService extends IncyclistService {
     protected api: IncyclistRoutesApi;
     protected routeDescriptions: RoutesDB;
     protected loader: IFileLoader;
+    protected videoProcessor: IVideoProcessor;
     constructor();
     initBindings(bindings: {
         path?: IPathBinding;
         db: IJsonRepositoryBinding;
         loader?: IFileLoader;
+        video?: IVideoProcessor;
     }): void;
     protected getVideosRepo(): JsonRepository;
     protected getRoutesRepo(): JsonRepository;

package/lib/routes/list/service.js

@@ -19,7 +19,6 @@ const service_1 = require("../../base/service");
 const route_1 = require("../base/utils/route");
 const settings_1 = require("../../settings");
 const api_2 = require("../../api");
-const clone_1 = __importDefault(require("../../utils/clone"));
 const FreeRideCard_1 = require("./FreeRideCard");
 const ImportCard_1 = require("./ImportCard");
 const utils_1 = require("../../utils");
@@ -43,13 +42,14 @@ class RouteListService extends service_1.IncyclistService {
         this.routeDescriptions = {};
     }
     initBindings(bindings) {
-        console.log('~~~ initBindings', bindings);
         if (bindings.db)
             api_2.JsonRepository.setBinding(bindings.db);
         if (bindings.path)
             path_1.default.initBinding(bindings.path);
         if (bindings.loader)
             this.loader = bindings.loader;
+        if (bindings.video)
+            this.videoProcessor = bindings.video;
         this.state.initialized = true;
     }
     getVideosRepo() {
@@ -365,9 +365,7 @@ class RouteListService extends service_1.IncyclistService {
                     }
                 });
             }
-            console.log('~~~ DEBUG: during preload', promises.length);
-            Promise.allSettled(promises).then((res) => {
-                console.log('~~~ DEBUG: after preload', (0, clone_1.default)(this.state), (0, clone_1.default)(this.routeDescriptions), res);
+            Promise.allSettled(promises).then(() => {
                 this.saveRouteDescriptions();
             });
         });
@@ -585,18 +583,19 @@ class RouteListService extends service_1.IncyclistService {
         return data;
     }
     getListFromApiDesciption(description) {
-        var _a;
+        var _a, _b;
         let list;
+        const category = (_a = description.category) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase();
         if (description.type === 'gpx') {
-            if (description.category === 'personal')
+            if (category === 'personal')
                 return 'myRoutes';
             list = description.category ? 'alternatives' : 'selected';
             return list;
         }
         if (description.type === 'video') {
-            if (description.category === undefined || description.category === 'personal')
+            if (category === undefined || category === 'personal' || category === 'imported')
                 return 'myRoutes';
-            if ((_a = description.video) === null || _a === void 0 ? void 0 : _a.url) {
+            if ((_b = description.video) === null || _b === void 0 ? void 0 : _b.url) {
                 return 'selected';
             }
         }
@@ -782,7 +781,6 @@ class RouteListService extends service_1.IncyclistService {
                     if (!Array.isArray(r.points))
                         delete r.points;
                 });
-                console.log('~~~ DEBUG:', all);
                 this.addDescriptionsFromDB(all);
             }
             this.saveRouteDescriptions();
@@ -834,6 +832,7 @@ class RouteListService extends service_1.IncyclistService {
     }
     loadRouteDetais(route) {
         return __awaiter(this, void 0, void 0, function* () {
+            console.log('~~~ loadRouteDetails', route);
             if (route.data.state === 'loaded' || route.data.state === 'loading')
                 return;
             try {
@@ -844,7 +843,8 @@ class RouteListService extends service_1.IncyclistService {
                         yield this.getVideosRepo().read(route.id)
                         :
                             yield this.getRoutesRepo().read(route.id);
-                    api_1.default.verify(route.details);
+                    if (route.details)
+                        api_1.default.verify(route.details);
                 }
                 catch (err) {
                     console.log('~~~ DEBUG:error', route.data.title, route.data.isLocal, err);
@@ -853,8 +853,14 @@ class RouteListService extends service_1.IncyclistService {
                 }
                 if (!route.details) {
                     route.details = yield this.api.getRouteDetails(route.id);
-                    api_1.default.verify(route.details);
-                    this.saveRouteDetails(route);
+                    if (route.details) {
+                        api_1.default.verify(route.details);
+                        this.saveRouteDetails(route);
+                        route.data.state = 'loaded';
+                    }
+                    else {
+                        route.data.state = 'prepared';
+                    }
                 }
                 if (route.details.id !== route.data.id) {
                     route.data.state = 'error';
@@ -864,7 +870,7 @@ class RouteListService extends service_1.IncyclistService {
                 this.mergeWithDetails(route);
                 route.data.state = 'loaded';
                 this.emitRouteUpdated(route);
-                const { list } = this.routeDescriptions[route.id];
+                const { list } = this.routeDescriptions[route.data.id];
                 this.routeDescriptions[route.id] = Object.assign(Object.assign({}, route.data), { list });
                 return route.data;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.0.72",
+  "version": "1.0.74",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "axios": "^1.6.1",
-    "incyclist-devices": "^2.1.31",
+    "incyclist-devices": "^2.1.35",
     "uuid": "^9.0.0",
     "xml2js": "^0.6.2"
   }