npm - nep-cli - Versions diffs - 0.2.1 → 0.2.2 - Mend

nep-cli 0.2.1 → 0.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/bin/assets/vue.js +11944 -0
package/bin/assets/vuetify/json/attributes.json +9158 -0
package/bin/assets/vuetify/json/tags.json +3063 -0
package/bin/assets/vuetify/json/web-types.json +27671 -0
package/bin/assets/vuetify/vuetify.css +24876 -0
package/bin/assets/vuetify/vuetify.css.map +1 -0
package/bin/assets/vuetify/vuetify.js +41073 -0
package/bin/assets/vuetify/vuetify.js.map +1 -0
package/bin/assets/vuetify/vuetify.min.css +8 -0
package/bin/assets/vuetify/vuetify.min.js +6 -0
package/bin/image.html +14 -6
package/bin/index.js +200 -173
package/bin/json.html +9 -4
package/package.json +3 -4

package/bin/image.html CHANGED Viewed

@@ -5,10 +5,10 @@
     <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>
+    <!-- Include Vue 2 and Vuetify 2 -->
+    <link href="assets/vuetify/vuetify.min.css" rel="stylesheet">
+    <script src="assets/vue.js"></script>
+    <script src="assets/vuetify/vuetify.js"></script>
 </head>
 <body>
@@ -16,13 +16,14 @@
         <v-app style="background-color: #121212;">
             <v-container>
                 <v-toolbar flat dense dark color="transparent">
-                    <v-toolbar-title> Topic: {{ topic }}</v-toolbar-title>
+                    <v-toolbar-title> Topic {{ topic }}</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-slider v-model="imageHeight" min="100" max="800" step="10" ></v-slider>
+                            <v-img :src="imageSrc" :height="imageHeight + 'px'" alt="Streamed Image" contain></v-img>
                         </v-card>
                     </v-col>
                 </v-row>
@@ -30,6 +31,7 @@
         </v-app>
     </div>
     <script src="/socket.io/socket.io.js"></script> <!-- Include the Socket.IO client library -->
     <script>
         // Function to get the value of a URL parameter by name
@@ -54,8 +56,14 @@
                 return {
                     imageSrc: '', // Initialize the image source as empty
                     topic: "",
+                    imageHeight: 400, // Initialize the image height
                 };
             },
+            watch: {
+                topic(newVal) {
+                    document.title = newVal ? `NEP+ Image ${newVal}` : 'NEP+ Image';
+                }
+            },
             mounted() {
                 this.topic = getParameterByName('topic');
                 const image = document.getElementById('image');

package/bin/index.js CHANGED Viewed

@@ -18,8 +18,8 @@ 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;
+const PORT_SERVER = 50050;
 program
@@ -120,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) {
@@ -197,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) {
@@ -239,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;
@@ -297,6 +254,10 @@ function startShowServer(port, topic, ip) {
   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)
@@ -330,6 +291,7 @@ function startJsonServer(port, topic, ip, msg_type = "json") {
   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)
@@ -364,6 +326,68 @@ function startJsonServer(port, topic, ip, msg_type = "json") {
 }
+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')
   .description('Open NEP+ App')
@@ -388,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')
@@ -433,7 +504,7 @@ 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");
@@ -452,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
@@ -503,141 +574,119 @@ 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('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";
-      if(msg_type === "images"){
+    const allowedFormats = ["json", "msgpack", "bytes", "images", "dictionary", "string"];
+    const master_ip = "127.0.0.1";
+    const requester = createRequester(master_ip, PORT_MASTER_INFO);
+    const results = await sendRequest(requester, { "input": "topics" });
+    topic = await selectTopic(results, topic);
+    var msg_type = await selectMsgType(allowedFormats, msg_type, topic);
+    index = await selectIndex(index);
+    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")
-      {
+      else if (msg_type === "json" || msg_type === "dictionary") {
         open(`http://localhost:${port}/?port=${port}&topic=${encodeURIComponent(topicid)}`);
         startJsonServer(port, topic, ip, msg_type);
       }
-    });
+    }
+    else {
+      console.log("Index must be between 0 and 49");
+    }
+  });
 program
