signalk-czone 0.3.0-beta.10 → 0.3.0-beta.12

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.3.0-beta.12
+
+- Keeps the connection indicator disconnected when circuit-list REST refreshes succeed but the live WebSocket is down; shows connecting/reconnecting status and the snapshot time.
+
+## 0.3.0-beta.11
+
+- Uses the npm `latest` tag for default installation and App Store updates while retaining the BETA version and listing labels.
+
+- Routes circuit current to known physical output owners instead of groups referencing those outputs, restoring Starlink current and correcting Port Fresh Water Pump and Meitaki Nav. AIS attribution.
+- Preserves existing current mappings when output ownership is ambiguous and adds regression coverage across all six ZCF fixtures.
+
 ## 0.3.0-beta.10
 
 - Adds opt-in circuit current trends with preset and custom chart periods, CSV storage, summaries and retention settings.

package/README.md

@@ -208,15 +208,15 @@ Once this beta is published and available in your App Store:
 3. Open **Server → Plugin Config → CZone** and use **Upload and install ZCF** to upload your vessel's `.zcf` configuration.
 4. Enable the plugin after configuration, then check the **Diagnostics** tab and published currents before testing controls.
 
-The plugin is disabled by default until explicitly enabled. Availability of beta versions in the App Store depends on the server version and publication channel.
+The plugin is disabled by default until explicitly enabled. Tested releases use the npm `latest` tag for default installation and Signal K App Store discovery; the version and listing retain their BETA labels.
 
-### Explicit npm beta installation
+### Explicit npm installation
 
 After npm publication, run this as the Signal K service user from the server's configuration directory (normally `~/.signalk`, or the directory configured by `SIGNALK_NODE_CONFIG_DIR`):
 
 ```bash
 cd ~/.signalk
-npm install signalk-czone@beta --omit=dev --ignore-scripts
+npm install signalk-czone@latest --omit=dev --ignore-scripts
 ```
 
 Restart Signal K and follow the configuration steps above. For Docker or appliance installations, use the corresponding container/configuration directory and restart method.
