frugal-iot-client 2.0.4 → 2.0.6

package/admin.js

@@ -7,7 +7,7 @@
 
 import {EL, GET, HTMLElementExtended} from '/node_modules/html-element-extended/htmlelementextended.js';
 import mqtt from '/node_modules/mqtt/dist/mqtt.esm.js'; // https://www.npmjs.com/package/mqtt
-import { CssUrl, DELETE, POST, XXX, brokerHost, configSet, el, getString, getStringWith, hasCapability, mqttTempConnect, mqtt_subscribe, retainedPattern, locationParameterChange, mqtt_client, preferedLanguageSet, preferedLanguages, redirectToLogin, server_config } from './core.js';
+import { CssUrl, DELETE, POST, XXX, brokerHost, configSet, el, getString, getStringWith, hasCapability, mqttTempConnect, mqtt_subscribe, mqtt_unsubscribe, retainedPattern, locationParameterChange, mqtt_client, preferedLanguageSet, preferedLanguages, redirectToLogin, server_config } from './core.js';
 
 
 // The OTA upload is multipart, which POST() (JSON) cannot carry. Callback-style, like the rest.
@@ -173,8 +173,9 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
     ]);
   }
 // Fetch ota files and display
-  getOrDeleteOtaFiles(url) {
+  getOrDeleteOtaFiles(url, cb = () => {}) {
     GET(url, {}, (err, json) => {
+      cb();
       if (err) {
         this.message(err);
         return;
@@ -184,11 +185,11 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
       }
     });
   }
-  getOtaFiles() {
-    if (this.state.org) {
-      if (this.otaOrgs.map(o => o[0]).includes(this.state.org)) {
-        this.getOrDeleteOtaFiles(`/ota_list/${this.state.org}`);
-      }
+  getOtaFiles(cb = () => {}) {
+    if (this.state.org && this.otaOrgs.map(o => o[0]).includes(this.state.org)) {
+      this.getOrDeleteOtaFiles(`/ota_list/${this.state.org}`, cb);
+    } else {
+      cb();
     }
   }
   onOtaDelete(val, ev) {
@@ -241,8 +242,9 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
       );
   }
   // Fetch people and display
-  getOrChangeAdminPeople(url) {
+  getOrChangeAdminPeople(url, cb = () => {}) {
     GET(url, {}, (err, json) => {
+      cb();
       if (err) {
         this.message(err.message);
         return;
@@ -328,9 +330,10 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
         onclick: this.onEnrolmentSecretAdd.bind(this)}),
     ]);
   }
-  getEnrolledNodes() {
-    if (!this.state.org) return;
+  getEnrolledNodes(cb = () => {}) {
+    if (!this.state.org) { cb(); return; }
     GET(`/nodes_list/${this.state.org}`, {}, (err, json) => {
+      cb();
       if (err) { this.message(err.message); return; }
       this.state.enrolled_nodes = json; // [{ project, nodeid, lora, enrolled_at }]
       this.replaceElement("enrolled_nodes", this.enrolledNodesList());
@@ -345,9 +348,10 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
    * itself is up. A Pi with a broken bridge still checks in, and that difference is exactly what
    * is hard to see from production any other way.
    */
-  getBridges() {
-    if (!this.state.org) return;
+  getBridges(cb = () => {}) {
+    if (!this.state.org) { cb(); return; }
     GET(`/bridges_list/${this.state.org}`, {}, (err, json) => {
+      cb();
       if (err) { this.message(err.message); return; }
       this.state.bridges = json; // [{ site, account, created_at, last_pull }]
       this.subscribeBridgeState();
@@ -554,9 +558,7 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
     const nodes = this.state.enrolled_nodes;
     if (!nodes || !nodes.length) {
       return el('p', {textContent:
-        "No nodes have enrolled yet, and none is asking to. A node enrols itself the first time it " +
-        "connects; one that asks and is refused is listed here too, so an empty list means nothing " +
-        "is reaching this server at all - check that the node's org and enrol URL are this one."});
+        "No nodes have enrolled yet, and none have asked and been rejected."});
     }
     const states = this.nodeStates();
     return el('table', {class: 'nodestates'}, [
@@ -594,14 +596,17 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
       }),
     ]);
   }
-  getPeopleList() {
+  getPeopleList(cb = () => {}) {
     if (this.state.org) {
-      this.getOrChangeAdminPeople(`/people_list/${this.state.org}`);
+      this.getOrChangeAdminPeople(`/people_list/${this.state.org}`, cb);
+    } else {
+      cb();
     }
   }
   // Fetch projects and display
-  getOrChangeAdminProjects(url) {
+  getOrChangeAdminProjects(url, cb = () => {}) {
     GET(url, {}, (err, json) => {
+      cb();
       if (err) {
         this.message(err.message);
         return;
@@ -611,9 +616,11 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
       }
     });
   }
-  getProjectsList() {
+  getProjectsList(cb = () => {}) {
     if (this.state.org) {
-      this.getOrChangeAdminProjects(`/projects_list/${this.state.org}`);
+      this.getOrChangeAdminProjects(`/projects_list/${this.state.org}`, cb);
+    } else {
+      cb();
     }
   }
   onPermissionsDelete(val, ev) {
@@ -717,9 +724,10 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
   }
   // Fetch all registered Farm-Platforms, and display. Not org-scoped - a platform is a many-to-many
   // relationship with orgs/projects, recorded per-mapping in api_farms (see getFarmsList).
-  getPlatformsList() {
+  getPlatformsList(cb = () => {}) {
     if (this.state.org) {
       GET(`/api/platforms/list`, {}, (err, json) => {
+        cb();
         if (err) {
           this.message(err.message);
           return;
@@ -733,6 +741,8 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
         this.replaceElement("platforms_list_display", this.platformsListDisplay());
         this.replaceElement("add_farm", this.collapsibleArea('add_farm', "Add Farm", this.farmRegisterForm));
       });
+    } else {
+      cb();
     }
   }
   onPlatformSelect(ev) {
@@ -802,9 +812,10 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
     return el('div', {}, [el('h3', {textContent: "Register Platform"}), EL]);
   }
   // Fetch farm-to-project mappings registered for the selected organization, and display
-  getFarmsList() {
+  getFarmsList(cb = () => {}) {
     if (this.state.org) {
       GET(`/api/farms/list?org=${encodeURIComponent(this.state.org)}`, {}, (err, json) => {
+        cb();
         if (err) {
           this.message(err.message);
           return;
@@ -819,6 +830,8 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
         this.replaceElement("farm_node_actions", this.farmNodeActions());
         this.getDeviceActionSchema();
       });
+    } else {
+      cb();
     }
   }
   onFarmSelect(ev) {
@@ -907,13 +920,13 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
   // server_config locally - this is the API tab, so it should exercise the same API a real
   // Farm-Platform would use. A farm can map to more than one project, so one request per project id,
   // joined into a single row set once all have replied.
-  getFarmNodesList() {
+  getFarmNodesList(cb = () => {}) {
     const org = this.state.org;
     const projectIds = this.selectedFarmProjectIds();
     if (!org || projectIds.length === 0) {
       this.state.farm_nodes_list = [];
-    this.state.enrolled_nodes = null;
       this.replaceElement("farm_nodes_table", this.farmNodesTable());
+      cb();
       return;
     }
     let remaining = projectIds.length;
@@ -936,6 +949,7 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
           });
         }
         if (--remaining === 0) {
+          cb();
           this.state.farm_nodes_list = allNodes;
           this.replaceElement("farm_nodes_table", this.farmNodesTable());
         }
@@ -999,15 +1013,17 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
   }
   // Fetch the selected node's Device Schema so the Action section can list its actions - triggered
   // whenever the selected node changes.
-  getDeviceActionSchema() {
+  getDeviceActionSchema(cb = () => {}) {
     const device = this.selectedFarmNodeDevice();
     this.state.device_schema = null;
     this.state.selected_action = null;
     if (!device) {
       this.replaceElement("action_section", this.actionSection());
+      cb();
       return;
     }
     GET(`/api/devices/schema?device=${encodeURIComponent(device)}`, {}, (err, json) => {
+      cb();
       if (err) {
         this.message(err.message);
         return;
@@ -1169,17 +1185,21 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
   }
   // Each of these lists is the result of one fetch made when the card opened - nothing pushes a
   // change, so the heading carries the way to ask again.
+  // refreshFn is given a callback for when its reply has arrived, which is what stops the spin.
   refreshableHeading(title, refreshFn) {
-    return el('h3', {}, [
-      el('span', {textContent: title}),
-      el('span', {class: 'pseudolink refresh', i8n: false, title: getString("Refresh"),
-        textContent: ' \u27f3', onclick: refreshFn.bind(this)}),
-    ]);
+    const iconEl = el('span', {class: 'pseudolink refresh', i8n: false, title: getString("Refresh"),
+      textContent: '\u27f3', onclick: () => {
+        if (iconEl.classList.contains('busy')) return;
+        iconEl.classList.add('busy');
+        refreshFn.call(this, () => iconEl.classList.remove('busy'));
+      }});
+    return el('h3', {}, [el('span', {textContent: title}), iconEl]);
   }
   // The organization's nodes are read out of server_config, so refreshing this table means fetching
   // /config.json again rather than re-rendering what is already here.
-  refreshNodesTable() {
+  refreshNodesTable(cb = () => {}) {
     GET("/config.json", {}, (err, json) => {
+      cb();
       if (err) { this.message(err.message); return; }
       configSet(json);
       this.replaceElement("nodes_table", this.nodesTable());
@@ -1204,9 +1224,7 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
     this.adminSections().forEach((section) => this.replaceElement(section.rest, this.gatedContent(section)));
     // Which tabs do their own network fetch, and so need one again for a new organization. Only
     // Dashboard does not (mqtt-wrapper handles it). "Nodes" is in the list because it now fetches
-    // the enrolled-node list as well as reading server_config - leaving it out was why that section
-    // always said "No nodes have enrolled yet": loadSectionIfNeeded returns early for a tab that is not
-    // in this set, so the fetch never happened.
+    // the enrolled-node list as well as reading server_config:
     this.state.sectionsNeedingLoad = new Set(['OTA', 'Admin', 'Projects', 'Nodes', 'Bridges', 'API']);
     this.loadSectionIfNeeded(this.state.activeSectionTitle);
     // Only a card created without an organization has a dropdown of its own; replaceElement does
@@ -1393,32 +1411,55 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
     }
 
     onNodeProjectChange(nodeId, oldProjectId, selectElement, onChanged) {
-      // Handle project change for a node
       const newProjectId = selectElement.value;
       if (newProjectId === oldProjectId) {
         return; // No change
       }
+      const org = this.state.org;
+      const topic = `${org}/${oldProjectId}/${nodeId}/set/frugal_iot/project`;
+      console.log(`Publishing ${topic} = ${newProjectId}`);
+      // Not retained: a sleeping node still gets it, from its persistent session, when it wakes.
+      mqtt_client.publish(topic, newProjectId, {retain: false, qos: 1});
+      this.message(getStringWith("Asked %s to move", nodeId));
+      this.watchNodeMove(org, nodeId, oldProjectId, newProjectId, onChanged);
+      onChanged();
+    }
 
-      // Send MQTT message to update project
-      const topic = `${this.state.org}/${oldProjectId}/${nodeId}/set/frugal_iot/project`;
-      const message = newProjectId;
-
-      console.log(`Publishing ${topic} = ${message}`);
-      mqtt_client.publish(topic, message, {retain: false, qos: 1});
-      this.message(`${getString("Project changed to")} ${newProjectId} ${getString("for node")} ${nodeId}`);
+    // The move is done when the node is heard at its new address - nothing else says so, because the
+    // node restarts and enrols afresh there, and the server tidies the old address away only then.
+    watchNodeMove(org, nodeId, fromProjectId, toProjectId, onChanged) {
+      const moves = this.state.nodeMoves || (this.state.nodeMoves = {});
+      if (moves[nodeId]) { mqtt_unsubscribe(moves[nodeId].watch); }
+      const watch = `${org}/${toProjectId}/${nodeId}/#`;
+      moves[nodeId] = {from: fromProjectId, to: toProjectId, watch};
+      mqtt_subscribe(watch, (topic, message, retained) => {
+        // A retained message is the broker's memory of an earlier stay in that project, not this node
+        if (retained || moves[nodeId]?.watch !== watch) { return; }
+        delete moves[nodeId];
+        mqtt_unsubscribe(watch);
+        this.moveNodeInConfig(org, nodeId, fromProjectId, toProjectId);
+        onChanged();
+      });
+    }
 
-      // Refresh the table after a short delay
-      setTimeout(onChanged, 500);
+    // server_config is only fetched at startup, so it is told here what the server now believes.
+    moveNodeInConfig(org, nodeId, fromProjectId, toProjectId) {
+      const projects = this.projectsOf(org);
+      const from = projects[fromProjectId]?.nodes;
+      const to = projects[toProjectId] && (projects[toProjectId].nodes || (projects[toProjectId].nodes = {}));
+      if (!to) { return; }
+      to[nodeId] = {...(from?.[nodeId] || {}), lastseen: new Date().toISOString()};
+      if (from) { delete from[nodeId]; }
     }
 
     renderProjectIdCell(node, onChanged) {
-      // Create an editable cell for projectId that opens a dropdown on click
+      const move = this.state.nodeMoves?.[node.nodeId];
+      const pending = move && move.from === node.projectId;
       return el('td', {
         style: 'cursor: pointer; position: relative;',
-        title: 'Click to change project',
+        title: pending ? getStringWith("Waiting for %s to report", node.nodeId) : getString("Click to change project"),
         onclick: (e) => {
-          // Replace with dropdown
-          const dropdown = this.projectsDropdownForNode(this.state.org, node.projectId);
+          const dropdown = this.projectsDropdownForNode(this.state.org, pending ? move.to : node.projectId);
           dropdown.addEventListener('change', (changeEvent) => {
             this.onNodeProjectChange(node.nodeId, node.projectId, changeEvent.target, onChanged);
           });
@@ -1427,7 +1468,7 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
           // Close dropdown if focus lost
           dropdown.addEventListener('blur', onChanged);
         }
-      }, [node.projectId]);
+      }, [pending ? `${node.projectId} → ${move.to} …` : node.projectId]);
     }
 
    // Content of the OTA tab below the organization dropdown - only rendered once an org is selected
@@ -1627,20 +1668,17 @@ class MqttAdmin extends HTMLElementExtended { // TODO-89 may depend on organizat
        el('section', {}, [
          this.refreshableHeading("Enrolled nodes", this.getEnrolledNodes),
          el('p', {textContent:
-           "Each node has its own broker credential, which it collects from this server the first " +
-           "time it connects. Forget one to have it issued a new credential - needed if its " +
-           "filesystem has been erased, because it can then no longer prove which node it is. A " +
-           "node that asked and was refused is listed here as well, with why: click Approve on it " +
-           "to accept its next request whatever secret it presents. It retries every half hour."}),
+           "Nodes that have obtained broker credentials on first connection. " +
+           "Forget reissues a new credential at next connection and is needed if memory has been erased. " +
+           "Refused nodes are listed - click Approve to allow (on next retry, typically 30 minutes)."}),
          this.state.elements.enrolled_nodes = this.enrolledNodesList(),
        ]),
        el('section', {}, [
          el('h3', {textContent: "Enrolment secret"}),
-         el('p', {textContent:
-           "Compiled into a node's firmware, this is what lets it ask this server for its own " +
-           "broker credential. It grants nothing else - no reading and no publishing. Add a second " +
-           "one to change it: both are accepted, so nodes already flashed keep working until you " +
-           "withdraw the old one."}),
+         el('p', {i8n: false, textContent: getString(
+           "Compiled into firmware and used to request broker credential. " +
+           "Add a second one to change it: both are accepted, so nodes already flashed keep working until you " +
+           "withdraw the old one.")}),
          this.state.elements.enrolment_secrets = this.enrolmentSecretsList(),
        ]),
      ]);

package/base/boards.json

@@ -1,7 +1,7 @@
 {
-  "version": 7,
+  "version": 8,
   "coreVersion": "pioarduino framework-arduinoespressif32 3.3.9",
-  "comment": "Base bundles for USB flashing - see FLASH_PLAN.md. Bootloaders MUST come from the same framework the firmware is built against: generated from pioarduino framework-arduinoespressif32-libs/<chip>/bin/bootloader_qio_80m.elf via 'esptool elf2image --flash-mode dio --flash-freq 80m --flash-size 4MB'. The C3 one is byte-identical to a real pioarduino build; S2/S3 use the same recipe but are unverified against a reference build. The Arduino IDE core's dio_80m ELF produces a DIFFERENT bootloader that did not work. Flash-size independent (esptool patches the header at write time). Partition tables are chip-independent. boot_app0.bin is universal.",
+  "comment": "Base bundles for USB flashing - see FLASH_PLAN.md. Bootloaders MUST come from the same framework the firmware is built against: generated from pioarduino framework-arduinoespressif32-libs/<chip>/bin/bootloader_qio_80m.elf via 'esptool elf2image --flash-mode dio --flash-freq 80m --flash-size 4MB'. The C3 one is byte-identical to a real pioarduino build; S2/S3 use the same recipe but are unverified against a reference build. The Arduino IDE core's dio_80m ELF produces a DIFFERENT bootloader that did not work. Flash-size independent (esptool patches the header at write time). Partition tables are chip-independent, and are the core's stock CSVs, so they match what a PlatformIO env using the same scheme writes. boot_app0.bin is universal.",
   "otadata": "boot_app0.bin",
   "partitionTableOffset": 32768,
   "bootloaderByChip": {
@@ -13,13 +13,13 @@
     "ESP32-C3-4MB": "min_spiffs",
     "ESP32-S2-4MB": "min_spiffs",
     "ESP32-S3-4MB": "min_spiffs",
-    "ESP32-S3-8MB": "frugal_8mb",
-    "ESP32-S3-16MB": "frugal_16mb"
+    "ESP32-S3-8MB": "default_8MB",
+    "ESP32-S3-16MB": "default_16MB"
   },
   "partitionsByScheme": {
     "min_spiffs": "partitions/min_spiffs.bin",
-    "frugal_8mb": "partitions/frugal_8mb.bin",
-    "frugal_16mb": "partitions/frugal_16mb.bin"
+    "default_8MB": "partitions/default_8MB.bin",
+    "default_16MB": "partitions/default_16MB.bin"
   },
   "wholeImageChips": [
     "ESP8266"

package/base/partitions/default_16MB.csv

@@ -0,0 +1,7 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x640000,
+app1,     app,  ota_1,   0x650000,0x640000,
+spiffs,   data, spiffs,  0xc90000,0x360000,
+coredump, data, coredump,0xFF0000,0x10000,

package/base/partitions/default_8MB.csv

@@ -0,0 +1,7 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x330000,
+app1,     app,  ota_1,   0x340000,0x330000,
+spiffs,   data, spiffs,  0x670000,0x180000,
+coredump, data, coredump,0x7F0000,0x10000,

package/cards.js

@@ -384,11 +384,20 @@ class MqttDeviceCard extends HTMLElementExtendedMinimum {
         this.compact(hyst, {}),
       ]) : null,
     ].filter(Boolean)) : null;
+    // Any other control - a display's inputs, Blinken's timings - gets a plain row per topic, or its
+    // section came out empty and was dropped, leaving nothing to wire (control_lcd_ht did exactly that)
+    const laidOut = ['now', 'greater', 'limit', 'hysteresis', 'hysterisis', 'out', 'manual'];
+    const others = Object.entries(t).filter(([leaf]) => !laidOut.includes(leaf)).map(([, mt]) => {
+      const widget = this.widgetForTopic(mt, '', mt.wireable ? { wiring: 'open' } : {});
+      this.state.elements.widgets.push({ row: { mt }, widget });
+      return this.field(mt.name, widget);
+    });
     return this.section(groupMt.state.name || groupId, [
       t.now ? this.field(getString('Input'), this.widgetForTopic(t.now, '', { wiring: 'open' })) : null,
       when ? this.field(getString('When'), when) : null,
       t.out ? this.field(getString('Output'), this.widgetForTopic(t.out, '', { wiring: 'open' })) : null,
       t.manual ? this.field(getString('Manual'), this.widgetForTopic(t.manual, '')) : null,
+      ...others,
     ]);
   }
   // A bare input with no label of its own, for the inline "when" row