incyclist-devices 1.4.102 → 1.5.1

package/lib/ble/ble-peripheral.d.ts

@@ -1,36 +1,36 @@
-import { BleCharacteristic, BlePeripheral } from "./ble";
-import BleInterface from "./ble-interface";
-export declare type ConnectorState = {
-    isConnected: boolean;
-    isConnecting: boolean;
-    isInitialized: boolean;
-    isInitializing: boolean;
-    isSubscribing: boolean;
-    subscribed?: string[];
-};
-export default class BlePeripheralConnector {
-    private state;
-    private services;
-    private characteristics;
-    private ble;
-    private peripheral;
-    private logger?;
-    private emitter;
-    constructor(ble: BleInterface, peripheral: BlePeripheral);
-    logEvent(event: any): void;
-    connect(): Promise<void>;
-    reconnect(): Promise<void>;
-    onDisconnect(): void;
-    initialize(enforce?: boolean): Promise<void>;
-    isSubscribed(characteristicUuid: string): boolean;
-    subscribeAll(callback: (characteristicUuid: string, data: any) => void): Promise<string[]>;
-    subscribe(characteristicUuid: string, timeout?: number): Promise<boolean>;
-    onData(characteristicUuid: string, data: any): void;
-    on(characteristicUuid: string, callback: (characteristicUuid: string, data: any) => void): void;
-    off(characteristicUuid: string, callback: (characteristicUuid: string, data: any) => void): void;
-    removeAllListeners(characteristicUuid: string): void;
-    getState(): string;
-    getCharachteristics(): BleCharacteristic[];
-    getServices(): string[];
-    getPeripheral(): BlePeripheral;
-}
+import { BleCharacteristic, BlePeripheral } from "./ble";
+import BleInterface from "./ble-interface";
+export declare type ConnectorState = {
+    isConnected: boolean;
+    isConnecting: boolean;
+    isInitialized: boolean;
+    isInitializing: boolean;
+    isSubscribing: boolean;
+    subscribed?: string[];
+};
+export default class BlePeripheralConnector {
+    private state;
+    private services;
+    private characteristics;
+    private ble;
+    private peripheral;
+    private logger?;
+    private emitter;
+    constructor(ble: BleInterface, peripheral: BlePeripheral);
+    logEvent(event: any): void;
+    connect(): Promise<void>;
+    reconnect(): Promise<void>;
+    onDisconnect(): void;
+    initialize(enforce?: boolean): Promise<void>;
+    isSubscribed(characteristicUuid: string): boolean;
+    subscribeAll(callback: (characteristicUuid: string, data: any) => void): Promise<string[]>;
+    subscribe(characteristicUuid: string, timeout?: number): Promise<boolean>;
+    onData(characteristicUuid: string, data: any): void;
+    on(characteristicUuid: string, callback: (characteristicUuid: string, data: any) => void): void;
+    off(characteristicUuid: string, callback: (characteristicUuid: string, data: any) => void): void;
+    removeAllListeners(characteristicUuid: string): void;
+    getState(): string;
+    getCharachteristics(): BleCharacteristic[];
+    getServices(): string[];
+    getPeripheral(): BlePeripheral;
+}

package/lib/ble/ble-peripheral.js

