Merge pull request #125 from Apollon77/node22

Node22
Apollon77 · May 9, 2024 · 8256736 · 8256736
2 parents 17a3b50 + c15d745
commit 8256736
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
@@ -63,7 +63,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [16.x, 18.x, 20.x]
+        node-version: [16.x, 18.x, 20.x, 22.x]
         os: [ubuntu-latest, windows-2019, windows-latest, macos-latest]
 
     steps:

diff --git a/binding.gyp b/binding.gyp
@@ -21,6 +21,15 @@
                             '-w'
                         ],
                     }
+
+                }],
+                ['OS=="win"', {
+			        'defines': [
+                        # Stop <windows.h> from defining macros that conflict with
+                        # std::min() and std::max().  We don't use <windows.h> (much)
+                        # but we still inherit it from uv.h.
+                        'NOMINMAX',
+                    ]
                 }]
             ],
             'dependencies': [

diff --git a/src/mbus-master.cc b/src/mbus-master.cc
@@ -255,7 +255,6 @@ class RecieveWorker : public Nan::AsyncWorker {
         char error[100];
         int address;
         int secondary_selected = 0;
-        int request_frame_res;
 
         memset((void *)&reply, 0, sizeof(mbus_frame));
 
@@ -376,7 +375,7 @@ class RecieveWorker : public Nan::AsyncWorker {
             Nan::New<String>(data).ToLocalChecked()
         };
         free(data);
-        callback->Call(2, argv);
+        callback->Call(2, argv, async_resource);
     };
 
     void HandleErrorCallback () {
@@ -388,7 +387,7 @@ class RecieveWorker : public Nan::AsyncWorker {
             Nan::Error(ErrorMessage())
         };
 
-        callback->Call(1, argv);
+        callback->Call(1, argv, async_resource);
     }
 private:
     char *data;
@@ -586,7 +585,7 @@ class ScanSecondaryWorker : public Nan::AsyncWorker {
             Nan::New<String>(data).ToLocalChecked()
         };
         free(data);
-        callback->Call(2, argv);
+        callback->Call(2, argv, async_resource);
     };
 
     void HandleErrorCallback () {
@@ -597,7 +596,7 @@ class ScanSecondaryWorker : public Nan::AsyncWorker {
         Local<Value> argv[] = {
             Nan::Error(ErrorMessage())
         };
-        callback->Call(1, argv);
+        callback->Call(1, argv, async_resource);
     }
 private:
     char *data;
@@ -769,7 +768,7 @@ class SetPrimaryWorker : public Nan::AsyncWorker {
         Local<Value> argv[] = {
             Nan::Null()
         };
-        callback->Call(1, argv);
+        callback->Call(1, argv, async_resource);
     };
 
     void HandleErrorCallback () {
@@ -781,7 +780,7 @@ class SetPrimaryWorker : public Nan::AsyncWorker {
             Nan::Error(ErrorMessage())
         };
 
-        callback->Call(1, argv);
+        callback->Call(1, argv, async_resource);
     }
 private:
     char *old_addr_str;