incyclist-services 1.7.74 → 1.7.76

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/services/overpass/overpass.js

@@ -46,10 +46,10 @@ const gd_eventlog_1 = require("gd-eventlog");
 const decorators_1 = require("../../base/decorators");
 const api_1 = require("../../api");
 const settings_1 = require("../../settings");
+const OVERPASS_URL_PRIMARY = 'https://overpass-api.de/api/interpreter';
 const OVERPASS_URL_ALT1 = 'https://overpass.kumi.systems/api/interpreter';
-const OVERPASS_URL_ALT2 = 'https://lz4.overpass-api.de/api/interpreter';
-const OVERPASS_URL_ALT3 = 'https://z.overpass-api.de/api/interpreter';
-exports.OVERPASS_URL_DEFAULT = OVERPASS_URL_ALT1;
+const OVERPASS_URL_ALT2 = 'https://overpass.openstreetmap.fr/api/interpreter';
+exports.OVERPASS_URL_DEFAULT = OVERPASS_URL_PRIMARY;
 let OverpassApi = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
@@ -77,7 +77,7 @@ let OverpassApi = (() => {
         logger;
         constructor(props) {
             super();
-            this.mirrors = [OVERPASS_URL_ALT1, OVERPASS_URL_ALT2, OVERPASS_URL_ALT3];
+            this.mirrors = [OVERPASS_URL_PRIMARY, OVERPASS_URL_ALT1, OVERPASS_URL_ALT2];
             this.url = props?.url ?? this.mirrors[0];
             this.logger = new gd_eventlog_1.EventLogger('Overpass');
             if (props?.url) {
@@ -108,6 +108,10 @@ let OverpassApi = (() => {
             };
         }
         async post(url, data, conf) {
+            const fetchBinding = this.getBindings()?.fetch;
+            if (fetchBinding) {
+                return await this.postViaFetchBinding(fetchBinding, url, data);
+            }
             try {
                 const https = require('https');
                 return await this.postViaNodeHttps(https, url, data);
@@ -121,6 +125,29 @@ 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);
+            try {
+                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: {}
+                };
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'fetch error', url, data, error: err.message });
+                throw err;
+            }
+        }
         async postViaNodeHttps(https, url, data) {
             return new Promise((resolve, reject) => {
                 const reqUrl = new URL(url);
@@ -262,7 +289,7 @@ let OverpassApi = (() => {
             throw lastError;
         }
         reset() {
-            this.mirrors = [OVERPASS_URL_ALT1, OVERPASS_URL_ALT2, OVERPASS_URL_ALT3];
+            this.mirrors = [OVERPASS_URL_PRIMARY, OVERPASS_URL_ALT1, OVERPASS_URL_ALT2];
             this.url = this.mirrors[0];
         }
         getAppVersion() {

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/services/overpass/overpass.js

@@ -40,10 +40,10 @@ import { EventLogger } from 'gd-eventlog';
 import { Injectable } from '../../base/decorators';
 import { getBindings } from '../../api';
 import { useUserSettings } from '../../settings';
+const OVERPASS_URL_PRIMARY = 'https://overpass-api.de/api/interpreter';
 const OVERPASS_URL_ALT1 = 'https://overpass.kumi.systems/api/interpreter';
-const OVERPASS_URL_ALT2 = 'https://lz4.overpass-api.de/api/interpreter';
-const OVERPASS_URL_ALT3 = 'https://z.overpass-api.de/api/interpreter';
-export const OVERPASS_URL_DEFAULT = OVERPASS_URL_ALT1;
+const OVERPASS_URL_ALT2 = 'https://overpass.openstreetmap.fr/api/interpreter';
+export const OVERPASS_URL_DEFAULT = OVERPASS_URL_PRIMARY;
 let OverpassApi = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
@@ -71,7 +71,7 @@ let OverpassApi = (() => {
         logger;
         constructor(props) {
             super();
-            this.mirrors = [OVERPASS_URL_ALT1, OVERPASS_URL_ALT2, OVERPASS_URL_ALT3];
+            this.mirrors = [OVERPASS_URL_PRIMARY, OVERPASS_URL_ALT1, OVERPASS_URL_ALT2];
             this.url = props?.url ?? this.mirrors[0];
             this.logger = new EventLogger('Overpass');
             if (props?.url) {
@@ -102,6 +102,10 @@ let OverpassApi = (() => {
             };
         }
         async post(url, data, conf) {
+            const fetchBinding = this.getBindings()?.fetch;
+            if (fetchBinding) {
+                return await this.postViaFetchBinding(fetchBinding, url, data);
+            }
             try {
                 const https = require('https');
                 return await this.postViaNodeHttps(https, url, data);
@@ -115,6 +119,29 @@ 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);
+            try {
+                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: {}
+                };
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'fetch error', url, data, error: err.message });
+                throw err;
+            }
+        }
         async postViaNodeHttps(https, url, data) {
             return new Promise((resolve, reject) => {
                 const reqUrl = new URL(url);
@@ -256,7 +283,7 @@ let OverpassApi = (() => {
             throw lastError;
         }
         reset() {
-            this.mirrors = [OVERPASS_URL_ALT1, OVERPASS_URL_ALT2, OVERPASS_URL_ALT3];
+            this.mirrors = [OVERPASS_URL_PRIMARY, OVERPASS_URL_ALT1, OVERPASS_URL_ALT2];
             this.url = this.mirrors[0];
         }
         getAppVersion() {

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/appstate/types.d.ts

@@ -1,4 +1,4 @@
-export type FeatureToggle = 'NEW_SEARCH_UI' | 'CONTROLLERS' | 'MOBILE_WORKOUTS';
+export type FeatureToggle = 'NEW_SEARCH_UI' | 'CONTROLLERS' | 'MOBILE_WORKOUTS' | 'WEBBLE_WINDOWS';
 export type Interfaces = 'ant' | 'ble' | 'serial' | 'wifi' | 'tcpip';
 export type BLEFeatures = {
     services: Array<string>;

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

@@ -2,7 +2,8 @@ import { AppApiBase } from '../../apps/base/api/base';
 import { EventLogger } from 'gd-eventlog';
 import { UserSettingsService } from '../../settings';
 import { AxiosResponse } from 'axios';
-export declare const OVERPASS_URL_DEFAULT = "https://overpass.kumi.systems/api/interpreter";
+import type { IFetchBinding } from '../../api/fetch/types';
+export declare const OVERPASS_URL_DEFAULT = "https://overpass-api.de/api/interpreter";
 export declare class OverpassApi extends AppApiBase {
     protected url: string;
     protected mirrors: 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,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.74",
+  "version": "1.7.76",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },