incyclist-devices 2.0.10 → 2.0.12

package/lib/serial/daum/classic/comms.js

@@ -15,8 +15,6 @@ const utils_2 = require("../../../utils/utils");
 const __1 = require("../..");
 const ByteLength = require('@serialport/parser-byte-length');
 const nop = () => { };
-const TIMEOUT_START = 15000;
-const TIMEOUT_CLOSE = 5000;
 const TIMEOUT_SEND = 2000;
 class Daum8008 {
     constructor(props) {
@@ -78,7 +76,7 @@ class Daum8008 {
                     this.connected = true;
                     this.sp = port;
                     this.sp.on('close', this.onPortClose.bind(this));
-                    this.sp.on('error', (error) => { this.onPortError(error); });
+                    this.sp.on('error', this.onPortError.bind(this));
                     return true;
                 }
                 else {
@@ -98,7 +96,10 @@ class Daum8008 {
                 return;
             this.stopWorker();
             yield this.flush();
-            yield this.serial.closePort(this.portName);
+            try {
+                yield this.serial.closePort(this.portName);
+            }
+            catch (_a) { }
             this.connected = false;
             if (this.sp)
                 this.sp.removeAllListeners();
@@ -136,7 +137,7 @@ class Daum8008 {
         if ((this.closing || this.closed) && (err.message === 'Port is not open' || err.message === 'Writing to COM port (GetOverlappedResult): Operation aborted'))
             return;
         const state = { opening: this.opening, connected: this.connected, closing: this.closing, closed: this.closed, busy: this.cmdBusy };
-        this.logEvent({ message: "port error:", port: this.getPort(), error: err.message, stack: err.stack, state });
+        this.logEvent({ message: "port error:", port: this.getPort(), error: err.message, state });
         this.error = err;
         this.cmdBusy = false;
     }

package/lib/serial/serial-interface.js

@@ -176,20 +176,23 @@ class SerialInterface extends events_1.default {
     openPort(path) {
         return __awaiter(this, void 0, void 0, function* () {
             this.logEvent({ message: 'opening port', path });
-            const port = serialport_1.default.getInstance().getSerialPort(this.ifaceName, { path });
-            if (!port) {
-                return null;
-            }
             const existing = this.ports.findIndex(p => p.path === path);
             if (existing !== -1) {
                 const port = this.ports[existing].port;
                 if (port.isOpen) {
+                    this.logEvent({ message: 'opening port - port already exists', path });
                     return port;
                 }
                 else {
                     this.ports.splice(existing, 1);
                 }
             }
+            this.logEvent({ message: 'opening port - getSerialPort()', path });
+            const port = serialport_1.default.getInstance().getSerialPort(this.ifaceName, { path });
+            if (!port) {
+                this.logEvent({ message: 'opening port - port does not exist', path });
+                return null;
+            }
             return new Promise((resolve) => {
                 port.once('error', (err) => {
                     this.logEvent({ message: 'error', path, error: err.message || err });
@@ -216,8 +219,11 @@ class SerialInterface extends events_1.default {
             if (!port.isOpen)
                 return true;
             port.on('error', () => { });
-            port.flush();
-            yield port.drain();
+            try {
+                port.flush();
+                yield port.drain();
+            }
+            catch (_a) { }
             return new Promise(resolve => {
                 port.close(err => {
                     if (!err) {

package/package.json

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