incyclist-services 1.8.0 → 1.8.2

package/lib/cjs/activities/ride/service.js

@@ -101,6 +101,7 @@ let ActivityRideService = (() => {
         isSaveDone;
         isDonateShown;
         isSummaryShown;
+        stopPromise;
         statsCalculator;
         durationCalculator;
         deviceDataHandler = this.onDeviceData.bind(this);
@@ -183,6 +184,17 @@ let ActivityRideService = (() => {
             }
         }
         async stop() {
+            if (this.stopPromise !== undefined)
+                return this.stopPromise;
+            this.stopPromise = this.doStop();
+            try {
+                await this.stopPromise;
+            }
+            finally {
+                delete this.stopPromise;
+            }
+        }
+        async doStop() {
             this.stopWorker();
             if (!this.observer || !this.activity)
                 return;
@@ -206,7 +218,9 @@ let ActivityRideService = (() => {
             delete this.observer;
         }
         async cleanup() {
-            if (this.state !== 'idle' && this.state !== 'completed')
+            if (this.stopPromise !== undefined)
+                await this.stopPromise;
+            else if (this.state !== 'idle' && this.state !== 'completed')
                 await this.stop();
             delete this.activity;
         }
@@ -1161,7 +1175,7 @@ let ActivityRideService = (() => {
         getTotalDistance() {
             try {
                 const route = this.current.route;
-                if (!route)
+                if (!route || !this.activity)
                     return 0;
                 const isLoop = (0, route_1.checkIsLoop)(route);
                 const totalRouteDistance = this.current?.endPos ?? route.distance ?? route.points?.at(-1)?.routeDistance;
@@ -1181,7 +1195,7 @@ let ActivityRideService = (() => {
         getTotalElevation() {
             try {
                 const route = this.current.route;
-                if (!route)
+                if (!route || !this.activity)
                     return 0;
                 const isLoop = (0, route_1.checkIsLoop)(route);
                 const totalRouteDistance = this.current?.endPos ?? route.distance ?? route.points?.at(-1)?.routeDistance;

package/lib/cjs/routes/base/api/index.js

@@ -141,15 +141,19 @@ let IncyclistRoutesApi = (() => {
             try {
                 const conf = {};
                 conf.validateStatus = (status) => {
-                    return (status >= 200 && status < 300) || status == 404;
+                    return (status >= 200 && status < 300) || status == 404 || status == 429;
                 };
                 const res = await this._get(url, conf);
                 if (res.status === 404)
                     return;
+                if (res.status === 429) {
+                    this.logger.logEvent({ message: 'getCountry hit rate limit', query });
+                    return;
+                }
                 return res.data.country?.toUpperCase();
             }
             catch (err) {
-                this.logError(err, 'reload');
+                this.logError(err, 'getCountry');
             }
         }
         async reload() {

package/lib/cjs/routes/download/service.js

@@ -87,6 +87,8 @@ let RouteDownloadService = (() => {
             const observer = new types_1.DownloadObserver(this._download(route));
             this.downloads.push({ route, observer });
             this.emit('download-started', route, observer);
+            observer.once('done', () => { this.removeDownload(route); });
+            observer.once('error', () => { this.removeDownload(route); });
             return observer;
         }
         stopDownload(route) {
@@ -97,6 +99,12 @@ let RouteDownloadService = (() => {
             info.observer.stop();
             this.downloads.splice(idx, 1);
         }
+        removeDownload(route) {
+            const idx = this.downloads.findIndex(d => d.route.description.id === route.description.id);
+            if (idx === -1)
+                return;
+            this.downloads.splice(idx, 1);
+        }
         async deleteIncompleteFile(route, videoDir) {
             const { file } = await this.getDownloadFileName(route, videoDir);
             if (file) {

package/lib/cjs/routes/index.js

@@ -20,3 +20,5 @@ __exportStar(require("./sync"), exports);
 __exportStar(require("./base/utils"), exports);
 __exportStar(require("./free-ride"), exports);
 __exportStar(require("./page"), exports);
+__exportStar(require("./library"), exports);
+__exportStar(require("./shapes"), exports);

package/lib/cjs/routes/library/errors.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toRouteImportError = exports.mapErrorToImportCode = exports.RouteImportError = void 0;
+class RouteImportError extends Error {
+    code;
+    missingExt;
+    constructor(message, code, props) {
+        super(message);
+        this.name = 'RouteImportError';
+        this.code = code;
+        this.missingExt = props?.missingExt;
+    }
+    toFailure() {
+        const failure = { code: this.code, reason: this.message };
+        if (this.missingExt)
+            failure.missingExt = this.missingExt;
+        return failure;
+    }
+}
+exports.RouteImportError = RouteImportError;
+const mapErrorToImportCode = (err, scope) => {
+    if (err instanceof RouteImportError)
+        return err.code;
+    switch (scope?.lastFailure?.reason) {
+        case 'offline':
+            return 'ICLOUD_OFFLINE';
+        case 'timeout':
+        case 'download-failed':
+            return 'ICLOUD_DOWNLOAD_FAILED';
+        case 'access-lost':
+            return 'READ_FAILED';
+    }
+    const message = errorText(err);
+    if (/AVI/i.test(message))
+        return 'AVI_NOT_SUPPORTED';
+    if (/no video|video file not found/i.test(message))
+        return 'NO_VIDEO';
+    if (/^Could not (open|read)/i.test(message))
+        return 'READ_FAILED';
+    if (/pars(e|ing)/i.test(message))
+        return 'PARSE_FAILED';
+    return 'UNSUPPORTED';
+};
+exports.mapErrorToImportCode = mapErrorToImportCode;
+const errorText = (err) => err?.message ?? (typeof err === 'string' ? err : '');
+const toRouteImportError = (err, scope, message) => {
+    if (err instanceof RouteImportError)
+        return err;
+    const text = message ?? errorText(err);
+    return new RouteImportError(text, (0, exports.mapErrorToImportCode)(err, scope));
+};
+exports.toRouteImportError = toRouteImportError;

package/lib/cjs/routes/library/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("./service"), exports);
+__exportStar(require("./errors"), exports);