Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Node.js v12 #1

Merged
merged 9 commits into from
Sep 28, 2019
Merged

Node.js v12 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0270e0c
[FIX] error C2660: 'v8::Value::Int32Value': function does not take 0 …
muffintoad Jun 7, 2019
7e4079c
[FIX] Node 12.x.x deprecated functions updated
muffintoad Jun 7, 2019
0a10e95
[FIX] cannot convert argument 1 from ' v8::Local<v8::String>' to 'con…
muffintoad Jun 7, 2019
bc6f04a
Update robotjs.cc
muffintoad Jun 7, 2019
77f741f
node v8 deprecated errors fixed. Added support for node v12.x.x
muffintoad Jun 7, 2019
9931ee8
Update .travis.yml
muffintoad Jun 7, 2019
a331068
Update appveyor.yml
muffintoad Jun 7, 2019
42e6d28
Updated node_version 12
muffintoad Jun 7, 2019
a1a0472
[FIX] Updated package.json to support node12 for nan package
muffintoad Jun 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ git:

env:
matrix:
- TRAVIS_NODE_VERSION="8"
- TRAVIS_NODE_VERSION="12"
- TRAVIS_NODE_VERSION="stable"

addons:
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
environment:
matrix:
# node.js
- nodejs_version: "8"
- nodejs_version: "12"
- nodejs_version: "Stable"

cache:
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
},
"homepage": "https://github.com/octalmage/robotjs",
"dependencies": {
"nan": "^2.2.1",
"nan": "^2.14.0",
"prebuild-install": "^2.1.1"
},
"devDependencies": {
Expand Down
56 changes: 28 additions & 28 deletions src/robotjs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ NAN_METHOD(dragMouse)
return Nan::ThrowError("Invalid number of arguments.");
}

const size_t x = info[0]->Int32Value();
const size_t y = info[1]->Int32Value();
const size_t x = Nan::To<int32_t>(info[0]).FromJust();
const size_t y = Nan::To<int32_t>(info[1]).FromJust();
MMMouseButton button = LEFT_BUTTON;

if (info.Length() == 3)
Expand Down Expand Up @@ -94,8 +94,8 @@ NAN_METHOD(moveMouse)
{
return Nan::ThrowError("Invalid number of arguments.");
}
size_t x = info[0]->Int32Value();
size_t y = info[1]->Int32Value();
size_t x = Nan::To<int32_t>(info[0]).FromJust();
size_t y = Nan::To<int32_t>(info[1]).FromJust();

MMPoint point;
point = MMPointMake(x, y);
Expand All @@ -111,8 +111,8 @@ NAN_METHOD(moveMouseSmooth)
{
return Nan::ThrowError("Invalid number of arguments.");
}
size_t x = info[0]->Int32Value();
size_t y = info[1]->Int32Value();
size_t x = Nan::To<int32_t>(info[0]).FromJust();
size_t y = Nan::To<int32_t>(info[1]).FromJust();

MMPoint point;
point = MMPointMake(x, y);
Expand Down Expand Up @@ -140,7 +140,7 @@ NAN_METHOD(mouseClick)

if (info.Length() > 0)
{
v8::String::Utf8Value bstr(info[0]->ToString());
v8::String::Utf8Value bstr(v8::Isolate::GetCurrent(), Nan::To<v8::String>(info[0]).ToLocalChecked());
const char * const b = *bstr;

switch (CheckMouseButton(b, &button))
Expand All @@ -156,7 +156,7 @@ NAN_METHOD(mouseClick)

if (info.Length() == 2)
{
doubleC = info[1]->BooleanValue();
doubleC = info[1]->BooleanValue(Nan::GetCurrentContext()).FromJust();
}
else if (info.Length() > 2)
{
Expand Down Expand Up @@ -236,7 +236,7 @@ NAN_METHOD(setMouseDelay)
return Nan::ThrowError("Invalid number of arguments.");
}

mouseDelay = info[0]->Int32Value();
mouseDelay = Nan::To<int32_t>(info[0]).FromJust();

info.GetReturnValue().Set(Nan::New(1));
}
Expand All @@ -248,8 +248,8 @@ NAN_METHOD(scrollMouse)
return Nan::ThrowError("Invalid number of arguments.");
}

int x = info[0]->Int32Value();
int y = info[1]->Int32Value();
int x = Nan::To<int32_t>(info[0]).FromJust();
int y = Nan::To<int32_t>(info[1]).FromJust();

scrollMouse(x, y);
microsleep(mouseDelay);
Expand Down Expand Up @@ -417,7 +417,7 @@ int CheckKeyFlags(char* f, MMKeyFlags* flags)

