@yarkivaev/scada 2.3.78 → 2.3.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yarkivaev/scada",
-  "version": "2.3.78",
+  "version": "2.3.79",
   "description": "SCADA domain objects, state persistence, and plant monitoring",
   "repository": {
     "type": "git",

package/src/infrastructure/ingest/pipelines/segmentPipeline.js

@@ -6,6 +6,7 @@ import segmentDispatch from '../../../domain/segment/dispatch.js';
 import segmentCoalesce from '../../../domain/segment/segmentCoalesce.js';
 import silenceBudget from '../../../domain/segment/silenceBudget.js';
 import segmentCodec from '../codecs/segmentCodec.js';
+import processingErrorLog from '../processingErrorLog.js';
 import silentOpenWatch from '../silentOpenWatch.js';
 import abutSegments from '../sinks/abutSegments.js';
 import closeOrphanOpen from '../sinks/closeOrphanOpen.js';
@@ -75,7 +76,10 @@ export default function segmentPipeline(stomp, postgres, pool, config) {
     return {
         destination,
         async start() {
-            await abutSegments(pool, budget);
+            const repair = abutSegments(pool, budget);
+            void repair.catch((error) => {
+                processingErrorLog('abut_segments', error, { budgetSeconds: budget });
+            });
             source.start();
             await silence.start();
         },

package/src/infrastructure/ingest/silentOpenWatch.js

@@ -18,14 +18,27 @@ export default function silentOpenWatch(closer, budget, options) {
         throw new Error(`Budget must be a positive number: ${budget}`);
     }
     const intervalMs = options && options.intervalMs ? options.intervalMs : 5000;
+    const gate = { busy: false };
     let timer;
     let active = false;
+    function claim() {
+        const free = !gate.busy;
+        gate.busy = true;
+        return free;
+    }
+    function release() {
+        gate.busy = false;
+    }
     async function tick() {
+        if (!claim()) {
+            return;
+        }
         try {
             await closer.close(budget);
         } catch {
             /* next tick retries */
         }
+        release();
     }
     return {
         async start() {

package/src/infrastructure/ingest/sinks/abutSegments.js

@@ -15,20 +15,19 @@ export default async function abutSegments(pool, budgetSeconds) {
         `UPDATE segments AS left_row
          SET end_time = right_row.start_time,
              duration = EXTRACT(EPOCH FROM (right_row.start_time - left_row.start_time))
-         FROM segments AS right_row
-         WHERE left_row.machine = right_row.machine
-           AND left_row.kind = right_row.kind
+         FROM LATERAL (
+             SELECT next.start_time, next.name
+             FROM segments AS next
+             WHERE next.machine = left_row.machine
+               AND next.kind = left_row.kind
+               AND next.start_time > left_row.start_time
+             ORDER BY next.start_time
+             LIMIT 1
+         ) AS right_row
+         WHERE left_row.duration > 0
            AND left_row.name = right_row.name
-           AND left_row.duration > 0
            AND right_row.start_time > left_row.end_time
-           AND right_row.start_time - left_row.end_time <= make_interval(secs => $1)
-           AND right_row.start_time = (
-               SELECT MIN(next.start_time)
-               FROM segments AS next
-               WHERE next.machine = left_row.machine
-                 AND next.kind = left_row.kind
-                 AND next.start_time > left_row.start_time
-           )`,
+           AND right_row.start_time - left_row.end_time <= make_interval(secs => $1)`,
         [budgetSeconds]
     );
 }