incyclist-devices 2.3.0-beta.5 → 2.3.0-beta.7

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

@@ -1,5 +1,5 @@
 import IncyclistDevice from "../../base/adpater";
-import { BleDeviceProperties, BleDeviceSettings, BleStartProperties, IBlePeripheral } from "../types";
+import { BleDeviceProperties, BleDeviceSettings, BleStartProperties, IBleInterface, IBlePeripheral } from "../types";
 import { IAdapter, IncyclistBikeData, IncyclistAdapterData, DeviceProperties } from "../../types";
 import { BleDeviceData } from "./types";
 import { LegacyProfile } from "../../antv2/types";
@@ -51,6 +51,7 @@ export default class BleAdapter<TDeviceData extends BleDeviceData, TDevice exten
     stop(): Promise<boolean>;
     pause(): Promise<boolean>;
     resume(): Promise<boolean>;
+    protected getBle(): IBleInterface<any>;
     update(): void;
     setCyclingMode(mode: string | ICyclingMode, settings?: any, sendInitCommands?: boolean): void;
 }

package/lib/ble/base/adapter.js

@@ -38,20 +38,20 @@ class BleAdapter extends adpater_1.default {
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            const iface = interface_factory_1.BleMultiTransportInterfaceFactory.createInstance(this.getInterface());
-            return yield iface.connect();
+            const ble = this.getBle();
+            return yield ble.connect();
         });
     }
     getPeripheral() {
-        const iface = interface_factory_1.BleMultiTransportInterfaceFactory.createInstance(this.getInterface());
-        const p = iface === null || iface === void 0 ? void 0 : iface.createPeripheralFromSettings(this.settings);
+        const ble = this.getBle();
+        const p = ble === null || ble === void 0 ? void 0 : ble.createPeripheralFromSettings(this.settings);
         return p;
     }
     waitForPeripheral() {
         return __awaiter(this, void 0, void 0, function* () {
             this.logEvent({ message: 'waiting for sensor ...', device: this.getName(), interface: this.getInterface() });
-            const iface = interface_factory_1.BleMultiTransportInterfaceFactory.createInstance(this.getInterface());
-            const peripheral = yield iface.waitForPeripheral(this.settings);
+            const ble = this.getBle();
+            const peripheral = yield ble.waitForPeripheral(this.settings);
             this.updateSensor(peripheral);
         });
     }
