incyclist-services 1.6.10 → 1.7.2

package/lib/activities/active-rides/index.js

@@ -1,18 +1,2 @@
-"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);
+export * from './service';
+export * from './types';

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

@@ -1,4 +1,3 @@
-"use strict";
 var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
     var useValue = arguments.length > 2;
     for (var i = 0; i < initializers.length; i++) {
@@ -33,152 +32,146 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     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");
+import { getBindings } from "../../api";
+import { Injectable } from "../../base/decorators";
+import { IncyclistService } from "../../base/service";
 let ActiveRideListMessageQueue = (() => {
-    var _a;
-    let _classSuper = service_1.IncyclistService;
+    let _classSuper = IncyclistService;
     let _instanceExtraInitializers = [];
     let _getMessageQueue_decorators;
     let _getActiveRideLis_decorators;
     let _getActiveRideLis_initializers = [];
     let _getActiveRideLis_extraInitializers = [];
-    return _a = class ActiveRideListMessageQueue extends _classSuper {
-            constructor() {
-                super('ActiveRides');
-                this.onTopicMessageHandler = (__runInitializers(this, _instanceExtraInitializers), this.onTopicMessage.bind(this));
-                this.onTopicSubscribedHandler = this.onTopicSubscribed.bind(this);
-                this.subscribed = [];
-                this.hasMQErrors = false;
-                this.subscribeEnabled = false;
-                this.getActiveRideLis = __runInitializers(this, _getActiveRideLis_initializers, void 0);
-                __runInitializers(this, _getActiveRideLis_extraInitializers);
-            }
-            onDisconnect() {
-                const mq = this.getMessageQueue();
-                if (!(mq === null || mq === void 0 ? void 0 : mq.enabled()))
-                    return;
-                this.unsubscribeAll();
-            }
-            onConnect() {
-                const mq = this.getMessageQueue();
-                if (!(mq === null || mq === void 0 ? void 0 : mq.enabled()))
-                    return;
+    return class ActiveRideListMessageQueue extends _classSuper {
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getMessageQueue_decorators = [Injectable];
+            _getActiveRideLis_decorators = [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();
-            }
-            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 === null || mq === void 0 ? void 0 : mq.enabled()))
+            const existing = this.subscribed.find(s => s.topic === topic);
+            if (existing) {
+                existing.handler = handler;
+                existing.filter = filter;
+                if (existing.subscribed)
                     return;
-                const s = this.subscribed.find(s => s.topic === topic);
-                mq.unsubscribe(s.topic);
-                this.subscribed.splice(this.subscribed.indexOf(s), 1);
             }
-            unsubscribeAll() {
-                var _b;
-                const topics = (_b = this.subscribed) !== null && _b !== void 0 ? _b : [];
-                const mq = this.getMessageQueue();
-                if (!(mq === null || mq === void 0 ? void 0 : mq.enabled()))
-                    return;
-                topics.forEach(s => { mq.unsubscribe(s.topic); });
-                this.subscribed = [];
-                this.disableSubscribe();
+            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;
             }
-            sendMessage(topic, payload) {
-                const mq = this.getMessageQueue();
-                if (!(mq === null || mq === void 0 ? void 0 : 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;
                 }
-                catch (err) {
-                    if (!this.hasMQErrors)
-                        this.logError(err, 'sendMessage', { topic, payload });
-                    this.hasMQErrors = true;
+                else if (message instanceof Uint8Array) {
+                    str = Buffer.from(message.buffer).toString();
                 }
+                payload = JSON.parse(str);
             }
-            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 });
+            catch (err) {
+                this.logError(err, 'on mq-message', { topic, mq_message: str });
             }
-            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 });
+            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;
-            }
-        },
-        (() => {
-            var _b;
-            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create((_b = _classSuper[Symbol.metadata]) !== null && _b !== void 0 ? _b : null) : void 0;
-            _getMessageQueue_decorators = [decorators_1.Injectable];
-            _getActiveRideLis_decorators = [decorators_1.Injectable];
-            __esDecorate(_a, 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(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-        })(),
-        _a;
+        }
+        getMessageQueue() {
+            return getBindings().mq;
+        }
+        getActiveRideLis = __runInitializers(this, _getActiveRideLis_initializers, void 0);
+    };
 })();
-exports.ActiveRideListMessageQueue = ActiveRideListMessageQueue;
+export { ActiveRideListMessageQueue };

package/lib/activities/active-rides/service.d.ts

@@ -1,6 +1,7 @@
 import { IncyclistService } from "../../base/service";
 import { Observer } from "../../base/types";
 import { CoachesService } from "../../coaches";
+import { Unit } from "../../i18n";
 import { OnlineStateMonitoringService } from "../../monitoring";
 import { RouteListService } from "../../routes";
 import { ActiveRideCount } from "../../routes/list/types";
@@ -53,14 +54,25 @@ export declare class ActiveRidesService extends IncyclistService {
     protected getName(item: any): any;
     protected randomName(id?: string): string;
     protected addCurrentActivity(): void;
-    protected getAvatar(item: ActiveRideEntry): import("../../avatars").Avatar;
+    protected getAvatar(item: ActiveRideEntry): import("../..").Avatar;
     protected getRelativePower(r: ActiveRideEntry): number;
     protected getLap(r: ActiveRideEntry, overwrite?: boolean): number;
-    protected getDistance(r: ActiveRideEntry): number;
-    protected getDistanceDiff(r: ActiveRideEntry): number;
+    protected getRoutePosDistance(r: ActiveRideEntry): number;
+    protected getSpeed(r: ActiveRideEntry): {
+        value: number;
+        unit: Unit;
+    };
+    protected getDistance(r: ActiveRideEntry): {
+        value: number;
+        unit: Unit;
+    };
+    protected getDistanceDiff(r: ActiveRideEntry): {
+        value: number;
+        unit: Unit;
+    };
     protected getRideInfo(): ActiveRideRoute;
     protected getType(type: ActivityRouteType): ActiveRideRouteType;
-    protected get activity(): import("../base").ActivityDetails;
+    protected get activity(): import("..").ActivityDetails;
     protected getRouteHash(): string;
     protected getUserName(user?: {
         firstname?: string;
@@ -95,6 +107,8 @@ export declare class ActiveRidesService extends IncyclistService {
     protected getActivityRide(): ActivityRideService;
     protected getRouteList(): RouteListService;
     getCoachesService(): CoachesService;
+    getUnitConverter(): import("../..").UnitConverterService;
+    protected getUnitConversionShortcuts(): any[];
     protected getMessageQueue(): ActiveRideListMessageQueue;
     protected getApi(): IncyclistActiveRidesApi;
     reset(): void;