bluetooth-serial-port 2.2.5 → 3.0.0

package/src/linux/BTSerialPortBindingServer.cc

@@ -162,7 +162,8 @@ void BTSerialPortBindingServer::EIO_AfterListen(uv_work_t *req) {
             Nan::Error(baton->errorString)
         };
 
-        baton->ecb->Call(1, argv);
+        Nan::AsyncResource resource("bluetooth-serial-port:server.Listen");
+        baton->ecb->Call(1, argv, &resource);
         return;
     }
 
@@ -214,7 +215,9 @@ void BTSerialPortBindingServer::EIO_AfterWrite(uv_work_t *req) {
         argv[1] = Nan::New<v8::Integer>((int32_t)data->result);
     }
 
-    data->callback->Call(2, argv);
+
+    Nan::AsyncResource resource("bluetooth-serial-port:server.Write");
+    data->callback->Call(2, argv, &resource);
 
     uv_mutex_lock(&data->rfcomm->mWriteQueueMutex);
     ngx_queue_remove(&queuedWrite->queue);
@@ -283,6 +286,7 @@ void BTSerialPortBindingServer::EIO_AfterRead(uv_work_t *req) {
 
     Local<Value> argv[2];
 
+    Nan::AsyncResource resource("bluetooth-serial-port:server.Read");
     if (baton->size <= 0) {
         char msg[512];
         sprintf(msg, "Error reading from connection: errno: %d", baton->errorno);
@@ -294,21 +298,18 @@ void BTSerialPortBindingServer::EIO_AfterRead(uv_work_t *req) {
                 baton->rfcomm->AdvertiseAndAccept();
             }
             argv[0] = Nan::Error(CLIENT_CLOSED_CONNECTION);
-            baton->cb->Call(2, argv);
+            baton->cb->Call(2, argv, &resource);
         }
         return;
     }
 
-    Local<Object> globalObj = Nan::GetCurrentContext()->Global();
-    Local<Function> bufferConstructor = Local<Function>::Cast(globalObj->Get(Nan::New("Buffer").ToLocalChecked()));
-    Handle<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(Buffer::Data(resultBuffer), baton->result, baton->size);
 
     argv[0] = Nan::Undefined();
     argv[1] = resultBuffer;
 
