bluetooth-serial-port 2.2.5 → 3.0.0

package/src/{osx → macos}/BluetoothWorker.mm

@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <node_object_wrap.h>
+#include <dispatch/dispatch.h>
 #include "pipe.h"
 
 #ifndef RFCOMM_UUID
@@ -34,7 +35,7 @@ using namespace v8;
 
 /** Private class for wrapping a pipe */
 @interface Pipe : NSObject {
-	pipe_t *pipe;
+    pipe_t *pipe;
 }
 @property (nonatomic, assign) pipe_t *pipe;
 @end
@@ -46,8 +47,8 @@ using namespace v8;
 
 /** Private class for wrapping data */
 @interface BTData : NSObject {
-	NSData *data;
-	NSString *address;
+    NSData *data;
+    NSString *address;
 }
 @property (nonatomic, assign) NSData *data;
 @property (nonatomic, assign) NSString *address;
@@ -102,193 +103,191 @@ static NSLock *globalConnectLock = nil;
     deviceLock = [[NSLock alloc] init];
     connectLock = [[NSLock alloc] init];
     writeLock = [[NSLock alloc] init];
-
-    // creates a worker thread that handles all the asynchronous stuff
-    worker = [[NSThread alloc]initWithTarget: self selector: @selector(startBluetoothThread:) object: nil];
-    [worker start];
+    worker_queue = dispatch_queue_create("btworker", NULL);
     return self;
 }
 
-/** Creates a run loop and sets a timer to keep the run loop alive */
-- (void) startBluetoothThread: (id) arg
-{
-    NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
-    //schedule a timer so runMode won't stop immediately
-    keepAliveTimer = [[NSTimer alloc] initWithFireDate:[NSDate distantFuture]
-        interval:1 target:nil selector:nil userInfo:nil repeats:YES];
-    [runLoop addTimer:keepAliveTimer forMode:NSDefaultRunLoopMode];
-    [[NSRunLoop currentRunLoop] run];
-}
-
 /** Disconnect from a Bluetooth device */
 - (void) disconnectFromDevice:(NSString *)address
 {
-	// this function is called synchronous from javascript so it waits on the worker task to complete.
-	[self performSelector:@selector(disconnectFromDeviceTask:) onThread:worker withObject: address waitUntilDone:true];
+    // this function is called synchronous from javascript so it waits on the worker task to complete.
+    dispatch_sync(worker_queue, ^{
+        [self disconnectFromDeviceTask: address];
+    });
 }
 
 /** Task on the worker to disconnect from a Bluetooth device */
 - (void) disconnectFromDeviceTask: (NSString *) address
 {
-	// make it safe
-	[deviceLock lock];
+    // make it safe
+    [deviceLock lock];
 
-	if (res != nil) {
-		if (res.producer != NULL) {
-			pipe_producer_free(res.producer);
-			res.producer = NULL;
-		}
+    if (res != nil) {
+        if (res.producer != NULL) {
+            pipe_producer_free(res.producer);
+            res.producer = NULL;
+        }
 
-		if (res.channel != NULL) {
-			[res.channel closeChannel];
-			res.channel = NULL;
-		}
+        if (res.channel != NULL) {
+            [res.channel closeChannel];
+            res.channel = NULL;
+        }
 
-		if (res.device != NULL) {
-			[res.device closeConnection];
-			res.device = NULL;
-		}
+        if (res.device != NULL) {
+            [res.device closeConnection];
+            res.device = NULL;
+        }
 
         res = nil;
-	}
+    }
 
-	[deviceLock unlock];
+    [deviceLock unlock];
 }
 
 /** Connect to a Bluetooth device on a specific channel using a pipe to communicate with the main thread */
 - (IOReturn)connectDevice: (NSString *) address onChannel: (int) channel withPipe: (pipe_t *)pipe
 {
-	[connectLock lock];
+    [connectLock lock];
 
-	Pipe *pipeObj = [[Pipe alloc] init];
-	pipeObj.pipe = pipe;
+    Pipe *pipeObj = [[Pipe alloc] init];
+    pipeObj.pipe = pipe;
 
-	NSDictionary *parameters = [[NSDictionary alloc] initWithObjectsAndKeys:
-		address, @"address", [NSNumber numberWithInt: channel], @"channel", pipeObj, @"pipe", nil];
+    NSDictionary *parameters = [[NSDictionary alloc] initWithObjectsAndKeys:
+        address, @"address", [NSNumber numberWithInt: channel], @"channel", pipeObj, @"pipe", nil];
 
-	// connect to a device and wait for the result
-	[self performSelector:@selector(connectDeviceTask:) onThread:worker withObject:parameters waitUntilDone:true];
-	IOReturn result = connectResult;
-	[connectLock unlock];
+    // connect to a device and wait for the result
+    dispatch_sync(worker_queue, ^{
+        [self connectDeviceTask:parameters];
+    });
+    IOReturn result = connectResult;
+    [connectLock unlock];
 
-	return result;
+    return result;
 }
 
 /** Task to connect to a specific device */
 - (void)connectDeviceTask: (NSDictionary *)parameters
 {
-	NSString *address = [parameters objectForKey:@"address"];
-	NSNumber *channelID = [parameters objectForKey:@"channel"];
-	pipe_t *pipe = ((Pipe *)[parameters objectForKey:@"pipe"]).pipe;
+    NSString *address = [parameters objectForKey:@"address"];
+    NSNumber *channelID = [parameters objectForKey:@"channel"];
+    pipe_t *pipe = ((Pipe *)[parameters objectForKey:@"pipe"]).pipe;
 
-	connectResult = kIOReturnError;
+    connectResult = kIOReturnError;
 
-	[deviceLock lock];
+    [deviceLock lock];
 
-	if (res == nil) {
-		IOBluetoothDevice *device = [IOBluetoothDevice deviceWithAddressString:address];
+    if (res == nil) {
+        IOBluetoothDevice *device = [IOBluetoothDevice deviceWithAddressString:address];
 
-		if (device != nil) {
-			IOBluetoothRFCOMMChannel *channel = [[IOBluetoothRFCOMMChannel alloc] init];
+        if (device != nil) {
+            IOBluetoothRFCOMMChannel *channel = [[IOBluetoothRFCOMMChannel alloc] init];
             [globalConnectLock lock];
-			if ([device openRFCOMMChannelSync: &channel withChannelID:[channelID intValue] delegate: self] == kIOReturnSuccess) {
+            if ([device openRFCOMMChannelSync: &channel withChannelID:[channelID intValue] delegate: self] == kIOReturnSuccess) {
                 [globalConnectLock unlock];
-				connectResult = kIOReturnSuccess;
-			   	pipe_producer_t *producer = pipe_producer_new(pipe);
+                connectResult = kIOReturnSuccess;
+                pipe_producer_t *producer = pipe_producer_new(pipe);
                 res = [[BluetoothDeviceResources alloc] init];
-			   	res.device = device;
-			   	res.producer = producer;
-			   	res.channel = channel;
-			} else {
+                res.device = device;
+                res.producer = producer;
+                res.channel = channel;
+            } else {
                 [globalConnectLock unlock];
             }
-		}
-	}
+        }
+    }
 
-	[deviceLock unlock];
+    [deviceLock unlock];
 }
 
 /** Write synchronized to a connected Bluetooth device */
 - (IOReturn)writeAsync:(void *)data length:(UInt16)length toDevice: (NSString *)address
 {
-	[writeLock lock];
+    [writeLock lock];
 
-	BTData *writeData = [[BTData alloc] init];
-	writeData.data = [NSData dataWithBytes: data length: length];
-	writeData.address = address;
+    BTData *writeData = [[BTData alloc] init];
+    writeData.data = [NSData dataWithBytes: data length: length];
+    writeData.address = address;
 
-	// wait for the write to be performed on the worker thread
-	[self performSelector:@selector(writeAsyncTask:) onThread:worker withObject:writeData waitUntilDone:true];
+    // wait for the write to be performed on the worker thread
+    dispatch_sync(worker_queue, ^{
+        [self writeAsyncTask:writeData];
+    });
 
-	IOReturn result = writeResult;
-	[writeLock unlock];
+    IOReturn result = writeResult;
+    [writeLock unlock];
 
-	return result;
+    return result;
 }
 
 /** Task to do the writing */
 - (void)writeAsyncTask:(BTData *)writeData
 {
-	if (res != nil) {
-		char *idx = (char *)[writeData.data bytes];
-		ssize_t numBytesRemaining;
-		BluetoothRFCOMMMTU rfcommChannelMTU;
+    if (res != nil) {
+        char *idx = (char *)[writeData.data bytes];
+        ssize_t numBytesRemaining;
+        BluetoothRFCOMMMTU rfcommChannelMTU;
 
-		numBytesRemaining = [writeData.data length];
-		writeResult = kIOReturnSuccess;
+        numBytesRemaining = [writeData.data length];
+        writeResult = kIOReturnSuccess;
 
-		// Get the RFCOMM Channel's MTU.  Each write can only
-		// contain up to the MTU size number of bytes.
-		rfcommChannelMTU = [res.channel getMTU];
+        // Get the RFCOMM Channel's MTU.  Each write can only
+        // contain up to the MTU size number of bytes.
+        rfcommChannelMTU = [res.channel getMTU];
 
-		// Loop through the data until we have no more to send.
-		while ((writeResult == kIOReturnSuccess) && (numBytesRemaining > 0)) {
-			// finds how many bytes I can send:
-			ssize_t numBytesToWrite = ((numBytesRemaining > rfcommChannelMTU) ? rfcommChannelMTU :  numBytesRemaining);
+        // Loop through the data until we have no more to send.
+        while ((writeResult == kIOReturnSuccess) && (numBytesRemaining > 0)) {
+            // finds how many bytes I can send:
+            ssize_t numBytesToWrite = ((numBytesRemaining > rfcommChannelMTU) ? rfcommChannelMTU :  numBytesRemaining);
 
-			// Send the bytes
-			writeResult = [res.channel writeAsync:idx length:numBytesToWrite refcon:res];
+            // Send the bytes
+            writeResult = [res.channel writeAsync:idx length:numBytesToWrite refcon:res];
 
-			// Updates the position in the buffer:
-			numBytesRemaining -= numBytesToWrite;
-			idx += numBytesToWrite;
-		}
-	}
+            // Updates the position in the buffer:
+            numBytesRemaining -= numBytesToWrite;
+            idx += numBytesToWrite;
+        }
+    }
 
-	CFRunLoopStop(CFRunLoopGetCurrent());
+    CFRunLoopStop(CFRunLoopGetCurrent());
 }
 
 - (void)rfcommChannelWriteComplete:(IOBluetoothRFCOMMChannel*)rfcommChannel refcon:(void*)refcon status:(IOReturn)error
 {
-	CFRunLoopStop(CFRunLoopGetCurrent());
+    CFRunLoopStop(CFRunLoopGetCurrent());
 }
 
 /** Inquire Bluetooth devices and send results through the given pipe */
 - (void) inquireWithPipe: (pipe_t *)pipe
 {
-	@synchronized(self) {
-	  inquiryProducer = pipe_producer_new(pipe);
-		[self performSelector:@selector(inquiryTask) onThread:worker withObject:nil waitUntilDone:false];
-	}
+    @synchronized(self) {
+      inquiryProducer = pipe_producer_new(pipe);
+      dispatch_async(worker_queue, ^{
+          [self inquiryTask];
+      });
+    }
 }
 
 /** Worker task to the the inquiry */
 - (void) inquiryTask
 {
-  IOBluetoothDeviceInquiry *bdi = [[IOBluetoothDeviceInquiry alloc] init];
-	[bdi setDelegate: self];
-	[bdi start];
+  IOBluetoothDeviceInquiry *bdi = [IOBluetoothDeviceInquiry inquiryWithDelegate:self];
+//  bdi.inquiryLength = 30;
+  [bdi start];
+//  [NSThread sleepUntilDate: [NSDate dateWithTimeIntervalSinceNow: 31]];
+//  [bdi stop];
 }
 
 /** Get the RFCOMM channel for a given device */
 - (int) getRFCOMMChannelID: (NSString *) address
 {
-	[sdpLock lock];
-	// call the task on the worker thread and wait for the result
-	[self performSelector:@selector(getRFCOMMChannelIDTask:) onThread:worker withObject:address waitUntilDone:true];
-	int returnValue = lastChannelID;
-	[sdpLock unlock];
-	return returnValue;
+    [sdpLock lock];
+    // call the task on the worker thread and wait for the result
+    dispatch_sync(worker_queue, ^{
+        [self getRFCOMMChannelIDTask:address];
+    });
+    int returnValue = lastChannelID;
+    [sdpLock unlock];
+    return returnValue;
 }
 
 /** Task to get the RFCOMM channel */
@@ -307,7 +306,7 @@ static NSLock *globalConnectLock = nil;
 
     bool stop = false;
 
-	NSTimeInterval endTime = [[NSDate date] timeIntervalSince1970] + 60;
+    NSTimeInterval endTime = [[NSDate date] timeIntervalSince1970] + 60;
     // if needed wait for a while for the sdp update
     while (!stop && [[NSDate date] timeIntervalSince1970] < endTime) { // wait no more than 60 seconds for SDP update
         currentServiceUpdate = [device getLastServicesUpdate];
@@ -329,63 +328,63 @@ static NSLock *globalConnectLock = nil;
             if ([sr hasServiceFromArray: uuids]) {
                 BluetoothRFCOMMChannelID cid = -1;
                 if ([sr getRFCOMMChannelID: &cid] == kIOReturnSuccess) {
-                	lastChannelID = cid;
-                	return;
+                    lastChannelID = cid;
+                    return;
                 }
             }
         }
     }
 
