fix(sandbox): resolve wait on disconnect

Complete live command and PTY wait promises immediately when disconnecting so socket event timing cannot leave Node 14 tests hanging.

Author: miclle

qiniu/sandbox/commands.js

@@ -108,6 +108,7 @@ function CommandHandle (commands, pid, result, opts, request, waitPromise) {
     this.opts = opts || {};
     this._request = request;
     this._waitPromise = waitPromise;
+    this._resolveWait = null;
     this.stdout = result && result.stdout ? result.stdout : '';
     this.stderr = result && result.stderr ? result.stderr : '';
 }
@@ -135,11 +136,26 @@ CommandHandle.prototype.kill = function () {
 };
 
 CommandHandle.prototype.disconnect = function () {
+    this._disconnected = true;
     if (this._request) {
-        this._disconnected = true;
         this._request.destroy();
         this._request = null;
     }
+    if (this._resolveWait) {
+        const result = this.result || {
+            pid: this.pid,
+            exitCode: 0,
+            stdout: this.stdout,
+            stderr: this.stderr,
+            error: ''
+        };
+        if (result.exitCode === -1) {
+            result.exitCode = 0;
+        }
+        this.result = result;
+        this._resolveWait(result);
+        this._resolveWait = null;
+    }
     return Promise.resolve();
 };
 
@@ -212,6 +228,7 @@ function connectLiveCommand (commands, procedure, body, opts, fallbackPid) {
                 cleanupStartTimer();
                 result.pid = pid || result.pid;
                 handle = new CommandHandle(commands, result.pid, null, opts, req, waitPromise);
+                handle._resolveWait = resolveWait;
                 settled = true;
                 resolve(handle);
             }
@@ -248,6 +265,7 @@ function connectLiveCommand (commands, procedure, body, opts, fallbackPid) {
             result.error = end && end.error ? end.error : '';
             if (handle) {
                 handle.result = result;
+                handle._resolveWait = null;
             }
             resolveWait(result);
         }

qiniu/sandbox/pty.js

@@ -33,6 +33,7 @@ function LivePtyHandle (pty, pid, request, waitPromise, opts) {
     this.pid = pid;
     this._request = request;
     this._waitPromise = waitPromise;
+    this._resolveWait = null;
     this.opts = opts || {};
     this.stdout = '';
     this.stderr = '';
@@ -52,11 +53,20 @@ LivePtyHandle.prototype.kill = function () {
 };
 
 LivePtyHandle.prototype.disconnect = function () {
+    this._disconnected = true;
     if (this._request) {
-        this._disconnected = true;
         this._request.destroy();
         this._request = null;
     }
+    if (this._resolveWait) {
+        const result = {
+            exitCode: 0,
+            stdout: this.stdout,
+            stderr: this.stderr
+        };
+        this._resolveWait(result);
+        this._resolveWait = null;
+    }
     return Promise.resolve();
 };
 
@@ -124,6 +134,7 @@ function connectLivePty (sandbox, procedure, body, opts, pty) {
             if (event.start && !handle) {
                 cleanupStartTimer();
                 handle = new LivePtyHandle(pty, event.start.pid, req, waitPromise, opts);
+                handle._resolveWait = resolveWait;
                 settled = true;
                 resolve(handle);
             }
@@ -151,6 +162,9 @@ function connectLivePty (sandbox, procedure, body, opts, pty) {
                     exitCode: event.end.exitCode === undefined ? 0 : event.end.exitCode,
                     error: event.end.error || ''
                 });
+                if (handle) {
+                    handle._resolveWait = null;
+                }
                 resolveWait(result);
             }
         }