incyclist-devices 2.0.33 → 2.0.35

package/lib/serial/daum/DaumAdapter.js

@@ -259,7 +259,7 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
     }
     sendRequests() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.stopped)
+            if (this.stopped || this.paused)
                 return;
             if (this.requests.length > 0) {
                 const processing = [...this.requests];
@@ -370,6 +370,8 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
         });
     }
     refreshRequests() {
+        if (this.isPaused() || this.isStopped())
+            return;
         if (!this.cyclingData.isPedalling || this.cyclingData.pedalRpm === 0)
             return;
         let bikeRequest = this.getCyclingMode().sendBikeUpdate({ refresh: true }) || {};

package/lib/serial/serial-interface.js

@@ -58,7 +58,7 @@ class SinglePathScanner {
                 return;
             this.isScanning = true;
             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                this.logEvent({ message: 'starting scan', path: this.path });
+                this.logEvent({ message: 'starting scan', path: this.path, interface: this.serial.getName() });
                 this.serial.scanEvents.on('timeout', () => this.onStopRequest(resolve));
                 this.serial.scanEvents.on('stop', () => this.onStopRequest(resolve));
                 let found = false;
@@ -78,6 +78,7 @@ class SinglePathScanner {
                         if (found) {
                             this.isFound = true;
                             const name = adapter.getName();
+                            yield adapter.close();
                             resolve(Object.assign(Object.assign({}, adapterSettings), { name }));
                         }
                         yield (0, utils_1.sleep)(100);
@@ -166,9 +167,11 @@ class SerialInterface extends events_1.default {
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.logEvent({ message: 'connecting', interface: this.ifaceName });
             const binding = serialport_1.default.getInstance().getBinding(this.ifaceName);
             if (!binding || !this.binding) {
                 this.connected = false;
+                this.logEvent({ message: 'connecting error', interface: this.ifaceName, reason: 'no binfing found' });
                 return false;
             }
             try {
@@ -178,6 +181,7 @@ class SerialInterface extends events_1.default {
                 return true;
             }
             catch (err) {
+                this.logEvent({ message: 'connecting error', interface: this.ifaceName, reason: err.message });
                 this.connected = false;
                 return false;
             }
@@ -210,7 +214,7 @@ class SerialInterface extends events_1.default {
             }
             return new Promise((resolve) => {
                 port.once('error', (err) => {
-                    this.logEvent({ message: 'error', path, error: err.message || err });
+                    this.logEvent({ message: 'error', path, error: err.message || err, stack: err.stack });
                     port.removeAllListeners();
                     resolve(null);
                 });
@@ -273,14 +277,15 @@ class SerialInterface extends events_1.default {
             }
             this.isScanning = true;
             let attemptNo = 0;
+            const isTcpip = this.getName() === 'tcpip';
             do {
                 if (attemptNo === 0)
-                    this.logEvent({ message: 'checking for ports', port, excludes: this.inUse });
+                    this.logEvent({ message: 'checking for ports', interface: this.ifaceName, port, excludes: this.inUse });
                 else
-                    this.logEvent({ message: 'checking for ports retry', retry: attemptNo });
+                    this.logEvent({ message: 'checking for ports retry', interface: this.ifaceName, retry: attemptNo });
                 attemptNo++;
                 try {
-                    if (this.getName() === 'tcpip') {
+                    if (isTcpip) {
                         const _binding = binding;
                         paths = (yield _binding.list(port, this.inUse)) || [];
                     }
@@ -307,19 +312,20 @@ class SerialInterface extends events_1.default {
                 }
                 return [];
             }
-            this.logEvent({ message: 'scanning on ', paths: paths.map(p => p.path), timeout });
+            this.logEvent({ message: 'scanning on ', interface: this.ifaceName, paths: paths.map(p => p.path).join(','), timeout });
             const scanners = paths.map(p => new SinglePathScanner(p.path, this, Object.assign(Object.assign({}, props), { logger: this.logger })));
             try {
                 yield Promise.all(scanners.map(s => s.scan()
-                    .then(device => {
+                    .then((device) => __awaiter(this, void 0, void 0, function* () {
                     if (device) {
                         const adapter = adapter_factory_1.default.getInstance().createInstance(device);
                         const path = adapter.getPort();
                         this.inUse.push(path);
+                        yield adapter.stop();
                         detected.push(device);
                         this.emit('device', device);
                     }
-                })
+                }))
                     .catch()));
             }
             catch (err) {

package/package.json

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