@colyseus/tools 0.15.47 → 0.15.49

package/package.json

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

package/pm2/post-deploy-agent.js

@@ -79,21 +79,19 @@ function postDeploy(cwd, reply) {
       });
     }
 
-    console.log("apps[0].pm2_env.pm_cwd =>", apps[0].pm2_env.pm_cwd);
-    console.log("cwd =>", cwd);
-
     //
     // detect if cwd has changed, and restart PM2 if it has
     //
     if (apps[0].pm2_env.pm_cwd !== cwd) {
-      console.log("cwd has changed. restarting PM2...");
+      console.log("App Root Directory changed. Restarting may take a bit longer...");
 
       //
       // remove all and start again with new cwd
       //
-      return pm2.delete(shared.NAMESPACE, function(err) {
+      return pm2.delete('all', function (err) {
+        logIfError(err);
+
         // start again
-        // (TODO: make sure CWD is actually changed after this...)
         pm2.start(config, { ...opts }, (err, result) => {
           reply({ success: !err, message: err?.message });
           updateAndSave(err, result);
@@ -133,7 +131,7 @@ function postDeploy(cwd, reply) {
      * - Stop old processes
      * - Spawn/reactivate the rest of the processes (shared.MAX_ACTIVE_PROCESSES)
      */
-    const onFirstAppsStart = (initialApps, err, result) => {
+    const onFirstAppsStart = async (initialApps, err, result) => {
       /**
        * release post-deploy action while proceeding with graceful restart of other processes
        */
@@ -149,6 +147,11 @@ function postDeploy(cwd, reply) {
        */
       writeNginxConfig(initialApps);
 
+      //
+      // Wait 1.5 seconds to ensure NGINX is updated & reloaded
+      //
+      await new Promise(resolve => setTimeout(resolve, 1500));
+
       //
       // Asynchronously stop/restart apps with active connections
       // (They make take from minutes up to hours to stop)

package/post-deploy.js

@@ -22,8 +22,6 @@ if (!CONFIG_FILE) {
 
 const CONFIG_FILE_PATH = `${pm2.cwd}/${CONFIG_FILE}`;
 
-let config = undefined;
-
 /**
  * Try to handle post-deploy via PM2 module first (pm2 install @colyseus/tools)
  * If not available, fallback to legacy post-deploy script.
@@ -31,7 +29,6 @@ let config = undefined;
 pm2.trigger('@colyseus/tools', 'post-deploy', `${pm2.cwd}:${CONFIG_FILE_PATH}`, async function (err, result) {
   if (err) {
     console.log("Proceeding with legacy post-deploy script...");
-    config = await shared.getAppConfig(CONFIG_FILE_PATH);
     postDeploy();
 
   } else {
@@ -53,7 +50,7 @@ async function postDeploy() {
       //
       // first deploy
       //
-      pm2.start(config, { ...opts }, () => onAppRunning());
+      pm2.start(CONFIG_FILE_PATH, { ...opts }, () => onAppRunning());
 
     } else {
 
@@ -88,13 +85,13 @@ function restartAll () {
   pm2.delete('all', function (err) {
     // kill & start again
     pm2.kill(function () {
-      pm2.start(config, { ...opts }, () => onAppRunning());
+      pm2.start(CONFIG_FILE_PATH, { ...opts }, () => onAppRunning());
     });
   });
 }
 
 function reloadAll(retry = 0) {
-  pm2.reload(config, { ...opts }, function (err, apps) {
+  pm2.reload(CONFIG_FILE_PATH, { ...opts }, function (err, apps) {
     if (err) {
       //
       // Retry in case of "Reload in progress" error.