@yousolution/node-red-contrib-you-tunnel-websocket 1.1.0 → 1.1.2

package/CHANGELOG.md

@@ -0,0 +1,82 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+---
+
+## [1.1.2] - 2026-05-04
+
+### Fixed
+- Add proper cleanup of existing server on port before starting
+- Replace console.log/warn/error with proper logger
+- Improve error handling during server start/stop
+
+### Changed
+- Update @remotelinker/reverse-ws-tunnel from ^1.0.10 to ^1.0.11
+- Add log context for each tunnel node
+
+---
+
+## [1.1.1] - 2025-??-??
+
+### Changed
+- Update @remotelinker/reverse-ws-tunnel from ^1.0.9 to ^1.0.10
+
+---
+
+## [1.1.0] - 2025-??-??
+
+### Fixed
+- Fix server configuration issues
+
+### Changed
+- Disable wstunnel client node temporarily
+- Switch from local/beta package to published reverse-ws-tunnel package
+
+### Documentation
+- Update README to match current codebase
+
+---
+
+## [1.0.1-dev-3] - 2025-??-??
+
+### Added
+- Initial wstunnel client node for reverse WebSocket tunneling
+
+### Changed
+- Update version to 1.0.1-dev-3
+- Update dependencies
+- Improve documentation
+- Disable wstunnel client node
+
+---
+
+## [1.0.1] - 2025-??-??
+
+### Added
+- Add configurable log level dropdown in wstunnel configuration (trace, debug, info, warning, error)
+
+### Fixed
+- Remove old connections when redeploying flows
+
+### Changed
+- First release with reverse tunnel functionality
+
+---
+
+## [1.0.0] - 2025-??-??
+
+### Added
+- Initial release with WebSocket tunnel support
+- MSSQL integration
+
+---
+
+[1.1.2]: https://github.com/yousolution-cloud/node-red-contrib-you-tunnel-websocket/compare/v1.1.1...v1.1.2
+[1.1.1]: https://github.com/yousolution-cloud/node-red-contrib-you-tunnel-websocket/compare/v1.1.0...v1.1.1
+[1.1.0]: https://github.com/yousolution-cloud/node-red-contrib-you-tunnel-websocket/compare/v1.0.1...v1.1.0
+[1.0.1]: https://github.com/yousolution-cloud/node-red-contrib-you-tunnel-websocket/compare/v1.0.0...v1.0.1
+[1.0.0]: https://github.com/yousolution-cloud/node-red-contrib-you-tunnel-websocket/tree/v1.0.0

package/nodes/wsTunnel.js

@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-
-const { startWebSocketServer } = require('@remotelinker/reverse-ws-tunnel/server');
-const { setLogLevel } = require('@remotelinker/reverse-ws-tunnel/utils');
+const { startWebSocketServer, stopWebSocketServer } = require('@remotelinker/reverse-ws-tunnel/server');
+const { logger, setLogContext, setLogLevel } = require('@remotelinker/reverse-ws-tunnel/utils');
 
 const instances = {};
 
