@yarkivaev/scada 2.3.83 → 2.3.84

package/package.json

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

package/src/domain/segment/normalize.js

@@ -17,7 +17,7 @@ export default function segmentNormalize(parsed) {
     const hasOpts = Array.isArray(parsed.options) && parsed.options.length > 0;
     const resolved = typeof parsed.resolved === 'boolean' ? parsed.resolved : !hasOpts;
     return {
-        type: parsed.type,
+        type: parsed.type || 'segment',
         machine: parsed.machine,
         name: parsed.name,
         kind: typeof parsed.kind === 'string' && parsed.kind.length > 0 ? parsed.kind : 'phase',

package/src/domain/segment/segmentCoalesce.js

@@ -153,6 +153,8 @@ export default function segmentCoalesce(codec, options = {}) {
             const ctx = { api, lane, codec, size, intervalMs };
             lane.queue = lane.queue.then(() => {
                 return step(ctx, envelope, parsed);
+            }).catch(() => {
+                return undefined;
             });
             return lane.queue;
         },

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

@@ -13,21 +13,21 @@
 export default async function abutSegments(pool, budgetSeconds) {
     await pool.query(
         `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 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 right_row.start_time > left_row.end_time
-           AND right_row.start_time - left_row.end_time <= make_interval(secs => $1)`,
+         SET end_time = next_row.next_start,
+             duration = EXTRACT(EPOCH FROM (next_row.next_start - left_row.start_time))
+         FROM (
+             SELECT machine, kind, start_time,
+                    lead(start_time) OVER (PARTITION BY machine, kind ORDER BY start_time) AS next_start,
+                    lead(name) OVER (PARTITION BY machine, kind ORDER BY start_time) AS next_name
+             FROM segments
+         ) AS next_row
+         WHERE left_row.machine = next_row.machine
+           AND left_row.kind = next_row.kind
+           AND left_row.start_time = next_row.start_time
+           AND left_row.duration > 0
+           AND left_row.name = next_row.next_name
+           AND next_row.next_start > left_row.end_time
+           AND next_row.next_start - left_row.end_time <= make_interval(secs => $1)`,
         [budgetSeconds]
     );
 }