frugal-iot-client 2.0.5 → 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

package/core.js

@@ -208,6 +208,13 @@ function mqtt_deliver(topic, msg, retained) {
     }
   }
 }
+// Drop one subscription, made with mqtt_subscribe, that was only wanted for a while.
+function mqtt_unsubscribe(topic) {
+  mqtt_subscriptions = mqtt_subscriptions.filter((s) => s.topic !== topic);
+  if (mqtt_client && mqtt_client.connected) {
+    mqtt_client.unsubscribe(topic, (err) => { if (err) console.error(err); });
+  }
+}
 // Drop every subscription belonging to an organization - all its topics start with the organization id.
 // Called when switching organization, both to tell the broker (if still connected) and so that the
 // connection made for the new organization does not resubscribe to the old organization's topics.
@@ -423,7 +430,7 @@ EN:
   close: close
   Collapse: Collapse
   Color:  Color
-  "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.": "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."
+  "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.": "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."
   Connect board: Connect board
   connected: connected
   connecting: connecting
@@ -446,7 +453,6 @@ EN:
   Done: Done
   ds18b20: ds18b20
   e.g. LiteFarm: e.g. LiteFarm
-  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.: 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.
   eCO2: eCO2
   Email: Email
   Enrol URL: Enrol URL
@@ -533,7 +539,7 @@ EN:
   No farms registered for this organization yet.: No farms registered for this organization yet.
   No nodes found for this farm's project(s).: No nodes found for this farm's project(s).
   No nodes found for this organization: No nodes found for this organization
-  No nodes have enrolled yet. A node enrols itself the first time it connects.: No nodes have enrolled yet. A node enrols itself the first time it connects.
+  No nodes have enrolled yet, and none have asked and been rejected.: No nodes have enrolled yet, and none have asked and been rejected.
   No organization: No organization
   No organization selected: No organization selected
   No OTA files uploaded yet.: No OTA files uploaded yet.
@@ -550,6 +556,7 @@ EN:
   Nodes: Nodes
   Nodes in Farm: Nodes in Farm
   Nodes in Organization: Nodes in Organization
+  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).: 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).
   Not in the schema: Not in the schema
   Not selected: Not selected
   Note this is your organization - not the organizations whose devices you want to access.: Note this is your organization - not the organizations whose devices you want to access.
@@ -581,6 +588,8 @@ EN:
   Pressure: Pressure
   Project: Project
   Project changed to: Project changed to
+  Asked %s to move: Asked %s to move
+  Waiting for %s to report: Waiting for %s to report
   Project ID: Project ID
   Project ID *: Project ID *
   Project Name: Project Name
@@ -733,7 +742,7 @@ FR:
   close: fermer
   Collapse: Réduire
   Color: Couleur  
-  "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.": "Compilé dans le micrologiciel d'un nœud, c'est ce qui lui permet de demander à ce serveur son propre identifiant de broker. Il n'accorde rien d'autre - ni lecture ni publication. Ajoutez-en un second pour le changer : les deux sont acceptés, donc les nœuds déjà flashés continuent de fonctionner jusqu'à ce que vous retiriez l'ancien."
+  "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.": "Compilé dans le micrologiciel et utilisé pour demander l'identifiant de broker. Ajoutez-en un second pour le changer : les deux sont acceptés, donc les nœuds déjà flashés continuent de fonctionner jusqu'à ce que vous retiriez l'ancien."
   Connect board: Connecter la carte
   connected: connecté
   connecting: connexion
@@ -756,7 +765,6 @@ FR:
   Done: Fait
   ds18b20: ds18b20
   e.g. LiteFarm: par ex. LiteFarm
-  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.: Chaque nœud a son propre identifiant de broker, qu'il récupère sur ce serveur lors de sa première connexion. Oubliez-en un pour qu'un nouvel identifiant lui soit délivré - nécessaire si son système de fichiers a été effacé, car il ne peut alors plus prouver quel nœud il est.
   eCO2: eCO2
   Email: Email
   Enrol URL: URL d'enrôlement
@@ -843,7 +851,7 @@ FR:
   No farms registered for this organization yet.: Aucune ferme enregistrée pour cette organisation pour l'instant.
   No nodes found for this farm's project(s).: Aucun nœud trouvé pour le(s) projet(s) de cette ferme.
   No nodes found for this organization: Aucun nœud trouvé pour cette organisation
-  No nodes have enrolled yet. A node enrols itself the first time it connects.: Aucun nœud ne s'est encore enrôlé. Un nœud s'enrôle lui-même lors de sa première connexion.
+  No nodes have enrolled yet, and none have asked and been rejected.: Aucun nœud ne s'est encore enrôlé, et aucun n'a été refusé.
   No organization: Aucune organisation
   No organization selected: Aucune organisation sélectionnée
   No OTA files uploaded yet.: Aucun fichier OTA téléversé pour l'instant.
