incyclist-devices 2.3.0-beta.1 → 2.3.0-beta.2

package/lib/ble/base/adapter.js

@@ -49,7 +49,7 @@ class BleAdapter extends adpater_1.default {
     }
     waitForPeripheral() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logEvent({ message: 'waiting for sensor ...' });
+            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);
             this.updateSensor(peripheral);
@@ -121,7 +121,7 @@ class BleAdapter extends adpater_1.default {
         if (this.isStopped() || this.isPaused())
             return;
         try {
-            this.logEvent({ message: 'refreshDeviceData', data: this.deviceData, isControllable: this.isControllable() });
+            this.logEvent({ message: 'refreshDeviceData', device: this.getName(), interface: this.getInterface(), data: this.deviceData, isControllable: this.isControllable() });
             if (this.isControllable()) {
                 const mappedData = this.mapData(this.deviceData);
                 const incyclistData = this.getCyclingMode().updateData(mappedData);
@@ -133,7 +133,7 @@ class BleAdapter extends adpater_1.default {
             this.emitData(this.data);
         }
         catch (err) {
-            this.logEvent({ message: 'error', fn: 'refreshDeviceData', error: err.message, stack: err.stack });
+            this.logEvent({ message: 'error', fn: 'refreshDeviceData', device: this.getName(), interface: this.getInterface(), error: err.message, stack: err.stack });
         }
     }
     onDeviceData(deviceData) {
@@ -143,7 +143,7 @@ class BleAdapter extends adpater_1.default {
             this.deviceData = Object.assign({}, deviceData);
             if (!this.canEmitData())
                 return;
-            this.logEvent({ message: 'onDeviceData', data: deviceData, isControllable: this.isControllable() });
+            this.logEvent({ message: 'onDeviceData', device: this.getName(), interface: this.getInterface(), data: deviceData, isControllable: this.isControllable() });
             if (this.isControllable()) {
                 const mappedData = this.mapData(deviceData);
                 const incyclistData = this.getCyclingMode().updateData(mappedData);
@@ -155,7 +155,7 @@ class BleAdapter extends adpater_1.default {
             this.emitData(this.data);
         }
         catch (err) {
-            this.logEvent({ message: 'Error', fn: 'onDeviceData', error: err.message, stack: err.stack });
+            this.logEvent({ message: 'Error', fn: 'onDeviceData', device: this.getName(), interface: this.getInterface(), error: err.message, stack: err.stack });
         }
     }
     mapData(deviceData) {
@@ -240,11 +240,11 @@ class BleAdapter extends adpater_1.default {
                 errorOnTimeout: false,
                 timeout: startupTimeout
             });
-            this.logEvent({ message: 'wait for sensor data', device: this.getName() });
+            this.logEvent({ message: 'wait for sensor data', device: this.getName(), interface: this.getInterface() });
             const hasData = yield waitTask.run();
             clearInterval(iv);
             if (hasData)
-                this.logEvent({ message: 'sensor data received', device: this.getName() });
+                this.logEvent({ message: 'sensor data received', device: this.getName(), interface: this.getInterface() });
         });
     }
     checkCapabilities() {
@@ -264,22 +264,22 @@ class BleAdapter extends adpater_1.default {
                 return this.started;
             }
             if (preCheckResult === 'connection-failed') {
-                this.logEvent({ message: 'start result: error', error: 'could not start device, reason:could not connect', protocol: this.getProtocolName() });
+                this.logEvent({ message: 'start result: error', error: 'could not start device, reason:could not connect', device: this.getName(), interface: this.getInterface(), protocol: this.getProtocolName() });
                 yield (0, utils_1.resolveNextTick)();
                 return false;
             }
-            this.logEvent({ message: 'starting device', device: this.getName(), props, isStarted: this.started });
+            this.logEvent({ message: 'starting device', device: this.getName(), interface: this.getInterface(), props, isStarted: this.started });
             try {
                 const connected = yield this.startSensor();
                 if (connected) {
-                    this.logEvent({ message: 'peripheral connected', device: this.getName(), props });
+                    this.logEvent({ message: 'peripheral connected', device: this.getName(), interface: this.getInterface(), props });
                 }
                 else {
-                    this.logEvent({ message: 'peripheral connection failed', device: this.getName(), reason: 'unknown', props });
+                    this.logEvent({ message: 'peripheral connection failed', device: this.getName(), interface: this.getInterface(), reason: 'unknown', props });
                     return false;
                 }
                 yield this.waitForInitialData(timeout);
-                yield this.checkCapabilities();
+                this.checkCapabilities();
                 if (this.hasCapability(types_1.IncyclistCapability.Control))
                     yield this.initControl(startProps);
                 this.resetData();
@@ -290,7 +290,7 @@ class BleAdapter extends adpater_1.default {
                 return true;
             }
             catch (err) {
-                this.logEvent({ message: 'start result: error', error: err.message, protocol: this.getProtocolName() });
+                this.logEvent({ message: 'start result: error', error: err.message, device: this.getName(), interface: this.getInterface(), protocol: this.getProtocolName() });
                 return false;
             }
         });
@@ -315,14 +315,14 @@ class BleAdapter extends adpater_1.default {
     }
     stop() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logEvent({ message: 'stopping device', device: this.getName() });
+            this.logEvent({ message: 'stopping device', device: this.getName(), interface: this.getInterface() });
             if (this.isStarting()) {
                 yield this.startTask.stop();
             }
             let reason = 'unknown';
             let stopped = false;
             if (!this.getComms()) {
-                this.logEvent({ message: 'device stopped - not started yet', device: this.getName() });
+                this.logEvent({ message: 'device stopped - not started yet', device: this.getName(), interface: this.getInterface() });
                 return true;
             }
             this.getComms().reset();
@@ -333,10 +333,10 @@ class BleAdapter extends adpater_1.default {
                 reason = err.message;
             }
             if (stopped) {
-                this.logEvent({ message: 'device stopped', device: this.getName() });
+                this.logEvent({ message: 'device stopped', device: this.getName(), interface: this.getInterface() });
             }
             else {
-                this.logEvent({ message: 'stopping device failed', device: this.getName(), reason });
+                this.logEvent({ message: 'stopping device failed', device: this.getName(), interface: this.getInterface(), reason });
             }
             this.started = false;
             this.stopped = true;

package/lib/ble/utils.js

@@ -6,6 +6,7 @@ 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),

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

