incyclist-devices 2.3.0 → 2.3.1

package/lib/ble/tacx/adapter.js

@@ -41,7 +41,7 @@ class BleTacxAdapter extends fm_1.BleFmAdapter {
     initControl(props) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const sensor = this.getComms();
+            const sensor = this.getSensor();
             const { user, wheelDiameter, gearRatio, bikeWeight = consts_1.DEFAULT_BIKE_WEIGHT } = props || {};
             const userWeight = ((_a = user === null || user === void 0 ? void 0 : user.weight) !== null && _a !== void 0 ? _a : consts_1.DEFAULT_USER_WEIGHT);
             sensor.sendTrackResistance(0.0);
@@ -51,15 +51,17 @@ class BleTacxAdapter extends fm_1.BleFmAdapter {
         });
     }
     checkCapabilities() {
-        const before = this.capabilities.join(',');
-        const sensor = this.getComms();
-        if (sensor.features && sensor.features.heartrate && !this.hasCapability(types_1.IncyclistCapability.HeartRate)) {
-            this.capabilities.push(types_1.IncyclistCapability.HeartRate);
-        }
-        const after = this.capabilities.join(',');
-        if (before !== after) {
-            this.emit('device-info', this.getSettings(), { capabilities: this.capabilities });
-        }
+        return __awaiter(this, void 0, void 0, function* () {
+            const before = this.capabilities.join(',');
+            const sensor = this.getSensor();
+            if (sensor.features && sensor.features.heartrate && !this.hasCapability(types_1.IncyclistCapability.HeartRate)) {
+                this.capabilities.push(types_1.IncyclistCapability.HeartRate);
+            }
+            const after = this.capabilities.join(',');
+            if (before !== after) {
+                this.emit('device-info', this.getSettings(), { capabilities: this.capabilities });
+            }
+        });
     }
 }
 BleTacxAdapter.INCYCLIST_PROFILE_NAME = 'Smart Trainer';

package/lib/ble/tacx/comms.d.ts

@@ -1,7 +1,7 @@
 import { LegacyProfile } from "../../antv2/types";
 import { CrankData } from "../cp";
 import { IndoorBikeData } from "../fm";
