incyclist-devices 2.0.18 → 2.0.19

package/lib/ble/base/comms.js

@@ -483,6 +483,7 @@ class BleComms extends events_1.default {
                 throw new Error('not connected');
             try {
                 const { withoutResponse, timeout } = props || {};
+                let fireAndForget = withoutResponse;
                 const connector = this.ble.peripheralCache.getConnector(this.peripheral);
                 const isAlreadySubscribed = connector.isSubscribed(characteristicUuid);
                 if (!withoutResponse && !this.workerIv) {
@@ -495,8 +496,14 @@ class BleComms extends events_1.default {
                         this.onData(uuid, data);
                     });
                     this.logEvent({ message: 'write:subscribing ', characteristic: characteristicUuid });
-                    yield connector.subscribe(characteristicUuid);
-                    this.subscribedCharacteristics.push(characteristicUuid);
+                    try {
+                        yield connector.subscribe(characteristicUuid);
+                        this.subscribedCharacteristics.push(characteristicUuid);
+                    }
+                    catch (err) {
+                        this.logEvent({ message: 'write:subscribing failed', characteristic: characteristicUuid, error: err.message });
+                        fireAndForget = true;
+                    }
                 }
                 return new Promise((resolve, reject) => {
                     const characteristic = this.characteristics.find(c => c.uuid === characteristicUuid || (0, utils_2.uuid)(c.uuid) === characteristicUuid);
@@ -504,9 +511,9 @@ class BleComms extends events_1.default {
                         reject(new Error('Characteristic not found'));
                         return;
                     }
-                    if (withoutResponse) {
-                        this.logEvent({ message: 'writing', data: data.toString('hex'), withoutResponse });
-                        characteristic.write(data, withoutResponse);
+                    if (fireAndForget) {
+                        this.logEvent({ message: 'writing', data: data.toString('hex'), withoutResponse: 'true' });
+                        characteristic.write(data, true);
                         resolve(new ArrayBuffer(0));
                         return;
                     }

package/lib/ble/ble-peripheral.js

@@ -24,8 +24,8 @@ class BlePeripheralConnector {
         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.services = [];
+        this.characteristics = [];
         this.logger = new gd_eventlog_1.EventLogger('BLE');
     }
     logEvent(event) {
@@ -92,18 +92,19 @@ class BlePeripheralConnector {
             }
             return new Promise((done) => __awaiter(this, void 0, void 0, function* () {
                 this.state.isInitializing = true;
-                this.characteristics = undefined;
-                this.services = undefined;
+                this.characteristics = [];
+                this.services = [];
                 try {
                     this.emitter.once('disconnect', () => {
                         done(false);
                     });
                     const res = yield this.peripheral.discoverSomeServicesAndCharacteristicsAsync([], []);
                     if (this.state.isInitializing) {
-                        this.characteristics = res.characteristics;
-                        this.services = res.services.map(s => typeof (s) === 'string' ? s : s.uuid);
+                        this.characteristics = res.characteristics || [];
+                        const services = res.services || [];
+                        this.services = services.map(s => typeof (s) === 'string' ? s : s.uuid);
                         this.state.isInitializing = false;
-                        this.state.isInitialized = this.characteristics !== undefined && this.services !== undefined;
+                        this.state.isInitialized = this.characteristics !== undefined && this.services !== undefined && this.characteristics.length > 0 && this.services.length > 0;
                         this.logEvent({ message: 'initialize done', peripheral: this.peripheral.address, state: this.state });
                         return done(true);
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.0.18",
+  "version": "2.0.19",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",