incyclist-services 1.3.58 → 1.3.60

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

@@ -68,7 +68,7 @@ export declare class ActivityRideService extends IncyclistService {
         slope: number;
         heartrate: number;
         cadence: number;
-        timeRemaining: number;
+        timeRemaining: any;
         distanceRemaining: number;
     };
     protected getAverageValues(): {

package/lib/activities/ride/service.js

@@ -188,6 +188,8 @@ let ActivityRideService = (() => {
             delete this.current.endPos;
         }
         getDashboardDisplayProperties() {
+            if (!this.current)
+                return [];
             try {
                 const currentValues = this.getCurrentValues();
                 const { time } = currentValues;
@@ -226,20 +228,23 @@ let ActivityRideService = (() => {
             return info;
         }
         getCurrentValues() {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
             const distance = ((_b = (_a = this.activity) === null || _a === void 0 ? void 0 : _a.distance) !== null && _b !== void 0 ? _b : 0) / 1000;
-            const speed = ((_c = this.current.deviceData.speed) !== null && _c !== void 0 ? _c : 0);
-            const power = ((_d = this.current.deviceData.power) !== null && _d !== void 0 ? _d : 0);
-            const slope = (_e = this.current.position) === null || _e === void 0 ? void 0 : _e.slope;
-            const heartrate = this.current.deviceData.heartrate;
-            const cadence = ((_f = this.current.deviceData.cadence) !== null && _f !== void 0 ? _f : 0);
-            const time = (_h = (_g = this.activity) === null || _g === void 0 ? void 0 : _g.time) !== null && _h !== void 0 ? _h : 0;
+            const speed = ((_d = (_c = this.current.deviceData) === null || _c === void 0 ? void 0 : _c.speed) !== null && _d !== void 0 ? _d : 0);
+            const power = ((_f = (_e = this.current.deviceData) === null || _e === void 0 ? void 0 : _e.power) !== null && _f !== void 0 ? _f : 0);
+            const slope = (_g = this.current.position) === null || _g === void 0 ? void 0 : _g.slope;
+            const heartrate = (_h = this.current.deviceData) === null || _h === void 0 ? void 0 : _h.heartrate;
+            const cadence = ((_k = (_j = this.current.deviceData) === null || _j === void 0 ? void 0 : _j.cadence) !== null && _k !== void 0 ? _k : 0);
+            const time = (_m = (_l = this.activity) === null || _l === void 0 ? void 0 : _l.time) !== null && _m !== void 0 ? _m : 0;
             let distanceRemaining = (this.getTotalDistance() / 1000 - distance);
             if (isNaN(distanceRemaining))
                 distanceRemaining = undefined;
             if (distanceRemaining < 0)
                 distanceRemaining = 0;
-            const timeRemaining = this.durationCalculator.getRemainingTime({ route: this.current.route, speed: this.current.deviceData.speed, routePos: this.activity.distance + ((_j = this.activity.startPos) !== null && _j !== void 0 ? _j : 0), endPos: this.current.endPos });
+            let timeRemaining;
+            if (speed > 0) {
+                timeRemaining = this.durationCalculator.getRemainingTime({ route: this.current.route, speed: (_o = this.current.deviceData) === null || _o === void 0 ? void 0 : _o.speed, routePos: this.activity.distance + ((_q = (_p = this.activity) === null || _p === void 0 ? void 0 : _p.startPos) !== null && _q !== void 0 ? _q : 0), endPos: (_r = this.current) === null || _r === void 0 ? void 0 : _r.endPos });
+            }
             return { distance, time, speed, power, slope, heartrate, cadence, timeRemaining, distanceRemaining };
         }
         getAverageValues() {

package/lib/base/decorators/index.d.ts

@@ -0,0 +1,2 @@
+export * from './Injection';
+export * from '../types/singleton';

package/lib/base/decorators/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./Injection"), exports);
+__exportStar(require("../types/singleton"), exports);

package/lib/devices/configuration/service.js

@@ -614,6 +614,8 @@ class DeviceConfigurationService extends events_1.default {
             const info = [];
             udids.forEach(udid => {
                 const adapter = this.adapters[udid];
+                if (!adapter)
+                    return;
                 info.push({ udid, adapter, capabilities: adapter.getCapabilities() });
             });
             return info;
@@ -626,6 +628,8 @@ class DeviceConfigurationService extends events_1.default {
             if (!devices.find(d => d.udid === c.selected))
                 return;
             const adapter = this.adapters[c.selected];
+            if (!adapter)
+                return;
             const idx = adapters.findIndex(a => a.udid === c.selected);
             if (idx === -1) {
                 adapters.push({ udid: c.selected, adapter, capabilities: [c.capability] });

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

@@ -1,34 +1,26 @@
-import EventEmitter from "events";
-import { DeviceAccessService } from "../access/service";
-import { AdapterInfo, DeviceConfigurationService, IncyclistDeviceSettings } from "../configuration";
+import { AdapterInfo, IncyclistDeviceSettings } from "../configuration";
 import { AdapterRideInfo, AdapterStateInfo, PreparedRoute, RideServiceCheckFilter, RideServiceDeviceProperties } from "./model";
-import { UserSettingsService } from "../../settings";
 import { EventLogger } from 'gd-eventlog';
 import { CyclingMode, DeviceData, DeviceSettings, IncyclistCapability, IncyclistDeviceAdapter, UpdateRequest } from "incyclist-devices";
-export declare class DeviceRideService extends EventEmitter {
-    protected static _instance: DeviceRideService;
-    protected configurationService: DeviceConfigurationService;
-    protected userSettings: UserSettingsService;
-    protected accessService: DeviceAccessService;
+import { IncyclistService } from "../../base/service";
+export declare class DeviceRideService extends IncyclistService {
     protected initizialized: boolean;
     protected adapters: AdapterRideInfo[];
     protected startPromises: Promise<boolean>[];
     protected data: DeviceData;
     protected simulatorEnforced: boolean;
     protected logger: EventLogger;
-    protected debug: any;
     protected promiseSendUpdate: Promise<UpdateRequest | void>[];
     protected originalMode: CyclingMode;
     protected deviceDataHandler: any;
-    static getInstance(): DeviceRideService;
     constructor();
-    logEvent(event: any): void;
-    setDebug(enabled: boolean): void;
     protected waitForInit(): Promise<void>;
     lazyInit(): Promise<void>;
     getAdapterStateInfo(adapterInfo: AdapterInfo): AdapterStateInfo;
     getData(): DeviceData;
-    protected getAdapterList(onlySelected?: boolean): AdapterRideInfo[];
+    protected getSelectedAdapters(): AdapterRideInfo[];
+    protected getAllAdapters(): AdapterRideInfo[];
+    protected getConfiguredAdapters(onlySelected?: boolean): AdapterRideInfo[];
     prepareEppRoute(props: RideServiceDeviceProperties): PreparedRoute;
     waitForPreviousStartToFinish(): Promise<boolean>;
     startCheck(filter: RideServiceCheckFilter): Promise<void>;
@@ -76,5 +68,9 @@ export declare class DeviceRideService extends EventEmitter {
     onDeviceDeleted(settings: IncyclistDeviceSettings): void;
     enforceSimulator(enforced?: boolean): void;
     canEnforceSimulator(): boolean;
+    protected storeOriginalCyclingMode(): void;
+    protected getDeviceConfiguration(): import("../configuration").DeviceConfigurationService;
+    protected getUserSettings(): import("../../settings").UserSettingsService;
+    protected getDeviceAccess(): import("../access/service").DeviceAccessService;
 }
 export declare const useDeviceRide: () => DeviceRideService;