@colyseus/tools 0.16.8 → 0.16.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colyseus/tools",
-  "version": "0.16.8",
+  "version": "0.16.9",
   "description": "Simplify the development and production settings for your Colyseus project.",
   "input": "./src/index.ts",
   "main": "./build/index.js",
@@ -50,7 +50,7 @@
     "@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.9"
   },

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) {