diff --git a/package-lock.json b/package-lock.json index 0b39d1a..a746b72 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1999,9 +1999,9 @@ "dev": true }, "nan": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", - "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz", + "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==" }, "nanomatch": { "version": "1.2.13", diff --git a/package.json b/package.json index a7c9060..9c38a06 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "author": "Max Brunsfeld", "license": "MIT", "dependencies": { - "nan": "^2.10.0" + "nan": "^2.12.1" }, "devDependencies": { "mocha": "^6.0.1", diff --git a/src/main.cc b/src/main.cc index f4a3930..288a65f 100644 --- a/src/main.cc +++ b/src/main.cc @@ -23,7 +23,7 @@ class Worker : public Nan::AsyncWorker { void HandleOKCallback() { Local argv[] = {Nan::New(exit_code)}; - callback->Call(1, argv); + callback->Call(1, argv, async_resource); } }; @@ -43,7 +43,8 @@ void SpawnAsAdmin(const Nan::FunctionCallbackInfo& info) { return; } - std::string command(*String::Utf8Value(info[0])); + Nan::Utf8String commandNan(info[0]); + std::string command(*commandNan, commandNan.length()); if (!info[1]->IsArray()) { Nan::ThrowTypeError("Arguments must be an array"); @@ -60,7 +61,7 @@ void SpawnAsAdmin(const Nan::FunctionCallbackInfo& info) { return; } - args.push_back(std::string(*String::Utf8Value(js_arg))); + args.push_back(*Nan::Utf8String(js_arg)); } bool test_mode = false;