incyclist-devices 2.1.24 → 2.1.26

package/lib/ble/ble-interface.d.ts

@@ -21,6 +21,7 @@ export interface ConnectState {
     isConnected: boolean;
     timeout?: NodeJS.Timeout;
     isInitSuccess: boolean;
+    connectPromise?: Promise<boolean>;
 }
 export interface BleDeviceInfo {
     device: BleComms;

package/lib/ble/ble-interface.js

@@ -132,68 +132,92 @@ class BleInterface extends events_1.default {
         this.logEvent({ message: 'error', error: err.message, stack: err.stack });
     }
     connect(to) {
-        this.resumeLogging();
-        const timeout = this.props.timeout || to || 2000;
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             if (this.connectState.isConnected) {
-                return resolve(true);
+                return true;
             }
-            this.logEvent({ message: 'Ble connect request', });
-            if (!this.getBinding())
-                return Promise.reject(new Error('no binding defined'));
-            this.connectState.timeout = setTimeout(() => {
-                this.connectState.isConnected = false;
-                this.connectState.isConnecting = false;
-                this.connectState.timeout = null;
-                this.logEvent({ message: 'Ble connect result: timeout' });
-                resolve(false);
-            }, timeout);
-            try {
-                const state = this.getBinding().state;
-                if (state === 'poweredOn') {
-                    clearTimeout(this.connectState.timeout);
-                    this.connectState.timeout = null;
-                    this.getBinding().removeAllListeners('stateChange');
-                    this.getBinding().on('stateChange', this.onStateChange.bind(this));
-                    this.connectState.isConnected = true;
+            if (this.connectState.isConnecting) {
+                return yield this.connectState.connectPromise;
+            }
+            this.resumeLogging();
+            const timeout = this.props.timeout || to || 2000;
+            const connect = new Promise((resolve, reject) => {
+                this.logEvent({ message: 'Ble connect request' });
+                if (!this.getBinding())
+                    return reject(new Error('no binding defined'));
+                this.connectState.timeout = setTimeout(() => {
+                    this.connectState.isConnected = false;
                     this.connectState.isConnecting = false;
-                    this.logEvent({ message: 'connect result: success' });
-                    resolve(true);
-                    return;
-                }
-                else {
-                    this.getBinding().once('error', (err) => {
+                    this.connectState.timeout = null;
+                    this.logEvent({ message: 'Ble connect result: timeout' });
+                    resolve(false);
+                }, timeout);
+                try {
+                    const state = this.getBinding().state;
+                    if (state === 'poweredOn') {
+                        clearTimeout(this.connectState.timeout);
+                        this.connectState.timeout = null;
+                        this.getBinding().removeAllListeners('stateChange');
+                        this.getBinding().on('stateChange', this.onStateChange.bind(this));
                         this.connectState.isConnected = true;
                         this.connectState.isConnecting = false;
-                        this.logEvent({ message: 'connect result: error', error: err.message });
-                        this.getBinding().on('error', this.onError.bind(this));
-                        return reject(err);
-                    });
-                    this.getBinding().on('stateChange', (state) => {
-                        if (state === 'poweredOn') {
-                            clearTimeout(this.connectState.timeout);
-                            this.connectState.timeout = null;
-                            this.getBinding().removeAllListeners('stateChange');
-                            this.getBinding().on('stateChange', this.onStateChange.bind(this));
+                        this.logEvent({ message: 'connect result: already connected' });
+                        resolve(true);
+                        return;
+                    }
+                    else {
+                        this.getBinding().once('error', (err) => {
                             this.connectState.isConnected = true;
                             this.connectState.isConnecting = false;
-                            this.logEvent({ message: 'Ble connect result: success' });
-                            return resolve(true);
-                        }
-                        else {
-                            this.logEvent({ message: 'BLE state change', state });
-                        }
-                    });
+                            this.logEvent({ message: 'connect result: error', error: err.message });
+                            this.getBinding().on('error', this.onError.bind(this));
+                            return reject(err);
+                        });
+                        this.getBinding().on('stateChange', (state) => {
+                            if (state === 'poweredOn') {
+                                clearTimeout(this.connectState.timeout);
+                                this.connectState.timeout = null;
+                                this.getBinding().removeAllListeners('stateChange');
+                                this.getBinding().on('stateChange', this.onStateChange.bind(this));
+                                this.connectState.isConnected = true;
+                                this.connectState.isConnecting = false;
+                                this.logEvent({ message: 'Ble connect result: success' });
+                                return resolve(true);
+                            }
+                            else {
+                                this.logEvent({ message: 'BLE state change', state });
+                            }
+                        });
+                    }
+                }
+                catch (err) {
+                    this.connectState.isConnected = false;
+                    this.connectState.isConnecting = false;
+                    if (this.connectState.timeout)
+                        clearTimeout(this.connectState.timeout);
+                    this.connectState.timeout = null;
+                    this.logEvent({ message: 'Ble connect result: error', error: err.message });
+                    return reject(new Error('bluetooth unavailable, cause: ' + err.message));
                 }
+            });
+            const cleanup = () => {
+                if (this.connectState.timeout) {
+                    clearTimeout(this.connectState.timeout);
+                    this.connectState.timeout = null;
+                }
+                this.connectState.isConnecting = false;
+                delete this.connectState.connectPromise;
+            };
+            this.connectState.isConnecting = true;
+            this.connectState.connectPromise = connect;
+            try {
+                const connected = yield connect;
+                cleanup();
+                return connected;
             }
             catch (err) {
-                this.connectState.isConnected = false;
-                this.connectState.isConnecting = false;
-                if (this.connectState.timeout)
-                    clearTimeout(this.connectState.timeout);
-                this.connectState.timeout = null;
-                this.logEvent({ message: 'Ble connect result: error', error: err.message });
-                return reject(new Error('bluetooth unavailable, cause: ' + err.message));
+                cleanup();
+                throw err;
             }
         });
     }

package/lib/serial/base/comms.d.ts

@@ -40,6 +40,7 @@ export default class SerialPortComms<T extends CommsState, C extends Request, R
     pause(): void;
     resume(): void;
     logEvent(e: any): void;
+    waitForAnyOpenConnectionAttempt(): Promise<boolean>;
     connect(): Promise<boolean>;
     onConnected(): void;
     portFlush(): void;

package/lib/serial/base/comms.js

@@ -66,11 +66,8 @@ class SerialPortComms {
             console.log(`~~~ ${this.getDefaultLoggerName()}`, e);
         }
     }
