nep-cli 0.1.8 → 0.2.0

package/bin/index.js

@@ -1,10 +1,11 @@
 #!/usr/bin/env node
 
 const { program } = require('commander');
+const { version } = require('../package.json');
 const os = require('os');
 const zmq = require("zeromq");
 var nep = require('nep-js');
-var nep_configuration = { current_port: 10000, IP: "127.0.0.1", brokers: {} }
+var nep_configuration = { current_port: 50200, IP: "0.0.0.0", brokers: {} }
 const { exec } = require('child_process');
 const { AutoComplete } = require('enquirer');
 
@@ -16,6 +17,52 @@ const socketIo = require('socket.io');
 const fs = require('fs');
 const zmqc = require("zeromq/v5-compat");
 
+const PORT_MASTER_INFO = 50001; // Default port for master info
+const PORT_IMAGES = [];
+for (let i = 50050; i <= 50060; i++) {
+  PORT_IMAGES.push(i);
+}
+
+
+program
+.version(version)
+.description('NEP-CLI')
+
+program
+.command('ip')
+.description('Display current Wi-Fi and Ethernet IP addresses of this computer')
+.action(() => {
+  try {
+    // subsitude by interfaces = nep.getNetworkInterfaces --> {"wifi":wifiInterfaces, "eth":ethernetInterface}
+    const platform = os.platform();
+    let wifiInterfaces, ethernetInterface;
+
+    if (platform === 'linux') {
+      wifiInterfaces = Object.keys(os.networkInterfaces()).filter(ifname => /^(wlan|wlp|wl|en)\d*$/i.test(ifname));
+      ethernetInterface = Object.keys(os.networkInterfaces()).find(ifname => /^(eth|enp|eno)\d*$/i.test(ifname));
+    } else if (platform === 'win32') {
+      wifiInterfaces = Object.keys(os.networkInterfaces()).filter(ifname => /^(Wireless|Wi-Fi)/i.test(ifname));
+      ethernetInterface = Object.keys(os.networkInterfaces()).find(ifname => /^Ethernet/i.test(ifname));
+    } else if (platform === 'darwin') {
+      wifiInterfaces = Object.keys(os.networkInterfaces()).filter(ifname => /^en\d*$/i.test(ifname));
+      ethernetInterface = Object.keys(os.networkInterfaces()).find(ifname => /^en\d*$/i.test(ifname));
+    } else {
+      console.log('Unsupported operating system.');
+      return;
+    }
+
+    wifiInterfaces.forEach(wifiInterface => {
+      const ipAddress = nep.getIPAddress(wifiInterface);
+      nep.printIPAddress(`Wi-Fi (${wifiInterface})`, ipAddress);
+    });
+
+    nep.printIPAddress('Ethernet', nep.getIPAddress(ethernetInterface));
+  } catch (error) {
+    console.error('An error occurred:', error.message);
+  }
+});
+
+
 
 // Node saved here
 var nodes_register = {};
