Skip to content

Commit

Permalink
fix: build error
Browse files Browse the repository at this point in the history
  • Loading branch information
@neko-para
neko-para committed Nov 23, 2024
1 parent 6c78994 commit 244aece
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 60 deletions.
83 changes: 24 additions & 59 deletions source/binding/NodeJS/src/include/cb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ inline void NotificationCallback(const char* message, const char* details_json,
{
auto ctx = reinterpret_cast<CallbackContext*>(callback_arg);
ctx->Call<void>(
[=](auto env, auto fn) {
return fn.Call(
{ Napi::String::New(env, message), Napi::String::New(env, details_json) });
},
[=](auto env, auto fn) { return fn.Call({ Napi::String::New(env, message), Napi::String::New(env, details_json) }); },
[](auto res) { std::ignore = res; });
}

Expand Down Expand Up @@ -48,7 +45,7 @@ inline MaaBool CustomRecognizerCallback(
try {
return JSConvert<Result>::from_value(res);
}
catch (MaaNodeException exc) {
catch (const MaaNodeException& exc) {
std::cerr << exc.what() << std::endl;
return std::nullopt;
}
Expand Down Expand Up @@ -92,7 +89,7 @@ inline MaaBool CustomActionCallback(
try {
return JSConvert<bool>::from_value(res);
}
catch (MaaNodeException exc) {
catch (const MaaNodeException& exc) {
std::cerr << exc.what() << std::endl;
return false;
}
Expand All @@ -111,7 +108,7 @@ inline MaaBool CustomControllerConnect(void* trans_arg)
try {
return JSConvert<bool>::from_value(res);
}
catch (MaaNodeException exc) {
catch (const MaaNodeException& exc) {
std::cerr << exc.what() << std::endl;
return false;
}
Expand Down Expand Up @@ -151,14 +148,12 @@ inline MaaBool CustomControllerStartApp(const char* intent, void* trans_arg)
auto ctx = reinterpret_cast<CallbackContext*>(trans_arg);

auto res = ctx->Call<bool>(
[=](auto env, auto fn) {
return fn.Call({ Napi::String::New(env, "start_app"), Napi::String::New(env, intent) });
},
[=](auto env, auto fn) { return fn.Call({ Napi::String::New(env, "start_app"), Napi::String::New(env, intent) }); },
[](Napi::Value res) {
try {
return JSConvert<bool>::from_value(res);
}
catch (MaaNodeException exc) {
catch (const MaaNodeException& exc) {
std::cerr << exc.what() << std::endl;
return false;
}
Expand All @@ -172,14 +167,12 @@ inline MaaBool CustomControllerStopApp(const char* intent, void* trans_arg)
auto ctx = reinterpret_cast<CallbackContext*>(trans_arg);

auto res = ctx->Call<bool>(
[=](auto env, auto fn) {
return fn.Call({ Napi::String::New(env, "stop_app"), Napi::String::New(env, intent) });
},
[=](auto env, auto fn) { return fn.Call({ Napi::String::New(env, "stop_app"), Napi::String::New(env, intent) }); },
[](Napi::Value res) {
try {
return JSConvert<bool>::from_value(res);
}
catch (MaaNodeException exc) {
catch (const MaaNodeException& exc) {
std::cerr << exc.what() << std::endl;
return false;
}
Expand All @@ -198,17 +191,14 @@ inline MaaBool CustomControllerScreencap(void* trans_arg, MaaImageBuffer* buffer
try {
return JSConvert<std::optional<Napi::ArrayBuffer>>::from_value(res);
}
catch (MaaNodeException exc) {
catch (const MaaNodeException& exc) {
std::cerr << exc.what() << std::endl;
return std::nullopt;
}
});

if (res) {
return MaaImageBufferSetEncoded(
buffer,
static_cast<uint8_t*>(res->Data()),
res->ByteLength());
return MaaImageBufferSetEncoded(buffer, static_cast<uint8_t*>(res->Data()), res->ByteLength());
}
else {
return false;
Expand All @@ -221,15 +211,13 @@ inline MaaBool CustomControllerClick(int32_t x, int32_t y, void* trans_arg)

auto res = ctx->Call<bool>(
[=](auto env, auto fn) {
return fn.Call({ Napi::String::New(env, "click"),
Napi::Number::New(env, x),
Napi::Number::New(env, y) });
return fn.Call({ Napi::String::New(env, "click"), Napi::Number::New(env, x), Napi::Number::New(env, y) });
},
[](Napi::Value res) {
try {
return JSConvert<bool>::from_value(res);
}
catch (MaaNodeException exc) {
catch (const MaaNodeException& exc) {
std::cerr << exc.what() << std::endl;
return false;
}
Expand All @@ -238,13 +226,7 @@ inline MaaBool CustomControllerClick(int32_t x, int32_t y, void* trans_arg)
return res;
}

inline MaaBool CustomControllerSwipe(
int32_t x1,
int32_t y1,
int32_t x2,
int32_t y2,
int32_t duration,
void* trans_arg)
inline MaaBool CustomControllerSwipe(int32_t x1, int32_t y1, int32_t x2, int32_t y2, int32_t duration, void* trans_arg)
{
auto ctx = reinterpret_cast<CallbackContext*>(trans_arg);

Expand All @@ -261,7 +243,7 @@ inline MaaBool CustomControllerSwipe(
try {
return JSConvert<bool>::from_value(res);
}
catch (MaaNodeException exc) {
catch (const MaaNodeException& exc) {
std::cerr << exc.what() << std::endl;
return false;
}
Expand All @@ -270,12 +252,7 @@ inline MaaBool CustomControllerSwipe(
return res;
}

inline MaaBool CustomControllerTouchDown(
int32_t contact,
int32_t x,
int32_t y,
int32_t pressure,
void* trans_arg)
inline MaaBool CustomControllerTouchDown(int32_t contact, int32_t x, int32_t y, int32_t pressure, void* trans_arg)
{
auto ctx = reinterpret_cast<CallbackContext*>(trans_arg);

Expand All @@ -291,7 +268,7 @@ inline MaaBool CustomControllerTouchDown(
try {
return JSConvert<bool>::from_value(res);
}
catch (MaaNodeException exc) {
catch (const MaaNodeException& exc) {
std::cerr << exc.what() << std::endl;
return false;
}
Expand All @@ -300,12 +277,7 @@ inline MaaBool CustomControllerTouchDown(
return res;
}

inline MaaBool CustomControllerTouchMove(
int32_t contact,
int32_t x,
int32_t y,
int32_t pressure,
void* trans_arg)
inline MaaBool CustomControllerTouchMove(int32_t contact, int32_t x, int32_t y, int32_t pressure, void* trans_arg)
{
auto ctx = reinterpret_cast<CallbackContext*>(trans_arg);

Expand All @@ -321,7 +293,7 @@ inline MaaBool CustomControllerTouchMove(
try {
return JSConvert<bool>::from_value(res);
}
catch (MaaNodeException exc) {
catch (const MaaNodeException& exc) {
std::cerr << exc.what() << std::endl;
return false;
}
Expand All @@ -335,14 +307,12 @@ inline MaaBool CustomControllerTouchUp(int32_t contact, void* trans_arg)
auto ctx = reinterpret_cast<CallbackContext*>(trans_arg);

auto res = ctx->Call<bool>(
[=](auto env, auto fn) {
return fn.Call({ Napi::String::New(env, "touch_up"), Napi::Number::New(env, contact) });
},
[=](auto env, auto fn) { return fn.Call({ Napi::String::New(env, "touch_up"), Napi::Number::New(env, contact) }); },
[](Napi::Value res) {
try {
return JSConvert<bool>::from_value(res);
}
catch (MaaNodeException exc) {
catch (const MaaNodeException& exc) {
std::cerr << exc.what() << std::endl;
return false;
}
Expand All @@ -356,15 +326,12 @@ inline MaaBool CustomControllerPressKey(int32_t keycode, void* trans_arg)
auto ctx = reinterpret_cast<CallbackContext*>(trans_arg);

auto res = ctx->Call<bool>(
[=](auto env, auto fn) {
return fn.Call(
{ Napi::String::New(env, "press_key"), Napi::Number::New(env, keycode) });
},
[=](auto env, auto fn) { return fn.Call({ Napi::String::New(env, "press_key"), Napi::Number::New(env, keycode) }); },
[](Napi::Value res) {
try {
return JSConvert<bool>::from_value(res);
}
catch (MaaNodeException exc) {
catch (const MaaNodeException& exc) {
std::cerr << exc.what() << std::endl;
return false;
}
Expand All @@ -378,14 +345,12 @@ inline MaaBool CustomControllerInputText(const char* text, void* trans_arg)
auto ctx = reinterpret_cast<CallbackContext*>(trans_arg);

auto res = ctx->Call<bool>(
[=](auto env, auto fn) {
return fn.Call({ Napi::String::New(env, "input_text"), Napi::String::New(env, text) });
},
[=](auto env, auto fn) { return fn.Call({ Napi::String::New(env, "input_text"), Napi::String::New(env, text) }); },
[](Napi::Value res) {
try {
return JSConvert<bool>::from_value(res);
}
catch (MaaNodeException exc) {
catch (const MaaNodeException& exc) {
std::cerr << exc.what() << std::endl;
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion source/binding/NodeJS/src/include/utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class SimpleAsyncWork : public Napi::AsyncWorker
try {
deferred.Resolve(ok(Env(), result));
}
catch (MaaNodeException exc) {
catch (const MaaNodeException& exc) {
deferred.Reject(Napi::TypeError::New(Env(), fmt::format("maa.{}: {}", name.data, exc.what())).Value());
}
}
Expand Down
1 change: 1 addition & 0 deletions source/binding/NodeJS/src/instance/controller.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ std::optional<Napi::External<ControllerInfo>> win32_controller_create(
return std::nullopt;
}
#endif
std::ignore = h;

MaaNotificationCallback cb = nullptr;
CallbackContext* ctx = nullptr;
Expand Down

0 comments on commit 244aece

Please sign in to comment.