-    connect() {
+    waitForAnyOpenConnectionAttempt() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.isConnected() && this.sp) {
-                return true;
-            }
             if (this.connectState === 'Connecting') {
                 if (this.connectPromise) {
                     try {
@@ -81,6 +78,17 @@ class SerialPortComms {
                 }
                 return this.isConnected();
             }
+            return null;
+        });
+    }
+    connect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isConnected() && this.sp) {
+                return true;
+            }
+            const connectResult = yield this.waitForAnyOpenConnectionAttempt();
+            if (connectResult !== null)
+                return connectResult;
             try {
                 this.connectState = 'Connecting';
                 this.connectPromise = this.serial.openPort(this.path);
@@ -99,7 +107,7 @@ class SerialPortComms {
                     return false;
                 }
             }
-            catch (_b) {
+            catch (_a) {
                 this.connectState = 'Disconnected';
                 return false;
             }
@@ -229,7 +237,6 @@ class SerialPortComms {
     portWrite(buffer) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.sp) {
-                this.logEvent({ message: 'write failed', error: 'port is not opened' });
                 return;
             }
             try {
@@ -243,7 +250,6 @@ class SerialPortComms {
     portRead(size) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.sp) {
-                this.logEvent({ message: 'write failed', error: 'port is not opened' });
                 return;
             }
             return yield this.sp.read(size);
@@ -251,6 +257,9 @@ class SerialPortComms {
     }
     write(buffer) {
         return __awaiter(this, void 0, void 0, function* () {
+            yield this.waitForAnyOpenConnectionAttempt();
+            if (!this.isConnected())
+                return;
             if (this.writePromise) {
                 try {
                     yield this.writePromise;

package/lib/serial/daum/DaumAdapter.js

@@ -340,17 +340,17 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.stopped)
                 return true;
-            this.logEvent({ message: 'stop request' });
+            this.logEvent({ message: 'stop request', port: this.getPort() });
             if (this.paused)
                 this.resume();
             try {
                 yield this.stopUpdatePull();
                 yield this.comms.close();
-                this.logEvent({ message: 'stop request completed' });
+                this.logEvent({ message: 'stop request completed', port: this.getPort() });
                 this.stopped = true;
             }
             catch (err) {
-                this.logEvent({ message: 'stop request failed', reason: err.message });
+                this.logEvent({ message: 'stop request failed', port: this.getPort(), reason: err.message });
                 throw (err);
             }
             return this.stopped;
@@ -360,7 +360,7 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.paused || this.stopped)
                 return;
-            this.logEvent({ message: 'sendUpdate', request, waiting: this.requests.length });
+            this.logEvent({ message: 'sendUpdate', port: this.getPort(), request, waiting: this.requests.length });
             return yield this.processClientRequest(request);
         });
     }
@@ -378,7 +378,7 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
             }
             catch (err) {
                 try {
-                    this.logEvent({ message: 'bike update error', error: err.message, stack: err.stack });
+                    this.logEvent({ message: 'bike update error', port: this.getPort(), error: err.message, stack: err.stack });
                     const incyclistData = this.updateData(this.deviceData);
                     this.transformData(incyclistData);
                 }
@@ -398,7 +398,7 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
                 if (cnt > 1) {
                     this.requests.forEach((request, idx) => {
                         if (idx !== cnt - 1) {
-                            this.logEvent({ message: 'ignoring bike update request', request });
+                            this.logEvent({ message: 'ignoring bike update request', port: this.getPort(), request });
                         }
                     });
                     this.requests = [this.requests[cnt - 1]];
@@ -409,7 +409,7 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
                     this.requests.shift();
                 }
                 catch (err) {
-                    this.logEvent({ message: 'bike update error', error: err.message, stack: err.stack, request });
+                    this.logEvent({ message: 'bike update error', port: this.getPort(), error: err.message, stack: err.stack, request });
                 }
             }
         });

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

@@ -16,7 +16,6 @@ const utils_1 = require("../../../utils/utils");
 const comms_1 = __importDefault(require("../../base/comms"));
 const utils_2 = require("./utils");
 const types_1 = require("../types");
-const ByteLength = require('@serialport/parser-byte-length');
 const TIMEOUT_SEND = 2000;
 class Daum8008 extends comms_1.default {
     constructor(props) {

package/package.json

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