node-red-contrib-uos-nats 0.1.8 → 0.1.10

package/README.md

@@ -31,38 +31,38 @@ Fields:
 - **Host / Port** – IP address of your controller (e.g. `192.168.10.100`) and the NATS port `49360`.
 - **Client Name** – used for the NATS inbox prefix (`_INBOX.<name>`).
 - **Client ID / Secret** – OAuth2 client credentials created in the Control Center.
-- **Scope** – fixed to `hub.variables.provide hub.variables.readwrite hub.variables.readonly` so the nodes can register providers and query the REST metadata; it is not editable in the UI.
+- **Scope** – defaults to `hub.variables.provide hub.variables.readwrite hub.variables.readonly`. Note: The API does not require a specific "read providers" scope; listing providers is covered by the standard variable scopes.
 - **Granted scopes** – click *Refresh* to query the token endpoint and show the scopes currently granted to that client.
 
-The config node automatically fetches tokens via Client Credentials flow and exposes helper endpoints so other nodes can list providers and variables. The token endpoint is derived from the configured host (`https://<host>/oauth2/token`), so there is no additional field to maintain.
+The config node automatically fetches tokens via Client Credentials flow.
 
 ## DataHub Input Node
 
-- Select the u-OS config node, then choose one of the discovered providers from the dropdown (the node queries `/datahub/v1/providers` for you). If your OAuth client lacks read-only scope, the dropdown is disabled and you can type the provider ID manually.
-- Pick the variables you need from the multi-select list. Leave it empty to receive all variables from the provider. (When manual provider input is used the list may stay empty, because it also requires the read-only permission.)
-- The node outputs messages with the structure:
+- Select the u-OS config node, then choose one of the discovered providers from the dropdown. 
+- **Troubleshooting**: If the dropdown remains empty, check the Node-RED debug tab. The node logs the API response count. Ensure your OAuth client has `hub.variables.readonly` permission.
+- Pick the variables you need from the multi-select list. Leave it empty to receive all variables.
+
+## DataHub Output Node
+
+- Reuses the u-OS config node. The provider ID defaults to `nodered` and is created automatically upon the first message.
+- Send a JSON object to the input pin. **Nested objects are supported** and create subcategories automatically:
   ```json
   {
-    "type": "snapshot" | "change",
-    "variables": [
-      {
-        "providerId": "sampleprovider",
-        "id": 5,
-        "key": "diagnostics.status_text",
-        "value": "running",
-        "quality": "GOOD",
-        "timestampNs": 1700000000000
+    "machine": {
+      "temperature": 45.2,
+      "status": {
+        "active": true,
+        "mode": "remote"
       }
-    ]
+    }
   }
   ```
-- Deploy multiple nodes if you want to monitor different providers.
-
-## DataHub Output Node
+  This creates/updates the following variables:
+  - `machine.temperature` (FLOAT64)
+  - `machine.status.active` (BOOLEAN)
+  - `machine.status.mode` (STRING)
 
-- Reuses the u-OS config node. The provider ID defaults to `nodered` and is created automatically.
-- Send a JSON object to the input pin. Nested objects become dot-separated keys (e.g. `{ "line1": { "status": "ok" } }` ⇒ `line1.status`).
-- The node infers data types (INT64/FLOAT64/BOOLEAN/STRING) and publishes `VariablesChangedEvent`s. New keys trigger an automatic provider definition update.
+- The node infers data types (INT64/FLOAT64/BOOLEAN/STRING) and automatically publishes definition updates when new keys are seen.
 - Read requests (`v1.loc.<provider>.vars.qry.read`) are answered using the most recent values, so other consumers can subscribe to your Node-RED provider.
 
 ## Example Flow

package/nodes/datahub-input.html

@@ -11,7 +11,7 @@
     inputs: 0,
     outputs: 1,
     icon: "white/datahub-input.svg",
-    oneditprepare: function() {
+    oneditprepare: function () {
       const node = this;
       const $config = $('#node-input-connection');
       const $providerHidden = $('#node-input-providerId');
@@ -29,6 +29,7 @@
         .filter((entry) => entry.length > 0);
 
       const normalizeProviders = (payload) => {
+        console.log('normalizeProviders payload:', payload);
         if (!payload) {
           return [];
         }
@@ -42,6 +43,7 @@
       };
 
       const normalizeVariables = (payload) => {
+        console.log('normalizeVariables payload:', payload);
         if (!payload) {
           return [];
         }
@@ -54,8 +56,11 @@
         return [];
       };
 
-      const providerLabel = (provider) => provider.name || provider.displayName || provider.providerId || provider.id || 'Unnamed provider';
-      const providerValue = (provider) => provider.providerId || provider.id || provider.name || '';
+      // API returns [{ "id": "..." }] for providers
+      const providerLabel = (provider) => provider.displayName || provider.name || provider.id || provider.providerId || 'Unnamed provider';
+      const providerValue = (provider) => provider.id || provider.providerId || provider.name || '';
+
+      // API returns [{ "key": "..." }] for variables
       const variableValue = (variable) => variable.key || variable.name || variable.path || variable.id || '';
       const variableLabel = (variable) => variable.tagName || variable.key || variable.name || variable.path || variable.id || 'Unnamed variable';
 
@@ -130,6 +135,7 @@
             setVariableStatus('Select one or multiple variables (Ctrl/Cmd + click). Leave empty to receive all.');
           })
           .fail((xhr) => {
+            console.error('Variable load failed', xhr);
             const msg = xhr?.responseJSON?.error || xhr.statusText || 'Failed to load variables.';
             setVariableStatus(msg);
             $variables.prop('disabled', true);
@@ -191,6 +197,7 @@
             loadVariables(selected);
           })
           .fail((xhr) => {
+            console.error('Provider load failed', xhr);
             const msg = xhr?.responseJSON?.error || xhr.statusText || 'Failed to load providers.';
             showManualProvider(`Provider list failed (${msg}). Enter the provider ID manually or grant hub.variables.readonly.`);
           });