-import BleFitnessMachineDevice from "../fm/sensor";
+import BleFitnessMachineDevice from "../fm/comms";
 import { BleProtocol, IBlePeripheralConnector } from "../types";
 import { BleFeBikeData } from "./types";
 export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineDevice {

package/lib/ble/tacx/comms.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const consts_1 = require("../consts");
-const sensor_1 = __importDefault(require("../fm/sensor"));
+const comms_1 = __importDefault(require("../fm/comms"));
 const utils_1 = require("../utils");
 var ANTMessages;
 (function (ANTMessages) {
@@ -37,7 +37,7 @@ const PROFILE_ID = 'Tacx SmartTrainer';
 const SYNC_BYTE = 0xA4;
 const DEFAULT_CHANNEL = 5;
 const ACKNOWLEDGED_DATA = 0x4F;
-class TacxAdvancedFitnessMachineDevice extends sensor_1.default {
+class TacxAdvancedFitnessMachineDevice extends comms_1.default {
     constructor(props) {
         super(props);
         this.prevCrankData = undefined;

package/lib/ble/tacx/sensor.js

@@ -43,7 +43,7 @@ class TacxAdvancedFitnessMachineDevice extends sensor_1.default {
         }
         this.messageCnt++;
         try {
-            const uuid = characteristic.toLocaleLowerCase();
+            const uuid = (0, utils_1.beautifyUUID)(characteristic).toLowerCase();
             let res = undefined;
             if (uuid && (0, utils_1.matches)(uuid, this.tacxRx)) {
                 res = this.parseFECMessage(data);
@@ -452,8 +452,14 @@ class TacxAdvancedFitnessMachineDevice extends sensor_1.default {
     sendMessage(message) {
         return __awaiter(this, void 0, void 0, function* () {
             this.logEvent({ message: 'write', characteristic: this.tacxTx, data: message.toString('hex') });
-            yield this.write(this.tacxTx, message, { withoutResponse: true });
-            return true;
+            try {
+                yield this.write(this.tacxTx, message, { withoutResponse: true });
+                return true;
+            }
+            catch (err) {
+                this.logEvent({ message: 'write failed', characteristic: this.tacxTx, reason: err.message });
+                return false;
+            }
         });
     }
     sendUserConfiguration(userWeight, bikeWeight, wheelDiameter, gearRatio) {

package/lib/ble/types.d.ts

@@ -1,7 +1,7 @@
 import EventEmitter from "events";
 import { EventLogger } from "gd-eventlog";
 import { DeviceProperties, DeviceSettings, DeviceStartProperties, IncyclistInterface, IncyclistScanProps, InterfaceProps } from "../types";
-export type BleProtocol = 'hr' | 'fm' | 'cp' | 'tacx' | 'wahoo' | 'elite';
+export type BleProtocol = 'hr' | 'fm' | 'cp' | 'tacx' | 'wahoo' | 'elite' | 'csc';
 export type BleInterfaceState = 'unknown' | 'resetting' | 'unsupported' | 'unauthorized' | 'poweredOff' | 'poweredOn';
 export interface BleBinding extends EventEmitter {
     startScanning(serviceUUIDs?: string[], allowDuplicates?: boolean, callback?: (error?: Error) => void): void;
@@ -13,11 +13,17 @@ export interface BleBinding extends EventEmitter {
     state: BleInterfaceState;
     on(eventName: string | symbol, listener: (...args: any[]) => void): this;
 }
+export interface BleRawAdvertisement {
+    address?: string;
+    localName?: string;
+    serviceUuids?: string[];
+    rssi?: number;
+}
 export interface BleRawPeripheral extends EventEmitter {
     id?: string;
     address?: string;
     name?: string;
-    services: [];
+    services: any[];
     advertisement: any;
     state: string;
     connectAsync(): Promise<void>;

package/lib/ble/utils.d.ts

@@ -19,4 +19,5 @@ export declare const beautifyUUID: (str: string, withX?: boolean) => string;
 export declare const fullUUID: (str: string) => string;
 export declare const propertyVal: (properties: BleProperty[]) => number;
 export declare const propertyFromVal: (val: number) => BleProperty[];
+export declare const bit: (nr: any) => number;
 export {};

package/lib/ble/utils.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.propertyFromVal = exports.propertyVal = exports.fullUUID = exports.beautifyUUID = exports.parseUUID = void 0;
+exports.bit = exports.propertyFromVal = exports.propertyVal = exports.fullUUID = exports.beautifyUUID = exports.parseUUID = void 0;
 exports.mapLegacyProfile = mapLegacyProfile;
 exports.uuid = uuid;
 exports.matches = matches;
 exports.getPeripheralInfo = getPeripheralInfo;
 exports.getCharachteristicsInfo = getCharachteristicsInfo;
+const gd_eventlog_1 = require("gd-eventlog");
 function mapLegacyProfile(profile) {
     switch (profile) {
         case 'Smart Trainer': return { profile: 'Smart Trainer', protocol: 'fm' };
@@ -74,7 +75,15 @@ const parseUUID = (str) => {
 };
 exports.parseUUID = parseUUID;
 const beautifyUUID = (str, withX = false) => {
-    const uuid = (0, exports.parseUUID)(str);
+    let uuid;
+    try {
+        uuid = (0, exports.parseUUID)(str);
+    }
+    catch (err) {
+        const logger = new gd_eventlog_1.EventLogger('Incyclist');
+        logger.logEvent({ message: 'beautifyUUID error', uuid: str, error: err.message });
+        return str;
+    }
     const parts = [
         uuid.substring(0, 8),
         uuid.substring(8, 12),
@@ -129,3 +138,7 @@ const propertyFromVal = (val) => {
     return res;
 };
 exports.propertyFromVal = propertyFromVal;
+const bit = (nr) => {
+    return (1 << nr);
+};
+exports.bit = bit;

package/lib/ble/wahoo/adapter.d.ts

@@ -8,4 +8,5 @@ export default class BleWahooAdapter extends BleFmAdapter {
     isSame(device: IAdapter): boolean;
     getProfile(): LegacyProfile;
     updateSensor(peripheral: IBlePeripheral): void;
+    protected checkCapabilities(): Promise<void>;
 }

package/lib/ble/wahoo/adapter.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -28,6 +37,11 @@ class BleWahooAdapter extends fm_1.BleFmAdapter {
     updateSensor(peripheral) {
         this.device = new sensor_1.default(peripheral, { logger: this.logger });
     }
+    checkCapabilities() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.logEvent({ message: 'device capabilities updated', name: this.getSettings().name, interface: this.getSettings().interface, capabilities: this.capabilities });
+        });
+    }
 }
 BleWahooAdapter.INCYCLIST_PROFILE_NAME = 'Smart Trainer';
 exports.default = BleWahooAdapter;

package/lib/ble/wahoo/comms.d.ts

@@ -1,7 +1,7 @@
 import { LegacyProfile } from "../../antv2/types";
 import { CrankData } from "../cp";
 import { IndoorBikeData } from "../fm";
-import BleFitnessMachineDevice from "../fm/sensor";
+import BleFitnessMachineDevice from "../fm/comms";
 import { BleProtocol, BleWriteProps, IBlePeripheralConnector } from "../types";
 export declare const enum OpCode {
     unlock = 32,

package/lib/ble/wahoo/comms.js

@@ -15,10 +15,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const _1 = require(".");
 const consts_1 = require("../../base/consts");
 const consts_2 = require("../consts");
-const sensor_1 = __importDefault(require("../fm/sensor"));
+const comms_1 = __importDefault(require("../fm/comms"));
 const utils_1 = require("../utils");
 const ErgWriteDelay = 2000;
-class BleWahooDevice extends sensor_1.default {
+class BleWahooDevice extends comms_1.default {
     constructor(props) {
         super(props);
         this.prevCrankData = undefined;

package/lib/ble/wahoo/sensor.js

@@ -43,11 +43,8 @@ class BleWahooDevice extends sensor_1.default {
         return [consts_2.INDOOR_BIKE_DATA, consts_2.FTMS_STATUS, consts_2.CSP_MEASUREMENT, consts_2.HR_MEASUREMENT];
     }
     onData(characteristic, data) {
-        const hasData = super.onData(characteristic, data);
-        if (!hasData)
-            return false;
-        const uuid = characteristic.toLowerCase();
-        let res = undefined;
+        const uuid = (0, utils_1.beautifyUUID)(characteristic).toLowerCase();
+        let res;
         switch (uuid) {
             case consts_2.CSP_MEASUREMENT:
                 res = this.parsePower(data);
@@ -62,7 +59,7 @@ class BleWahooDevice extends sensor_1.default {
                 res = this.parseFitnessMachineStatus(data);
                 break;
             default:
-                this.logEvent({ message: 'data', uuid, data: data.toString('hex') });
+                this.logEvent({ message: 'data', uuid, data: Buffer.from(data).toString('hex') });
                 break;
         }
         if (res) {

package/lib/direct-connect/base/interface.d.ts

@@ -29,6 +29,7 @@ export default class DirectConnectInterface extends EventEmitter implements IBle
     protected connected: boolean;
     static getInstance(props?: InterfaceProps): DirectConnectInterface;
     constructor(props: InterfaceProps);
+    setProps(props: InterfaceProps): void;
     createPeripheral(announcement: MulticastDnsAnnouncement): IBlePeripheral;
     createDeviceSetting(service: MulticastDnsAnnouncement): BleDeviceSettings;
     createPeripheralFromSettings(settings: DeviceSettings): IBlePeripheral;
@@ -57,7 +58,7 @@ export default class DirectConnectInterface extends EventEmitter implements IBle
         interface: string;
         name: string;
     }[];
-    protected addService(service: MulticastDnsAnnouncement): void;
+    protected addService(service: MulticastDnsAnnouncement, source?: string): void;
     protected find(service: MulticastDnsAnnouncement): Announcement;
     protected getAll(): Announcement[];
     setDebug(enabled: boolean): void;

package/lib/direct-connect/base/interface.js

@@ -27,6 +27,7 @@ class DirectConnectInterface extends events_1.default {
         if (DirectConnectInterface._instance === undefined)
             DirectConnectInterface._instance = new DirectConnectInterface(props);
         else {
+            DirectConnectInterface._instance.setProps(props);
             if (props.binding) {
                 DirectConnectInterface._instance.setBinding(props.binding);
             }
@@ -54,9 +55,13 @@ class DirectConnectInterface extends events_1.default {
         }
         this.internalEvents = new events_1.default();
         this.instance = ++instanceId;
-        if (this.binding)
+        const { enabled } = props;
+        if (this.binding && (enabled !== null && enabled !== void 0 ? enabled : false))
             this.autoConnect();
     }
+    setProps(props) {
+        this.props = props;
+    }
     createPeripheral(announcement) {
         return peripheral_1.DirectConnectPeripheral.create(announcement);
     }
@@ -83,7 +88,7 @@ class DirectConnectInterface extends events_1.default {
     setBinding(binding) {
         const prev = this.binding;
         this.binding = binding;
-        if (!prev)
+        if (!prev && this.props.enabled)
             this.autoConnect();
     }
     getBinding() {
@@ -107,8 +112,11 @@ class DirectConnectInterface extends events_1.default {
                 this.getBinding().mdns.connect();
                 if (!reconnect)
                     this.logEvent({ message: 'starting multicast DNS scan ..' });
+                this.getBinding().mdns.find(null, (service) => {
+                    this.addService(service, 'unfiltered');
+                });
                 this.getBinding().mdns.find({ type: DC_TYPE }, (service) => {
-                    this.addService(service);
+                    this.addService(service, DC_TYPE);
                 });
             }
             catch (err) {
@@ -159,11 +167,11 @@ class DirectConnectInterface extends events_1.default {
     stopScan() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.isScanning())
-                return Promise.resolve(true);
-            this.logEvent({ message: 'stopping scan ...' });
+                return true;
+            this.logEvent({ message: 'stopping scan ...', interface: 'wifi' });
             const res = yield this.scanTask.stop();
             delete this.scanTask;
-            return res;
+            return (res === true);
         });
     }
     onScanDone() {
@@ -225,8 +233,8 @@ class DirectConnectInterface extends events_1.default {
     buildDeviceSettings(matching = []) {
         return matching.map((name) => ({ interface: DirectConnectInterface.INTERFACE_NAME, name }));
     }
-    addService(service) {
-        var _a;
+    addService(service, source) {
+        var _a, _b;
         try {
             service.transport = this.getName();
             const existing = this.find(service);
@@ -235,10 +243,12 @@ class DirectConnectInterface extends events_1.default {
                 this.services[idx] = { ts: Date.now(), service };
             }
             else {
-                this.logEvent({ message: 'device announced', device: service.name, announcement: service });
                 this.services.push({ ts: Date.now(), service });
+                if (!((_a = service.serviceUUIDs) === null || _a === void 0 ? void 0 : _a.length))
+                    return;
+                this.logEvent({ message: 'device announced', device: service.name, announcement: service, source });
                 this.emitDevice(service);
-                (_a = this.matching) === null || _a === void 0 ? void 0 : _a.push(service.name);
+                (_b = this.matching) === null || _b === void 0 ? void 0 : _b.push(service.name);
             }
         }
         catch (err) {

package/lib/direct-connect/base/peripheral.d.ts

@@ -21,24 +21,24 @@ export declare class DirectConnectPeripheral implements IBlePeripheral {
     constructor(announcement: MulticastDnsAnnouncement);
     get services(): BleService[];
     connect(): Promise<boolean>;
-    disconnect(): Promise<boolean>;
+    disconnect(connectionLost?: boolean): Promise<boolean>;
     isConnected(): boolean;
     isConnecting(): boolean;
     onDisconnect(callback: () => void): void;
     discoverServices(): Promise<string[]>;
     discoverCharacteristics(serviceUUID: string): Promise<BleCharacteristic[]>;
-    subscribe(characteristicUUID: string, callback: (characteristicUuid: string, data: Buffer) => void): Promise<boolean>;
+    subscribe(characteristicUUID: string, callback?: (characteristicUuid: string, data: Buffer) => void): Promise<boolean>;
     unsubscribe(characteristicUUID: string): Promise<boolean>;
     subscribeAll(callback: (characteristicUuid: string, data: Buffer) => void): Promise<boolean>;
     subscribeSelected(characteristics: string[], callback: (characteristicUuid: string, data: Buffer) => void): Promise<boolean>;
-    unsubscribeAll(): Promise<boolean>;
+    unsubscribeAll(connectionLost?: boolean): Promise<void>;
     read(characteristicUUID: string): Promise<Buffer>;
     write(characteristicUUID: string, data: Buffer, options?: BleWriteProps): Promise<Buffer>;
     protected startConnection(): Promise<boolean>;
     protected onPortError(err: Error): void;
     protected onPortClose(): Promise<void>;
     protected getPath(): string;
-    protected stopConnection(): Promise<boolean>;
+    protected stopConnection(connectionLost?: boolean): Promise<boolean>;
     protected getNextSeqNo(): number;
     protected send(seqNo: number, data: Buffer): Promise<Buffer>;
     protected getNextMessage(data: Buffer): Buffer;