nep-cli 0.2.0 → 0.2.2

package/bin/index.js

@@ -18,49 +18,47 @@ 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);
-}
+const PORT_SERVER = 50050;
+
 
 
 program
-.version(version)
-.description('NEP-CLI')
+  .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;
-    }
+  .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);
-    });
+      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);
-  }
-});
+      nep.printIPAddress('Ethernet', nep.getIPAddress(ethernetInterface));
+    } catch (error) {
+      console.error('An error occurred:', error.message);
+    }
+  });
 
 
 
@@ -122,28 +120,6 @@ var onRegisteredTopic = function (node_request, topic_register, topic) {
 }
 
 
-var onResetTopic = function (node_request) {
-
-  var topic = node_request["topic"]
-  nep_configuration["current_port"] = Math.max(nep_configuration["current_port"], node_request["port"] + 2);
-
-  if (node_request["socket"] === "publisher" || node_request["socket"] === "subscriber") {
-    // Create new broker for many2many communication
-    if (node_request["mode"] === "many2many") {
-      restartBroker(node_request["topic"], node_request["port"]);
-    }
-
-    if ("msg_type" in node_request) {
-      topic_register[topic] = { "port": node_request["port"], "socket": node_request["socket"], 'ip': nep_configuration["IP"], "mode": node_request["mode"], "msg_type": node_request["msg_type"] }
-    }
-    else {
-      topic_register[topic] = { "port": node_request["port"], "socket": node_request["socket"], 'ip': nep_configuration["IP"], "mode": node_request["mode"], "msg_type": "json" }
-    }
-
-    topic_register[topic]["nodes"] = [];
-  }
-
-}
 
 var onNewTopic = function (node_request, topic_register) {
 
@@ -199,16 +175,6 @@ var createBroker = function (topic) {
   }
 }
 
