Handle ptyprocess exit normally

Signed-off-by: Yilun <zyl.skysniper@gmail.com>
nknorg · Nov 14, 2019 · eb54df6 · eb54df6
1 parent 379a39c
commit eb54df6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -209,6 +209,7 @@ class Session {
     this.client = client;
     this.remoteAddr = remoteAddr;
     this.outputBuffer = '';
+    this.exit = false;
     this.ptyProcess = (0, _nodePty.spawn)(shell, [], Object.assign({
       name: 'xterm-color',
       cols: ptyCols,
@@ -219,6 +220,10 @@ class Session {
     this.ptyProcess.onData(data => {
       this.outputBuffer += data;
     });
+    this.ptyProcess.onExit(() => {
+      this.exit = true;
+      delete sessions[this.remoteAddr];
+    });
 
     this.flushSession = () => {
       if (this.outputBuffer.length > 0) {
@@ -237,9 +242,13 @@ class Session {
           console.error("Send msg error:", e);
         }
 
-        this.flushTimeout = setTimeout(this.flushSession, sessionFlushIntervalInUse);
+        if (!this.exit) {
+          this.flushTimeout = setTimeout(this.flushSession, sessionFlushIntervalInUse);
+        }
       } else {
-        this.flushTimeout = setTimeout(this.flushSession, sessionFlushIntervalIdle);
+        if (!this.exit) {
+          this.flushTimeout = setTimeout(this.flushSession, sessionFlushIntervalIdle);
+        }
       }
     };
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nkn-shell-daemon",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "NKN Shell Daemon",
   "main": "nshd.js",
   "bin": {

diff --git a/src/index.js b/src/index.js
@@ -196,6 +196,7 @@ class Session {
     this.client = client
     this.remoteAddr = remoteAddr
     this.outputBuffer = ''
+    this.exit = false
     this.ptyProcess = spawn(shell, [], Object.assign({
       name: 'xterm-color',
       cols: ptyCols,
@@ -208,6 +209,11 @@ class Session {
       this.outputBuffer += data
     })
 
+    this.ptyProcess.onExit(() => {
+      this.exit = true
+      delete sessions[this.remoteAddr]
+    })
+
     this.flushSession = () => {
       if (this.outputBuffer.length > 0) {
         let res = {
@@ -221,9 +227,13 @@ class Session {
         } catch (e) {
           console.error("Send msg error:", e)
         }
-        this.flushTimeout = setTimeout(this.flushSession, sessionFlushIntervalInUse)
+        if (!this.exit) {
+          this.flushTimeout = setTimeout(this.flushSession, sessionFlushIntervalInUse)
+        }
       } else {
-        this.flushTimeout = setTimeout(this.flushSession, sessionFlushIntervalIdle)
+        if (!this.exit) {
+          this.flushTimeout = setTimeout(this.flushSession, sessionFlushIntervalIdle)
+        }
       }
     }