incyclist-services 1.7.4 → 1.7.6

package/lib/activities/ride/service.d.ts

@@ -85,7 +85,7 @@ export declare class ActivityRideService extends IncyclistService {
     };
     protected getAverageValues(): {
         speedDetails: {
-            value: any;
+            value: string;
             label: string;
         };
         powerDetails: {
@@ -105,10 +105,16 @@ export declare class ActivityRideService extends IncyclistService {
             label: string;
             unit: any;
         };
+    } | {
+        speedDetails?: undefined;
+        powerDetails?: undefined;
+        heartrateDetails?: undefined;
+        cadenceDetails?: undefined;
+        elevationGain?: undefined;
     };
     protected getMaximumValues(): {
         speedDetails: {
-            value: any;
+            value: string;
             label: string;
         };
         powerDetails: {
@@ -128,6 +134,12 @@ export declare class ActivityRideService extends IncyclistService {
             label: string;
             unit: any;
         };
+    } | {
+        speedDetails?: undefined;
+        powerDetails?: undefined;
+        heartrateDetails?: undefined;
+        cadenceDetails?: undefined;
+        elevationGain?: undefined;
     };
     getActivitySummaryDisplayProperties(): ActivitySummaryDisplayProperties;
     protected canShowDonate(): boolean;

package/lib/activities/ride/service.js

@@ -309,30 +309,44 @@ let ActivityRideService = (() => {
             return { position, distance, routeDistance, time, speed, power, slope, heartrate, cadence, timeRemaining, distanceRemaining, lap, gear };
         }
         getAverageValues() {
-            const [C, U] = this.getUnitConversionShortcuts();
-            const stats = this.activity?.stats;
-            const speedDetails = { value: C(stats?.speed?.max, 'speed')?.toFixed(1) ?? '', label: 'max' };
-            const powerDetails = { value: formatNumber(stats?.power?.max, 0), label: 'max' };
-            const heartrateDetails = { value: formatNumber(stats?.hrm?.max, 0), label: 'max' };
-            const cadenceDetails = { value: formatNumber(stats?.cadence?.max, 0), label: 'max' };
-            const elevationGain = { value: C(this.current.elevationGainDisplay ?? 0, 'elevation')?.toFixed(0) ?? '', label: 'elev. done', unit: U('elevation') };
-            return { speedDetails, powerDetails, heartrateDetails, cadenceDetails, elevationGain };
+            try {
+                const [C, U] = this.getUnitConversionShortcuts();
+                const stats = this.activity?.stats;
+                const maxSpeed = stats?.speed?.max;
+                const speedDetails = { value: formatNumber(C(maxSpeed, 'speed'), 1), label: 'max' };
+                const powerDetails = { value: formatNumber(stats?.power?.max, 0), label: 'max' };
+                const heartrateDetails = { value: formatNumber(stats?.hrm?.max, 0), label: 'max' };
+                const cadenceDetails = { value: formatNumber(stats?.cadence?.max, 0), label: 'max' };
+                const elevationGain = { value: C(this.current.elevationGainDisplay ?? 0, 'elevation')?.toFixed(0) ?? '', label: 'elev. done', unit: U('elevation') };
+                return { speedDetails, powerDetails, heartrateDetails, cadenceDetails, elevationGain };
+            }
+            catch (err) {
+                this.logError(err, 'getAverageValues', { stats: this.activity?.stats });
+                return {};
+            }
         }
         getMaximumValues() {
-            const [C, U] = this.getUnitConversionShortcuts();
-            const stats = this.activity?.stats;
-            const speedDetails = { value: C(stats?.speed?.avg, 'speed')?.toFixed(1) ?? '', label: 'avg' };
-            const powerDetails = { value: formatNumber(stats?.power?.avg, 0), label: 'avg' };
-            const heartrateDetails = { value: formatNumber(stats?.hrm?.avg, 0), label: 'avg' };
-            const cadenceDetails = { value: formatNumber(stats?.cadence?.avg, 0), label: 'avg' };
-            let elevationGainRemaining = this.getTotalElevation() - (this.current.elevationGainDisplay ?? 0);
-            if (isNaN(elevationGainRemaining))
-                elevationGainRemaining = undefined;
-            if (elevationGainRemaining < 0)
-                elevationGainRemaining = 0;
-            const value = elevationGainRemaining === undefined ? undefined : `${C(elevationGainRemaining, 'elevation').toFixed(0)}`;
-            const elevationGain = { value, label: 'elev. todo', unit: U('elevation') };
-            return { speedDetails, powerDetails, heartrateDetails, cadenceDetails, elevationGain };
+            try {
+                const [C, U] = this.getUnitConversionShortcuts();
+                const stats = this.activity?.stats;
+                const avgSpeed = stats?.speed?.avg;
+                const speedDetails = { value: formatNumber(C(avgSpeed, 'speed'), 1), label: 'avg' };
+                const powerDetails = { value: formatNumber(stats?.power?.avg, 0), label: 'avg' };
+                const heartrateDetails = { value: formatNumber(stats?.hrm?.avg, 0), label: 'avg' };
+                const cadenceDetails = { value: formatNumber(stats?.cadence?.avg, 0), label: 'avg' };
+                let elevationGainRemaining = this.getTotalElevation() - (this.current.elevationGainDisplay ?? 0);
+                if (isNaN(elevationGainRemaining))
+                    elevationGainRemaining = undefined;
+                if (elevationGainRemaining < 0)
+                    elevationGainRemaining = 0;
+                const value = elevationGainRemaining === undefined ? undefined : `${C(elevationGainRemaining, 'elevation').toFixed(0)}`;
+                const elevationGain = { value, label: 'elev. todo', unit: U('elevation') };
+                return { speedDetails, powerDetails, heartrateDetails, cadenceDetails, elevationGain };
+            }
+            catch (err) {
+                this.logError(err, 'getMaximumValues', { stats: this.activity?.stats });
+                return {};
+            }
         }
         getActivitySummaryDisplayProperties() {
             try {

package/lib/cjs/activities/active-rides/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("./types"), exports);

package/lib/cjs/activities/active-rides/mq.js

@@ -0,0 +1,180 @@
+"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.ActiveRideListMessageQueue = void 0;
+const api_1 = require("../../api");
+const decorators_1 = require("../../base/decorators");
+const service_1 = require("../../base/service");
+let ActiveRideListMessageQueue = (() => {
+    let _classSuper = service_1.IncyclistService;
+    let _instanceExtraInitializers = [];
+    let _getMessageQueue_decorators;
+    let _getActiveRideLis_decorators;
+    let _getActiveRideLis_initializers = [];
+    let _getActiveRideLis_extraInitializers = [];
+    return class ActiveRideListMessageQueue extends _classSuper {
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getMessageQueue_decorators = [decorators_1.Injectable];
+            _getActiveRideLis_decorators = [decorators_1.Injectable];
+            __esDecorate(this, null, _getMessageQueue_decorators, { kind: "method", name: "getMessageQueue", static: false, private: false, access: { has: obj => "getMessageQueue" in obj, get: obj => obj.getMessageQueue }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(null, null, _getActiveRideLis_decorators, { kind: "field", name: "getActiveRideLis", static: false, private: false, access: { has: obj => "getActiveRideLis" in obj, get: obj => obj.getActiveRideLis, set: (obj, value) => { obj.getActiveRideLis = value; } }, metadata: _metadata }, _getActiveRideLis_initializers, _getActiveRideLis_extraInitializers);
+            if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        }
+        onTopicMessageHandler = (__runInitializers(this, _instanceExtraInitializers), this.onTopicMessage.bind(this));
+        onTopicSubscribedHandler = this.onTopicSubscribed.bind(this);
+        subscribed = [];
+        hasMQErrors = false;
+        subscribeEnabled = false;
+        constructor() {
+            super('ActiveRides');
+            __runInitializers(this, _getActiveRideLis_extraInitializers);
+        }
+        onDisconnect() {
+            const mq = this.getMessageQueue();
+            if (!mq?.enabled())
+                return;
+            this.unsubscribeAll();
+        }
+        onConnect() {
+            const mq = this.getMessageQueue();
+            if (!mq?.enabled())
+                return;
+            this.enableSubscribe();
+        }
+        subscribe(topic, handler, filter) {
+            if (!this.subscribeEnabled)
+                this.enableSubscribe();
+            const existing = this.subscribed.find(s => s.topic === topic);
+            if (existing) {
+                existing.handler = handler;
+                existing.filter = filter;
+                if (existing.subscribed)
+                    return;
+            }
+            this.getMessageQueue().subscribe(topic);
+            if (!existing)
+                this.subscribed.push({ topic, filter, handler });
+        }
+        unsubscribe(topic) {
+            const mq = this.getMessageQueue();
+            if (!mq?.enabled())
+                return;
+            const s = this.subscribed.find(s => s.topic === topic);
+            mq.unsubscribe(s.topic);
+            this.subscribed.splice(this.subscribed.indexOf(s), 1);
+        }
+        unsubscribeAll() {
+            const topics = this.subscribed ?? [];
+            const mq = this.getMessageQueue();
+            if (!mq?.enabled())
+                return;
+            topics.forEach(s => { mq.unsubscribe(s.topic); });
+            this.subscribed = [];
+            this.disableSubscribe();
+        }
+        sendMessage(topic, payload) {
+            const mq = this.getMessageQueue();
+            if (!mq?.enabled())
+                return;
+            try {
+                mq.publish(topic, payload);
+                this.hasMQErrors = false;
+            }
+            catch (err) {
+                if (!this.hasMQErrors)
+                    this.logError(err, 'sendMessage', { topic, payload });
+                this.hasMQErrors = true;
+            }
+        }
+        enableSubscribe() {
+            if (this.subscribeEnabled)
+                return;
+            const mq = this.getMessageQueue();
+            mq.on('mq-subscribed', this.onTopicSubscribedHandler);
+            mq.on('mq-message', this.onTopicMessageHandler);
+            this.subscribeEnabled = true;
+        }
+        disableSubscribe() {
+            if (!this.subscribeEnabled)
+                return;
+            const mq = this.getMessageQueue();
+            mq.off('mq-subscribed', this.onTopicSubscribedHandler);
+            mq.off('mq-message', this.onTopicMessageHandler);
+            this.subscribeEnabled = false;
+        }
+        onTopicSubscribed(topic) {
+            const existing = this.subscribed.find(s => s.topic === topic);
+            existing.subscribed = true;
+            this.logEvent({ message: 'Subscribed to topic', topic });
+        }
+        onTopicMessage(topic, message) {
+            if (!this.subscribeEnabled)
+                return;
+            let payload;
+            let str;
+            try {
+                if (typeof message === 'string') {
+                    str = message;
+                }
+                else if (message instanceof Uint8Array) {
+                    str = Buffer.from(message.buffer).toString();
+                }
+                payload = JSON.parse(str);
+            }
+            catch (err) {
+                this.logError(err, 'on mq-message', { topic, mq_message: str });
+            }
+            if (!payload)
+                return;
+            let handled = false;
+            this.subscribed.filter(s => s.subscribed).forEach(s => {
+                if ((s.filter && topic.startsWith(s.filter)) || (!s.filter)) {
+                    s.handler(topic, payload);
+                    handled = true;
+                }
+            });
+            if (!handled) {
+                this.logEvent({ message: 'unknown topic message', topic, payload: message });
+            }
+        }
+        getMessageQueue() {
+            return (0, api_1.getBindings)().mq;
+        }
+        getActiveRideLis = __runInitializers(this, _getActiveRideLis_initializers, void 0);
+    };
+})();
+exports.ActiveRideListMessageQueue = ActiveRideListMessageQueue;