@colyseus/tools 0.16.14 → 0.16.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colyseus/tools",
-  "version": "0.16.14",
+  "version": "0.16.15",
   "description": "Simplify the development and production settings for your Colyseus project.",
   "input": "./src/index.ts",
   "main": "./build/index.js",
@@ -50,11 +50,11 @@
     "@types/cors": "^2.8.10",
     "@types/dotenv": "^8.2.0",
     "uwebsockets-express": "^1.1.10",
+    "@colyseus/core": "^0.16.24",
+    "@colyseus/redis-driver": "^0.16.1",
     "@colyseus/ws-transport": "^0.16.5",
     "@colyseus/redis-presence": "^0.16.4",
     "@colyseus/bun-websockets": "^0.16.5",
-    "@colyseus/redis-driver": "^0.16.1",
-    "@colyseus/core": "^0.16.21",
     "@colyseus/uwebsockets-transport": "^0.16.10"
   },
   "peerDependencies": {

package/report-stats.js

@@ -3,12 +3,18 @@
 const fs = require('fs');
 const net = require('net');
 const pm2 = require('pm2');
+const dotenv = require('dotenv');
 
 const COLYSEUS_CLOUD_URL = `${process.env.ENDPOINT}/vultr/stats`;
 
 const FAILED_ATTEMPS_FILE = "/var/tmp/pm2-stats-attempts.txt";
 const FETCH_TIMEOUT = 30000;
 
+// load environment variables (Colyseus Cloud environment variables)
+if (process.env.APP_ROOT_PATH) {
+  dotenv.config({ path: `${process.env.APP_ROOT_PATH}/.env.cloud` });
+}
+
 async function retryFailedAttempts() {
   /**
    * Retry cached failed attempts
@@ -127,6 +133,9 @@ pm2.Client.executeRemote('getMonitorData', {}, async function(err, list) {
     version: 1,
     ip,
     time: new Date(),
+    statuses: {
+      driver: await checkDriverIsAccessible()
+    },
     aggregate,
     apps,
   };
@@ -165,6 +174,11 @@ pm2.Client.executeRemote('getMonitorData', {}, async function(err, list) {
   }
 });
 
+/**
+ * Check if a socket file is active
+ * @param {string} sockFilePath - The path to the socket file
+ * @returns {Promise<boolean>} true if the socket file is active, false otherwise
+ */
 function checkSocketIsActive(sockFilePath) {
   return new Promise((resolve, _) => {
     const client = net.createConnection({ path: sockFilePath, timeout: 5000 })
@@ -176,3 +190,45 @@ function checkSocketIsActive(sockFilePath) {
       .on('timeout', () => resolve(false));
   });
 }
+
+/**
+ * Check if the driver is accessible
+ * @returns {Promise<boolean | string>} returns true if the driver is accessible, false otherwise or the error message
+ */
+async function checkDriverIsAccessible() {
+  try {
+    if (process.env.REDIS_URI) {
+      const url = new URL(process.env.REDIS_URI);
+      return await isPortOpen({
+        host: url.hostname,
+        port: url.port
+      });
+    } else {
+      return true;
+    }
+  } catch (e) {
+    return e.message || false;
+  }
+}
+
+/**
+ * Check if a port is open
+ * @param {{ host: string, port: number, timeout?: number }} options - The options to check
+ * @returns {Promise<boolean | string>}
+ */
+function isPortOpen({ host, port, timeout = 2000 }) {
+  return new Promise((resolve) => {
+    const socket = new net.Socket();
+    const onError = (value) => {
+      socket.destroy();
+      resolve(value || false);
+    };
+    socket.setTimeout(timeout);
+    socket.once("error", (e) => onError(e.message));
+    socket.once("timeout", () => onError("timeout"));
+    socket.connect(port, host, () => {
+      socket.end(); // immediately close
+      resolve(true);
+    });
+  });
+}