incyclist-services 1.4.8 → 1.4.10

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

@@ -6,6 +6,7 @@ import { IncyclistService } from "../../base/service";
 export declare class DeviceRideService extends IncyclistService {
     protected initizialized: boolean;
     protected adapters: AdapterRideInfo[];
+    protected rideAdapters: AdapterRideInfo[];
     protected startPromises: Promise<boolean>[];
     protected data: DeviceData;
     protected simulatorEnforced: boolean;
@@ -15,6 +16,7 @@ export declare class DeviceRideService extends IncyclistService {
     protected deviceDataHandler: any;
     protected lazyInitDone: boolean;
     protected lastDataInfo: Record<string, number>;
+    protected reconnectBusy: boolean;
     constructor();
     protected waitForInit(): Promise<void>;
     lazyInit(): Promise<void>;
@@ -33,6 +35,10 @@ export declare class DeviceRideService extends IncyclistService {
         info: AdapterInfo;
     }>;
     startAdapters(adapters: AdapterRideInfo[], startType: 'start' | 'check' | 'pair', props?: RideServiceDeviceProperties): Promise<boolean>;
+    protected startSingleAdapter(ai: AdapterRideInfo, duplicates: any, props: any, startType: 'start' | 'check' | 'pair'): Promise<boolean>;
+    private initForStart;
+    private initForPairing;
+    private initCyclingMode;
     private handleStartRejection;
     private handleStartFailure;
     private handleStartSuccess;
@@ -42,11 +48,11 @@ export declare class DeviceRideService extends IncyclistService {
     stopHealthCheck(ai: AdapterRideInfo): void;
     prepareReconnect(unhealthy: AdapterRideInfo): Promise<void>;
     private reconnectInterface;
-    private finalizeAdaptersAfterRestart;
     private performInterfaceReconnect;
+    protected stopAllAdaptersOnInterface(ifName: string): Promise<void>;
     private stopAdapters;
     private reconnectAdapters;
-    protected stopAfterRestart(unhealthy: AdapterRideInfo): Promise<void>;
+    protected stopDuringInterfaceRestart(unhealthy: AdapterRideInfo): Promise<void>;
     private reconnectSingle;
     start(props: RideServiceDeviceProperties): Promise<boolean>;
     startRetry(props: RideServiceDeviceProperties): Promise<boolean>;
@@ -60,7 +66,7 @@ export declare class DeviceRideService extends IncyclistService {
     onData(deviceSettings: DeviceSettings, data: DeviceData): void;
     protected registerData(adapterInfo: AdapterRideInfo, data: DeviceData): void;
     protected getLastDataTS(adapterInfo: AdapterRideInfo): number;
-    protected setLastDataTS(adapterInfo: AdapterRideInfo, ts: number): number;
+    protected setLastDataTS(adapterInfo: AdapterRideInfo, ts: number): void;
     protected clearLastDataTS(adapterInfo: AdapterRideInfo): void;
     private getEnabledCapabilities;
     isUpdateBusy(): boolean;

package/lib/devices/ride/service.js

@@ -123,11 +123,14 @@ let DeviceRideService = (() => {
             return this.data;
         }
         getSelectedAdapters() {
-            this.adapters = this.getConfiguredAdapters();
+            if (this.rideAdapters)
+                return this.rideAdapters;
+            this.rideAdapters = this.adapters = this.getConfiguredAdapters(true);
             if (!this.simulatorEnforced)
                 return this.adapters;
             const adapter = incyclist_devices_1.AdapterFactory.create({ interface: 'simulator', name: 'Simulator' });
-            return [{ adapter, udid: 'Simulator' + Date.now(), capabilities: adapter.getCapabilities(), isStarted: false }];
+            this.rideAdapters = [{ adapter, udid: 'Simulator' + Date.now(), capabilities: adapter.getCapabilities(), isStarted: false }];
+            return this.rideAdapters;
         }
         getAllAdapters() {
             var _a;
@@ -147,7 +150,7 @@ let DeviceRideService = (() => {
         }
         prepareEppRoute(props) {
             const { route, startPos, realityFactor, rideMode } = props;
-            if (!route || !route.get()) {
+            if (!(route === null || route === void 0 ? void 0 : route.get())) {
                 return null;
             }
             let res;
@@ -420,73 +423,10 @@ let DeviceRideService = (() => {
         }
         startAdapters(adapters, startType, props) {
             return __awaiter(this, void 0, void 0, function* () {
-                const { forceErgMode, startPos, realityFactor, rideMode, route } = props || {};
+                var _a;
                 const duplicates = this.checkAntSameDeviceID(adapters);
-                const config = this.getDeviceConfiguration();
-                this.startPromises = adapters === null || adapters === void 0 ? void 0 : adapters.map((ai) => __awaiter(this, void 0, void 0, function* () {
-                    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 = config.getModeSettings(ai.udid);
-                        mode = modeInfo === null || modeInfo === void 0 ? void 0 : modeInfo.mode;
-                        settings = (modeInfo === null || modeInfo === void 0 ? void 0 : 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 = config.getModeSettings(ai.udid, mode);
-                                settings = modeInfo.settings;
-                            }
-                        }
-                        if (!mode)
-                            mode = bike.getDefaultCyclingMode();
-                        bike.setCyclingMode(mode, settings);
-                    }
-                    if (startType === 'check' || startType === 'pair') {
-                        startProps.timeout = 10000;
-                        if (ai.adapter.getSettings().interface === 'ble')
-                            startProps.timeout = 30000;
-                    }
-                    if (startType === 'start') {
-                        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);
-                                };
-                            }
-                        }
-                    }
-                    const sType = ai.adapter.hasCapability(incyclist_devices_1.IncyclistCapability.Control) ? 'bike' : 'sensor';
-                    const logProps = {};
-                    logProps[sType] = ai.adapter.getUniqueName();
-                    logProps.cability = ai.adapter.getCapabilities().join('/');
-                    logProps.interface = (0, logging_1.getLegacyInterface)(ai.adapter);
-                    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* () {
-                        if (success) {
-                            yield this.handleStartSuccess(startType, ai, duplicates, sType, logProps);
-                            return true;
-                        }
-                        yield this.handleStartFailure(startType, ai, duplicates, sType, logProps);
-                        return false;
-                    }))
-                        .catch((err) => __awaiter(this, void 0, void 0, function* () {
-                        yield this.handleStartRejection(startType, sType, logProps, err, ai, duplicates);
-                        return false;
-                    }));
-                }));
-                if (!this.startPromises)
+                this.startPromises = adapters === null || adapters === void 0 ? void 0 : adapters.map((ai) => __awaiter(this, void 0, void 0, function* () { return this.startSingleAdapter(ai, duplicates, props, startType); }));
+                if (!((_a = this.startPromises) === null || _a === void 0 ? void 0 : _a.length))
                     return true;
                 const status = yield Promise.all(this.startPromises);
                 const allOK = status.find(s => s === false) === undefined;
@@ -498,6 +438,85 @@ let DeviceRideService = (() => {
                 return allOK;
             });
         }
+        startSingleAdapter(ai, duplicates, props, startType) {
+            return __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                if (duplicates.find(dai => dai.info.udid === ai.udid))
+                    return;
+                const startProps = (0, clone_1.default)(props || {});
+                const { forceErgMode, startPos, realityFactor, rideMode, route } = props || {};
+                this.initCyclingMode(ai, forceErgMode);
+                if (startType === 'check' || startType === 'pair') {
+                    this.initForPairing(startProps, ai);
+                }
+                if (startType === 'start') {
+                    this.initForStart(ai, startProps, route, startPos, realityFactor, rideMode);
+                }
+                const sType = ai.adapter.hasCapability(incyclist_devices_1.IncyclistCapability.Control) ? 'bike' : 'sensor';
+                const logProps = {};
+                logProps[sType] = ai.adapter.getUniqueName();
+                logProps.cability = ai.adapter.getCapabilities().join('/');
+                logProps.interface = (0, logging_1.getLegacyInterface)(ai.adapter);
+                if (sType === 'bike') {
+                    const bike = ai.adapter;
+                    logProps.cyclingMode = (_a = bike.getCyclingMode()) === null || _a === void 0 ? void 0 : _a.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* () {
+                    if (success) {
+                        yield this.handleStartSuccess(startType, ai, duplicates, sType, logProps);
+                        return true;
+                    }
+                    yield this.handleStartFailure(startType, ai, duplicates, sType, logProps);
+                    return false;
+                }))
+                    .catch((err) => __awaiter(this, void 0, void 0, function* () {
+                    yield this.handleStartRejection(startType, sType, logProps, err, ai, duplicates);
+                    return false;
+                }));
+            });
+        }
+        initForStart(ai, startProps, route, startPos, realityFactor, rideMode) {
+            var _a;
+            if ((_a = ai.adapter) === null || _a === void 0 ? void 0 : _a.isControllable()) {
+                const bike = ai.adapter;
+                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);
+                    };
+                }
+            }
+        }
+        initForPairing(startProps, ai) {
+            startProps.timeout = 10000;
+            if (ai.adapter.getSettings().interface === 'ble')
+                startProps.timeout = 30000;
+        }
+        initCyclingMode(ai, forceErgMode) {
+            var _a;
+            let bike, mode, settings;
+            if ((_a = ai.adapter) === null || _a === void 0 ? void 0 : _a.isControllable()) {
+                bike = ai.adapter;
+                const config = this.getDeviceConfiguration();
+                const modeInfo = config.getModeSettings(ai.udid);
+                mode = modeInfo === null || modeInfo === void 0 ? void 0 : modeInfo.mode;
+                settings = (modeInfo === null || modeInfo === void 0 ? void 0 : 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 = config.getModeSettings(ai.udid, mode);
+                        settings = modeInfo.settings;
+                    }
+                }
+                if (!mode)
+                    mode = bike.getDefaultCyclingMode();
+                bike.setCyclingMode(mode, settings);
+            }
+        }
         handleStartRejection(startType, sType, logProps, err, ai, duplicates) {
             return __awaiter(this, void 0, void 0, function* () {
                 this.logEvent(Object.assign(Object.assign({ message: `${startType} ${sType} request failed` }, logProps), { reason: err.message }));
@@ -582,6 +601,11 @@ let DeviceRideService = (() => {
                 return;
             ai.ivToCheck = (0, timers_1.setInterval)(() => { check(); }, 1000);
             ai.isHealthy = true;
+            if (ai.dataStatus !== undefined && ai.dataStatus !== 'green') {
+                ai.dataStatus = 'green';
+                const { enabledCapabilities } = this.getEnabledCapabilities(ai);
+                this.emit('health', ai.udid, ai.dataStatus, enabledCapabilities);
+            }
         }
         updateOnDatahandler(ai) {
             this.logEvent({ message: 'init health check', device: ai.adapter.getName(), udid: ai.udid });
@@ -603,15 +627,20 @@ let DeviceRideService = (() => {
         }
         prepareReconnect(unhealthy) {
             return __awaiter(this, void 0, void 0, function* () {
+                var _a;
                 this.logEvent({ message: 'prepareReconnect', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData });
+                this.reconnectBusy = true;
                 if (unhealthy.isRestarting)
                     return;
-                yield (0, sleep_1.sleep)(UNHEALTHY_THRESHOLD - NO_DATA_THRESHOLD - 5000);
-                if (unhealthy.isHealthy || unhealthy.isRestarting)
+                yield (0, sleep_1.sleep)(1000);
+                if (unhealthy.isHealthy || unhealthy.isRestarting) {
+                    this.logEvent({ message: 'skipped reconnect', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData });
                     return;
+                }
+                this.logEvent({ message: 'reconnect confirmed', device: unhealthy.adapter.getUniqueName(), udid: unhealthy.udid, noDataSince: (Date.now() - unhealthy.tsLastData), tsLastData: unhealthy.tsLastData });
                 const ifName = unhealthy.adapter.getInterface();
-                const adapters = this.getAllAdapters().filter(ai => ai.adapter.getInterface() === ifName);
-                if (!adapters.find(ai => ai.isHealthy)) {
+                const adapters = (_a = this.rideAdapters) === null || _a === void 0 ? void 0 : _a.filter(ai => ai.adapter.getInterface() === ifName);
+                if (!adapters.find(ai => ai.isHealthy) && adapters.length > 1) {
                     yield this.reconnectInterface(ifName, adapters);
                 }
                 else {
@@ -622,6 +651,10 @@ let DeviceRideService = (() => {
         }
         reconnectInterface(ifName, adapters) {
             return __awaiter(this, void 0, void 0, function* () {
+                if (this.reconnectBusy) {
+                    return;
+                }
+                this.reconnectBusy = true;
                 if (ifName === 'simulator')
                     return;
                 if (ifName === 'ble') {
@@ -631,13 +664,14 @@ let DeviceRideService = (() => {
                     catch (err) {
                         this.logError(err, 'reconnectInterface');
                     }
+                    this.reconnectBusy = false;
                     return;
                 }
                 this.logger.logEvent({ message: 'restart interface', interface: ifName });
                 let stopRequested = false;
                 this.once('stop-ride', () => { stopRequested = true; });
                 try {
-                    yield this.stopAdapters(adapters);
+                    yield this.stopAllAdaptersOnInterface(ifName);
                     if (stopRequested)
                         return;
                     yield this.performInterfaceReconnect(ifName);
@@ -648,20 +682,7 @@ let DeviceRideService = (() => {
                 catch (err) {
                     this.logger.logEvent({ message: 'restart interface failed', interface: ifName, reason: err.message });
                 }
-                this.finalizeAdaptersAfterRestart(adapters);
-            });
-        }
-        finalizeAdaptersAfterRestart(adapters) {
-            adapters.forEach(ai => {
-                if (ai.adapter.isStarted()) {
-                    ai.tsLastData = Date.now();
-                }
-                else {
-                    ai.isRestarting = false;
-                    this.prepareReconnect(ai);
-                }
-                ai.adapter.on('data', this.deviceDataHandler);
-                ai.isRestarting = false;
+                this.reconnectBusy = false;
             });
         }
         performInterfaceReconnect(ifName) {
@@ -674,11 +695,15 @@ let DeviceRideService = (() => {
                 }
             });
         }
+        stopAllAdaptersOnInterface(ifName) {
+            const adapaters = this.getAllAdapters().filter(ai => ai.adapter.getInterface() === ifName);
+            return this.stopAdapters(adapaters);
+        }
         stopAdapters(adapters) {
             return __awaiter(this, void 0, void 0, function* () {
                 const promisesStop = [];
                 adapters.forEach(ai => {
-                    promisesStop.push(this.stopAfterRestart(ai));
+                    promisesStop.push(this.stopDuringInterfaceRestart(ai));
                 });
                 if (promisesStop.length > 0) {
                     yield Promise.race([(0, sleep_1.sleep)(66000), Promise.allSettled(promisesStop)]);
@@ -705,7 +730,7 @@ let DeviceRideService = (() => {
                 }
             });
         }
-        stopAfterRestart(unhealthy) {
+        stopDuringInterfaceRestart(unhealthy) {
             return __awaiter(this, void 0, void 0, function* () {
                 this.emit('stop-adapter', unhealthy.udid);
                 if (unhealthy.isRestarting) {
@@ -721,12 +746,18 @@ let DeviceRideService = (() => {
                 }
                 unhealthy.isRestarting = true;
                 unhealthy.adapter.off('data', this.deviceDataHandler);
-                yield unhealthy.adapter.stop();
+                try {
+                    yield unhealthy.adapter.stop();
+                }
+                catch (err) {
+                    this.logError(err, 'stopDuringInterfaceRestart');
+                }
             });
         }
         reconnectSingle(unhealthy) {
             return __awaiter(this, void 0, void 0, function* () {
                 unhealthy.isRestarting = true;
+                this.stopHealthCheck(unhealthy);
                 let stopRequested = false;
                 this.once('stop-ride', () => { stopRequested = true; });
                 this.once('stop-adapter', (udid) => {
@@ -736,7 +767,6 @@ let DeviceRideService = (() => {
                 let success = false;
                 do {
                     this.logger.logEvent({ message: 'restart adapter', device: unhealthy.udid });
-                    unhealthy.adapter.off('data', this.deviceDataHandler);
                     const adapter = unhealthy.adapter;
                     try {
                         const started = yield adapter.restart();
@@ -747,10 +777,13 @@ let DeviceRideService = (() => {
                     }
                     catch (err) {
                         this.logger.logEvent({ message: 'restart adapter failed', device: unhealthy.udid, reason: err.message });
-                        this.prepareReconnect(unhealthy);
                     }
-                    unhealthy.adapter.on('data', this.deviceDataHandler);
-                    if (!success) {
+                    if (success) {
+                        this.startHealthCheck(unhealthy);
+                        unhealthy.isRestarting = false;
+                        unhealthy.isStarted = true;
+                    }
+                    else {
                         for (let i = 0; i < 60 && !stopRequested; i++)
                             yield (0, sleep_1.sleep)(1000);
                     }
@@ -762,6 +795,7 @@ let DeviceRideService = (() => {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.lazyInit();
                 const adapters = this.getSelectedAdapters();
+                this.rideAdapters = adapters;
                 this.emit('start-request', adapters === null || adapters === void 0 ? void 0 : adapters.map(this.getAdapterStateInfo.bind(this)));
                 const goodToGo = yield this.waitForPreviousStartToFinish();
                 if (!goodToGo)
@@ -773,8 +807,8 @@ let DeviceRideService = (() => {
         startRetry(props) {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.lazyInit();
-                const allAdapters = this.getSelectedAdapters();
-                this.emit('start-request', allAdapters === null || allAdapters === void 0 ? void 0 : allAdapters.map(this.getAdapterStateInfo));
+                const selected = this.getSelectedAdapters();
+                this.emit('start-request', selected === null || selected === void 0 ? void 0 : selected.map(this.getAdapterStateInfo));
                 const adapters = this.getSelectedAdapters().filter(ai => !ai.adapter.isStarted());
                 const goodToGo = yield this.waitForPreviousStartToFinish();
                 if (!goodToGo)
@@ -802,6 +836,7 @@ let DeviceRideService = (() => {
                 });
                 yield Promise.allSettled(promises);
                 this.startPromises = null;
+                delete this.rideAdapters;
                 return true;
             });
         }
@@ -818,7 +853,7 @@ let DeviceRideService = (() => {
                     this.logEvent({ message: 'stop devices' });
                 else
                     this.logEvent({ message: 'stop device', udid });
-                const adapters = this.getSelectedAdapters();
+                const adapters = this.rideAdapters;
                 this.emit('stop-ride');
                 const promises = adapters === null || adapters === void 0 ? void 0 : adapters.filter(ai => udid ? ai.udid === udid : true).map(ai => {
                     this.stopHealthCheck(ai);
@@ -827,6 +862,7 @@ let DeviceRideService = (() => {
                 });
                 if (promises)
                     yield Promise.allSettled(promises);
+                delete this.rideAdapters;
                 return true;
             });
         }
@@ -855,7 +891,6 @@ let DeviceRideService = (() => {
             adapters === null || adapters === void 0 ? void 0 : adapters.forEach(ai => {
                 ai.tsLastData = Date.now();
                 ai.adapter.resume();
-                ai.adapter.on('data', this.deviceDataHandler);
                 this.startHealthCheck(ai);
             });
         }
@@ -931,7 +966,7 @@ let DeviceRideService = (() => {
         }
         setLastDataTS(adapterInfo, ts) {
             const udid = adapterInfo.udid;
-            return this.lastDataInfo[udid] = ts;
+            this.lastDataInfo[udid] = ts;
         }
         clearLastDataTS(adapterInfo) {
             const udid = adapterInfo.udid;
@@ -983,9 +1018,9 @@ let DeviceRideService = (() => {
                 const adapters = this.getSelectedAdapters();
                 this.promiseSendUpdate = [];
                 adapters === null || adapters === void 0 ? void 0 : adapters.forEach(ai => {
-                    if (ai.adapter && ai.adapter.isControllable()) {
-                        const d = ai.adapter;
-                        this.promiseSendUpdate.push(d.sendUpdate(request));
+                    var _a, _b, _c;
+                    if (((_a = ai === null || ai === void 0 ? void 0 : ai.adapter) === null || _a === void 0 ? void 0 : _a.isControllable()) && ((_b = ai === null || ai === void 0 ? void 0 : ai.adapter) === null || _b === void 0 ? void 0 : _b.isStarted()) && !((_c = ai.adapter) === null || _c === void 0 ? void 0 : _c.isStopped())) {
+                        this.promiseSendUpdate.push(ai.adapter.sendUpdate(request));
                     }
                 });
                 yield this.waitForUpdateFinish();
@@ -1099,10 +1134,9 @@ let DeviceRideService = (() => {
                 if (!currentMode || currentMode.getName() !== mode) {
                     const adapters = this.getSelectedAdapters();
                     const adapter = (_a = adapters === null || adapters === void 0 ? void 0 : adapters.find(ai => ai.udid === udid)) === null || _a === void 0 ? void 0 : _a.adapter;
-                    if (adapter && adapter.isControllable()) {
-                        const device = adapter;
-                        device.setCyclingMode(mode, settings);
-                        yield device.sendInitCommands();
+                    if (adapter === null || adapter === void 0 ? void 0 : adapter.isControllable()) {
+                        adapter.setCyclingMode(mode, settings);
+                        yield adapter.sendInitCommands();
                     }
                 }
                 else {

package/lib/routes/list/cards/base.d.ts

@@ -7,6 +7,7 @@ export declare class BaseCard implements Card<Route> {
     setInitialized(val: boolean): void;
     reset(): void;
     delete(): PromiseObserver<boolean>;
+    get id(): string;
     getId(): string;
     getTitle(): string;
     getData(): Route;

package/lib/routes/list/cards/base.js

@@ -16,6 +16,9 @@ class BaseCard {
     delete() {
         throw new Error("Method not implemented.");
     }
+    get id() {
+        return this.getId();
+    }
     getId() {
         throw new Error("Method not implemented.");
     }

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

@@ -8,7 +8,7 @@ import { RouteInfo } from "../base/types";
 import { RoutesApiLoader } from "./loaders/api";
 import { MyRoutes } from "./lists/myroutes";
 import { RouteCard, SummaryCardDisplayProps } from "./cards/RouteCard";
-import { RouteStartSettings, SearchFilter, SearchFilterOptions } from "./types";
+import { DisplayType, RouteStartSettings, SearchFilter, SearchFilterOptions } from "./types";
 import { RoutesDbLoader } from "./loaders/db";
 import { RouteListObserver } from "./RouteListObserver";
 import { ActiveImportCard } from "./cards/ActiveImportCard";
@@ -32,6 +32,8 @@ export declare class RouteListService extends IncyclistService {
     }>;
     protected previewProcessing: PromiseObserver<void>;
     protected filters: SearchFilter;
+    protected listTop: Record<DisplayType, number>;
+    protected displayType: DisplayType;
     constructor();
     setLanguage(language: string): void;
     getLanguage(): string;
@@ -49,11 +51,23 @@ export declare class RouteListService extends IncyclistService {
         routes: SummaryCardDisplayProps[];
         filters: SearchFilter;
         observer: RouteListObserver;
+        cards?: undefined;
+    } | {
+        routes: SummaryCardDisplayProps[];
+        cards: RouteCard[];
+        filters: SearchFilter;
+        observer: RouteListObserver;
     } | {
         routes: any[];
         filters: {};
         observer?: undefined;
+        cards?: undefined;
     };
+    setListTop(display: number | DisplayType, top?: number): void;
+    getListTop(display?: DisplayType): number;
+    setDisplayType(displayType: DisplayType): void;
+    getDisplayType(): DisplayType;
+    isStillLoading(): boolean;
     private applyRouteTypeFilter;
     private applyContentTypeFilter;
     private applyCountryFilter;
@@ -102,7 +116,8 @@ export declare class RouteListService extends IncyclistService {
         list: CardList<Route>;
     };
     protected resetCards(): void;
-    protected getAllCards(): RouteCard[];
+    protected getAllSearchCards(): RouteCard[];
+    protected getUserSettings(): import("../../settings").UserSettingsService;
 }
 export declare const useRouteList: () => RouteListService;
 export declare const getRouteList: () => RouteListService;

package/lib/routes/list/service.js

@@ -1,4 +1,11 @@
 "use strict";
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
 var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
     function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
     var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
@@ -26,13 +33,6 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
-var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i = 0; i < initializers.length; i++) {
-        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
-    }
-    return useValue ? value : void 0;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -72,15 +72,21 @@ const selected_1 = require("./lists/selected");
 const alternatives_1 = require("./lists/alternatives");
 const utils_1 = require("./utils");
 const utils_2 = require("incyclist-devices/lib/utils/utils");
+const settings_1 = require("../../settings");
+const decorators_1 = require("../../base/decorators");
 let RouteListService = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
     let _classSuper = service_1.IncyclistService;
+    let _instanceExtraInitializers = [];
+    let _getUserSettings_decorators;
     var RouteListService = _classThis = class extends _classSuper {
         constructor() {
             super('RouteList');
+            this.myRoutes = __runInitializers(this, _instanceExtraInitializers);
+            this.listTop = { list: undefined, tiles: undefined };
             this.myRoutes = new myroutes_1.MyRoutes('myRoutes', 'My Routes');
             this.selectedRoutes = new selected_1.SelectedRoutes('selected', 'Selected For Me');
             this.alternatives = new alternatives_1.AlternativeRoutes('alternaties', 'Alternatives');
@@ -130,8 +136,9 @@ let RouteListService = (() => {
                     this.observer = new RouteListObserver_1.RouteListObserver(this);
                     emitStartEvent();
                 }
-                if (!this.initialized && !this.preloadObserver) {
-                    this.preload();
+                if (this.isStillLoading()) {
+                    const preload = this.preload();
+                    preload.start().then(emitLoadedEvent);
                 }
                 else if (this.initialized) {
                     this.unselect();
@@ -165,7 +172,7 @@ let RouteListService = (() => {
                 if (requestedFilters)
                     this.filters = requestedFilters;
                 const filters = requestedFilters || this.filters;
-                let routes = Array.from(this.getAllCards().map(c => c.getDisplayProperties()));
+                let routes = Array.from(this.getAllSearchCards().map(c => c.getDisplayProperties()));
                 routes.sort((a, b) => a.title > b.title ? 1 : -1);
                 if (!filters) {
                     return { routes, filters, observer: this.observer };
@@ -177,13 +184,33 @@ let RouteListService = (() => {
                 routes = this.applyCountryFilter(filters, routes);
                 routes = this.applyContentTypeFilter(filters, routes);
                 routes = this.applyRouteTypeFilter(filters, routes);
-                return { routes, filters, observer: this.observer };
+                const cards = routes.map(r => this.getCard(r.id));
+                return { routes, cards, filters, observer: this.observer };
             }
             catch (err) {
                 this.logError(err, 'search');
                 return { routes: [], filters: {} };
             }
         }
+        setListTop(display, top) {
+            const displayType = typeof display === 'number' ? this.displayType : display;
+            const topValue = typeof display === 'number' ? display : top;
+            this.listTop[displayType] = topValue;
+        }
+        getListTop(display = this.displayType) {
+            return this.listTop[display];
+        }
+        setDisplayType(displayType) {
+            this.displayType = displayType;
+            this.getUserSettings().set('preferences.routeListDisplayType', displayType);
+        }
+        getDisplayType() {
+            var _a;
+            return (_a = this.displayType) !== null && _a !== void 0 ? _a : this.getUserSettings().get('preferences.routeListDisplayType', 'list');
+        }
+        isStillLoading() {
+            return !this.initialized && !this.preloadObserver;
+        }
         applyRouteTypeFilter(filters, routes) {
             if (filters.routeType) {
                 const loop = filters.routeType === undefined || filters.routeType === 'Loop';
@@ -264,9 +291,13 @@ let RouteListService = (() => {
             try {
                 list.getCards().forEach((card, idx) => {
                     card.setInitialized(true);
-                    if (idx < item + itemsInSlide + 2) {
-                        card.setVisible(true);
-                    }
+                });
+                process.nextTick(() => {
+                    list.getCards().forEach((card, idx) => {
+                        if (idx < item + itemsInSlide) {
+                            card.setVisible(true);
+                        }
+                    });
                 });
                 setTimeout(() => { this.onCarouselUpdated(list, item, itemsInSlide); }, 1000);
             }
@@ -751,23 +782,28 @@ let RouteListService = (() => {
                 });
             });
         }
-        getAllCards() {
+        getAllSearchCards() {
             var _a;
             const cards = [];
             (_a = this.getLists(false)) === null || _a === void 0 ? void 0 : _a.forEach(list => {
                 list.getCards().forEach((card) => {
-                    if (card.getCardType() === 'Import' || card.getCardType() === 'Free-Ride')
+                    if (card.getCardType() === 'Import' || card.getCardType() === 'Free-Ride' || card.getCardType() === 'ActiveImport')
                         return;
                     cards.push(card);
                 });
             });
             return cards;
         }
+        getUserSettings() {
+            return (0, settings_1.useUserSettings)();
+        }
     };
     __setFunctionName(_classThis, "RouteListService");
     (() => {
         var _a;
         const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create((_a = _classSuper[Symbol.metadata]) !== null && _a !== void 0 ? _a : null) : void 0;
+        _getUserSettings_decorators = [decorators_1.Injectable];
+        __esDecorate(_classThis, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
         __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
         RouteListService = _classThis = _classDescriptor.value;
         if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });

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

@@ -3,6 +3,7 @@ import { RouteCardType } from "./cards/types";
 export interface RouteStartSettings {
     type: RouteCardType;
 }
+export type DisplayType = 'list' | 'tiles';
 export interface FreeRidePoints extends LatLng {
     distance?: number;
     tag?: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.4.8",
+  "version": "1.4.10",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },
@@ -10,14 +10,14 @@
     "@typescript-eslint/eslint-plugin": "^8.19.0",
     "@typescript-eslint/parser": "^8.18.2",
     "dotenv": "^16.4.7",
-    "eslint": "^9.15.0",
+    "eslint": "^9.18.0",
     "formdata-node": "^6.0.3",
     "jest": "^29.7.0",
     "jsdoc": "^4.0.4",
     "ts-jest": "^29.2.5",
     "typedoc": "^0.27.4",
     "typedoc-plugin-markdown": "^4.3.2",
-    "typedoc-plugin-no-inherit": "^1.4.0",
+    "typedoc-plugin-no-inherit": "^1.5.0",
     "typescript": "^5.7.2"
   },
   "scripts": {
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "axios": "^1.7.7",
-    "incyclist-devices": "^2.3.7",
+    "incyclist-devices": "^2.3.8",
     "promise.any": "^2.0.6",
     "semver": "^7.6.3",
     "tcx-builder": "^1.1.1",