smart-home-engine 1.20.0 → 1.20.1

package/dist/web/assets/{tsMode-Dbzvu1EX.js → tsMode-BNcOSQVq.js}

@@ -1,4 +1,4 @@
-import{m as O}from"./monaco-langs-Dt8a9eeo.js";import{t as I}from"./index-BUev42o8.js";/*!-----------------------------------------------------------------------------
+import{m as O}from"./monaco-langs-Dt8a9eeo.js";import{t as I}from"./index-DxR31sxM.js";/*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.52.2(404545bded1df6ffa41ea0af4e8ddb219018c6c1)
  * Released under the MIT license

package/dist/web/index.html

@@ -172,10 +172,10 @@
                 }
             })();
         </script>
-      <script type="module" crossorigin src="/assets/index-BUev42o8.js"></script>
+      <script type="module" crossorigin src="/assets/index-DxR31sxM.js"></script>
       <link rel="modulepreload" crossorigin href="/assets/monaco-langs-Dt8a9eeo.js">
       <link rel="stylesheet" crossorigin href="/assets/monaco-langs-DyX1CsEw.css">
-      <link rel="stylesheet" crossorigin href="/assets/index-nf1nG74s.css">
+      <link rel="stylesheet" crossorigin href="/assets/index-CjRDTePT.css">
     </head>
     <body>
         <div id="app"></div>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "smart-home-engine",
-    "version": "1.20.0",
+    "version": "1.20.1",
     "description": "Node.js based script runner for use in MQTT based Smart Home environments",
     "main": "src/index.js",
     "scripts": {

package/src/influx.js

@@ -6,6 +6,10 @@ let _mode = null; // 'v1' | 'v2' | null
 
 const V1_TIMEOUT_MS = 10000;
 
+function v1Timeout() {
+    return Number(_opts.timeout) || V1_TIMEOUT_MS;
+}
+
 /**
  * Initialise the InfluxDB client.  Called from index.js when config.influx is set.
  *
@@ -119,7 +123,7 @@ async function v1Write(lines) {
         method: 'POST',
         headers: v1Headers(),
         body: lines,
-        signal: AbortSignal.timeout(V1_TIMEOUT_MS),
+        signal: AbortSignal.timeout(v1Timeout()),
     });
     if (!res.ok) {
         const body = await res.text().catch(() => '');
@@ -139,7 +143,7 @@ async function v1Query(q) {
     const params = new URLSearchParams({ db: _opts.database, q, epoch: 'ms' });
     const res = await fetch(`${_opts.url.replace(/\/$/, '')}/query?${params}`, {
         headers: v1Headers(),
-        signal: AbortSignal.timeout(V1_TIMEOUT_MS),
+        signal: AbortSignal.timeout(v1Timeout()),
     });
     if (!res.ok) {
         const body = await res.text().catch(() => '');
@@ -170,4 +174,13 @@ function escapeQL(s) {
     return String(s).replace(/\\/g, '\\\\').replace(/'/g, "\\'");
 }
 
-module.exports = { init, getClient, getOpts, getMode, buildLine, v1Write, v1Query, escapeQL };
+/**
+ * Escape a string for use inside an InfluxQL double-quoted identifier
+ * (measurement/tag/field name).
+ * @param {string} s
+ */
+function escapeIdent(s) {
+    return String(s).replace(/"/g, '\\"');
+}
+
+module.exports = { init, getClient, getOpts, getMode, buildLine, v1Write, v1Query, escapeQL, escapeIdent };

package/src/sandbox/influx-sandbox.js

@@ -35,6 +35,18 @@ function v1RowVal(row) {
     return null;
 }
 
+/**
+ * Map v1 result rows to the { ts, val } shape, newest-trimmed to n (LIMIT
+ * applies per series in InfluxQL, so multi-series results must be merged and
+ * re-trimmed), sorted oldest-first.
+ * @param {object[]} rows
+ * @param {number} [n]
+ */
+function v1Points(rows, n) {
+    const pts = rows.map((r) => ({ ts: r.time, val: v1RowVal(r) })).sort((a, b) => b.ts - a.ts);
+    return (n ? pts.slice(0, Number(n)) : pts).reverse();
+}
+
 module.exports = function (she) {
     she.influx = {
         /**
@@ -101,10 +113,12 @@ module.exports = function (she) {
         },
 
         /**
-         * Return the last N recorded values for an MQTT topic.
-         * Assumes data was stored with a "topic" tag; the value comes from the
-         * "_value" field (v2) or the "value" field (v1, falling back to the
-         * first data column). Results are sorted oldest-first.
+         * Return the last N recorded values for an MQTT topic (last 30 days).
+         * v2: assumes points carry a "topic" tag, value from "_value".
+         * v1: tries a measurement named like the topic first (influx4mqtt-style
+         * schema), then falls back to a "topic" tag scan; value from the
+         * "value" field, falling back to the first data column.
+         * Results are sorted oldest-first.
          * @param {string} topic
          * @param {number} n
          * @returns {Promise<{ ts: number, val: any }[]>}
@@ -113,16 +127,16 @@ module.exports = function (she) {
             const mode = influx.getMode();
             if (!mode) return Promise.resolve([]);
             if (mode === 'v1') {
-                // LIMIT applies per series in InfluxQL — query across all
-                // measurements, then merge, trim to n and sort ascending.
-                const ql = `SELECT * FROM /.*/ WHERE "topic" = '${influx.escapeQL(topic)}' ORDER BY time DESC LIMIT ${Number(n)}`;
-                return influx.v1Query(ql).then((rows) =>
-                    rows
-                        .map((r) => ({ ts: r.time, val: v1RowVal(r) }))
-                        .sort((a, b) => b.ts - a.ts)
-                        .slice(0, Number(n))
-                        .reverse(),
-                );
+                // Fast path: measurement named like the topic (the common
+                // mqtt-to-influx v1 schema, e.g. influx4mqtt). Fallback: points
+                // stored with a "topic" tag — that needs a scan across all
+                // measurements, so keep it time-bounded (30d, like the v2 path).
+                const mQl = `SELECT * FROM "${influx.escapeIdent(topic)}" WHERE time >= now() - 30d ORDER BY time DESC LIMIT ${Number(n)}`;
+                return influx.v1Query(mQl).then((rows) => {
+                    if (rows.length) return v1Points(rows, n);
+                    const tagQl = `SELECT * FROM /.*/ WHERE "topic" = '${influx.escapeQL(topic)}' AND time >= now() - 30d ORDER BY time DESC LIMIT ${Number(n)}`;
+                    return influx.v1Query(tagQl).then((tagRows) => v1Points(tagRows, n));
+                });
             }
             const opts = influx.getOpts();
             const safeTopic = topic.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
@@ -143,8 +157,13 @@ module.exports = function (she) {
             if (mode === 'v1') {
                 const fromMs = new Date(from).getTime();
                 const toMs = new Date(to).getTime();
-                const ql = `SELECT * FROM /.*/ WHERE "topic" = '${influx.escapeQL(topic)}' AND time >= ${fromMs}ms AND time <= ${toMs}ms`;
-                return influx.v1Query(ql).then((rows) => rows.map((r) => ({ ts: r.time, val: v1RowVal(r) })).sort((a, b) => a.ts - b.ts));
+                const bounds = `time >= ${fromMs}ms AND time <= ${toMs}ms`;
+                const mQl = `SELECT * FROM "${influx.escapeIdent(topic)}" WHERE ${bounds}`;
+                return influx.v1Query(mQl).then((rows) => {
+                    if (rows.length) return v1Points(rows);
+                    const tagQl = `SELECT * FROM /.*/ WHERE "topic" = '${influx.escapeQL(topic)}' AND ${bounds}`;
+                    return influx.v1Query(tagQl).then((tagRows) => v1Points(tagRows));
+                });
             }
             const opts = influx.getOpts();
             const safeTopic = topic.replace(/\\/g, '\\\\').replace(/"/g, '\\"');