-    // This can happen is some conditions where the network is unreliable. Just ignore for now...
+    // This can happen in some conditions where the network is unreliable. Just ignore for now...
     lastChannelID = -1;
 }
 
 /** Called when data is received from a remote device */
 - (void)rfcommChannelData:(IOBluetoothRFCOMMChannel*)rfcommChannel data:(void *)dataPointer length:(size_t)dataLength
 {
-	NSData *data = [NSData dataWithBytes: dataPointer length: dataLength];
+    NSData *data = [NSData dataWithBytes: dataPointer length: dataLength];
 
-	if (res != NULL && res.producer != NULL) {
-		// push the data into the pipe so it can be read from the main thread
-		pipe_push(res.producer, [data bytes], data.length);
-	}
+    if (res != NULL && res.producer != NULL) {
+        // push the data into the pipe so it can be read from the main thread
+        pipe_push(res.producer, [data bytes], data.length);
+    }
 
-	CFRunLoopStop(CFRunLoopGetCurrent());
+    CFRunLoopStop(CFRunLoopGetCurrent());
 }
 
 /** Called when a channel has been closed */
 - (void)rfcommChannelClosed:(IOBluetoothRFCOMMChannel*)rfcommChannel
 {
-	[self disconnectFromDevice: [[rfcommChannel getDevice] getAddressString]];
+    [self disconnectFromDevice: [[rfcommChannel getDevice] addressString]];
 }
 
 /** Called when the device inquiry completes */
 - (void) deviceInquiryComplete: (IOBluetoothDeviceInquiry *) sender error: (IOReturn) error aborted: (BOOL) aborted
 {
-	@synchronized(self) {
-		if (inquiryProducer != NULL) {
-			// free the producer so the main thread is signaled that the inquiry has been completed.
-			pipe_producer_free(inquiryProducer);
-			inquiryProducer = NULL;
-		}
-	}
+    @synchronized(self) {
+        if (inquiryProducer != NULL) {
+            // free the producer so the main thread is signaled that the inquiry has been completed.
+            pipe_producer_free(inquiryProducer);
+            inquiryProducer = NULL;
+        }
+    }
 }
 
 /** Called when a device has been found */
 - (void) deviceInquiryDeviceFound: (IOBluetoothDeviceInquiry*) sender device: (IOBluetoothDevice*) device
 {
-	@synchronized(self) {
-		if (inquiryProducer != NULL) {
-			device_info_t *info = new device_info_t;
-			strcpy(info->address, [[device getAddressString] UTF8String]);
-			strcpy(info->name, [[device getNameOrAddress] UTF8String]);
-
-			// push the device data into the pipe to notify the main thread
-			pipe_push(inquiryProducer, info, 1);
-
-			delete info;
-		}
-	}
+    @synchronized(self) {
+        if (inquiryProducer != NULL) {
+            device_info_t *info = new device_info_t;
+            strcpy(info->address, [[device addressString] UTF8String]);
+            strcpy(info->name, [[device addressString] UTF8String]);
+
+            // push the device data into the pipe to notify the main thread
+            pipe_push(inquiryProducer, info, 1);
+
+            delete info;
+        }
+    }
 }
 
 @end

