@yarkivaev/source-to-sink 1.3.6 → 1.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yarkivaev/source-to-sink",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "description": "Generic library for building data streaming pipelines",
   "repository": {
     "type": "git",

package/src/modbusSource.js

@@ -85,6 +85,28 @@ function connected(client) {
   };
 }
 
+/**
+ * Destroys a Modbus client without throwing if already closed.
+ *
+ * @param {object} client - ModbusRTU client
+ */
+function drop(client) {
+  if (client && typeof client.destroy === 'function') {
+    client.destroy(() => {
+      return undefined;
+    });
+  }
+}
+
+/**
+ * Builds a ModbusRTU client for one connect attempt.
+ *
+ * @returns {object} Fresh ModbusRTU client
+ */
+function create() {
+  return new ModbusRTU();
+}
+
 /**
  * Starts one connect attempt and ignores results after stop().
  *
@@ -93,9 +115,11 @@ function connected(client) {
 function attempt(bag) {
   const token = bag.epoch;
   bag.state = opening();
+  drop(bag.client);
+  bag.client = bag.create();
   bag.connect(bag.client).then(() => {
     if (token !== bag.epoch) {
-      bag.client.close();
+      drop(bag.client);
       return;
     }
     bag.delay = bag.interval;
@@ -105,6 +129,7 @@ function attempt(bag) {
     if (token !== bag.epoch) {
       return;
     }
+    drop(bag.client);
     bag.log.error(`Connection to ${bag.target} failed, retrying in ${bag.delay}s: ${err.message}`);
     const handle = setTimeout(() => {
       attempt(bag);
@@ -121,19 +146,20 @@ function attempt(bag) {
  * @returns {object} Source with start() and stop() methods
  */
 function modbusPollingSource(options) {
-  const { address, count, interval, collector, clk, client } = options;
-  async function fetch() {
-    const result = await client.readHoldingRegisters(address, count);
-    return [result.data];
-  }
+  const { address, count, interval, collector, clk } = options;
   const bag = {
     ...options,
+    client: undefined,
     state: idle(),
     epoch: 0,
     maxDelay: 300,
-    source: pollingSource(fetch, interval, collector, clk),
     delay: interval
   };
+  async function fetch() {
+    const result = await bag.client.readHoldingRegisters(address, count);
+    return [result.data];
+  }
+  bag.source = pollingSource(fetch, interval, collector, clk);
   return {
     /**
      * Connects to the Modbus device and starts polling.
@@ -153,9 +179,8 @@ function modbusPollingSource(options) {
       if (bag.state.retrying()) {
         bag.state.cancel();
       }
-      if (bag.state.connected() || bag.state.opening()) {
-        bag.client.close();
-      }
+      drop(bag.client);
+      bag.client = undefined;
       bag.state = idle();
     }
   };
@@ -195,11 +220,11 @@ export default function modbusSource(host, port, address, count, interval, colle
   if (typeof count !== 'number' || count <= 0) {
     throw new Error(`Count must be a positive number, got: ${count}`);
   }
-  const client = new ModbusRTU();
   function connect(modbusClient) {
     return modbusClient.connectTCP(host, { port });
   }
   return modbusPollingSource({
+    create,
     connect,
     target: `${host}:${port}`,
     address,
@@ -207,7 +232,6 @@ export default function modbusSource(host, port, address, count, interval, colle
     interval,
     collector,
     clk,
-    client,
     log
   });
 }
@@ -248,7 +272,6 @@ export function modbusRtuSource(path, serial, address, count, interval, collecto
   if (typeof count !== 'number' || count <= 0) {
     throw new Error(`Count must be a positive number, got: ${count}`);
   }
-  const client = new ModbusRTU();
   const slaveId = serial.slaveId || 1;
   const dataBits = serial.dataBits || 8;
   const stopBits = serial.stopBits || 1;
@@ -264,6 +287,7 @@ export function modbusRtuSource(path, serial, address, count, interval, collecto
     });
   }
   return modbusPollingSource({
+    create,
     connect,
     target: path,
     address,
@@ -271,7 +295,6 @@ export function modbusRtuSource(path, serial, address, count, interval, collecto
     interval,
     collector,
     clk,
-    client,
     log
   });
 }

package/src/pollingSource.js

@@ -64,14 +64,17 @@ export default function pollingSource(fetch, interval, collector, clk) {
   }
   let state = idle();
   let since = clk.millis();
-  async function poll() {
+  function poll() {
     const from = since;
     const until = clk.millis();
     since = until;
-    const result = await fetch(from, until);
-    for (const entry of result) {
-      collector.accept(entry);
-    }
+    Promise.resolve(fetch(from, until)).then((result) => {
+      for (const entry of result) {
+        collector.accept(entry);
+      }
+    }).catch(() => {
+      return undefined;
+    });
   }
   return {
     /**

package/test/test_modbusSource.js

@@ -59,6 +59,27 @@ function settle(ms) {
     });
 }
 
+/**
+ * Collects unhandledRejection events until stop().
+ *
+ * @returns {object} Collector with seen() and stop()
+ */
+function watchRejects() {
+    const seen = [];
+    function onReject(err) {
+        seen.push(err);
+    }
+    process.on('unhandledRejection', onReject);
+    return {
+        seen() {
+            return seen.length;
+        },
+        stop() {
+            process.off('unhandledRejection', onReject);
+        }
+    };
+}
+
 /**
  * Waits until probe is true or the timeout elapses.
  *
@@ -200,6 +221,28 @@ describe('modbusSource', () => {
     assert.strictEqual(true, true, 'Should not crash on unreachable host');
   });
 
+  it('does not emit unhandled rejection after connection retry', async function() {
+    this.timeout(4000);
+    const watch = watchRejects();
+    const log = { error() {} };
+    const port = 65000 + Math.floor(Math.random() * 500);
+    const source = modbusSource(
+      '127.0.0.1',
+      port,
+      4000,
+      14,
+      0.05,
+      { accept() {} },
+      fakeClock(1 + Math.floor(Math.random() * 100)),
+      log
+    );
+    source.start();
+    await settle(400);
+    source.stop();
+    watch.stop();
+    assert.strictEqual(watch.seen(), 0, 'retry leaked an unhandled rejection');
+  });
+
   it('does not open a second TCP socket when start is called twice', async function() {
     const gate = await countingListen();
     const source = modbusSource(

package/test/test_pollingSource.js

@@ -91,6 +91,26 @@ describe('pollingSource', () => {
     assert.strictEqual(count, before, 'Should stop polling after stop');
   });
 
+  it('does not emit unhandled rejection when fetch rejects', async () => {
+    const seen = [];
+    function onReject(err) {
+      seen.push(err);
+    }
+    process.on('unhandledRejection', onReject);
+    const label = `\u00e9${Math.random()}`;
+    const fetch = () => {
+      return Promise.reject(new Error(label));
+    };
+    const source = pollingSource(fetch, 0.03, { accept() {} }, fakeClock(1 + Math.floor(Math.random() * 100)));
+    source.start();
+    await new Promise((resolve) => {
+      setTimeout(resolve, 80);
+    });
+    source.stop();
+    process.off('unhandledRejection', onReject);
+    assert.strictEqual(seen.length, 0, 'poll rejection leaked as unhandled');
+  });
+
   it('throws on missing fetch', () => {
     const collector = { accept: () => {} };
     const clk = fakeClock(0);