-  .command('echo <topic> <msg_type>')
+  .command('echo [topic]')
   .description('Subscribe to a NEP+ topic and display raw string messages')
   .action(async (topic, msg_type) => {
     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;
-    }
-    var opensub = function (master_ip = "127.0.0.1", msg_type) {
-      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, msg_type, callback, conf);
-    };
+    const master_ip = "127.0.0.1";
+    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, msg_type);
-        } else {
-          console.log("Topic is not registered");
-        }
+        console.log(msg);
       }
-    }
+    };
-    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 allowedFormats = ["json", "msgpack", "bytes", "images", "dictionary", "string"];
+    const master_ip = "127.0.0.1";
-    const opensub = function () {
-      const timestamps = []; // To store message timestamps
+    const requester = createRequester(master_ip, PORT_MASTER_INFO);
+    const results = await sendRequest(requester, { "input": "topics" });
+    const timestamps = []; // Store timestamps of received messages
-      const callback = function (msg) {
-        const date = new Date();
-        const timestamp = date.getTime();
+    topic = await selectTopic(results, topic);
+    msg_type = await selectMsgType(allowedFormats, msg_type, topic);
-        timestamps.push(timestamp);
+    const callback = function (msg) {
+      const date = new Date();
+      const timestamp = date.getTime();
-        // Remove timestamps older than ten seconds
-        const tenSecondsAgo = timestamp - 10000;
-        while (timestamps[0] < tenSecondsAgo) {
-          timestamps.shift();
-        }
-      };
+      timestamps.push(timestamp);
-      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;
+      // Remove timestamps older than ten seconds
+      const tenSecondsAgo = timestamp - 10000;
+      while (timestamps[0] < tenSecondsAgo) {
+        timestamps.shift();
       }
-      const node = new nep.Node("nep-cli-sub");
-      const conf = node.hybrid(master_ip);
-      console.log("Topic:", topic)
-      console.log("Message type:", msg_type)
+    };
-      const sub = node.new_sub(topic, msg_type, 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) {
@@ -666,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();
   });

package/bin/json.html CHANGED Viewed

@@ -6,9 +6,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>NEP+ JSON Data</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>
+    <link href="assets/vuetify/vuetify.min.css" rel="stylesheet">
+    <script src="assets/vue.js"></script>
+    <script src="assets/vuetify/vuetify.js"></script>
     <!-- Include JSON Editor library -->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jsoneditor/9.10.2/jsoneditor.min.js"></script>
     <link href="https://cdnjs.cloudflare.com/ajax/libs/jsoneditor/9.10.2/jsoneditor.min.css" rel="stylesheet">
@@ -109,7 +109,7 @@
         <v-app style="background-color: #0D0D0D;">
             <v-container>
                 <v-toolbar flat dense dark color="transparent">
-                    <v-toolbar-title> Topic: {{ topic }}</v-toolbar-title>
+                    <v-toolbar-title> Topic {{ topic }}</v-toolbar-title>
                     <v-spacer></v-spacer>
                 </v-toolbar>
                 <v-row>
@@ -148,6 +148,11 @@
                     topic: '',
                 };
             },
+            watch: {
+                topic(newVal) {
+                    document.title = newVal ? `NEP+ JSON ${newVal}` : 'NEP+ JSON';
+                }
+            },
             mounted() {
                 this.topic = getParameterByName('topic');
                 const socket = io.connect(`http://localhost:${port}`);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "nep-cli",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "main": "./lib/nep.js",
   "bin": {
     "nep": "./bin/index.js"
@@ -12,11 +12,10 @@
     "commander": "^11.0.0",
     "enquirer": "^2.4.1",
     "express": "^4.18.2",
-    "fix-path": "^2.1.0",
-    "inquirer": "^9.2.10",
-    "nep-js": "0.3.8",
+    "nep-js": "^0.3.8",
     "open": "7.4.2",
     "socket.io": "^4.7.2",
+    "vue": "^2.7.16",
     "zeromq": "6.0.0-beta.19"
   }
 }