package/src/{osx → macos}/DeviceINQ.mm

@@ -72,10 +72,10 @@ class InquireWorker : public Nan::AsyncWorker {
             Nan::New(device.address).ToLocalChecked(),
             Nan::New(device.name).ToLocalChecked()
         };
-        found->Call(2, argv);
+        found->Call(2, argv, async_resource);
     }
 
-    callback->Call(0, 0);
+    callback->Call(0, 0, async_resource);
     [inquiryResult release];
   }
 
@@ -106,7 +106,7 @@ void DeviceINQ::EIO_AfterSdpSearch(uv_work_t *req) {
     Local<Value> argv[] = {
         Nan::New(baton->channelID)
     };
-    baton->cb->Call(1, argv);
+    Nan::Call(*baton->cb, 1, argv);
 
     if (try_catch.HasCaught()) {
         Nan::FatalException(try_catch);
@@ -118,7 +118,7 @@ void DeviceINQ::EIO_AfterSdpSearch(uv_work_t *req) {
     baton = NULL;
 }
 
-void DeviceINQ::Init(Handle<Object> target) {
+void DeviceINQ::Init(Local<Object> target) {
     Nan::HandleScope scope;
 
     Local<FunctionTemplate> t = Nan::New<FunctionTemplate>(New);
@@ -126,15 +126,14 @@ void DeviceINQ::Init(Handle<Object> target) {
     t->InstanceTemplate()->SetInternalFieldCount(1);
     t->SetClassName(Nan::New("DeviceINQ").ToLocalChecked());
 
+    Isolate *isolate = target->GetIsolate();
+    Local<Context> ctx = isolate->GetCurrentContext();
+
     Nan::SetPrototypeMethod(t, "inquireSync", InquireSync);
     Nan::SetPrototypeMethod(t, "inquire", Inquire);
     Nan::SetPrototypeMethod(t, "findSerialPortChannel", SdpSearch);
     Nan::SetPrototypeMethod(t, "listPairedDevices", ListPairedDevices);
-    target->Set(Nan::New("DeviceINQ").ToLocalChecked(), t->GetFunction());
-    target->Set(Nan::New("DeviceINQ").ToLocalChecked(), t->GetFunction());
-    target->Set(Nan::New("DeviceINQ").ToLocalChecked(), t->GetFunction());
-    target->Set(Nan::New("DeviceINQ").ToLocalChecked(), t->GetFunction());
-
+    target->Set(ctx, Nan::New("DeviceINQ").ToLocalChecked(), t->GetFunction(ctx).ToLocalChecked());
 }
 
 NSArray *DeviceINQ::doInquire() {
@@ -216,6 +215,7 @@ NAN_METHOD(DeviceINQ::InquireSync) {
     NSValue *boxedDevice;
     NSArray *inquiryResult = doInquire();
     NSEnumerator *enumerator = [inquiryResult objectEnumerator];
+    Nan::AsyncResource resource("bluetooth-serial-port:inqureSync");
     while (boxedDevice = [enumerator nextObject]) {
         struct bt_device device;
 
@@ -225,10 +225,10 @@ NAN_METHOD(DeviceINQ::InquireSync) {
             Nan::New(device.name).ToLocalChecked()
         };
 
-        found->Call(2, argv);
+        found->Call(2, argv, &resource);
     }
 
-    callback->Call(0, 0);
+    callback->Call(0, 0, &resource);
     [inquiryResult release];
 
     return;
@@ -243,7 +243,7 @@ NAN_METHOD(DeviceINQ::SdpSearch) {
     if (!info[0]->IsString()) {
         return Nan::ThrowTypeError("First argument should be a string value");
     }
-    String::Utf8Value address(info[0]);
+    String::Utf8Value address(info.GetIsolate(), info[0]);
 
     if(!info[1]->IsFunction()) {
         return Nan::ThrowTypeError("Second argument must be a function");
@@ -294,8 +294,8 @@ NAN_METHOD(DeviceINQ::ListPairedDevices) {
 
         Local<Object> deviceObj = Nan::New<v8::Object>();
 
-        deviceObj->Set(Nan::New("name").ToLocalChecked(), Nan::New([device.nameOrAddress UTF8String]).ToLocalChecked());
-        deviceObj->Set(Nan::New("address").ToLocalChecked(), Nan::New([device.addressString UTF8String]).ToLocalChecked());
+        Nan::Set(deviceObj, Nan::New("name").ToLocalChecked(), Nan::New([device.nameOrAddress UTF8String]).ToLocalChecked());
+        Nan::Set(deviceObj, Nan::New("address").ToLocalChecked(), Nan::New([device.addressString UTF8String]).ToLocalChecked());
 
         // A device may have multiple services, so enumerate each one
         Local<Array> servicesArray = Nan::New<v8::Array>((int)device.services.count);
@@ -305,26 +305,24 @@ NAN_METHOD(DeviceINQ::ListPairedDevices) {
             [service getRFCOMMChannelID:&channelID];
 
             Local<Object> serviceObj = Nan::New<v8::Object>();
-            serviceObj->Set(Nan::New("channel").ToLocalChecked(), Nan::New((int)channelID));
+            Nan::Set(serviceObj, Nan::New("channel").ToLocalChecked(), Nan::New((int)channelID));
 
             if ([service getServiceName])
-                serviceObj->Set(Nan::New("name").ToLocalChecked(), Nan::New([[service getServiceName] UTF8String]).ToLocalChecked());
+                Nan::Set(serviceObj, Nan::New("name").ToLocalChecked(), Nan::New([[service getServiceName] UTF8String]).ToLocalChecked());
             else
-                serviceObj->Set(Nan::New("name").ToLocalChecked(), Nan::Undefined());
+                Nan::Set(serviceObj, Nan::New("name").ToLocalChecked(), Nan::Undefined());
 
-            servicesArray->Set(j, serviceObj);
+            Nan::Set(servicesArray, j, serviceObj);
         }
-        deviceObj->Set(Nan::New("services").ToLocalChecked(), servicesArray);
+        Nan::Set(deviceObj, Nan::New("services").ToLocalChecked(), servicesArray);
 
-        resultArray->Set(i, deviceObj);
+        Nan::Set(resultArray, i, deviceObj);
     }
 
     Local<Value> argv[1] = {
         resultArray
     };
-    cb->Call(Nan::GetCurrentContext()->Global(), 1, argv);
+    cb->Call(Nan::GetCurrentContext(), Nan::GetCurrentContext()->Global(), 1, argv);
 
     return;
 }
-
-

package/src/windows/BTSerialPortBinding.cc

@@ -61,9 +61,9 @@ void BTSerialPortBinding::EIO_AfterConnect(uv_work_t *req) {
     connect_baton_t *baton = static_cast<connect_baton_t *>(req->data);
 
     Nan::TryCatch try_catch;
-
+    Nan::AsyncResource resource("bluetooth-serial-port:Connect");
     if (baton->status == 0) {
-        baton->cb->Call(0, nullptr);
+        baton->cb->Call(0, nullptr, &resource);
     } else {
         if (baton->rfcomm->s != INVALID_SOCKET) {
             closesocket(baton->rfcomm->s);
@@ -74,7 +74,7 @@ void BTSerialPortBinding::EIO_AfterConnect(uv_work_t *req) {
         Local<Value> argv[] = {
             Nan::Error(msg)
         };
-        baton->ecb->Call(1, argv);
+        baton->ecb->Call(1, argv, &resource);
     }
 
     if (try_catch.HasCaught()) {
@@ -127,7 +127,8 @@ void BTSerialPortBinding::EIO_AfterWrite(uv_work_t *req) {
         argv[1] = Nan::New<v8::Integer>(static_cast<int32_t>(data->result));
     }
 
-    data->callback->Call(2, argv);
+    Nan::AsyncResource resource("bluetooth-serial-port:Write");
+    data->callback->Call(2, argv, &resource);
 
     uv_mutex_lock(&write_queue_mutex);
     ngx_queue_remove(&queuedWrite->queue);
@@ -187,18 +188,14 @@ void BTSerialPortBinding::EIO_AfterRead(uv_work_t *req) {
         argv[0] = Nan::Error("Error reading from connection");
         argv[1] = Nan::Undefined();
     } else {
-        Local<Object> globalObj = Nan::GetCurrentContext()->Global();
-        Local<Function> bufferConstructor = Local<Function>::Cast(globalObj->Get(Nan::New("Buffer").ToLocalChecked()));
-        Local<Value> constructorArgs[1] = { Nan::New<v8::Integer>(baton->size) };
-        Local<Object> resultBuffer = Nan::NewInstance(bufferConstructor, 1, constructorArgs).ToLocalChecked();
-
+        Local<Object> resultBuffer = Nan::NewBuffer(baton->size).ToLocalChecked();
         memcpy_s(Buffer::Data(resultBuffer), baton->size, baton->result, baton->size);
-
         argv[0] = Nan::Undefined();
         argv[1] = resultBuffer;
     }
 
-    baton->cb->Call(2, argv);
+    Nan::AsyncResource resource("bluetooth-serial-port:Read");
+    baton->cb->Call(2, argv, &resource);
 
     if (try_catch.HasCaught()) {
         Nan::FatalException(try_catch);
@@ -210,20 +207,21 @@ void BTSerialPortBinding::EIO_AfterRead(uv_work_t *req) {
     baton = nullptr;
 }
 
-void BTSerialPortBinding::Init(Handle<Object> target) {
+void BTSerialPortBinding::Init(Local<Object> target) {
     Nan::HandleScope scope;
 
     Local<FunctionTemplate> t = Nan::New<FunctionTemplate>(New);
 
+    Isolate *isolate = target->GetIsolate();
+    Local<Context> ctx = isolate->GetCurrentContext();
+
     t->InstanceTemplate()->SetInternalFieldCount(1);
     t->SetClassName(Nan::New("BTSerialPortBinding").ToLocalChecked());
 
     Nan::SetPrototypeMethod(t, "write", Write);
     Nan::SetPrototypeMethod(t, "read", Read);
     Nan::SetPrototypeMethod(t, "close", Close);
-    target->Set(Nan::New("BTSerialPortBinding").ToLocalChecked(), t->GetFunction());
-    target->Set(Nan::New("BTSerialPortBinding").ToLocalChecked(), t->GetFunction());
-    target->Set(Nan::New("BTSerialPortBinding").ToLocalChecked(), t->GetFunction());
+    target->Set(ctx, Nan::New("BTSerialPortBinding").ToLocalChecked(), t->GetFunction(ctx).ToLocalChecked());
 }
 
 BTSerialPortBinding::BTSerialPortBinding() : s(INVALID_SOCKET) {
@@ -244,8 +242,8 @@ NAN_METHOD(BTSerialPortBinding::New) {
         return Nan::ThrowError("usage: BTSerialPortBinding(address, channelID, callback, error)");
     }
 
-    String::Utf8Value address(info[0]);
-    int channelID = info[1]->Int32Value();
+    String::Utf8Value address(info.GetIsolate(), info[0]);
+    int channelID = info[1]->Int32Value(Nan::GetCurrentContext()).ToChecked();
     if (channelID <= 0) {
         return Nan::ThrowTypeError("ChannelID should be a positive int value");
     }
@@ -353,8 +351,9 @@ NAN_METHOD(BTSerialPortBinding::Read) {
         argv[0] = Nan::Error("The connection has been closed");
         argv[1] = Nan::Undefined();
 
+        Nan::AsyncResource resource("bluetooth-serial-port:Read");
         Nan::Callback *nc = new Nan::Callback(cb);
-        nc->Call(2, argv);
+        nc->Call(2, argv, &resource);
     } else {
         read_baton_t *baton = new read_baton_t();
         baton->rfcomm = rfcomm;