@@ -1,200 +1,200 @@
-"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 };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const ble_1 = require("./ble");
-const gd_eventlog_1 = require("gd-eventlog");
-const events_1 = __importDefault(require("events"));
-class BlePeripheralConnector {
-    constructor(ble, peripheral) {
-        this.ble = ble;
-        this.peripheral = peripheral;
-        this.emitter = new events_1.default();
-        if (!this.peripheral || !this.ble)
-            throw new Error('Illegal Arguments');
-        this.state = { subscribed: [], isConnected: false, isConnecting: false, isInitialized: false, isInitializing: false, isSubscribing: false };
-        this.services = undefined;
-        this.characteristics = undefined;
-        this.logger = new gd_eventlog_1.EventLogger('BLE');
-    }
-    logEvent(event) {
-        if (this.logger) {
-            this.logger.logEvent(event);
-        }
-        if (process.env.BLE_DEBUG) {
-            console.log('~~~BLE:', event);
-        }
-    }
-    connect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.state.isConnected)
-                return;
-            this.logEvent({ message: 'connect', peripheral: this.peripheral.address, state: this.state });
-            this.state.isConnecting = true;
-            try {
-                this.peripheral.on('connect', () => { console.log('~~~ peripheral connected', this.peripheral); });
-                this.peripheral.on('disconnect', () => { this.onDisconnect(); });
-                if (!this.state.isConnected || (this.peripheral && this.peripheral.state !== 'connected')) {
-                    yield this.peripheral.connectAsync();
-                }
-                this.state.isConnected = this.peripheral.state === 'connected';
-            }
-            catch (err) {
-                this.logEvent({ message: 'Error', fn: 'connect()', error: err.message });
-            }
-            this.state.isConnecting = false;
-        });
-    }
-    reconnect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.connect();
-        });
-    }
-    onDisconnect() {
-        this.peripheral.removeAllListeners('connect');
-        this.peripheral.removeAllListeners('disconnect');
-        this.logEvent({ message: 'onDisconnected', peripheral: this.peripheral.address, state: this.state });
-        this.state.isConnected = false;
-        this.state.isConnecting = false;
-        this.emitter.emit('disconnect');
-    }
-    initialize(enforce = false) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.state.isInitialized && !enforce)
-                return;
-            this.logEvent({ message: 'initialize', peripheral: this.peripheral.address, state: this.state, enforce });
-            if (this.state.isInitialized && enforce) {
-                this.state.isInitialized = false;
-            }
-            this.state.isInitializing = true;
-            this.characteristics = undefined;
-            this.services = undefined;
-            try {
-                const res = yield this.peripheral.discoverSomeServicesAndCharacteristicsAsync([], []);
-                this.characteristics = res.characteristics;
-                this.services = res.services;
-            }
-            catch (err) {
-            }
-            this.state.isInitializing = false;
-            this.state.isInitialized = this.characteristics !== undefined && this.services !== undefined;
-        });
-    }
-    isSubscribed(characteristicUuid) {
-        return this.state.subscribed.find(c => c === characteristicUuid || (0, ble_1.uuid)(c) === characteristicUuid || c === (0, ble_1.uuid)(characteristicUuid)) !== undefined;
-    }
-    subscribeAll(callback) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const cnt = this.characteristics.length;
-            this.state.isSubscribing = true;
-            const subscribed = [];
-            if (!this.state.subscribed)
-                this.state.subscribed = [];
-            for (let i = 0; i < cnt; i++) {
-                try {
-                    const c = this.characteristics[i];
-                    const isNotify = c.properties.find(p => p === 'notify');
-                    if (isNotify && subscribed.find(uuid => uuid === c.uuid) === undefined) {
-                        c.on('data', (data, _isNotification) => {
-                            this.onData((0, ble_1.uuid)(c.uuid), data);
-                        });
-                        if (callback) {
-                            this.on((0, ble_1.uuid)(c.uuid), callback);
-                        }
-                        this.logEvent({ message: 'subscribe', peripheral: this.peripheral.address, characteristic: c.uuid, uuid: (0, ble_1.uuid)(c.uuid) });
-                        if (this.state.subscribed.find(uuid => uuid === c.uuid) === undefined) {
-                            try {
-                                yield this.subscribe(c.uuid, 3000);
-                                subscribed.push(c.uuid);
-                            }
-                            catch (err) {
-                                this.logEvent({ message: 'cannot subscribe', peripheral: this.peripheral.address, characteristic: c.uuid, error: err.message || err });
-                            }
-                        }
-                    }
-                }
-                catch (err) {
-                    this.logEvent({ message: 'error', fn: 'subscribeAll()', error: err.message || err, stack: err.stack });
-                }
-            }
-            this.state.isSubscribing = false;
-            this.state.subscribed = subscribed;
-            return subscribed;
-        });
-    }
-    subscribe(characteristicUuid, timeout) {
-        this.logEvent({ message: 'subscribe attempt', characteristic: characteristicUuid, characteristics: this.characteristics.map(c => ({ characteristic: c.uuid, uuid: (0, ble_1.uuid)(c.uuid) })) });
-        return new Promise((resolve, reject) => {
-            try {
-                const characteristic = this.characteristics.find(c => (0, ble_1.uuid)(c.uuid) === (0, ble_1.uuid)(characteristicUuid) || (0, ble_1.uuid)(c.uuid) === (0, ble_1.uuid)(characteristicUuid));
-                if (!characteristic) {
-                    reject(new Error('Characteristic not found'));
-                    return;
-                }
-                this.logEvent({ message: 'subscribe', peripheral: this.peripheral.address, characteristic: characteristic.uuid });
-                characteristic.removeAllListeners('data');
-                characteristic.on('data', (data, _isNotification) => {
-                    this.onData((0, ble_1.uuid)(characteristicUuid), data);
-                });
-                let to;
-                if (timeout) {
-                    to = setTimeout(() => {
-                        this.logEvent({ message: 'subscribe result', characteristic: characteristicUuid, error: 'timeout' });
-                        reject(new Error('timeout'));
-                    }, timeout);
-                }
-                characteristic.subscribe((err) => {
-                    if (to)
-                        clearTimeout(to);
-                    this.logEvent({ message: 'subscribe result', characteristic: characteristicUuid, error: err });
-                    if (err)
-                        reject(err);
-                    else {
-                        this.state.subscribed.push(characteristicUuid);
-                        resolve(true);
-                    }
-                });
-            }
-            catch (err) {
-                this.logEvent({ message: 'error', error: err.message || err, stack: err.stack });
-            }
-        });
-    }
-    onData(characteristicUuid, data) {
-        this.emitter.emit((0, ble_1.uuid)(characteristicUuid), characteristicUuid, data);
-    }
-    on(characteristicUuid, callback) {
-        if (callback)
-            this.emitter.on((0, ble_1.uuid)(characteristicUuid), callback);
-    }
-    off(characteristicUuid, callback) {
-        if (callback)
-            this.emitter.off((0, ble_1.uuid)(characteristicUuid), callback);
-    }
-    removeAllListeners(characteristicUuid) {
-        this.emitter.removeAllListeners((0, ble_1.uuid)(characteristicUuid));
-    }
-    getState() {
-        return this.peripheral.state;
-    }
-    getCharachteristics() {
-        return this.characteristics;
-    }
-    getServices() {
-        return this.services;
-    }
-    getPeripheral() {
-        return this.peripheral;
-    }
-}
-exports.default = BlePeripheralConnector;
+"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 };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ble_1 = require("./ble");
+const gd_eventlog_1 = require("gd-eventlog");
+const events_1 = __importDefault(require("events"));
+class BlePeripheralConnector {
+    constructor(ble, peripheral) {
+        this.ble = ble;
+        this.peripheral = peripheral;
+        this.emitter = new events_1.default();
+        if (!this.peripheral || !this.ble)
+            throw new Error('Illegal Arguments');
+        this.state = { subscribed: [], isConnected: false, isConnecting: false, isInitialized: false, isInitializing: false, isSubscribing: false };
+        this.services = undefined;
+        this.characteristics = undefined;
+        this.logger = new gd_eventlog_1.EventLogger('BLE');
+    }
+    logEvent(event) {
+        if (this.logger) {
+            this.logger.logEvent(event);
+        }
+        if (process.env.BLE_DEBUG) {
+            console.log('~~~BLE:', event);
+        }
+    }
+    connect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.state.isConnected)
+                return;
+            this.logEvent({ message: 'connect', peripheral: this.peripheral.address, state: this.state });
+            this.state.isConnecting = true;
+            try {
+                this.peripheral.on('connect', () => { console.log('~~~ peripheral connected', this.peripheral); });
+                this.peripheral.on('disconnect', () => { this.onDisconnect(); });
+                if (!this.state.isConnected || (this.peripheral && this.peripheral.state !== 'connected')) {
+                    yield this.peripheral.connectAsync();
+                }
+                this.state.isConnected = this.peripheral.state === 'connected';
+            }
+            catch (err) {
+                this.logEvent({ message: 'Error', fn: 'connect()', error: err.message });
+            }
+            this.state.isConnecting = false;
+        });
+    }
+    reconnect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.connect();
+        });
+    }
+    onDisconnect() {
+        this.peripheral.removeAllListeners('connect');
+        this.peripheral.removeAllListeners('disconnect');
+        this.logEvent({ message: 'onDisconnected', peripheral: this.peripheral.address, state: this.state });
+        this.state.isConnected = false;
+        this.state.isConnecting = false;
+        this.emitter.emit('disconnect');
+    }
+    initialize(enforce = false) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.state.isInitialized && !enforce)
+                return;
+            this.logEvent({ message: 'initialize', peripheral: this.peripheral.address, state: this.state, enforce });
+            if (this.state.isInitialized && enforce) {
+                this.state.isInitialized = false;
+            }
+            this.state.isInitializing = true;
+            this.characteristics = undefined;
+            this.services = undefined;
+            try {
+                const res = yield this.peripheral.discoverSomeServicesAndCharacteristicsAsync([], []);
+                this.characteristics = res.characteristics;
+                this.services = res.services;
+            }
+            catch (err) {
+            }
+            this.state.isInitializing = false;
+            this.state.isInitialized = this.characteristics !== undefined && this.services !== undefined;
+        });
+    }
+    isSubscribed(characteristicUuid) {
+        return this.state.subscribed.find(c => c === characteristicUuid || (0, ble_1.uuid)(c) === characteristicUuid || c === (0, ble_1.uuid)(characteristicUuid)) !== undefined;
+    }
+    subscribeAll(callback) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cnt = this.characteristics.length;
+            this.state.isSubscribing = true;
+            const subscribed = [];
+            if (!this.state.subscribed)
+                this.state.subscribed = [];
+            for (let i = 0; i < cnt; i++) {
+                try {
+                    const c = this.characteristics[i];
+                    const isNotify = c.properties.find(p => p === 'notify');
+                    if (isNotify && subscribed.find(uuid => uuid === c.uuid) === undefined) {
+                        c.on('data', (data, _isNotification) => {
+                            this.onData((0, ble_1.uuid)(c.uuid), data);
+                        });
+                        if (callback) {
+                            this.on((0, ble_1.uuid)(c.uuid), callback);
+                        }
+                        this.logEvent({ message: 'subscribe', peripheral: this.peripheral.address, characteristic: c.uuid, uuid: (0, ble_1.uuid)(c.uuid) });
+                        if (this.state.subscribed.find(uuid => uuid === c.uuid) === undefined) {
+                            try {
+                                yield this.subscribe(c.uuid, 3000);
+                                subscribed.push(c.uuid);
+                            }
+                            catch (err) {
+                                this.logEvent({ message: 'cannot subscribe', peripheral: this.peripheral.address, characteristic: c.uuid, error: err.message || err });
+                            }
+                        }
+                    }
+                }
+                catch (err) {
+                    this.logEvent({ message: 'error', fn: 'subscribeAll()', error: err.message || err, stack: err.stack });
+                }
+            }
+            this.state.isSubscribing = false;
+            this.state.subscribed = subscribed;
+            return subscribed;
+        });
+    }
+    subscribe(characteristicUuid, timeout) {
+        this.logEvent({ message: 'subscribe attempt', characteristic: characteristicUuid, characteristics: this.characteristics.map(c => ({ characteristic: c.uuid, uuid: (0, ble_1.uuid)(c.uuid) })) });
+        return new Promise((resolve, reject) => {
+            try {
+                const characteristic = this.characteristics.find(c => (0, ble_1.uuid)(c.uuid) === (0, ble_1.uuid)(characteristicUuid) || (0, ble_1.uuid)(c.uuid) === (0, ble_1.uuid)(characteristicUuid));
+                if (!characteristic) {
+                    reject(new Error('Characteristic not found'));
+                    return;
+                }
+                this.logEvent({ message: 'subscribe', peripheral: this.peripheral.address, characteristic: characteristic.uuid });
+                characteristic.removeAllListeners('data');
+                characteristic.on('data', (data, _isNotification) => {
+                    this.onData((0, ble_1.uuid)(characteristicUuid), data);
+                });
+                let to;
+                if (timeout) {
+                    to = setTimeout(() => {
+                        this.logEvent({ message: 'subscribe result', characteristic: characteristicUuid, error: 'timeout' });
+                        reject(new Error('timeout'));
+                    }, timeout);
+                }
+                characteristic.subscribe((err) => {
+                    if (to)
+                        clearTimeout(to);
+                    this.logEvent({ message: 'subscribe result', characteristic: characteristicUuid, error: err });
+                    if (err)
+                        reject(err);
+                    else {
+                        this.state.subscribed.push(characteristicUuid);
+                        resolve(true);
+                    }
+                });
+            }
+            catch (err) {
+                this.logEvent({ message: 'error', error: err.message || err, stack: err.stack });
+            }
+        });
+    }
+    onData(characteristicUuid, data) {
+        this.emitter.emit((0, ble_1.uuid)(characteristicUuid), characteristicUuid, data);
+    }
+    on(characteristicUuid, callback) {
+        if (callback)
+            this.emitter.on((0, ble_1.uuid)(characteristicUuid), callback);
+    }
+    off(characteristicUuid, callback) {
+        if (callback)
+            this.emitter.off((0, ble_1.uuid)(characteristicUuid), callback);
+    }
+    removeAllListeners(characteristicUuid) {
+        this.emitter.removeAllListeners((0, ble_1.uuid)(characteristicUuid));
+    }
+    getState() {
+        return this.peripheral.state;
+    }
+    getCharachteristics() {
+        return this.characteristics;
+    }
+    getServices() {
+        return this.services;
+    }
+    getPeripheral() {
+        return this.peripheral;
+    }
+}
+exports.default = BlePeripheralConnector;