@@ -57,7 +57,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

@@ -108,10 +108,10 @@ class DirectConnectInterface extends events_1.default {
                 if (!reconnect)
                     this.logEvent({ message: 'starting multicast DNS scan ..' });
                 this.getBinding().mdns.find(null, (service) => {
-                    this.addService(service);
+                    this.addService(service, 'unfiltered');
                 });
                 this.getBinding().mdns.find({ type: DC_TYPE }, (service) => {
-                    this.addService(service);
+                    this.addService(service, DC_TYPE);
                 });
             }
             catch (err) {
@@ -228,7 +228,7 @@ class DirectConnectInterface extends events_1.default {
     buildDeviceSettings(matching = []) {
         return matching.map((name) => ({ interface: DirectConnectInterface.INTERFACE_NAME, name }));
     }
-    addService(service) {
+    addService(service, source) {
         var _a, _b;
         try {
             service.transport = this.getName();
@@ -238,7 +238,7 @@ 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.logEvent({ message: 'device announced', device: service.name, announcement: service, source });
                 this.services.push({ ts: Date.now(), service });
                 if (service.type !== DC_TYPE && ((_a = service.serviceUUIDs) === null || _a === void 0 ? void 0 : _a.length) === 0)
                     return;

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

@@ -82,12 +82,19 @@ class DirectConnectPeripheral {
             const seqNo = this.getNextSeqNo();
             const message = new messages_1.DiscoverServiceMessage();
             const request = message.createRequest(seqNo, {});
+            let response;
             this.logEvent({ message: 'DiscoverServices request', path: this.getPath(), raw: request.toString('hex') });
-            const response = yield this.send(seqNo, request);
-            const res = message.parseResponse(response);
-            const uuids = res.body.serviceDefinitions.map(s => (0, utils_1.beautifyUUID)(s.serviceUUID));
-            this.logEvent({ message: 'DiscoverServices response', path: this.getPath(), uuids, raw: request.toString('hex') });
-            return res.body.serviceDefinitions.map(s => s.serviceUUID);
+            try {
+                response = yield this.send(seqNo, request);
+                const res = message.parseResponse(response);
+                const uuids = res.body.serviceDefinitions.map(s => (0, utils_1.beautifyUUID)(s.serviceUUID));
+                this.logEvent({ message: 'DiscoverServices response', path: this.getPath(), uuids, raw: request.toString('hex') });
+                return res.body.serviceDefinitions.map(s => s.serviceUUID);
+            }
+            catch (err) {
+                this.logEvent({ message: 'DiscoverServices failed', path: this.getPath(), raw: response === null || response === void 0 ? void 0 : response.toString('hex'), reason: err.message });
+                return [];
+            }
         });
     }
     discoverCharacteristics(serviceUUID) {
@@ -95,13 +102,20 @@ class DirectConnectPeripheral {
             const seqNo = this.getNextSeqNo();
             const message = new messages_1.DiscoverCharacteristicsMessage();
             const request = message.createRequest(seqNo, { serviceUUID: (0, utils_1.parseUUID)(serviceUUID) });
+            let response;
             this.logEvent({ message: 'DiscoverCharacteritics request', path: this.getPath(), service: (0, utils_1.beautifyUUID)(serviceUUID), raw: request.toString('hex') });
-            const response = yield this.send(seqNo, request);
-            const res = message.parseResponse(response);
-            const service = (0, utils_1.beautifyUUID)(res.body.serviceUUID);
-            const characteristics = res.body.characteristicDefinitions.map(cd => `${(0, utils_1.beautifyUUID)(cd.characteristicUUID)}:${cd.properties.join('/')}`);
-            this.logEvent({ message: 'DiscoverCharacteritics response', path: this.getPath(), service, characteristics, raw: request.toString('hex') });
-            return res.body.characteristicDefinitions.map(c => ({ uuid: c.characteristicUUID, properties: c.properties }));
+            try {
+                response = yield this.send(seqNo, request);
+                const res = message.parseResponse(response);
+                const service = (0, utils_1.beautifyUUID)(res.body.serviceUUID);
+                const characteristics = res.body.characteristicDefinitions.map(cd => `${(0, utils_1.beautifyUUID)(cd.characteristicUUID)}:${cd.properties.join('/')}`);
+                this.logEvent({ message: 'DiscoverCharacteritics response', path: this.getPath(), service, characteristics, raw: request.toString('hex') });
+                return res.body.characteristicDefinitions.map(c => ({ uuid: c.characteristicUUID, properties: c.properties }));
+            }
+            catch (err) {
+                this.logEvent({ message: 'DiscoverCharacteritics failed', path: this.getPath(), raw: response === null || response === void 0 ? void 0 : response.toString('hex'), reason: err.message });
+                return [];
+            }
         });
     }
     subscribe(characteristicUUID, callback) {
@@ -109,19 +123,26 @@ class DirectConnectPeripheral {
             const seqNo = this.getNextSeqNo();
             const message = new messages_1.EnableCharacteristicNotificationsMessage();
             const request = message.createRequest(seqNo, { characteristicUUID: (0, utils_1.parseUUID)(characteristicUUID), enable: true });
+            let response;
             this.logEvent({ message: 'EnableCharacteristicNotifications request', path: this.getPath(), characteristic: (0, utils_1.beautifyUUID)(characteristicUUID), enabled: true, raw: request.toString('hex') });
-            const response = yield this.send(seqNo, request);
-            const res = message.parseResponse(response);
-            this.logEvent({ message: 'EnableCharacteristicNotifications response', path: this.getPath(), characteristic: (0, utils_1.beautifyUUID)(res.body.characteristicUUID), raw: request.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);
-                });
-                return true;
+            try {
+                response = yield this.send(seqNo, request);
+                const res = message.parseResponse(response);
+                this.logEvent({ message: 'EnableCharacteristicNotifications response', path: this.getPath(), characteristic: (0, utils_1.beautifyUUID)(res.body.characteristicUUID), raw: request.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);
+                    });
+                    return true;
+                }
+                return false;
+            }
+            catch (err) {
+                this.logEvent({ message: 'EnableCharacteristicNotifications failed', path: this.getPath(), raw: response === null || response === void 0 ? void 0 : response.toString('hex'), reason: err.message });
+                return false;
             }
-            return false;
         });
     }
     unsubscribe(characteristicUUID) {
@@ -130,17 +151,24 @@ class DirectConnectPeripheral {
                 const seqNo = this.getNextSeqNo();
                 const message = new messages_1.EnableCharacteristicNotificationsMessage();
                 const request = message.createRequest(seqNo, { characteristicUUID: (0, utils_1.parseUUID)(characteristicUUID), enable: false });
-                this.logEvent({ message: 'EnableCharacteristicNotifications request', path: this.getPath(), characteristic: (0, utils_1.beautifyUUID)(characteristicUUID), enabled: false, raw: request.toString('hex') });
-                const response = yield this.send(seqNo, request);
-                const res = message.parseResponse(response);
-                this.logEvent({ message: 'EnableCharacteristicNotifications response', path: this.getPath(), characteristic: (0, utils_1.beautifyUUID)(res.body.characteristicUUID), raw: request.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.eventEmitter.removeAllListeners((0, utils_1.parseUUID)(characteristicUUID));
-                    return true;
+                let response;
+                try {
+                    this.logEvent({ message: 'EnableCharacteristicNotifications request', path: this.getPath(), characteristic: (0, utils_1.beautifyUUID)(characteristicUUID), enabled: false, raw: request.toString('hex') });
+                    response = yield this.send(seqNo, request);
+                    const res = message.parseResponse(response);
+                    this.logEvent({ message: 'EnableCharacteristicNotifications response', path: this.getPath(), characteristic: (0, utils_1.beautifyUUID)(res.body.characteristicUUID), raw: request.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.eventEmitter.removeAllListeners((0, utils_1.parseUUID)(characteristicUUID));
+                        return true;
+                    }
+                    return false;
+                }
+                catch (err) {
+                    this.logEvent({ message: 'EnableCharacteristicNotifications failed', path: this.getPath(), raw: response === null || response === void 0 ? void 0 : response.toString('hex'), reason: err.message });
+                    return false;
                 }
-                return false;
             }
             catch (err) {
                 this.logEvent({ messsage: 'EnableCharacteristicNotifications failed', reason: err.message });
@@ -158,9 +186,8 @@ class DirectConnectPeripheral {
                 catch (err) {
                     this.logEvent({ message: 'could not discover services', reason: err.message });
                 }
-                const res = [];
-                for (let i = 0; i < services.length; i++) {
-                    const service = services[i];
+                for (const element of services) {
+                    const service = element;
                     let characteristics = [];
                     try {
                         characteristics = yield this.discoverCharacteristics(service);
@@ -171,8 +198,8 @@ class DirectConnectPeripheral {
                     }
                     if (!(characteristics === null || characteristics === void 0 ? void 0 : characteristics.length))
                         continue;
-                    for (let j = 0; j < characteristics.length; j++) {
-                        const characteristic = characteristics[j];
+                    for (const element of characteristics) {
+                        const characteristic = element;
                         if (characteristic.properties.includes('notify'))
                             yield this.subscribe(characteristic.uuid, callback);
                     }
@@ -188,14 +215,14 @@ class DirectConnectPeripheral {
     subscribeSelected(characteristics, callback) {
         return __awaiter(this, void 0, void 0, function* () {
             const retry = [];
-            for (let i = 0; i < characteristics.length; i++) {
-                const uuid = characteristics[i];
+            for (const element of characteristics) {
+                const uuid = element;
                 const success = yield this.subscribe(uuid, callback);
                 if (!success)
                     retry.push(uuid);
             }
-            for (let i = 0; i < retry.length; i++) {
-                const c = retry[i];
+            for (const element of retry) {
+                const c = element;
                 yield this.subscribe(c.uuid, callback);
             }
             return true;
@@ -216,13 +243,20 @@ class DirectConnectPeripheral {
             const seqNo = this.getNextSeqNo();
             const message = new messages_1.ReadCharacteristicMessage();
             const request = message.createRequest(seqNo, { characteristicUUID: (0, utils_1.parseUUID)(characteristicUUID) });
-            this.logEvent({ message: 'ReadCharacteristic request', path: this.getPath(), characteristic: (0, utils_1.beautifyUUID)(characteristicUUID), raw: request.toString('hex') });
-            const response = yield this.send(seqNo, request);
-            const res = message.parseResponse(response);
-            this.logEvent({ message: 'ReadCharacteristic response', path: this.getPath(), characteristic: (0, utils_1.beautifyUUID)(res.body.characteristicUUID),
-                data: Buffer.from(res.body.characteristicData).toString('hex'),
-                raw: request.toString('hex') });
-            return Buffer.from(res.body.characteristicData);
+            let response;
+            try {
+                this.logEvent({ message: 'ReadCharacteristic request', path: this.getPath(), characteristic: (0, utils_1.beautifyUUID)(characteristicUUID), raw: request.toString('hex') });
+                response = yield this.send(seqNo, request);
+                const res = message.parseResponse(response);
+                this.logEvent({ message: 'ReadCharacteristic response', path: this.getPath(), characteristic: (0, utils_1.beautifyUUID)(res.body.characteristicUUID),
+                    data: Buffer.from(res.body.characteristicData).toString('hex'),
+                    raw: request.toString('hex') });
+                return Buffer.from(res.body.characteristicData);
+            }
+            catch (err) {
+                this.logEvent({ message: 'ReadCharacteristic failed', path: this.getPath(), raw: response === null || response === void 0 ? void 0 : response.toString('hex'), reason: err.message });
+                return Buffer.from([]);
+            }
         });
     }
     write(characteristicUUID, data, options) {
@@ -237,19 +271,23 @@ class DirectConnectPeripheral {
                 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') });
-                this.send(seqNo, request).then((response) => {
+                this.send(seqNo, request).then((data) => {
+                    response = data;
                     const res = message.parseResponse(response);
-                    this.logEvent({ message: 'WriteCharacteristic response', path: this.getPath(), characteristic: (0, utils_1.beautifyUUID)(res.body.characteristicUUID),
+                    characteristic = (0, utils_1.beautifyUUID)(res.body.characteristicUUID);
+                    this.logEvent({ message: 'WriteCharacteristic response', path: this.getPath(), characteristic,
                         raw: request.toString('hex') });
                     if (options === null || options === void 0 ? void 0 : options.withoutResponse) {
                         resolve(Buffer.from([]));
                     }
                 })
                     .catch(err => {
-                    this.logEvent({ message: 'WriteCharacteristic error', path: this.getPath(), characteristic: (0, utils_1.beautifyUUID)(characteristicUUID), error: err.message });
+                    this.logEvent({ message: 'WriteCharacteristic failed', path: this.getPath(), characteristic, raw: response === null || response === void 0 ? void 0 : response.toString('hex'), reason: err.message });
                 });
             });
         });

package/package.json

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