@@ -225,9 +225,9 @@ For installation from a maintainer-provided npm tarball, run `npm install /path/
 
 ### Publishing (maintainers)
 
-Publish `signalk-czone-zcf@0.1.0-beta.1` first. Then run `npm install`, `npm test`, and `npm pack --dry-run` in this repository, verify the runtime files and App Store assets, and run `npm publish --tag beta` after npm authentication.
+Publish `signalk-czone-zcf@0.1.0-beta.1` first. Then run `npm install`, `npm test`, and `npm pack --dry-run` in this repository, verify the runtime files and App Store assets, and run `npm publish --tag latest` after npm authentication.
 
-The package defaults to the `beta` tag. Promoting a beta to `latest` for default installs is a separate release decision.
+The package defaults to `latest`, including versions named `-beta.N`. The GitHub publishing workflow runs when `package.json` or the workflow changes on `main`: it tests and packs the release, publishes it if the version is new, and sets and verifies the `latest` tag. If the version already exists, the workflow promotes that existing version without republishing its contents.
 
 ### Beta feedback
 

package/index.js

@@ -559,11 +559,8 @@ module.exports = function (app) {
     if (!mapping || !Array.isArray(mapping.circuits)) return null
     if (pgn === CURRENT_PGN_AC && Number(module) !== 0xF8) return null
     if (pgn === CURRENT_PGN_DC && Number(module) === 0x28) return null
-    return mapping.circuits.find(c =>
-      Number(c.module) === Number(module) &&
-      Number(c.page) === Number(page) &&
-      Number(c.slot) === Number(slot)
-    ) || null
+    return zcf.lookup(mapping, module, page, slot,
+      pgn === CURRENT_PGN_CONTROL_X_PLUS ? CURRENT_PGN_DC : pgn)
   }
 
   function publishSettingsRevision () {

package/lib/zcf.js

@@ -64,6 +64,14 @@ function enrichRuntimeModel (mapping) {
   mapping.currentMappings = mapping.circuits
     .map(circuit => {
       if (Number(circuit.module) === 0x28) return null
+      // Group/virtual circuits can reference another circuit's primary load.
+      // Prefer a known owner, preserving existing resolution where ownership
+      // is ambiguous (for example multiple controls for the same load).
+      if (Array.isArray(circuit.ownOutputs) && !circuit.ownOutputs.length &&
+        mapping.circuits.some(owner => Array.isArray(owner.ownOutputs) &&
+          owner.ownOutputs.some(output =>
+            output.module === circuit.module && output.channel === circuit.channel
+          ))) return null
       return {
         ...circuit,
         pgn: Number(circuit.module) === 0xF8 ? CURRENT_PGN_AC : CURRENT_PGN_DC,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "signalk-czone",
-  "version": "0.3.0-beta.10",
+  "version": "0.3.0-beta.12",
   "description": "BETA: Signal K CZone monitoring and control using dynamically parsed ZCF configuration and NMEA 2000",
   "main": "index.js",
   "keywords": [
@@ -57,6 +57,6 @@
   },
   "publishConfig": {
     "access": "public",
-    "tag": "beta"
+    "tag": "latest"
   }
 }

package/public/index.html

@@ -293,7 +293,7 @@
   ];
   const topLevelCategories = new Set(['AC', 'DC', 'Favorites']);
   let circuits = [], status = {}, modes = [], activeMode = null, vesselName = '', view = 'all', category = null, query = '', sort = 'name', socket = null;
-  let socketReconnectTimer = null, watchdogTimer = null, lastSocketUpdateAt = 0, socketConnected = false;
+  let socketReconnectTimer = null, watchdogTimer = null, lastSocketUpdateAt = 0, socketConnected = false, socketEverOpen = false;
   const WS_WATCHDOG_MS = 120000;
   const COMMAND_CONFIRM_MS = 15000;
   const COMMAND_RECONCILE_DELAY_MS = 200;
@@ -565,8 +565,16 @@
       console.debug('[CZone UI] REST refresh', reason, { circuits: incoming.length, modes: Array.isArray(data.modes) ? data.modes.length : 0, sendingEnabled: data.sendingEnabled === true, nmeaReady: data.nmeaReady === true });
       mergeRest(data);
       if (incoming.length === 0) throw new Error('CZone plugin returned an empty circuit list');
-      document.querySelector('#connection').classList.add('ok');
-      document.querySelector('#connection').innerHTML = '<i></i><span>Connected · live circuit data</span>';
+      // "Connected" only while the live feed is up. This read is a one-off
+      // (first load, or the watchdog's reconciliation): with the feed down
+      // the page would otherwise say Connected while nothing on it moves.
+      const conn = document.querySelector('#connection');
+      conn.classList.toggle('ok', socketConnected);
+      conn.innerHTML = socketConnected
+        ? '<i></i><span>Connected · live circuit data</span>'
+        : socketEverOpen
+          ? `<i></i><span>Live updates lost · reconnecting… (circuits as of ${new Date().toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', second: '2-digit' })})</span>`
+          : '<i></i><span>Circuits loaded · connecting live updates…</span>';
       render();
       return true;
     } catch (e) {
@@ -1018,6 +1026,7 @@
       socket = new WebSocket(SK);
       socket.onopen = () => {
         socketConnected = true;
+        socketEverOpen = true;
         lastSocketUpdateAt = Date.now();
         updateSocketIndicator('Connected · WebSocket live', true);
         sendSubscriptions();
@@ -1046,7 +1055,7 @@
       };
       socket.onclose = () => {
         socketConnected = false;
-        updateSocketIndicator('Reconnecting to Signal K…', false);
+        updateSocketIndicator(socketEverOpen ? 'Live updates lost · reconnecting…' : 'Connecting live updates…', false);
         console.warn('[CZone WS] closed; reconnecting');
         clearTimeout(socketReconnectTimer);
         socketReconnectTimer = setTimeout(connectSocket, 3000);