incyclist-services 1.7.64 → 1.7.66

package/lib/cjs/devices/configuration/service.js

@@ -372,7 +372,8 @@ let DeviceConfigurationService = (() => {
             try {
                 const udid = requestedUdid ||
                     capabilities.find(d => d.capability === incyclist_devices_1.IncyclistCapability.Control)?.selected ||
-                    capabilities.find(d => d.capability === incyclist_devices_1.IncyclistCapability.Power)?.selected;
+                    capabilities.find(d => d.capability === incyclist_devices_1.IncyclistCapability.Power)?.selected ||
+                    capabilities.find(d => d.capability === incyclist_devices_1.IncyclistCapability.Speed)?.selected;
                 if (!udid)
                     return;
                 const device = devices.find(d => d.udid === udid);

package/lib/cjs/devices/pairing/service.js

@@ -919,7 +919,11 @@ let DevicePairingService = (() => {
                 return false;
             const control = this.getCapability(incyclist_devices_1.IncyclistCapability.Control);
             const power = this.getCapability(incyclist_devices_1.IncyclistCapability.Power);
-            const success = (control?.connectState === 'connected' || power?.connectState === 'connected');
+            const speed = this.getCapability(incyclist_devices_1.IncyclistCapability.Speed);
+            const controlOK = (control?.selected && control?.connectState === 'connected');
+            const powerOK = (!control?.selected && power?.selected && power?.connectState === 'connected');
+            const speedOK = (!control?.selected && !power?.selected && speed?.selected && speed?.connectState === 'connected');
+            const success = controlOK || powerOK || speedOK;
             this.state.canStartRide = success;
             return success;
         }

package/lib/cjs/devices/ride/service.js

@@ -1060,6 +1060,7 @@ let DeviceRideService = (() => {
             this.verifySelected(selectedDevices, incyclist_devices_1.IncyclistCapability.Speed);
             this.verifySelected(selectedDevices, incyclist_devices_1.IncyclistCapability.Cadence);
             this.verifySelected(selectedDevices, incyclist_devices_1.IncyclistCapability.Power);
+            const isSpeedOnlyMode = this.getCyclingMode()?.getName() === 'SpeedSensor';
             const { enabledCapabilities, toBeReplaced } = this.getEnabledCapabilities(adapterInfo, selectedDevices);
             this.logEvent({ message: 'Data Update', device: adapterInfo.adapter.getName(), data, enabledCapabilities });
             enabledCapabilities.forEach(capability => {
@@ -1072,6 +1073,9 @@ let DeviceRideService = (() => {
                         break;
                     case incyclist_devices_1.IncyclistCapability.Speed:
                         this.data.speed = data.speed;
+                        if (isSpeedOnlyMode) {
+                            this.data.power = data.power;
+                        }
                         break;
                     case incyclist_devices_1.IncyclistCapability.Cadence:
                         this.data.cadence = data.cadence;
@@ -1321,6 +1325,9 @@ let DeviceRideService = (() => {
                     adapter.setCyclingMode(mode, settings);
                     await adapter.sendInitCommands();
                 }
+                else {
+                    adapter.setCyclingMode(mode, settings);
+                }
             }
             else {
                 currentMode.setSettings(settings);

package/lib/cjs/package.json

@@ -0,0 +1,68 @@
+{
+    "name": "incyclist-services",
+    "version": "1.7.66",
+    "peerDependencies": {
+        "gd-eventlog": "^0.1.27"
+    },
+    "dependencies": {
+        "@garmin/fitsdk": "^21.200.0",
+        "axios": "^1.15.2",
+        "incyclist-devices": "^3.0.21",
+        "promise.any": "^2.0.6",
+        "semver": "^7.7.4",
+        "tcx-builder": "^1.1.1",
+        "uuid": "^14.0.0",
+        "xml2js": "^0.6.2"
+    },
+    "devDependencies": {
+        "@serialport/binding-mock": "^10.2.2",
+        "@serialport/bindings-interface": "^1.2.2",
+        "@types/jest": "^30.0.0",
+        "@types/node": "^25.6.0",
+        "@typescript-eslint/eslint-plugin": "^8.58.2",
+        "@typescript-eslint/parser": "^8.58.2",
+        "dotenv": "^17.4.2",
+        "eslint": "^9.39.4",
+        "formdata-node": "^6.0.3",
+        "jest": "^30.3.0",
+        "jsdoc": "^4.0.5",
+        "ts-jest": "^29.4.9",
+        "typedoc": "^0.28.19",
+        "typedoc-plugin-markdown": "^4.11.0",
+        "typedoc-plugin-no-inherit": "^1.6.1",
+        "typescript": "^5.9.3",
+        "typescript-eslint": "^8.58.2"
+    },
+    "scripts": {
+        "lint": "eslint . --quiet",
+        "buildx": "npm run lint && tsc",
+        "build": "npm run build:esm && npm run build:cjs",
+        "build:esm": "tsc -p tsconfig.esm.json",
+        "build:cjs": "tsc -p tsconfig.cjs.json",
+        "test:all": "npx jest",
+        "test:e2e": "npx jest --coverage -c jest.e2e-config.cjs  --coverageDirectory coverage.e2e",
+        "test:unit": "npx jest --coverage -c jest.unit-config.cjs  ",
+        "test": "npx jest --coverage -c jest.unit-config.cjs  ",
+        "dev": "tsc -p tsconfig.esm.json --watch",
+        "docgen": "typedoc --options typedoc.json",
+        "docgen1": "typedoc --readme none --excludeProtected --excludePrivate --plugin typedoc-plugin-no-inherit --plugin  typedoc-plugin-markdown src/index.ts",
+        "postversion": "git push --tags"
+    },
+    "files": [
+        "lib/"
+    ],
+    "module": "./lib/esm/index.js",
+    "main": "./lib/cjs/index.js",
+    "types": "./lib/types/index.d.ts",
+    "exports": {
+        ".": {
+            "types": "./lib/types/index.d.ts",
+            "import": "./lib/esm/index.js",
+            "require": "./lib/cjs/index.js"
+        }
+    },
+    "directories": {
+        "example": "./sample",
+        "lib": "./src"
+    }
+}

package/lib/cjs/src/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/src/activities/active-rides/mq.js

@@ -0,0 +1,190 @@
+"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;
+            }
+            if (!existing)
+                this.subscribed.push({ topic, filter, handler });
+            this.getMessageQueue()?.subscribe(topic);
+        }
+        unsubscribe(topic) {
+            const mq = this.getMessageQueue();
+            if (!mq || !mq?.enabled())
+                return;
+            const subscribed = this.subscribed ?? [];
+            const s = subscribed.find(s => s.topic === topic);
+            mq.unsubscribe(s.topic);
+            subscribed.splice(subscribed.indexOf(s), 1);
+        }
+        unsubscribeAll() {
+            const topics = this.subscribed ?? [];
+            const mq = this.getMessageQueue();
+            if (!mq || !mq.enabled())
+                return;
+            topics.forEach(s => { mq.unsubscribe(s.topic); });
+            this.subscribed = [];
+            this.disableSubscribe();
+        }
+        sendMessage(topic, payload) {
+            const mq = this.getMessageQueue();
+            if (!mq || !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();
+            if (!mq)
+                return;
+            mq.on('mq-subscribed', this.onTopicSubscribedHandler);
+            mq.on('mq-message', this.onTopicMessageHandler);
+            this.subscribeEnabled = true;
+        }
+        disableSubscribe() {
+            if (!this.subscribeEnabled)
+                return;
+            const mq = this.getMessageQueue();
+            if (!mq)
+                return;
+            mq.off('mq-subscribed', this.onTopicSubscribedHandler);
+            mq.off('mq-message', this.onTopicMessageHandler);
+            this.subscribeEnabled = false;
+        }
+        onTopicSubscribed(topic) {
+            const subscribed = this.subscribed ?? [];
+            const existing = subscribed.find(s => s.topic === topic);
+            if (existing)
+                existing.subscribed = true;
+            else {
+                this.logEvent({ message: 'Warning: subscribe confirmation received but no existing record', topic, subscribed: subscribed.map(s => s.topic).join('') });
+            }
+            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;