-var restartBroker = function (topic, port) {
-  try {
-    var broker = new nep.Broker(nep_configuration["IP"], port + 1, port)
-    //var brokersubex = new BrokerBridgeSUBEX(conf["IP"],IP_EXTERNAL, conf["current_port"] , conf["current_port"])
-    // Add broker defined to list of brokers
-    nep_configuration["brokers"][topic] = broker
-  } catch (error) {
-    console.log("NEP ERROR: ports " + String(port) + " and " + String(port + 1) + " not avaliable")
-  }
-}
 
 var m2mResponse = function (node_request, topic_register, topic) {
   if ("msg_type" in node_request) {
@@ -241,17 +207,6 @@ var updatePID = function (node_request, topic_register, topic) {
 }
 
 
-var restartTopics = function (node_request) {
-  console.log(node_request)
-  // Get topic name
-  var topic = String(node_request['topic'])
-
-  console.log(" --- Reset topic : *" + topic + "* ---")
-  // Create new broker
-  onResetTopic(node_request);
-  onUpdateTopicList(topic_register)
-}
-
 const processMsg = (json_msg, nodes_register, topic_register) => {
   const node_request = JSON.parse(json_msg);
   const { node, socket, topic, pid } = node_request;
@@ -277,7 +232,7 @@ const processMsg = (json_msg, nodes_register, topic_register) => {
 
   // Update node info
   nodes_register[node] = pid;
-  
+
   // Check topic status
   const topicStr = String(topic);
   if (topicStr in topic_register) {
@@ -293,6 +248,145 @@ const processMsg = (json_msg, nodes_register, topic_register) => {
   }
 };
 
+function startShowServer(port, topic, ip) {
+  const app = express();
+  const server = http.createServer(app);
+  const io = socketIo(server);
+  const path = require('path');
+
+  // Serve static files from node_modules
+  app.use(express.static(path.join(__dirname)));
+
+
+  const node = new nep.Node("nep-cli-sub");
+  const config = node.hybrid(ip)
+
+  function getImage(msg) {
+    // Send the received image data as-is to connected clients
+    io.sockets.emit('image', { image: msg });
+  }
+
+  const sub = node.new_sub(topic, "images", getImage, config);
+
+  app.get('/', (req, res) => {
+    res.sendFile(path.join(__dirname, './image.html')); // Serve your HTML file
+  });
+
+  server.listen(port, () => {
+    console.log(`Server is running on http://localhost:${port}`);
+  }).on('error', err => {
+    console.error(`Error starting server: ${err}`);
+  });
+
+  io.on('connection', (socket) => {
+    const frameRate = 30; // Desired frame rate
+    const interval = 1000 / frameRate; // Interval between frames
+  }).on('error', err => {
+    console.error(`Error with socket connection: ${err}`);
+  });
+}
+
+function startJsonServer(port, topic, ip, msg_type = "json") {
+  const app = express();
+  const server = http.createServer(app);
+  const io = socketIo(server);
+  const path = require('path');
+  app.use(express.static(path.join(__dirname)));
+
+  const node = new nep.Node("nep-cli-sub");
+  const config = node.hybrid(ip)
+
+  function getJSON(msg) {
+    try {
+
+      io.sockets.emit('json_data', msg);
+    } catch (error) {
+
+    }
+  }
+
+  const sub = node.new_sub(topic, msg_type, getJSON, config);
+
+  app.get('/', (req, res) => {
+    res.sendFile(path.join(__dirname, './json.html')); // Serve your HTML file
+  });
+
+  server.listen(port, () => {
+    console.log(`Server is running on http://localhost:${port}`);
+  }).on('error', err => {
+    console.error(`Error starting server: ${err}`);
+  });
+
+  io.on('connection', (socket) => {
+    const frameRate = 30; // Desired frame rate
+    const interval = 1000 / frameRate; // Interval between frames
+  }).on('error', err => {
+    console.error(`Error with socket connection: ${err}`);
+  });
+}
+
+
+const createRequester = (master_ip, port) => {
+  const requester = new zmq.Request();
+  requester.connect(`tcp://${master_ip}:${port}`);
+  return requester;
+};
+
+const sendRequest = async (requester, msg) => {
+  const message = JSON.stringify(msg);
+  await requester.send(message);
+  const [result] = await requester.receive();
+  return JSON.parse(result.toString());
+};
+
+const selectTopic = async (results, topic) => {
+  if (!topic || !results["input"].includes(topic)) {
+    const autoComplete = new AutoComplete({
+      name: 'topic',
+      message: !topic ? 'Select a topic:' : 'Invalid topic. Select a valid topic:',
+      choices: results["input"],
+    });
+    topic = await autoComplete.run();
+  }
+  return topic;
+};
+
+const selectIndex = async (index, maxIndex = 9) => {
+  const choices = ["0","1","2","3","4","5","6","7","8","9"];
+
+  const autoComplete = new AutoComplete({
+    name: 'index',
+    message: !index ? 'Select a index:' : 'Invalid index. Select a valid index:',
+    choices: choices,
+  });
+  index = await autoComplete.run();
+
+  return index;
+};
+
+const selectMsgType = async (allowedFormats, msg_type, topic) => {
+  var msgType = topic.split('/').pop();
+  if (msgType && msgType !== topic) {
+    msg_type = msgType;
+  }
+
+  if (!msg_type || !allowedFormats.includes(msg_type)) {
+    const autoComplete = new AutoComplete({
+      name: 'msg_type',
+      message: !msg_type ? 'Select a message type:' : `Select a valid format:`,
+      choices: allowedFormats,
+    });
+    msg_type = await autoComplete.run();
+  }
+  return msg_type;
+};
+
+const openSub = (master_ip, topic, msg_type, callback) => {
+  const node = new nep.Node("nep-cli-sub");
+  const conf = node.hybrid(master_ip);
+  const sub = node.new_sub(topic, msg_type, callback, conf);
+};
+
 
 program
   .command('app')
@@ -318,6 +412,53 @@ program
   });
 
 
+  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('open [programName]')
   .description('Open a NEP+ GUI')
@@ -363,13 +504,13 @@ program
 
 program
   .command('master')
-  .description('Start NEP master in localhost')
+  .description('Fetches and displays the list of NEP+ topics from the NEP master')
   .action(async () => {
     try {
       var node = new nep.Node("nep-cli");
       console.log("Starting NEP master in terminal")
       var master = new MasterLocal();
-      var info = new nep.MasterInfoServer(IP = '0.0.0.0', topics = topic_register, port_=PORT_MASTER_INFO);
+      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.");
@@ -382,7 +523,7 @@ program
 
 program
   .command('topics')
-  .description('Get list of NEP+ topics')
+  .description('Displays the list of NEP+ topics')
   .action(async () => {
     const master_ip = "127.0.0.1";
     const TIMEOUT_DURATION = 5000; // Timeout duration in milliseconds
@@ -433,205 +574,119 @@ program
     await getTopics(); // Call the function to get topics
   });
 
-
 program
-  .command('listen <topic>')
-  .description('Subscribe to a NEP+ topic and display JSON 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, "json", callback, conf);
-    };
+  .command('show [topic] [index]')
+  .description('Displays messages published to a specified NEP+ topic in the default browser. ' +
+               'The [index] parameter specifies the index of the message to display and must be a number between 0 and 49. '
+               )
+  .action(async (topic, index) => {
+    const ip = "127.0.0.1";
+
+    const allowedFormats = ["json", "msgpack", "bytes", "images", "dictionary", "string"];
+    const master_ip = "127.0.0.1";
 
-    var master_ip = "127.0.0.1";
-    async function run() {
-      var requester = new zmq.Request();
-      requester.connect("tcp://" + master_ip + ":" + PORT_MASTER_INFO);
+    const requester = createRequester(master_ip, PORT_MASTER_INFO);
+    const results = await sendRequest(requester, { "input": "topics" });
 
-      let msg = { "input": "topics" };
-      var message = JSON.stringify(msg);
-      await requester.send(message);
-      const [result] = await requester.receive();
-      var results = JSON.parse(result.toString());
+    topic = await selectTopic(results, topic);
+    var msg_type = await selectMsgType(allowedFormats, msg_type, topic);
+    index = await selectIndex(index);
 
-      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 topicid = `${index}: ${topic}`;
+    if(parseInt(index) < 50)
+    {
+      const port = PORT_SERVER + parseInt(index);
+      console.log(PORT_SERVER)
+      console.log(index)
+      console.log(PORT_SERVER + parseInt(index))
+  
+      if (msg_type === "images") {
+        open(`http://localhost:${port}/?port=${port}&topic=${encodeURIComponent(topicid)}`);
+        startShowServer(port, topic, ip);
+      }
+      else if (msg_type === "json" || msg_type === "dictionary") {
+        open(`http://localhost:${port}/?port=${port}&topic=${encodeURIComponent(topicid)}`);
+        startJsonServer(port, topic, ip, msg_type);
       }
-    }
 
-    run();
+    }
+    else {
+      console.log("Index must be between 0 and 49");
+    }
+  
   });
 
 
 program
-  .command('echo <topic>')
+  .command('echo [topic]')
   .description('Subscribe to a NEP+ topic 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);
-        }
-      };
+  .action(async (topic, msg_type) => {
+    const allowedFormats = ["json", "msgpack", "bytes", "images", "dictionary", "string"];
+    const master_ip = "127.0.0.1";
 
-      var node = new nep.Node("nep-cli-sub");
-      var conf = node.hybrid(master_ip);
-      sub = node.new_sub(topic, "string", callback, conf);
-    };
+    const requester = createRequester(master_ip, PORT_MASTER_INFO);
+    const results = await sendRequest(requester, { "input": "topics" });
 
-    var master_ip = "127.0.0.1";
-    async function run() {
-      var requester = new zmq.Request();
-      requester.connect("tcp://" + master_ip + ":" + PORT_MASTER_INFO);
+    topic = await selectTopic(results, topic);
+    msg_type = await selectMsgType(allowedFormats, msg_type, topic);
 
-      let msg = { "input": "topics" };
-      var message = JSON.stringify(msg);
-      await requester.send(message);
-      const [result] = await requester.receive();
-      var results = JSON.parse(result.toString());
+    const callback = (msg) => {
+      const date = new Date();
+      const dateString = date.toISOString();
+      console.log(dateString);
 
-      if (results["state"] === "failure") {
-        console.log("Topic is not registered");
+      if (msg.length > 10000) {
+        console.log("the message is too long to be displayed");
       } else {
-        console.log("");
-        if (results["input"].includes(topic)) {
-          opensub(master_ip);
-        } else {
-          console.log("Topic is not registered");
-        }
-      }
-    }
-
-    run();
-  });
-
-
-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)
+        console.log(msg);
       }
+    };
 
-
-      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()
+    openSub(master_ip, topic, msg_type, callback);
   });
 