@@ -860,6 +868,7 @@ FR:
   Nodes: Nœuds
   Nodes in Farm: Nœuds dans la ferme
   Nodes in Organization: Nœuds dans l'organisation
+  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).: Nœuds ayant obtenu leur identifiant de broker à la première connexion. Oublier en délivre un nouveau à la prochaine connexion, nécessaire si la mémoire a été effacée. Les nœuds refusés sont listés - cliquez sur Approuver pour autoriser (à la prochaine tentative, généralement 30 minutes).
   Not in the schema: Absent du schéma
   Not selected: Non sélectionné
   Note this is your organization - not the organizations whose devices you want to access.: Ceci est votre organisation - pas les organisations dont vous voulez accéder aux appareils.
@@ -891,6 +900,8 @@ FR:
   Pressure: Pression
   Project: Projet
   Project changed to: Projet changé en
+  Asked %s to move: Déplacement demandé à %s
+  Waiting for %s to report: En attente du rapport de %s
   Project ID: ID du projet
   Project ID *: ID du projet *
   Project Name: Nom du projet
@@ -1043,7 +1054,7 @@ HI:
   close: बंद करें
   Collapse: छोटा करें
   Color: रंग  
-  "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.": "नोड के फ़र्मवेयर में संकलित, यही उसे इस सर्वर से अपना ब्रोकर क्रेडेंशियल माँगने देता है। यह और कुछ नहीं देता - न पढ़ना, न प्रकाशित करना। इसे बदलने के लिए दूसरा जोड़ें: दोनों स्वीकार किए जाते हैं, इसलिए पहले फ़्लैश किए गए नोड तब तक काम करते रहते हैं जब तक आप पुराना वापस नहीं लेते।"
+  "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.": "फ़र्मवेयर में संकलित और ब्रोकर क्रेडेंशियल माँगने के लिए उपयोग किया जाता है। इसे बदलने के लिए दूसरा जोड़ें: दोनों स्वीकार किए जाते हैं, इसलिए पहले फ़्लैश किए गए नोड तब तक काम करते रहते हैं जब तक आप पुराना वापस नहीं लेते।"
   Connect board: बोर्ड कनेक्ट करें
   connected: जुड़े हुए
   connecting: कनेक्ट हो रहा है
@@ -1066,7 +1077,6 @@ HI:
   Done: पूर्ण
   ds18b20: ds18b20
   e.g. LiteFarm: उदाहरण के लिए LiteFarm
-  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.: हर नोड का अपना ब्रोकर क्रेडेंशियल होता है, जो वह पहली बार जुड़ते समय इस सर्वर से लेता है। किसी को भुला दें ताकि उसे नया क्रेडेंशियल मिले - यह ज़रूरी है यदि उसका फ़ाइल-सिस्टम मिटा दिया गया हो, क्योंकि तब वह यह सिद्ध नहीं कर सकता कि वह कौन सा नोड है।
   eCO2: ईसीओ2
   Email: ईमेल
   Enrol URL: पंजीकरण URL
@@ -1153,7 +1163,7 @@ HI:
   No farms registered for this organization yet.: इस संगठन के लिए अभी तक कोई फार्म पंजीकृत नहीं है।
   No nodes found for this farm's project(s).: इस फार्म के प्रोजेक्ट (प्रोजेक्ट्स) के लिए कोई नोड नहीं मिला।
   No nodes found for this organization: इस संगठन के लिए कोई नोड नहीं मिला
-  No nodes have enrolled yet. A node enrols itself the first time it connects.: अभी तक कोई नोड पंजीकृत नहीं हुआ है। नोड पहली बार जुड़ते समय स्वयं पंजीकृत हो जाता है।
+  No nodes have enrolled yet, and none have asked and been rejected.: अभी तक कोई नोड पंजीकृत नहीं हुआ है, और किसी को अस्वीकार नहीं किया गया है।
   No organization: कोई संगठन नहीं
   No organization selected: कोई संगठन चयनित नहीं
   No OTA files uploaded yet.: अभी तक कोई OTA फ़ाइल अपलोड नहीं की गई है।
@@ -1170,6 +1180,7 @@ HI:
   Nodes: नोड्स
   Nodes in Farm: फार्म में नोड्स
   Nodes in Organization: संगठन में नोड्स
