node-pty 1.1.0-beta5 → 1.1.0-beta6

package/src/win/winpty.cc

@@ -8,9 +8,11 @@
  *   with pseudo-terminal file descriptors.
  */
 
+#define NODE_ADDON_API_DISABLE_DEPRECATED
+#include <napi.h>
 #include <iostream>
+#include <assert.h>
 #include <map>
-#include <nan.h>
 #include <Shlwapi.h> // PathCombine, PathIsRelative
 #include <sstream>
 #include <stdlib.h>
@@ -24,8 +26,6 @@
 /**
 * Misc
 */
-extern "C" void init(v8::Local<v8::Object>);
-
 #define WINPTY_DBG_VARIABLE TEXT("WINPTYDBG")
 
 /**
@@ -66,28 +66,28 @@ static bool remove_pipe_handle(DWORD pid) {
   return false;
 }
 
-void throw_winpty_error(const char *generalMsg, winpty_error_ptr_t error_ptr) {
-  std::wstringstream why;
-  std::wstring msg(winpty_error_msg(error_ptr));
-  why << generalMsg << ": " << msg;
-  Nan::ThrowError(path_util::from_wstring(why.str().c_str()));
+Napi::Error error_with_winpty_msg(const char *generalMsg, winpty_error_ptr_t error_ptr, Napi::Env env) {
+  std::string why;
+  why += generalMsg;
+  why += ": ";
+  why += path_util::wstring_to_string(winpty_error_msg(error_ptr));
   winpty_error_free(error_ptr);
+  return Napi::Error::New(env, why);
 }
 
-static NAN_METHOD(PtyGetExitCode) {
-  Nan::HandleScope scope;
+static Napi::Value PtyGetExitCode(const Napi::CallbackInfo& info) {
+  Napi::Env env(info.Env());
+  Napi::HandleScope scope(env);
 
   if (info.Length() != 1 ||
-      !info[0]->IsNumber()) {
-    Nan::ThrowError("Usage: pty.getExitCode(pid)");
-    return;
+      !info[0].IsNumber()) {
+    throw Napi::Error::New(env, "Usage: pty.getExitCode(pid)");
   }
 
-  DWORD pid = info[0]->Uint32Value(Nan::GetCurrentContext()).FromJust();
+  DWORD pid = info[0].As<Napi::Number>().Uint32Value();
   HANDLE handle = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid);
   if (handle == NULL) {
-    info.GetReturnValue().Set(Nan::New<v8::Number>(-1));
-    return;
+    return Napi::Number::New(env, -1);
   }
 
   DWORD exitCode = 0;
@@ -97,95 +97,86 @@ static NAN_METHOD(PtyGetExitCode) {
   }
 
   CloseHandle(handle);
-  info.GetReturnValue().Set(Nan::New<v8::Number>(exitCode));
+  return Napi::Number::New(env, exitCode);
 }
 
-static NAN_METHOD(PtyGetProcessList) {
-  Nan::HandleScope scope;
+static Napi::Value PtyGetProcessList(const Napi::CallbackInfo& info) {
+  Napi::Env env(info.Env());
+  Napi::HandleScope scope(env);
 
   if (info.Length() != 1 ||
-      !info[0]->IsNumber()) {
-    Nan::ThrowError("Usage: pty.getProcessList(pid)");
-    return;
+      !info[0].IsNumber()) {
+    throw Napi::Error::New(env, "Usage: pty.getProcessList(pid)");
   }
 
-  DWORD pid = info[0]->Uint32Value(Nan::GetCurrentContext()).FromJust();
+  DWORD pid = info[0].As<Napi::Number>().Uint32Value();
   winpty_t *pc = get_pipe_handle(pid);
   if (pc == nullptr) {
-    info.GetReturnValue().Set(Nan::New<v8::Array>(0));
-    return;
+    return Napi::Number::New(env, 0);
   }
   int processList[64];
   const int processCount = 64;
   int actualCount = winpty_get_console_process_list(pc, processList, processCount, nullptr);
   if (actualCount <= 0) {
-    info.GetReturnValue().Set(Nan::New<v8::Array>(0));
-    return;
+    return Napi::Number::New(env, 0);
   }
-  uint32_t actualCountSize = static_cast<uint32_t>(actualCount);
-  v8::Local<v8::Array> result = Nan::New<v8::Array>(actualCountSize);
-  for (uint32_t i = 0; i < actualCountSize; i++) {
-    Nan::Set(result, i, Nan::New<v8::Number>(processList[i]));
+  Napi::Array result = Napi::Array::New(env, actualCount);
+  for (int i = 0; i < actualCount; i++) {
+    result.Set(i, Napi::Number::New(env, processList[i]));
   }
-  info.GetReturnValue().Set(result);
+  return result;
 }
 
-static NAN_METHOD(PtyStartProcess) {
-  Nan::HandleScope scope;
+static Napi::Value PtyStartProcess(const Napi::CallbackInfo& info) {
+  Napi::Env env(info.Env());
+  Napi::HandleScope scope(env);
 
   if (info.Length() != 7 ||
-      !info[0]->IsString() ||
-      !info[1]->IsString() ||
-      !info[2]->IsArray() ||
-      !info[3]->IsString() ||
-      !info[4]->IsNumber() ||
-      !info[5]->IsNumber() ||
-      !info[6]->IsBoolean()) {
-    Nan::ThrowError("Usage: pty.startProcess(file, cmdline, env, cwd, cols, rows, debug)");
-    return;
+      !info[0].IsString() ||
+      !info[1].IsString() ||
+      !info[2].IsArray() ||
+      !info[3].IsString() ||
+      !info[4].IsNumber() ||
+      !info[5].IsNumber() ||
+      !info[6].IsBoolean()) {
+    throw Napi::Error::New(env, "Usage: pty.startProcess(file, cmdline, env, cwd, cols, rows, debug)");
   }
 
-  const wchar_t *filename = path_util::to_wstring(Nan::Utf8String(info[0]));
-  const wchar_t *cmdline = path_util::to_wstring(Nan::Utf8String(info[1]));
-  const wchar_t *cwd = path_util::to_wstring(Nan::Utf8String(info[3]));
+  std::wstring filename(path_util::to_wstring(info[0].As<Napi::String>()));
+  std::wstring cmdline(path_util::to_wstring(info[1].As<Napi::String>()));
+  std::wstring cwd(path_util::to_wstring(info[3].As<Napi::String>()));
 
   // create environment block
-  std::wstring env;
-  const v8::Local<v8::Array> envValues = v8::Local<v8::Array>::Cast(info[2]);
+  std::wstring envStr;
+  const Napi::Array envValues = info[2].As<Napi::Array>();
   if (!envValues.IsEmpty()) {
-
-    std::wstringstream envBlock;
-
-    for(uint32_t i = 0; i < envValues->Length(); i++) {
-      std::wstring envValue(path_util::to_wstring(Nan::Utf8String(Nan::Get(envValues, i).ToLocalChecked())));
-      envBlock << envValue << L'\0';
+    std::wstring envBlock;
+    for(uint32_t i = 0; i < envValues.Length(); i++) {
+      envBlock += path_util::to_wstring(envValues.Get(i).As<Napi::String>());
+      envBlock += L'\0';
     }
-
-    env = envBlock.str();
+    envStr = std::move(envBlock);
   }
 
   // use environment 'Path' variable to determine location of
   // the relative path that we have recieved (e.g cmd.exe)
   std::wstring shellpath;
-  if (::PathIsRelativeW(filename)) {
+  if (::PathIsRelativeW(filename.c_str())) {
     shellpath = path_util::get_shell_path(filename);
   } else {
     shellpath = filename;
   }
 
   if (shellpath.empty() || !path_util::file_exists(shellpath)) {
-    std::wstringstream why;
-    why << "File not found: " << shellpath;
-    Nan::ThrowError(path_util::from_wstring(why.str().c_str()));
-    delete filename;
-    delete cmdline;
-    delete cwd;
-    return;
+    std::string why;
+    why += "File not found: ";
+    why += path_util::wstring_to_string(shellpath);
+    throw Napi::Error::New(env, why);
   }
 
-  int cols = info[4]->Int32Value(Nan::GetCurrentContext()).FromJust();
-  int rows = info[5]->Int32Value(Nan::GetCurrentContext()).FromJust();
-  bool debug = Nan::To<bool>(info[6]).FromJust();
+  int cols = info[4].As<Napi::Number>().Int32Value();
+  int rows = info[5].As<Napi::Number>().Int32Value();
+  bool debug = info[6].As<Napi::Boolean>().Value();
 
   // Enable/disable debugging
   SetEnvironmentVariable(WINPTY_DBG_VARIABLE, debug ? "1" : NULL); // NULL = deletes variable
@@ -194,11 +185,7 @@ static NAN_METHOD(PtyStartProcess) {
   winpty_error_ptr_t error_ptr = nullptr;
   winpty_config_t* winpty_config = winpty_config_new(0, &error_ptr);
   if (winpty_config == nullptr) {
-    throw_winpty_error("Error creating WinPTY config", error_ptr);
-    delete filename;
-    delete cmdline;
-    delete cwd;
-    return;
+    throw error_with_winpty_msg("Error creating WinPTY config", error_ptr, env);
   }
   winpty_error_free(error_ptr);
 
@@ -209,23 +196,15 @@ static NAN_METHOD(PtyStartProcess) {
   winpty_t *pc = winpty_open(winpty_config, &error_ptr);
   winpty_config_free(winpty_config);
   if (pc == nullptr) {
-    throw_winpty_error("Error launching WinPTY agent", error_ptr);
-    delete filename;
-    delete cmdline;
-    delete cwd;
-    return;
+    throw error_with_winpty_msg("Error launching WinPTY agent", error_ptr, env);
   }
   winpty_error_free(error_ptr);
 
   // Create winpty spawn config
-  winpty_spawn_config_t* config = winpty_spawn_config_new(WINPTY_SPAWN_FLAG_AUTO_SHUTDOWN, shellpath.c_str(), cmdline, cwd, env.c_str(), &error_ptr);
+  winpty_spawn_config_t* config = winpty_spawn_config_new(WINPTY_SPAWN_FLAG_AUTO_SHUTDOWN, shellpath.c_str(), cmdline.c_str(), cwd.c_str(), envStr.c_str(), &error_ptr);
   if (config == nullptr) {
-    throw_winpty_error("Error creating WinPTY spawn config", error_ptr);
     winpty_free(pc);
-    delete filename;
-    delete cmdline;
-    delete cwd;
-    return;
+    throw error_with_winpty_msg("Error creating WinPTY spawn config", error_ptr, env);
   }
   winpty_error_free(error_ptr);
 
@@ -234,121 +213,99 @@ static NAN_METHOD(PtyStartProcess) {
   BOOL spawnSuccess = winpty_spawn(pc, config, &handle, nullptr, nullptr, &error_ptr);
   winpty_spawn_config_free(config);
   if (!spawnSuccess) {
-    throw_winpty_error("Unable to start terminal process", error_ptr);
     if (handle) {
       CloseHandle(handle);
     }
     winpty_free(pc);
-    delete filename;
-    delete cmdline;
-    delete cwd;
-    return;
+    throw error_with_winpty_msg("Unable to start terminal process", error_ptr, env);
   }
   winpty_error_free(error_ptr);
 
   LPCWSTR coninPipeName = winpty_conin_name(pc);
   std::string coninPipeNameStr(path_util::from_wstring(coninPipeName));
   if (coninPipeNameStr.empty()) {
-    Nan::ThrowError("Failed to initialize winpty conin");
     CloseHandle(handle);
     winpty_free(pc);
-    delete filename;
-    delete cmdline;
-    delete cwd;
-    return;
+    throw Napi::Error::New(env, "Failed to initialize winpty conin");
   }
 
   LPCWSTR conoutPipeName = winpty_conout_name(pc);
   std::string conoutPipeNameStr(path_util::from_wstring(conoutPipeName));
   if (conoutPipeNameStr.empty()) {
-    Nan::ThrowError("Failed to initialize winpty conout");
     CloseHandle(handle);
     winpty_free(pc);
-    delete filename;
-    delete cmdline;
-    delete cwd;
-    return;
+    throw Napi::Error::New(env, "Failed to initialize winpty conout");
   }
 
   DWORD innerPid = GetProcessId(handle);
   if (createdHandles[innerPid]) {
-    std::stringstream why;
-    why << "There is already a process with innerPid " << innerPid;
-    Nan::ThrowError(why.str().c_str());
     CloseHandle(handle);
     winpty_free(pc);
-    delete filename;
-    delete cmdline;
-    delete cwd;
-    return;
+    std::stringstream why;
+    why << "There is already a process with innerPid " << innerPid;
+    throw Napi::Error::New(env, why.str());
   }
   createdHandles[innerPid] = handle;
 
   // Save pty struct for later use
   ptyHandles.push_back(pc);
 
-  v8::Local<v8::Object> marshal = Nan::New<v8::Object>();
   DWORD pid = GetProcessId(winpty_agent_process(pc));
-  Nan::Set(marshal, Nan::New<v8::String>("innerPid").ToLocalChecked(), Nan::New<v8::Number>(static_cast<double>(innerPid)));
-  Nan::Set(marshal, Nan::New<v8::String>("pid").ToLocalChecked(), Nan::New<v8::Number>(static_cast<double>(pid)));
-  Nan::Set(marshal, Nan::New<v8::String>("pty").ToLocalChecked(), Nan::New<v8::Number>(InterlockedIncrement(&ptyCounter)));
-  Nan::Set(marshal, Nan::New<v8::String>("fd").ToLocalChecked(), Nan::New<v8::Number>(-1));
-  Nan::Set(marshal, Nan::New<v8::String>("conin").ToLocalChecked(), Nan::New<v8::String>(coninPipeNameStr).ToLocalChecked());
-  Nan::Set(marshal, Nan::New<v8::String>("conout").ToLocalChecked(), Nan::New<v8::String>(conoutPipeNameStr).ToLocalChecked());
-  info.GetReturnValue().Set(marshal);
-
-  delete filename;
-  delete cmdline;
-  delete cwd;
+  Napi::Object marshal = Napi::Object::New(env);
+  marshal.Set("innerPid", Napi::Number::New(env, (int)innerPid));
+  marshal.Set("pid", Napi::Number::New(env, (int)pid));
+  marshal.Set("pty", Napi::Number::New(env, InterlockedIncrement(&ptyCounter)));
+  marshal.Set("fd", Napi::Number::New(env, -1));
+  marshal.Set("conin", Napi::String::New(env, coninPipeNameStr));
+  marshal.Set("conout", Napi::String::New(env, conoutPipeNameStr));
+
+  return marshal;
 }
 
-static NAN_METHOD(PtyResize) {
-  Nan::HandleScope scope;
+static Napi::Value PtyResize(const Napi::CallbackInfo& info) {
+  Napi::Env env(info.Env());
+  Napi::HandleScope scope(env);
 
   if (info.Length() != 3 ||
-      !info[0]->IsNumber() ||
-      !info[1]->IsNumber() ||
-      !info[2]->IsNumber()) {
-    Nan::ThrowError("Usage: pty.resize(pid, cols, rows)");
-    return;
+      !info[0].IsNumber() ||
+      !info[1].IsNumber() ||
+      !info[2].IsNumber()) {
+    throw Napi::Error::New(env, "Usage: pty.resize(pid, cols, rows)");
   }
 
-  DWORD pid = info[0]->Uint32Value(Nan::GetCurrentContext()).FromJust();
-  int cols = info[1]->Int32Value(Nan::GetCurrentContext()).FromJust();
-  int rows = info[2]->Int32Value(Nan::GetCurrentContext()).FromJust();
+  DWORD pid = info[0].As<Napi::Number>().Uint32Value();
+  int cols = info[1].As<Napi::Number>().Int32Value();
+  int rows = info[2].As<Napi::Number>().Int32Value();
 
   winpty_t *pc = get_pipe_handle(pid);
 
   if (pc == nullptr) {
-    Nan::ThrowError("The pty doesn't appear to exist");
-    return;
+    throw Napi::Error::New(env, "The pty doesn't appear to exist");
   }
   BOOL success = winpty_set_size(pc, cols, rows, nullptr);
   if (!success) {
-    Nan::ThrowError("The pty could not be resized");
-    return;
+    throw Napi::Error::New(env, "The pty could not be resized");
   }
 
-  return info.GetReturnValue().SetUndefined();
+  return env.Undefined();
 }
 
-static NAN_METHOD(PtyKill) {
-  Nan::HandleScope scope;
+static Napi::Value PtyKill(const Napi::CallbackInfo& info) {
+  Napi::Env env(info.Env());
+  Napi::HandleScope scope(env);
 
   if (info.Length() != 2 ||
-      !info[0]->IsNumber() ||
-      !info[1]->IsNumber()) {
-    Nan::ThrowError("Usage: pty.kill(pid, innerPid)");
-    return;
+      !info[0].IsNumber() ||
+      !info[1].IsNumber()) {
+    throw Napi::Error::New(env, "Usage: pty.kill(pid, innerPid)");
   }
 
-  DWORD pid = info[0]->Uint32Value(Nan::GetCurrentContext()).FromJust();
-  DWORD innerPid = info[1]->Uint32Value(Nan::GetCurrentContext()).FromJust();
+  DWORD pid = info[0].As<Napi::Number>().Uint32Value();
+  DWORD innerPid = info[1].As<Napi::Number>().Uint32Value();
 
   winpty_t *pc = get_pipe_handle(pid);
   if (pc == nullptr) {
-    Nan::ThrowError("Pty seems to have been killed already");
-    return;
+    throw Napi::Error::New(env, "Pty seems to have been killed already");
   }
 
   assert(remove_pipe_handle(pid));
@@ -357,20 +314,20 @@ static NAN_METHOD(PtyKill) {
   createdHandles.erase(innerPid);
   CloseHandle(innerPidHandle);
 
-  return info.GetReturnValue().SetUndefined();
+  return env.Undefined();
 }
 
 /**
 * Init
 */
 
-extern "C" void init(v8::Local<v8::Object> target) {
-  Nan::HandleScope scope;
-  Nan::SetMethod(target, "startProcess", PtyStartProcess);
-  Nan::SetMethod(target, "resize", PtyResize);
-  Nan::SetMethod(target, "kill", PtyKill);
-  Nan::SetMethod(target, "getExitCode", PtyGetExitCode);
-  Nan::SetMethod(target, "getProcessList", PtyGetProcessList);
+Napi::Object init(Napi::Env env, Napi::Object exports) {
+  exports.Set("startProcess", Napi::Function::New(env, PtyStartProcess));
+  exports.Set("resize", Napi::Function::New(env, PtyResize));
+  exports.Set("kill", Napi::Function::New(env, PtyKill));
+  exports.Set("getExitCode", Napi::Function::New(env, PtyGetExitCode));
+  exports.Set("getProcessList", Napi::Function::New(env, PtyGetProcessList));
+  return exports;
 };
 
-NODE_MODULE(pty, init);
+NODE_API_MODULE(NODE_GYP_MODULE_NAME, init);