frugal-iot-client 2.0.6 → 2.0.7

package/CLAUDE.md

@@ -259,7 +259,9 @@ else — no `mqtt-wrapper`, no discovery tree, no `/config.json`. `standaloneTop
 the `mqtt-client` element instead. `test/embedded.test.js` guards this — it has broken twice
 unnoticed.
 
-Still not available on such a page: graph history (`addDataFrom` needs `server_config.logger.url`).
+Graph history has no `server_config.logger.url` to read on such a page, so `loggerUrl()` falls back
+to `/data` on the server the modules were loaded from. `/data` needs a login, so a page on another
+site gets dotted "no data" gaps instead of history.
 
 ### Looking up topics
 

package/core.js

@@ -66,6 +66,11 @@ function nextUniqueId() { return ++unique_id; }
 const RECEIVER_ATTRIBUTES = ['value','color','type','label','topic','graphable','wired','wiring'];
 let server_config;  // { user, organizations, logger, mqtt, server } - note loaded by MqttWrapper OR MqttAdmin
 
+// An embedded page loads no /config.json, so assume the logger is on the server these modules came from
+function loggerUrl() {
+  return server_config?.logger?.url ?? new URL('/data', import.meta.url).href;
+}
+
 // This structure defines each of the common Input/Output types included within a sensor or acctuator
 // NOTE BELOW COPIED TO SERVER config.d/schema on 20 Feb - append any changes since then
 
@@ -2186,7 +2191,9 @@ class MqttTopic {
     } else {
       // Headless path: update the data tree directly (also reached by detached MqttGraphDataset topics).
       // topicSetPath throws if nodeMt is null, so guard the startsWith call with nodeMt.
-      const isParam = this.nodeMt && topic.startsWith(this.topicSetPath + '/');
+      // The node publishes its own wired paths on the read path, the UX writes them on the set path.
+      const isParam = this.nodeMt
+        && (topic.startsWith(this.topicPath + '/') || topic.startsWith(this.topicSetPath + '/'));
       if (isParam) {
         // Parameter subtopic arriving (e.g. now/wired, temperature/max).
         if (topic.split('/').pop() === 'wired') this.setWired(message);
@@ -2329,7 +2336,7 @@ class MqttTopic {
   addDataFrom(filename, first, cb) {
     //TODO this location may change
     // noinspection JSUnresolvedReference
-    let filepath = `${server_config.logger.url}/${this.topicPath}/${filename}`;
+    let filepath = `${loggerUrl()}/${this.topicPath}/${filename}`;
     console.log("Adding from", filepath);
     //let self = this; // if needed in Promise
     fetch(filepath)

package/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "async": "^3.2.6",
     "chart.js": "^4.5.1",
-    "csv-parse": "^5.6.0",
+    "csv-parse": "^7.0.3",
     "dial-gauge": "^0.1.5",
     "esptool-js": "^0.6.1",
     "html-element-extended": "^0.1.7",
@@ -41,5 +41,5 @@
     "unlink:hee": "rm -f node_modules/html-element-extended && npm install html-element-extended"
   },
   "type": "module",
-  "version": "2.0.6"
+  "version": "2.0.7"
 }

package/test/datatree.test.js

@@ -260,6 +260,15 @@ describe('controls and wiring', () => {
     assert.equal(nowMt.wiredTopic, nodeMt.groups.sht.topics.temperature);
   });
 
+  test('a wired path the node publishes on its read path is a parameter, not a value', () => {
+    const { projectMt } = mock.runScenario('control-wired');
+    const groupMt = projectMt.nodes['esp8266-fb94bb'].groups.controlhysteresis;
+    mock.deliver('dev/lotus/esp8266-fb94bb/controlhysteresis/out/wired', 'dev/lotus/esp8266-fb94bb/set/relay/on');
+    assert.equal(groupMt.state.out_wired, 'dev/lotus/esp8266-fb94bb/set/relay/on');
+    assert.equal(groupMt.topics.out.wired, 'dev/lotus/esp8266-fb94bb/set/relay/on');
+    assert.equal(typeof groupMt.summaryShort(), 'string');
+  });
+
   test('an unwired control has no wiredTopic', () => {
     const { projectMt } = mock.runScenario('control-unwired');
     const nowMt = projectMt.nodes['esp8266-fb94bb'].groups.controlhysteresis?.topics?.now;

package/test/embedded.test.js

@@ -47,4 +47,19 @@ describe('embedded widgets', () => {
     // Not delivering a message here: dataChanged() calls chart.update(), and Chart.js cannot
     // measure text without a canvas, which jsdom does not have.
   });
+
+  test('a graphdataset fetches history from the logger with no server config', (t, done) => {
+    document.body.innerHTML =
+      '<mqtt-graph><mqtt-graphdataset topic="dev/lotus/esp32-784702/sht/temperature" color="red" label="Office Temperature" min=0 max=50 type="float"></mqtt-graphdataset></mqtt-graph>';
+    const ds = document.querySelector('mqtt-graphdataset');
+    const realFetch = globalThis.fetch;
+    let asked;
+    globalThis.fetch = (url) => { asked = url; return Promise.resolve({ ok: false, status: 404, statusText: 'Not Found' }); };
+    ds.mt.addDataFrom('2026-10-18.csv', true, (err) => {
+      globalThis.fetch = realFetch;
+      assert.equal(err, null);
+      assert.match(asked, /\/data\/dev\/lotus\/esp32-784702\/sht\/temperature\/2026-10-18\.csv$/);
+      done();
+    });
+  });
 });