Expose proper PID on windows and clean up process handle

Fixes chjj#45
ddm · Mar 13, 2017 · c6f65ab · c6f65ab
1 parent 05b02dc
commit c6f65ab
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/win/pty.cc b/src/win/pty.cc
@@ -246,6 +246,8 @@ static NAN_METHOD(PtyStartProcess) {
   // Pty object values.
   Local<Object> marshal = Nan::New<Object>();
 
+  marshal->Set(Nan::New<String>("innerPid").ToLocalChecked(), Nan::New<Number>((int)GetProcessId(handle)));
+  marshal->Set(Nan::New<String>("innerPidHandle").ToLocalChecked(), Nan::New<Number>((int)handle));
   marshal->Set(Nan::New<String>("pid").ToLocalChecked(), Nan::New<Number>((int)winpty_agent_process(pc)));
   marshal->Set(Nan::New<String>("pty").ToLocalChecked(), Nan::New<Number>(InterlockedIncrement(&ptyCounter)));
   marshal->Set(Nan::New<String>("fd").ToLocalChecked(), Nan::New<Number>(-1));
@@ -311,18 +313,21 @@ static NAN_METHOD(PtyResize) {
 static NAN_METHOD(PtyKill) {
   Nan::HandleScope scope;
 
-  if (info.Length() != 1
-    || !info[0]->IsNumber()) // pid
+  if (info.Length() != 2
+    || !info[0]->IsNumber() // pid
+    || !info[1]->IsNumber()) // innerPidHandle
   {
     return Nan::ThrowError("Usage: pty.kill(pid)");
   }
 
   int handle = info[0]->Int32Value();
+  HANDLE innerPidHandle = (HANDLE)info[0]->Int32Value();
 
   winpty_t *pc = get_pipe_handle(handle);
 
   assert(pc != nullptr);
   assert(remove_pipe_handle(handle));
+  CloseHandle(innerPidHandle);
 
   return info.GetReturnValue().SetUndefined();
 }

diff --git a/src/windowsPtyAgent.ts b/src/windowsPtyAgent.ts
@@ -21,6 +21,9 @@ export class WindowsPtyAgent {
   private _inSocket: net.Socket;
   private _outSocket: net.Socket;
   private _pid: number;
+  private _innerPid: number;
+  private _innerPidHandle: number;
+
   private _fd: any;
   private _pty: number;
 
@@ -50,6 +53,8 @@ export class WindowsPtyAgent {
 
     // Terminal pid.
     this._pid = term.pid;
+    this._innerPid = term.innerPid;
+    this._innerPidHandle = term.innerPidHandle;
 
     // Not available on windows.
     this._fd = term.fd;
@@ -83,7 +88,7 @@ export class WindowsPtyAgent {
     this._inSocket.writable = false;
     this._outSocket.readable = false;
     this._outSocket.writable = false;
-    pty.kill(this.pid);
+    pty.kill(this.pid, this._innerPidHandle);
   }
 }