@yarkivaev/scada 1.2.0 → 1.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yarkivaev/scada",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "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)
@@ -63,15 +63,16 @@ export default function clickhouseSensor(connection, topic, displayName, unit) {
                 return { timestamp: new Date(`${row.ts}Z`), value: row.value, unit };
             });
         },
-        stream(since, step, callback) {
+        stream(since, step, callback, clock) {
+            const time = clock || (() => { return new Date(); });
             let lastTs = since;
             const timer = setInterval(async () => {
                 try {
                     const rows = await connection.query(
                         `SELECT ts, value FROM scada.metrics
-                         WHERE topic = {topic:String} AND ts > {since:DateTime64(3)}
+                         WHERE topic = {topic:String} AND ts > {since:DateTime64(3)} AND ts <= {until:DateTime64(3)}
                          ORDER BY ts LIMIT 100`,
-                        { topic, since: formatDateTime(lastTs) }
+                        { topic, since: formatDateTime(lastTs), until: formatDateTime(time()) }
                     );
                     rows.forEach((row) => {
                         const timestamp = new Date(`${row.ts}Z`);

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/scyllaSensor.js

@@ -31,12 +31,13 @@ export default function scyllaSensor(connection, topic, displayName, unit) {
                 return { timestamp: row.ts, value: row.value, unit };
             });
         },
-        stream(since, step, callback) {
+        stream(since, step, callback, clock) {
+            const time = clock || (() => { return new Date(); });
             let lastTs = since;
             const timer = setInterval(async () => {
                 const rows = await connection.query(
-                    'SELECT ts, value FROM scada.metrics WHERE topic = ? AND ts > ? LIMIT 100',
-                    [topic, lastTs]
+                    'SELECT ts, value FROM scada.metrics WHERE topic = ? AND ts > ? AND ts <= ? LIMIT 100',
+                    [topic, lastTs, time()]
                 );
                 rows.forEach((row) => {
                     callback({ timestamp: row.ts, value: row.value, unit });