@yarkivaev/source-to-sink 1.3.6 → 1.3.8

package/eslint.config.js

@@ -150,6 +150,7 @@ export default [
         files: ['src/modbusSource.js'],
         rules: {
             'max-params': ['error', 8],
+            'max-lines': ['error', { 'max': 250, 'skipBlankLines': true, 'skipComments': true }],
             'max-lines-per-function': ['error', { 'max': 60, 'skipBlankLines': true, 'skipComments': true }],
             'max-statements': ['error', 20]
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yarkivaev/source-to-sink",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "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,18 +115,25 @@ 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;
     bag.state = connected(bag.client);
+    bag.client.setTimeout(bag.interval * 1000);
+    bag.client.once('close', () => {
+      bag.lost();
+    });
     bag.source.start();
   }).catch((err) => {
     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);
@@ -114,6 +143,28 @@ function attempt(bag) {
   });
 }
 
+/**
+ * Resets a live session and retries through attempt() backoff.
+ *
+ * @param {object} bag - Mutable lifecycle bag
+ */
+function resume(bag) {
+  if (!bag.state.connected()) {
+    return;
+  }
+  bag.source.stop();
+  const { client } = bag;
+  bag.client = undefined;
+  bag.state = idle();
+  drop(client);
+  bag.log.error(`Connection to ${bag.target} lost, retrying in ${bag.delay}s`);
+  const handle = setTimeout(() => {
+    attempt(bag);
+  }, bag.delay * 1000);
+  bag.state = retrying(handle);
+  bag.delay = Math.min(bag.delay * 2, bag.maxDelay);
+}
+
 /**
  * Shared Modbus polling lifecycle for TCP and RTU transports.
  *
@@ -121,19 +172,28 @@ 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
   };
+  bag.lost = function lost() {
+    resume(bag);
+  };
+  async function fetch() {
+    try {
+      const result = await bag.client.readHoldingRegisters(address, count);
+      return [result.data];
+    } catch (err) {
+      bag.lost();
+      throw err;
+    }
+  }
+  bag.source = pollingSource(fetch, interval, collector, clk);
   return {
     /**
      * Connects to the Modbus device and starts polling.
@@ -153,10 +213,10 @@ function modbusPollingSource(options) {
       if (bag.state.retrying()) {
         bag.state.cancel();
       }
-      if (bag.state.connected() || bag.state.opening()) {
-        bag.client.close();
-      }
+      const { client } = bag;
+      bag.client = undefined;
       bag.state = idle();
+      drop(client);
     }
   };
 }
@@ -195,11 +255,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 +267,6 @@ export default function modbusSource(host, port, address, count, interval, colle
     interval,
     collector,
     clk,
-    client,
     log
   });
 }
@@ -248,7 +307,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 +322,7 @@ export function modbusRtuSource(path, serial, address, count, interval, collecto
     });
   }
   return modbusPollingSource({
+    create,
     connect,
     target: path,
     address,
@@ -271,7 +330,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.
  *
@@ -84,6 +105,114 @@ function until(probe, limit) {
     return new Promise(tick);
 }
 
+/**
+ * TCP listener that counts accepted sockets and can drop them.
+ *
+ * @returns {Promise<object>} Gate with port, accepted, drop, close
+ */
+function sessionListen() {
+    let accepted = 0;
+    const sockets = new Set();
+    const server = net.createServer((sock) => {
+        accepted += 1;
+        sockets.add(sock);
+        sock.on('close', () => {
+            sockets.delete(sock);
+        });
+    });
+    return new Promise((resolve) => {
+        server.listen(0, '127.0.0.1', () => {
+            resolve({
+                port: server.address().port,
+                accepted() {
+                    return accepted;
+                },
+                drop() {
+                    for (const sock of sockets) {
+                        sock.destroy();
+                    }
+                },
+                close() {
+                    for (const sock of sockets) {
+                        sock.destroy();
+                    }
+                    return new Promise((done) => {
+                        server.close(done);
+                    });
+                }
+            });
+        });
+    });
+}
+
+/**
+ * Builds a Modbus TCP Read Holding Registers response.
+ *
+ * @param {Buffer} req - Request frame
+ * @param {number[]} values - Register values
+ * @returns {Buffer} Response frame
+ */
+function holding(req, values) {
+    const tid = req.readUInt16BE(0);
+    const uid = req.readUInt8(6);
+    const bytes = values.length * 2;
+    const out = Buffer.alloc(9 + bytes);
+    out.writeUInt16BE(tid, 0);
+    out.writeUInt16BE(0, 2);
+    out.writeUInt16BE(3 + bytes, 4);
+    out.writeUInt8(uid, 6);
+    out.writeUInt8(3, 7);
+    out.writeUInt8(bytes, 8);
+    for (let i = 0; i < values.length; i += 1) {
+        out.writeUInt16BE(values[i], 9 + i * 2);
+    }
+    return out;
+}
+
+/**
+ * TCP listener that stays silent on the first socket then answers later ones.
+ *
+ * @param {number[]} values - Holding register values
+ * @returns {Promise<object>} Gate with port, accepted, close
+ */
+function recoverListen(values) {
+    let accepted = 0;
+    const sockets = new Set();
+    const server = net.createServer((sock) => {
+        accepted += 1;
+        sockets.add(sock);
+        sock.on('close', () => {
+            sockets.delete(sock);
+        });
+        if (accepted === 1) {
+            return;
+        }
+        sock.on('data', (req) => {
+            if (req.length >= 12 && req.readUInt8(7) === 3) {
+                sock.write(holding(req, values));
+            }
+        });
+    });
+    return new Promise((resolve) => {
+        server.listen(0, '127.0.0.1', () => {
+            resolve({
+                port: server.address().port,
+                accepted() {
+                    return accepted;
+                },
+                close() {
+                    for (const sock of sockets) {
+                        sock.destroy();
+                    }
+                    return new Promise((done) => {
+                        server.close(done);
+                    });
+                }
+            });
+        });
+    });
+}
+
 describe('modbusSource', () => {
   it('throws on empty host', () => {
     const collector = { accept: () => {} };
@@ -200,6 +329,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(
@@ -268,4 +419,64 @@ describe('modbusSource', () => {
     await gate.close();
     assert.strictEqual(live, 0, 'stop during connect left a Modbus TCP socket open');
   });
+
+  it('opens a new TCP socket after the device stays silent or drops the session', async function() {
+    this.timeout(6000);
+    const gate = await sessionListen();
+    const source = modbusSource(
+      '127.0.0.1',
+      gate.port,
+      4000,
+      3 + Math.floor(Math.random() * 8),
+      0.05,
+      { accept() {} },
+      fakeClock(11 + Math.floor(Math.random() * 100)),
+      { error() {} }
+    );
+    source.start();
+    await until(() => {
+      return gate.accepted() >= 1;
+    }, 2000);
+    await settle(80);
+    gate.drop();
+    await until(() => {
+      return gate.accepted() >= 2;
+    }, 3000);
+    const accepted = gate.accepted();
+    source.stop();
+    await gate.close();
+    assert.ok(accepted >= 2, 'silent or dropped session did not open a new Modbus TCP socket');
+  });
+
+  it('forwards a new sample after the device answers again', async function() {
+    this.timeout(6000);
+    const count = 3 + Math.floor(Math.random() * 6);
+    const values = Array.from({ length: count }, () => {
+      return 1000 + Math.floor(Math.random() * 500);
+    });
+    const samples = [];
+    const gate = await recoverListen(values);
+    const source = modbusSource(
+      '127.0.0.1',
+      gate.port,
+      4000,
+      count,
+      0.05,
+      {
+        accept(entry) {
+          samples.push(entry);
+        }
+      },
+      fakeClock(13 + Math.floor(Math.random() * 100)),
+      { error() {} }
+    );
+    source.start();
+    await until(() => {
+      return samples.length >= 1;
+    }, 4000);
+    const sample = samples[0];
+    source.stop();
+    await gate.close();
+    assert.deepStrictEqual(sample, values, 'restored device did not deliver a new sample');
+  });
 });

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);