node-red-contrib-uos-nats 1.3.39 → 1.3.46

package/nodes/datahub-output.html

@@ -135,7 +135,9 @@
     <dd>Connection node with host/port and OAuth credentials.</dd>
     <dt>Provider ID</dt>
     <dd>The unique ID for this provider. <b>Note:</b> You cannot use <code>u_os_sbm</code> (Reserved system name).</dd>
-    <dd><b>Auto Mode:</b> Shows the <em>Client Name</em> from your Config. Uses this name automatically.</dd>
+    <dt>Provider ID</dt>
+    <dd>The unique ID for this provider. <b>Note:</b> You cannot use <code>u_os_sbm</code> (Reserved system name).</dd>
+    <dd><b>Auto Mode:</b> If empty, uses your **Client Name** (e.g. `nodered`) to match your Connection.</dd>
     <dt>Keep-Alive (s)</dt>
     <dd>Interval in seconds to refresh the provider definition. Default: <b>300s (5 min)</b>.</dd>
     <dt>Allow external writes</dt>

package/nodes/datahub-output.js

@@ -77,11 +77,10 @@ module.exports = function (RED) {
       return;
     }
     // Retrieve configuration node
-    // Default to Connection's Client Name (Friendly Name) because Client ID is often a UUID
-    // that doesn't match the desired Provider ID. User typically expects 'nodered' not '0069...'
+    // Auto Mode: Prefer Client Name ("nodered") to match Connection Name.
+    // This ensures consistency with DataHub UI expectations.
     let defaultId = connection.clientName;
     if (!defaultId) {
-      // Fallback to ID if Name is missing (should not happen as Name is mandatory)
       defaultId = connection.clientId || 'nodered';
     }
 
@@ -134,6 +133,7 @@ module.exports = function (RED) {
     };
 
     // Check Singleton Status
