@bldgblocks/node-red-contrib-control 0.1.38 → 0.2.0

package/LICENSE.md

@@ -1,4 +1,33 @@
 
+# Commons Clause License Condition v1.0
+
+The Software is provided to you by the Licensor under the License, as
+defined below, subject to the following condition.
+
+Without limiting other conditions in the License, the grant of rights
+under the License will not include, and the License does not grant to
+you, the right to Sell the Software.
+
+For purposes of the foregoing, "Sell" means practicing any or all of
+the rights granted to you under the License to provide to third parties,
+for a fee or other consideration (including without limitation fees for
+hosting or consulting/support services related to the Software), a
+product or service whose value derives, entirely or substantially, from
+the functionality of the Software. Any license notice or attribution
+required by the License must also include this Commons Clause License
+Condition notice.
+
+**Software:** node-red-contrib-control
+
+**License:** Apache 2.0
+
+**Licensor:** buildingblocks
+
+For commercial licensing inquiries, contact the Licensor via the
+repository at https://github.com/BldgBlocks/node-red-contrib-control
+
+---
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -187,11 +216,12 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2024-2026 buildingblocks
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+   Licensed under the Apache License, Version 2.0, with Commons Clause
+   License Condition v1.0 (the "License"); you may not use this file
+   except in compliance with the License. You may obtain a copy of the
+   License at
 
        http://www.apache.org/licenses/LICENSE-2.0
 
@@ -199,4 +229,7 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.
+
+   This software is subject to the Commons Clause License Condition v1.0
+   as described at the top of this file.

package/nodes/accumulate-block.html

@@ -61,9 +61,9 @@ Counts consecutive inputs from a configured property based on the selected mode,
 
 ### Details
 Counts inputs according to the selected mode, reading from the configured **Input Property** (default: `msg.payload`):
-- **Accumulate True**: counts consecutive `true` values (resets on `false` or explicit reset)
-- **Accumulate False**: counts consecutive `false` values (resets on `true` or explicit reset)
-- **Accumulate Flows**: counts all valid input messages (resets only on explicit reset)
+- **Accumulate True** counts consecutive `true` values (resets on `false` or explicit reset)
+- **Accumulate False** counts consecutive `false` values (resets on `true` or explicit reset)
+- **Accumulate Flows** counts all valid input messages (resets only on explicit reset)
 
 Reset via `msg.context = "reset"` with `msg.payload = true`.
 

package/nodes/alarm-collector.js

