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

package/README.md

@@ -40,7 +40,7 @@ Search for the package name and add to your project.
 ```
 # Navigate to Node-RED user directory (varies by installation)
 - $ cd ~/.node-red
-- $ npm install node-red-contrib-buildingblocks-control
+- $ npm install node-red-contrib-control
 # then restart node-red
 ```
 

package/nodes/global-setter.js

@@ -96,19 +96,21 @@ module.exports = function(RED) {
                 //   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)
+                // Use local variable — never mutate node.writePriority so the config default is preserved across messages
+                let activePrioritySlot = null;
                 try {
-                    if (msg.hasOwnProperty("priority")) {
-                        // Source 1: msg.priority (direct number or "default")
+                    if (msg.hasOwnProperty("priority") && (typeof msg.priority === "number" || typeof msg.priority === "string")) {
+                        // Source 1: msg.priority (direct number or "default") — skip objects (e.g. priority array from state)
                         const mp = msg.priority;
                         if (mp === "default") {
-                            node.writePriority = "default";
+                            activePrioritySlot = "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);
+                            activePrioritySlot = String(p);
                         }
                     } else if (msg.hasOwnProperty("context") && typeof msg.context === "string") {
                         // Source 2: msg.context tagged-input ("priority8", "default", etc.)
@@ -116,21 +118,20 @@ module.exports = function(RED) {
                         const ctx = msg.context;
                         const priorityMatch = /^priority([1-9]|1[0-6])$/.exec(ctx);
                         if (priorityMatch) {
-                            node.writePriority = priorityMatch[1];
+                            activePrioritySlot = priorityMatch[1];
                         } else if (ctx === "default") {
-                            node.writePriority = "default";
+                            activePrioritySlot = "default";
+                        }
+                        // Other contexts (e.g. "reload") leave activePrioritySlot null → falls to config
+                    }
+
+                    // Source 3: Fall back to configured typed-input when no message override matched
+                    if (activePrioritySlot === null) {
+                        if (utils.requiresEvaluation(config.writePriorityType)) {
+                            activePrioritySlot = await utils.evaluateNodeProperty(config.writePriority, config.writePriorityType, node, msg);
+                        } else {
+                            activePrioritySlot = config.writePriority;
                         }
-                        // 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}`);
@@ -168,15 +169,15 @@ module.exports = function(RED) {
                 }
 
                 // Update State
-                if (node.writePriority === 'default') {
+                if (activePrioritySlot === 'default') {
                     state.defaultValue = inputValue === null || inputValue === "null" ? node.defaultValue : inputValue;
                 } else {
-                    const priority = parseInt(node.writePriority, 10);
+                    const priority = parseInt(activePrioritySlot, 10);
                     if (isNaN(priority) || priority < 1 || priority > 16) {
-                        return utils.sendError(node, msg, done, `Invalid priority: ${node.writePriority}`);
+                        return utils.sendError(node, msg, done, `Invalid priority: ${activePrioritySlot}`);
                     }
                     if (inputValue !== undefined) {
-                        state.priority[node.writePriority] = inputValue;
+                        state.priority[activePrioritySlot] = inputValue;
                     }
                 }
                 
@@ -196,9 +197,9 @@ module.exports = function(RED) {
                     if (node.storeName !== 'default') {
                         await utils.setGlobalState(node, node.varName, 'default', state);
                     }
-                    prefix = `${node.writePriority === 'default' ? '' : 'P'}`;
+                    prefix = `${activePrioritySlot === 'default' ? '' : 'P'}`;
                     const statePrefix = `${state.activePriority === 'default' ? '' : 'P'}`;
-                    const noChangeText = `no change: ${prefix}${node.writePriority}:${inputValue} > active: ${statePrefix}${state.activePriority}:${state.value}${state.units || ''}`;
+                    const noChangeText = `no change: ${prefix}${activePrioritySlot}:${inputValue} > active: ${statePrefix}${state.activePriority}:${state.value}${state.units || ''}`;
                     utils.setStatusUnchanged(node, noChangeText);
                     // Pass message through even if no context change
                     send({ ...state });
@@ -236,9 +237,9 @@ module.exports = function(RED) {
                     await utils.setGlobalState(node, node.varName, 'default', state);
                 }
 
-                prefix = `${node.writePriority === 'default' ? '' : 'P'}`;
+                prefix = `${activePrioritySlot === 'default' ? '' : 'P'}`;
                 const statePrefix = `${state.activePriority === 'default' ? '' : 'P'}`;
-                const statusText = `write: ${prefix}${node.writePriority}:${inputValue}${state.units || ''} > active: ${statePrefix}${state.activePriority}:${state.value}${state.units || ''}`;
+                const statusText = `write: ${prefix}${activePrioritySlot}:${inputValue}${state.units || ''} > active: ${statePrefix}${state.activePriority}:${state.value}${state.units || ''}`;
 
                 RED.events.emit("bldgblocks:global:value-changed", {
                     key: node.varName,

package/nodes/network-point-register.js

@@ -105,7 +105,7 @@ module.exports = function(RED) {
 
                 // Passthrough
                 const prefix = msg.activePriority === 'default' ? '' : 'P';
-                const statusText = `Passthrough: ${prefix}${msg.activePriority}:${msg.value}${msg.units}`;
+                const statusText = `Passthrough: ${prefix}${msg.activePriority}:${msg.value}${msg.units === null ? "" : ` ${msg.units}`}`;
                 utils.sendSuccess(node, msg, done, statusText, node.pointId, "ring");
 
             } catch (err) {

package/nodes/network-service-registry.html

@@ -29,6 +29,7 @@
                     <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;width:30px;" title="Writable"><i class="fa fa-pencil"></i></th>
                         <th style="padding:4px;">Path</th>
                         <th style="padding:4px;width:30px;"></th>
                     </tr>
@@ -106,7 +107,7 @@
                 $selectAll.prop('checked', false);
 
                 if (!points.length) {
-                    $tbody.append('<tr><td colspan="4" style="padding:8px;color:#999;">No points defined (deploy first if newly added)</td></tr>');
+                    $tbody.append('<tr><td colspan="5" style="padding:8px;color:#999;">No points defined (deploy first if newly added)</td></tr>');
                     $status.text("");
                     return;
                 }
@@ -141,6 +142,13 @@
 
                     const $tdId = $('<td>').css({ padding: '3px 4px' }).append($idInput);
 
+                    // Writable checkbox
+                    const $wrCb = $('<input type="checkbox" class="point-writable">')
+                        .prop('checked', !!pt.writable)
+                        .attr('data-original-writable', pt.writable ? '1' : '0')
+                        .attr('title', 'Allow network writes to this point');
+                    const $tdWr = $('<td>').css({ padding: '3px 4px', textAlign: 'center' }).append($wrCb);
+
                     // 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' })
@@ -157,7 +165,7 @@
                         });
                     const $tdBtn = $('<td>').css({ padding: '3px 4px' }).append($btn);
 
-                    $tr.append($tdCb, $tdId, $tdPath, $tdBtn);
+                    $tr.append($tdCb, $tdId, $tdWr, $tdPath, $tdBtn);
                     $tbody.append($tr);
                 });
 
@@ -267,11 +275,25 @@
                         changeCount++;
                     }
                 }
+
+                // Check writable change
+                const $wrCb = $(this).find('.point-writable');
+                const newWr = $wrCb.is(':checked');
+                const origWr = $wrCb.attr('data-original-writable') === '1';
+                if (newWr !== origWr) {
+                    const editorNode = RED.nodes.node(nid);
+                    if (editorNode) {
+                        editorNode.writable = newWr;
+                        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");
+                RED.notify(changeCount + " change" + (changeCount !== 1 ? "s" : "") + " applied. Deploy to take effect.", "success");
             }
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bldgblocks/node-red-contrib-control",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Sedona-inspired control nodes for Node-RED",
   "keywords": [
     "node-red",