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

package/nodes/contextual-label-block.js

@@ -8,7 +8,7 @@ module.exports = function(RED) {
         node.contextPropertyName = config.contextPropertyName || "in1";
         node.removeLabel = config.removeLabel || false;
 
-        utils.setStatusOK(node, `mode: ${node.removeLabel ? "remove" : "set"}, property: ${node.contextPropertyName}`);
+        utils.setStatusOK(node, node.removeLabel ? "remove" : `set -> ${node.contextPropertyName}`);
 
         node.on("input", function(msg, send, done) {
             send = send || function() { node.send.apply(node, arguments); };
@@ -23,10 +23,10 @@ module.exports = function(RED) {
             // Set or remove context property
             if (node.removeLabel) {
                 delete msg.context;
-                utils.setStatusChanged(node, `in: ${msg.payload}, out: removed context`);
+                utils.setStatusChanged(node, `${msg.payload} -> removed`);
             } else {
                 msg.context = node.contextPropertyName;
-                utils.setStatusChanged(node, `in: ${msg.payload}, out: ${node.contextPropertyName}`);
+                utils.setStatusChanged(node, `${msg.payload} -> ${node.contextPropertyName}`);
             }
 
             send(msg);

package/nodes/delay-block.js

@@ -5,14 +5,19 @@ module.exports = function(RED) {
         RED.nodes.createNode(this, config);
         const node = this;
 
+        // Unit multipliers (constant, computed once)
+        const delayOnMultiplier = config.delayOnUnits === "seconds" ? 1000 : config.delayOnUnits === "minutes" ? 60000 : 1;
+        const delayOffMultiplier = config.delayOffUnits === "seconds" ? 1000 : config.delayOffUnits === "minutes" ? 60000 : 1;
+
         // Initialize state
         node.name = config.name;
         node.state = false;
         node.desired = false;
-        node.delayOn = parseFloat(config.delayOn) * (config.delayOnUnits === "seconds" ? 1000 : config.delayOnUnits === "minutes" ? 60000 : 1);
-        node.delayOff = parseFloat(config.delayOff) * (config.delayOffUnits === "seconds" ? 1000 : config.delayOffUnits === "minutes" ? 60000 : 1);
+        node.delayOn = parseFloat(config.delayOn) * delayOnMultiplier;
+        node.delayOff = parseFloat(config.delayOff) * delayOffMultiplier;
 
         let timeoutId = null;
+        let pendingDone = null;   // Track deferred done() for in-flight timers
         node.isBusy = false;
 
         node.on("input", async function(msg, send, done) {
@@ -46,21 +51,21 @@ module.exports = function(RED) {
                     utils.requiresEvaluation(config.delayOnType) 
                         ? utils.evaluateNodeProperty(config.delayOn, config.delayOnType, node, msg)
                             .then(val => parseFloat(val))
-                        : Promise.resolve(node.delayOn),
+                        : Promise.resolve(parseFloat(config.delayOn)),
                 );
                 
                 evaluations.push(
                     utils.requiresEvaluation(config.delayOffType) 
                         ? utils.evaluateNodeProperty(config.delayOff, config.delayOffType, node, msg)
                             .then(val => parseFloat(val))
-                        : Promise.resolve(node.delayOff),
+                        : Promise.resolve(parseFloat(config.delayOff)),
                 );
 
                 const results = await Promise.all(evaluations);   
 
-                // Update runtime with evaluated values
-                if (!isNaN(results[0])) node.delayOn = results[0] * (config.delayOnUnits === "seconds" ? 1000 : config.delayOnUnits === "minutes" ? 60000 : 1);
-                if (!isNaN(results[1])) node.delayOff = results[1] * (config.delayOffUnits === "seconds" ? 1000 : config.delayOffUnits === "minutes" ? 60000 : 1);         
+                // Update runtime with evaluated values (apply unit multiplier to raw config value)
+                if (!isNaN(results[0])) node.delayOn = results[0] * delayOnMultiplier;
+                if (!isNaN(results[1])) node.delayOff = results[1] * delayOffMultiplier;         
             } catch (err) {
                 node.error(`Error evaluating properties: ${err.message}`);
                 if (done) done();
@@ -98,7 +103,13 @@ module.exports = function(RED) {
                             clearTimeout(timeoutId);
                             timeoutId = null;
                         }
+                        // Complete any deferred done from a cancelled timer
+                        if (pendingDone) {
+                            pendingDone();
+                            pendingDone = null;
+                        }
                         node.state = false;
+                        node.desired = false;
                         utils.setStatusOK(node, "reset");
                     }
                     if (done) done();
@@ -160,44 +171,89 @@ module.exports = function(RED) {
 
             if (!node.state && inputValue === true) {
                 if (node.desired) {
+                    // Already awaiting true, ignore duplicate
                     if (done) done();
                     return;
                 }
                 if (timeoutId) {
                     clearTimeout(timeoutId);
+                    timeoutId = null;
+                }
+                // Complete any prior deferred done before starting new timer
+                if (pendingDone) {
+                    pendingDone();
+                    pendingDone = null;
                 }
                 utils.setStatusUnchanged(node, "awaiting true");
                 node.desired = true;
+
+                // Clone msg for the timer callback so we don't hold the original
+                const delayedMsg = RED.util.cloneMessage(msg);
+                // Defer done — this message isn't complete until the timer fires or is cancelled
+                pendingDone = done;
+
                 timeoutId = setTimeout(() => {
                     node.state = true;
-                    msg.payload = true;
-                    delete msg.context;
+                    delayedMsg.payload = true;
+                    delete delayedMsg.context;
                     utils.setStatusChanged(node, "in: true, out: true");
-                    send(msg);
+                    send(delayedMsg);
                     timeoutId = null;
+                    if (pendingDone) {
+                        pendingDone();
+                        pendingDone = null;
+                    }
                 }, node.delayOn);
+
+                // Don't call done() here — it's deferred to the timer callback
+                return;
             } else if (node.state && inputValue === false) {
                 if (node.desired === false) {
+                    // Already awaiting false, ignore duplicate
                     if (done) done();
                     return;
                 }
                 if (timeoutId) {
                     clearTimeout(timeoutId);
+                    timeoutId = null;
+                }
+                // Complete any prior deferred done before starting new timer
+                if (pendingDone) {
+                    pendingDone();
+                    pendingDone = null;
                 }
                 utils.setStatusUnchanged(node, "awaiting false");
                 node.desired = false;
+
+                // Clone msg for the timer callback so we don't hold the original
+                const delayedMsg = RED.util.cloneMessage(msg);
+                // Defer done — this message isn't complete until the timer fires or is cancelled
+                pendingDone = done;
+
                 timeoutId = setTimeout(() => {
                     node.state = false;
-                    msg.payload = false;
-                    delete msg.context;
+                    delayedMsg.payload = false;
+                    delete delayedMsg.context;
                     utils.setStatusChanged(node, "in: false, out: false");
-                    send(msg);
+                    send(delayedMsg);
                     timeoutId = null;
+                    if (pendingDone) {
+                        pendingDone();
+                        pendingDone = null;
+                    }
                 }, node.delayOff);
+
+                // Don't call done() here — it's deferred to the timer callback
+                return;
             } else {
                 if (timeoutId) {
                     clearTimeout(timeoutId);
                     timeoutId = null;
+                    // Complete deferred done from the cancelled timer's message
+                    if (pendingDone) {
+                        pendingDone();
+                        pendingDone = null;
+                    }
                     utils.setStatusUnchanged(node, `canceled awaiting ${node.state}`);
                 } else {
                     utils.setStatusUnchanged(node, "no change");
@@ -217,6 +273,11 @@ module.exports = function(RED) {
                 clearTimeout(timeoutId);
                 timeoutId = null;
             }
+            // Complete any deferred done on shutdown
+            if (pendingDone) {
+                pendingDone();
+                pendingDone = null;
+            }
             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-getter.js

@@ -10,10 +10,11 @@ module.exports = function(RED) {
         node.detail = config.detail;
         
         let setterNode = null;
-        let retryAction = null;
-        let healthCheckAction = null;
+        let retryTimeout = null;
+        let healthCheckTimeout = null;
         let updateListener = null;
         let retryCount = 0;
+        let closed = false;
         const retryDelays = [0, 100, 500, 1000, 2000, 4000, 8000, 16000];
         const maxRetries = retryDelays.length - 1;
         
@@ -85,9 +86,9 @@ module.exports = function(RED) {
                 
                 RED.events.on("bldgblocks:global:value-changed", updateListener);
                 
-                if (retryAction) {
-                    clearInterval(retryAction);
-                    retryAction = null;
+                if (retryTimeout) {
+                    clearTimeout(retryTimeout);
+                    retryTimeout = null;
                 }
                 
                 utils.setStatusOK(node, "Connected");
@@ -98,6 +99,11 @@ module.exports = function(RED) {
 
         function startHealthCheck() {
             const check = () => {
+                if (closed) return;
+                if (!updateListener) {
+                    healthCheckTimeout = setTimeout(check, 30000);
+                    return;
+                }
                 const listeners = RED.events.listeners("bldgblocks:global:value-changed");
                 const hasOurListener = listeners.includes(updateListener);
                 if (!hasOurListener) {
@@ -106,13 +112,14 @@ module.exports = function(RED) {
                         utils.setStatusOK(node, "Reconnected");
                     }
                 }
-                setTimeout(check, 30000);
+                healthCheckTimeout = setTimeout(check, 30000);
             };
-            setTimeout(check, 30000);
+            healthCheckTimeout = setTimeout(check, 30000);
         }
 
         function subscribeWithRetry() {
-            retryAction = () => {
+            function attempt() {
+                if (closed) return;
                 if (retryCount >= maxRetries) {
                     utils.sendError(node, null, null, "Connection failed");
                     return;
@@ -122,9 +129,9 @@ module.exports = function(RED) {
                     return; 
                 }
                 retryCount++;
-                setTimeout(retryAction, retryDelays[Math.min(retryCount, maxRetries - 1)]);
-            };
-            setTimeout(retryAction, retryDelays[0]);
+                retryTimeout = setTimeout(attempt, retryDelays[Math.min(retryCount, maxRetries - 1)]);
+            }
+            retryTimeout = setTimeout(attempt, retryDelays[0]);
         }
 
         // --- INPUT HANDLER ---
@@ -160,10 +167,18 @@ module.exports = function(RED) {
         }
 
         node.on('close', function(removed, done) {
-            if (healthCheckAction) clearInterval(healthCheckAction);
-            if (retryAction) clearInterval(retryAction);
-            if (removed && updateListener) {
+            closed = true;
+            if (healthCheckTimeout) {
+                clearTimeout(healthCheckTimeout);
+                healthCheckTimeout = null;
+            }
+            if (retryTimeout) {
+                clearTimeout(retryTimeout);
+                retryTimeout = null;
+            }
+            if (updateListener) {
                 RED.events.removeListener("bldgblocks:global:value-changed", updateListener);
+                updateListener = null;
             }
             done();
         });

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