incyclist-services 1.7.73 → 1.7.75

package/lib/cjs/api/bindings/index.js

@@ -65,6 +65,7 @@ let IncyclistBindings = (() => {
         logging;
         serial;
         crypto;
+        fetch;
         ant;
         ble;
         wifi;

package/lib/cjs/api/fetch/types.js

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

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

@@ -197,7 +197,7 @@ let RidePageService = (() => {
         onMenuClose() {
             try {
                 const state = this.getRideDisplay().getState();
-                if (state === 'Finished' || this.menuProps.finished) {
+                if (state === 'Finished' || this.menuProps?.finished) {
                     this.moveToPreviousPage();
                     this.closePage();
                     return;
@@ -206,7 +206,7 @@ let RidePageService = (() => {
                 this.updatePageDisplay();
             }
             catch (err) {
-                this.logError(err, 'onMenuOpen');
+                this.logError(err, 'onMenuClose');
             }
         }
         onPause() {

package/lib/cjs/routes/free-ride/service.js

@@ -158,6 +158,8 @@ let FreeRideService = (() => {
             if (!opts?.length && from != null) {
                 opts = this.addLastSegmentReverse(opts, from);
             }
+            if (!from)
+                return opts ?? [];
             opts = this.filterOptions(opts, from);
             opts = this.sortOptions(opts, from);
             return opts;

package/lib/cjs/services/overpass/overpass.js

@@ -108,6 +108,14 @@ let OverpassApi = (() => {
             };
         }
         async post(url, data, conf) {
+            const fetchBinding = this.getBindings()?.fetch;
+            if (fetchBinding) {
+                try {
+                    return await this.postViaFetchBinding(fetchBinding, url, data);
+                }
+                catch {
+                }
+            }
             try {
                 const https = require('https');
                 return await this.postViaNodeHttps(https, url, data);
@@ -121,6 +129,23 @@ let OverpassApi = (() => {
                 return await super.post(url, data, config);
             }
         }
+        async postViaFetchBinding(fetchBinding, url, data) {
+            const headers = this.getOverpassHeaders();
+            const body = typeof data === 'string' ? data : JSON.stringify(data);
+            const res = await fetchBinding.fetch(url, {
+                method: 'POST',
+                headers,
+                body,
+                referrerPolicy: 'unsafe-url'
+            });
+            return {
+                data: res.data,
+                status: res.status,
+                statusText: res.statusText,
+                headers: res.headers,
+                config: {}
+            };
+        }
         async postViaNodeHttps(https, url, data) {
             return new Promise((resolve, reject) => {
                 const reqUrl = new URL(url);
@@ -203,9 +228,17 @@ let OverpassApi = (() => {
             const promises = [];
             this.mirrors.forEach(mirror => {
                 promises.push(this.post(mirror, query)
-                    .then((res) => res?.data)
+                    .then((res) => {
+                    if (res?.status >= 400) {
+                        const err = Object.assign(new Error(`HTTP ${res.status}`), { response: res });
+                        errors.push(this.extractErrorInfo(err, mirror));
+                        throw err;
+                    }
+                    return res?.data;
+                })
                     .catch(err => {
-                    errors.push(this.extractErrorInfo(err, mirror));
+                    if (!errors.find(e => e.mirror === mirror))
+                        errors.push(this.extractErrorInfo(err, mirror));
                     throw err;
                 }));
             });
@@ -237,6 +270,9 @@ let OverpassApi = (() => {
                 }
                 try {
                     const res = await this.post(mirror, query);
+                    if (res?.status >= 400) {
+                        throw Object.assign(new Error(`HTTP ${res.status}`), { response: res });
+                    }
                     return res?.data;
                 }
                 catch (err) {

package/lib/esm/api/bindings/index.js

@@ -62,6 +62,7 @@ let IncyclistBindings = (() => {
         logging;
         serial;
         crypto;
+        fetch;
         ant;
         ble;
         wifi;

package/lib/esm/api/fetch/types.js

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

package/lib/esm/ride/page/service.js

@@ -194,7 +194,7 @@ let RidePageService = (() => {
         onMenuClose() {
             try {
                 const state = this.getRideDisplay().getState();
-                if (state === 'Finished' || this.menuProps.finished) {
+                if (state === 'Finished' || this.menuProps?.finished) {
                     this.moveToPreviousPage();
                     this.closePage();
                     return;
@@ -203,7 +203,7 @@ let RidePageService = (() => {
                 this.updatePageDisplay();
             }
             catch (err) {
-                this.logError(err, 'onMenuOpen');
+                this.logError(err, 'onMenuClose');
             }
         }
         onPause() {

package/lib/esm/routes/free-ride/service.js

@@ -152,6 +152,8 @@ let FreeRideService = (() => {
             if (!opts?.length && from != null) {
                 opts = this.addLastSegmentReverse(opts, from);
             }
+            if (!from)
+                return opts ?? [];
             opts = this.filterOptions(opts, from);
             opts = this.sortOptions(opts, from);
             return opts;

package/lib/esm/services/overpass/overpass.js

@@ -102,6 +102,14 @@ let OverpassApi = (() => {
             };
         }
         async post(url, data, conf) {
+            const fetchBinding = this.getBindings()?.fetch;
+            if (fetchBinding) {
+                try {
+                    return await this.postViaFetchBinding(fetchBinding, url, data);
+                }
+                catch {
+                }
+            }
             try {
                 const https = require('https');
                 return await this.postViaNodeHttps(https, url, data);
@@ -115,6 +123,23 @@ let OverpassApi = (() => {
                 return await super.post(url, data, config);
             }
         }
+        async postViaFetchBinding(fetchBinding, url, data) {
+            const headers = this.getOverpassHeaders();
+            const body = typeof data === 'string' ? data : JSON.stringify(data);
+            const res = await fetchBinding.fetch(url, {
+                method: 'POST',
+                headers,
+                body,
+                referrerPolicy: 'unsafe-url'
+            });
+            return {
+                data: res.data,
+                status: res.status,
+                statusText: res.statusText,
+                headers: res.headers,
+                config: {}
+            };
+        }
         async postViaNodeHttps(https, url, data) {
             return new Promise((resolve, reject) => {
                 const reqUrl = new URL(url);
@@ -197,9 +222,17 @@ let OverpassApi = (() => {
             const promises = [];
             this.mirrors.forEach(mirror => {
                 promises.push(this.post(mirror, query)
-                    .then((res) => res?.data)
+                    .then((res) => {
+                    if (res?.status >= 400) {
+                        const err = Object.assign(new Error(`HTTP ${res.status}`), { response: res });
+                        errors.push(this.extractErrorInfo(err, mirror));
+                        throw err;
+                    }
+                    return res?.data;
+                })
                     .catch(err => {
-                    errors.push(this.extractErrorInfo(err, mirror));
+                    if (!errors.find(e => e.mirror === mirror))
+                        errors.push(this.extractErrorInfo(err, mirror));
                     throw err;
                 }));
             });
@@ -231,6 +264,9 @@ let OverpassApi = (() => {
                 }
                 try {
                     const res = await this.post(mirror, query);
+                    if (res?.status >= 400) {
+                        throw Object.assign(new Error(`HTTP ${res.status}`), { response: res });
+                    }
                     return res?.data;
                 }
                 catch (err) {

package/lib/types/api/bindings/index.d.ts

@@ -11,6 +11,7 @@ import type { IVideoProcessor } from '../video';
 import type { ISecretBinding } from '../secret';
 import type { ISerialBinding } from '../serial/types';
 import type { ICryptoBinding } from '../crypto/types';
+import type { IFetchBinding } from '../fetch/types';
 export interface IUserSettingsBinding {
     getAll(): Promise<any>;
     set(key: string, value: any): Promise<boolean>;
@@ -33,6 +34,7 @@ export declare class IncyclistBindings {
     logging: ILogBinding;
     serial: ISerialBinding;
     crypto: ICryptoBinding;
+    fetch?: IFetchBinding;
     ant: any;
     ble: any;
     wifi: any;

package/lib/types/api/fetch/types.d.ts

@@ -0,0 +1,16 @@
+export interface IFetchRequestInit {
+    method?: string;
+    headers?: Record<string, string>;
+    body?: string;
+    referrerPolicy?: 'no-referrer' | 'no-referrer-when-downgrade' | 'origin' | 'origin-when-cross-origin' | 'same-origin' | 'strict-origin' | 'strict-origin-when-cross-origin' | 'unsafe-url';
+}
+export interface IFetchResponse {
+    ok: boolean;
+    status: number;
+    statusText: string;
+    headers: Record<string, string>;
+    data: string;
+}
+export interface IFetchBinding {
+    fetch(url: string, init?: IFetchRequestInit): Promise<IFetchResponse>;
+}

package/lib/types/api/types.d.ts

@@ -4,4 +4,5 @@ export type * from './repository/types';
 export type * from './path';
 export type * from './video';
 export type * from './crypto/types';
+export type * from './fetch/types';
 export type * from './bindings/types';

package/lib/types/services/overpass/overpass.d.ts

@@ -2,6 +2,7 @@ import { AppApiBase } from '../../apps/base/api/base';
 import { EventLogger } from 'gd-eventlog';
 import { UserSettingsService } from '../../settings';
 import { AxiosResponse } from 'axios';
+import type { IFetchBinding } from '../../api/fetch/types';
 export declare const OVERPASS_URL_DEFAULT = "https://overpass.kumi.systems/api/interpreter";
 export declare class OverpassApi extends AppApiBase {
     protected url: string;
@@ -15,6 +16,7 @@ export declare class OverpassApi extends AppApiBase {
         Referer: string;
     };
     protected post(url: string, data?: object | string, conf?: object): Promise<AxiosResponse>;
+    protected postViaFetchBinding(fetchBinding: IFetchBinding, url: string, data?: object | string): Promise<AxiosResponse>;
     protected postViaNodeHttps(https: any, url: string, data?: object | string): Promise<any>;
     query(queryOL: string, timeout?: number): Promise<JSON | string | undefined>;
     singleQuery(queryOL: string): Promise<JSON | string>;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.73",
+  "version": "1.7.75",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },
   "dependencies": {
     "@garmin/fitsdk": "^21.200.0",
     "axios": "^1.15.2",
-    "incyclist-devices": "^3.0.22",
+    "incyclist-devices": "^3.0.23",
     "promise.any": "^2.0.6",
     "semver": "^7.7.4",
     "tcx-builder": "^1.1.1",