@@ -45,66 +44,63 @@ module.exports = function (RED) {
 
     // Set the log level dynamically based on configuration
     const logLevel = node.tunnelConfig.options.logLevel || 'info';
+    setLogContext('TunnelNode-' + node.tunnelConfig.options.name);
     setLogLevel(logLevel);
 
     node.status({ fill: 'red', shape: 'ring', text: 'disconnected' });
-
     const port = node.tunnelConfig.options.port;
     const host = node.tunnelConfig.options.host ? '' : undefined;
     const path = node.tunnelConfig.options.path ? '' : undefined;
     const tunnelIdHeaderName = node.tunnelConfig.options.tunnelIdHeaderName;
-
-    instances[id] = instances[id] || { state: {} };
-
-    if (instances[id].state[port]) {
-      console.warn(`Server already running on port ${port} for node ${id}. Skipping creation.`);
-      node.status({
-        fill: 'green',
-        shape: 'dot',
-        text: `listening on port ${port}`,
+    instances[id] = instances[id] || {};
+    // Cleanup any existing server on this port before starting
+    // This handles cases where previous deployment didn't cleanup properly
+    stopWebSocketServer(port)
+      .then(() => {
+        logger.info(`Cleaned up any existing server on port ${port} before starting`);
+        return startWebSocketServer({
+          port,
+          host,
+          path,
+          tunnelIdHeaderName,
+        });
+      })
+      .then((state) => {
+        instances[id].state = state;
+        logger.info(`Started WebSocketServer for node ${id} on port ${port}`);
+        if (instances[id].state[port].webSocketServer) {
+          onListening();
+        }
+      })
+      .catch((err) => {
+        logger.error(`Error starting WebSocketServer on port ${port}:`, err);
+        node.status({
+          fill: 'red',
+          shape: 'dot',
+          text: `error: ${err.message}`,
+        });
       });
-      return;
-    }
-
-    instances[id].state = startWebSocketServer({
-      port,
-      host,
-      path,
-      tunnelIdHeaderName,
-    });
-
-    console.log(`Started WebSocketServer for node ${id} on port ${port}`);
-
-    if (instances[id].state[port].webSocketServer) {
-      onListening();
-    }
-
     function onListening() {
       const server = instances[id].state[port].webSocketServer;
-
       server.on('listening', () => {
-        console.log('Listening ' + id);
+        logger.info('Listening ' + id);
         node.status({
           fill: 'green',
           shape: 'dot',
           text: `listening on port ${port}`,
         });
       });
-
       server.on('connection', (ws) => {
         const clientAddress = ws._socket.remoteAddress;
         const clientPort = ws._socket.remotePort;
         const totalClients = server.clients.size;
-
         node.status({
           fill: 'green',
           shape: 'dot',
           text: `clients ${totalClients}`,
         });
-
-        console.log(`WebSocket connection from ${clientAddress}:${clientPort}`);
-        console.log(`Total connected clients: ${totalClients}`);
-
+        logger.info(`WebSocket connection from ${clientAddress}:${clientPort}`);
+        logger.info(`Total connected clients: ${totalClients}`);
         ws.on('close', () => {
           const remainingClients = server.clients.size;
           node.status({
@@ -112,45 +108,31 @@ module.exports = function (RED) {
             shape: 'dot',
             text: `clients ${remainingClients}`,
           });
-          console.log(`Client disconnected: ${clientAddress}:${clientPort}`);
-          console.log(`Remaining clients: ${remainingClients}`);
+          logger.info(`Client disconnected: ${clientAddress}:${clientPort}`);
+          logger.info(`Remaining clients: ${remainingClients}`);
         });
       });
     }
-
     this.on('close', function (removed, done) {
-      if (instances[id] && instances[id].state && instances[id].state[port]) {
-        const server = instances[id].state[port].webSocketServer;
-        if (server) {
-          try {
-            for (const client of server.clients) {
-              try {
-                client.removeAllListeners();
-                client.close();
-              } catch (clientErr) {
-                console.error(`Error terminating client on port ${port}:`, clientErr);
-              }
-            }
+      logger.info(`[DEBUG] Close called for node ${id}, removed=${removed}`);
 
-            server.close(() => {
-              console.log(`Closed WebSocketServer on port ${port} during node shutdown`);
-            });
-          } catch (err) {
-            console.error(`Error closing WebSocketServer on port ${port}:`, err);
-          }
-        }
-
-        delete instances[id].state[port];
-
-        // Se non ci sono più porte attive per questo nodo, cancella del tutto
-        if (Object.keys(instances[id].state).length === 0) {
-          delete instances[id];
-        }
+      if (instances[id] && instances[id].state && instances[id].state[port]) {
+        stopWebSocketServer(port)
+          .then(() => {
+            logger.info(`Cleaned up WebSocketServer on port ${port} for node ${id}`);
+            delete instances[id];
+            done();
+          })
+          .catch((err) => {
+            console.error(`Error stopping server on port ${port}:`, err);
+            delete instances[id];
+            done();
+          });
+      } else {
+        logger.info(`No server state found for node ${id} on port ${port}`);
+        done();
       }
-
-      done();
     });
   }
-
   RED.nodes.registerType('wstunnel server', WSTunnelServer);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yousolution/node-red-contrib-you-tunnel-websocket",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Module to create websockeet tunnel for NODE-RED",
   "license": "MIT",
   "scripts": {
@@ -23,7 +23,7 @@
     }
   },
   "dependencies": {
-    "@remotelinker/reverse-ws-tunnel": "^1.0.7",
+    "@remotelinker/reverse-ws-tunnel": "^1.0.11",
     "cookie": "^1.0.2",
     "cross-conf-env": "^1.3.0",
     "dotenv": "^17.2.1",