incyclist-services 1.7.66 → 1.7.68

package/lib/cjs/activities/base/utils/activity.js

@@ -181,7 +181,7 @@ let Activity = (() => {
             try {
                 const converter = this.getActivityConverter();
                 const data = await converter.convert(this.details, format);
-                const fileName = this.details.fileName.replace('.json', `.${format}`);
+                const fileName = await this.getExportFileName(format);
                 await fs.writeFile(fileName, Buffer.from(data));
                 this.details[`${format}FileName`] = fileName;
                 await this.save(true);
@@ -197,6 +197,18 @@ let Activity = (() => {
             }
             return success;
         }
+        async getExportFileName(format) {
+            let fileName = this.details.fileName.replace('json', format);
+            if (fileName.startsWith('mmkv:/')) {
+                const fs = this.getBindings().fs;
+                const appDir = this.getBindings().appInfo.getAppDir();
+                const activitiesDir = this.getBindings().path.join(appDir, 'activities');
+                await fs.ensureDir(activitiesDir);
+                const baseName = fileName.split('/').pop();
+                fileName = this.getBindings().path.join(activitiesDir, baseName);
+            }
+            return fileName;
+        }
         async upload(connectedApp, observer) {
             let success = false;
             let error;

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

@@ -1,4 +1,11 @@
 "use strict";
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
 var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
     function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
     var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
@@ -26,13 +33,6 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
-var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i = 0; i < initializers.length; i++) {
-        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
-    }
-    return useValue ? value : void 0;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -43,6 +43,9 @@ const types_1 = require("../../base/types");
 const sleep_1 = require("../../utils/sleep");
 const base_1 = require("../../apps/base/api/base");
 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_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';
@@ -53,16 +56,23 @@ let OverpassApi = (() => {
     let _classExtraInitializers = [];
     let _classThis;
     let _classSuper = base_1.AppApiBase;
+    let _instanceExtraInitializers = [];
+    let _getUserSettings_decorators;
+    let _getBindings_decorators;
     var OverpassApi = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getUserSettings_decorators = [decorators_1.Injectable];
+            _getBindings_decorators = [decorators_1.Injectable];
+            __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getBindings_decorators, { kind: "method", name: "getBindings", static: false, private: false, access: { has: obj => "getBindings" in obj, get: obj => obj.getBindings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             OverpassApi = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
-        url;
+        url = __runInitializers(this, _instanceExtraInitializers);
         mirrors = [];
         logger;
         constructor(props) {
@@ -76,6 +86,70 @@ let OverpassApi = (() => {
                 }
             }
         }
+        getOverpassHeaders() {
+            const version = this.getAppVersion();
+            const userId = this.getUserId();
+            let userAgent = `Incyclist/${version}`;
+            if (userId) {
+                try {
+                    const crypto = this.getBindings()?.crypto;
+                    const hashedId = crypto ? crypto.createHash('sha256').update('OAPI:' + userId).digest('hex').substring(0, 8) : undefined;
+                    if (hashedId) {
+                        userAgent += ` (${hashedId})`;
+                    }
+                }
+                catch (err) {
+                    this.logger.logEvent({ message: 'failed to hash userId', error: err.message });
+                }
+            }
+            return {
+                'User-Agent': userAgent,
+                'Referer': 'https://incyclist.com'
+            };
+        }
+        async post(url, data, conf) {
+            try {
+                const https = require('https');
+                return await this.postViaNodeHttps(https, url, data);
+            }
+            catch {
+                const cfg = conf ?? {};
+                const config = {
+                    ...cfg,
+                    headers: this.getOverpassHeaders()
+                };
+                return await super.post(url, data, config);
+            }
+        }
+        async postViaNodeHttps(https, url, data) {
+            return new Promise((resolve, reject) => {
+                const reqUrl = new URL(url);
+                const headers = this.getOverpassHeaders();
+                const queryData = typeof data === 'string' ? data : JSON.stringify(data);
+                const options = {
+                    method: 'POST',
+                    headers: {
+                        ...headers,
+                        'Content-Length': Buffer.byteLength(queryData)
+                    }
+                };
+                const req = https.request(reqUrl, options, (res) => {
+                    let body = '';
+                    res.on('data', (chunk) => body += chunk);
+                    res.on('end', () => {
+                        resolve({
+                            data: body,
+                            status: res.statusCode,
+                            statusText: res.statusMessage,
+                            headers: res.headers
+                        });
+                    });
+                });
+                req.on('error', reject);
+                req.write(queryData);
+                req.end();
+            });
+        }
         async query(queryOL, timeout) {
             const ts = Date.now();
             this.logger.logEvent({ message: 'query', queryOL, queryId: ts, timeout });
@@ -96,24 +170,102 @@ let OverpassApi = (() => {
         getBaseUrl() {
             return '';
         }
+        extractErrorInfo(err, mirror) {
+            return {
+                mirror,
+                status: err?.response?.status,
+                statusText: err?.response?.statusText,
+                error: err?.message ?? 'overpass query failed'
+            };
+        }
+        logUnexpectedErrors(fn, errors) {
+            const unexpectedErrors = errors.filter(e => {
+                const status = e.status;
+                if (!status || status === 408 || status === 504)
+                    return false;
+                return status >= 406 && status < 500;
+            });
+            if (unexpectedErrors.length > 0 && unexpectedErrors.length === errors.length) {
+                unexpectedErrors.forEach(err => {
+                    this.logger.logEvent({
+                        message: 'error',
+                        fn,
+                        mirror: err.mirror,
+                        status: err.status,
+                        statusText: err.statusText,
+                        error: err.error ?? 'all mirrors failed with 4xx error'
+                    });
+                });
+            }
+        }
         async bulkQuery(query, timeout) {
+            const errors = [];
             const promises = [];
             this.mirrors.forEach(mirror => {
-                promises.push(this.post(mirror, query).then((res) => res?.data));
+                promises.push(this.post(mirror, query)
+                    .then((res) => res?.data)
+                    .catch(err => {
+                    errors.push(this.extractErrorInfo(err, mirror));
+                    throw err;
+                }));
             });
             if (timeout !== undefined && timeout !== null) {
                 promises.push((0, sleep_1.sleep)(timeout).then(() => 'timeout'));
             }
-            const res = await (0, promise_any_1.default)(promises);
-            if (res === 'timeout') {
-                return undefined;
+            try {
+                const res = await (0, promise_any_1.default)(promises);
+                if (res === 'timeout') {
+                    return undefined;
+                }
+                return res;
+            }
+            catch (err) {
+                this.logUnexpectedErrors('bulkQuery', errors);
+                throw err;
             }
-            return res;
+        }
+        async sequentialQuery(query, timeout) {
+            const startTime = Date.now();
+            const errors = [];
+            let lastError;
+            for (const mirror of this.mirrors) {
+                if (timeout !== undefined && timeout !== null) {
+                    const elapsed = Date.now() - startTime;
+                    if (elapsed >= timeout) {
+                        return undefined;
+                    }
+                }
+                try {
+                    const res = await this.post(mirror, query);
+                    return res?.data;
+                }
+                catch (err) {
+                    lastError = err;
+                    errors.push(this.extractErrorInfo(err, mirror));
+                    if (mirror !== this.mirrors[this.mirrors.length - 1]) {
+                        await (0, sleep_1.sleep)(100);
+                    }
+                }
+            }
+            this.logUnexpectedErrors('sequentialQuery', errors);
+            throw lastError;
         }
         reset() {
             this.mirrors = [OVERPASS_URL_ALT1, OVERPASS_URL_ALT2, OVERPASS_URL_ALT3];
             this.url = this.mirrors[0];
         }
+        getAppVersion() {
+            return this.getBindings()?.appInfo?.getAppVersion() ?? '';
+        }
+        getUserId() {
+            return this.getUserSettings().getValue('uuid', '');
+        }
+        getUserSettings() {
+            return (0, settings_1.useUserSettings)();
+        }
+        getBindings() {
+            return (0, api_1.getBindings)();
+        }
     };
     return OverpassApi = _classThis;
 })();

package/lib/cjs/{src/settings/display/support → settings/display/ride}/service.js

@@ -34,19 +34,13 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     done = true;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSupportSettingsDisplay = exports.SupportSettingsDisplayService = void 0;
+exports.useRideSettingsDisplay = exports.RideSettingsDisplayService = void 0;
 const api_1 = require("../../../api");
 const decorators_1 = require("../../../base/decorators");
 const service_1 = require("../../../base/service");
 const types_1 = require("../../../base/types");
 const service_2 = require("../../service");
-const DEFAULT_PRIVACY_URL = 'https://incyclist.com/privacy';
-const DEFAULT_SLACK_URL = 'https://join.slack.com/t/incyclist/shared_invite/zt-119wcvtjn-uiZ_Pw6gh5WLc0zT8jkfTg';
-const DEFAULT_STRAVA_URL = 'https://www.strava.com/clubs/1029407';
-const DEFAULT_EMAIL = 'support@incyclist.com';
-const DEFAULT_GITHUB_URL = 'https://github.com/incyclist';
-const DEFAULT_DONATION_URL = 'https://www.paypal.com/paypalme/incyclist';
-let SupportSettingsDisplayService = (() => {
+let RideSettingsDisplayService = (() => {
     let _classDecorators = [decorators_1.Singleton];
     let _classDescriptor;
     let _classExtraInitializers = [];
@@ -55,7 +49,7 @@ let SupportSettingsDisplayService = (() => {
     let _instanceExtraInitializers = [];
     let _getUserSettings_decorators;
     let _getBindings_decorators;
-    var SupportSettingsDisplayService = class extends _classSuper {
+    var RideSettingsDisplayService = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
@@ -64,14 +58,13 @@ let SupportSettingsDisplayService = (() => {
             __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getBindings_decorators, { kind: "method", name: "getBindings", static: false, private: false, access: { has: obj => "getBindings" in obj, get: obj => obj.getBindings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-            SupportSettingsDisplayService = _classThis = _classDescriptor.value;
+            RideSettingsDisplayService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
-        initialized = __runInitializers(this, _instanceExtraInitializers);
-        observer;
+        observer = __runInitializers(this, _instanceExtraInitializers);
         constructor() {
-            super('SupportSettings');
+            super('GearSettings');
         }
         open() {
             if (this.observer)
@@ -85,21 +78,45 @@ let SupportSettingsDisplayService = (() => {
         }
         getDisplayProps() {
             return {
-                uuid: this.getUserSettings().get('uuid', null),
-                appVersion: this.getAppInfo().getAppVersion(),
-                uiVersion: this.getAppInfo().getUIVersion(),
-                privacyUrl: process.env.PRIVACY_URL ?? DEFAULT_PRIVACY_URL,
-                supportUrls: [
-                    { label: 'Slack', text: 'Incyclist Slack Workspace', url: process.env.PRIVACY_URL ?? DEFAULT_SLACK_URL },
-                    { label: 'Strava', text: 'Incyclist Strava Club', url: process.env.PRIVACY_URL ?? DEFAULT_STRAVA_URL },
-                    { label: 'Email', text: process.env.SUPPORT_EMAIL ?? DEFAULT_EMAIL, url: `mailto:${process.env.SUPPORT_EMAIL ?? DEFAULT_EMAIL}` },
-                ],
-                gitHubUrl: process.env.GITHUB_URL ?? DEFAULT_GITHUB_URL,
-                donationUrl: process.env.DONATION_URL ?? DEFAULT_DONATION_URL
+                rideView: this.getRideView(),
+                rideViewOptions: this.getRideViewOptions()
             };
         }
-        getAppInfo() {
-            return this.getBindings().appInfo;
+        setRideView(rideView) {
+            try {
+                this.getUserSettings().get('preferences.rideView', rideView);
+            }
+            catch (err) {
+                this.logError(err, 'setRideView');
+            }
+        }
+        emitChanged() {
+            if (this.observer)
+                this.observer.emit('changed', this.getDisplayProps());
+        }
+        getRideView() {
+            if (this.isMobile() && !this.isAndroid())
+                return 'map';
+            const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
+            return rideView;
+        }
+        getRideViewOptions() {
+            const map = new Map();
+            if (!this.isIOS())
+                map.set('sv', 'Street View');
+            map.set('map', 'Map');
+            if (!this.isMobile())
+                map.set('sat', 'Satellite View');
+            return map;
+        }
+        isMobile() {
+            return this.getBindings().appInfo?.getChannel() === 'mobile';
+        }
+        isAndroid() {
+            return this.getBindings().appInfo?.getOS()?.platform === 'android';
+        }
+        isIOS() {
+            return this.getBindings().appInfo?.getOS()?.platform === 'darwin';
         }
         getUserSettings() {
             return (0, service_2.useUserSettings)();
@@ -108,8 +125,8 @@ let SupportSettingsDisplayService = (() => {
             return (0, api_1.getBindings)();
         }
     };
-    return SupportSettingsDisplayService = _classThis;
+    return RideSettingsDisplayService = _classThis;
 })();
-exports.SupportSettingsDisplayService = SupportSettingsDisplayService;
-const useSupportSettingsDisplay = () => new SupportSettingsDisplayService();
-exports.useSupportSettingsDisplay = useSupportSettingsDisplay;
+exports.RideSettingsDisplayService = RideSettingsDisplayService;
+const useRideSettingsDisplay = () => new RideSettingsDisplayService();
+exports.useRideSettingsDisplay = useRideSettingsDisplay;

package/lib/cjs/workouts/base/parsers/zwo/zwo.js

@@ -224,7 +224,7 @@ class ZwoParser {
                 }
                 try {
                     this.context = {};
-                    const zwoSteps = result.workout_file.workout[0].$$ ?? [];
+                    const zwoSteps = result.workout_file.workout?.[0].$$ ?? [];
                     const ftpOverride = result.workout_file.ftpOverride?.[0] ?? -1;
                     if (ftpOverride !== -1) {
                         this.context.ftpOverride = Number(ftpOverride);
@@ -244,7 +244,7 @@ class ZwoParser {
                     resolve(workout);
                 }
                 catch (err) {
-                    this.logger.logEvent({ message: 'error', fn: 'parse()', error: err.message, tag, stack: err.stack });
+                    this.logger.logEvent({ message: 'error', fn: 'parse()', error: err.message, tag, stack: err.stack, zwo: data });
                     reject(new Error(`parsing error: ${err.message}`));
                 }
             });

package/lib/esm/activities/base/utils/activity.js

@@ -178,7 +178,7 @@ let Activity = (() => {
             try {
                 const converter = this.getActivityConverter();
                 const data = await converter.convert(this.details, format);
-                const fileName = this.details.fileName.replace('.json', `.${format}`);
+                const fileName = await this.getExportFileName(format);
                 await fs.writeFile(fileName, Buffer.from(data));
                 this.details[`${format}FileName`] = fileName;
                 await this.save(true);
@@ -194,6 +194,18 @@ let Activity = (() => {
             }
             return success;
         }
+        async getExportFileName(format) {
+            let fileName = this.details.fileName.replace('json', format);
+            if (fileName.startsWith('mmkv:/')) {
+                const fs = this.getBindings().fs;
+                const appDir = this.getBindings().appInfo.getAppDir();
+                const activitiesDir = this.getBindings().path.join(appDir, 'activities');
+                await fs.ensureDir(activitiesDir);
+                const baseName = fileName.split('/').pop();
+                fileName = this.getBindings().path.join(activitiesDir, baseName);
+            }
+            return fileName;
+        }
         async upload(connectedApp, observer) {
             let success = false;
             let error;

package/lib/esm/package.json

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