+    this.fatalError = false;
     let isPrimary = false;
     const existingNodeId = providerRegistry.get(this.providerId);
     if (existingNodeId && existingNodeId !== this.id) {
@@ -147,7 +147,8 @@ module.exports = function (RED) {
     // --- SEND DEFINITION HELPER ---
     const sendDefinitionUpdate = async (modPayloads, modSubjects) => {
       if (!nc) return;
-      if (!isPrimary) return; // Only Primary sends definitions
+      if (!isPrimary) return;
+      if (this.fatalError) return; // permanent lockout
 
       try {
         const { payload, fingerprint: fp } = modPayloads.buildProviderDefinitionEvent(definitions);
@@ -160,7 +161,17 @@ module.exports = function (RED) {
         await nc.flush();
         console.log(`[DataHub Output] Definition published. FP: ${fp}`);
       } catch (err) {
-        this.warn(`Definition update error: ${err.message}`);
+        let msg = err.message || '';
+        // Check for fatal Auth/Permission errors
+        if (msg.includes('Authorization') || msg.includes('permissions') || msg.includes('10003') || msg.includes('Access Denied')) {
+          this.fatalError = true;
+          this.error(`FATAL AUTH ERROR: ${msg}. Stopping provider to protect connection.`);
+          this.status({ fill: 'red', shape: 'dot', text: 'auth blocked (permanent)' });
+          // Clear heartbeats
+          if (outputHeartbeat) clearInterval(outputHeartbeat);
+        } else {
+          this.warn(`Definition update error: ${err.message}`);
+        }
       }
     };
 
@@ -186,6 +197,7 @@ module.exports = function (RED) {
         // console.log('[DataHub Output] Heartbeat skipped: NATS closed.');
         return;
       }
+      if (this.fatalError) return; // permanent lockout
       if (!loadedPayloads || !loadedSubjects) return;
 
       // If we have no definitions yet, nothing to send

package/nodes/datahub-write.js

@@ -170,7 +170,7 @@ module.exports = function (RED) {
                         node.resolvedId = this.variableId;
                         // Log as debug implies we handle it gracefully => No User Warn
                         node.debug(`ID Resolution failed for '${this.variableKey}' (${err.message}). Using configured ID: ${this.variableId}`);
-                        node.status({ fill: 'green', shape: 'ring', text: 'ready (fallback)' });
+                        node.status({ fill: 'yellow', shape: 'dot', text: 'fallback (key missing)' });
                     } else {
                         node.warn(`ID Resolution failed for '${this.variableKey}': ${err.message}`);
                         node.status({ fill: 'red', shape: 'dot', text: 'resolution failed' });

package/nodes/uos-config.js

@@ -176,37 +176,51 @@ module.exports = function (RED) {
       if (this.nc) {
         return this.nc;
       }
-      // Ensure we have a valid token initially
-      await this.getToken();
+      // Deduplication: Return existing promise if we are already connecting
+      if (this.connectionPromise) {
+        // this.log('Joining pending connection request...');
+        return this.connectionPromise;
+      }
 
-      // Use jwtAuthenticator to allow dynamic token refresh on reconnect
-      try {
-        this.nc = await connect({
-          servers: `nats://${this.host}:${this.port}`,
-          // Authenticator must be SYNCHRONOUS. We rely on background refresh to keep this.tokenInfo current.
-          // Token function must be SYNCHRONOUS if we rely on background refresh.
-          token: () => {
-            return this.tokenInfo ? this.tokenInfo.token : '';
-          },
-          name: this.clientName,
-          inboxPrefix: `_INBOX.${this.clientName}`,
-          maxReconnectAttempts: -1, // Infinite reconnects
-          reconnectTimeWait: 2000,
-        });
-        this.log(`NATS connecting with Name: '${this.clientName}'`);
+      this.connectionPromise = (async () => {
+        try {
+          // Ensure we have a valid token initially
+          await this.getToken();
+
+          this.nc = await connect({
+            servers: `nats://${this.host}:${this.port}`,
+            // Authenticator must be SYNCHRONOUS. We rely on background refresh to keep this.tokenInfo current.
+            // Token function must be SYNCHRONOUS if we rely on background refresh.
+            token: () => {
+              return this.tokenInfo ? this.tokenInfo.token : '';
+            },
+            // REVERT: Use Configured Client Name for Connection.
+            // Using UUID caused "Authorization Violation" for some users.
+            name: this.clientName,
+            inboxPrefix: `_INBOX.${this.clientName}`,
+            maxReconnectAttempts: -1, // Infinite reconnects
+            reconnectTimeWait: 2000,
+          });
 
-        // Reset Failure timestamp on success
-        this.authFailureTimestamp = 0;
+          this.log(`NATS connecting as Name: '${this.clientName}' (Dedup Active)`);
 
-      } catch (e) {
-        if (e.message && (e.message.includes('Authorization') || e.message.includes('Permissions') || e.message.includes('Authentication'))) {
-          this.warn(`NATS Authorization failed. Invalidating token cache. Circuit Breaker active for 10s.`);
-          this.tokenInfo = null; // Force fresh token next time
-          this.authFailureTimestamp = Date.now(); // Start Cooldown
+          // Reset Failure timestamp on success
+          this.authFailureTimestamp = 0;
+          return this.nc;
+
+        } catch (e) {
+          if (e.message && (e.message.includes('Authorization') || e.message.includes('Permissions') || e.message.includes('Authentication'))) {
+            this.warn(`NATS Authorization failed. Invalidating token cache. Circuit Breaker active for 10s.`);
+            this.tokenInfo = null; // Force fresh token next time
+            this.authFailureTimestamp = Date.now(); // Start Cooldown
+          }
+          this.error(`NATS connect failed: ${e.message}`);
+          throw e;
+        } finally {
+          this.connectionPromise = null;
         }
-        this.error(`NATS connect failed: ${e.message}`);
-        throw e;
-      }
+      })();
+      return this.connectionPromise;
       this.nc.closed().then(() => {
         this.nc = null;
         this.emit('disconnected');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-uos-nats",
-  "version": "1.3.39",
+  "version": "1.3.46",
   "description": "Node-RED nodes for Weidmüller u-OS Data Hub. Read, write, and provide variables via NATS protocol with OAuth2 authentication. Features: Variable Key resolution, custom icons, example flows, and provider definition caching.",
   "author": {
     "name": "IoTUeli",