package/lib/ble/ble-st-mode.d.ts

@@ -1,15 +1,15 @@
-import CyclingMode, { CyclingModeProperty, IncyclistBikeData, UpdateRequest } from "../CyclingMode";
-import { DeviceAdapter } from "../Device";
-import PowerBasedCyclingModeBase from "../modes/power-base";
-export default class FtmsCyclingMode extends PowerBasedCyclingModeBase implements CyclingMode {
-    prevRequest: UpdateRequest;
-    hasBikeUpdate: boolean;
-    constructor(adapter: DeviceAdapter, props?: any);
-    getName(): string;
-    getDescription(): string;
-    getProperties(): CyclingModeProperty[];
-    getProperty(name: string): CyclingModeProperty;
-    getBikeInitRequest(): UpdateRequest;
-    sendBikeUpdate(request: UpdateRequest): UpdateRequest;
-    updateData(bikeData: IncyclistBikeData): any;
-}
+import CyclingMode, { CyclingModeProperty, IncyclistBikeData, UpdateRequest } from "../cycling-mode";
+import { DeviceAdapter } from "../device";
+import PowerBasedCyclingModeBase from "../modes/power-base";
+export default class FtmsCyclingMode extends PowerBasedCyclingModeBase implements CyclingMode {
+    prevRequest: UpdateRequest;
+    hasBikeUpdate: boolean;
+    constructor(adapter: DeviceAdapter, props?: any);
+    getName(): string;
+    getDescription(): string;
+    getProperties(): CyclingModeProperty[];
+    getProperty(name: string): CyclingModeProperty;
+    getBikeInitRequest(): UpdateRequest;
+    sendBikeUpdate(request: UpdateRequest): UpdateRequest;
+    updateData(bikeData: IncyclistBikeData): any;
+}