incyclist-services 1.3.0 → 1.3.2

package/lib/activities/ride/service.js

@@ -265,30 +265,44 @@ let ActivityRideService = (() => {
             this.current.position = position;
         }
         onDeviceData(data) {
-            this.current.tsDeviceData = Date.now();
-            const update = Object.assign({}, data);
-            if (data.distance < 0 || data.speed === 0) {
-                update.distance = 0;
-                update.speed = 0;
-            }
-            this.current.deviceData = Object.assign(Object.assign({}, this.current.deviceData), update);
-            if (this.state !== 'active') {
-                if (this.state === 'paused' && data.speed > 0 && this.current.isAutoResume) {
-                    this.resume('system');
-                    return;
+            if (!this.current)
+                return;
+            try {
+                this.current.tsDeviceData = Date.now();
+                const update = Object.assign({}, data);
+                if (data.distance < 0 || data.speed === 0) {
+                    update.distance = 0;
+                    update.speed = 0;
                 }
-                if (this.state === 'ininitalized' && data.speed > 0) {
-                    this.start();
+                this.current.deviceData = Object.assign(Object.assign({}, this.current.deviceData), update);
+                if (this.state !== 'active') {
+                    if (this.state === 'paused' && data.speed > 0 && this.current.isAutoResume) {
+                        this.resume('system');
+                        return;
+                    }
+                    if (this.state === 'ininitalized' && data.speed > 0) {
+                        this.start();
+                        return;
+                    }
+                    this.current.deviceData.speed = 0;
                     return;
                 }
-                this.current.deviceData.speed = 0;
-                return;
+            }
+            catch (err) {
+                this.logError(err, 'onDeviceData');
             }
         }
         onDeviceHealthUpdate(udid, status, capabilities) {
-            capabilities.forEach(capability => {
-                this.current.dataState[capability.toLowerCase()] = status;
-            });
+            if (!this.current)
+                return;
+            try {
+                capabilities.forEach(capability => {
+                    this.current.dataState[capability.toLowerCase()] = status;
+                });
+            }
+            catch (err) {
+                this.logError(err, 'onDeviceHealthUpdate');
+            }
         }
         emit(eventName, ...args) {
             if (!this.observer)
@@ -488,28 +502,33 @@ let ActivityRideService = (() => {
         }
         update() {
             var _a, _b;
-            const prev = Math.floor(this.activity.time);
-            this.updateActivityState();
-            const time = Math.floor(this.activity.time);
-            if (time !== prev && this.state === 'active') {
-                const distance = this.current.routeDistance - ((_b = (_a = this.prevEmit) === null || _a === void 0 ? void 0 : _a.routeDistance) !== null && _b !== void 0 ? _b : 0);
-                const data = {
-                    time: this.activity.time,
-                    speed: this.current.deviceData.speed,
-                    routeDistance: this.current.routeDistance,
-                    distance
-                };
-                this.emit('data', data);
-                this.prevEmit = data;
-                const logRecord = this.createLogRecord();
-                if (logRecord) {
-                    this.activity.logs.push(logRecord);
-                    this.statsCalculator.add(logRecord);
+            try {
+                const prev = Math.floor(this.activity.time);
+                this.updateActivityState();
+                const time = Math.floor(this.activity.time);
+                if (time !== prev && this.state === 'active') {
+                    const distance = this.current.routeDistance - ((_b = (_a = this.prevEmit) === null || _a === void 0 ? void 0 : _a.routeDistance) !== null && _b !== void 0 ? _b : 0);
+                    const data = {
+                        time: this.activity.time,
+                        speed: this.current.deviceData.speed,
+                        routeDistance: this.current.routeDistance,
+                        distance
+                    };
+                    this.emit('data', data);
+                    this.prevEmit = data;
+                    const logRecord = this.createLogRecord();
+                    if (logRecord) {
+                        this.activity.logs.push(logRecord);
+                        this.statsCalculator.add(logRecord);
+                    }
+                    this.activity.distance = this.current.routeDistance - this.activity.startPos;
+                    this.activity.totalElevation = this.current.elevationGain;
+                    this.logActivityUpdateMessage();
+                    this.updateRepo();
                 }
-                this.activity.distance = this.current.routeDistance - this.activity.startPos;
-                this.activity.totalElevation = this.current.elevationGain;
-                this.logActivityUpdateMessage();
-                this.updateRepo();
+            }
+            catch (err) {
+                this.logError(err, 'update');
             }
         }
         createFreeRide(settings) {

package/lib/activities/upload/velohero.d.ts

@@ -1,15 +1,17 @@
 import { IncyclistService } from "../../base/service";
 import { ActivityDetails } from "../base";
 import { VeloHeroAuth } from "./types";
-import VeloHeroApi from "../../apps/base/api/velohero/api";
+import { VeloHeroApi } from "../../apps/base/api";
 export declare class VeloHeroUpload extends IncyclistService {
     protected isInitialized: any;
     protected username: any;
     protected password: any;
     protected api: VeloHeroApi;
+    protected _isConnecting: any;
     constructor();
     init(): boolean;
     isConnected(): boolean;
+    isConnecting(): any;
     login(username: string, password: string): Promise<boolean>;
     disconnect(): void;
     upload(activity: ActivityDetails, format?: string): Promise<boolean>;

package/lib/activities/upload/velohero.js

@@ -55,8 +55,8 @@ const service_1 = require("../../base/service");
 const types_1 = require("../../base/types");
 const settings_1 = require("../../settings");
 const crypto_1 = __importDefault(require("crypto"));
-const api_1 = __importDefault(require("../../apps/base/api/velohero/api"));
 const valid_1 = require("../../utils/valid");
+const api_1 = require("../../apps/base/api");
 let VeloHeroUpload = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
@@ -92,11 +92,17 @@ let VeloHeroUpload = (() => {
                 this.logger.logEvent({ message: 'error', error: err.message, fn: 'init', stack: err.stack });
                 this.isInitialized = false;
             }
+            this.on('login-start', () => { this._isConnecting = true; });
+            this.on('login-success', () => { this._isConnecting = false; });
+            this.on('login-failure', () => { this._isConnecting = false; });
             return this.isInitialized;
         }
         isConnected() {
             return ((0, valid_1.valid)(this.username) && (0, valid_1.valid)(this.password));
         }
+        isConnecting() {
+            return this._isConnecting;
+        }
         login(username, password) {
             return __awaiter(this, void 0, void 0, function* () {
                 this.logger.logEvent({ message: 'VeloHero Login' });
@@ -114,7 +120,7 @@ let VeloHeroUpload = (() => {
                 catch (err) {
                     this.logger.logEvent({ message: 'VeloHero Login failed', error: err.message });
                     this.emit('login-failure');
-                    return false;
+                    throw err;
                 }
             });
         }
@@ -207,7 +213,7 @@ let VeloHeroUpload = (() => {
         }
         getApi() {
             if (!this.api)
-                this.api = new api_1.default();
+                this.api = new api_1.VeloHeroApi();
             return this.api;
         }
     };

package/lib/apps/base/api/base.d.ts

@@ -0,0 +1,12 @@
+import { AxiosInstance } from "axios";
+import { Form } from "../../../api/form";
+export declare class AppApiBase {
+    protected api: AxiosInstance;
+    protected getBaseUrl(): string;
+    protected get(url: string, config?: object): Promise<import("axios").AxiosResponse<any, any>>;
+    protected postForm(form: Form): Promise<any>;
+    protected createForm(url: string, uploadInfo: object): Promise<Form>;
+    protected getApi(): AxiosInstance;
+    protected getUserSettings(): import("../../../settings").UserSettingsService;
+    protected getFormBinding(): import("../../../api/form").IFormPostBinding;
+}

package/lib/apps/base/api/base.js

@@ -0,0 +1,56 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppApiBase = void 0;
+const api_1 = require("../../../api");
+const settings_1 = require("../../../settings");
+class AppApiBase {
+    getBaseUrl() {
+        throw new Error('not implemented');
+    }
+    get(url, config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const props = config !== null && config !== void 0 ? config : {};
+            const request = Object.assign({ method: 'get', url: this.getBaseUrl() + url, validateStatus: (status) => {
+                    return (status >= 200 && status < 300) || status === 403;
+                } }, props);
+            return yield this.getApi().request(request);
+        });
+    }
+    postForm(form) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const fp = this.getFormBinding();
+            return yield fp.post(form);
+        });
+    }
+    createForm(url, uploadInfo) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const fp = this.getFormBinding();
+            const form = yield fp.createForm({ uri: this.getBaseUrl() + url }, uploadInfo);
+            return form;
+        });
+    }
+    getApi() {
+        if (!this.api) {
+            this.api = api_1.RestApiClient.getClient();
+            return this.api;
+        }
+        return this.api;
+    }
+    getUserSettings() {
+        return (0, settings_1.useUserSettings)();
+    }
+    getFormBinding() {
+        var _a;
+        return (_a = (0, api_1.getBindings)()) === null || _a === void 0 ? void 0 : _a.form;
+    }
+}
+exports.AppApiBase = AppApiBase;

package/lib/apps/base/api/index.d.ts

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

package/lib/apps/base/api/index.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("./velohero"), exports);

package/lib/apps/base/api/strava/api.d.ts

@@ -0,0 +1,4 @@
+import { AppApiBase } from "../base";
+export declare class StravaApi extends AppApiBase {
+    protected getBaseUrl(): any;
+}

package/lib/apps/base/api/strava/api.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StravaApi = void 0;
+const base_1 = require("../base");
+const BASE_URL = 'https://www.strava.com/api/v3';
+class StravaApi extends base_1.AppApiBase {
+    getBaseUrl() {
+        try {
+            return this.getUserSettings().get('STRAVA_API', BASE_URL);
+        }
+        catch (_a) {
+            return BASE_URL;
+        }
+    }
+}
+exports.StravaApi = StravaApi;

package/lib/apps/base/api/strava/index.d.ts

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

package/lib/apps/base/api/strava/index.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("./api"), exports);

package/lib/apps/base/api/velohero/api.d.ts

@@ -1,8 +1,6 @@
-import { AxiosInstance } from 'axios';
 import { VeloHeroAccountType, VeloHeroLoginReponse, VeloHeroUploadProps } from './types';
-import { Form } from '../../../../api/form';
-export default class VeloHeroApi {
-    protected api: AxiosInstance;
+import { AppApiBase } from '../base';
+export declare class VeloHeroApi extends AppApiBase {
     protected username: string;
     protected password: string;
     protected loginResponse: VeloHeroLoginReponse;
@@ -11,10 +9,4 @@ export default class VeloHeroApi {
     isAuthenticated(): boolean;
     upload(fileName: string, props?: VeloHeroUploadProps): Promise<boolean>;
     protected getBaseUrl(): any;
-    protected get(url: string, config?: object): Promise<import("axios").AxiosResponse<any, any>>;
-    protected postForm(form: Form): Promise<any>;
-    protected createForm(url: string, uploadInfo: object): Promise<Form>;
-    protected getApi(): AxiosInstance;
-    protected getUserSettings(): import("../../../../settings").UserSettingsService;
-    protected getFormBinding(): import("../../../../api/form").IFormPostBinding;
 }

package/lib/apps/base/api/velohero/api.js

@@ -9,11 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const api_1 = require("../../../../api");
-const settings_1 = require("../../../../settings");
+exports.VeloHeroApi = void 0;
 const valid_1 = require("../../../../utils/valid");
+const base_1 = require("../base");
 const BASE_URL = 'https://app.velohero.com';
-class VeloHeroApi {
+class VeloHeroApi extends base_1.AppApiBase {
     login(username, password) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -38,6 +38,8 @@ class VeloHeroApi {
                 }
             }
             catch (err) {
+                if (err.message === 'invalid credentials')
+                    throw err;
                 let error = `Internal error: ${err.message}`;
                 if (err.response) {
                     const { response } = err;
@@ -70,65 +72,23 @@ class VeloHeroApi {
                 pass: password,
                 view: 'json'
             };
-            try {
-                const form = yield this.createForm('/upload/file', uploadInfo);
-                const response = yield this.postForm(form);
-                if (response.data && !response.error) {
-                    return true;
-                }
-                else {
-                    throw new Error(((_e = (_d = (_c = response.error) === null || _c === void 0 ? void 0 : _c.response) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.error) || response.error.message || response.error || `HTTP error ${response.status}`);
-                }
+            const form = yield this.createForm('/upload/file', uploadInfo);
+            const response = yield this.postForm(form);
+            if (response.data && !response.error) {
+                return true;
             }
-            catch (err) {
-                console.log(err);
-                throw err;
+            else {
+                throw new Error(((_e = (_d = (_c = response.error) === null || _c === void 0 ? void 0 : _c.response) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.error) || response.error.message || response.error || `HTTP error ${response.status}`);
             }
         });
     }
     getBaseUrl() {
         try {
-            return (0, settings_1.useUserSettings)().get('VELOHERO_API', BASE_URL);
+            return this.getUserSettings().get('VELOHERO_API', BASE_URL);
         }
         catch (_a) {
             return BASE_URL;
         }
     }
-    get(url, config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const props = config !== null && config !== void 0 ? config : {};
-            const request = Object.assign({ method: 'get', url: this.getBaseUrl() + url, validateStatus: (status) => {
-                    return (status >= 200 && status < 300) || status === 403;
-                } }, props);
-            return yield this.getApi().request(request);
-        });
-    }
-    postForm(form) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const fp = this.getFormBinding();
-            return yield fp.post(form);
-        });
-    }
-    createForm(url, uploadInfo) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const fp = this.getFormBinding();
-            const form = yield fp.createForm({ uri: this.getBaseUrl() + url }, uploadInfo);
-            return form;
-        });
-    }
-    getApi() {
-        if (!this.api) {
-            this.api = api_1.RestApiClient.getClient();
-            return this.api;
-        }
-        return this.api;
-    }
-    getUserSettings() {
-        return (0, settings_1.useUserSettings)();
-    }
-    getFormBinding() {
-        var _a;
-        return (_a = (0, api_1.getBindings)()) === null || _a === void 0 ? void 0 : _a.form;
-    }
 }
-exports.default = VeloHeroApi;
+exports.VeloHeroApi = VeloHeroApi;

package/lib/apps/base/api/velohero/index.d.ts

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

package/lib/apps/base/api/velohero/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("./api"), exports);
+__exportStar(require("./types"), exports);

package/lib/routes/base/utils/route.js

@@ -257,7 +257,7 @@ const getNextPosition = (route, props) => {
     const targetRouteDistance = props.routeDistance !== undefined ? props.routeDistance : getLapTotalDistance(route, props.prev) + distance;
     let pPrev = props.prev || Object.assign(Object.assign({}, points[0]), { lap: 1 });
     let point, p;
-    let lap = (0, valid_1.valid)(pPrev.lap) ? pPrev.lap : 1;
+    let lap = (0, valid_1.valid)(pPrev === null || pPrev === void 0 ? void 0 : pPrev.lap) ? pPrev.lap : 1;
     let cnt = ((_a = props.prev) === null || _a === void 0 ? void 0 : _a.cnt) || 0;
     let targetRouteInLap;
     if ((0, exports.checkIsLoop)(route)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },