bluetooth-serial-port 2.2.5 → 3.0.0

package/src/windows/BluetoothSerialPort.cc

@@ -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.
  */
 
 #include <node.h>
@@ -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/windows/DeviceINQ.cc

@@ -113,7 +113,7 @@ void DeviceINQ::EIO_AfterSdpSearch(uv_work_t *req) {
     baton = nullptr;
 }
 
-void DeviceINQ::Init(Handle<Object> target) {
+void DeviceINQ::Init(Local<Object> target) {
     Nan::HandleScope scope;
 
     Local<FunctionTemplate> t = Nan::New<FunctionTemplate>(New);
@@ -121,14 +121,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() {
@@ -333,13 +333,15 @@ NAN_METHOD(DeviceINQ::SdpSearch) {
     }
 
     sdp_baton_t *baton = new sdp_baton_t();
-    String::Utf8Value address(info[0]);
+
+    Local<Function> cb = info[1].As<Function>();
+    String::Utf8Value address(cb->GetIsolate(), info[0]);
     if (strcpy_s(baton->address, *address) != 0) {
         delete baton;
         return Nan::ThrowTypeError("Address (first argument) length is invalid");
     }
 
-    Local<Function> cb = info[1].As<Function>();
+
     DeviceINQ *inquire = Nan::ObjectWrap::Unwrap<DeviceINQ>(info.This());
 
     baton->inquire = inquire;
@@ -413,8 +415,8 @@ NAN_METHOD(DeviceINQ::ListPairedDevices) {
                         : Nan::New(address);
 
                     Local<Object> deviceObj = Nan::New<v8::Object>();
-                    deviceObj->Set(Nan::New("name").ToLocalChecked(), Nan::New(querySet->lpszServiceInstanceName).ToLocalChecked());
-                    deviceObj->Set(Nan::New("address").ToLocalChecked(), addressString.ToLocalChecked());
+                    Nan::Set(deviceObj, Nan::New("name").ToLocalChecked(), Nan::New(querySet->lpszServiceInstanceName).ToLocalChecked());
+                    Nan::Set(deviceObj, Nan::New("address").ToLocalChecked(), addressString.ToLocalChecked());
 
                     Local<Array> servicesArray = Local<Array>(Nan::New<Array>());
                     {
@@ -443,9 +445,9 @@ NAN_METHOD(DeviceINQ::ListPairedDevices) {
                                 if (lookupServiceError2 != SOCKET_ERROR ) {
                                     int port = (int)((SOCKADDR_BTH *)querySet2->lpcsaBuffer->RemoteAddr.lpSockaddr)->port;
                                     Local<Object> serviceObj = Nan::New<v8::Object>();
-                                    serviceObj->Set(Nan::New("channel").ToLocalChecked(), Nan::New(port));
-                                    serviceObj->Set(Nan::New("name").ToLocalChecked(), Nan::New(querySet2->lpszServiceInstanceName).ToLocalChecked());
-                                    servicesArray->Set(place++, serviceObj);
+                                    Nan::Set(serviceObj, Nan::New("channel").ToLocalChecked(), Nan::New(port));
+                                    Nan::Set(serviceObj, Nan::New("name").ToLocalChecked(), Nan::New(querySet2->lpszServiceInstanceName).ToLocalChecked());
+                                    Nan::Set(servicesArray, place++, serviceObj);
                                 } else {
                                     int lookupServiceErrorNumber = WSAGetLastError();
                                     if (lookupServiceErrorNumber == WSAEFAULT) {
@@ -474,8 +476,8 @@ NAN_METHOD(DeviceINQ::ListPairedDevices) {
                         free(querySet2);
                     }
 
-                    deviceObj->Set(Nan::New("services").ToLocalChecked(), servicesArray);
-                    resultArray->Set(i, deviceObj);
+                    Nan::Set(deviceObj, Nan::New("services").ToLocalChecked(), servicesArray);
+                    Nan::Set(resultArray, i, deviceObj);
                     i = i+1;
                 }
             } else {
@@ -519,7 +521,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/.travis.yml

@@ -1,48 +0,0 @@
-language: cpp # node_js is not supported yet on osx
-compiler: gcc
-sudo: false
-
-os:
-  - linux
-  - osx
-
-env:
-  matrix:
-    - export NODE_VERSION="6"
-    - export NODE_VERSION="7"
-    - export NODE_VERSION="8"
-    - export NODE_VERSION="9"
-    - export NODE_VERSION="10"
-    - export NODE_VERSION="11"
-
-matrix:
-  fast-finish: true
-
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - libbluetooth-dev
-
-before_install:
-  - git clone https://github.com/creationix/nvm.git ./.nvm
-  - source ./.nvm/nvm.sh
-  - nvm install $NODE_VERSION
-  - nvm use $NODE_VERSION
-  - npm config set python `which python`
-  - gcc --version
-  - g++ --version
-  - npm --version
-  - node --version
-
-script:
-  - npm install
-  - node ./test/index.js
-
-cache:
-  directories:
-    - $HOME/.node-gyp
-    - $HOME/.npm
-    - node_modules
-