+  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).: वे नोड जिन्होंने पहली बार जुड़ने पर ब्रोकर क्रेडेंशियल प्राप्त किए हैं। भुलाएँ अगली बार जुड़ने पर नया क्रेडेंशियल जारी करता है, और यह ज़रूरी है यदि मेमोरी मिटा दी गई हो। अस्वीकृत नोड भी सूचीबद्ध हैं - अनुमति देने के लिए स्वीकृत करें पर क्लिक करें (अगले प्रयास पर, आमतौर पर 30 मिनट)।
   Not in the schema: स्कीमा में नहीं
   Not selected: चयनित नहीं
   Note this is your organization - not the organizations whose devices you want to access.: ध्यान दें यह आपका संगठन है - वे संगठन नहीं जिनके उपकरणों तक आप पहुंचना चाहते हैं।
@@ -1201,6 +1212,8 @@ HI:
   Pressure: दाब
   Project: परियोजना
   Project changed to: प्रोजेक्ट बदलकर किया गया
+  Asked %s to move: "%s को स्थानांतरित करने को कहा"
+  Waiting for %s to report: "%s की रिपोर्ट की प्रतीक्षा"
   Project ID: प्रोजेक्ट आईडी
   Project ID *: प्रोजेक्ट आईडी *
   Project Name: प्रोजेक्ट का नाम
@@ -1353,7 +1366,7 @@ ID:
   close: tutup
   Collapse: Ciutkan
   Color: Warna  
-  "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.": "Dikompilasi ke dalam firmware sebuah node, inilah yang memungkinkannya meminta kredensial broker miliknya sendiri dari server ini. Ia tidak memberi apa pun selain itu - tidak membaca dan tidak menerbitkan. Tambahkan yang kedua untuk menggantinya: keduanya diterima, sehingga node yang sudah di-flash tetap bekerja sampai Anda mencabut yang lama."
+  "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.": "Dikompilasi ke dalam firmware dan digunakan untuk meminta kredensial broker. Tambahkan yang kedua untuk menggantinya: keduanya diterima, sehingga node yang sudah di-flash tetap bekerja sampai Anda mencabut yang lama."
   Connect board: Hubungkan papan
   connected: terhubung
   connecting: menghubungkan
@@ -1376,7 +1389,6 @@ ID:
   Done: Selesai
   ds18b20: ds18b20
   e.g. LiteFarm: misalnya LiteFarm
-  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.: Setiap node memiliki kredensial broker sendiri, yang diambilnya dari server ini saat pertama kali tersambung. Lupakan salah satu agar diberi kredensial baru - diperlukan jika sistem berkasnya telah dihapus, karena node itu tidak lagi dapat membuktikan node yang mana dirinya.
   eCO2: eCO2  
   Email: Email
   Enrol URL: URL pendaftaran
@@ -1463,7 +1475,7 @@ ID:
   No farms registered for this organization yet.: Belum ada farm yang terdaftar untuk organisasi ini.
   No nodes found for this farm's project(s).: Tidak ada node ditemukan untuk proyek farm ini.
   No nodes found for this organization: Tidak ada node ditemukan untuk organisasi ini
-  No nodes have enrolled yet. A node enrols itself the first time it connects.: Belum ada node yang mendaftar. Sebuah node mendaftarkan dirinya sendiri saat pertama kali tersambung.
+  No nodes have enrolled yet, and none have asked and been rejected.: Belum ada node yang terdaftar, dan tidak ada yang ditolak.
   No organization: Tidak ada organisasi
   No organization selected: Tidak ada organisasi yang dipilih
   No OTA files uploaded yet.: Belum ada berkas OTA yang diunggah.
@@ -1480,6 +1492,7 @@ ID:
   Nodes: Node
   Nodes in Farm: Node dalam Farm
   Nodes in Organization: Node dalam Organisasi
+  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).: Node yang telah memperoleh kredensial broker saat pertama kali tersambung. Lupakan menerbitkan kredensial baru pada sambungan berikutnya, dan diperlukan jika memori telah dihapus. Node yang ditolak juga dicantumkan - klik Setujui untuk mengizinkan (pada percobaan berikutnya, biasanya 30 menit).
   Not in the schema: Tidak ada di skema
   Not selected: Tidak dipilih
   Note this is your organization - not the organizations whose devices you want to access.: Ini adalah organisasi Anda - bukan organisasi yang perangkatnya ingin Anda akses.
@@ -1511,6 +1524,8 @@ ID:
   Pressure: Tekanan
   Project: Proyek
   Project changed to: Proyek diubah menjadi
+  Asked %s to move: Meminta %s pindah
+  Waiting for %s to report: Menunggu laporan %s
   Project ID: ID Proyek
   Project ID *: ID Proyek *
   Project Name: Nama Proyek
@@ -3332,6 +3347,7 @@ export {
   mqttTempConnect,
   mqtt_deliver,
   mqtt_subscribe,
+  mqtt_unsubscribe,
   mqtt_unsubscribe_organization,
   nextUniqueId,
   nowMs,