incyclist-devices 2.4.10 → 2.4.12

package/lib/ble/zwift/play/sensor.d.ts

@@ -50,6 +50,7 @@ export declare class BleZwiftPlaySensor extends TBleSensor {
     initHubService(setSimulation?: boolean): Promise<boolean>;
     sendHubRequest(request: HubRequest): Promise<Buffer<ArrayBufferLike>>;
     sendHubCommand(command: HubCommand): Promise<Buffer<ArrayBufferLike>>;
+    protected onTrainerResponse(m: Buffer): void;
     protected onRidingData(m: Buffer): void;
     protected onDeviceInformation(m: Buffer): void;
     onClickButtonMessage(d: Buffer): void;

package/lib/ble/zwift/play/sensor.js

@@ -146,6 +146,9 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
         else if (type === 0x03) {
             this.onRidingData(message);
         }
+        else if (type === 0x2A) {
+            this.onTrainerResponse(message);
+        }
         else if (type === 0x3c) {
             this.onDeviceInformation(message);
         }
@@ -157,31 +160,38 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
     }
     initHubService() {
         return __awaiter(this, arguments, void 0, function* (setSimulation = true) {
-            var _a;
             if (!this.isHubServiceActive && this.initHubServicePromise !== undefined) {
                 yield this.initHubServicePromise;
             }
+            const subscribe = () => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                if (!this.isHubServiceSubscribed) {
+                    this.logEvent({ message: 'subscribe to hub service characteristics' });
+                    this.subscribePromise = (_a = this.subscribePromise) !== null && _a !== void 0 ? _a : this.subscribe();
+                    const subscribed = yield this.subscribePromise;
+                    this.subscribePromise = undefined;
+                    this.isHubServiceSubscribed = subscribed;
+                    if (!subscribed)
+                        return false;
+                    this.logEvent({ message: 'subscribed to hub service characteristics' });
+                }
+            });
+            const pair = () => __awaiter(this, void 0, void 0, function* () {
+                if (!this.isHubServicePaired) {
+                    this.logEvent({ message: 'pair hub service' });
+                    this.pairPromise = this.pair();
+                    const paired = yield this.pairPromise;
+                    this.pairPromise = undefined;
+                    if (!paired)
+                        return false;
+                }
+            });
             if (this.isHubServiceActive)
                 return true;
             this.logEvent({ message: 'init hub service', paired: this.isHubPairConfirmed, subscribed: this.isHubServiceSubscribed });
-            if (!this.isHubServicePaired) {
-                this.logEvent({ message: 'pair hub service' });
-                this.pairPromise = this.pair();
-                const paired = yield this.pairPromise;
-                this.pairPromise = undefined;
-                if (!paired)
-                    return false;
-            }
-            if (!this.isHubServiceSubscribed) {
-                this.logEvent({ message: 'subscribe to hub service characteristics' });
-                this.subscribePromise = (_a = this.subscribePromise) !== null && _a !== void 0 ? _a : this.subscribe();
-                const subscribed = yield this.subscribePromise;
-                this.subscribePromise = undefined;
-                this.isHubServiceSubscribed = subscribed;
-                if (!subscribed)
-                    return false;
-                this.logEvent({ message: 'subscribed to hub service characteristics' });
-            }
+            yield subscribe();
+            yield pair();
+            yield subscribe();
             this.initHubServicePromise = new Promise((done) => {
                 this.logEvent({ message: 'send hub init message' });
                 let timeout = setTimeout(() => {
@@ -235,6 +245,16 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
             return yield this.sendPlayCommand(0x04, message);
         });
     }
+    onTrainerResponse(m) {
+        try {
+            const data = zwift_hub_1.TrainerResponse.fromBinary(m);
+            this.emit('hub-trainer-response', data);
+            this.logEvent({ message: 'trainer response received', data });
+        }
+        catch (err) {
+            this.logEvent({ message: 'Error', fn: 'onTrainerResponse', error: err.message, stack: err.stack });
+        }
+    }
     onRidingData(m) {
         try {
             this.tsLastRidingData = Date.now();

package/lib/proto/zwift_hub.d.ts

@@ -67,6 +67,13 @@ export interface RideKeyPadStatus {
     buttonMap?: number;
     analogButtons?: RideAnalogKeyGroup;
 }
+export interface TrainerResponse {
+    unknown?: number;
+    content?: TrainerResponseContent;
+}
+export interface TrainerResponseContent {
+    text?: string;
+}
 export interface ClickKeyPadStatus {
     buttonPlus?: PlayButtonStatus;
     buttonMinus?: PlayButtonStatus;
@@ -230,6 +237,20 @@ declare class RideKeyPadStatus$Type extends MessageType<RideKeyPadStatus> {
     internalBinaryWrite(message: RideKeyPadStatus, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter;
 }
 export declare const RideKeyPadStatus: RideKeyPadStatus$Type;
+declare class TrainerResponse$Type extends MessageType<TrainerResponse> {
+    constructor();
+    create(value?: PartialMessage<TrainerResponse>): TrainerResponse;
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: TrainerResponse): TrainerResponse;
+    internalBinaryWrite(message: TrainerResponse, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter;
+}
+export declare const TrainerResponse: TrainerResponse$Type;
+declare class TrainerResponseContent$Type extends MessageType<TrainerResponseContent> {
+    constructor();
+    create(value?: PartialMessage<TrainerResponseContent>): TrainerResponseContent;
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: TrainerResponseContent): TrainerResponseContent;
+    internalBinaryWrite(message: TrainerResponseContent, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter;
+}
+export declare const TrainerResponseContent: TrainerResponseContent$Type;
 declare class ClickKeyPadStatus$Type extends MessageType<ClickKeyPadStatus> {
     constructor();
     create(value?: PartialMessage<ClickKeyPadStatus>): ClickKeyPadStatus;

package/lib/proto/zwift_hub.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeviceDataEnvelope = exports.DeviceSettingsSubContent = exports.DeviceSettings = exports.DeviceInformation = exports.SubContent = exports.DeviceInformationContent = exports.ClickKeyPadStatus = exports.RideKeyPadStatus = exports.RideAnalogKeyGroup = exports.RideAnalogKeyPress = exports.Idle = exports.PlayCommand = exports.PlayCommandContents = exports.PlayCommandParameters = exports.PlayKeyPadStatus = exports.HubCommand = exports.PhysicalParam = exports.SimulationParam = exports.HubRidingData = exports.HubRequest = exports.RideAnalogLocation = exports.RideButtonMask = exports.PlayButtonStatus = void 0;
+exports.DeviceDataEnvelope = exports.DeviceSettingsSubContent = exports.DeviceSettings = exports.DeviceInformation = exports.SubContent = exports.DeviceInformationContent = exports.ClickKeyPadStatus = exports.TrainerResponseContent = exports.TrainerResponse = exports.RideKeyPadStatus = exports.RideAnalogKeyGroup = exports.RideAnalogKeyPress = exports.Idle = exports.PlayCommand = exports.PlayCommandContents = exports.PlayCommandParameters = exports.PlayKeyPadStatus = exports.HubCommand = exports.PhysicalParam = exports.SimulationParam = exports.HubRidingData = exports.HubRequest = exports.RideAnalogLocation = exports.RideButtonMask = exports.PlayButtonStatus = void 0;
 const runtime_1 = require("@protobuf-ts/runtime");
 const runtime_2 = require("@protobuf-ts/runtime");
 const runtime_3 = require("@protobuf-ts/runtime");
@@ -715,6 +715,94 @@ class RideKeyPadStatus$Type extends runtime_4.MessageType {
     }
 }
 exports.RideKeyPadStatus = new RideKeyPadStatus$Type();
+class TrainerResponse$Type extends runtime_4.MessageType {
+    constructor() {
+        super("org.cagnulen.qdomyoszwift.TrainerResponse", [
+            { no: 1, name: "Unknown", kind: "scalar", jsonName: "Unknown", opt: true, T: 13 },
+            { no: 2, name: "Content", kind: "message", jsonName: "Content", T: () => exports.TrainerResponseContent }
+        ]);
+    }
+    create(value) {
+        const message = globalThis.Object.create((this.messagePrototype));
+        if (value !== undefined)
+            (0, runtime_3.reflectionMergePartial)(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader, length, options, target) {
+        let message = target !== null && target !== void 0 ? target : this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case 1:
+                    message.unknown = reader.uint32();
+                    break;
+                case 2:
+                    message.content = exports.TrainerResponseContent.internalBinaryRead(reader, reader.uint32(), options, message.content);
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? runtime_2.UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message, writer, options) {
+        if (message.unknown !== undefined)
+            writer.tag(1, runtime_1.WireType.Varint).uint32(message.unknown);
+        if (message.content)
+            exports.TrainerResponseContent.internalBinaryWrite(message.content, writer.tag(2, runtime_1.WireType.LengthDelimited).fork(), options).join();
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? runtime_2.UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+exports.TrainerResponse = new TrainerResponse$Type();
+class TrainerResponseContent$Type extends runtime_4.MessageType {
+    constructor() {
+        super("org.cagnulen.qdomyoszwift.TrainerResponseContent", [
+            { no: 4, name: "Text", kind: "scalar", jsonName: "Text", opt: true, T: 9 }
+        ]);
+    }
+    create(value) {
+        const message = globalThis.Object.create((this.messagePrototype));
+        if (value !== undefined)
+            (0, runtime_3.reflectionMergePartial)(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader, length, options, target) {
+        let message = target !== null && target !== void 0 ? target : this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case 4:
+                    message.text = reader.string();
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? runtime_2.UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message, writer, options) {
+        if (message.text !== undefined)
+            writer.tag(4, runtime_1.WireType.LengthDelimited).string(message.text);
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? runtime_2.UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+exports.TrainerResponseContent = new TrainerResponseContent$Type();
 class ClickKeyPadStatus$Type extends runtime_4.MessageType {
     constructor() {
         super("org.cagnulen.qdomyoszwift.ClickKeyPadStatus", [

package/lib/serial/daum/classic/utils.d.ts

@@ -2,7 +2,7 @@ import { DeviceType, IncyclistBikeData } from '../../../types';
 export declare const DEFAULT_AGE = 30;
 export declare const DEFAULT_USER_WEIGHT = 75;
 export declare const DEFAULT_BIKE_WEIGHT = 10;
-export declare function getCockpit(c: number): "Cardio" | "Fitness" | "Vita De Luxe" | "8008" | "8008 TRS" | "8080" | "Therapie" | "8008 TRS Pro" | "8008 TRS3" | "ergo_lyps Cardio Pro" | "Unknown";
+export declare function getCockpit(c: number): "Unknown" | "Cardio" | "Fitness" | "Vita De Luxe" | "8008" | "8008 TRS" | "8080" | "Therapie" | "8008 TRS Pro" | "8008 TRS3" | "ergo_lyps Cardio Pro";
 export declare function getSerialNo(arr: Uint8Array, start: number, length: number): string;
 export declare function getBikeType(type?: DeviceType): number;
 export declare function getGender(sex: any): 0 | 1 | 2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.4.10",
+  "version": "2.4.12",
   "dependencies": {
     "@protobuf-ts/runtime": "^2.11.1",
     "@serialport/bindings-interface": "^1.2.2",