node-red-contrib-uos-nats 1.3.71 → 1.4.0

package/lib/payloads.js

@@ -222,6 +222,13 @@ export function decodeVariableList(list, whitelistIds = null) {
     if (!list)
         return [];
     const result = [];
+
+    // Optimization: Reuse holders to reduce GC pressure
+    const holderInt64 = new VariableValueInt64();
+    const holderFloat64 = new VariableValueFloat64();
+    const holderBoolean = new VariableValueBoolean();
+    const holderString = new VariableValueString();
+
     for (let i = 0; i < list.itemsLength(); i += 1) {
         const item = list.items(i);
         if (!item)
@@ -236,27 +243,23 @@ export function decodeVariableList(list, whitelistIds = null) {
         let decoded;
         switch (item.valueType()) {
             case VariableValue.Int64: {
-                const holder = new VariableValueInt64();
-                item.value(holder);
-                decoded = Number(holder.value());
+                item.value(holderInt64);
+                decoded = Number(holderInt64.value());
                 break;
             }
             case VariableValue.Float64: {
-                const holder = new VariableValueFloat64();
-                item.value(holder);
-                decoded = holder.value();
+                item.value(holderFloat64);
+                decoded = holderFloat64.value();
                 break;
             }
             case VariableValue.Boolean: {
-                const holder = new VariableValueBoolean();
-                item.value(holder);
-                decoded = holder.value();
+                item.value(holderBoolean);
+                decoded = holderBoolean.value();
                 break;
             }
             case VariableValue.String: {
-                const holder = new VariableValueString();
-                item.value(holder);
-                decoded = holder.value();
+                item.value(holderString);
+                decoded = holderString.value();
                 break;
             }
             default:

package/nodes/datahub-input.js

@@ -74,12 +74,14 @@ module.exports = function (RED) {
     // Pre-populate raw map with manual definitions
     this.manualDefs.forEach(d => defMap.set(d.id, { ...d, type: 'MANUAL', dataType: 'UNKNOWN', access: 'READ_ONLY' }));
 
+    // Optimization: Use Set for O(1) lookups
+    const variableSet = new Set(this.variables.map(v => normalizeKey(v)));
+
     const shouldInclude = (key) => {
-      if (!this.variables.length) {
+      if (variableSet.size === 0) {
         return true;
       }
-      const needle = normalizeKey(key);
-      return this.variables.includes(needle);
+      return variableSet.has(normalizeKey(key));
     };
 
     const processStates = (states) => {
@@ -101,6 +103,12 @@ module.exports = function (RED) {
         this.warnOnce('Filtering active but Variable Definitions failed to load (API Error). Names cannot be resolved. Try using "Name:ID" format to manually map variables.');
       }
 
+      // Optimization: redundant check removed if whitelist is active, but keeping as safeguard 
+      // If we used a whitelist, we know we only have relevant IDs.
+      // However, keeping strict check is safer for "Name-based" consistency.
+      // But we can optimize: if mapped.length is same as whitelist size, we are good?
+      // Actually, let's keep it simple: Filter-on-Decode handles the heavy lifting (byte level).
+      // This JS filter is now cheap (O(1) lookup). We'll keep it for correctness in case of aliasing/manual IDs.
       return mapped.filter((state) => shouldInclude(state.key));
     };
 

package/nodes/icons/uos-api.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60" width="60" height="60">
+    <rect width="60" height="60" rx="6" ry="6" fill="#a6bbcf" />
+    <text x="50%" y="55%" dominant-baseline="middle" text-anchor="middle" font-family="sans-serif" font-weight="bold" font-size="24" fill="white">API</text>
+</svg>

package/nodes/uos-config.html

@@ -3,10 +3,13 @@
   RED.nodes.registerType('uos-config', {
     category: 'config',
     defaults: {
+      name: { value: "" },
       host: { value: '127.0.0.1', required: true },
-      port: { value: 49360, required: true, validate: RED.validators.number() },
-      clientName: { value: '', required: true }, // No default, required
+      port: { value: 4222, required: true, validate: RED.validators.number() },
+      clientName: { value: 'nodered' },
       scope: { value: FIXED_SCOPE, required: true },
+      enableSystemAdmin: { value: false },
+      customScopes: { value: "" }
     },
     credentials: {
       clientId: { type: 'text', required: true },
@@ -141,6 +144,19 @@
     <label for="node-config-input-clientSecret"><i class="fa fa-key"></i> Client Secret</label>
     <input type="password" id="node-config-input-clientSecret">
   </div>
+
+    <!-- Advanced Scopes Section -->
+    <div class="form-row">
+        <label for="node-config-input-enableSystemAdmin" style="width: auto;"><i class="fa fa-lock"></i> Enable System Admin Access</label>
+        <input type="checkbox" id="node-config-input-enableSystemAdmin" style="display: inline-block; width: auto; vertical-align: top;">
+        <div class="form-tips" style="margin-top: 5px;">
+            Grants permission to manage System, Network, Security, Logs, and Recovery.
+        </div>
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-customScopes"><i class="fa fa-plus-circle"></i> Custom Scopes</label>
+        <input type="text" id="node-config-input-customScopes" placeholder="space-separated scopes">
+    </div>
   <input type="hidden" id="node-config-input-scope">
   <div class="form-row">
     <label><i class="fa fa-list"></i> Scope</label>

package/nodes/uos-config.js

@@ -49,7 +49,32 @@ module.exports = function (RED) {
         this.warn("Illegal Client Name 'u_os_sbm' detected! It conflicts with the system provider. Forcing rename to 'nodered'.");
         this.clientName = 'nodered';
       }
-      this.scope = DEFAULT_SCOPE;
+
+      // Dynamic Scope Generation
+      this.enableSystemAdmin = config.enableSystemAdmin || false;
+      this.customScopes = config.customScopes || "";
+
+      const baseScopes = DEFAULT_SCOPE.split(' ');
+      const adminScopes = [
+        'u-os-adm.logging.readonly',
+        'u-os-adm.network.readwrite',
+        'u-os-adm.recovery.readwrite',
+        'u-os-adm.security.readwrite',
+        'u-os-adm.system.readwrite'
+      ];
+
+      let finalScopes = [...baseScopes];
+      if (this.enableSystemAdmin) {
+        finalScopes.push(...adminScopes);
+      }
+      if (this.customScopes.trim()) {
+        const extras = this.customScopes.split(' ').map(s => s.trim()).filter(s => s);
+        finalScopes.push(...extras);
+      }
+
+      // Deduplicate
+      this.scope = [...new Set(finalScopes)].join(' ');
+
       this.clientId = this.credentials ? this.credentials.clientId : null;
       this.clientSecret = this.credentials ? this.credentials.clientSecret : null;
       this.tokenInfo = null;

package/nodes/uos-http.html

@@ -0,0 +1,150 @@
+<script type="text/javascript">
+    RED.nodes.registerType('uos-http', {
+        category: 'Web Services',
+        color: '#a6bbcf',
+        defaults: {
+            name: { value: "" },
+            uosConfig: { type: "uos-config", required: true },
+            mode: { value: "datahub" },
+
+            // DataHub
+            dhAction: { value: "read" },
+            dhProvider: { value: "" },
+            dhVariable: { value: "" },
+
+            // System
+            sysCategory: { value: "system" },
+            sysAction: { value: "info" }
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: "uos-api.svg",
+        label: function () {
+            return this.name || "u-OS API";
+        },
+        oneditprepare: function () {
+            $("#node-input-mode").on("change", function () {
+                var mode = $(this).val();
+                if (mode === "datahub") {
+                    $(".uos-mode-datahub").show();
+                    $(".uos-mode-system").hide();
+                } else {
+                    $(".uos-mode-datahub").hide();
+                    $(".uos-mode-system").show();
+                }
+            });
+
+            // System Action Dynamic Options
+            const sysActions = {
+                system: [
+                    { val: "info", label: "Get System Info" },
+                    { val: "nameplate", label: "Get Nameplate" },
+                    { val: "disks", label: "Get Disks" },
+                    { val: "reboot", label: "Reboot System (POST)" }
+                ],
+                network: [
+                    { val: "get_state", label: "Get State" },
+                    { val: "get_config", label: "Get Config" },
+                    { val: "set_config", label: "Set Config (PUT)" },
+                    { val: "update_config", label: "Update Config (PATCH)" }
+                ],
+                logging: [
+                    { val: "entries", label: "Get Entries" },
+                    { val: "sources", label: "Get Sources" },
+                    { val: "create_report", label: "Create Report" }
+                ],
+                security: [
+                    { val: "get_config", label: "Get Config" },
+                    { val: "set_config", label: "Set Config (PUT)" }
+                ],
+                recovery: [
+                    { val: "factory_reset", label: "Factory Reset" }
+                ]
+            };
+
+            $("#node-input-sysCategory").on("change", function () {
+                var cat = $(this).val();
+                var actions = sysActions[cat] || [];
+                var select = $("#node-input-sysAction");
+                select.empty();
+                actions.forEach(function (a) {
+                    select.append($("<option></option>").attr("value", a.val).text(a.label));
+                });
+                // Restore previous value if feasible, otherwise select first
+                // (Logic simplified here)
+            });
+        }
+    });
+</script>
+
+<script type="text/html" data-template-name="uos-http">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
+    <div class="form-row">
+        <label for="node-input-uosConfig"><i class="fa fa-cog"></i> u-OS Config</label>
+        <input type="text" id="node-input-uosConfig">
+    </div>
+    <div class="form-row">
+        <label for="node-input-mode"><i class="fa fa-sliders"></i> Mode</label>
+        <select id="node-input-mode">
+            <option value="datahub">DataHub Variables</option>
+            <option value="system">System Administration</option>
+        </select>
+    </div>
+
+    <!-- DataHub Mode -->
+    <div class="uos-mode-datahub">
+        <div class="form-row">
+            <label for="node-input-dhAction"><i class="fa fa-play"></i> Action</label>
+            <select id="node-input-dhAction">
+                <option value="read">Read Variable</option>
+                <option value="write">Write Variable</option>
+                <option value="list_providers">List Providers</option>
+                <option value="list_variables">List Variables</option>
+            </select>
+        </div>
+        <div class="form-row">
+            <label for="node-input-dhProvider"><i class="fa fa-server"></i> Provider</label>
+            <input type="text" id="node-input-dhProvider" placeholder="e.g. u_os_sbm">
+        </div>
+        <div class="form-row">
+            <label for="node-input-dhVariable"><i class="fa fa-tag"></i> Variable</label>
+            <input type="text" id="node-input-dhVariable" placeholder="e.g. digital_nameplate.software_version">
+        </div>
+    </div>
+
+    <!-- System Mode -->
+    <div class="uos-mode-system" style="display:none;">
+        <div class="form-row">
+            <label for="node-input-sysCategory"><i class="fa fa-folder"></i> Category</label>
+            <select id="node-input-sysCategory">
+                <option value="system">System</option>
+                <option value="network">Network</option>
+                <option value="logging">Logging</option>
+                <option value="security">Security</option>
+                <option value="recovery">Recovery</option>
+            </select>
+        </div>
+        <div class="form-row">
+            <label for="node-input-sysAction"><i class="fa fa-bolt"></i> Action</label>
+            <select id="node-input-sysAction">
+                <!-- Populated dynamically -->
+            </select>
+        </div>
+    </div>
+</script>
+
+<script type="text/html" data-help-name="uos-http">
+    <p>A unified node for u-OS HTTP APIs.</p>
+    
+    <h3>Modes</h3>
+    <dl class="message-properties">
+        <dt>DataHub Variables</dt>
+        <dd>Access values via the standard DataHub HTTP API. Use for devices that don't support NATS or simple polling.</dd>
+        
+        <dt>System Administration</dt>
+        <dd>Manage the u-OS device: Network, Logs, Security, etc. Requires <b>Enable System Admin</b> in config.</dd>
+    </dl>
+</script>

package/nodes/uos-http.js

@@ -0,0 +1,151 @@
+const fetch = require('node-fetch');
+const https = require('https');
+
+module.exports = function (RED) {
+    function UosHttpNode(config) {
+        RED.nodes.createNode(this, config);
+        const node = this;
+
+        node.uosConfig = RED.nodes.getNode(config.uosConfig);
+        node.mode = config.mode; // 'datahub' or 'system'
+
+        // DataHub Config
+        node.dhAction = config.dhAction; // 'read', 'write', 'list_providers', 'list_variables'
+        node.dhProvider = config.dhProvider;
+        node.dhVariable = config.dhVariable;
+
+        // System Config
+        node.sysCategory = config.sysCategory; // 'logging', 'network', 'system', 'security', 'recovery'
+        node.sysAction = config.sysAction; // dynamic based on category
+
+        if (!node.uosConfig) {
+            node.error('No u-OS Configuration configured!');
+            return;
+        }
+
+        const httpsAgent = new https.Agent({
+            rejectUnauthorized: false
+        });
+
+        node.on('input', async function (msg) {
+            const token = await node.uosConfig.getToken();
+            if (!token) {
+                node.error('Authentication failed (No Token)', msg);
+                return;
+            }
+
+            let url = '';
+            let method = 'GET';
+            let body = null;
+            let baseUrl = `https://${node.uosConfig.host}:443`; // HTTPS Port 443 implies standard web server (nginx proxy)
+
+            try {
+                if (node.mode === 'datahub') {
+                    baseUrl += '/u-os-hub/api/v1';
+
+                    // Allow override from msg for dynamic usage
+                    const provider = msg.provider || node.dhProvider;
+                    const variable = msg.variable || node.dhVariable;
+
+                    switch (node.dhAction) {
+                        case 'list_providers':
+                            url = `${baseUrl}/providers`;
+                            break;
+                        case 'list_variables':
+                            if (!provider) throw new Error('Provider ID required');
+                            url = `${baseUrl}/providers/${provider}/variables`;
+                            if (msg.payload && typeof msg.payload === 'object') {
+                                // allow query params like prefixes
+                            }
+                            break;
+                        case 'read':
+                            if (!provider || !variable) throw new Error('Provider ID and Variable Key required');
+                            url = `${baseUrl}/providers/${provider}/variables/${variable}`;
+                            break;
+                        case 'write':
+                            if (!provider || !variable) throw new Error('Provider ID and Variable Key required');
+                            url = `${baseUrl}/providers/${provider}/variables/${variable}`;
+                            method = 'POST';
+                            body = JSON.stringify({ key: variable, value: msg.payload });
+                            break;
+                        default:
+                            throw new Error(`Unknown DataHub Action: ${node.dhAction}`);
+                    }
+
+                } else if (node.mode === 'system') {
+                    baseUrl += '/u-os-adm/api/v1';
+
+                    switch (node.sysCategory) {
+                        case 'system':
+                            if (node.sysAction === 'info') url = `${baseUrl}/system/info`;
+                            else if (node.sysAction === 'nameplate') url = `${baseUrl}/system/nameplate`;
+                            else if (node.sysAction === 'disks') url = `${baseUrl}/system/disks`;
+                            else if (node.sysAction === 'reboot') { url = `${baseUrl}/system:reboot`; method = 'POST'; }
+                            break;
+                        case 'network':
+                            if (node.sysAction === 'get_state') url = `${baseUrl}/network/state`;
+                            else if (node.sysAction === 'get_config') url = `${baseUrl}/network/config`;
+                            else if (node.sysAction === 'set_config') { url = `${baseUrl}/network/config`; method = 'PUT'; body = JSON.stringify(msg.payload); }
+                            else if (node.sysAction === 'update_config') { url = `${baseUrl}/network/config`; method = 'PATCH'; body = JSON.stringify(msg.payload); } // Content-Type merg-patch?
+                            break;
+                        case 'logging':
+                            if (node.sysAction === 'entries') url = `${baseUrl}/logging/entries`;
+                            else if (node.sysAction === 'sources') url = `${baseUrl}/logging/sources`;
+                            else if (node.sysAction === 'create_report') { url = `${baseUrl}/logging/reports`; method = 'POST'; }
+                            break;
+                        case 'security':
+                            if (node.sysAction === 'get_config') url = `${baseUrl}/security/config`;
+                            else if (node.sysAction === 'set_config') { url = `${baseUrl}/security/config`; method = 'PUT'; body = JSON.stringify(msg.payload); }
+                            break;
+                        case 'recovery':
+                            if (node.sysAction === 'factory_reset') { url = `${baseUrl}/recovery:factory-reset`; method = 'POST'; }
+                            break;
+                        default:
+                            throw new Error(`Unknown System Category: ${node.sysCategory}`);
+                    }
+                }
+
+                node.status({ fill: 'blue', shape: 'dot', text: 'requesting...' });
+
+                const headers = {
+                    'Authorization': `Bearer ${token}`,
+                    'Content-Type': 'application/json'
+                };
+
+                if (node.mode === 'system' && node.sysCategory === 'network' && node.sysAction === 'update_config') {
+                    headers['Content-Type'] = 'application/merge-patch+json';
+                }
+
+                const response = await fetch(url, {
+                    method,
+                    headers,
+                    body,
+                    agent: httpsAgent
+                });
+
+                if (!response.ok) {
+                    const errorText = await response.text();
+                    throw new Error(`HTTP ${response.status}: ${errorText}`);
+                }
+
+                // Parse Response
+                const contentType = response.headers.get('content-type');
+                if (contentType && contentType.includes('application/json')) {
+                    msg.payload = await response.json();
+                } else {
+                    msg.payload = await response.text();
+                }
+
+                msg.statusCode = response.status;
+                node.send(msg);
+                node.status({ fill: 'green', shape: 'dot', text: 'Ok' });
+
+            } catch (err) {
+                node.error(err, msg);
+                node.status({ fill: 'red', shape: 'ring', text: 'Error' });
+            }
+        });
+    }
+
+    RED.nodes.registerType('uos-http', UosHttpNode);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-uos-nats",
-  "version": "1.3.71",
+  "version": "1.4.0",
   "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",
@@ -56,7 +56,8 @@
       "uos-config": "nodes/uos-config.js",
       "datahub-input": "nodes/datahub-input.js",
       "datahub-output": "nodes/datahub-output.js",
-      "datahub-write": "nodes/datahub-write.js"
+      "datahub-write": "nodes/datahub-write.js",
+      "uos-http": "nodes/uos-http.js"
     }
   },
   "scripts": {