incyclist-devices 2.0.16 → 2.0.17

package/lib/index.d.ts

@@ -8,8 +8,9 @@ import { IncyclistCapability } from './types/capabilities';
 import { DeviceData } from './types/data';
 import { DeviceSettings } from './types/device';
 import CyclingMode from './modes/cycling-mode';
+import calc from './utils/calculations';
 export * from './modes/cycling-mode';
 export * from './serial';
 export * from './ble';
 export * from './antv2';
-export { IncyclistInterface, INTERFACE, InterfaceFactory, InterfaceProps, DeviceSettings, CyclingMode, AdapterFactory, IncyclistDeviceAdapter, Controllable, ControllableDeviceAdapter, DeviceData, IncyclistCapability, };
+export { IncyclistInterface, INTERFACE, InterfaceFactory, InterfaceProps, DeviceSettings, CyclingMode, AdapterFactory, IncyclistDeviceAdapter, Controllable, ControllableDeviceAdapter, DeviceData, IncyclistCapability, calc, };

package/lib/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IncyclistCapability = exports.ControllableDeviceAdapter = exports.AdapterFactory = exports.InterfaceFactory = exports.INTERFACE = void 0;
+exports.calc = exports.IncyclistCapability = exports.ControllableDeviceAdapter = exports.AdapterFactory = exports.InterfaceFactory = exports.INTERFACE = void 0;
 const device_1 = require("./types/device");
 Object.defineProperty(exports, "INTERFACE", { enumerable: true, get: function () { return device_1.INTERFACE; } });
 const interfaces_1 = __importDefault(require("./interfaces"));
@@ -28,6 +28,8 @@ const adpater_1 = require("./base/adpater");
 Object.defineProperty(exports, "ControllableDeviceAdapter", { enumerable: true, get: function () { return adpater_1.ControllableDevice; } });
 const capabilities_1 = require("./types/capabilities");
 Object.defineProperty(exports, "IncyclistCapability", { enumerable: true, get: function () { return capabilities_1.IncyclistCapability; } });
+const calculations_1 = __importDefault(require("./utils/calculations"));
+exports.calc = calculations_1.default;
 __exportStar(require("./modes/cycling-mode"), exports);
 __exportStar(require("./serial"), exports);
 __exportStar(require("./ble"), exports);

package/lib/serial/bindings/tcp.js

@@ -16,6 +16,7 @@ exports.TCPPortBinding = exports.TCPBinding = exports.getSubnets = exports.scanS
 const gd_eventlog_1 = require("gd-eventlog");
 const os_1 = require("os");
 const net_1 = __importDefault(require("net"));
+const DEFAULT_TIMEOUT = 3000;
 function resolveNextTick() {
     return new Promise(resolve => process.nextTick(() => resolve()));
 }
@@ -123,8 +124,7 @@ exports.TCPBinding = {
                         return reject(new TypeError('"path" is not valid'));
                     }
                     const socket = new net_1.default.Socket();
-                    if (options.timeout)
-                        socket.setTimeout(options.timeout);
+                    socket.setTimeout(options.timeout || DEFAULT_TIMEOUT);
                     socket.once('timeout', () => { reject(new Error('timeout')); });
                     socket.once('error', (err) => { reject(err); });
                     socket.once('connect', () => { resolve(socket); });
@@ -145,6 +145,7 @@ class TCPPortBinding {
         this.pendingRead = null;
         this.writeOperation = null;
         this.data = null;
+        this.socket.removeAllListeners();
         this.socket.on('data', this.onData.bind(this));
         this.socket.on('error', this.onError.bind(this));
         this.socket.on('close', () => { this.close(); });
@@ -175,14 +176,20 @@ class TCPPortBinding {
             if (!this.isOpen)
                 return;
             this.data = Buffer.alloc(0);
-            const socket = this.socket;
-            socket.removeAllListeners();
-            socket.destroy();
-            socket.on('error', () => { });
-            setTimeout(() => { socket.removeAllListeners(); }, 500);
-            this.socket = null;
-            if (this.pendingRead) {
-                this.pendingRead(new CanceledError('port is closed'));
+            const close = () => __awaiter(this, void 0, void 0, function* () {
+                return new Promise(done => {
+                    const socket = this.socket;
+                    socket.on('error', () => { done(false); });
+                    socket.on('close', () => { socket.removeAllListeners(); done(true); });
+                    socket.destroy();
+                });
+            });
+            const closed = yield close();
+            if (closed) {
+                this.socket = null;
+                if (this.pendingRead) {
+                    this.pendingRead(new CanceledError('port is closed'));
+                }
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.0.16",
+  "version": "2.0.17",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",
@@ -28,6 +28,7 @@
     "lint": "eslint . --ext .ts",
     "build": "tsc",
     "test": "jest --coverage",
+    "test:ci": "jest --coverage --forceExit",
     "dev": "tsc --watch"
   },
   "files": [