nep-cli 0.1.9 → 0.2.1

package/bin/index.js

@@ -5,7 +5,7 @@ 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: "0.0.0.0", brokers: {} }
+var nep_configuration = { current_port: 50200, IP: "0.0.0.0", brokers: {} }
 const { exec } = require('child_process');
 const { AutoComplete } = require('enquirer');
 
@@ -17,64 +17,48 @@ 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 = 50060;
+const PORT_JSON = 50080;
 
-program
-.version(version)
-.description('NEP-CLI')
-
-
-function getIPAddress(interfaceName) {
-  const interfaces = os.networkInterfaces();
-  const networkInterface = interfaces[interfaceName];
-
-  if (networkInterface) {
-    const ipAddressInfo = networkInterface.find(info => info.family === 'IPv4');
-    return ipAddressInfo ? ipAddressInfo.address : null;
-  } else {
-    return null;
-  }
-}
 
-function printIPAddress(interfaceName, ipAddress) {
-  if (ipAddress) {
-    console.log(`${interfaceName} IP Address: ${ipAddress}`);
-  } else {
-    console.log(`No ${interfaceName} IPv4 address found.`);
-  }
-}
+program
+  .version(version)
+  .description('NEP-CLI')
 
 program
-.command('ip')
-.description('Display current Wi-Fi and Ethernet IP addresses of this computer')
-.action(() => {
-  try {
-    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 = getIPAddress(wifiInterface);
-      printIPAddress(`Wi-Fi (${wifiInterface})`, ipAddress);
-    });
+      wifiInterfaces.forEach(wifiInterface => {
+        const ipAddress = nep.getIPAddress(wifiInterface);
+        nep.printIPAddress(`Wi-Fi (${wifiInterface})`, ipAddress);
+      });
 
-    printIPAddress('Ethernet', 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);
+    }
+  });
 
 
 
@@ -85,7 +69,7 @@ var nodes_register = {};
 var topic_register = {};
 
 class MasterLocal {
-  constructor(IP = '0.0.0.0', 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)
@@ -266,60 +250,118 @@ 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'])
-  // Check topic status
-  if (topic in topic_register) {
-    console.log("--- Topic *" + topic + "* already registered --- ")
+  nodes_register[node] = pid;
 
+  // Check topic status
+  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);
   }
