nep-cli 0.1.9 → 0.2.0

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,37 +17,23 @@ 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')
 
-
-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
 .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;
 
@@ -66,11 +52,11 @@ program
     }
 
     wifiInterfaces.forEach(wifiInterface => {
-      const ipAddress = getIPAddress(wifiInterface);
-      printIPAddress(`Wi-Fi (${wifiInterface})`, ipAddress);
+      const ipAddress = nep.getIPAddress(wifiInterface);
+      nep.printIPAddress(`Wi-Fi (${wifiInterface})`, ipAddress);
     });
 
-    printIPAddress('Ethernet', getIPAddress(ethernetInterface));
+    nep.printIPAddress('Ethernet', nep.getIPAddress(ethernetInterface));
   } catch (error) {
     console.error('An error occurred:', error.message);
   }
@@ -85,7 +71,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 +252,46 @@ 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
@@ -397,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 = '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.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nep-cli",
-  "version": "0.1.9",
+  "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.5",
+    "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"
   }
 }