@colyseus/tools 0.15.32 → 0.15.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colyseus/tools",
-  "version": "0.15.32",
+  "version": "0.15.34",
   "description": "Colyseus Tools for Production",
   "input": "./src/index.ts",
   "main": "./build/index.js",

package/post-deploy.js

@@ -32,20 +32,42 @@ pm2.list(function(err, apps) {
     pm2.start(CONFIG_FILE, {...opts}, onAppRunning);
 
   } else {
-    // reload existing apps
-    pm2.reload(CONFIG_FILE, {...opts}, function(err, apps) {
-      bailOnErr(err);
-
-      const name = apps[0].name;
 
-      // scale app to use all CPUs available
-      if (apps.length !== maxCPU) {
-        pm2.scale(name, maxCPU, onAppRunning);
+    //
+    // detect if cwd has changed, and restart PM2 if it has
+    //
+    if (apps[0].pm2_env.pm_cwd !== pm2.cwd) {
+
+      //
+      // remove all and start again with new cwd
+      //
+      pm2.delete('all', function(err) {
+        // force to remove ~/.pm2 folder to avoid conflicts
+        fs.rmdirSync(path.join(process.env.HOME, '.pm2'), { recursive: true });
+
+        // start again
+        pm2.start(CONFIG_FILE, { ...opts }, onAppRunning);
+      });
+
+    } else {
+      //
+      // reload existing apps
+      //
+      pm2.reload(CONFIG_FILE, {...opts}, function(err, apps) {
+        bailOnErr(err);
+
+        const name = apps[0].name;
+
+        // scale app to use all CPUs available
+        if (apps.length !== maxCPU) {
+          pm2.scale(name, maxCPU, onAppRunning);
+
+        } else {
+          onAppRunning();
+        }
+      });
+    }
 
-      } else {
-        onAppRunning();
-      }
-    });
   }
 });
 
@@ -62,13 +84,14 @@ function updateColyseusBootService() {
   const COLYSEUS_CLOUD_BOOT_SERVICE = '/etc/systemd/system/colyseus-boot.service';
 
   // ignore if no boot service found
-  if (!fs.existsSync(COLYSEUS_CLOUD_BOOT_SERVICE)) { return; }
+  if (!fs.existsSync(COLYSEUS_CLOUD_BOOT_SERVICE)) {
+    return;
+  }
 
   const workingDirectory = pm2.cwd;
-  const execStart = __filename;
+  const execStart = `${detectPackageManager()} run colyseus-post-deploy`;
 
   const contents = fs.readFileSync(COLYSEUS_CLOUD_BOOT_SERVICE, 'utf8');
-
   try {
     fs.writeFileSync(COLYSEUS_CLOUD_BOOT_SERVICE, contents
       .replace(/WorkingDirectory=(.*)/, `WorkingDirectory=${workingDirectory}`)
@@ -120,6 +143,23 @@ function updateAndReloadNginx() {
   });
 }
 
+function detectPackageManager() {
+  const lockfiles = {
+    npm: path.resolve(pm2.cwd, 'package-lock.json'),
+    yarn: path.resolve(pm2.cwd, 'yarn.lock'),
+    pnpm: path.resolve(pm2.cwd, 'pnpm-lock.yaml'),
+    bun: path.resolve(pm2.cwd, 'bun.lockb'),
+  };
+
+  for (const [key, value] of Object.entries(lockfiles)) {
+    if (fs.existsSync(value)) {
+      return key;
+    }
+  }
+
+  return "npm";
+}
+
 function bailOnErr(err) {
   if (err) {
     console.error(err);