try get away other callback deprecations

Apollon77 · May 9, 2024 · 9cce2e3 · 9cce2e3
1 parent cc8604d
commit 9cce2e3
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/mbus-master.cc b/src/mbus-master.cc
@@ -405,18 +405,16 @@ NAN_METHOD(MbusMaster::Get) {
 
     char *address = get(Nan::To<v8::String>(info[0]).ToLocalChecked(),"0");
     bool ping_first = Nan::To<bool>(info[1]).FromJust();
+    Nan::Callback *callback = obj->connected ? new Nan::Callback(info[2].As<Function>()) : new Nan::Call(info[2].As<Function>());
 
     if(obj->connected) {
         obj->communicationInProgress = true;
 
-        Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());
         Nan::AsyncQueueWorker(new RecieveWorker(callback, address, ping_first, &(obj->queueLock), obj->handle, &(obj->communicationInProgress)));
     } else {
         Local<Value> argv[] = {
             Nan::Error("Not connected to port")
         };
-
-        Nan::Call *callback = new Nan::Call(info[2].As<Function>());
         callback->Call(1, argv);
     }
     info.GetReturnValue().SetUndefined();
@@ -612,16 +610,15 @@ NAN_METHOD(MbusMaster::ScanSecondary) {
 
     MbusMaster* obj = node::ObjectWrap::Unwrap<MbusMaster>(info.This());
 
+    Nan::Callback *callback = obj->connected ? new Nan::Callback(info[0].As<Function>()) : new Nan::Call(info[0].As<Function>());
     if(obj->connected) {
         obj->communicationInProgress = true;
 
-        Nan::Callback *callback = new Nan::Callback(info[0].As<Function>());
         Nan::AsyncQueueWorker(new ScanSecondaryWorker(callback, &(obj->queueLock), obj->handle, &(obj->communicationInProgress)));
     } else {
         Local<Value> argv[] = {
             Nan::Error("Not connected to port")
         };
-        Nan::Call *callback = new Nan::Call(info[0].As<Function>());
         callback->Call(1, argv);
     }
     info.GetReturnValue().SetUndefined();
@@ -800,16 +797,15 @@ NAN_METHOD(MbusMaster::SetPrimaryId) {
 
     char *oldAddress = get(Nan::To<v8::String>(info[0]).ToLocalChecked(),"0");
     int newAddress = (int)Nan::To<int64_t>(info[1]).FromJust();
+    Nan::Callback *callback = obj->connected ? new Nan::Callback(info[2].As<Function>()) : new Nan::Call(info[2].As<Function>());
     if(obj->connected) {
         obj->communicationInProgress = true;
 
-        Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());
         Nan::AsyncQueueWorker(new SetPrimaryWorker(callback, oldAddress, newAddress, &(obj->queueLock), obj->handle, &(obj->communicationInProgress)));
     } else {
         Local<Value> argv[] = {
             Nan::Error("Not connected to port")
         };
-        Nan::Call *callback = new Nan::Call(info[2].As<Function>());
         callback->Call(1, argv);
     }
     info.GetReturnValue().SetUndefined();