@colyseus/tools 0.16.7 → 0.16.9

package/build/loadenv.js

@@ -23,8 +23,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_dotenv = __toESM(require("dotenv"));
+function getEnvFromArgv() {
+  const envIndex = process.argv.indexOf("--env");
+  return envIndex !== -1 ? process.argv[envIndex + 1] : void 0;
+}
 function getNodeEnv() {
-  return process.env.NODE_ENV || "development";
+  return process.env.NODE_ENV || getEnvFromArgv() || "development";
 }
 function getRegion() {
   return (process.env.REGION || "unknown").toLowerCase();

package/build/loadenv.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/loadenv.ts"],
-  "sourcesContent": ["import fs from 'fs';\nimport path from 'path';\nimport dotenv from 'dotenv';\n\nfunction getNodeEnv() {\n  return process.env.NODE_ENV || \"development\";\n}\n\nfunction getRegion() {\n  // EU, NA, AS, AF, AU, SA, UNKNOWN\n  return (process.env.REGION || \"unknown\").toLowerCase();\n}\n\nfunction loadEnvFile(envFileOptions: string[], log: 'none' | 'success' | 'both'  = 'none') {\n    const envPaths = [];\n    envFileOptions.forEach((envFilename) => {\n      envPaths.push(path.resolve(path.dirname(require?.main?.filename || process.cwd()), \"..\", envFilename));\n      envPaths.push(path.resolve(process.cwd(), envFilename));\n    });\n\n    // return the first .env path found\n    const envPath = envPaths.find((envPath) => fs.existsSync(envPath));\n\n    if (envPath) {\n        dotenv.config({ path: envPath });\n\n        if (log !== \"none\") {\n            console.info(`\u2705 ${path.basename(envPath)} loaded.`);\n        }\n\n    } else if (log === \"both\") {\n        console.info(`\u2139\uFE0F  optional .env file not found: ${envFileOptions.join(\", \")}`);\n    }\n}\n\n// load .env.cloud defined on admin panel\nif (process.env.COLYSEUS_CLOUD !== undefined) {\n    loadEnvFile([`.env.cloud`]);\n}\n\n// (overrides previous env configs)\nloadEnvFile([`.env.${getNodeEnv()}`, `.env`], 'both');\n\nif (process.env.REGION !== undefined) {\n  loadEnvFile([`.env.${getRegion()}.${getNodeEnv()}`], 'success');\n}"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA,gBAAe;AACf,kBAAiB;AACjB,oBAAmB;AAEnB,SAAS,aAAa;AACpB,SAAO,QAAQ,IAAI,YAAY;AACjC;AAEA,SAAS,YAAY;AAEnB,UAAQ,QAAQ,IAAI,UAAU,WAAW,YAAY;AACvD;AAEA,SAAS,YAAY,gBAA0B,MAAoC,QAAQ;AACvF,QAAM,WAAW,CAAC;AAClB,iBAAe,QAAQ,CAAC,gBAAgB;AACtC,aAAS,KAAK,YAAAA,QAAK,QAAQ,YAAAA,QAAK,QAAQ,SAAS,MAAM,YAAY,QAAQ,IAAI,CAAC,GAAG,MAAM,WAAW,CAAC;AACrG,aAAS,KAAK,YAAAA,QAAK,QAAQ,QAAQ,IAAI,GAAG,WAAW,CAAC;AAAA,EACxD,CAAC;AAGD,QAAM,UAAU,SAAS,KAAK,CAACC,aAAY,UAAAC,QAAG,WAAWD,QAAO,CAAC;AAEjE,MAAI,SAAS;AACT,kBAAAE,QAAO,OAAO,EAAE,MAAM,QAAQ,CAAC;AAE/B,QAAI,QAAQ,QAAQ;AAChB,cAAQ,KAAK,UAAK,YAAAH,QAAK,SAAS,OAAO,CAAC,UAAU;AAAA,IACtD;AAAA,EAEJ,WAAW,QAAQ,QAAQ;AACvB,YAAQ,KAAK,+CAAqC,eAAe,KAAK,IAAI,CAAC,EAAE;AAAA,EACjF;AACJ;AAGA,IAAI,QAAQ,IAAI,mBAAmB,QAAW;AAC1C,cAAY,CAAC,YAAY,CAAC;AAC9B;AAGA,YAAY,CAAC,QAAQ,WAAW,CAAC,IAAI,MAAM,GAAG,MAAM;AAEpD,IAAI,QAAQ,IAAI,WAAW,QAAW;AACpC,cAAY,CAAC,QAAQ,UAAU,CAAC,IAAI,WAAW,CAAC,EAAE,GAAG,SAAS;AAChE;",
+  "sourcesContent": ["import fs from 'fs';\nimport path from 'path';\nimport dotenv from 'dotenv';\n\nfunction getEnvFromArgv() {\n  const envIndex = process.argv.indexOf(\"--env\");\n  return (envIndex !== -1) ? process.argv[envIndex + 1] : undefined;\n}\n\nfunction getNodeEnv() {\n  return process.env.NODE_ENV || getEnvFromArgv() || \"development\";\n}\n\nfunction getRegion() {\n  // EU, NA, AS, AF, AU, SA, UNKNOWN\n  return (process.env.REGION || \"unknown\").toLowerCase();\n}\n\nfunction loadEnvFile(envFileOptions: string[], log: 'none' | 'success' | 'both'  = 'none') {\n    const envPaths = [];\n    envFileOptions.forEach((envFilename) => {\n      envPaths.push(path.resolve(path.dirname(require?.main?.filename || process.cwd()), \"..\", envFilename));\n      envPaths.push(path.resolve(process.cwd(), envFilename));\n    });\n\n    // return the first .env path found\n    const envPath = envPaths.find((envPath) => fs.existsSync(envPath));\n\n    if (envPath) {\n        dotenv.config({ path: envPath });\n\n        if (log !== \"none\") {\n            console.info(`\u2705 ${path.basename(envPath)} loaded.`);\n        }\n\n    } else if (log === \"both\") {\n        console.info(`\u2139\uFE0F  optional .env file not found: ${envFileOptions.join(\", \")}`);\n    }\n}\n\n// load .env.cloud defined on admin panel\nif (process.env.COLYSEUS_CLOUD !== undefined) {\n    loadEnvFile([`.env.cloud`]);\n}\n\n// (overrides previous env configs)\nloadEnvFile([`.env.${getNodeEnv()}`, `.env`], 'both');\n\nif (process.env.REGION !== undefined) {\n  loadEnvFile([`.env.${getRegion()}.${getNodeEnv()}`], 'success');\n}"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA,gBAAe;AACf,kBAAiB;AACjB,oBAAmB;AAEnB,SAAS,iBAAiB;AACxB,QAAM,WAAW,QAAQ,KAAK,QAAQ,OAAO;AAC7C,SAAQ,aAAa,KAAM,QAAQ,KAAK,WAAW,CAAC,IAAI;AAC1D;AAEA,SAAS,aAAa;AACpB,SAAO,QAAQ,IAAI,YAAY,eAAe,KAAK;AACrD;AAEA,SAAS,YAAY;AAEnB,UAAQ,QAAQ,IAAI,UAAU,WAAW,YAAY;AACvD;AAEA,SAAS,YAAY,gBAA0B,MAAoC,QAAQ;AACvF,QAAM,WAAW,CAAC;AAClB,iBAAe,QAAQ,CAAC,gBAAgB;AACtC,aAAS,KAAK,YAAAA,QAAK,QAAQ,YAAAA,QAAK,QAAQ,SAAS,MAAM,YAAY,QAAQ,IAAI,CAAC,GAAG,MAAM,WAAW,CAAC;AACrG,aAAS,KAAK,YAAAA,QAAK,QAAQ,QAAQ,IAAI,GAAG,WAAW,CAAC;AAAA,EACxD,CAAC;AAGD,QAAM,UAAU,SAAS,KAAK,CAACC,aAAY,UAAAC,QAAG,WAAWD,QAAO,CAAC;AAEjE,MAAI,SAAS;AACT,kBAAAE,QAAO,OAAO,EAAE,MAAM,QAAQ,CAAC;AAE/B,QAAI,QAAQ,QAAQ;AAChB,cAAQ,KAAK,UAAK,YAAAH,QAAK,SAAS,OAAO,CAAC,UAAU;AAAA,IACtD;AAAA,EAEJ,WAAW,QAAQ,QAAQ;AACvB,YAAQ,KAAK,+CAAqC,eAAe,KAAK,IAAI,CAAC,EAAE;AAAA,EACjF;AACJ;AAGA,IAAI,QAAQ,IAAI,mBAAmB,QAAW;AAC1C,cAAY,CAAC,YAAY,CAAC;AAC9B;AAGA,YAAY,CAAC,QAAQ,WAAW,CAAC,IAAI,MAAM,GAAG,MAAM;AAEpD,IAAI,QAAQ,IAAI,WAAW,QAAW;AACpC,cAAY,CAAC,QAAQ,UAAU,CAAC,IAAI,WAAW,CAAC,EAAE,GAAG,SAAS;AAChE;",
   "names": ["path", "envPath", "fs", "dotenv"]
 }

package/build/loadenv.mjs

@@ -9,8 +9,12 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 import fs from "fs";
 import path from "path";
 import dotenv from "dotenv";
+function getEnvFromArgv() {
+  const envIndex = process.argv.indexOf("--env");
+  return envIndex !== -1 ? process.argv[envIndex + 1] : void 0;
+}
 function getNodeEnv() {
-  return process.env.NODE_ENV || "development";
+  return process.env.NODE_ENV || getEnvFromArgv() || "development";
 }
 function getRegion() {
   return (process.env.REGION || "unknown").toLowerCase();

package/build/loadenv.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/loadenv.ts"],
-  "sourcesContent": ["import fs from 'fs';\nimport path from 'path';\nimport dotenv from 'dotenv';\n\nfunction getNodeEnv() {\n  return process.env.NODE_ENV || \"development\";\n}\n\nfunction getRegion() {\n  // EU, NA, AS, AF, AU, SA, UNKNOWN\n  return (process.env.REGION || \"unknown\").toLowerCase();\n}\n\nfunction loadEnvFile(envFileOptions: string[], log: 'none' | 'success' | 'both'  = 'none') {\n    const envPaths = [];\n    envFileOptions.forEach((envFilename) => {\n      envPaths.push(path.resolve(path.dirname(require?.main?.filename || process.cwd()), \"..\", envFilename));\n      envPaths.push(path.resolve(process.cwd(), envFilename));\n    });\n\n    // return the first .env path found\n    const envPath = envPaths.find((envPath) => fs.existsSync(envPath));\n\n    if (envPath) {\n        dotenv.config({ path: envPath });\n\n        if (log !== \"none\") {\n            console.info(`\u2705 ${path.basename(envPath)} loaded.`);\n        }\n\n    } else if (log === \"both\") {\n        console.info(`\u2139\uFE0F  optional .env file not found: ${envFileOptions.join(\", \")}`);\n    }\n}\n\n// load .env.cloud defined on admin panel\nif (process.env.COLYSEUS_CLOUD !== undefined) {\n    loadEnvFile([`.env.cloud`]);\n}\n\n// (overrides previous env configs)\nloadEnvFile([`.env.${getNodeEnv()}`, `.env`], 'both');\n\nif (process.env.REGION !== undefined) {\n  loadEnvFile([`.env.${getRegion()}.${getNodeEnv()}`], 'success');\n}"],
-  "mappings": ";;;;;;;;AAAA,OAAO,QAAQ;AACf,OAAO,UAAU;AACjB,OAAO,YAAY;AAEnB,SAAS,aAAa;AACpB,SAAO,QAAQ,IAAI,YAAY;AACjC;AAEA,SAAS,YAAY;AAEnB,UAAQ,QAAQ,IAAI,UAAU,WAAW,YAAY;AACvD;AAEA,SAAS,YAAY,gBAA0B,MAAoC,QAAQ;AACvF,QAAM,WAAW,CAAC;AAClB,iBAAe,QAAQ,CAAC,gBAAgB;AACtC,aAAS,KAAK,KAAK,QAAQ,KAAK,QAAQ,WAAS,MAAM,YAAY,QAAQ,IAAI,CAAC,GAAG,MAAM,WAAW,CAAC;AACrG,aAAS,KAAK,KAAK,QAAQ,QAAQ,IAAI,GAAG,WAAW,CAAC;AAAA,EACxD,CAAC;AAGD,QAAM,UAAU,SAAS,KAAK,CAACA,aAAY,GAAG,WAAWA,QAAO,CAAC;AAEjE,MAAI,SAAS;AACT,WAAO,OAAO,EAAE,MAAM,QAAQ,CAAC;AAE/B,QAAI,QAAQ,QAAQ;AAChB,cAAQ,KAAK,UAAK,KAAK,SAAS,OAAO,CAAC,UAAU;AAAA,IACtD;AAAA,EAEJ,WAAW,QAAQ,QAAQ;AACvB,YAAQ,KAAK,+CAAqC,eAAe,KAAK,IAAI,CAAC,EAAE;AAAA,EACjF;AACJ;AAGA,IAAI,QAAQ,IAAI,mBAAmB,QAAW;AAC1C,cAAY,CAAC,YAAY,CAAC;AAC9B;AAGA,YAAY,CAAC,QAAQ,WAAW,CAAC,IAAI,MAAM,GAAG,MAAM;AAEpD,IAAI,QAAQ,IAAI,WAAW,QAAW;AACpC,cAAY,CAAC,QAAQ,UAAU,CAAC,IAAI,WAAW,CAAC,EAAE,GAAG,SAAS;AAChE;",
+  "sourcesContent": ["import fs from 'fs';\nimport path from 'path';\nimport dotenv from 'dotenv';\n\nfunction getEnvFromArgv() {\n  const envIndex = process.argv.indexOf(\"--env\");\n  return (envIndex !== -1) ? process.argv[envIndex + 1] : undefined;\n}\n\nfunction getNodeEnv() {\n  return process.env.NODE_ENV || getEnvFromArgv() || \"development\";\n}\n\nfunction getRegion() {\n  // EU, NA, AS, AF, AU, SA, UNKNOWN\n  return (process.env.REGION || \"unknown\").toLowerCase();\n}\n\nfunction loadEnvFile(envFileOptions: string[], log: 'none' | 'success' | 'both'  = 'none') {\n    const envPaths = [];\n    envFileOptions.forEach((envFilename) => {\n      envPaths.push(path.resolve(path.dirname(require?.main?.filename || process.cwd()), \"..\", envFilename));\n      envPaths.push(path.resolve(process.cwd(), envFilename));\n    });\n\n    // return the first .env path found\n    const envPath = envPaths.find((envPath) => fs.existsSync(envPath));\n\n    if (envPath) {\n        dotenv.config({ path: envPath });\n\n        if (log !== \"none\") {\n            console.info(`\u2705 ${path.basename(envPath)} loaded.`);\n        }\n\n    } else if (log === \"both\") {\n        console.info(`\u2139\uFE0F  optional .env file not found: ${envFileOptions.join(\", \")}`);\n    }\n}\n\n// load .env.cloud defined on admin panel\nif (process.env.COLYSEUS_CLOUD !== undefined) {\n    loadEnvFile([`.env.cloud`]);\n}\n\n// (overrides previous env configs)\nloadEnvFile([`.env.${getNodeEnv()}`, `.env`], 'both');\n\nif (process.env.REGION !== undefined) {\n  loadEnvFile([`.env.${getRegion()}.${getNodeEnv()}`], 'success');\n}"],
+  "mappings": ";;;;;;;;AAAA,OAAO,QAAQ;AACf,OAAO,UAAU;AACjB,OAAO,YAAY;AAEnB,SAAS,iBAAiB;AACxB,QAAM,WAAW,QAAQ,KAAK,QAAQ,OAAO;AAC7C,SAAQ,aAAa,KAAM,QAAQ,KAAK,WAAW,CAAC,IAAI;AAC1D;AAEA,SAAS,aAAa;AACpB,SAAO,QAAQ,IAAI,YAAY,eAAe,KAAK;AACrD;AAEA,SAAS,YAAY;AAEnB,UAAQ,QAAQ,IAAI,UAAU,WAAW,YAAY;AACvD;AAEA,SAAS,YAAY,gBAA0B,MAAoC,QAAQ;AACvF,QAAM,WAAW,CAAC;AAClB,iBAAe,QAAQ,CAAC,gBAAgB;AACtC,aAAS,KAAK,KAAK,QAAQ,KAAK,QAAQ,WAAS,MAAM,YAAY,QAAQ,IAAI,CAAC,GAAG,MAAM,WAAW,CAAC;AACrG,aAAS,KAAK,KAAK,QAAQ,QAAQ,IAAI,GAAG,WAAW,CAAC;AAAA,EACxD,CAAC;AAGD,QAAM,UAAU,SAAS,KAAK,CAACA,aAAY,GAAG,WAAWA,QAAO,CAAC;AAEjE,MAAI,SAAS;AACT,WAAO,OAAO,EAAE,MAAM,QAAQ,CAAC;AAE/B,QAAI,QAAQ,QAAQ;AAChB,cAAQ,KAAK,UAAK,KAAK,SAAS,OAAO,CAAC,UAAU;AAAA,IACtD;AAAA,EAEJ,WAAW,QAAQ,QAAQ;AACvB,YAAQ,KAAK,+CAAqC,eAAe,KAAK,IAAI,CAAC,EAAE;AAAA,EACjF;AACJ;AAGA,IAAI,QAAQ,IAAI,mBAAmB,QAAW;AAC1C,cAAY,CAAC,YAAY,CAAC;AAC9B;AAGA,YAAY,CAAC,QAAQ,WAAW,CAAC,IAAI,MAAM,GAAG,MAAM;AAEpD,IAAI,QAAQ,IAAI,WAAW,QAAW;AACpC,cAAY,CAAC,QAAQ,UAAU,CAAC,IAAI,WAAW,CAAC,EAAE,GAAG,SAAS;AAChE;",
   "names": ["envPath"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colyseus/tools",
-  "version": "0.16.7",
+  "version": "0.16.9",
   "description": "Simplify the development and production settings for your Colyseus project.",
   "input": "./src/index.ts",
   "main": "./build/index.js",
@@ -50,9 +50,9 @@
     "@types/cors": "^2.8.10",
     "@types/dotenv": "^8.2.0",
     "uwebsockets-express": "^1.1.10",
-    "@colyseus/core": "^0.16.17",
+    "@colyseus/core": "^0.16.18",
     "@colyseus/ws-transport": "^0.16.5",
-    "@colyseus/uwebsockets-transport": "^0.16.8"
+    "@colyseus/uwebsockets-transport": "^0.16.9"
   },
   "peerDependencies": {
     "@colyseus/core": "0.16.x",

package/system-boot.js

@@ -6,57 +6,63 @@ const { execSync } = require('child_process');
 
 const NGINX_LIMITS_CONFIG_FILE = '/etc/nginx/colyseus_limits.conf';
 const LIMITS_CONF_FILE = '/etc/security/limits.d/colyseus.conf';
-const SYSCTL_FILE = '/etc/sysctl.d/local.conf'
+const SYSCTL_FILE = '/etc/sysctl.d/local.conf';
 
-const MAX_CCU_PER_CPU = 8000;
+const MAX_CCU_PER_CPU = 5000;
 
 /**
  * System-wide limits configuration for high-CCU environments
  * @param {Object} options
  * @param {number} options.maxCCUPerCPU - Maximum concurrent users per CPU core
- * @param {number} options.connectionsMultiplier - Multiplier for worker connections (default: 3)
- * @param {number} options.fileDescriptorMultiplier - Multiplier for max file descriptors (default: 4)
+ * @param {number} options.connectionsMultiplier - Multiplier for worker connections (default: 2)
+ * @param {number} options.fileDescriptorMultiplier - Multiplier for max file descriptors (default: 6)
  */
 function configureSystemLimits(options = {}) {
   const {
-    connectionsMultiplier = 3,
-    fileDescriptorMultiplier = 4
+    connectionsMultiplier = 2,
+    fileDescriptorMultiplier = 6
   } = options;
 
   const numCPU = os.cpus().length;
   const maxCCU = numCPU * MAX_CCU_PER_CPU;
 
   // Calculate limits
-  const workerConnections = maxCCU * connectionsMultiplier;
-  const maxFileDescriptors = maxCCU * fileDescriptorMultiplier;
+  const workerConnections = Math.min(maxCCU * connectionsMultiplier, 65535); // Cap at max_socket_backlog (65535)
+  let maxFileDescriptors = maxCCU * fileDescriptorMultiplier;
+  const workerRlimitNofile = Math.ceil(workerConnections * 3.5); // Assume 3.5 file descriptors per connection for safety
 
-  // Nginx-specific calculations
-  const workerRlimitNofile = (workerConnections / numCPU) * 2;
+  // Calculate total file descriptors needed
+  const totalFileDescriptors = workerRlimitNofile * numCPU;
 
-  // Validation checks
-  if (workerConnections > 65535) {
-    console.warn(`Warning: worker_connections (${workerConnections}) exceeds typical max_socket_backlog (65535)`);
+  if (totalFileDescriptors > maxFileDescriptors) {
+    console.warn(`Warning: Total file descriptors (${totalFileDescriptors}) exceeds maxFileDescriptors (${maxFileDescriptors}). Increasing maxFileDescriptors.`);
+    maxFileDescriptors = totalFileDescriptors * 1.5; // 50% safety margin
   }
 
-  if (maxFileDescriptors > 1048576) {
-    console.warn(`Warning: Very high file descriptor limit (${maxFileDescriptors}). Verify system capabilities.`);
+  // Check memory (rough estimate: 150 KB per connection)
+  const estimatedMemoryMB = (workerConnections * numCPU * 150) / 1024;
+  const totalMemoryMB = Number(execSync('free -m | awk \'/Mem:/ {print $2}\'').toString().trim());
+  if (estimatedMemoryMB > totalMemoryMB * 0.8) {
+    console.warn(`Warning: Estimated memory usage (${estimatedMemoryMB} MB) exceeds 80% of available memory (${totalMemoryMB} MB). Consider reducing MAX_CCU_PER_CPU.`);
   }
 
   if (process.argv.includes('--dry-run')) {
     console.log({
+      numCPU,
       maxCCU,
       workerConnections,
       maxFileDescriptors,
-      workerRlimitNofile
-    })
+      workerRlimitNofile,
+      totalFileDescriptors,
+      estimatedMemoryMB
+    });
     process.exit();
   }
 
   // Configuration updates
   try {
     // Update Nginx limits
-    if (fs.existsSync(NGINX_LIMITS_CONFIG_FILE)) {
-      fs.writeFileSync(NGINX_LIMITS_CONFIG_FILE, `
+    fs.writeFileSync(NGINX_LIMITS_CONFIG_FILE, `
 worker_rlimit_nofile ${workerRlimitNofile};
 events {
     use epoll;
@@ -64,7 +70,6 @@ events {
     multi_accept on;
 }
 `);
-    }
 
     // Update system-wide limits
     fs.writeFileSync(LIMITS_CONF_FILE, `
@@ -74,7 +79,7 @@ nginx soft nofile ${maxFileDescriptors}
 nginx hard nofile ${maxFileDescriptors}
 `);
 
-    // Update sysctl with doubled file-max for safety margin
+    // Update sysctl
     fs.writeFileSync(SYSCTL_FILE, `
 # System-wide file descriptor limit
 fs.file-max = ${maxFileDescriptors * 2}
@@ -99,7 +104,11 @@ net.ipv4.tcp_keepalive_probes = 3
 `);
 
     // Apply sysctl changes
-    execSync("sysctl -p", { stdio: 'inherit' });
+    execSync('sysctl -p', { stdio: 'inherit' });
+
+    // Reload systemd
+    execSync('systemctl daemon-reload', { stdio: 'inherit' });
+
     console.log(`System limits configured successfully for ${maxCCU} CCU (${MAX_CCU_PER_CPU}/CPU)`);
 
   } catch (error) {