@@ -286,4 +293,4 @@
     { "name": "diagnostics.status_text", "value": "ready" }
   ]
 }</pre>
-</script>
+</script>

package/nodes/datahub-output.html

@@ -10,7 +10,7 @@
     inputs: 1,
     outputs: 1,
     icon: "white/datahub-output.svg",
-    oneditprepare: function() {},
+    oneditprepare: function () { },
     label: function () {
       return this.name || `Output ${this.providerId || ''}`;
     },
@@ -43,12 +43,14 @@
     <dt>Provider ID</dt>
     <dd>Defaults to <code>nodered</code>; change it if you want to publish under another provider name.</dd>
   </dl>
-  <p>Send a JSON object as <code>msg.payload</code>. Nested objects are flattened using dot-notation:</p>
+  <p>Send a JSON object as <code>msg.payload</code>. Nested objects are flattened using dot-notation to create <strong>subcategories</strong> automatically:</p>
 <pre>{
-  "diagnostics": {
-    "status_text": "running",
-    "error_count": 0
+  "machine": {
+    "status": "running",
+    "details": {
+      "temp": 45.2
+    }
   }
 }</pre>
-  <p>becomes variables <code>diagnostics.status_text</code> and <code>diagnostics.error_count</code> in the Data Hub.</p>
-</script>
+  <p>becomes variables <code>machine.status</code> and <code>machine.details.temp</code> in the Data Hub.</p>
+</script>

package/nodes/datahub-output.js

@@ -35,12 +35,16 @@ const flattenPayload = (value, prefix = '') => {
   const path = (key) => (prefix ? `${prefix}.${key}` : key);
   if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
     Object.entries(value).forEach(([key, val]) => {
-      entries.push(...flattenPayload(val, path(key)));
+      if (val !== undefined) {
+        entries.push(...flattenPayload(val, path(key)));
+      }
     });
   }
   else if (Array.isArray(value)) {
     value.forEach((val, idx) => {
-      entries.push(...flattenPayload(val, prefix ? `${prefix}[${idx}]` : `[${idx}]`));
+      if (val !== undefined) {
+        entries.push(...flattenPayload(val, prefix ? `${prefix}[${idx}]` : `[${idx}]`));
+      }
     });
   }
   else {
@@ -129,14 +133,21 @@ module.exports = function (RED) {
               return;
             }
             const entries = flattenPayload(msg.payload);
+
+            // Optimization: If payload is empty after flattening (e.g. only undefined values), stop here
             if (!entries.length) {
               done();
               return;
             }
+
             const [payloadsMod, subjectsMod] = await loadModules();
             let definitionsChanged = false;
             const states = [];
+
             entries.forEach(({ key, value }) => {
+              // Ensure we don't accidentally send undefined/null as value if logic slipped through
+              if (value === undefined || value === null) return;
+
               const { def, created } = ensureDefinition(key, inferType(value));
               if (created) {
                 definitionsChanged = true;

package/nodes/uos-config.js

@@ -1,6 +1,6 @@
 const fetch = require('node-fetch');
 const { connect } = require('nats');
-const DEFAULT_SCOPE = 'hub.variables.provide hub.variables.readwrite hub.variables.readonly';
+const DEFAULT_SCOPE = 'hub.variables.provide hub.variables.readwrite hub.variables.readonly'; // hub.providers.read removed as it does not exist
 
 if (!process.env.NODE_TLS_REJECT_UNAUTHORIZED) {
   process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
@@ -98,7 +98,9 @@ module.exports = function (RED) {
       if (!res.ok) {
         throw new Error(`Provider list failed: ${res.status}`);
       }
-      return res.json();
+      const json = await res.json();
+      this.log(`Fetched ${Array.isArray(json) ? json.length : 'unknown'} providers from API`);
+      return json;
     };
 
     this.fetchProviderVariables = async (providerId) => {
@@ -112,7 +114,9 @@ module.exports = function (RED) {
       if (!res.ok) {
         throw new Error(`Variable list failed: ${res.status}`);
       }
-      return res.json();
+      const json = await res.json();
+      this.log(`Fetched ${Array.isArray(json) ? json.length : 'unknown'} variables via API for provider ${providerId}`);
+      return json;
     };
 
     this.acquire = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-uos-nats",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Node-RED nodes for u-OS Data Hub via NATS",
   "repository": {
     "type": "git",
@@ -31,4 +31,4 @@
       "datahub-output": "nodes/datahub-output.js"
     }
   }
-}
+}