Fastify example, updating ws package, fix ws closing

docs/advanced-configuration.md

@@ -753,6 +753,8 @@ The `examples` directory within the `guacamole-lite` project contains the follow
   language of choice.
 - [expressjs.js](../examples/expressjs.js): Illustrates how to integrate `guacamole-lite` with an Express.js application, combining web server
   functionality with remote desktop capabilities.
+- [fastify.js](../examples/fastify.js): Illustrates how to integrate `guacamole-lite` with a Fastify application, combining web server
+  functionality with remote desktop capabilities.
 
 These examples are designed to be informative and easily adaptable to your specific use case. Whether you're just
 getting started with `guacamole-lite` or looking to implement more complex features, the examples directory is a

examples/fastify.js

@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+
+import Fastify from 'fastify';
+import GuacamoleLite from 'guacamole-lite';
+
+const fastify = Fastify();
+
+const guacdOptions = {
+    port: 4822,
+};
+
+const clientOptions = {
+    crypt: {
+        cypher: 'AES-256-CBC',
+        key: 'MySuperSecretKeyForParamsToken12',
+    }
+};
+
+new GuacamoleLite({ server: fastify.server }, guacdOptions, clientOptions);
+
+process.on('SIGINT', fastify.close);
+process.on('SIGTERM', fastify.close);
+
+fastify.listen({ port: 8080 }, function (err) {
+    if (err) {
+        console.error(err);
+        process.exit(1);
+    }
+});

lib/ClientConnection.js

@@ -7,7 +7,7 @@ const Crypt = require('./Crypt.js');
 
 class ClientConnection {
 
-    constructor(server, connectionId, webSocket) {
+    constructor(server, connectionId, webSocket, upgradeRequest) {
         this.STATE_OPEN = 1;
         this.STATE_CLOSED = 2;
 
@@ -16,7 +16,7 @@ class ClientConnection {
         this.server = server;
         this.connectionId = connectionId;
         this.webSocket = webSocket;
-        this.query = Url.parse(this.webSocket.upgradeReq.url, true).query;
+        this.query = Url.parse(upgradeRequest.url, true).query;
         this.lastActivity = Date.now();
         this.activityCheckInterval = null;
 

lib/Server.js

@@ -139,16 +139,15 @@ class Server extends EventEmitter {
             this.clientOptions.log.stdLog('Closing all connections and exiting...');
         }
 
-        this.webSocketServer.close(() => {
-            this.activeConnections.forEach((activeConnection) => {
-                activeConnection.close();
-            });
+        this.activeConnections.forEach((activeConnection) => {
+            activeConnection.close();
         });
+        this.webSocketServer.close();
     }
 
-    newConnection(webSocketConnection) {
+    newConnection(webSocketConnection, upgradeRequest) {
         this.connectionsCount++;
-        this.activeConnections.set(this.connectionsCount, new ClientConnection(this, this.connectionsCount, webSocketConnection));
+        this.activeConnections.set(this.connectionsCount, new ClientConnection(this, this.connectionsCount, webSocketConnection, upgradeRequest));
     }
 }
 

package.json

@@ -16,8 +16,8 @@
   ],
   "dependencies": {
     "deep-extend": "^0.6.0",
-    "moment": "^2.17.1",
-    "ws": "^1.1.2"
+    "moment": "^2.30.1",
+    "ws": "^8.17.0"
   },
   "engines": {
     "node": ">=6"