openmausbot 0.1.73 → 0.1.75

package/dist-server/server/engine-install.js

@@ -112,10 +112,16 @@ function runNpm(args, env, cwd, timeoutMs) {
         let timedOut = false;
         const timer = setTimeout(() => {
             timedOut = true;
-            void killCliTree(child);
+            void killCliTree(child).then((stopped) => {
+                rejectRun(new Error(stopped
+                    ? "The install took too long and was stopped. Check the server's network connection and try again."
+                    : "The install took too long, but npm could not be confirmed stopped. Ask the server administrator to stop the install process before trying again."));
+            });
         }, timeoutMs);
         timer.unref();
         child.once("error", (error) => {
+            if (timedOut)
+                return; // A failed kill is not a failed npm launch.
             clearTimeout(timer);
             rejectRun(new Error(error.code === "ENOENT"
                 ? "npm is not installed on this server. Install Node.js with npm for the user running OpenMausBot, then try again."
@@ -123,10 +129,8 @@ function runNpm(args, env, cwd, timeoutMs) {
         });
         child.once("close", (code) => {
             clearTimeout(timer);
-            if (timedOut) {
-                rejectRun(new Error("The install took too long and was stopped. Check the server's network connection and try again."));
-                return;
-            }
+            if (timedOut)
+                return; // The whole group must stop, not just npm's root.
             resolveRun({ code, output });
         });
     });