frugal-iot-server 0.3.6 → 0.3.7

package/config.d/schema/modules.yaml

@@ -153,6 +153,20 @@ do:
 ens160:
   name: "ENS160"
   topics:
+    # Compensation inputs, not readings. The ENS160 has no thermometer of its own: it takes
+    # ambient temperature and humidity from whatever is wired to it - an AHT21 sitting on the
+    # same breakout, or any other sensor on the node. So these come from controlfloat (wireable,
+    # rw: w, not logged) rather than from the temperature/humidity topics, which are read-only
+    # readings - whichever sensor actually measures them is the one that logs them.
+    - leaf: temperature
+      leaf_from: controlfloat
+      name: Temperature
+      max:  50
+      color: red
+    - leaf: humidity
+      leaf_from: controlfloat
+      name: Humidity
+      color: blue
     - leaf: aqi
     - leaf: tvoc
     - leaf: eco2

package/config.d/server.yaml

@@ -6,12 +6,21 @@ port: 8080
 # so this setting arriving in a new release never quietens a machine that was logging before.
 morgan: false
 
-#Production mode
-nodemodulesdir: ./node_modules
+# Where the web client is. Installed with npm it is a dependency, so it is here:
 htmldir: ./node_modules/frugal-iot-client
-# Development mode (uncomment these two, and comment out the two above, when working on the client)
+# To work on the client, either point this at your checkout of it
 #htmldir: ../frugal-iot-client
-#nodemodulesdir: ../frugal-iot-client/node_modules
+# or, better, leave this line alone and link the checkout in, which needs no edit here and so
+# nothing to remember to change back:
+#   cd ../frugal-iot-client && npm link
+#   cd ../frugal-iot-server && npm link frugal-iot-client
+#
+# nodemodulesdir is where the libraries the client loads (chart.js, luxon ...) are served from.
+# It does not normally need setting: the server looks inside htmldir first and then here, which
+# covers both an npm install (libraries hoisted to this directory) and a checkout (libraries in
+# the checkout's own node_modules). Set it only if yours are somewhere else again.
+#nodemodulesdir: ./node_modules
+
 # The path to the private directory is relative to the server's working directory.
 privatedir: ./private
 publicdir: ./public

package/frugal-iot-server.js

@@ -747,12 +747,31 @@ mqttLogger.readYamlConfig('.', (err, configobj) => {
         });
     });
 
-    // Serve Node modules at /node_modules but configure where to get them.
-    console.log("Serving /node_modules from", config.server.nodemodulesdir);
+    // Serve Node modules at /node_modules - the libraries the web client loads, such as chart.js
+    // and luxon, which it asks for by that path.
+    //
+    // Two places to look, because where those libraries sit depends on how the client got here:
+    //  - installed with npm, they are hoisted to this directory's own node_modules alongside the
+    //    client, and there is no node_modules inside the client at all;
+    //  - working from a checkout of the client (whether htmldir points at it, or node_modules holds
+    //    an "npm link" symlink to it), they are in that checkout's own node_modules, and npm has
+    //    removed the hoisted copies as no longer needed.
+    // Both are offered, the client's own first, and express falls through to the next when a file is
+    // not in the one before. So neither layout needs configuring, and getting it wrong is not a
+    // thing that can happen.
+    // Both default to where npm puts things, so a server.yaml that says nothing about either still
+    // works, and a missing setting does not turn into an obscure error from express.static
+    if (!config.server.nodemodulesdir) config.server.nodemodulesdir = './node_modules';
+    if (!config.server.htmldir) config.server.htmldir = './node_modules/frugal-iot-client';
+    const clientNodeModules = path.join(config.server.htmldir, 'node_modules');
+    console.log("Serving /node_modules from", clientNodeModules, "then", config.server.nodemodulesdir);
     const routerNM = express.Router();
     app.use('/node_modules', routerNM);
     //routerData.use('/', (req, res, next) => { console.log("NM:", req.url); next(); });
-    routerNM.use(express.static(config.server.nodemodulesdir, {immutable: true, maxAge: 1000 * 60 * 60 * 24}));
+    routerNM.use(
+      express.static(clientNodeModules, {immutable: true, maxAge: 1000 * 60 * 60 * 24}),
+      express.static(config.server.nodemodulesdir, {immutable: true, maxAge: 1000 * 60 * 60 * 24})
+    );
 
     openOrCreateDatabase((err, db) => {
       if (err) {

package/package.json

@@ -12,7 +12,7 @@
     "cookie-parser": "^1.4.7",
     "express": "^5.2.1",
     "express-session": "^1.19.0",
-    "frugal-iot-client": "^1.3.12",
+    "frugal-iot-client": "^1.3.13",
     "frugal-iot-logger": "^1.1.18",
     "hash-wasm": "^4.12.0",
     "js-yaml": "^4.2.0",
@@ -71,5 +71,5 @@
     "prerelease": "zsh scripts/prerelease.zsh"
   },
   "type": "module",
-  "version": "0.3.6"
+  "version": "0.3.7"
 }

package/public/service-worker.js

@@ -1,6 +1,6 @@
 // Change this version number if want existing installs of PWA to refresh their cache
 // TODO-28 - probably make this the same as the app version in frugal-iot-client
-const CACHE_NAME = 'frugal-iot-cache-1.3.12';
+const CACHE_NAME = 'frugal-iot-cache-1.3.13';
 const urlsToCache = [
     '/',
     '/index.html',