@@ -24,7 +71,7 @@ var nodes_register = {};
 var topic_register = {};
 
 class MasterLocal {
-  constructor(IP = '127.0.0.1', port_ = 7000) {
+  constructor(IP = '0.0.0.0', port_ = 50000) {
     this.port = String(port_)
     var address = "tcp://" + IP + ":" + this.port
     console.log("New Master in: " + address)
@@ -136,7 +183,6 @@ var onNewTopic = function (node_request, topic_register) {
 }
 
 
-
 var createBroker = function (topic) {
   try {
     var broker = new Broker(nep_configuration["IP"], nep_configuration["current_port"] + 1, nep_configuration["current_port"])
@@ -206,97 +252,47 @@ var restartTopics = function (node_request) {
   onUpdateTopicList(topic_register)
 }
 
-var processMsg = function (json_msg, nodes_register, topic_register) {
-
-  let node_request = JSON.parse(json_msg)
-  console.log("NEP : Node request - node: " + node_request["node"] + ", socket: " + node_request["socket"] + ", topic: " + node_request["topic"])
+const processMsg = (json_msg, nodes_register, topic_register) => {
+  const node_request = JSON.parse(json_msg);
+  const { node, socket, topic, pid } = node_request;
+  console.log(`NEP: Node request - node: ${node}, socket: ${socket}, topic: ${topic}`);
 
   // Check node status
-  if ('node' in node_request) {
-
+  if (node) {
     // Kill previous node with the same name
-    if (node_request['node'] in nodes_register) {
-
-      console.log("--- Node *" + node_request['node'] + "* already defined ---")
-      var current_pid = nodes_register[node_request['node']]
-      if (node_request['pid'] === current_pid) {
-
-      }
-      else {
-        // TODO -- reset topics in node for graph
-        console.log("Kill node: " + node_request['node'])
-        nep.killNode(current_pid)
+    if (node in nodes_register) {
+      console.log(`--- Node *${node}* already defined ---`);
+      const current_pid = nodes_register[node];
+      if (pid !== current_pid) {
+        if (!node.startsWith('nep-cli')) {
+          // TODO: Reset topics in node for graph
+          console.log(`Kill node: ${node}`);
+          nep.killNode(current_pid);
+        }
       }
-    }
-    else {
-      console.log("--- New Node *" + node_request['node'] + "* ---")
+    } else {
+      console.log(`--- New Node *${node}* ---`);
     }
   }
 
   // Update node info
-  nodes_register[node_request['node']] = node_request['pid']
-  // Get topic name
-  var topic = String(node_request['topic'])
+  nodes_register[node] = pid;
+  
   // Check topic status
-  if (topic in topic_register) {
-    console.log("--- Topic *" + topic + "* already registered --- ")
-
+  const topicStr = String(topic);
+  if (topicStr in topic_register) {
+    console.log(`--- Topic *${topicStr}* already registered ---`);
     // Send information of topic already defined
-    var response = onRegisteredTopic(node_request, topic_register, topic)
-    return JSON.stringify(response)
-  }
-  else {
-    console.log(" --- New topic : *" + topic + "* ---")
+    const response = onRegisteredTopic(node_request, topic_register, topicStr);
+    return JSON.stringify(response);
+  } else {
+    console.log(`--- New topic: *${topicStr}* ---`);
     // Create new broker
-    var response = onNewTopic(node_request, topic_register);
-    return JSON.stringify(response)
+    const response = onNewTopic(node_request, topic_register);
+    return JSON.stringify(response);
   }
-}
-
-const PORT_MASTER_INFO = 7010; // Default port for master info
-const PORT_IMAGE = 3000;
-const PORT_IMAGES = [];
-for (let i = 3020; i <= 3040; i++) {
-  PORT_IMAGES.push(i);
-}
-
-
-program
-  .version('"0.1.2')
-  .description('NEP+ CLI');
-
-program
-  .command('ip')
-  .description('Display current Wi-Fi and Ethernet IP addresses of this computer')
-  .action(() => {
-    const interfaces = os.networkInterfaces();
-
-    // Find Wi-Fi interface
-    const wifiInterface = interfaces['Wi-Fi'] || interfaces['Wi-Fi 2'] || interfaces['wlan0'] || interfaces['wlo1'];
-    if (wifiInterface) {
-      const wifiIPv4 = wifiInterface.find(iface => iface.family === 'IPv4');
-      if (wifiIPv4) {
-        console.log(`Wi-Fi IP Address: ${wifiIPv4.address}`);
-      } else {
-        console.log('No Wi-Fi IPv4 address found.');
-      }
-    } else {
-      console.log('Wi-Fi interface not found.');
-    }
+};
 
-    // Find Ethernet interface
-    const ethernetInterface = interfaces['Ethernet'] || interfaces['Ethernet 2'] || interfaces['eth0'] || interfaces['イーサネット'] || interfaces['enp0s10'];
-    if (ethernetInterface) {
-      const ethernetIPv4 = ethernetInterface.find(iface => iface.family === 'IPv4');
-      if (ethernetIPv4) {
-        console.log(`Ethernet IP Address: ${ethernetIPv4.address}`);
-      } else {
-        console.log('No Ethernet IPv4 address found.');
-      }
-    } else {
-      console.log('Ethernet interface not found.');
-    }
-  });
 
 program
   .command('app')
@@ -365,7 +361,6 @@ program
   });
 
 
-
 program
   .command('master')
   .description('Start NEP master in localhost')
@@ -374,7 +369,7 @@ program
       var node = new nep.Node("nep-cli");
       console.log("Starting NEP master in terminal")
       var master = new MasterLocal();
-      var info = new nep.MasterInfoServer(IP = '127.0.0.1', topics = topic_register);
+      var info = new nep.MasterInfoServer(IP = '0.0.0.0', topics = topic_register, port_=PORT_MASTER_INFO);
     } catch (error) {
       if (error.message.includes('EADDRINUSE')) {
         console.error("Error: Address already in use. Another instance of NEP master might be running.");
@@ -384,78 +379,6 @@ program
     }
   });
 
-program
-  .command('master-wifi')
-  .description('Start NEP master in Wi-Fi network')
-  .action(async () => {
-
-    const interfaces = os.networkInterfaces();
-
-    // Find Wi-Fi interface
-    const wifiInterface = interfaces['Wi-Fi'] || interfaces['Wi-Fi 2'] || interfaces['wlan0'] || interfaces['wlo1'];
-    if (wifiInterface) {
-      const wifiIPv4 = wifiInterface.find(iface => iface.family === 'IPv4');
-      if (wifiIPv4) {
-        console.log(`Wi-Fi IP Address: ${wifiIPv4.address}`);
-        try {
-          var node = new nep.Node("nep-cli");
-          nep_configuration["IP"] = wifiIPv4.address;
-          var master = new MasterLocal(IP = wifiIPv4.address);
-          var info = new nep.MasterInfoServer(IP = wifiIPv4.address, topics = topic_register);
-        } catch (error) {
-          if (error.message.includes('EADDRINUSE')) {
-            console.error("Error: Address already in use. Another instance of NEP master might be running.");
-          } else {
-            console.error("An error occurred:", error.message);
-          }
-        }
-
-      } else {
-        console.log('No Wi-Fi IPv4 address found.');
-      }
-    } else {
-      console.log('Wi-Fi interface not found.');
-    }
-  });
-program
-  .command('master-eth')
-  .description('Start NEP master in Ethernet network')
-  .action(async () => {
-
-    const interfaces = os.networkInterfaces();
-
-    const ethernetInterface = interfaces['Ethernet'] || interfaces['Ethernet 2'] || interfaces['eth0'] || interfaces['イーサネット'] || interfaces['enp0s10'];
-    if (ethernetInterface) {
-      const ethernetIPv4 = ethernetInterface.find(iface => iface.family === 'IPv4');
-      if (ethernetIPv4) {
-        console.log(`Ethernet IP Address: ${ethernetIPv4.address}`);
-        var node = new nep.Node("nep-cli");
-        nep_configuration["IP"] = ethernetIPv4.address;
-        var master = new MasterLocal(IP = ethernetIPv4.address);
-        var info = new nep.MasterInfoServer(IP = ethernetIPv4.address, topics = topic_register);
-      } else {
-        console.log('No Ethernet IPv4 address found.');
-      }
-    } else {
-      console.log('Ethernet interface not found.');
-    }
-  });
-
-
-program
-  .command('master-ip <ip>')
-  .description('Start NEP master in some specific IP')
-  .action(async (ip) => {
-
-
-    console.log(`IP Address: ${ip}`);
-    var node = new nep.Node("nep-cli");
-    nep_configuration["IP"] = ip;
-    var master = new MasterLocal(IP = ip);
-    var info = new nep.MasterInfoServer(IP = ip, topics = topic_register);
-
-  });
-
 
 program
   .command('topics')
@@ -510,93 +433,6 @@ program
     await getTopics(); // Call the function to get topics
   });
 
-program
-  .command('topics-eth')
-  .description('Get list of NEP+ topics over Ethernet')
-  .action(async () => {
-    const interfaces = os.networkInterfaces();
-    const ethernetInterface = interfaces['Ethernet'] || interfaces['Ethernet 2'] || interfaces['eth0'] || interfaces['イーサネット'] || interfaces['enp0s10'];
-
-    if (ethernetInterface) {
-      const ethernetIPv4 = ethernetInterface.find(iface => iface.family === 'IPv4');
-      if (ethernetIPv4) {
-        const master_ip = ethernetIPv4.address;
-        console.log('Asking to NEP+ master in -', ethernetIPv4.address);
-        console.log("\n")
-        await getAndDisplayTopics(master_ip);
-      } else {
-        console.log('No Ethernet IPv4 address found.');
-      }
-    } else {
-      console.log('Ethernet interface not found.');
-    }
-  });
-
-
-program
-  .command('topics-wifi')
-  .description('Get list of NEP+ topics over Wi-Fi')
-  .action(async () => {
-    const interfaces = os.networkInterfaces();
-    const wifiInterface = interfaces['Wi-Fi'] || interfaces['Wi-Fi 2'] || interfaces['wlan0'] || interfaces['wlo1'];
-
-    if (wifiInterface) {
-      const wifiIPv4 = wifiInterface.find(iface => iface.family === 'IPv4');
-      if (wifiIPv4) {
-        const master_ip = wifiIPv4.address; // Set the Wi-Fi IP address dynamically
-        console.log('Asking to NEP+ master in -', wifiIPv4.address);
-        console.log("\n")
-        const TIMEOUT_DURATION = 5000;
-
-        async function getTopics() {
-          var requester = new zmq.Request();
-          requester.connect(`tcp://${master_ip}:${PORT_MASTER_INFO}`);
-
-          let msg = { "input": "topics" };
-          var message = JSON.stringify(msg);
-
-          try {
-            const responsePromise = new Promise(async (resolve, reject) => {
-              await requester.send(message);
-              const [result] = await requester.receive();
-              var results = JSON.parse(result.toString());
-              resolve(results);
-            });
-
-            const timeoutPromise = new Promise((resolve, reject) => {
-              setTimeout(() => {
-                reject(new Error("Timed out, NEP master over Wi-Fi was not found"));
-              }, TIMEOUT_DURATION);
-            });
-
-            const results = await Promise.race([responsePromise, timeoutPromise]);
-
-            if (results["state"] === "success") {
-              availableTopics = results["input"]; // Store the topics here
-              console.log("");
-              results["input"].forEach(element => {
-                console.log(element);
-              });
-            } else {
-              console.log("No topics yet");
-            }
-          } catch (error) {
-            console.error("Error:", error.message);
-          } finally {
-            process.exit();
-          }
-        }
-
-        await getTopics();
-
-      } else {
-        console.log('No Wi-Fi IPv4 address found.');
-      }
-    } else {
-      console.log('Wi-Fi interface not found.');
-    }
-  });
-
 
 program
   .command('listen <topic>')
@@ -648,9 +484,10 @@ program
     run();
   });
 
+
 program
-  .command('listen-eth <topic>')
-  .description('Subscribe to a NEP+ topic over Ethernet and display JSON messages')
+  .command('echo <topic>')
+  .description('Subscribe to a NEP+ topic and display raw string messages')
   .action(async (topic) => {
     const interfaces = os.networkInterfaces();
 
@@ -669,10 +506,11 @@ program
 
       var node = new nep.Node("nep-cli-sub");
       var conf = node.hybrid(master_ip);
-      sub = node.new_sub(topic, "json", callback, conf);
+      sub = node.new_sub(topic, "string", callback, conf);
     };
 
-    async function run(master_ip) {
+    var master_ip = "127.0.0.1";
+    async function run() {
       var requester = new zmq.Request();
       requester.connect("tcp://" + master_ip + ":" + PORT_MASTER_INFO);
 
@@ -694,461 +532,97 @@ program
       }
     }
 
-    // Find Ethernet interface
-    const ethernetInterface = interfaces['Ethernet'] || interfaces['Ethernet 2'] || interfaces['eth0'] || interfaces['イーサネット'] || interfaces['enp0s10'];
-    if (ethernetInterface) {
-      const ethernetIPv4 = ethernetInterface.find(iface => iface.family === 'IPv4');
-      if (ethernetIPv4) {
-        console.log(`Ethernet IP Address: ${ethernetIPv4.address}`);
-        run(ethernetIPv4.address)
-      } else {
-        console.log('No Ethernet IPv4 address found.');
-      }
-    } else {
-      console.log('Ethernet interface not found.');
-    }
+    run();
   });
 
