node-red-contrib-uos-nats 0.2.2 → 0.2.4

package/nodes/datahub-write.js

@@ -1,56 +1,58 @@
-import { encodeWriteVariablesCommand } from '../lib/payloads.js';
-import { buildReadProviderDefinitionQuery, decodeProviderDefinition } from '../lib/payloads.js';
+const path = require('path');
+const { pathToFileURL } = require('url');
+
+const payloadModuleUrl = pathToFileURL(path.join(__dirname, '..', 'lib', 'payloads.js')).href;
 
 // Simple cache for provider definitions (5 min TTL)
 const providerCache = new Map();
 const CACHE_TTL = 5 * 60 * 1000; // 5 minutes
 
-async function resolveVariableKey(nc, providerId, key, node) {
-    const cacheKey = `${providerId}`;
-    const cached = providerCache.get(cacheKey);
-
-    // Check cache
-    if (cached && (Date.now() - cached.timestamp < CACHE_TTL)) {
-        const variable = cached.definition.variables.find(v => v.key === key);
-        if (variable) {
-            node.debug && node.debug(`Key '${key}' resolved to ID ${variable.id} (cached)`);
-            return variable.id;
+module.exports = function (RED) {
+    async function resolveVariableKey(nc, providerId, key, node, payloads) {
+        const cacheKey = `${providerId}`;
+        const cached = providerCache.get(cacheKey);
+
+        // Check cache
+        if (cached && (Date.now() - cached.timestamp < CACHE_TTL)) {
+            const variable = cached.definition.variables.find(v => v.key === key);
+            if (variable) {
+                node.debug && node.debug(`Key '${key}' resolved to ID ${variable.id} (cached)`);
+                return variable.id;
+            }
         }
-    }
 
-    // Query provider definition
-    try {
-        const query = buildReadProviderDefinitionQuery();
-        const subject = `v1.loc.${providerId}.def.query`;
+        // Query provider definition
+        try {
+            const query = payloads.buildReadProviderDefinitionQuery();
+            const subject = `v1.loc.${providerId}.def.query`;
 
-        const response = await nc.request(subject, query, { timeout: 3000 });
-        const definition = decodeProviderDefinition(response.data);
+            const response = await nc.request(subject, query, { timeout: 3000 });
+            const definition = payloads.decodeProviderDefinition(response.data);
 
-        if (!definition) {
-            throw new Error(`Provider ${providerId} not found or no definition returned`);
-        }
+            if (!definition) {
+                throw new Error(`Provider ${providerId} not found or no definition returned`);
+            }
 
-        // Cache the definition
-        providerCache.set(cacheKey, {
-            definition,
-            timestamp: Date.now()
-        });
+            // Cache the definition
+            providerCache.set(cacheKey, {
+                definition,
+                timestamp: Date.now()
+            });
 
-        // Find variable by key
-        const variable = definition.variables.find(v => v.key === key);
-        if (!variable) {
-            throw new Error(`Variable key '${key}' not found in provider ${providerId}`);
-        }
+            // Find variable by key
+            const variable = definition.variables.find(v => v.key === key);
+            if (!variable) {
+                throw new Error(`Variable key '${key}' not found in provider ${providerId}`);
+            }
 
-        node.debug && node.debug(`Key '${key}' resolved to ID ${variable.id}`);
-        return variable.id;
+            node.debug && node.debug(`Key '${key}' resolved to ID ${variable.id}`);
+            return variable.id;
 
-    } catch (err) {
-        throw new Error(`Failed to resolve key '${key}': ${err.message}`);
+        } catch (err) {
+            throw new Error(`Failed to resolve key '${key}': ${err.message}`);
+        }
     }
-}
 
-export default function (RED) {
     function DataHubWriteNode(config) {
         RED.nodes.createNode(this, config);
         const node = this;
@@ -68,6 +70,7 @@ export default function (RED) {
         this.variableId = config.variableId ? parseInt(config.variableId, 10) : null;
         this.variableKey = config.variableKey?.trim();
         this.resolvedId = null; // Cached resolved ID
+        this.payloads = null; // Will be loaded dynamically
 
         if (!this.providerId) {
             node.error('Provider ID is required');
@@ -95,6 +98,13 @@ export default function (RED) {
             return;
         }
 
+        // Load payloads module dynamically
+        import(payloadModuleUrl).then(payloads => {
+            node.payloads = payloads;
+        }).catch(err => {
+            node.error(`Failed to load payloads module: ${err.message}`);
+        });
+
         // Handle incoming messages
         node.on('input', async function (msg) {
             const value = msg.payload;
@@ -104,6 +114,11 @@ export default function (RED) {
                 return;
             }
 
+            if (!node.payloads) {
+                node.error('Payloads module not loaded yet');
+                return;
+            }
+
             try {
                 // Get NATS connection from config node
                 const nc = await configNode.acquire();
@@ -117,13 +132,13 @@ export default function (RED) {
                 let varId = node.resolvedId;
                 if (!varId && node.variableKey) {
                     node.status({ fill: 'yellow', shape: 'dot', text: 'resolving key...' });
-                    varId = await resolveVariableKey(nc, node.providerId, node.variableKey, node);
+                    varId = await resolveVariableKey(nc, node.providerId, node.variableKey, node, node.payloads);
                     node.resolvedId = varId; // Cache for future messages
                     node.status({ fill: 'green', shape: 'ring', text: 'ready' });
                 }
 
                 // Build write command
-                const writeCommand = encodeWriteVariablesCommand([
+                const writeCommand = node.payloads.encodeWriteVariablesCommand([
                     {
                         id: varId,
                         value: value
@@ -161,4 +176,4 @@ export default function (RED) {
     }
 
     RED.nodes.registerType('datahub-write', DataHubWriteNode);
-}
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-uos-nats",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "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",