@@ -256,7 +256,7 @@ class BleAdapter extends adpater_1.default {
     startAdapter(startProps) {
         return __awaiter(this, void 0, void 0, function* () {
             const props = this.getStartProps(startProps);
-            const { timeout = this.getDefaultStartupTimeout() } = startProps;
+            const { timeout = this.getDefaultStartupTimeout() } = startProps !== null && startProps !== void 0 ? startProps : {};
             const wasPaused = this.paused;
             const preCheckResult = yield this.startPreChecks(props);
             if (preCheckResult === 'done') {
@@ -349,8 +349,8 @@ class BleAdapter extends adpater_1.default {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const res = yield _super.pause.call(this);
-            const iface = interface_factory_1.BleMultiTransportInterfaceFactory.createInstance(this.getInterface());
-            iface.pauseLogging();
+            const ble = this.getBle();
+            ble.pauseLogging();
             return res;
         });
     }
@@ -359,12 +359,15 @@ class BleAdapter extends adpater_1.default {
             resume: { get: () => super.resume }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            const iface = interface_factory_1.BleMultiTransportInterfaceFactory.createInstance(this.getInterface());
-            iface.resumeLogging();
+            const ble = this.getBle();
+            ble.resumeLogging();
             const res = yield _super.resume.call(this);
             return res;
         });
     }
+    getBle() {
+        return interface_factory_1.BleMultiTransportInterfaceFactory.createInstance(this.getInterface());
+    }
     update() {
     }
     setCyclingMode(mode, settings, sendInitCommands) {

package/lib/ble/base/interface.js

@@ -312,6 +312,7 @@ class BleInterface extends events_1.default {
             return;
         }
         if (announcement.serviceUUIDs.length === 0) {
+            return;
             if (this.isCompleting(announcement)) {
                 return;
             }

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

@@ -27,7 +27,7 @@ export declare class DirectConnectPeripheral implements IBlePeripheral {
     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>;

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

@@ -133,6 +133,10 @@ class DirectConnectPeripheral {
     subscribe(characteristicUUID, callback) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            const uuid = (0, utils_1.parseUUID)(characteristicUUID);
+            if (this.subscribed.includes(uuid)) {
+                return true;
+            }
             const seqNo = this.getNextSeqNo();
             const message = new messages_1.EnableCharacteristicNotificationsMessage();
             const request = message.createRequest(seqNo, { characteristicUUID: (0, utils_1.parseUUID)(characteristicUUID), enable: true });
@@ -149,10 +153,12 @@ class DirectConnectPeripheral {
                 this.logEvent({ message: 'EnableCharacteristicNotifications response', path: this.getPath(), rc, characteristic: (0, utils_1.beautifyUUID)(res.body.characteristicUUID), raw: response.toString('hex') });
                 const confirmed = res.body.characteristicUUID;
                 if ((0, utils_1.parseUUID)(confirmed) === (0, utils_1.parseUUID)(characteristicUUID)) {
-                    this.subscribed.push(characteristicUUID);
-                    this.eventEmitter.on((0, utils_1.parseUUID)(characteristicUUID), (data) => {
-                        callback(characteristicUUID, data);
-                    });
+                    this.subscribed.push((0, utils_1.parseUUID)(characteristicUUID));
+                    if (callback) {
+                        this.eventEmitter.on((0, utils_1.parseUUID)(characteristicUUID), (data) => {
+                            callback(characteristicUUID, data);
+                        });
+                    }
                     return true;
                 }
                 return false;
@@ -183,7 +189,7 @@ class DirectConnectPeripheral {
                     this.logEvent({ message: 'EnableCharacteristicNotifications response', path: this.getPath(), rc, characteristic: (0, utils_1.beautifyUUID)(res.body.characteristicUUID), raw: response.toString('hex') });
                     const confirmed = res.body.characteristicUUID;
                     if ((0, utils_1.parseUUID)(confirmed) === (0, utils_1.parseUUID)(characteristicUUID)) {
-                        this.subscribed.splice(this.subscribed.indexOf(characteristicUUID), 1);
+                        this.subscribed.splice(this.subscribed.indexOf((0, utils_1.parseUUID)(characteristicUUID)), 1);
                         this.eventEmitter.removeAllListeners((0, utils_1.parseUUID)(characteristicUUID));
                         return true;
                     }
@@ -282,7 +288,7 @@ class DirectConnectPeripheral {
         return __awaiter(this, void 0, void 0, function* () {
             const promises = [];
             this.subscribed.forEach(characteristicUUID => {
-                promises.push(this.unsubscribe(characteristicUUID));
+                promises.push(this.unsubscribe((0, utils_1.parseUUID)(characteristicUUID)));
             });
             yield Promise.allSettled(promises);
             return true;
@@ -318,17 +324,18 @@ class DirectConnectPeripheral {
     write(characteristicUUID, data, options) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise(resolve => {
+                const seqNo = this.getNextSeqNo();
+                const message = new messages_1.WriteCharacteristicMessage();
+                const request = message.createRequest(seqNo, { characteristicUUID: (0, utils_1.parseUUID)(characteristicUUID), characteristicData: data });
+                let response;
+                let characteristic = characteristicUUID;
                 if (!(options === null || options === void 0 ? void 0 : options.withoutResponse)) {
+                    this.subscribe(characteristicUUID);
                     const uuid = (0, utils_1.parseUUID)(characteristicUUID);
                     this.eventEmitter.once(uuid, (data) => {
                         resolve(data);
                     });
                 }
-                const seqNo = this.getNextSeqNo();
-                const message = new messages_1.WriteCharacteristicMessage();
-                const request = message.createRequest(seqNo, { characteristicUUID: (0, utils_1.parseUUID)(characteristicUUID), characteristicData: data });
-                let response;
-                let characteristic = characteristicUUID;
                 this.logEvent({ message: 'WriteCharacteristic request', path: this.getPath(), characteristic: (0, utils_1.beautifyUUID)(characteristicUUID),
                     data: data.toString('hex'),
                     raw: request.toString('hex') });
@@ -488,10 +495,11 @@ class DirectConnectPeripheral {
                     this.msgSeqNo = notification.header.seqNum;
                     const uuid = (0, utils_1.parseUUID)(notification.body.characteristicUUID);
                     this.logEvent({ message: 'Characteristic notification', path: this.getPath(), characteristic: (0, utils_1.beautifyUUID)(notification.body.characteristicUUID),
-                        data: Buffer.from(notification.body.characteristicData).toString('hex') });
+                        data: Buffer.from(notification.body.characteristicData).toString('hex'), raw: incoming.toString('hex') });
                     this.eventEmitter.emit(uuid, notification.body.characteristicData);
                 }
                 else {
+                    this.logEvent({ message: 'incoming message', path: this.getPath(), raw: incoming.toString('hex'), header });
                     this.eventEmitter.emit(`response-${header.seqNum}`, incoming);
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.3.0-beta.5",
+  "version": "2.3.0-beta.7",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",