-}
+};
+
+function startShowServer(port, topic, ip) {
+  const app = express();
+  const server = http.createServer(app);
+  const io = socketIo(server);
+  const path = require('path');
 
-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);
+  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');
+
+  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}`);
+  });
+}
 
 
 program
@@ -397,7 +439,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 = '0.0.0.0', 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.");
@@ -461,65 +503,45 @@ program
     await getTopics(); // Call the function to get topics
   });
 
+  program
+    .command('show <topic> <msg_type> [index]')
+    .description('Show images published to a NEP+ topic in the default browser')
+    .action(async (topic, msg_type, index = 0) => {
+      const ip = "127.0.0.1";
+      const topicid = `${topic}`;
+      const port = PORT_IMAGES + parseInt(index);
+
+      const allowedFormats = ["json", "images", "dictionary"];
+      if (!allowedFormats.includes(msg_type)) {
+        console.error(`Format '${msg_type}' no allowed. Allowed formats are: ${allowedFormats.join(', ')}`);
+        return;
+      }
 
-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);
-        }
-      };
+      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);
+      }
+    });
 
-      var node = new nep.Node("nep-cli-sub");
-      var conf = node.hybrid(master_ip);
-      sub = node.new_sub(topic, "json", callback, conf);
-    };
+program
+  .command('echo <topic> <msg_type>')
+  .description('Subscribe to a NEP+ topic and display raw string messages')
+  .action(async (topic, msg_type) => {
 
-    var master_ip = "127.0.0.1";
-    async function run() {
-      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 allowedFormats = ["json", "msgpack", "bytes", "images", "dictionary", "string"];
+    if (!allowedFormats.includes(msg_type)) {
+      console.error(`Format '${msg_type}' no allowed. Allowed formats are: ${allowedFormats.join(', ')}`);
+      return;
     }
 
-    run();
-  });
-
-
-program
-  .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 opensub = function (master_ip = "127.0.0.1", msg_type) {
       var callback = function (msg) {
         var date = new Date();
         var dateString = date.toISOString();
@@ -534,9 +556,10 @@ program
 
       var node = new nep.Node("nep-cli-sub");
       var conf = node.hybrid(master_ip);
-      sub = node.new_sub(topic, "string", callback, conf);
+      sub = node.new_sub(topic, msg_type, callback, conf);
     };
 
+
     var master_ip = "127.0.0.1";
     async function run() {
       var requester = new zmq.Request();
@@ -553,7 +576,7 @@ program
       } else {
         console.log("");
         if (results["input"].includes(topic)) {
-          opensub(master_ip);
+          opensub(master_ip, msg_type);
         } else {
           console.log("Topic is not registered");
         }
@@ -563,54 +586,6 @@ program
     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)
-      }
-
-
-      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('hz <topic> <msg_type>')
   .description('Monitor the publishing rate of a NEP+ topic in localhost')
@@ -634,15 +609,18 @@ program
         }
       };
 
-      const allowedFormats = ["json", "msgpack", "bytes", "images", "image"];
-      const messageFormat = allowedFormats.includes(msg_type) ? msg_type : "json";
+      const allowedFormats = ["json", "msgpack", "bytes", "images", "dictionary", "string"];
+      if (!allowedFormats.includes(msg_type)) {
+        console.error(`Format '${msg_type}' no allowed. Allowed formats are: ${allowedFormats.join(', ')}`);
+        return;
+      }
       const node = new nep.Node("nep-cli-sub");
       const conf = node.hybrid(master_ip);
 
       console.log("Topic:", topic)
-      console.log("Message type:", messageFormat)
+      console.log("Message type:", msg_type)
 
-      const sub = node.new_sub(topic, messageFormat, callback, conf);
+      const sub = node.new_sub(topic, msg_type, callback, conf);
       console.log("");
 
       setInterval(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nep-cli",
-  "version": "0.1.9",
+  "version": "0.2.1",
   "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.5",
+    "nep-js": "0.3.8",
     "open": "7.4.2",
     "socket.io": "^4.7.2",
-    "zeromq": "6.0.0-beta.6"
+    "zeromq": "6.0.0-beta.19"
   }
 }

package/bin/image4.html

@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>NEP+ Image</title>
-    <!-- Include Vue 2 and Vuetify 2 from CDN -->
-    <link href="https://cdn.jsdelivr.net/npm/vuetify@2.6.3/dist/vuetify.min.css" rel="stylesheet">
-    <script src="https://cdn.jsdelivr.net/npm/vue@2.6.14/dist/vue.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/vuetify@2.6.3/dist/vuetify.js"></script>
-</head>
-
-<body>
-    <div id="app">
-        <v-app>
-            <v-container>
-                <v-toolbar dense color="transparent">
-                    <v-toolbar-title>Camera USB</v-toolbar-title>
-                    <v-spacer></v-spacer>
-
-                </v-toolbar>
-                <v-row>
-                    <v-col>
-                        <v-card color="#1A1A1A">
-                            <v-img :src="imageSrc" alt="Streamed Image" contain></v-img>
-                        </v-card>
-                    </v-col>
-                </v-row>
-            </v-container>
-        </v-app>
-    </div>
-    <script src="/socket.io/socket.io.js"></script> <!-- Include the Socket.IO client library -->
-    <script>
-        // Initialize Vue and Vuetify
-        new Vue({
-            el: '#app',
-            vuetify: new Vuetify(),
-            data() {
-                return {
-                    imageSrc: '', // Initialize the image source as empty
-                };
-            },
-            mounted() {
-                const image = document.getElementById('image');
-                const socket = io.connect('http://localhost:3000'); // Connect to your server
-
-                socket.on('image', (data) => {
-                    // Set the received image data as the image source
-                    this.imageSrc = `data:image/jpeg;base64,${data.image}`;
-                });
-            },
-        });
-    </script>
-</body>
-
-</html>