incyclist-services 1.7.21 → 1.7.22

package/lib/cjs/activities/types.js

@@ -0,0 +1,17 @@
+"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("./ride/types"), exports);

package/lib/cjs/apps/base/app/index.js

@@ -54,6 +54,7 @@ let ConnectedAppService = (() => {
         appKey;
         isInitialized;
         id;
+        credentials;
         constructor(service, appKey) {
             super(service);
             this.service = service;
@@ -67,7 +68,12 @@ let ConnectedAppService = (() => {
                 return true;
             if (!this.getUserSettings().isInitialized)
                 return false;
-            this.isInitialized = this.initAuth();
+            try {
+                this.isInitialized = this.checkAuth();
+            }
+            catch {
+                this.isInitialized = this.initAuth();
+            }
             return this.isInitialized;
         }
         connect(credentials) {
@@ -85,6 +91,9 @@ let ConnectedAppService = (() => {
         initAuth() {
             throw new Error('method not implemented');
         }
+        checkAuth() {
+            throw new Error('method not implemented');
+        }
         ensureInitialized() {
             if (!this.isInitialized)
                 this.init();

package/lib/cjs/apps/komoot/KomootAppConnection.js

@@ -62,9 +62,10 @@ let KomootAppConnection = (() => {
         }
         _isConnecting = __runInitializers(this, _instanceExtraInitializers);
         api;
-        credentials;
         constructor() {
             super('KomootAppConnection', 'komoot');
+            this.api = new api_2.KomootApi();
+            this.iniAuth();
         }
         async connect(credentials) {
             this.ensureInitialized();
@@ -107,11 +108,17 @@ let KomootAppConnection = (() => {
             return this.credentials;
         }
         getApi() {
-            if (!this.api)
-                this.api = new api_2.KomootApi();
             return this.api;
         }
-        initAuth() {
+        iniAuth() {
+            const api = this.getApi();
+            if (this.credentials) {
+                api.setAuth(this.credentials);
+                return true;
+            }
+            return false;
+        }
+        checkAuth() {
             let isInitialized = false;
             let credentials;
             if (!this.getUserSettings().isInitialized) {
@@ -127,7 +134,7 @@ let KomootAppConnection = (() => {
                         credentials = this.decrypt(CRYPT_ALGO, auth);
                     }
                 }
-                this.logEvent({ message: 'Komoot init done', hasCredentials: ((0, valid_1.valid)(this.credentials?.username) && (0, valid_1.valid)(this.credentials?.password)) });
+                this.logEvent({ message: 'Komoot init done', hasCredentials: ((0, valid_1.valid)(credentials?.username) && (0, valid_1.valid)(credentials?.password)) });
                 isInitialized = true;
             }
             catch (err) {
@@ -135,10 +142,7 @@ let KomootAppConnection = (() => {
                 isInitialized = false;
             }
             this.setupEventListeners();
-            this.credentials = credentials;
-            if (credentials) {
-                this.getApi().setAuth(credentials);
-            }
+            this.credentials = { ...credentials };
             return isInitialized;
         }
         getAuthConfig() {

package/lib/cjs/apps/velohero/VeloHeroAppConnection.js

@@ -62,7 +62,6 @@ let VeloHeroAppConnection = (() => {
         }
         _isConnecting = __runInitializers(this, _instanceExtraInitializers);
         api;
-        credentials;
         constructor() {
             super('VeloHeroAppConnection', 'velohero');
         }

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

@@ -15,4 +15,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./service"), exports);
-__exportStar(require("./model"), exports);

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

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

package/lib/esm/activities/types.js

@@ -0,0 +1 @@
+export * from './ride/types';

package/lib/esm/apps/base/app/index.js

@@ -51,6 +51,7 @@ let ConnectedAppService = (() => {
         appKey;
         isInitialized;
         id;
+        credentials;
         constructor(service, appKey) {
             super(service);
             this.service = service;
@@ -64,7 +65,12 @@ let ConnectedAppService = (() => {
                 return true;
             if (!this.getUserSettings().isInitialized)
                 return false;
-            this.isInitialized = this.initAuth();
+            try {
+                this.isInitialized = this.checkAuth();
+            }
+            catch {
+                this.isInitialized = this.initAuth();
+            }
             return this.isInitialized;
         }
         connect(credentials) {
@@ -82,6 +88,9 @@ let ConnectedAppService = (() => {
         initAuth() {
             throw new Error('method not implemented');
         }
+        checkAuth() {
+            throw new Error('method not implemented');
+        }
         ensureInitialized() {
             if (!this.isInitialized)
                 this.init();

package/lib/esm/apps/komoot/KomootAppConnection.js

@@ -59,9 +59,10 @@ let KomootAppConnection = (() => {
         }
         _isConnecting = __runInitializers(this, _instanceExtraInitializers);
         api;
-        credentials;
         constructor() {
             super('KomootAppConnection', 'komoot');
+            this.api = new KomootApi();
+            this.iniAuth();
         }
         async connect(credentials) {
             this.ensureInitialized();
@@ -104,11 +105,17 @@ let KomootAppConnection = (() => {
             return this.credentials;
         }
         getApi() {
-            if (!this.api)
-                this.api = new KomootApi();
             return this.api;
         }
-        initAuth() {
+        iniAuth() {
+            const api = this.getApi();
+            if (this.credentials) {
+                api.setAuth(this.credentials);
+                return true;
+            }
+            return false;
+        }
+        checkAuth() {
             let isInitialized = false;
             let credentials;
             if (!this.getUserSettings().isInitialized) {
@@ -124,7 +131,7 @@ let KomootAppConnection = (() => {
                         credentials = this.decrypt(CRYPT_ALGO, auth);
                     }
                 }
-                this.logEvent({ message: 'Komoot init done', hasCredentials: (valid(this.credentials?.username) && valid(this.credentials?.password)) });
+                this.logEvent({ message: 'Komoot init done', hasCredentials: (valid(credentials?.username) && valid(credentials?.password)) });
                 isInitialized = true;
             }
             catch (err) {
@@ -132,10 +139,7 @@ let KomootAppConnection = (() => {
                 isInitialized = false;
             }
             this.setupEventListeners();
-            this.credentials = credentials;
-            if (credentials) {
-                this.getApi().setAuth(credentials);
-            }
+            this.credentials = { ...credentials };
             return isInitialized;
         }
         getAuthConfig() {

package/lib/esm/apps/velohero/VeloHeroAppConnection.js

@@ -59,7 +59,6 @@ let VeloHeroAppConnection = (() => {
         }
         _isConnecting = __runInitializers(this, _instanceExtraInitializers);
         api;
-        credentials;
         constructor() {
             super('VeloHeroAppConnection', 'velohero');
         }

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

@@ -1,2 +1 @@
 export * from './service';
-export * from './model';

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

@@ -0,0 +1 @@
+export {};

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

@@ -187,7 +187,7 @@ export declare class ActivityRideService extends IncyclistService {
     protected update(): void;
     protected isLoop(): boolean;
     protected createFreeRide(settings: FreeRideStartSettings): Route;
-    protected getMode(routeType: ActivityRouteType): "video" | "workout" | "free ride" | "follow route";
+    protected getMode(routeType: ActivityRouteType): "video" | "workout" | "follow route" | "free ride";
     protected updateActivityTime(): void;
     getRideProps(): any;
     protected logActivityUpdateMessage(): void;

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

@@ -1,3 +1,4 @@
+import { HealthStatus } from "../../devices";
 import { Dimension, Unit } from "../../i18n";
 import { ActivityDetailsUI } from "../base";
 export type ActivityState = 'ininitalized' | 'active' | 'paused' | 'completed' | 'idle';
@@ -15,3 +16,16 @@ export type ActivityUpdate = {
     routeDistance: number;
     distance: number;
 };
+export interface ActivityDashboardDataItem {
+    value: string | number | undefined;
+    unit?: string;
+    label?: string;
+    info?: string;
+}
+export interface ActivityDashboardItem {
+    title: string;
+    data: ActivityDashboardDataItem[];
+    size?: number;
+    dataState?: HealthStatus;
+}
+export type ActivityDashboardDisplayProperties = ActivityDashboardItem[];

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

@@ -0,0 +1 @@
+export * from './ride/types';

package/lib/types/apps/base/app/index.d.ts

@@ -6,6 +6,7 @@ export declare class ConnectedAppService<C extends AppCredentials> extends Incyc
     protected appKey: string;
     protected isInitialized: boolean;
     protected id: any;
+    protected credentials: C;
     constructor(service: any, appKey: string);
     init(): boolean;
     connect(credentials: C): Promise<boolean>;
@@ -13,6 +14,7 @@ export declare class ConnectedAppService<C extends AppCredentials> extends Incyc
     isConnected(): boolean;
     getCredentials(): C;
     protected initAuth(): boolean;
+    protected checkAuth(): boolean;
     protected ensureInitialized(): boolean;
     protected getUserSettings(): import("../../../settings").UserSettingsService;
 }

package/lib/types/apps/komoot/KomootAppConnection.d.ts

@@ -4,7 +4,6 @@ import { KomootAuth, KomootCredentials } from "./types";
 export declare class KomootAppConnection extends ConnectedAppService<KomootCredentials> {
     protected _isConnecting: any;
     protected api: KomootApi;
-    protected credentials: KomootCredentials;
     constructor();
     connect(credentials: KomootCredentials): Promise<boolean>;
     isConnecting(): boolean;
@@ -12,7 +11,8 @@ export declare class KomootAppConnection extends ConnectedAppService<KomootCrede
     isConnected(): boolean;
     getCredentials(): KomootCredentials;
     getApi(): KomootApi;
-    protected initAuth(): boolean;
+    protected iniAuth(): boolean;
+    protected checkAuth(): boolean;
     protected getAuthConfig(): KomootAuth | KomootCredentials;
     protected getUuid(): any;
     protected saveCredentials(): void;

package/lib/types/apps/velohero/VeloHeroAppConnection.d.ts

@@ -4,7 +4,6 @@ import { VeloHeroAuth, VeloHeroCredentials } from "./types";
 export declare class VeloHeroAppConnection extends ConnectedAppService<VeloHeroCredentials> {
     protected _isConnecting: any;
     protected api: VeloHeroApi;
-    protected credentials: VeloHeroCredentials;
     constructor();
     connect(credentials: VeloHeroCredentials): Promise<boolean>;
     isConnecting(): boolean;

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

@@ -1,2 +1,2 @@
 export * from './service';
-export * from './model';
+export type * from './types';

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

@@ -1,5 +1,5 @@
 import { AdapterInfo, IncyclistDeviceSettings } from "../configuration";
-import { AdapterRideInfo, AdapterStateInfo, LegacyRoute, PreparedRoute, RideServiceCheckFilter, RideServiceDeviceProperties } from "./model";
+import { AdapterRideInfo, AdapterStateInfo, LegacyRoute, PreparedRoute, RideServiceCheckFilter, RideServiceDeviceProperties } from "./types";
 import { CyclingMode, DeviceData, DeviceSettings, ICyclingMode, IncyclistCapability, IncyclistDeviceAdapter, UpdateRequest } from "incyclist-devices";
 import { IncyclistService } from "../../base/service";
 import { Route } from "../../routes/base/model/route";

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

@@ -0,0 +1,54 @@
+import { DeviceProperties } from "incyclist-devices";
+import { AdapterInfo, ExtendedIncyclistCapability } from "../configuration";
+import { Route } from "../../routes/base/model/route";
+import { RouteApiDetail } from "../../routes/base/api/types";
+export type HealthStatus = 'green' | 'amber' | 'red';
+export interface AdapterRideInfo extends AdapterInfo {
+    isStarted: boolean;
+    tsLastData?: number;
+    isHealthy?: boolean;
+    isRestarting?: boolean;
+    dataStatus?: HealthStatus;
+    ivToCheck?: NodeJS.Timeout;
+    isControl?: boolean;
+}
+export interface AdapterStateInfo {
+    udid: string;
+    name: string;
+    isControl: boolean;
+    capabilities: Array<ExtendedIncyclistCapability>;
+    isStarted: boolean;
+}
+export interface LegacyRoute {
+    get(): RouteApiDetail;
+    isLap(): boolean;
+    getTitle(): string;
+}
+export interface RideServiceDeviceProperties extends DeviceProperties {
+    forceErgMode?: boolean;
+    startPos?: number;
+    realityFactor?: number;
+    rideMode?: string;
+    route?: Route | LegacyRoute;
+}
+export interface RideServiceCheckFilter {
+    interface?: string;
+    interfaces?: string[];
+    udid?: string;
+}
+export interface Point {
+    elevation: number;
+    distance: number;
+}
+export interface PreparedRoute {
+    name: string;
+    description: string;
+    programId: number;
+    type: string;
+    totalDistance: number;
+    lapMode: boolean;
+    minElevation: number;
+    maxElevation: number;
+    sampleRate: number;
+    points: Point[];
+}

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

@@ -1 +1,2 @@
 export type * from './page/types';
+export type * from './ride/types';

package/lib/types/types.d.ts

@@ -2,3 +2,4 @@ export type * from './base/typedefs';
 export type * from './devices/types';
 export type * from './api/types';
 export type * from './routes/types';
+export type * from './activities/types';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.21",
+  "version": "1.7.22",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },