incyclist-services 1.7.67 → 1.7.68

package/lib/cjs/settings/display/ride/service.js

@@ -0,0 +1,132 @@
+"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";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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");
+let RideSettingsDisplayService = (() => {
+    let _classDecorators = [decorators_1.Singleton];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = service_1.IncyclistService;
+    let _instanceExtraInitializers = [];
+    let _getUserSettings_decorators;
+    let _getBindings_decorators;
+    var RideSettingsDisplayService = 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);
+            RideSettingsDisplayService = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        observer = __runInitializers(this, _instanceExtraInitializers);
+        constructor() {
+            super('GearSettings');
+        }
+        open() {
+            if (this.observer)
+                this.close();
+            this.observer = new types_1.Observer();
+            return this.observer;
+        }
+        close() {
+            this.observer.stop();
+            delete this.observer;
+        }
+        getDisplayProps() {
+            return {
+                rideView: this.getRideView(),
+                rideViewOptions: this.getRideViewOptions()
+            };
+        }
+        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)();
+        }
+        getBindings() {
+            return (0, api_1.getBindings)();
+        }
+    };
+    return RideSettingsDisplayService = _classThis;
+})();
+exports.RideSettingsDisplayService = RideSettingsDisplayService;
+const useRideSettingsDisplay = () => new RideSettingsDisplayService();
+exports.useRideSettingsDisplay = useRideSettingsDisplay;

package/lib/cjs/settings/display/ride/types.js

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

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/settings/display/gear/service.js

@@ -0,0 +1,127 @@
+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";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+import { getBindings } from "../../../api";
+import { Injectable, Singleton } from "../../../base/decorators";
+import { IncyclistService } from "../../../base/service";
+import { Observer } from "../../../base/types";
+import { useUserSettings } from "../../service";
+let GearSettingsDisplayService = (() => {
+    let _classDecorators = [Singleton];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = IncyclistService;
+    let _instanceExtraInitializers = [];
+    let _getUserSettings_decorators;
+    let _getBindings_decorators;
+    var GearSettingsDisplayService = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getUserSettings_decorators = [Injectable];
+            _getBindings_decorators = [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);
+            GearSettingsDisplayService = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        observer = __runInitializers(this, _instanceExtraInitializers);
+        constructor() {
+            super('GearSettings');
+        }
+        open() {
+            if (this.observer)
+                this.close();
+            this.observer = new Observer();
+            return this.observer;
+        }
+        close() {
+            this.observer.stop();
+            delete this.observer;
+        }
+        getDisplayProps() {
+            return {
+                rideView: this.getRideView(),
+                rideViewOptions: this.getRideViewOptions()
+            };
+        }
+        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 useUserSettings();
+        }
+        getBindings() {
+            return getBindings();
+        }
+    };
+    return GearSettingsDisplayService = _classThis;
+})();
+export { GearSettingsDisplayService };

package/lib/esm/settings/display/gear/types.js

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

package/lib/esm/settings/display/ride/service.js

@@ -0,0 +1,128 @@
+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";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+import { getBindings } from "../../../api";
+import { Injectable, Singleton } from "../../../base/decorators";
+import { IncyclistService } from "../../../base/service";
+import { Observer } from "../../../base/types";
+import { useUserSettings } from "../../service";
+let RideSettingsDisplayService = (() => {
+    let _classDecorators = [Singleton];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = IncyclistService;
+    let _instanceExtraInitializers = [];
+    let _getUserSettings_decorators;
+    let _getBindings_decorators;
+    var RideSettingsDisplayService = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getUserSettings_decorators = [Injectable];
+            _getBindings_decorators = [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);
+            RideSettingsDisplayService = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        observer = __runInitializers(this, _instanceExtraInitializers);
+        constructor() {
+            super('GearSettings');
+        }
+        open() {
+            if (this.observer)
+                this.close();
+            this.observer = new Observer();
+            return this.observer;
+        }
+        close() {
+            this.observer.stop();
+            delete this.observer;
+        }
+        getDisplayProps() {
+            return {
+                rideView: this.getRideView(),
+                rideViewOptions: this.getRideViewOptions()
+            };
+        }
+        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 useUserSettings();
+        }
+        getBindings() {
+            return getBindings();
+        }
+    };
+    return RideSettingsDisplayService = _classThis;
+})();
+export { RideSettingsDisplayService };
+export const useRideSettingsDisplay = () => new RideSettingsDisplayService();

package/lib/esm/settings/display/ride/types.js

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

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

@@ -218,7 +218,7 @@ export 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);
@@ -238,7 +238,7 @@ export 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/types/settings/display/gear/service.d.ts

@@ -0,0 +1,21 @@
+import { IncyclistService } from "../../../base/service";
+import { Observer } from "../../../base/types";
+import { IObserver } from "../../../types";
+import { UserSettingsService } from "../../service";
+import { GearSettingsDisplayProps, TRideView } from "./types";
+export declare class GearSettingsDisplayService extends IncyclistService {
+    protected observer: Observer;
+    constructor();
+    open(): IObserver;
+    close(): void;
+    getDisplayProps(): GearSettingsDisplayProps;
+    setRideView(rideView: TRideView): void;
+    protected emitChanged(): void;
+    protected getRideView(): TRideView;
+    protected getRideViewOptions(): Map<TRideView, string>;
+    protected isMobile(): boolean;
+    protected isAndroid(): boolean;
+    protected isIOS(): boolean;
+    protected getUserSettings(): UserSettingsService;
+    protected getBindings(): import("../../../api").IncyclistBindings;
+}

package/lib/types/settings/display/gear/types.d.ts

@@ -0,0 +1,5 @@
+export type TRideView = 'sv' | 'sat' | 'map';
+export interface GearSettingsDisplayProps {
+    rideView: TRideView;
+    rideViewOptions: Map<TRideView, string>;
+}

package/lib/types/settings/display/ride/service.d.ts

@@ -0,0 +1,22 @@
+import { IncyclistService } from "../../../base/service";
+import { Observer } from "../../../base/types";
+import { IObserver } from "../../../types";
+import { UserSettingsService } from "../../service";
+import { RideSettingsDisplayProps, TRideView } from "./types";
+export declare class RideSettingsDisplayService extends IncyclistService {
+    protected observer: Observer;
+    constructor();
+    open(): IObserver;
+    close(): void;
+    getDisplayProps(): RideSettingsDisplayProps;
+    setRideView(rideView: TRideView): void;
+    protected emitChanged(): void;
+    protected getRideView(): TRideView;
+    protected getRideViewOptions(): Map<TRideView, string>;
+    protected isMobile(): boolean;
+    protected isAndroid(): boolean;
+    protected isIOS(): boolean;
+    protected getUserSettings(): UserSettingsService;
+    protected getBindings(): import("../../../api").IncyclistBindings;
+}
+export declare const useRideSettingsDisplay: () => RideSettingsDisplayService;

package/lib/types/settings/display/ride/types.d.ts

@@ -0,0 +1,5 @@
+export type TRideView = 'sv' | 'sat' | 'map';
+export interface RideSettingsDisplayProps {
+    rideView: TRideView;
+    rideViewOptions: Map<TRideView, string>;
+}

package/package.json

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