@@ -46,6 +46,20 @@ module.exports = function(RED) {
         node.conditionMet = false;
         node.valueChangedListener = null;
 
+        // Register with alarm-config at startup so the registry knows about this collector
+        if (node.alarmConfig) {
+            node.alarmConfig.register(node.id, {
+                name: node.name,
+                severity: node.priority,
+                status: 'cleared',
+                title: node.title,
+                message: node.message,
+                topic: node.topic,
+                value: null,
+                timestamp: new Date().toISOString()
+            });
+        }
+
         utils.setStatusOK(node, `idle`);
 
         // ====================================================================
@@ -180,15 +194,14 @@ module.exports = function(RED) {
 
             // Register/update alarm in registry
             if (node.alarmConfig) {
-                const alarmName = node.name;
-                node.alarmConfig.register(alarmName, {
-                    nodeId: node.id,
-                    pointId: node.currentValue,
+                node.alarmConfig.register(node.id, {
+                    name: node.name,
                     severity: node.priority,
                     status: node.alarmState ? 'active' : 'cleared',
                     title: node.title,
                     message: node.message,
                     topic: node.topic,
+                    value: node.currentValue,
                     timestamp: new Date().toISOString()
                 });
             }
@@ -288,7 +301,7 @@ module.exports = function(RED) {
 
             // Unregister alarm from registry
             if (node.alarmConfig) {
-                node.alarmConfig.unregister(node.name, node.id);
+                node.alarmConfig.unregister(node.id);
             }
 
             // Remove global value-changed listener

package/nodes/alarm-config.html

@@ -36,10 +36,10 @@
             const $list = $("#node-input-alarm-list");
 
             function loadAlarms() {
-                $.getJSON(`/alarm-config/list/${node.id}`, function(data) {
+                $.getJSON(`alarm-config/list/${node.id}`, function(data) {
                     $list.empty();
                     if (!data.length) {
-                        return $list.append('<li style="color:#999;">No alarms registered</li>');
+                        return $list.append('<li style="color:#999;">No alarms registered (deploy first if newly added)</li>');
                     }
 
                     // Data already sorted by server
@@ -63,9 +63,10 @@
                                 width: '16px'
                             });
 
-                        // Alarm info (name, severity, point)
+                        // Alarm info (name, severity, topic)
+                        const valuePart = alarm.value != null ? ` val:${alarm.value}` : '';
                         const infoText = $('<span>')
-                            .html(`<strong>${alarm.name}</strong> <span style="color:#666;font-size:0.9em;">[${alarm.severity}] #${alarm.pointId}</span>`)
+                            .html(`<strong>${alarm.name}</strong> <span style="color:#666;font-size:0.9em;">[${alarm.severity}] ${alarm.topic}${valuePart}</span>`)
                             .css({ flexGrow: 1 });
 
                         // Reveal button (find node on canvas)
@@ -80,8 +81,12 @@
                         li.append(statusDot, infoText, revealBtn);
                         $list.append(li);
                     });
-                }).fail(function() {
-                    $list.html('<li style="color:red;">Could not load alarms</li>');
+                }).fail(function(jqXHR) {
+                    if (jqXHR.status === 401 || jqXHR.status === 403) {
+                        $list.html('<li style="color:red;">Permission denied (alarm-config.read)</li>');
+                    } else {
+                        $list.html('<li style="color:red;">Could not load alarms (HTTP ' + jqXHR.status + ')</li>');
+                    }
                 });
             }
 

package/nodes/alarm-config.js

@@ -8,45 +8,39 @@ module.exports = function(RED) {
         const utils = require('./utils')(RED);
         utils.registerRegistryNode(node);
         
-        // The Map: stores alarm metadata by name
-        // Format: { "alarmName": { nodeId: "abc.123", pointId: 101, severity: "high", status: "active", ... } }
+        // The Map: stores alarm metadata keyed by collector node ID (always unique)
+        // Format: { "nodeId": { name: "Alarm Name", severity: "high", status: "active", ... } }
         node.alarms = new Map();
 
-        // Register an alarm in the registry
-        node.register = function(alarmName, meta) {
-            if (!alarmName || typeof alarmName !== 'string') {
+        // Register an alarm in the registry (keyed by nodeId for uniqueness)
+        node.register = function(nodeId, meta) {
+            if (!nodeId || typeof nodeId !== 'string') {
                 return false;
             }
 
-            if (node.alarms.has(alarmName)) {
-                const existing = node.alarms.get(alarmName);
-                // Allow update if it's the same node
-                if (existing.nodeId !== meta.nodeId) {
-                    return false;
-                }
-                // Merge updates (preserving status if provided)
+            if (node.alarms.has(nodeId)) {
+                const existing = node.alarms.get(nodeId);
+                // Merge updates (preserving existing fields not in new meta)
                 meta = Object.assign({}, existing, meta);
             }
-            node.alarms.set(alarmName, meta);
+            node.alarms.set(nodeId, meta);
             return true;
         };
 
-        // Unregister an alarm
-        node.unregister = function(alarmName, nodeId) {
-            if (node.alarms.has(alarmName) && node.alarms.get(alarmName).nodeId === nodeId) {
-                node.alarms.delete(alarmName);
-            }
+        // Unregister an alarm by node ID
+        node.unregister = function(nodeId) {
+            node.alarms.delete(nodeId);
         };
 
-        // Lookup an alarm by name
-        node.lookup = function(alarmName) {
-            return node.alarms.get(alarmName);
+        // Lookup an alarm by node ID
+        node.lookup = function(nodeId) {
+            return node.alarms.get(nodeId);
         };
 
-        // Update alarm status
-        node.updateStatus = function(alarmName, status) {
-            if (node.alarms.has(alarmName)) {
-                const alarm = node.alarms.get(alarmName);
+        // Update alarm status by node ID
+        node.updateStatus = function(nodeId, status) {
+            if (node.alarms.has(nodeId)) {
+                const alarm = node.alarms.get(nodeId);
                 alarm.status = status;  // 'active' or 'cleared'
                 alarm.lastUpdate = new Date().toISOString();
                 return true;
@@ -57,8 +51,8 @@ module.exports = function(RED) {
         // Get all alarms
         node.getAll = function() {
             const arr = [];
-            for (const [name, meta] of node.alarms.entries()) {
-                arr.push({ name, ...meta });
+            for (const [nodeId, meta] of node.alarms.entries()) {
+                arr.push({ nodeId, ...meta });
             }
             return arr;
         };
@@ -73,7 +67,8 @@ module.exports = function(RED) {
         // Find the alarm-config node
         const configNode = RED.nodes.getNode(configId);
         if (!configNode) {
-            return res.status(404).json({ error: 'Configuration node not found' });
+            // Not deployed yet — return empty list so the editor can show a friendly message
+            return res.json([]);
         }
 
         // Get all alarms from this config
@@ -104,20 +99,24 @@ module.exports = function(RED) {
             return res.json({ status: result, warning: "Configuration not deployed" });
         }
 
-        // Check for the alarm
-        entry = configNode.lookup(alarmName);
+        // Check for the alarm — map is keyed by nodeId
+        entry = configNode.lookup(checkNodeId);
+
         if (entry) {
-            // Collision if alarm exists AND belongs to a different node
-            if (entry.nodeId !== checkNodeId) {
+            result = "assigned";
+        } else {
+            // Check if any other node has the same alarm name (name collision check)
+            const allAlarms = configNode.getAll();
+            const nameMatch = allAlarms.find(a => a.name === alarmName && a.nodeId !== checkNodeId);
+            if (nameMatch) {
                 collision = true;
+                entry = nameMatch;
             }
         }
 
         if (collision) {
             result = "collision";
-        } else if (!collision && entry) {
-            result = "assigned";
-        } else {
+        } else if (!entry) {
             result = "available";
         }
 

package/nodes/boolean-switch-block.html

@@ -4,6 +4,10 @@
         <label for="node-input-name" title="Display name shown on the canvas"><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-state" title="Initial switch state"><i class="fa fa-toggle-on"></i> State</label>
+        <input type="checkbox" id="node-input-state" style="width: auto;">
+    </div>
 </script>
 
 <!-- JavaScript Section -->
@@ -29,30 +33,39 @@
 
 <!-- Help Section -->
 <script type="text/markdown" data-help-name="boolean-switch-block">
-Routes input flows to one of three outputs based on a boolean switch state.
+A boolean gate that routes messages based on a `true`/`false` switch state.
 
 ### Inputs
-: context (string) : Configuration commands (`toggle`, `switch`, `inTrue`, `inFalse`).
-: payload (any) : Flow data for `"inTrue"` or `"inFalse"`.
+: context (string) : Message tag: `"in"`, `"inTrue"`, `"inFalse"`, `"toggle"`, or `"switch"`.
+: payload (any) : Flow data for `"in"` / `"inTrue"` / `"inFalse"`; boolean for `"switch"`.
+
+#### Contexts
+- **`"in"`** — Routes `msg` to `outTrue` when state is `true`, or `outFalse` when state is `false`. Always flows through.
+- **`"inTrue"`** — Passes `msg` to `outTrue` only when state is `true`. Blocked with warning when `false`.
+- **`"inFalse"`** — Passes `msg` to `outFalse` only when state is `false`. Blocked with warning when `true`.
+- **`"toggle"`** — Flips the switch state and emits new state on `outControl`.
+- **`"switch"`** — Sets the switch state to `!!msg.payload` and emits on `outControl`.
 
 ### Outputs
-: outTrue (msg) : Receives `msg` with `context "inTrue"` when switch is `true`.
-: outFalse (msg) : Receives `msg` with `context "inFalse"` when switch is `false`.
-: outControl (msg) : `msg.payload` set to switch state on toggle.
+: outTrue (msg) : Receives `msg` when state is `true` (via `"in"` or `"inTrue"`).
+: outFalse (msg) : Receives `msg` when state is `false` (via `"in"` or `"inFalse"`).
+: outControl (msg) : Emits `{ payload: <boolean> }` on `"toggle"` or `"switch"` only.
 
 ### Details
-Routes input messages to one of three outputs based on a boolean switch state (`true` or `false`).
+This node acts as a boolean gate/router.
 
-Messages with `msg.context = "inTrue"` are sent to `outTrue` when `state = true`, and messages with `msg.context = "inFalse"` are sent to `outFalse` when `state = false`.
+Use `"in"` to auto-route messages to the correct output based on state — messages always flow through.
+Use `"inTrue"`/`"inFalse"` for conditional gating — messages are blocked (with yellow warning) when state doesn't match.
 
-State can be controlled directly with the `"switch"` property given a `msg.payload` boolean value.
+State can be controlled with `"toggle"` (flip) or `"switch"` (set explicitly via payload).
+The `outControl` port fires only on state commands, not on routed data messages.
 
 ### Status
-- Green (dot): Configuration update
-- Blue (dot): State changed
-- Blue (ring): State unchanged
-- Red (ring): Error
-- Yellow (ring): Warning
+- **Green (dot)**: Message routed successfully
+- **Blue (dot)**: State changed (`toggle` / `switch`)
+- **Blue (ring)**: State unchanged (`switch` with same value)
+- **Yellow (ring)**: Message blocked (`inTrue` when false, `inFalse` when true) or unknown context
+- **Red (ring)**: Error (missing context, invalid message)
 
 ### References
 - [Node-RED Documentation](https://nodered.org/docs/)

package/nodes/boolean-switch-block.js

@@ -5,8 +5,8 @@ module.exports = function(RED) {
         RED.nodes.createNode(this, config);
         const node = this;
 
-        // Initialize state from config
-        node.state = config.state;
+        // Initialize state from config (coerce to boolean)
+        node.state = !!config.state;
 
         // Set initial status
         utils.setStatusOK(node, `state: ${node.state}`);
@@ -30,31 +30,41 @@ module.exports = function(RED) {
 
             // Handle context commands
             switch (msg.context) {
-                case "toggle":
+                case "toggle": {
                     node.state = !node.state;
                     utils.setStatusChanged(node, `state: ${node.state}`);
                     send([null, null, { payload: node.state }]);
                     break;
-                case "switch":
-                    node.state = !!msg.payload;
-                    utils.setStatusChanged(node, `state: ${node.state}`);
+                }
+
+                case "switch": {
+                    const newState = !!msg.payload;
+                    if (newState === node.state) {
+                        utils.setStatusUnchanged(node, `state: ${node.state}`);
+                    } else {
+                        node.state = newState;
+                        utils.setStatusChanged(node, `state: ${node.state}`);
+                    }
                     send([null, null, { payload: node.state }]);
                     break;
+                }
                 case "inTrue":
                     if (node.state) {
-                        utils.setStatusOK(node, `out: ${msg.payload}`);
-                        send([msg, null, { payload: node.state }]);
+                        utils.setStatusOK(node, `outTrue: ${msg.payload}`);
+                        send([msg, null, null]);
                     }
                     break;
+
                 case "inFalse":
                     if (!node.state) {
-                        utils.setStatusOK(node, `out: ${msg.payload}`);
-                        send([null, msg, { payload: node.state }]);
+                        utils.setStatusOK(node, `outFalse: ${msg.payload}`);
+                        send([null, msg, null]);
                     }
                     break;
+
                 default:
-                    utils.setStatusWarn(node, "unknown context");
-                    if (done) done("Unknown context");
+                    utils.setStatusWarn(node, `unknown context: ${msg.context}`);
+                    if (done) done("Unknown context: " + msg.context);
                     return;
             }
             if (done) done();

package/nodes/global-getter.html

@@ -4,12 +4,22 @@
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
     
-    <div class="form-row">
-        <label for="node-input-targetNode"><i class="fa fa-crosshairs"></i> Source</label>
-        <input type="text" id="node-input-targetNode" style="width: calc(70% - 45px);">
-        <button id="node-config-find-source" class="editor-button" style="margin-left: 5px; width: 40px;" title="Find Source Node">
-            <i class="fa fa-search"></i>
-        </button>
+    <div class="form-row" style="margin-bottom: 0px;">
+        <label><i class="fa fa-crosshairs"></i> Source</label>
+        <input type="hidden" id="node-input-targetNode">
+        <span id="node-input-source-toggle" style="float: right; cursor: pointer; padding: 2px 6px; font-size: 14px;" title="Collapse/Expand source list">
+            <i class="fa fa-caret-down"></i>
+        </span>
+    </div>
+    <div id="node-input-source-summary" style="display: none; padding: 4px 8px; margin-bottom: 5px; border: 1px solid #ddd; border-radius: 4px; background: transparent; color: #888; font-style: italic; cursor: pointer;" title="Click to expand">No source selected</div>
+    <div id="node-input-source-expanded">
+        <div style="position: relative; height: 30px; text-align: right;">
+            <div style="display: inline-block; vertical-align: middle;"><input type="text" id="node-input-source-filter"></div>
+            <button id="node-config-find-source" class="editor-button" style="width: 28px; height: 28px; vertical-align: middle; margin-left: 4px; display: inline-flex; align-items: center; justify-content: center;" title="Reveal Source Node">
+                <i class="fa fa-search"></i>
+            </button>
+        </div>
+        <div class="form-row node-input-source-row"></div>
     </div>
 
     <div class="form-row">
@@ -74,6 +84,7 @@
         paletteLabel: "global get",
         oneditprepare: function() {
             const node = this;
+            let initComplete = false;
             
             let candidateNodes = [];
             RED.nodes.eachNode(function(n) {
@@ -93,10 +104,137 @@
 
             candidateNodes.sort((a, b) => a.label.localeCompare(b.label));
 
-            $("#node-input-targetNode").typedInput({
-                types: [{ value: "target", options: candidateNodes }]
+            // Build treeList grouped by flow tab (like link-in node)
+            const sourceList = $("<div>").css({width: "100%", height: "100%"}).appendTo(".node-input-source-row")
+                .treeList({autoSelect: false});
+
+            const flowMap = {};
+            const flows = [];
+            RED.nodes.eachWorkspace(function(ws) {
+                flowMap[ws.id] = {
+                    id: ws.id,
+                    class: 'red-ui-palette-header',
+                    label: (ws.label || ws.id) + (node.z === ws.id ? " *" : ""),
+                    expanded: true,
+                    children: []
+                };
+                flows.push(flowMap[ws.id]);
+            });
+
+            let candidateNodesCount = 0;
+            candidateNodes.forEach(function(opt) {
+                if (flowMap[RED.nodes.node(opt.value)?.z]) {
+                    const targetZ = RED.nodes.node(opt.value).z;
+                    flowMap[targetZ].children.push({
+                        id: opt.value,
+                        node: RED.nodes.node(opt.value),
+                        label: opt.label,
+                        radio: true,
+                        radioGroup: "source-select",
+                        selected: opt.value === node.targetNode
+                    });
+                    candidateNodesCount++;
+                }
+            });
+
+            const flowsFiltered = flows.filter(function(f) { return f.children.length > 0; });
+            sourceList.treeList('data', flowsFiltered);
+
+            // Show current node's flow tab
+            setTimeout(function() { sourceList.treeList('show', node.z); }, 100);
+
+            // searchBox filter (same pattern as link-in)
+            const search = $("#node-input-source-filter").searchBox({
+                style: "compact",
+                delay: 300,
+                change: function() {
+                    const val = $(this).val().trim().toLowerCase();
+                    if (val === "") {
+                        sourceList.treeList("filter", null);
+                        search.searchBox("count", "");
+                    } else {
+                        const count = sourceList.treeList("filter", function(item) {
+                            return item.label && item.label.toLowerCase().indexOf(val) > -1;
+                        });
+                        search.searchBox("count", count + " / " + candidateNodesCount);
+                    }
+                }
             });
             
+            // Helper to get the currently selected source from the treeList
+            function getSelectedSourceId() {
+                const items = sourceList.treeList('data');
+                for (let f = 0; f < items.length; f++) {
+                    const children = items[f].children || [];
+                    for (let c = 0; c < children.length; c++) {
+                        if (children[c].selected) return children[c].id;
+                    }
+                }
+                return "";
+            }
+
+            // --- Collapse / Expand toggle ---
+            const toggleBtn = $("#node-input-source-toggle");
+            const expandedSection = $("#node-input-source-expanded");
+            const summaryBar = $("#node-input-source-summary");
+            let sourceExpanded = true;
+
+            function getSelectedLabel() {
+                const id = getSelectedSourceId();
+                if (!id) return "No source selected";
+                const opt = candidateNodes.find(o => o.value === id);
+                return opt ? opt.label : "Unknown";
+            }
+
+            function resizeSourceList() {
+                if (!sourceExpanded) return;
+                var dialogForm = $("#dialog-form");
+                var height = dialogForm.height();
+                dialogForm.children().each(function() {
+                    var $el = $(this);
+                    if ($el.attr("id") === "node-input-source-expanded") {
+                        // Subtract the search/button bar inside expanded, but not the source-row itself
+                        $el.children().each(function() {
+                            if (!$(this).hasClass("node-input-source-row")) {
+                                height -= $(this).outerHeight(true);
+                            }
+                        });
+                    } else {
+                        height -= $el.outerHeight(true);
+                    }
+                });
+                $(".node-input-source-row").css("height", Math.max(200, height) + "px");
+            }
+
+            function setSourceExpanded(expanded) {
+                sourceExpanded = expanded;
+                if (expanded) {
+                    summaryBar.hide();
+                    expandedSection.show();
+                    toggleBtn.find("i").removeClass("fa-caret-right").addClass("fa-caret-down");
+                    setTimeout(resizeSourceList, 50);
+                } else {
+                    expandedSection.hide();
+                    summaryBar.text(getSelectedLabel()).show();
+                    toggleBtn.find("i").removeClass("fa-caret-down").addClass("fa-caret-right");
+                }
+            }
+
+            toggleBtn.on("click", function() { setSourceExpanded(!sourceExpanded); });
+            summaryBar.on("click", function() { setSourceExpanded(true); });
+
+            // Update summary text and hidden input when selection changes
+            sourceList.on('treelistselect', function() {
+                if (!initComplete) return;
+                $("#node-input-targetNode").val(getSelectedSourceId());
+                if (!sourceExpanded) summaryBar.text(getSelectedLabel());
+            });
+
+            // Start collapsed if a source is already selected
+            if (node.targetNode) {
+                setSourceExpanded(false);
+            }
+
             $("#node-input-outputProperty").typedInput({
                 default: "msg",
                 types: ["msg", "flow",
@@ -110,10 +248,12 @@
             }).typedInput("type", node.outputPropertyType || "msg").typedInput("value", node.outputProperty);
 
             function updateOutputValue() {
+                if (!initComplete) return;
                 const currentType = $("#node-input-outputProperty").typedInput("type");
+                const currentValue = $("#node-input-outputProperty").typedInput("value");
                 
-                if (currentType === "dropdown" && node.outputProperty === "sourceToFlow") {
-                    const selectedSourceId = $("#node-input-targetNode").val();
+                if (currentType === "dropdown" && currentValue === "sourceToFlow") {
+                    const selectedSourceId = getSelectedSourceId();
                     const selectedOption = candidateNodes.find(opt => opt.value === selectedSourceId);
                     
                     if (selectedOption && selectedOption.path) {
@@ -122,14 +262,35 @@
                 }
             }
 
-            $("#node-input-targetNode").on("change", updateOutputValue);
+            sourceList.on('treelistselect', updateOutputValue);
             $("#node-input-outputProperty").on("change", updateOutputValue);
 
             $("#node-config-find-source").on("click", function() {
-                const selectedId = $("#node-input-targetNode").val();
+                const selectedId = getSelectedSourceId();
                 if (selectedId) { RED.view.reveal(selectedId); } 
                 else { RED.notify("Please select a source node first.", "warning"); }
             });
+
+            // Mark init complete - all event handlers now active
+            setTimeout(function() { initComplete = true; }, 200);
+        },
+        oneditresize: function(size) {
+            if ($("#node-input-source-expanded").is(":hidden")) return;
+            var dialogForm = $("#dialog-form");
+            var height = dialogForm.height();
+            dialogForm.children().each(function() {
+                var $el = $(this);
+                if ($el.attr("id") === "node-input-source-expanded") {
+                    $el.children().each(function() {
+                        if (!$(this).hasClass("node-input-source-row")) {
+                            height -= $(this).outerHeight(true);
+                        }
+                    });
+                } else {
+                    height -= $el.outerHeight(true);
+                }
+            });
+            $(".node-input-source-row").css("height", Math.max(200, height) + "px");
         }
     });
 </script>

package/nodes/global-setter.html

@@ -25,6 +25,15 @@
         <input type="hidden" id="node-input-defaultValueType">
     </div>
 
+    <hr>
+
+    <div class="form-row">
+        <label>&nbsp;</label>
+        <button type="button" id="node-btn-clear-priorities" class="editor-button" style="width: calc(70% - 3px);" title="Clear all 16 priority slots on the live node (does not affect the default value)">
+            <i class="fa fa-eraser"></i> Clear All Priorities
+        </button>
+    </div>
+
     <div class="form-tips">
         <b>Note:</b> This node writes to the selected <b>Priority</b>, manually, by msg or flow. The actual Global Variable value will be the highest active priority.
     </div>
@@ -97,6 +106,30 @@
                 }, "msg", "flow"],
                 typeField: "#node-input-writePriorityType"
             }).typedInput("type", node.writePriorityType).typedInput("value", node.writePriority);
+
+            // Clear Priorities button — calls the admin endpoint on the live runtime node
+            $("#node-btn-clear-priorities").on("click", function() {
+                const btn = $(this);
+                if (!node.id) {
+                    RED.notify("Node must be deployed before clearing priorities.", "warning");
+                    return;
+                }
+                btn.prop("disabled", true).find("i").removeClass("fa-eraser").addClass("fa-spinner fa-spin");
+                $.ajax({
+                    url: "global-setter/" + node.id + "/clear-priorities",
+                    type: "POST",
+                    success: function(data) {
+                        RED.notify("Priorities cleared — active: " + (data.activePriority || "default") + ":" + data.value, "success");
+                    },
+                    error: function(jqXHR) {
+                        const errMsg = jqXHR.responseJSON ? jqXHR.responseJSON.error : "Unknown error";
+                        RED.notify("Failed to clear priorities: " + errMsg, "error");
+                    },
+                    complete: function() {
+                        btn.prop("disabled", false).find("i").removeClass("fa-spinner fa-spin").addClass("fa-eraser");
+                    }
+                });
+            });
         }
     });
 </script>
@@ -108,6 +141,8 @@ Manage a global variable in a repeatable way.
 ### Inputs 
 : payload (any) : Input payload is passed through unchanged.
 : property (string) : The input property where the value is taken from.
+: priority (number|string) : _Optional_. Overrides the configured Priority at runtime. Accepts `1`–`16` or `"default"`. For example, `msg.priority = 8` writes to priority slot 8.
+: context (string) : _Optional_. Tagged-input priority routing (matches priority-block conventions). Accepts `"priority1"`–`"priority16"`, `"default"`, or `"reload"`. When both `msg.priority` and `msg.context` are present, `msg.priority` takes precedence.
 : units (string) : The units associated with the value, if any. Also supports nested units at `msg.<inputProperty>.units`.
 
 ### Outputs
@@ -120,6 +155,8 @@ This node allows you to set a global variable in one place, and retrieve it else
 
 When this node is deleted or the flow is redeployed, it will automatically remove (prune) the variable from the selected Context Store.
 
+**Clear All Priorities** button (in editor): Resets all 16 priority slots to `null` on the live running node. The default value is preserved. The active value recalculates to the highest remaining priority (or falls back to default). The node must be deployed first.
+
 ### Status
 - Green (dot): Configuration update
 - Blue (dot): State changed

package/nodes/global-setter.js

@@ -92,16 +92,46 @@ module.exports = function(RED) {
                 }
                 node.isBusy = true;
 
-                // Evaluate Dynamic Properties (Exact same logic as before)
+                // Resolve write priority — three sources, in order of precedence:
+                //   1. msg.priority (number 1-16 or "default") — explicit per-message override
+                //   2. msg.context  ("priority1"–"priority16" or "default") — tagged-input pattern (matches priority-block)
+                //   3. Configured writePriority (dropdown / msg / flow typed-input)
                 try {
-                    const evaluations = [];
-                    evaluations.push(
-                        utils.requiresEvaluation(config.writePriorityType) 
-                            ? utils.evaluateNodeProperty(config.writePriority, config.writePriorityType, node, msg)
-                            : Promise.resolve(node.writePriority)
-                    );
-                    const results = await Promise.all(evaluations);   
-                    node.writePriority = results[0];
+                    if (msg.hasOwnProperty("priority")) {
+                        // Source 1: msg.priority (direct number or "default")
+                        const mp = msg.priority;
+                        if (mp === "default") {
+                            node.writePriority = "default";
+                        } else {
+                            const p = parseInt(mp, 10);
+                            if (isNaN(p) || p < 1 || p > 16) {
+                                node.isBusy = false;
+                                return utils.sendError(node, msg, done, `Invalid msg.priority: ${mp}`);
+                            }
+                            node.writePriority = String(p);
+                        }
+                    } else if (msg.hasOwnProperty("context") && typeof msg.context === "string") {
+                        // Source 2: msg.context tagged-input ("priority8", "default", etc.)
+                        // "reload" is handled separately below — skip it here
+                        const ctx = msg.context;
+                        const priorityMatch = /^priority([1-9]|1[0-6])$/.exec(ctx);
+                        if (priorityMatch) {
+                            node.writePriority = priorityMatch[1];
+                        } else if (ctx === "default") {
+                            node.writePriority = "default";
+                        }
+                        // Other contexts (e.g. "reload") fall through — config stays as-is
+                    } else {
+                        // Source 3: Configured typed-input (dropdown, msg path, flow variable)
+                        const evaluations = [];
+                        evaluations.push(
+                            utils.requiresEvaluation(config.writePriorityType) 
+                                ? utils.evaluateNodeProperty(config.writePriority, config.writePriorityType, node, msg)
+                                : Promise.resolve(node.writePriority)
+                        );
+                        const results = await Promise.all(evaluations);   
+                        node.writePriority = results[0];
+                    }
                 } catch (err) {
                     throw new Error(`Property Eval Error: ${err.message}`);
                 } finally {
@@ -161,8 +191,14 @@ module.exports = function(RED) {
                 if (value === state.value && priority === state.activePriority) {
                     // Ensure payload stays in sync with value
                     state.payload = state.value;
+                    // Persist even when output unchanged — the priority array itself changed
+                    await utils.setGlobalState(node, node.varName, node.storeName, state);
+                    if (node.storeName !== 'default') {
+                        await utils.setGlobalState(node, node.varName, 'default', state);
+                    }
                     prefix = `${node.writePriority === 'default' ? '' : 'P'}`;
-                    const noChangeText = `no change: ${prefix}${node.writePriority}:${state.value}${state.units || ''}`;
+                    const statePrefix = `${state.activePriority === 'default' ? '' : 'P'}`;
+                    const noChangeText = `no change: ${prefix}${node.writePriority}:${inputValue} > active: ${statePrefix}${state.activePriority}:${state.value}${state.units || ''}`;
                     utils.setStatusUnchanged(node, noChangeText);
                     // Pass message through even if no context change
                     send({ ...state });
@@ -231,4 +267,47 @@ module.exports = function(RED) {
         });
     }
     RED.nodes.registerType("global-setter", GlobalSetterNode);
+
+    // --- Admin endpoint: Clear all priority slots for a given setter node ---
+    RED.httpAdmin.post('/global-setter/:id/clear-priorities', RED.auth.needsPermission('global-setter.write'), async function(req, res) {
+        const targetNode = RED.nodes.getNode(req.params.id);
+        if (!targetNode) {
+            return res.status(404).json({ error: "Node not found" });
+        }
+        try {
+            let state = await utils.getGlobalState(targetNode, targetNode.varName, targetNode.storeName);
+            if (!state || typeof state !== 'object' || !state.priority) {
+                return res.status(200).json({ message: "No state to clear" });
+            }
+            // Clear all 16 priority slots
+            for (let i = 1; i <= 16; i++) {
+                state.priority[i] = null;
+            }
+            // Recalculate winner (will fall back to default)
+            const { value, priority } = utils.getHighestPriority(state);
+            state.payload = value;
+            state.value = value;
+            state.activePriority = priority;
+            state.metadata.lastSet = new Date().toISOString();
+            state.metadata.sourceId = targetNode.id;
+
+            await utils.setGlobalState(targetNode, targetNode.varName, targetNode.storeName, state);
+            if (targetNode.storeName !== 'default') {
+                await utils.setGlobalState(targetNode, targetNode.varName, 'default', state);
+            }
+
+            RED.events.emit("bldgblocks:global:value-changed", {
+                key: targetNode.varName,
+                store: targetNode.storeName,
+                data: state
+            });
+            utils.setStatusOK(targetNode, `cleared: default:${state.value}`);
+            targetNode.send({ ...state });
+
+            res.status(200).json({ message: "Priorities cleared", value: state.value, activePriority: state.activePriority });
+        } catch (err) {
+            targetNode.error(`Clear priorities error: ${err.message}`);
+            res.status(500).json({ error: err.message });
+        }
+    });
 }

package/nodes/history-collector.html

@@ -95,7 +95,9 @@
                 
                 // 1. Update Series Dropdown
                 const seriesOptions = configNode && configNode.series ?
-                    configNode.series.map(s => ({ value: s.seriesName, label: s.seriesName })) :
+                    configNode.series
+                        .map(s => ({ value: s.seriesName, label: s.seriesName }))
+                        .sort((a, b) => a.label.localeCompare(b.label, undefined, { sensitivity: 'base' })) :
                     [];
                 
                 seriesInput.typedInput('types', [{

package/nodes/history-config.html

@@ -149,8 +149,11 @@
                 );
             }
 
-            (node.series || []).forEach(addRow);
-            if (node.series.length === 0) {
+            const sortedSeries = (node.series || []).slice().sort((a, b) =>
+                (a.seriesName || '').localeCompare(b.seriesName || '', undefined, { sensitivity: 'base' })
+            );
+            sortedSeries.forEach(addRow);
+            if (sortedSeries.length === 0) {
                 addRow({seriesName: "OutsideTemp", seriesUnits: "°F"});
             }
 
@@ -223,6 +226,9 @@
                 RED.notify("At least one valid series is required", "error");
                 throw new Error("No valid series");
             }
+            series.sort((a, b) =>
+                (a.seriesName || '').localeCompare(b.seriesName || '', undefined, { sensitivity: 'base' })
+            );
             this.series = series;
             this.name = cleanSaveStr($("#node-config-input-name").val()) || 'default';
         }

package/nodes/network-point-read.js

@@ -154,7 +154,7 @@ module.exports = function(RED) {
                 }
                 const errorText = `Read failed for point #${node.pointId}: ${data.errorMessage || "Unknown error"}`;
                 utils.setStatusError(node, `Error: ${data.errorMessage || "Unknown error"}`);
-                node.error(errorText);  // Show in debug panel
+                //node.error(errorText);  // Show in debug panel
                 // Don't update cache on error, keep stale value
                 return;
             }

package/nodes/network-point-register.html

@@ -126,7 +126,7 @@
                 });
 
                 // Also check deployed registry for any points not visible in editor
-                $.getJSON(`/network-point-registry/list/${registry}`, function (data) {
+                $.getJSON(`network-point-registry/list/${registry}`, function (data) {
                     const maxDeployedId = data.reduce((max, pt) => Math.max(max, pt.id), 0);
                     const next = Math.max(maxEditorId, maxDeployedId) + 1;
                     idInput.val(next);

package/nodes/network-service-registry.html

@@ -8,19 +8,38 @@
         <p>This node maintains the mapping between Network Point IDs (integers) and Global Variables.</p>
     </div>
 
-    <div class="form-row">
+    <div class="form-row" style="margin-bottom:4px;">
         <label><i class="fa fa-list-ul"></i> Points</label>
+        <div style="display:inline-block; vertical-align:top;">
+            <button type="button" id="node-input-renumber-btn" class="editor-button editor-button-small" title="Renumber selected points sequentially">
+                <i class="fa fa-sort-numeric-asc"></i> Renumber...
+            </button>
+        </div>
+    </div>
+    <div class="form-row">
         <div id="node-input-point-list-div"
              style="
                  border:1px solid #ccc;
-                 height:200px;          /* set a fixed height */
-                 overflow-y:auto;       /* enable vertical scrolling */
+                 height:300px;
+                 overflow-y:auto;
                  padding:5px;
                  box-sizing:border-box;">
-            <!-- The list will be injected by the JavaScript below -->
-            <ul id="node-input-point-list" style="margin:0;padding-left:1.2em;"></ul>
+            <table id="node-input-point-table" style="width:100%;border-collapse:collapse;font-size:0.9em;">
+                <thead>
+                    <tr style="border-bottom:2px solid #ccc;text-align:left;">
+                        <th style="padding:4px;width:28px;"><input type="checkbox" id="node-input-select-all" title="Select all"></th>
+                        <th style="padding:4px;width:70px;">ID</th>
+                        <th style="padding:4px;">Path</th>
+                        <th style="padding:4px;width:30px;"></th>
+                    </tr>
+                </thead>
+                <tbody id="node-input-point-list"></tbody>
+            </table>
         </div>
     </div>
+    <div class="form-row">
+        <span id="node-input-point-status" style="font-size:0.85em;color:#666;"></span>
+    </div>
 </script>
 
 <script type="text/javascript">
@@ -33,44 +52,227 @@
             return this.name || "Point Registry";
         },
         oneditprepare: function() {
-            const node = this;
-            const $list = $("#node-input-point-list");
+            const configNode = this;
+            const $tbody = $("#node-input-point-list");
+            const $status = $("#node-input-point-status");
+            const $selectAll = $("#node-input-select-all");
 
+            // Track pending changes: { editorNodeId: newPointId }
+            const pendingChanges = {};
+
+            // ============================================================
+            // Load deployed points + merge in any editor-only register nodes
+            // ============================================================
             function loadPoints() {
-                $.getJSON(`/network-point-registry/list/${node.id}`, function(data) {
-                    $list.empty();
-                    if (!data.length) return $list.append('<li>No points defined</li>');
+                // Gather all register nodes in the editor that reference this registry
+                const editorNodes = {};
+                RED.nodes.eachNode(function(n) {
+                    if ((n.type === "network-point-register" || n.type === "network-register") && n.registry === configNode.id) {
+                        editorNodes[n.id] = {
+                            nodeId: n.id,
+                            id: parseInt(n.pointId),
+                            path: null,      // will be filled from deployed data if available
+                            store: null,
+                            writable: !!n.writable,
+                            editorName: n.name || ""
+                        };
+                    }
+                });
+
+                $.getJSON(`network-point-registry/list/${configNode.id}`, function(deployedData) {
+                    // Merge deployed data into editor nodes (deployed has runtime path/store)
+                    deployedData.forEach(function(pt) {
+                        if (editorNodes[pt.nodeId]) {
+                            editorNodes[pt.nodeId].path = pt.path;
+                            editorNodes[pt.nodeId].store = pt.store;
+                        } else {
+                            // Deployed but not in editor (unusual — maybe just deleted)
+                            editorNodes[pt.nodeId] = pt;
+                        }
+                    });
 
-                    
-                data.sort((a, b) => parseInt(a.id, 10) - parseInt(b.id, 10));
+                    renderTable(Object.values(editorNodes));
+                }).fail(function() {
+                    // Fallback: render from editor nodes only
+                    renderTable(Object.values(editorNodes));
+                });
+            }
 
-                data.forEach(pt => {
-                    const li = $('<li>').css({ display:'flex', alignItems:'center' });
+            // ============================================================
+            // Render the editable table
+            // ============================================================
+            function renderTable(points) {
+                $tbody.empty();
+                $selectAll.prop('checked', false);
 
-                    // Text part: ID + path
-                    const txt = $('<span>')
-                        .text(`ID ${pt.id}: ${pt.path ?? 'not set'}`)
-                        .css({ flexGrow:1 });          // push button to the right
+                if (!points.length) {
+                    $tbody.append('<tr><td colspan="4" style="padding:8px;color:#999;">No points defined (deploy first if newly added)</td></tr>');
+                    $status.text("");
+                    return;
+                }
 
-                    // Button part
-                    const btn = $('<button type="button" class="editor-button">')
-                        .attr('title','Find node')
+                points.sort((a, b) => (a.id || 0) - (b.id || 0));
+
+                points.forEach(function(pt) {
+                    const $tr = $('<tr>').css({ borderBottom: '1px solid #eee' }).attr('data-node-id', pt.nodeId);
+
+                    // Checkbox
+                    const $cb = $('<input type="checkbox" class="point-select">');
+                    const $tdCb = $('<td>').css({ padding: '3px 4px' }).append($cb);
+
+                    // Editable ID input
+                    const $idInput = $('<input type="number" class="point-id-input">')
+                        .val(pt.id)
+                        .attr('data-original-id', pt.id)
+                        .css({ width: '55px', padding: '2px 4px', textAlign: 'right' });
+
+                    $idInput.on('change input', function() {
+                        const nid = pt.nodeId;
+                        const newVal = parseInt($(this).val());
+                        const origVal = parseInt($(this).attr('data-original-id'));
+
+                        if (!isNaN(newVal) && newVal !== origVal) {
+                            pendingChanges[nid] = newVal;
+                        } else {
+                            delete pendingChanges[nid];
+                        }
+                        validateIds();
+                    });
+
+                    const $tdId = $('<td>').css({ padding: '3px 4px' }).append($idInput);
+
+                    // Path display
+                    const displayPath = pt.path && pt.path !== "not ready" ? pt.path : (pt.editorName || 'not deployed');
+                    const $tdPath = $('<td>').css({ padding: '3px 4px', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', maxWidth: '200px' })
+                        .attr('title', displayPath)
+                        .text(displayPath);
+
+                    // Reveal button
+                    const $btn = $('<button type="button" class="editor-button editor-button-small">')
+                        .attr('title', 'Find node on canvas')
                         .html('<i class="fa fa-search"></i>')
-                        .on('click', function (e) {
+                        .on('click', function(e) {
                             e.stopPropagation();
-
                             RED.view.reveal(pt.nodeId);
                         });
+                    const $tdBtn = $('<td>').css({ padding: '3px 4px' }).append($btn);
 
-                    li.append(txt, btn);
-                    $list.append(li);
+                    $tr.append($tdCb, $tdId, $tdPath, $tdBtn);
+                    $tbody.append($tr);
                 });
-                }).fail(function() {
-                    $list.html('<li style="color:red;">Could not load points</li>');
+
+                $status.text(points.length + " point" + (points.length !== 1 ? "s" : ""));
+                validateIds();
+            }
+
+            // ============================================================
+            // Validate all IDs — highlight duplicates
+            // ============================================================
+            function validateIds() {
+                const idCounts = {};
+                $tbody.find('.point-id-input').each(function() {
+                    const val = parseInt($(this).val());
+                    if (!isNaN(val)) {
+                        idCounts[val] = (idCounts[val] || 0) + 1;
+                    }
+                });
+
+                $tbody.find('.point-id-input').each(function() {
+                    const val = parseInt($(this).val());
+                    const orig = parseInt($(this).attr('data-original-id'));
+                    const isDup = !isNaN(val) && idCounts[val] > 1;
+                    const isChanged = !isNaN(val) && val !== orig;
+
+                    $(this).css({
+                        border: isDup ? '2px solid #d32f2f' : (isChanged ? '2px solid #1976d2' : ''),
+                        backgroundColor: isDup ? '#f8a0a0' : (isChanged ? '#a0c8f0' : ''),
+                        color: isDup ? '#7a0000' : (isChanged ? '#003060' : '')
+                    });
                 });
             }
 
+            // ============================================================
+            // Select All checkbox
+            // ============================================================
+            $selectAll.on('change', function() {
+                const checked = $(this).is(':checked');
+                $tbody.find('.point-select').prop('checked', checked);
+            });
+
+            // ============================================================
+            // Renumber button
+            // ============================================================
+            $("#node-input-renumber-btn").on('click', function() {
+                const $checked = $tbody.find('.point-select:checked');
+                if ($checked.length === 0) {
+                    RED.notify("Select points to renumber using the checkboxes.", "warning");
+                    return;
+                }
+
+                // Prompt for starting number
+                const startStr = prompt("Enter starting ID number for " + $checked.length + " selected point(s):", "1");
+                if (startStr === null) return;
+
+                const startId = parseInt(startStr);
+                if (isNaN(startId) || startId < 0) {
+                    RED.notify("Invalid starting ID.", "error");
+                    return;
+                }
+
+                // Renumber selected rows in current table order (top to bottom)
+                let nextId = startId;
+                $checked.each(function() {
+                    const $row = $(this).closest('tr');
+                    const $input = $row.find('.point-id-input');
+                    const nid = $row.attr('data-node-id');
+                    const origVal = parseInt($input.attr('data-original-id'));
+
+                    $input.val(nextId);
+
+                    if (nextId !== origVal) {
+                        pendingChanges[nid] = nextId;
+                    } else {
+                        delete pendingChanges[nid];
+                    }
+                    nextId++;
+                });
+
+                validateIds();
+            });
+
+            // ============================================================
+            // Load on open
+            // ============================================================
             loadPoints();
+        },
+
+        oneditsave: function() {
+            // Apply pending ID changes to editor nodes
+            const $tbody = $("#node-input-point-list");
+            let changeCount = 0;
+
+            $tbody.find('tr[data-node-id]').each(function() {
+                const nid = $(this).attr('data-node-id');
+                const $input = $(this).find('.point-id-input');
+                const newVal = parseInt($input.val());
+                const origVal = parseInt($input.attr('data-original-id'));
+
+                if (!isNaN(newVal) && newVal !== origVal) {
+                    // Update the editor node config
+                    const editorNode = RED.nodes.node(nid);
+                    if (editorNode) {
+                        editorNode.pointId = newVal;
+                        editorNode.changed = true;
+                        editorNode.dirty = true;
+                        changeCount++;
+                    }
+                }
+            });
+
+            if (changeCount > 0) {
+                RED.nodes.dirty(true);
+                RED.notify(changeCount + " point ID" + (changeCount !== 1 ? "s" : "") + " updated. Deploy to apply.", "success");
+            }
         }
     });
 </script>
@@ -83,6 +285,13 @@ Maintains the mapping between integer Point IDs and global variable paths. This
 
 Create a single registry for your network of nodes and reference it from each network-register node.
 
+### Bulk ID Editing
+The config panel lets you edit Point IDs directly in the table:
+
+1. **Inline editing**: Change any ID by typing in its input field. Changed IDs highlight blue; conflicts highlight red.
+2. **Renumber**: Select points with checkboxes, click **Renumber...**, enter a starting ID — selected points get sequential IDs in table order.
+3. **Deploy**: Click Done, then Deploy to apply changes. The register nodes update automatically.
+
 **API for Developers:**
 * `register(id, meta)`: Claim an ID.
 * `lookup(id)`: Find the path/store for an ID.

package/nodes/network-service-registry.js

@@ -83,7 +83,7 @@ module.exports = function(RED) {
 
     RED.httpAdmin.get('/network-point-registry/list/:registryId', RED.auth.needsPermission('network-point-registry.read'), function(req, res) {
         const reg = RED.nodes.getNode(req.params.registryId);
-        if (!reg) return res.status(404).json({error:'not found'});
+        if (!reg) return res.json([]);  // Not deployed yet — return empty list
 
         // Convert Map to array
         const arr = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bldgblocks/node-red-contrib-control",
-  "version": "0.1.38",
+  "version": "0.2.0",
   "description": "Sedona-inspired control nodes for Node-RED",
   "keywords": [
     "node-red",
@@ -93,7 +93,7 @@
     }
   },
   "author": "buildingblocks",
-  "license": "Apache-2.0",
+  "license": "Apache-2.0 WITH Commons-Clause",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/BldgBlocks/node-red-contrib-control.git"