int GetFlagsFromString(v8::Local<v8::Value> value, MMKeyFlags* flags)
{
v8::String::Utf8Value fstr(value->ToString());
v8::String::Utf8Value fstr(v8::Isolate::GetCurrent(), Nan::To<v8::String>(value).ToLocalChecked());
return CheckKeyFlags(*fstr, flags);
}

Expand Down Expand Up @@ -454,7 +454,7 @@ NAN_METHOD(keyTap)

char *k;

v8::String::Utf8Value kstr(info[0]->ToString());
v8::String::Utf8Value kstr(v8::Isolate::GetCurrent(), Nan::To<v8::String>(info[0]).ToLocalChecked());
k = *kstr;

switch (info.Length())
Expand Down Expand Up @@ -586,7 +586,7 @@ NAN_METHOD(typeStringDelayed)

str = *string;

size_t cpm = info[1]->Int32Value();
size_t cpm = Nan::To<int32_t>(info[1]).FromJust();

typeStringDelayed(str, cpm);

Expand All @@ -600,7 +600,7 @@ NAN_METHOD(setKeyboardDelay)
return Nan::ThrowError("Invalid number of arguments.");
}

keyboardDelay = info[0]->Int32Value();
keyboardDelay = Nan::To<int32_t>(info[0]).FromJust();

info.GetReturnValue().Set(Nan::New(1));
}
Expand Down Expand Up @@ -636,8 +636,8 @@ NAN_METHOD(getPixelColor)
MMBitmapRef bitmap;
MMRGBHex color;

size_t x = info[0]->Int32Value();
size_t y = info[1]->Int32Value();
size_t x = Nan::To<int32_t>(info[0]).FromJust();
size_t y = Nan::To<int32_t>(info[1]).FromJust();

if (!pointVisibleOnMainDisplay(MMPointMake(x, y)))
{
Expand Down Expand Up @@ -705,10 +705,10 @@ NAN_METHOD(captureScreen)
//TODO: Make sure requested coords are within the screen bounds, or we get a seg fault.
// An error message is much nicer!

x = info[0]->Int32Value();
y = info[1]->Int32Value();
w = info[2]->Int32Value();
h = info[3]->Int32Value();
x = Nan::To<int32_t>(info[0]).FromJust();
y = Nan::To<int32_t>(info[1]).FromJust();
w = Nan::To<int32_t>(info[2]).FromJust();
h = Nan::To<int32_t>(info[3]).FromJust();
}
else
{
Expand Down Expand Up @@ -765,11 +765,11 @@ BMP buildBMP(Local<Object> info)

BMP img;

img.width = obj->Get(Nan::New("width").ToLocalChecked())->Uint32Value();
img.height = obj->Get(Nan::New("height").ToLocalChecked())->Uint32Value();
img.byteWidth = obj->Get(Nan::New("byteWidth").ToLocalChecked())->Uint32Value();
img.bitsPerPixel = obj->Get(Nan::New("bitsPerPixel").ToLocalChecked())->Uint32Value();
img.bytesPerPixel = obj->Get(Nan::New("bytesPerPixel").ToLocalChecked())->Uint32Value();
img.width = obj->Get(Nan::New("width").ToLocalChecked())->Uint32Value(Nan::GetCurrentContext()).FromJust();
img.height = obj->Get(Nan::New("height").ToLocalChecked())->Uint32Value(Nan::GetCurrentContext()).FromJust();
img.byteWidth = obj->Get(Nan::New("byteWidth").ToLocalChecked())->Uint32Value(Nan::GetCurrentContext()).FromJust();
img.bitsPerPixel = obj->Get(Nan::New("bitsPerPixel").ToLocalChecked())->Uint32Value(Nan::GetCurrentContext()).FromJust();
img.bytesPerPixel = obj->Get(Nan::New("bytesPerPixel").ToLocalChecked())->Uint32Value(Nan::GetCurrentContext()).FromJust();

char* buf = node::Buffer::Data(obj->Get(Nan::New("image").ToLocalChecked()));

Expand All @@ -785,8 +785,8 @@ NAN_METHOD(getColor)
MMBitmapRef bitmap;
MMRGBHex color;

size_t x = info[1]->Int32Value();
size_t y = info[2]->Int32Value();
size_t x = Nan::To<int32_t>(info[1]).FromJust();
size_t y = Nan::To<int32_t>(info[2]).FromJust();

//Get our image object from JavaScript.
BMP img = buildBMP(Nan::To<v8::Object>(info[0]).ToLocalChecked());
Expand Down