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

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/nodes/or-block.js

@@ -48,7 +48,7 @@ module.exports = function(RED) {
                     node.inputs[slotVal.index - 1] = Boolean(msg.payload);
                     const result = node.inputs.some(v => v === true);
                     const isUnchanged = result === lastResult && node.inputs.every((v, i) => v === lastInputs[i]);
-                    const statusText = `in: [${node.inputs.join(", ")}], out: ${result}`;
+                    const statusText = `[${node.inputs.join(", ")}] -> ${result}`;
                     
                     // ================================================================
                     // Debounce: Suppress consecutive same outputs within 500ms

package/nodes/priority-block.js

@@ -174,7 +174,7 @@ module.exports = function(RED) {
             send(currentOutput);
             const inDisplay = typeof msg.payload === "number" ? msg.payload.toFixed(2) : typeof msg.payload === "object" ? JSON.stringify(msg.payload).slice(0, 20) : msg.payload;
             const outDisplay = currentOutput.payload === null ? "null" : typeof currentOutput.payload === "number" ? currentOutput.payload.toFixed(2) : currentOutput.payload;
-            const statusText = `in: ${inDisplay}, out: ${outDisplay}, slot: ${currentOutput.diagnostics.activePriority || "none"}`;
+            const statusText = `out: ${outDisplay}, slot: ${currentOutput.diagnostics.activePriority || "none"}`;
             utils.setStatusChanged(node, statusText);
 
             if (done) done();

package/nodes/tstat-block.html

@@ -63,6 +63,10 @@
         <input type="text" id="node-input-isHeating" style="width: auto; vertical-align: middle;">
         <input type="hidden" id="node-input-isHeatingType">
     </div>
+    <div class="form-row">
+        <label for="node-input-startupDelay" title="Seconds to suppress heating/cooling calls after deploy (0 = disabled)"><i class="fa fa-hourglass-start"></i> Startup Delay</label>
+        <input type="number" id="node-input-startupDelay" placeholder="30" min="0" step="1">
+    </div>
 </script>
 
 <script type="text/javascript">
@@ -94,7 +98,8 @@
             ignoreAnticipatorCycles: { value: "1" },
             ignoreAnticipatorCyclesType: { value: "num" },
             isHeating: { value: false },
-            isHeatingType: { value: "bool" }
+            isHeatingType: { value: "bool" },
+            startupDelay: { value: 30 }
         },
         inputs: 1,
         outputs: 3,
@@ -223,100 +228,50 @@
 </script>
 
 <script type="text/markdown" data-help-name="tstat-block">
-Thermostat controller for heating/cooling with single, split, or specified setpoint operation, hysteresis, and anticipation to prevent or allow overshoot for testing.
+Thermostat controller for heating/cooling with single, split, or specified setpoint operation, hysteresis, and anticipation.
 
 ### Inputs
-: context (string) : Configures node (`"algorithm"`, `"setpoint"`, `"heatingSetpoint"`, `"coolingSetpoint"`, `"coolingOn"`, `"coolingOff"`, `"heatingOff"`, `"heatingOn"`, `"diff"`, `"anticipator"`, `"ignoreAnticipatorCycles"`, `"isHeating"`, `"status"`).
-: payload (number | boolean | string) : Number for temperature or config values, boolean for `isHeating`, string for `algorithm` (`"single"`, `"split"`, `"specified"`).
+: payload (number) : Temperature reading.
+: isHeating (boolean) : Optional. Overrides the configured heating mode (typically wired from a changeover node).
 
 ### Outputs
-All output messages include a `msg.status` object containing runtime information
-: isHeating (boolean) : `true` for heating mode, `false` for cooling mode. Includes `msg.context = "isHeating"`.
-: above (boolean) : `true` if input exceeds cooling on threshold.
-: below (boolean) : `true` if input is below heating on threshold.
-: status (object) : Contains detailed runtime information including:
-  - `algorithm`: Current algorithm in use
-  - `input`: Current temperature input value
-  - `isHeating`: Current heating mode
-  - `above/below`: Current output states
-  - Algorithm-specific setpoints and values
-  - `modeChanged`: If mode recently changed
-  - `cyclesSinceModeChange`: Count since last mode change
-  - `effectiveAnticipator`: Current anticipator value after mode change adjustments
+: isHeating (boolean) : Output 1. Current heating mode. Includes `msg.context = "isHeating"`.
+: above (boolean) : Output 2. `true` when cooling call is active (temperature exceeded cooling threshold).
+: below (boolean) : Output 3. `true` when heating call is active (temperature dropped below heating threshold).
 
-### Status Monitoring
-All outputs include comprehensive status information in `msg.status`. Example:
-```json
-{
-  "status": {
-    "algorithm": "single",
-    "input": 68.5,
-    "isHeating": true,
-    "above": false,
-    "below": true,
-    "setpoint": 70,
-    "diff": 2,
-    "anticipator": 0.5,
-    "modeChanged": false,
-    "cyclesSinceModeChange": 3,
-    "effectiveAnticipator": 0.5
-  }
-}
-```
+All outputs include a `msg.status` object with runtime diagnostics: `algorithm`, `input`, `isHeating`, `above`, `below`, `activeSetpoint`, `onThreshold`, `offThreshold`, `diff`, `anticipator`, `effectiveAnticipator`, `modeChanged`, `cyclesSinceModeChange`.
 
 ### Algorithms
-- **Single Setpoint**:
-  - Uses `setpoint`, `diff`, and `anticipator`.
-  - Sets `above` if `input > setpoint + diff/2`, clears when `input < setpoint + anticipator`.
-  - Sets `below` if `input < setpoint - diff/2`, clears when `input > setpoint - anticipator`.
-  - For positive `anticipator`, stops early to prevent overshoot. For negative `anticipator` (testing only), delays turn-off to overshoot setpoint.
-  - Example: `setpoint=70`, `diff=2`, `anticipator=-0.5`, `above` if `input > 71`, clears at `< 69.5` (overshoots); `below` if `input < 69`, clears at `> 70.5` (overshoots).
-
-- **Split Setpoint**:
-  - Uses `heatingSetpoint`, `coolingSetpoint`, `diff`, and `anticipator`.
-  - For `isHeating = true`:
-    - Sets `below` if `input < heatingSetpoint - diff/2`, clears when `input > heatingSetpoint - anticipator`.
-    - `above` is `false`.
-  - For `isHeating = false`:
-    - Sets `above` if `input > coolingSetpoint + diff/2`, clears when `input < coolingSetpoint + anticipator`.
-    - `below` is `false`.
-  - Ensures `heatingSetpoint < coolingSetpoint`.
-  - For negative `anticipator`, delays turn-off (e.g., heating off above `heatingSetpoint`).
-  - Example: `heatingSetpoint=68`, `coolingSetpoint=74`, `diff=2`, `anticipator=-0.5`, heating mode sets `below` if `input < 67`, clears at `> 68.5`; cooling mode sets `above` if `input > 75`, clears at `< 73.5`.
 
-- **Specified Setpoint**:
-  - Uses `coolingOn`, `coolingOff`, `heatingOff`, `heatingOn`, and `anticipator`.
-  - For `isHeating = false`:
-    - Sets `above` if `input > coolingOn`, clears when `input < coolingOff + anticipator`.
-    - `below` is `false`.
-  - For `isHeating = true`:
-    - Sets `below` if `input < heatingOn`, clears when `input > heatingOff - anticipator`.
-    - `above` is `false`.
-  - Validates `coolingOn >= coolingOff >= heatingOff >= heatingOn`.
-  - For negative `anticipator`, delays turn-off (e.g., heating off above `heatingOff`).
-  - Example: `coolingOn=74`, `coolingOff=72`, `heatingOff=68`, `heatingOn=66`, `anticipator=-0.5`, cooling mode sets `above` if `input > 74`, clears at `< 71.5`; heating mode sets `below` if `input < 66`, clears at `> 68.5`.
+**Single** — One setpoint with differential hysteresis.
+- Heating: call ON when `temp < setpoint - diff/2`, OFF when `temp > setpoint - anticipator`
+- Cooling: call ON when `temp > setpoint + diff/2`, OFF when `temp < setpoint + anticipator`
 
-### Details
-Compares a numeric temperature input (`msg.payload`) against setpoints to control heating or cooling. 
+**Split** — Separate heating/cooling setpoints with differential.
+- Heating: call ON when `temp < heatingSetpoint - diff/2`, OFF when `temp > heatingSetpoint - anticipator`
+- Cooling: call ON when `temp > coolingSetpoint + diff/2`, OFF when `temp < coolingSetpoint + anticipator`
 
-The `differential` (`diff`) applies to the `single` and `split` setpoint algorithms, providing hysteresis. 
+**Specified** — Explicit on/off trigger temperatures.
+- Heating: call ON when `temp < heatingOn`, OFF when `temp > heatingOff - anticipator`
+- Cooling: call ON when `temp > coolingOn`, OFF when `temp < coolingOff + anticipator`
 
-The `anticipator` adjusts turn-off points: positive values stop early to prevent overshoot (subtracts for heating, adds for cooling); 
-negative values (allowed for testing, >= -2) delay turn-off to overshoot setpoint. 
+### Anticipator
+Positive values stop early to prevent overshoot. Negative values (≥ -2, testing only) delay turn-off to allow overshoot.
 
-The `isHeating` flag (typically from a changeover node) sets output 1 and selects the active setpoint(s).
+The `ignoreAnticipatorCycles` setting disables the anticipator for N cycles after a mode change to reduce short-cycling.
 
-The `ignoreAnticipatorCycles` setting allows ignoring the anticipator for a specified number of cycles after a mode change to reduce short-cycling. 
+### Startup Delay
+Configurable delay (default 30s, 0 = disabled) suppresses `above`/`below` calls after deployment. Prevents false calls before upstream mode selection has initialized. During delay, `isHeating` passes through normally and internal state is tracked. Status shows `[startup]` during suppression.
 
-All numeric inputs (`setpoint`, `heatingSetpoint`, `coolingSetpoint`, `coolingOn`, `coolingOff`, `heatingOff`, `heatingOn`, `diff`, `anticipator`, 
-`ignoreAnticipatorCycles`) support `num`, `msg`, `flow`, or `global` types via `typedInput`.
+### Configuration
+All numeric inputs support `num`, `msg`, `flow`, or `global` types via typed inputs. The `isHeating` flag supports `bool`, `msg`, `flow`, or `global`. Algorithm supports dropdown, `msg`, `flow`, or `global`.
 
 ### Status
-- Green (dot): Configuration updates (e.g., `setpoint: 70.0`, `anticipator: 0.5`, `isHeating: true`).
-- Blue (dot): Outputs when state changes (e.g., `in: 65.00, out: heating, above: false, below: true`).
-- Blue (ring): Outputs when state unchanged (e.g., `in: 66.00, out: heating, above: false, below: true`).
-- Red (ring): Errors (e.g., `missing input`, `invalid coolingOff`, `invalid diff, using 2`).
-- Yellow (ring): Warnings (e.g., `unknown context`).
+- Green (dot): Configuration update
+- Blue (dot): State changed
+- Blue (ring): State unchanged
+- Red (ring): Error
+- Yellow (ring): Warning / startup delay
 
 ### References
 - [Node-RED Documentation](https://nodered.org/docs/)