Merge pull request #13 from marcus-universe/dev

Update 3.0

Author: marcus-universe

Installer/touchportal_keysightplugin.tpp

@@ -1,7 +1,7 @@
 {
   "sdk": 1,
-  "version": 2,
-  "name": "keysight",
+  "version": 3,
+  "name": "Keysight",
   "id": "keysight",
   "configuration": {
     "colorDark": "#029e84",
@@ -12,9 +12,7 @@
     "id": "keysightmessages",
     "name": "Keysight",
     "imagepath": "%TP_PLUGIN_FOLDER%TouchPortalKeysight\\img\\keysight_logo.png",
-    "actions": [
-
-      {
+    "actions": [{
         "id": "send_keysight_command",
         "prefix": "Send a command to Keysight",
         "name": "Send command to Keysight",
@@ -30,14 +28,23 @@
           "description": "The message to send to Keysight",
           "required": true
         }]
+      },
+      {
+        "id": "restart_keysight_server",
+        "prefix": "restarts the Keysight server",
+        "name": "Restart_Keysight_Server",
+        "type": "communicate",
+        "tryInline": true,
+        "format": "Keysight server restarted"
       }
+
     ]
   }],
   "settings": [{
       "name": "Port",
       "default": "3000",
       "type": "text",
-      "maxLenght": 16,
+      "maxLenght": 5,
       "isPassword": false,
       "minValue": 0,
       "maxValue": 120,

TouchPortalKeysight/entry.json

@@ -6,7 +6,7 @@
     "touchportal-api": "^3.2.1"
   },
   "name": "touchportal_keysightplugin",
-  "version": "2.2.2",
+  "version": "3.0.0",
   "description": "A plugin for touchportal to control websockets in keysight",
   "main": "src/index.js",
   "bin": "src/index.js",

package-lock.json

@@ -1,36 +1,91 @@
-// const Client = require('socket.io-client');
-const TouchPortalAPI = require('touchportal-api');
+const TouchPortalAPI = require("touchportal-api");
 const TPClient = new TouchPortalAPI.Client();
-const pluginId = 'keysight';
-const express = require('express');
+const pluginId = "keysight";
+const express = require("express");
 const app = express();
-const server = require('http').createServer(app);
 
-const Port = 3000;
+// Create a new HTTP server
+let server = require("http").createServer(app);
 
-// TPClient.on("Settings", (data) => {
-  // const portNumber = JSON.parse(data[0]);
+// Current Port
+let Port = 3000;
 
-  // console.log(portNumber);
-// });
+// Create a new Socket.IO instance
+let io = require("socket.io")(Port, server, { cors: { origin: "*" } });
 
-const io = require('socket.io')(Port, server, {cors: {origin: '*'}});
+//#####################
+//Functions
+//#####################
 
-// const socket = io('ws://localhost:3000');
+//Restart Websocket Server
+function restartWebSocketServer() {
+  // Close the existing server
+  try {
+    server.close(() => {
+      console.log("WebSocket server closed");
 
-// socket.on('connect', () => { console.log('Client connected'); });
+      // Create a new server
+      try {
+        server = require("http").createServer(app);
+      } catch (error) {
+        console.log(error);
+      }
+      // Create a new Socket.IO instance
+      try {
+        io = require("socket.io")(Port, server, { cors: { origin: "*" } });
+        console.log("WebSocket server restarted");
+      } catch (error) {
+        console.log(error);
+      }
+    });
+  } catch (error) {
+    console.log(error);
+  }
+}
 
-  TPClient.on("Action", (data) => {
-    if (data.actionId == "send_keysight_command") {
-      let command = data.data[0].value;
-      console.log(command + " was sent to Keysight");
+//Change Port
+function changePort(newPort) {
+  Port = newPort;
+  console.log(`Port changed to ${Port}`);
+  restartWebSocketServer();
+}
 
-      // Send the command to the SocketIO server
-      io.emit('command', command);
+//#####################
+//Settings
+//#####################
+TPClient.on("Settings", (data) => {
+  const portNumber = parseInt(data[0].Port);
+
+  if (portNumber !== NaN) {
+    if (portNumber !== Port) {
+      console.log(`Change Port from ${Port} to ${portNumber}`);
+      changePort(portNumber);
     }
-  });
+  } else {
+    console.log("Port Number is not a number");
+  }
+});
 
-  
+//#####################
+//Actions
+//#####################
+TPClient.on("Action", (data) => {
+  if (data.actionId == "send_keysight_command") {
+    let command = data.data[0].value;
+    console.log(command + " was sent to Keysight");
+    io.emit("command", command);
+  } else if (data.actionId == "restart_keysight_server") {
+    restartWebSocketServer();
+  }
+});
 
+//#####################
+//Receive Messages from Keysight
+//#####################
+io.on("connection", (socket) => {
+  socket.on("message", (message) => {
+    console.log("Received message:", message);
+  });
+});
 
-TPClient.connect({ pluginId });
+TPClient.connect({ pluginId });