incyclist-services 1.0.71 → 1.0.73

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.js

@@ -823,7 +823,7 @@ class DevicePairingService extends service_2.IncyclistService {
             this.state.tsPrevStart = Date.now();
             this.processConnectedDevices(adapters);
             const selected = this.state.capabilities.map(c => c.selected);
-            const target = adapters.filter(ai => !ai.adapter.isStarted() && selected.includes(ai.udid));
+            const target = adapters.filter(ai => selected.includes(ai.udid));
             if (this.isPairing() && this.state.check.preparing !== preparing) {
                 return;
             }

package/lib/devices/ride/service.js

@@ -340,67 +340,71 @@ class DeviceRideService extends events_1.default {
         }
     }
     checkAntSameDeviceID(adapters) {
-        const antDevices = adapters.map((ai, idx) => (Object.assign(Object.assign({}, ai), { idx })))
-            .filter(ai => ai.adapter.getInterface() === 'ant')
-            .map(ai => ({ idx: ai.idx, deviceID: ai.adapter.getID(), capabilities: ai.capabilities, udid: ai.udid }));
-        const antDeviceIds = antDevices.map(di => di.deviceID);
-        const duplicateIds = antDeviceIds.filter((item, index) => antDeviceIds.indexOf(item) !== index);
-        const score = (capabilities) => {
-            let value = 0;
-            if (capabilities.includes(incyclist_devices_1.IncyclistCapability.Control))
-                value += 100;
-            if (capabilities.includes(incyclist_devices_1.IncyclistCapability.Power))
-                value += 50;
-            value += capabilities.length;
-            return value;
-        };
-        const duplicateDevices = antDevices.filter(di => duplicateIds.includes(di.deviceID)).sort((a, b) => score(b.capabilities) - score(a.capabilities));
-        const leading = duplicateDevices[0];
-        const duplicateAdapters = [];
-        duplicateDevices.forEach((di, i) => {
-            if (i == 0)
-                return;
-            duplicateAdapters.push({ udid: leading.udid, info: adapters[di.idx] });
-        });
-        return duplicateAdapters;
+        try {
+            const antDevices = adapters.map((ai, idx) => (Object.assign(Object.assign({}, ai), { idx })))
+                .filter(ai => ai.adapter.getInterface() === 'ant')
+                .map(ai => ({ idx: ai.idx, deviceID: ai.adapter.getID(), capabilities: ai.capabilities, udid: ai.udid }));
+            const antDeviceIds = antDevices.map(di => di.deviceID);
+            const duplicateIds = antDeviceIds.filter((item, index) => antDeviceIds.indexOf(item) !== index);
+            const score = (capabilities) => {
+                let value = 0;
+                if (capabilities.includes(incyclist_devices_1.IncyclistCapability.Control))
+                    value += 100;
+                if (capabilities.includes(incyclist_devices_1.IncyclistCapability.Power))
+                    value += 50;
+                value += capabilities.length;
+                return value;
+            };
+            const duplicateDevices = antDevices.filter(di => duplicateIds.includes(di.deviceID)).sort((a, b) => score(b.capabilities) - score(a.capabilities));
+            const leading = duplicateDevices[0];
+            const duplicateAdapters = [];
+            duplicateDevices.forEach((di, i) => {
+                if (i == 0)
+                    return;
+                duplicateAdapters.push({ udid: leading.udid, info: adapters[di.idx] });
+            });
+            return duplicateAdapters;
+        }
+        catch (err) {
+            return [];
+        }
     }
     startAdapters(adapters, startType, props) {
         return __awaiter(this, void 0, void 0, function* () {
             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);
@@ -413,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* () {
@@ -474,6 +481,8 @@ class DeviceRideService extends events_1.default {
     }
     startHealthCheck(ai) {
         const check = () => {
+            if (!ai.ivToCheck)
+                return;
             const tsNow = Date.now();
             const isPaused = ai.adapter.isPaused();
             const prevStatus = ai.dataStatus;
@@ -491,8 +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 });
-                console.log('~~~~ health check: prepare reconnect');
+                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) {
@@ -504,7 +512,10 @@ class DeviceRideService extends events_1.default {
                 this.emit('health', ai.udid, ai.dataStatus, enabledCapabilities);
             }
         };
-        ai.ivToCheck = (0, timers_1.setInterval)(check, 1000);
+        if (ai.ivToCheck) {
+            this.stopHealthCheck(ai);
+        }
+        ai.ivToCheck = (0, timers_1.setInterval)(() => { check(); }, 1000);
         ai.isHealthy = true;
     }
     stopHealthCheck(ai) {
@@ -518,11 +529,9 @@ class DeviceRideService extends events_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             if (unhealthy.isRestarting)
                 return;
-            console.log('~~~~ health check: wait 45s', unhealthy.udid);
             yield (0, sleep_1.sleep)(UNHEALTHY_THRESHOLD - NO_DATA_THRESHOLD - 5000);
             if (unhealthy.isHealthy || unhealthy.isRestarting)
                 return;
-            console.log('~~~~ health check: still unhealthy', unhealthy.udid, unhealthy.isHealthy, unhealthy.isRestarting);
             const ifName = unhealthy.adapter.getInterface();
             const adapters = this.getAdapterList().filter(ai => ai.adapter.getInterface() === ifName);
             if (!adapters.find(ai => ai.isHealthy)) {
@@ -536,46 +545,52 @@ class DeviceRideService extends events_1.default {
     }
     reconnectInterface(ifName, adapters) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log('~~~~ health check: restart interface', ifName);
+            if (ifName === 'simulator')
+                return;
             this.logger.logEvent({ message: 'restart interface', interface: ifName });
             let stopRequested = false;
             this.once('stop-ride', () => { stopRequested = true; });
-            const i = incyclist_devices_1.InterfaceFactory.create(ifName);
             try {
-                console.log('~~~~ health check: prepare stop Adapters', ifName);
+                const i = incyclist_devices_1.InterfaceFactory.create(ifName);
                 const promisesStop = [];
                 adapters.map(ai => {
                     promisesStop.push(this.stopAfterRestart(ai));
                 });
-                console.log('~~~~ health check: stop Adapters', ifName, promisesStop.length);
                 if (promisesStop.length > 0) {
-                    yield Promise.allSettled(promisesStop);
+                    yield Promise.race([(0, sleep_1.sleep)(66000), Promise.allSettled(promisesStop)]);
                 }
-                console.log('~~~~ health check: reconnect interface', ifName);
                 if (!stopRequested) {
                     yield i.disconnect();
                     yield (0, sleep_1.sleep)(1000);
                     yield i.connect();
                 }
-                console.log('~~~~ health check: start adapters', ifName);
                 if (!stopRequested) {
                     const promisesStart = [];
                     adapters.map(ai => { promisesStart.push(ai.adapter.start()); });
                     if (promisesStart.length > 0) {
-                        yield Promise.allSettled(promisesStart);
+                        if (ifName === 'ant') {
+                            for (let i = 0; i < promisesStart.length; i++) {
+                                try {
+                                    yield promisesStart[i];
+                                }
+                                catch (_a) {
+                                }
+                            }
+                        }
+                        else {
+                            yield Promise.allSettled(promisesStart);
+                        }
                     }
                 }
             }
             catch (err) {
                 this.logger.logEvent({ message: 'restart interface failed', interface: ifName, reason: err.message });
-                console.log('~~~~ health check: restart interface error', ifName, err);
             }
             adapters.map(ai => {
                 if (ai.adapter.isStarted()) {
                     ai.tsLastData = Date.now();
                 }
                 else {
-                    console.log('~~~~ health check: adapter still not healthy', ifName, ai.udid);
                     ai.isRestarting = false;
                     this.prepareReconnect(ai);
                 }
@@ -586,13 +601,12 @@ class DeviceRideService extends events_1.default {
     }
     stopAfterRestart(unhealthy) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.emit('stop-adapter', unhealthy.udid);
             if (unhealthy.isRestarting) {
-                console.log('~~~ health adapter lready stopping', unhealthy.udid);
                 yield new Promise(done => {
                     const to = setTimeout(done, 65000);
                     this.once('stop-adapter-confirmed', (udid) => {
                         if (udid === unhealthy.udid) {
-                            console.log('~~~ health adapter now can be stopped', unhealthy.udid);
                             clearTimeout(to);
                             done();
                         }
@@ -601,7 +615,6 @@ class DeviceRideService extends events_1.default {
             }
             unhealthy.isRestarting = true;
             unhealthy.adapter.off('data', this.deviceDataHandler);
-            console.log('~~~ health stop adapter', unhealthy.udid);
             yield unhealthy.adapter.stop();
         });
     }
@@ -616,7 +629,6 @@ class DeviceRideService extends events_1.default {
             });
             let success = false;
             do {
-                console.log('~~~~ health check: restart adapter', unhealthy.udid);
                 this.logger.logEvent({ message: 'restart adapter', device: unhealthy.udid });
                 unhealthy.adapter.off('data', this.deviceDataHandler);
                 const adapter = unhealthy.adapter;
@@ -665,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;
         });
@@ -679,7 +701,7 @@ class DeviceRideService extends events_1.default {
     startRide(_props) {
         const adapters = this.getAdapterList();
         adapters === null || adapters === void 0 ? void 0 : adapters.forEach(ai => {
-            ai.adapter.removeAllListeners('data');
+            ai.adapter.off('data', this.deviceDataHandler);
             ai.adapter.on('data', this.deviceDataHandler);
         });
     }
@@ -707,6 +729,7 @@ class DeviceRideService extends events_1.default {
             ai.tsLastData = Date.now();
             ai.adapter.pause();
             ai.adapter.off('data', this.deviceDataHandler);
+            this.stopHealthCheck(ai);
         });
     }
     resume() {
@@ -715,6 +738,7 @@ class DeviceRideService extends events_1.default {
             ai.tsLastData = Date.now();
             ai.adapter.resume();
             ai.adapter.on('data', this.deviceDataHandler);
+            this.startHealthCheck(ai);
         });
     }
     verifySelected(selectedDevices, capability) {

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() {
@@ -222,7 +222,7 @@ class RouteListService extends service_1.IncyclistService {
                 }
                 console.log('~~~ DATA', content);
                 const parser = parsers.findMatching(file.ext, content);
-                const res = yield parser.import(file, content);
+                const res = yield parser.import(file, content, this.loader);
                 const data = res.data;
                 data.state = 'loaded';
                 const details = res.data;
@@ -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/lib/settings/user/service.d.ts

@@ -2,15 +2,19 @@ import { EventLogger } from 'gd-eventlog';
 import { IUserSettingsBinding } from './bindings';
 export declare class UserSettingsService {
     static _instance: UserSettingsService;
+    static _defaultBinding: IUserSettingsBinding;
     settings: any;
     binding: IUserSettingsBinding;
     logger: EventLogger;
     isInitialized: boolean;
     isDirty: boolean;
     savePromise: Promise<boolean> | null;
+    instanceId: number;
+    initPromise: Promise<boolean>;
     static getInstance(): UserSettingsService;
     constructor(binding?: IUserSettingsBinding);
     setBinding(binding: IUserSettingsBinding): void;
+    static setDefaultBinding(binding: IUserSettingsBinding): void;
     init(): Promise<boolean>;
     getAll(): any;
     get(key: string, defValue: any): any;

package/lib/settings/user/service.js

@@ -30,19 +30,29 @@ class UserSettingsService {
         this.isInitialized = false;
         this.isDirty = false;
         this.savePromise = null;
+        this.instanceId = Date.now();
+        this.initPromise = undefined;
         this.setBinding(binding);
     }
     setBinding(binding) {
         this.binding = binding;
+        UserSettingsService.setDefaultBinding(binding);
+    }
+    static setDefaultBinding(binding) {
+        UserSettingsService._defaultBinding = binding;
     }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isInitialized)
                 return true;
-            if (!this.binding)
+            if (this.initPromise)
+                return yield this.initPromise;
+            const binding = this.binding || UserSettingsService._defaultBinding;
+            if (!binding)
                 return false;
             try {
-                this.settings = yield this.binding.getAll();
+                this.initPromise = binding.getAll();
+                this.settings = yield this.initPromise;
                 this.logger.logEvent({ message: 'settings loaded' });
                 this.isInitialized = true;
                 return true;
@@ -175,6 +185,7 @@ exports.useUserSettings = useUserSettings;
 const initUserSettings = (binding) => {
     const us = UserSettingsService.getInstance();
     us.setBinding(binding);
+    us.init();
     return us;
 };
 exports.initUserSettings = initUserSettings;

package/package.json

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