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

package/README.md

@@ -31,15 +31,15 @@ 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** – usually `hub.variables.provide hub.variables.readwrite`.
+- **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.
 - **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.
 
 ## 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).
-- Pick the variables you need from the multi-select list. Leave it empty to receive all variables from the provider.
+- 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:
   ```json
   {
@@ -68,7 +68,7 @@ The config node automatically fetches tokens via Client Credentials flow and exp
 ## Example Flow
 
 1. Drop a **u-OS Config** node, fill in host/port and OAuth credentials from the Control Center.
-2. Add a **DataHub Input** node, select the config, enter the provider ID and optional comma-separated variable list. Connect the output to a Debug node.
+2. Add a **DataHub Input** node, select the config, choose the provider from the dropdown (or type the provider ID if the API access is restricted) and pick the variables you care about. Connect the output to a Debug node.
 3. Add a **DataHub Output** node, leave provider ID = `nodered` and send structured JSON (e.g. from a Function node). The values instantly appear in the Data Hub under the provider `nodered`.
 
 > Tip: Because both nodes rely on the Control Center HTTP API for metadata they inherit the same permissions as your OAuth client. Make sure the client has at least `hub.variables.readonly` for the input node and `hub.variables.provide hub.variables.readwrite` for the output node.

package/nodes/datahub-input.html

@@ -14,13 +14,15 @@
     oneditprepare: function() {
       const node = this;
       const $config = $('#node-input-connection');
-      const $provider = $('#node-input-providerId');
+      const $providerHidden = $('#node-input-providerId');
+      const $providerSelect = $('#datahub-provider-select');
+      const $providerManual = $('#datahub-provider-manual');
       const $providerStatus = $('#datahub-provider-status');
       const $variablesHidden = $('#node-input-variablesText');
       const $variables = $('#datahub-input-variables');
       const $variablesStatus = $('#datahub-variables-status');
 
-      const initialProvider = node.providerId;
+      const initialProvider = $providerHidden.val() || '';
       const initialVars = ($variablesHidden.val() || '')
         .split(',')
         .map((entry) => entry.trim())
@@ -68,6 +70,24 @@
       const setProviderStatus = (text) => $providerStatus.text(text || '');
       const setVariableStatus = (text) => $variablesStatus.text(text || '');
 
+      const setProviderValue = (value) => {
+        $providerHidden.val(value || '');
+      };
+
+      const getProviderValue = () => $providerHidden.val() || '';
+
+      const showManualProvider = (message) => {
+        $providerSelect.hide().prop('disabled', true);
+        $providerManual.show().prop('disabled', false);
+        $providerManual.val(getProviderValue());
+        setProviderStatus(message || 'Enter the provider ID manually.');
+      };
+
+      const showSelectProvider = () => {
+        $providerManual.hide().prop('disabled', true);
+        $providerSelect.show().prop('disabled', false);
+      };
+
       const loadVariables = (providerId, keepSelection = false) => {
         const configId = $config.val();
         if (!configId || !providerId) {
@@ -121,10 +141,10 @@
       const loadProviders = () => {
         const configId = $config.val();
         if (!configId) {
-          $provider.empty();
-          $provider.append('<option value="">Select a u-OS config first</option>');
-          $provider.prop('disabled', true);
-          setProviderStatus('Pick or create a u-OS config node before selecting a provider.');
+          $providerSelect.empty();
+          $providerSelect.append('<option value="">Select a u-OS config first</option>');
+          $providerSelect.prop('disabled', true);
+          showManualProvider('Pick or create a u-OS config node before selecting a provider.');
           setVariableStatus('');
           $variables.empty();
           $variables.prop('disabled', true);
@@ -132,18 +152,20 @@
         }
         const seq = ++providerRequest;
         setProviderStatus('Loading providers…');
-        $provider.prop('disabled', true);
+        $providerSelect.prop('disabled', true);
+        showSelectProvider();
         $.getJSON(`uos/providers/${configId}`)
           .done((payload) => {
             if (seq !== providerRequest) {
               return;
             }
             const list = normalizeProviders(payload);
-            $provider.empty();
+            $providerSelect.empty();
             if (!list.length) {
-              $provider.append('<option value="">No providers available</option>');
+              $providerSelect.append('<option value="">No providers available</option>');
+              $providerSelect.prop('disabled', true);
               setProviderStatus('No providers returned. Verify Data Hub access.');
-              $provider.prop('disabled', true);
+              showManualProvider('No providers returned. Enter the ID manually if you know it.');
               return;
             }
             list.forEach((prov) => {
@@ -154,24 +176,23 @@
               const option = $('<option></option>')
                 .attr('value', value)
                 .text(providerLabel(prov));
-              $provider.append(option);
+              $providerSelect.append(option);
             });
-            $provider.prop('disabled', false);
+            $providerSelect.prop('disabled', false);
             if (initialProvider) {
-              $provider.val(initialProvider);
+              $providerSelect.val(initialProvider);
             }
-            if (!$provider.val()) {
-              $provider.val($provider.find('option:first').attr('value'));
+            if (!$providerSelect.val()) {
+              $providerSelect.val($providerSelect.find('option:first').attr('value'));
             }
+            const selected = $providerSelect.val();
+            setProviderValue(selected);
             setProviderStatus('Choose the provider you want to subscribe to.');
-            loadVariables($provider.val());
+            loadVariables(selected);
           })
           .fail((xhr) => {
             const msg = xhr?.responseJSON?.error || xhr.statusText || 'Failed to load providers.';
-            $provider.empty();
-            $provider.append('<option value="">Unable to load providers</option>');
-            $provider.prop('disabled', true);
-            setProviderStatus(msg);
+            showManualProvider(`Provider list failed (${msg}). Enter the provider ID manually or grant hub.variables.readonly.`);
           });
       };
 
@@ -179,10 +200,22 @@
         syncVariablesField();
       });
 
-      $provider.on('change', () => {
+      $providerSelect.on('change', () => {
+        const value = $providerSelect.val();
+        setProviderValue(value);
         $variablesHidden.val('');
         syncVariablesField();
-        loadVariables($provider.val(), false);
+        loadVariables(value, false);
+      });
+
+      $providerManual.on('change keyup paste', () => {
+        const value = $providerManual.val();
+        setProviderValue(value);
+        $variablesHidden.val('');
+        syncVariablesField();
+        if (value) {
+          loadVariables(value, false);
+        }
       });
 
       $config.on('change', () => {
@@ -212,8 +245,12 @@
     <input type="text" id="node-input-connection">
   </div>
   <div class="form-row">
-    <label for="node-input-providerId"><i class="fa fa-id-badge"></i> Provider</label>
-    <select id="node-input-providerId"></select>
+    <label><i class="fa fa-id-badge"></i> Provider</label>
+    <div style="flex:1;">
+      <select id="datahub-provider-select" style="width:100%;"></select>
+      <input type="text" id="datahub-provider-manual" placeholder="provider id" style="width:100%; display:none;">
+      <input type="hidden" id="node-input-providerId">
+    </div>
   </div>
   <div class="form-row">
     <label></label>

package/nodes/uos-config.html

@@ -1,11 +1,12 @@
 <script type="text/javascript">
+  const FIXED_SCOPE = 'hub.variables.provide hub.variables.readwrite hub.variables.readonly';
   RED.nodes.registerType('uos-config', {
     category: 'config',
     defaults: {
       host: { value: '127.0.0.1', required: true },
       port: { value: 49360, required: true, validate: RED.validators.number() },
       clientName: { value: 'nodered', required: true },
-      scope: { value: 'hub.variables.provide hub.variables.readwrite', required: true },
+      scope: { value: FIXED_SCOPE, required: true },
     },
     credentials: {
       clientId: { type: 'text', required: true },
@@ -54,6 +55,9 @@
         evt.preventDefault();
         fetchScopes();
       });
+      $('#node-config-input-scope').val(FIXED_SCOPE);
+      $('#uos-scope-fixed').text(FIXED_SCOPE);
+
       if (node.credentials && node.credentials.clientId) {
         fetchScopes();
       }
@@ -82,9 +86,10 @@
     <label for="node-config-input-clientSecret"><i class="fa fa-key"></i> Client Secret</label>
     <input type="password" id="node-config-input-clientSecret">
   </div>
+  <input type="hidden" id="node-config-input-scope">
   <div class="form-row">
-    <label for="node-config-input-scope"><i class="fa fa-list"></i> Scope</label>
-    <input type="text" id="node-config-input-scope">
+    <label><i class="fa fa-list"></i> Scope</label>
+    <span id="uos-scope-fixed" class="form-tips"></span>
   </div>
   <div class="form-row">
     <label><i class="fa fa-info-circle"></i> Granted scopes</label>
@@ -102,7 +107,7 @@
     <li><strong>Host / Port</strong> – IP and NATS port of the controller (default <code>127.0.0.1:49360</code>).</li>
     <li><strong>Client Name</strong> – Friendly identifier used in NATS connection logs.</li>
     <li><strong>Client ID / Secret</strong> – OAuth credentials from your u-OS Control Center client.</li>
-    <li><strong>Scope</strong> – Space separated scopes; e.g. <code>hub.variables.provide hub.variables.readwrite</code>.</li>
+    <li><strong>Scope</strong> – Fixed to <code>hub.variables.provide hub.variables.readwrite hub.variables.readonly</code> so the nodes can register providers and read metadata. It cannot be edited in the UI.</li>
     <li><strong>Granted scopes</strong> – Click <em>Refresh</em> to show what the token endpoint actually returns for this client.</li>
   </ul>
 </script>

package/nodes/uos-config.js

@@ -1,5 +1,6 @@
 const fetch = require('node-fetch');
 const { connect } = require('nats');
+const DEFAULT_SCOPE = 'hub.variables.provide hub.variables.readwrite hub.variables.readonly';
 
 if (!process.env.NODE_TLS_REJECT_UNAUTHORIZED) {
   process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
@@ -13,7 +14,7 @@ module.exports = function (RED) {
     this.host = config.host || '127.0.0.1';
     this.port = Number(config.port) || 49360;
     this.clientName = config.clientName || 'nodered';
-    this.scope = config.scope || 'hub.variables.provide hub.variables.readwrite';
+    this.scope = DEFAULT_SCOPE;
     this.clientId = this.credentials.clientId;
     this.clientSecret = this.credentials.clientSecret;
     this.tokenInfo = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-uos-nats",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Node-RED nodes for u-OS Data Hub via NATS",
   "repository": {
     "type": "git",