From 73bc0fff3383c03c1a70a110f295bbfea3c656c3 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Sat, 20 Aug 2022 15:28:43 +0200 Subject: [PATCH 1/3] Do not use deprecated Callback::Call overload --- src/nodejs/node_osrm.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nodejs/node_osrm.cpp b/src/nodejs/node_osrm.cpp index ebd3b3fbf81..fde0cc24d32 100644 --- a/src/nodejs/node_osrm.cpp +++ b/src/nodejs/node_osrm.cpp @@ -148,7 +148,7 @@ inline void async(const Nan::FunctionCallbackInfo &info, ServiceMemFn service, Nan::Callback *callback, PluginParameters pluginParams_) - : Base(callback), osrm{std::move(osrm_)}, service{std::move(service)}, + : Base(callback, "osrm:async"), osrm{std::move(osrm_)}, service{std::move(service)}, params{std::move(params_)}, pluginParams{std::move(pluginParams_)} { } @@ -184,7 +184,7 @@ inline void async(const Nan::FunctionCallbackInfo &info, const constexpr auto argc = 2u; v8::Local argv[argc] = {Nan::Null(), render(result)}; - callback->Call(argc, argv); + callback->Call(argc, argv, async_resource); } // Keeps the OSRM object alive even after shutdown until we're done with callback @@ -230,7 +230,7 @@ inline void asyncForTiles(const Nan::FunctionCallbackInfo &info, ServiceMemFn service, Nan::Callback *callback, PluginParameters pluginParams_) - : Base(callback), osrm{std::move(osrm_)}, service{std::move(service)}, + : Base(callback, "osrm:asyncForTiles"), osrm{std::move(osrm_)}, service{std::move(service)}, params{std::move(params_)}, pluginParams{std::move(pluginParams_)} { } @@ -256,7 +256,7 @@ inline void asyncForTiles(const Nan::FunctionCallbackInfo &info, auto str_result = result.get(); v8::Local argv[argc] = {Nan::Null(), render(str_result)}; - callback->Call(argc, argv); + callback->Call(argc, argv, async_resource); } // Keeps the OSRM object alive even after shutdown until we're done with callback From a3f017e6b410bc5dd08dd2f233cd70ed47c4d3c2 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Sat, 20 Aug 2022 15:34:37 +0200 Subject: [PATCH 2/3] Do not use deprecated Callback::Call overload --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4d1f62a3a5..e8137556a1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - FIXED: Use Boost.Beast to parse HTTP request. [#6294](https://github.com/Project-OSRM/osrm-backend/pull/6294) - FIXED: Fix inefficient osrm-routed connection handling [#6113](https://github.com/Project-OSRM/osrm-backend/pull/6113) - Misc: + - CHANGED: Do not use deprecated Callback::Call overload in Node bindings. [#6318](https://github.com/Project-OSRM/osrm-backend/pull/6318) - FIXED: Fix distance calculation consistency. [#6315](https://github.com/Project-OSRM/osrm-backend/pull/6315) - FIXED: Fix performance issue after migration to sol2 3.3.0. [#6304](https://github.com/Project-OSRM/osrm-backend/pull/6304) - CHANGED: Pass osm_node_ids by reference in osrm::updater::Updater class. [#6298](https://github.com/Project-OSRM/osrm-backend/pull/6298) From d7eb107d00a1eaf936a339fc75b4e085984a0773 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Sat, 20 Aug 2022 15:45:23 +0200 Subject: [PATCH 3/3] Do not use deprecated Callback::Call overload --- src/nodejs/node_osrm.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/nodejs/node_osrm.cpp b/src/nodejs/node_osrm.cpp index fde0cc24d32..5c8c486a579 100644 --- a/src/nodejs/node_osrm.cpp +++ b/src/nodejs/node_osrm.cpp @@ -230,8 +230,9 @@ inline void asyncForTiles(const Nan::FunctionCallbackInfo &info, ServiceMemFn service, Nan::Callback *callback, PluginParameters pluginParams_) - : Base(callback, "osrm:asyncForTiles"), osrm{std::move(osrm_)}, service{std::move(service)}, - params{std::move(params_)}, pluginParams{std::move(pluginParams_)} + : Base(callback, "osrm:asyncForTiles"), osrm{std::move(osrm_)}, + service{std::move(service)}, params{std::move(params_)}, pluginParams{ + std::move(pluginParams_)} { }