-
 program
-  .command('hz <topic> <msg_type>')
-  .description('Monitor the publishing rate of a NEP+ topic in localhost')
+  .command('hz [topic]')
+  .description('Monitor the publishing rate of a NEP+ topic')
   .action(async (topic, msg_type) => {
-    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 allowedFormats = ["json", "msgpack", "bytes", "images", "dictionary", "string"];
+    const master_ip = "127.0.0.1";
 
-      const callback = function (msg) {
-        const date = new Date();
-        const timestamp = date.getTime();
+    const requester = createRequester(master_ip, PORT_MASTER_INFO);
+    const results = await sendRequest(requester, { "input": "topics" });
+    const timestamps = []; // Store timestamps of received messages
 
-        timestamps.push(timestamp);
+    topic = await selectTopic(results, topic);
+    msg_type = await selectMsgType(allowedFormats, msg_type, topic);
 
-        // Remove timestamps older than ten seconds
-        const tenSecondsAgo = timestamp - 10000;
-        while (timestamps[0] < tenSecondsAgo) {
-          timestamps.shift();
-        }
-      };
+    const callback = function (msg) {
+      const date = new Date();
+      const timestamp = date.getTime();
 
-      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);
+      timestamps.push(timestamp);
 
-      console.log("Topic:", topic)
-      console.log("Message type:", messageFormat)
+      // Remove timestamps older than ten seconds
+      const tenSecondsAgo = timestamp - 10000;
+      while (timestamps[0] < tenSecondsAgo) {
+        timestamps.shift();
+      }
+    };
 
-      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);
 
-      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) {
@@ -660,30 +715,8 @@ program
       return stdDeviation;
     };
 
+    openSub(master_ip, topic, msg_type, callback);
 
-    async function run() {
-      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();
-        } else {
-          console.log("Topic is not registered, use *nep topics* to see the list of avaliable topics");
-        }
-      }
-    }
-
-    run();
   });