aes70 1.3.2 → 1.3.6

package/src/controller/udp_connection.js

@@ -25,8 +25,7 @@ async function waitForKeepalive(socket, options) {
 
       pos = decodeMessage(new DataView(data.buffer), 0, pdus);
 
-      if (pdus.length !== 1)
-        throw new Error('Expected keepalive response.');
+      if (pdus.length !== 1) throw new Error('Expected keepalive response.');
 
       socket.off('message', onMessage);
       socket.off('error', reject);
@@ -43,8 +42,7 @@ async function waitForKeepalive(socket, options) {
   for (let i = 0; i < 3; i++) {
     socket.send(msg);
 
-    if (await Promise.race([ waiter, delay(t) ]))
-      return;
+    if (await Promise.race([waiter, delay(t)])) return;
   }
 
   throw new Error('Failed to connect.');
@@ -101,8 +99,10 @@ export class UDPConnection extends ClientConnection {
       this._write_out_id = -1;
       this._write_out();
     };
-    this._retry_id = (this.retry_interval > 0) ?
-      setInterval(() => this._retryCommands(), this.retry_interval) : -1;
+    this._retry_id =
+      this.retry_interval > 0
+        ? setInterval(() => this._retryCommands(), this.retry_interval)
+        : -1;
     this.q = [];
     socket.on('message', (data, rinfo) => {
       try {
@@ -176,16 +176,13 @@ export class UDPConnection extends ClientConnection {
   write(buf) {
     this.q.push(buf);
 
-    if (this.tx_idle_time() >= this.delay)
-      this._write_out();
-    else
-      this._schedule_write_out();
+    if (this.tx_idle_time() >= this.delay) this._write_out();
+    else this._schedule_write_out();
   }
 
   flush() {
     super.flush();
-    if (this.tx_idle_time() > this.delay)
-      this._write_out();
+    if (this.tx_idle_time() > this.delay) this._write_out();
   }
 
   cleanup() {
@@ -219,8 +216,7 @@ export class UDPConnection extends ClientConnection {
     this.socket.send(Buffer.from(buf));
     super.write(buf);
 
-    if (q.length)
-      this._schedule_write_out();
+    if (q.length) this._schedule_write_out();
   }
 
   _schedule_write_out() {
@@ -233,10 +229,12 @@ export class UDPConnection extends ClientConnection {
     }
 
     // Already scheduled.
-    if (this._write_out_id !== -1)
-      return;
+    if (this._write_out_id !== -1) return;
 
-    this._write_out_id = setTimeout(this._write_out_callback, delay - tx_idle_time);
+    this._write_out_id = setTimeout(
+      this._write_out_callback,
+      delay - tx_idle_time
+    );
   }
 
   _retryCommands() {
@@ -251,7 +249,7 @@ export class UDPConnection extends ClientConnection {
     const failed = [];
 
     for (const entry of pendingCommands) {
-      const [ handle, pendingCommand ] = entry;
+      const [handle, pendingCommand] = entry;
 
       // All later commands are newer than the cutoff.
       if (pendingCommand.lastSent > retryTime) break;
@@ -265,13 +263,13 @@ export class UDPConnection extends ClientConnection {
     if (failed.length) {
       const timeoutError = new Error('Timeout.');
 
-      failed.forEach(([ handle, pendingCommand ]) => {
+      failed.forEach(([handle, pendingCommand]) => {
         pendingCommands.delete(handle);
         pendingCommand.reject(timeoutError);
       });
     }
 
-    retries.forEach(([ handle, pendingCommand ]) => {
+    retries.forEach(([handle, pendingCommand]) => {
       pendingCommands.delete(handle);
       pendingCommands.set(handle, pendingCommand);
       this.send(pendingCommand.command);

package/src/controller/websocket_connection.js

@@ -52,7 +52,9 @@ export class WebSocketConnection extends ClientConnection {
   cleanup() {
     super.cleanup();
     if (this.ws) {
-      try { this.ws.close(); } catch (err) {}
+      try {
+        this.ws.close();
+      } catch (err) {}
       this.ws = null;
     }
   }

package/src/controller/websocket_connection_node.js

@@ -1,6 +1,6 @@
 /* eslint-env node */
 
-import * as WebSocket from 'ws';
+import WebSocket from 'ws';
 import { performance } from 'perf_hooks';
 
 import { ClientConnection } from './client_connection.js';
@@ -54,7 +54,10 @@ export class WebSocketConnection extends ClientConnection {
   cleanup() {
     super.cleanup();
     if (this.ws) {
-      try { this.ws.close(); } catch (err) {}
+      try {
+        this.ws.close();
+      } catch (err) {}
+      this.ws.removeAllListeners();
       this.ws = null;
     }
   }

package/tests/device/test.js

@@ -48,6 +48,7 @@ export class Test {
   {
     if (this.device !== null)
     {
+      this.device.connection.emit('test_done');
       this.device.close();
       this.device = null;
     }

package/tests/device.js

@@ -187,12 +187,23 @@ function timeout(n)
 
 async function run_tests(type, target)
 {
+  let onClose = null;
+
+  const close_p = new Promise((resolve, reject) => {
+    onClose = () => setTimeout(() => reject(new Error('Closed.')), 1000);
+  });
+
   const get_device = async () => {
     const connection = await type.connect(connect_options(target));
     const device = new RemoteDevice(connection);
 
     device.set_keepalive_interval(1);
 
+    connection.on('close', onClose);
+    connection.on('test_done', () => {
+      connection.removeEventListener('close', onClose);
+    });
+
     return device;
   };
 
@@ -203,7 +214,7 @@ async function run_tests(type, target)
     const timeout_p = timeout(60*1000);
     const test_p = test_runner.run();
 
-    await Promise.race([ timeout_p.then(() => { timed_out = true; }), test_p ]);
+    await Promise.race([ timeout_p.then(() => { timed_out = true; }), test_p, close_p ]);
 
     if (timed_out)
     {

package/src/OCP1/OcaClassID.js

@@ -1,16 +0,0 @@
-/*
- * This file has been generated.
- */
-import { Struct } from './Struct.js';
-import { FieldType } from './FieldType.js';
-import { OcaUint16 } from './OcaUint16.js';
-
-import { OcaClassID as type } from '../types/OcaClassID.js';
-
-export const OcaClassID = Struct(
-  {
-    FieldCount: OcaUint16,
-    Fields: FieldType,
-  },
-  type
-);