+
 program
-  .command('listen-wifi <topic>')
-  .description('Subscribe to a NEP+ topic over Wi-Fi and display JSON messages')
-  .action(async (topic) => {
-    const interfaces = os.networkInterfaces();
+  .command('publish <topic> <message>')
+  .description('Publish a message to a NEP+ topic')
+  .action((topic, message) => {
 
-    var opensub = function (master_ip = "127.0.0.1") {
-      var callback = function (msg) {
-        var date = new Date();
-        var dateString = date.toISOString();
-        console.log(dateString);
+    var openpub = function (master_ip = "127.0.0.1") {
 
-        if (msg.length > 10000) {
-          console.log("the message is too long to be displayed");
-        } else {
-          console.log(msg);
-        }
-      };
+      var pubFunction = function () {
 
-      var node = new nep.Node("nep-cli-sub");
-      var conf = node.hybrid(master_ip);
-      sub = node.new_sub(topic, "json", callback, conf);
-    };
+        var msg = message.replace(/'/g, '"')
+        console.log(JSON.parse(msg))
+        pub.publish(JSON.parse(msg))
+        console.log("Message published")
 
-    async function run(master_ip) {
-      var requester = new zmq.Request();
-      requester.connect("tcp://" + master_ip + ":" + PORT_MASTER_INFO);
+        process.exit(1)
+      }
 
-      let msg = { "input": "topics" };
-      var message = JSON.stringify(msg);
-      await requester.send(message);
-      const [result] = await requester.receive();
-      var results = JSON.parse(result.toString());
 
-      if (results["state"] === "failure") {
-        console.log("Topic is not registered");
-      } else {
-        console.log("");
-        if (results["input"].includes(topic)) {
-          opensub(master_ip);
-        } else {
-          console.log("Topic is not registered");
-        }
-      }
+      var node = new nep.Node("nep-cli-pub")
+      var pub = node.new_pub(topic, "json")
+      setTimeout(pubFunction, 1000)
     }
 
-    const wifiInterface = interfaces['Wi-Fi'] || interfaces['Wi-Fi 2'] || interfaces['wlan0'] || interfaces['wlo1'];
-    if (wifiInterface) {
-      const wifiIPv4 = wifiInterface.find(iface => iface.family === 'IPv4');
-      if (wifiIPv4) {
-        run(wifiIPv4.address);
-      } else {
-        console.log('No Wi-Fi IPv4 address found.');
+    async function run() {
+      var requester = new zmq.Request;
+      var master_ip = "127.0.0.1"
+
+      requester.connect("tcp://" + master_ip + ":" + PORT_MASTER_INFO);
+
+      let msg = { "input": "topics" }
+      var message = JSON.stringify(msg);
+      await requester.send(message)
+      const [result] = await requester.receive()
+      var results = JSON.parse(result.toString())
+      //console.log(results);
+      if (results["input"].includes(topic)) {
+        console.log("")
+        openpub(master_ip)
+      }
+      else {
+        console.log("Topic is not registered");
       }
-    } else {
-      console.log('Wi-Fi interface not found.');
     }
+    run()
   });
 
 
 program
-  .command('echo <topic>')
-  .description('Subscribe to a NEP+ topic and display raw string messages')
-  .action(async (topic) => {
+  .command('hz <topic> <msg_type>')
+  .description('Monitor the publishing rate of a NEP+ topic in localhost')
+  .action(async (topic, msg_type) => {
     const interfaces = os.networkInterfaces();
+    const master_ip = "127.0.0.1"; // Change to the appropriate master IP
 
-    var opensub = function (master_ip = "127.0.0.1") {
-      var callback = function (msg) {
-        var date = new Date();
-        var dateString = date.toISOString();
-        console.log(dateString);
+    const opensub = function () {
+      const timestamps = []; // To store message timestamps
 
-        if (msg.length > 10000) {
-          console.log("the message is too long to be displayed");
-        } else {
-          console.log(msg);
+      const callback = function (msg) {
+        const date = new Date();
+        const timestamp = date.getTime();
+
+        timestamps.push(timestamp);
+
+        // Remove timestamps older than ten seconds
+        const tenSecondsAgo = timestamp - 10000;
+        while (timestamps[0] < tenSecondsAgo) {
+          timestamps.shift();
         }
       };
 
-      var node = new nep.Node("nep-cli-sub");
-      var conf = node.hybrid(master_ip);
-      sub = node.new_sub(topic, "string", callback, conf);
-    };
-
-    var master_ip = "127.0.0.1";
-    async function run() {
-      var requester = new zmq.Request();
-      requester.connect("tcp://" + master_ip + ":" + PORT_MASTER_INFO);
+      const allowedFormats = ["json", "msgpack", "bytes", "images", "image"];
+      const messageFormat = allowedFormats.includes(msg_type) ? msg_type : "json";
+      const node = new nep.Node("nep-cli-sub");
+      const conf = node.hybrid(master_ip);
 
-      let msg = { "input": "topics" };
-      var message = JSON.stringify(msg);
-      await requester.send(message);
-      const [result] = await requester.receive();
-      var results = JSON.parse(result.toString());
+      console.log("Topic:", topic)
+      console.log("Message type:", messageFormat)
 
-      if (results["state"] === "failure") {
-        console.log("Topic is not registered");
-      } else {
-        console.log("");
-        if (results["input"].includes(topic)) {
-          opensub(master_ip);
-        } else {
-          console.log("Topic is not registered");
-        }
-      }
-    }
+      const sub = node.new_sub(topic, messageFormat, callback, conf);
+      console.log("");
 
-    run();
-  });
-
-program
-  .command('echo-eth <topic>')
-  .description('Subscribe to a NEP+ topic over Ethernet and display raw string messages')
-  .action(async (topic) => {
-    const interfaces = os.networkInterfaces();
-
-    var opensub = function (master_ip = "127.0.0.1") {
-      var callback = function (msg) {
-        var date = new Date();
-        var dateString = date.toISOString();
-        console.log(dateString);
-
-        if (msg.length > 10000) {
-          console.log("the message is too long to be displayed");
-        } else {
-          console.log(msg);
-        }
-      };
-
-      var node = new nep.Node("nep-cli-sub");
-      var conf = node.hybrid(master_ip);
-      sub = node.new_sub(topic, "string", callback, conf);
-    };
-
-    async function run(master_ip) {
-      var requester = new zmq.Request();
-      requester.connect("tcp://" + master_ip + ":" + PORT_MASTER_INFO);
-
-      let msg = { "input": "topics" };
-      var message = JSON.stringify(msg);
-      await requester.send(message);
-      const [result] = await requester.receive();
-      var results = JSON.parse(result.toString());
-
-      if (results["state"] === "failure") {
-        console.log("Topic is not registered");
-      } else {
-        console.log("");
-        if (results["input"].includes(topic)) {
-          opensub(master_ip);
-        } else {
-          console.log("Topic is not registered");
-        }
-      }
-    }
-
-    // Find Ethernet interface
-    const ethernetInterface = interfaces['Ethernet'] || interfaces['Ethernet 2'] || interfaces['eth0'] || interfaces['イーサネット'] || interfaces['enp0s10'];
-    if (ethernetInterface) {
-      const ethernetIPv4 = ethernetInterface.find(iface => iface.family === 'IPv4');
-      if (ethernetIPv4) {
-        console.log(`Ethernet IP Address: ${ethernetIPv4.address}`);
-        run(ethernetIPv4.address)
-      } else {
-        console.log('No Ethernet IPv4 address found.');
-      }
-    } else {
-      console.log('Ethernet interface not found.');
-    }
-  });
-
-program
-  .command('echo-wifi <topic>')
-  .description('Subscribe to a NEP+ topic over Wi-Fi and display raw string messages')
-  .action(async (topic) => {
-    const interfaces = os.networkInterfaces();
-
-    var opensub = function (master_ip = "127.0.0.1") {
-      var callback = function (msg) {
-        var date = new Date();
-        var dateString = date.toISOString();
-        console.log(dateString);
-
-        if (msg.length > 10000) {
-          console.log("the message is too long to be displayed");
-        } else {
-          console.log(msg);
-        }
-      };
-
-      var node = new nep.Node("nep-cli-sub");
-      var conf = node.hybrid(master_ip);
-      sub = node.new_sub(topic, "string", callback, conf);
-    };
-
-    async function run(master_ip) {
-      var requester = new zmq.Request();
-      requester.connect("tcp://" + master_ip + ":" + PORT_MASTER_INFO);
-
-      let msg = { "input": "topics" };
-      var message = JSON.stringify(msg);
-      await requester.send(message);
-      const [result] = await requester.receive();
-      var results = JSON.parse(result.toString());
-
-      if (results["state"] === "failure") {
-        console.log("Topic is not registered");
-      } else {
-        console.log("");
-        if (results["input"].includes(topic)) {
-          opensub(master_ip);
-        } else {
-          console.log("Topic is not registered");
-        }
-      }
-    }
-
-    const wifiInterface = interfaces['Wi-Fi'] || interfaces['Wi-Fi 2'] || interfaces['wlan0'] || interfaces['wlo1'];
-    if (wifiInterface) {
-      const wifiIPv4 = wifiInterface.find(iface => iface.family === 'IPv4');
-      if (wifiIPv4) {
-        run(wifiIPv4.address);
-      } else {
-        console.log('No Wi-Fi IPv4 address found.');
-      }
-    } else {
-      console.log('Wi-Fi interface not found.');
-    }
-  });
-
-program
-  .command('publish <topic> <message>')
-  .description('Publish a message to a NEP+ topic')
-  .action((topic, message) => {
-
-    var openpub = function (master_ip = "127.0.0.1") {
-
-      var pubFunction = function () {
-
-        var msg = message.replace(/'/g, '"')
-        console.log(JSON.parse(msg))
-        pub.publish(JSON.parse(msg))
-        console.log("Message published")
-
-        process.exit(1)
-      }
-
-
-      var node = new nep.Node("nep-cli-pub")
-      var pub = node.new_pub(topic, "json")
-      setTimeout(pubFunction, 1000)
-    }
-
-    async function run() {
-      var requester = new zmq.Request;
-      var master_ip = "127.0.0.1"
-
-      requester.connect("tcp://" + master_ip + ":" + PORT_MASTER_INFO);
-
-      let msg = { "input": "topics" }
-      var message = JSON.stringify(msg);
-      await requester.send(message)
-      const [result] = await requester.receive()
-      var results = JSON.parse(result.toString())
-      //console.log(results);
-      if (results["input"].includes(topic)) {
-        console.log("")
-        openpub(master_ip)
-      }
-      else {
-        console.log("Topic is not registered");
-      }
-    }
-    run()
-  });
-
-program
-  .command('publish-eth <topic> <message>')
-  .description('Publish a JSON message to a NEP+ topic over Ethernet')
-  .action((topic, message) => {
-
-    const interfaces = os.networkInterfaces();
-
-    var openpub = function (master_ip = "127.0.0.1") {
-
-      var pubFunction = function () {
-
-        var msg = message.replace(/'/g, '"')
-        console.log(JSON.parse(msg))
-        pub.publish(JSON.parse(msg))
-        console.log("Message published")
-
-        process.exit(1)
-      }
-
-
-      var node = new nep.Node("nep-cli-pub")
-      var pub = node.new_pub(topic, "json")
-      setTimeout(pubFunction, 1000)
-    }
-
-    async function run(master_ip) {
-      var requester = new zmq.Request();
-      requester.connect(`tcp://${master_ip}:${PORT_MASTER_INFO}`);
-
-      let msg = { "input": "topics" };
-      var message = JSON.stringify(msg);
-
-
-      try {
-        await requester.send(message);
-        const [result] = await Promise.race([requester.receive(), timeoutPromise(5000)]); // Timeout of 5 seconds
-        var results = JSON.parse(result.toString());
-
-        if (results["input"].includes(topic)) {
-          console.log("");
-          openpub(master_ip);
-        } else {
-          console.log("Topic is not registered");
-        }
-      } catch (error) {
-        console.error("Error:", error.message);
-      } finally {
-        process.exit(1)
-      }
-    }
-
-    const ethernetInterface = interfaces['Ethernet'] || interfaces['Ethernet 2'] || interfaces['eth0'] || interfaces['イーサネット'] || interfaces['enp0s10'];
-    if (ethernetInterface) {
-      const ethernetIPv4 = ethernetInterface.find(iface => iface.family === 'IPv4');
-      if (ethernetIPv4) {
-        console.log(`Ethernet IP Address: ${ethernetIPv4.address}`);
-        run(ethernetIPv4.address)
-      } else {
-        console.log('No Ethernet IPv4 address found.');
-      }
-    } else {
-      console.log('Ethernet interface not found.');
-    }
-  });
-
-program
-  .command('publish-wifi <topic> <message>')
-  .description('Publish a JSON message to a NEP+ topic over Wi-Fi')
-  .action((topic, message) => {
-
-    const interfaces = os.networkInterfaces();
-
-    var openpub = function (master_ip = "127.0.0.1") {
-
-      var pubFunction = function () {
-
-        var msg = message.replace(/'/g, '"')
-        console.log(JSON.parse(msg))
-        pub.publish(JSON.parse(msg))
-        console.log("Message published")
-
-        process.exit(1)
-      }
-
-
-      var node = new nep.Node("nep-cli-pub")
-      var pub = node.new_pub(topic, "json")
-      setTimeout(pubFunction, 1000)
-    }
-
-    async function run(master_ip) {
-      var requester = new zmq.Request();
-      requester.connect(`tcp://${master_ip}:${PORT_MASTER_INFO}`);
-
-      let msg = { "input": "topics" };
-      var message = JSON.stringify(msg);
-
-
-      try {
-        await requester.send(message);
-        const [result] = await Promise.race([requester.receive(), timeoutPromise(5000)]); // Timeout of 5 seconds
-        var results = JSON.parse(result.toString());
-
-        if (results["input"].includes(topic)) {
-          console.log("");
-          openpub(master_ip);
-        } else {
-          console.log("Topic is not registered");
-        }
-      } catch (error) {
-        console.error("Error:", error.message);
-      } finally {
-        process.exit(1)
-      }
-    }
-    const wifiInterface = interfaces['Wi-Fi'] || interfaces['Wi-Fi 2'] || interfaces['wlan0'] || interfaces['wlo1'];
-    if (wifiInterface) {
-      const wifiIPv4 = wifiInterface.find(iface => iface.family === 'IPv4');
-      if (wifiIPv4) {
-        console.log(`Wi-Fi IP Address: ${wifiIPv4.address}`);
-        run(wifiIPv4.address)
-      } else {
-        console.log('No Wi-Fi IPv4 address found.');
-      }
-    } else {
-      console.log('Wi-Fi interface not found.');
-    }
-  });
-
-
-program
-  .command('hz <topic>')
-  .description('Monitor the publishing rate of a NEP+ topic in localhost')
-  .action(async (topic) => {
-    const interfaces = os.networkInterfaces();
-    const master_ip = "127.0.0.1"; // Change to the appropriate master IP
-
-    const opensub = function () {
-      const timestamps = []; // To store message timestamps
-
-      const callback = function (msg) {
-        const date = new Date();
-        const timestamp = date.getTime();
-
-        timestamps.push(timestamp);
-
-        // Remove timestamps older than ten seconds
-        const tenSecondsAgo = timestamp - 10000;
-        while (timestamps[0] < tenSecondsAgo) {
-          timestamps.shift();
-        }
-      };
-
-      const messageFormat = topic.endsWith("/image") ? "string" : "string";
-      const node = new nep.Node("nep-cli-sub");
-      const conf = node.hybrid(master_ip);
-      const sub = node.new_sub(topic, messageFormat, callback, conf);
-
-      setInterval(() => {
-        // Calculate statistics for the last 10 seconds
-        const now = Date.now();
-        const tenSecondsAgo = now - 10000;
-        const recentTimestamps = timestamps.filter((ts) => ts > tenSecondsAgo);
-        const rate = recentTimestamps.length / 10; // Messages per second for a 10-second window
+      setInterval(() => {
+        // Calculate statistics for the last 10 seconds
+        const now = Date.now();
+        const tenSecondsAgo = now - 10000;
+        const recentTimestamps = timestamps.filter((ts) => ts > tenSecondsAgo);
+        const rate = recentTimestamps.length / 10; // Messages per second for a 10-second window
 
         console.log("Average rate:", rate.toFixed(2), "Hz");
         console.log("Min:", (10 / Math.max(rate, 0.1)).toFixed(2), "s");
@@ -1213,223 +687,6 @@ program
   });
 
 
-program
-  .command('hz-wifi <topic>')
-  .description('Monitor the publishing rate of a NEP+ topic over Wi-Fi')
-  .action(async (topic) => {
-    const interfaces = os.networkInterfaces();
-
-
-    const opensub = function (master_ip) {
-      const timestamps = []; // To store message timestamps
-
-      const callback = function (msg) {
-        const date = new Date();
-        const timestamp = date.getTime();
-
-        timestamps.push(timestamp);
-
-        // Remove timestamps older than ten seconds
-        const tenSecondsAgo = timestamp - 10000;
-        while (timestamps[0] < tenSecondsAgo) {
-          timestamps.shift();
-        }
-      };
-
-      const messageFormat = topic.endsWith("/image") ? "string" : "string";
-      const node = new nep.Node("nep-cli-sub");
-      const conf = node.hybrid(master_ip);
-      const sub = node.new_sub(topic, messageFormat, callback, conf);
-
-      setInterval(() => {
-        // Calculate statistics for the last 10 seconds
-        const now = Date.now();
-        const tenSecondsAgo = now - 10000;
-        const recentTimestamps = timestamps.filter((ts) => ts > tenSecondsAgo);
-        const rate = recentTimestamps.length / 10; // Messages per second for a 10-second window
-
-        console.log("Average rate:", rate.toFixed(2), "Hz");
-        console.log("Min:", (10 / Math.max(rate, 0.1)).toFixed(2), "s");
-        console.log("Max:", (10 / Math.min(rate, 10)).toFixed(2), "s");
-        console.log("Std dev:", calculateStdDev(recentTimestamps, now).toFixed(2), "s");
-        console.log("Window:", recentTimestamps.length);
-        console.log("");
-      }, 1000);
-    };
-
-    const calculateStdDev = (timestamps) => {
-      if (timestamps.length < 2) {
-        return 0; // Standard deviation is not meaningful with less than two timestamps
-      }
-
-      // Calculate the time intervals between consecutive timestamps
-      const timeIntervals = [];
-      for (let i = 1; i < timestamps.length; i++) {
-        const interval = timestamps[i] - timestamps[i - 1];
-        timeIntervals.push(interval);
-      }
-
-      // Calculate the mean (average) of the time intervals
-      const mean = timeIntervals.reduce((acc, val) => acc + val, 0) / timeIntervals.length;
-
-      // Calculate the squared differences from the mean
-      const squaredDifferences = timeIntervals.map((interval) => Math.pow(interval - mean, 2));
-
-      // Calculate the mean of the squared differences
-      const meanSquaredDifference = squaredDifferences.reduce((acc, val) => acc + val, 0) / squaredDifferences.length;
-
-      // Calculate the square root of the mean squared difference
-      const stdDeviation = Math.sqrt(meanSquaredDifference);
-
-      return stdDeviation;
-    };
-
-
-    async function run(master_ip) {
-      const requester = new zmq.Request();
-      requester.connect(`tcp://${master_ip}:${PORT_MASTER_INFO}`);
-
-      const msg = { "input": "topics" };
-      const message = JSON.stringify(msg);
-      await requester.send(message);
-      const [result] = await requester.receive();
-      const results = JSON.parse(result.toString());
-
-      if (results["state"] === "failure") {
-        console.log("Topic is not registered, use *nep topics* to see the list of avaliable topics");
-      } else {
-        console.log("");
-        if (results["input"].includes(topic)) {
-          opensub(master_ip);
-        } else {
-          console.log("Topic is not registered, use *nep topics* to see the list of avaliable topics");
-        }
-      }
-    }
-
-    const wifiInterface = interfaces['Wi-Fi'] || interfaces['Wi-Fi 2'] || interfaces['wlan0'] || interfaces['wlo1'];
-    if (wifiInterface) {
-      const wifiIPv4 = wifiInterface.find(iface => iface.family === 'IPv4');
-      if (wifiIPv4) {
-        console.log(`Wi-Fi IP Address: ${wifiIPv4.address}`);
-        run(wifiIPv4.address)
-      } else {
-        console.log('No Wi-Fi IPv4 address found.');
-      }
-    } else {
-      console.log('Wi-Fi interface not found.');
-    }
-  });
-
-program
-  .command('hz-eth <topic>')
-  .description('Monitor the publishing rate of a NEP+ topic over Ethernet')
-  .action(async (topic) => {
-    const interfaces = os.networkInterfaces();
-
-
-    const opensub = function (master_ip) {
-      const timestamps = []; // To store message timestamps
-
-      const callback = function (msg) {
-        const date = new Date();
-        const timestamp = date.getTime();
-
-        timestamps.push(timestamp);
-
-        // Remove timestamps older than ten seconds
-        const tenSecondsAgo = timestamp - 10000;
-        while (timestamps[0] < tenSecondsAgo) {
-          timestamps.shift();
-        }
-      };
-
-      const messageFormat = topic.endsWith("/image") ? "string" : "string";
-      const node = new nep.Node("nep-cli-sub");
-      const conf = node.hybrid(master_ip);
-      const sub = node.new_sub(topic, messageFormat, callback, conf);
-
-      setInterval(() => {
-        // Calculate statistics for the last 10 seconds
-        const now = Date.now();
-        const tenSecondsAgo = now - 10000;
-        const recentTimestamps = timestamps.filter((ts) => ts > tenSecondsAgo);
-        const rate = recentTimestamps.length / 10; // Messages per second for a 10-second window
-
-        console.log("Average rate:", rate.toFixed(2), "Hz");
-        console.log("Min:", (10 / Math.max(rate, 0.1)).toFixed(2), "s");
-        console.log("Max:", (10 / Math.min(rate, 10)).toFixed(2), "s");
-        console.log("Std dev:", calculateStdDev(recentTimestamps, now).toFixed(2), "s");
-        console.log("Window:", recentTimestamps.length);
-        console.log("");
-      }, 1000);
-    };
-
-    const calculateStdDev = (timestamps) => {
-      if (timestamps.length < 2) {
-        return 0; // Standard deviation is not meaningful with less than two timestamps
-      }
-
-      // Calculate the time intervals between consecutive timestamps
-      const timeIntervals = [];
-      for (let i = 1; i < timestamps.length; i++) {
-        const interval = timestamps[i] - timestamps[i - 1];
-        timeIntervals.push(interval);
-      }
-
-      // Calculate the mean (average) of the time intervals
-      const mean = timeIntervals.reduce((acc, val) => acc + val, 0) / timeIntervals.length;
-
-      // Calculate the squared differences from the mean
-      const squaredDifferences = timeIntervals.map((interval) => Math.pow(interval - mean, 2));
-
-      // Calculate the mean of the squared differences
-      const meanSquaredDifference = squaredDifferences.reduce((acc, val) => acc + val, 0) / squaredDifferences.length;
-
-      // Calculate the square root of the mean squared difference
-      const stdDeviation = Math.sqrt(meanSquaredDifference);
-
-      return stdDeviation;
-    };
-
-
-    async function run(master_ip) {
-      const requester = new zmq.Request();
-      requester.connect(`tcp://${master_ip}:${PORT_MASTER_INFO}`);
-
-      const msg = { "input": "topics" };
-      const message = JSON.stringify(msg);
-      await requester.send(message);
-      const [result] = await requester.receive();
-      const results = JSON.parse(result.toString());
-
-      if (results["state"] === "failure") {
-        console.log("Topic is not registered, use *nep topics* to see the list of avaliable topics");
-      } else {
-        console.log("");
-        if (results["input"].includes(topic)) {
-          opensub(master_ip);
-        } else {
-          console.log("Topic is not registered, use *nep topics* to see the list of avaliable topics");
-        }
-      }
-    }
-
-    const ethernetInterface = interfaces['Ethernet'] || interfaces['Ethernet 2'] || interfaces['eth0'] || interfaces['イーサネット'] || interfaces['enp0s10'];
-    if (ethernetInterface) {
-      const ethernetIPv4 = ethernetInterface.find(iface => iface.family === 'IPv4');
-      if (ethernetIPv4) {
-        console.log(`Ethernet IP Address: ${ethernetIPv4.address}`);
-        run(ethernetIPv4.address)
-      } else {
-        console.log('No Ethernet IPv4 address found.');
-      }
-    } else {
-      console.log('Ethernet interface not found.');
-    }
-  });
-
-
 program
   .command('docs')
   .description('Open the NEP+ documentation in the default browser')
@@ -1444,107 +701,6 @@ program
     }
   });
 
-function timeoutPromise(ms) {
-  return new Promise((resolve, reject) => {
-    setTimeout(() => {
-      reject(new Error("Request timed out"));
-    }, ms);
-  });
-}
-
-function timeoutPromise(ms) {
-  return new Promise((resolve, reject) => {
-    setTimeout(() => {
-      reject(new Error("Request timed out"));
-    }, ms);
-  });
-}
-
-async function getAndDisplayTopics(master_ip) {
-  const TIMEOUT_DURATION = 5000;
-
-  var requester = new zmq.Request();
-  requester.connect(`tcp://${master_ip}:${PORT_MASTER_INFO}`);
-
-  let msg = { "input": "topics" };
-  var message = JSON.stringify(msg);
-
-  try {
-    const responsePromise = new Promise(async (resolve, reject) => {
-      await requester.send(message);
-      const [result] = await requester.receive();
-      var results = JSON.parse(result.toString());
-      resolve(results);
-    });
-
-    const timeoutPromise = new Promise((resolve, reject) => {
-      setTimeout(() => {
-        reject(new Error("Timed out, NEP master over Wi-Fi was not found"));
-      }, TIMEOUT_DURATION);
-    });
-
-    const results = await Promise.race([responsePromise, timeoutPromise]);
-
-    if (results["state"] === "success") {
-      availableTopics = results["input"];
-      console.log("");
-      results["input"].forEach(element => {
-        console.log(element);
-      });
-    } else {
-      console.log("No topics yet");
-    }
-  } catch (error) {
-    console.error("Error:", error.message);
-  } finally {
-    process.exit();
-  }
-}
-
-
-
-
-async function getAndDisplayTopics(master_ip) {
-  const TIMEOUT_DURATION = 5000;
-
-  var requester = new zmq.Request();
-  requester.connect(`tcp://${master_ip}:${PORT_MASTER_INFO}`);
-
-  let msg = { "input": "topics" };
-  var message = JSON.stringify(msg);
-
-  try {
-    const responsePromise = new Promise(async (resolve, reject) => {
-      await requester.send(message);
-      const [result] = await requester.receive();
-      var results = JSON.parse(result.toString());
-      resolve(results);
-    });
-
-    const timeoutPromise = new Promise((resolve, reject) => {
-      setTimeout(() => {
-        reject(new Error("Timed out, NEP master over Ethernet was not found"));
-      }, TIMEOUT_DURATION);
-    });
-
-    const results = await Promise.race([responsePromise, timeoutPromise]);
-
-    if (results["state"] === "success") {
-      availableTopics = results["input"];
-      console.log("");
-      results["input"].forEach(element => {
-        console.log(element);
-      });
-    } else {
-      console.log("No topics yet");
-    }
-  } catch (error) {
-    console.error("Error:", error.message);
-  } finally {
-    process.exit();
-  }
-}
-
 
 program.parse(process.argv);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nep-cli",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "main": "./lib/nep.js",
   "bin": {
     "nep": "./bin/index.js"
@@ -14,9 +14,9 @@
     "express": "^4.18.2",
     "fix-path": "^2.1.0",
     "inquirer": "^9.2.10",
-    "nep-js": "^0.3.0",
+    "nep-js": "0.3.7",
     "open": "7.4.2",
     "socket.io": "^4.7.2",
-    "zeromq": "6.0.0-beta.6"
+    "zeromq": "6.0.0-beta.19"
   }
 }