xilica-subscribe node rules and text box changed

nodes/xilica-subscribe.js

@@ -1,76 +1,53 @@
 module.exports = function (RED) {
-  function buildNamesFromList(targets) {
-    return targets
-      .split(/\r?\n/)
-      .map((l) => l.trim())
-      .filter((l) => l.length > 0);
-  }
-
-  function buildNamesStartsWith(targets, startIndex, endIndex) {
-    const prefixes = buildNamesFromList(targets);
+  function buildControlNamesFromRules(rules) {
     const names = [];
-    if (startIndex > endIndex) {
-      const tmp = startIndex;
-      startIndex = endIndex;
-      endIndex = tmp;
+    if (!Array.isArray(rules)) {
+      return names;
     }
-    prefixes.forEach((prefix) => {
-      for (let i = startIndex; i <= endIndex; i += 1) {
-        names.push(prefix + i);
-      }
-    });
-    return names;
-  }
 
-  function buildNamesEndsWith(targets, startIndex, endIndex) {
-    const suffixes = buildNamesFromList(targets);
-    const names = [];
-    if (startIndex > endIndex) {
-      const tmp = startIndex;
-      startIndex = endIndex;
-      endIndex = tmp;
-    }
-    suffixes.forEach((suffix) => {
-      for (let i = startIndex; i <= endIndex; i += 1) {
-        names.push(String(i) + suffix);
-      }
-    });
-    return names;
-  }
-
-  function buildNamesStartsAndEnds(targets, startIndex, endIndex) {
-    const patterns = buildNamesFromList(targets);
-    const names = [];
-    if (startIndex > endIndex) {
-      const tmp = startIndex;
-      startIndex = endIndex;
-      endIndex = tmp;
-    }
-    patterns.forEach((pattern) => {
-      const parts = pattern.split("|");
-      const prefix = (parts[0] || "").trim();
-      const suffix = (parts[1] || "").trim();
-      if (!prefix && !suffix) {
+    rules.forEach((rule) => {
+      if (!rule) {
         return;
       }
-      for (let i = startIndex; i <= endIndex; i += 1) {
-        names.push(prefix + i + suffix);
+
+      const type = (rule.t || rule.type || "eq").toString();
+
+      if (type === "idx") {
+        const base = (rule.v || rule.base || "").trim();
+        if (!base) {
+          return;
+        }
+
+        let from = parseInt(rule.from, 10);
+        let to = parseInt(rule.to, 10);
+
+        if (Number.isNaN(from) && Number.isNaN(to)) {
+          return;
+        }
+        if (Number.isNaN(from)) {
+          from = to;
+        }
+        if (Number.isNaN(to)) {
+          to = from;
+        }
+        if (from > to) {
+          const tmp = from;
+          from = to;
+          to = tmp;
+        }
+
+        for (let i = from; i <= to; i += 1) {
+          names.push(base + i);
+        }
+      } else {
+        const name = (rule.v || rule.value || "").trim();
+        if (name) {
+          names.push(name);
+        }
       }
     });
-    return names;
-  }
 
-  function buildControlNames(mode, targets, startIndex, endIndex) {
-    if (mode === "startsWith") {
-      return buildNamesStartsWith(targets, startIndex, endIndex);
-    }
-    if (mode === "endsWith") {
-      return buildNamesEndsWith(targets, startIndex, endIndex);
-    }
-    if (mode === "startsAndEnds") {
-      return buildNamesStartsAndEnds(targets, startIndex, endIndex);
-    }
-    return buildNamesFromList(targets);
+    return names;
   }
 
   function normaliseAction(action) {
@@ -86,10 +63,7 @@ module.exports = function (RED) {
     const node = this;
 
     node.action = config.action || "subscribe";
-    node.mode = config.mode || "list";
-    node.targets = config.targets || "";
-    node.startIndex = parseInt(config.startIndex, 10) || 1;
-    node.endIndex = parseInt(config.endIndex, 10) || node.startIndex;
+    node.rules = Array.isArray(config.rules) ? config.rules : [];
     node.transport = config.transport || "TCP";
 
     node.on("input", (msg, send, done) => {
@@ -101,37 +75,17 @@ module.exports = function (RED) {
       done = done || function () {};
 
       const action = normaliseAction(msg.action || node.action);
-      const mode = (msg.mode || node.mode || "list").toString();
-
-      const targets =
-        typeof msg.targets === "string" && msg.targets.trim().length
-          ? msg.targets
-          : node.targets;
-
-      let startIndex = node.startIndex;
-      let endIndex = node.endIndex;
-      if (Object.prototype.hasOwnProperty.call(msg, "startIndex")) {
-        const v = parseInt(msg.startIndex, 10);
-        if (!Number.isNaN(v)) {
-          startIndex = v;
-        }
-      }
-      if (Object.prototype.hasOwnProperty.call(msg, "endIndex")) {
-        const v = parseInt(msg.endIndex, 10);
-        if (!Number.isNaN(v)) {
-          endIndex = v;
-        }
-      }
+      const rules = Array.isArray(msg.rules) ? msg.rules : node.rules;
 
       const transport =
         typeof msg.transport === "string" && msg.transport.trim().length
           ? msg.transport.trim()
           : node.transport;
 
-      const names = buildControlNames(mode, targets || "", startIndex, endIndex);
+      const names = buildControlNamesFromRules(rules);
 
       if (!names.length) {
-        node.warn("xilica-subscribe: no targets defined");
+        node.warn("xilica-subscribe: no rules defined");
         send(msg);
         done();
         return;
@@ -150,4 +104,3 @@ module.exports = function (RED) {
 
   RED.nodes.registerType("xilica-subscribe", XilicaSubscribe);
 };
-