-    baton->cb->Call(2, argv);
+    baton->cb->Call(2, argv, &resource);
 
     if (try_catch.HasCaught()) {
         Nan::FatalException(try_catch);
@@ -319,7 +320,7 @@ void BTSerialPortBindingServer::EIO_AfterRead(uv_work_t *req) {
     delete baton;
 }
 
-void BTSerialPortBindingServer::Init(Handle<Object> target) {
+void BTSerialPortBindingServer::Init(Local<Object> target) {
     Nan::HandleScope scope;
 
     Local<FunctionTemplate> t = Nan::New<FunctionTemplate>(New);
@@ -327,13 +328,16 @@ void BTSerialPortBindingServer::Init(Handle<Object> target) {
     t->InstanceTemplate()->SetInternalFieldCount(1);
     t->SetClassName(Nan::New("BTSerialPortBindingServer").ToLocalChecked());
 
+    Isolate *isolate = target->GetIsolate();
+    Local<Context> ctx = isolate->GetCurrentContext();
+
     Nan::SetPrototypeMethod(t, "write", Write);
     Nan::SetPrototypeMethod(t, "read", Read);
     Nan::SetPrototypeMethod(t, "close", Close);
     Nan::SetPrototypeMethod(t, "disconnectClient", DisconnectClient);
     Nan::SetPrototypeMethod(t, "isOpen", IsOpen);
 
-    target->Set(Nan::New("BTSerialPortBindingServer").ToLocalChecked(), t->GetFunction());
+    Nan::Set(target, Nan::New("BTSerialPortBindingServer").ToLocalChecked(), t->GetFunction(ctx).ToLocalChecked());
 }
 
 BTSerialPortBindingServer::BTSerialPortBindingServer() :
@@ -377,16 +381,19 @@ NAN_METHOD(BTSerialPortBindingServer::New) {
     listen_baton_t * baton = rfcomm->mListenBaton;
     rfcomm->Wrap(info.This());
 
-    Handle<Object> jsOptions = Handle<Object>::Cast(info[2]);
-    Handle<Array> properties = jsOptions->GetPropertyNames();
+    Local<Object> jsOptions = Local<Object>::Cast(info[2]);
+    Isolate *isolate = jsOptions->GetIsolate();
+    Local<Context> ctx = isolate->GetCurrentContext();
+
+    Local<Array> properties = jsOptions->GetPropertyNames(ctx).ToLocalChecked();
     int n = properties->Length();
     std::map<std::string, std::string> options;
 
     for (int i = 0; i < n ; i++) {
-        Handle<Value>  property = properties->Get(Nan::New<Integer>(i));
-        string propertyName = std::string(*String::Utf8Value(property));
-        Handle<Value> optionValue = jsOptions->Get(property);
-        options[propertyName] = std::string(*String::Utf8Value(optionValue));
+        Local<Value>  property = Nan::Get(properties, Nan::New<Integer>(i)).ToLocalChecked();
+        string propertyName = std::string(*String::Utf8Value(isolate, property));
+        Local<Value> optionValue = Nan::Get(jsOptions, property).ToLocalChecked();
+        options[propertyName] = std::string(*String::Utf8Value(isolate, optionValue));
     }
 
     if(!str2uuid(options["uuid"].c_str(), &baton->uuid)){
@@ -600,8 +607,9 @@ NAN_METHOD(BTSerialPortBindingServer::Read) {
         argv[0] = Nan::Error(CLIENT_CLOSED_CONNECTION);
         argv[1] = Nan::Undefined();
 
+        Nan::AsyncResource resource("bluetooth-serial-port:server.Read");
         std::unique_ptr<Nan::Callback> nc(new Nan::Callback(cb));
-        nc->Call(2, argv);
+        nc->Call(2, argv, &resource);
         return;
     }
     read_baton_t *baton = new read_baton_t();
@@ -666,7 +674,7 @@ void BTSerialPortBindingServer::ClientWorker::Execute(){
 
         select_status = select(mBaton->rfcomm->s + 1, &fds, NULL, NULL, &timeout);
         if (select_status > 0) {
-            break; 
+            break;
         }
         else if (select_status == -1) {
             return Nan::ThrowError("error pselect'ing socket!");
@@ -701,6 +709,8 @@ void BTSerialPortBindingServer::ClientWorker::HandleOKCallback(){
     Local<Value> argv[] = {
         Nan::New<v8::String>((mBaton->clientAddress)).ToLocalChecked()
     };
-    callback->Call(1, argv);
+
+    Nan::AsyncResource resource("bluetooth-serial-port:server.HandleOK");
+    callback->Call(1, argv, &resource);
 
 }

package/src/linux/BluetoothSerialPort.cc

@@ -15,7 +15,7 @@
 
 using namespace v8;
 
-void InitAll(Handle<Object> exports) {
+void InitAll(Local<Object> exports) {
 	DeviceINQ::Init(exports);
 	BTSerialPortBinding::Init(exports);
 }

package/src/linux/BluetoothSerialPortServer.cc

@@ -15,7 +15,7 @@
 
 using namespace v8;
 
-void InitAllServer(Handle<Object> exports) {
+void InitAllServer(Local<Object> exports) {
 	BTSerialPortBindingServer::Init(exports);
 }
 

package/src/linux/DeviceINQ.cc

@@ -136,7 +136,8 @@ void DeviceINQ::EIO_AfterSdpSearch(uv_work_t *req) {
         Nan::New(baton->channelID)
     };
 
-    baton->cb->Call(1, argv);
+    Nan::AsyncResource resource("bluetooth-serial-port:SdpSearch");
+    baton->cb->Call(1, argv, &resource);
 
     if (try_catch.HasCaught()) {
         Nan::FatalException(try_catch);
@@ -148,7 +149,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);
@@ -156,14 +157,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());
 }
 
 bt_inquiry DeviceINQ::doInquire() {
@@ -239,26 +240,27 @@ NAN_METHOD(DeviceINQ::InquireSync) {
         return Nan::ThrowError(usage);
     }
 
+    Nan::AsyncResource resource("bluetooth-serial-port:InquireSync");
     Nan::Callback *found = new Nan::Callback(info[0].As<Function>());
     Nan::Callback *callback = new Nan::Callback(info[1].As<Function>());
 
     bt_inquiry inquiryResult = DeviceINQ::doInquire();
     for (int i = 0; i < inquiryResult.num_rsp; i++) {
       Local<Value> argv[] = {
-        Nan::New(inquiryResult.devices[i].address).ToLocalChecked(),  
+        Nan::New(inquiryResult.devices[i].address).ToLocalChecked(),
         Nan::New(inquiryResult.devices[i].name).ToLocalChecked()
       };
-      found->Call(2, argv);
+      found->Call(2, argv, &resource);
     }
 
     Local<Value> argv[] = {};
-    callback->Call(0, argv);
+    callback->Call(0, argv, &resource);
     return;
 }
 
 class InquireWorker : public Nan::AsyncWorker {
  public:
-  InquireWorker(Nan::Callback* found, Nan::Callback *callback) 
+  InquireWorker(Nan::Callback* found, Nan::Callback *callback)
     : Nan::AsyncWorker(callback), found(found) {}
   ~InquireWorker() {}
 
@@ -276,16 +278,17 @@ class InquireWorker : public Nan::AsyncWorker {
   void HandleOKCallback () {
     Nan::HandleScope scope;
 
+    Nan::AsyncResource resource("bluetooth-serial-port:Inquire");
     for (int i = 0; i < inquiryResult.num_rsp; i++) {
       Local<Value> argv[] = {
-        Nan::New(inquiryResult.devices[i].address).ToLocalChecked(),  
+        Nan::New(inquiryResult.devices[i].address).ToLocalChecked(),
         Nan::New(inquiryResult.devices[i].name).ToLocalChecked()
       };
-      found->Call(2, argv);
+      found->Call(2, argv, &resource);
     }
 
     Local<Value> argv[] = {};
-    callback->Call(0, argv);
+    callback->Call(0, argv, &resource);
   }
 
   private:
@@ -314,7 +317,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");
@@ -363,7 +366,7 @@ NAN_METHOD(DeviceINQ::ListPairedDevices) {
     Local<Value> argv[1] = {
         resultArray
     };
-    cb->Call(Nan::GetCurrentContext()->Global(), 1, argv);
+    cb->Call(Nan::GetCurrentContext(), Nan::GetCurrentContext()->Global(), 1, argv);
 
     return;
 }

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

@@ -75,15 +75,16 @@ void BTSerialPortBinding::EIO_AfterConnect(uv_work_t *req) {
 
     Nan::TryCatch try_catch;
 
+    Nan::AsyncResource resource("bluetooth-serial-port:Connect");
     if (baton->status == 0) {
-        baton->cb->Call(0, NULL);
+        baton->cb->Call(0, NULL, &resource);
     } else {
         char msg[80];
         sprintf(msg, "Cannot connect: %d", baton->status);
         Local<Value> argv[] = {
             Nan::Error(msg)
         };
-        baton->ecb->Call(1, argv);
+        baton->ecb->Call(1, argv, &resource);
     }
 
     if (try_catch.HasCaught()) {
@@ -130,7 +131,8 @@ void BTSerialPortBinding::EIO_AfterWrite(uv_work_t *req) {
         argv[1] = Nan::New<v8::Integer>((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);
@@ -186,17 +188,15 @@ 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(Buffer::Data(resultBuffer), 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);
@@ -208,7 +208,7 @@ void BTSerialPortBinding::EIO_AfterRead(uv_work_t *req) {
     baton = NULL;
 }
 
-void BTSerialPortBinding::Init(Handle<Object> target) {
+void BTSerialPortBinding::Init(Local<Object> target) {
     Nan::HandleScope scope;
 
     Local<FunctionTemplate> t = Nan::New<FunctionTemplate>(New);
@@ -216,12 +216,13 @@ void BTSerialPortBinding::Init(Handle<Object> target) {
     t->InstanceTemplate()->SetInternalFieldCount(1);
     t->SetClassName(Nan::New("BTSerialPortBinding").ToLocalChecked());
 
+    Isolate *isolate = target->GetIsolate();
+    Local<Context> ctx = isolate->GetCurrentContext();
+
     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() :
@@ -240,9 +241,9 @@ NAN_METHOD(BTSerialPortBinding::New) {
         return Nan::ThrowError(usage);
     }
 
-    String::Utf8Value address(info[0]);
+    String::Utf8Value address(info.GetIsolate(), info[0]);
 
-    int channelID = info[1]->Int32Value();
+    int channelID = info[1]->Int32Value(Nan::GetCurrentContext()).ToChecked();
     if (channelID <= 0) {
         return Nan::ThrowTypeError("ChannelID should be a positive int value.");
     }
@@ -283,7 +284,11 @@ NAN_METHOD(BTSerialPortBinding::Write) {
     void* bufferData = Buffer::Data(bufferObject);
     size_t bufferLength = Buffer::Length(bufferObject);
 
-    String::Utf8Value addressParameter(info[1]);
+    // string
+    if (!info[1]->IsString()) {
+        Nan::ThrowTypeError("Second argument must be a string");
+    }
+    String::Utf8Value addressParameter(info.GetIsolate(), info[1]);
 
     // callback
     if(!info[2]->IsFunction()) {
@@ -328,7 +333,7 @@ NAN_METHOD(BTSerialPortBinding::Close) {
     }
 
     //TODO should be a better way to do this...
-    String::Utf8Value addressParameter(info[0]);
+    String::Utf8Value addressParameter(info.GetIsolate(), info[0]);
     char addressArray[32];
     strncpy(addressArray, *addressParameter, 32);
     NSString *address = [NSString stringWithCString:addressArray encoding:NSASCIIStringEncoding];
@@ -356,7 +361,8 @@ NAN_METHOD(BTSerialPortBinding::Read) {
         argv[1] = Nan::Undefined();
 
         Nan::Callback *nc = new Nan::Callback(cb);
-        nc->Call(2, argv);
+        Nan::AsyncResource resource("bluetooth-serial-port:Read");
+        nc->Call(2, argv, &resource);
     } else {
         read_baton_t *baton = new read_baton_t();
         baton->rfcomm = rfcomm;

package/src/macos/BluetoothSerialPort.mm

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2012-2013, Eelco Cramer
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <node.h>
+#include "DeviceINQ.h"
+#include "BTSerialPortBinding.h"
+
+using namespace v8;
+
+void InitAll(Local<Object> exports) {
+	DeviceINQ::Init(exports);
+	BTSerialPortBinding::Init(exports);
+}
+
+NODE_MODULE(BluetoothSerialPort, InitAll)

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

@@ -3,10 +3,10 @@
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- * 
+ *
  * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
  * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef NODE_BTSP_SRC_BLUETOOTH_WORKER_H
@@ -29,7 +29,7 @@ struct device_info_t {
 @interface BluetoothWorker: NSObject {
     @private
 BluetoothDeviceResources *res;
-    NSThread *worker;
+    dispatch_queue_t worker_queue;
     pipe_producer_t *inquiryProducer;
     NSLock *sdpLock;
     NSLock *connectLock;