@yarkivaev/scada 1.3.0 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yarkivaev/scada",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "SCADA domain objects for plant monitoring",
   "repository": {
     "type": "git",

package/src/clickhouseSensor.js

@@ -15,7 +15,7 @@
  * @example
  *   const sensor = clickhouseSensor(conn, 'icht1/voltage', 'Voltage', 'V');
  *   sensor.name(); // 'Voltage'
- *   await sensor.current(); // { timestamp, value, unit }
+ *   await sensor.current(); // { found: true, timestamp, value, unit } or { found: false }
  *   await sensor.measurements({ start, end }, 60000); // downsampled to 1-minute intervals
  *   sensor.stream(since, 1000, callback); // live stream
  */
@@ -37,16 +37,16 @@ export default function clickhouseSensor(connection, topic, displayName, unit) {
                 { topic }
             );
             if (rows.length === 0) {
-                return { timestamp: new Date(), value: 0, unit };
+                return { found: false };
             }
-            return { timestamp: new Date(`${rows[0].ts}Z`), value: rows[0].value, unit };
+            return { found: true, timestamp: new Date(`${rows[0].ts}Z`), value: rows[0].value, unit };
         },
         async measurements(range, step) {
             const seconds = Math.max(1, Math.floor(step / 1000));
             const rows = await connection.query(
                 `SELECT
                     toStartOfInterval(ts, INTERVAL ${seconds} SECOND) as ts,
-                    avg(value) as value
+                    anyLast(value) as value
                 FROM scada.metrics
                 WHERE topic = {topic:String}
                   AND ts >= toStartOfInterval({start:DateTime64(3)}, INTERVAL ${seconds} SECOND)

package/src/machineChronology.js

@@ -25,7 +25,9 @@ export default function machineChronology(initial, history, sensors) {
             const values = await Promise.all(keys.map((key) => {
                 return sensors[key].current();
             }));
-            keys.forEach((key, i) => { result[key] = values[i]; });
+            keys.forEach((key, i) => {
+                result[key] = values[i].found ? values[i] : { value: 0, unit: '' };
+            });
         }
         return result;
     }

package/src/segments.js

@@ -10,7 +10,7 @@ import pubsub from './pubsub.js';
  * @example
  *   const segs = segments();
  *   segs.add({ name: 'on', startTime: new Date(), endTime: new Date(), duration: 60 });
- *   segs.relabel(startTime, 'heating');
+ *   segs.relabel(startTime, ['heating'], {});
  *   segs.query(); // all segments
  *   segs.query({ from: '2024-01-01', to: '2024-01-02' }); // filtered
  *   const sub = segs.stream((e) => console.log(e));
@@ -24,12 +24,24 @@ export default function segments() {
             items.push(segment);
             bus.emit({ type: 'created', segment });
         },
-        relabel(start, name) {
+        relabel(start, tags, properties) {
             const found = items.find((item) => {
                 return item.startTime.getTime() === start.getTime();
             });
             if (found) {
-                found.name = name;
+                found.tags = tags;
+                found.properties = properties;
+                bus.emit({ type: 'relabeled', segment: found });
+            }
+        },
+        retag(start, tags, properties) {
+            const found = items.find((item) => {
+                return item.startTime.getTime() === start.getTime();
+            });
+            if (found) {
+                found.tags = tags;
+                found.properties = properties;
+                delete found.options;
                 bus.emit({ type: 'relabeled', segment: found });
             }
         },