bluetooth-serial-port 2.2.7 → 3.0.1

package/.circleci/config.yml

@@ -0,0 +1,47 @@
+# Use the latest 2.1 version of CircleCI pipeline process engine.
+# See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+
+orbs:
+  # The Node.js orb contains a set of prepackaged CircleCI configuration you can utilize
+  # Orbs reduce the amount of configuration required for common tasks.
+  # See the orb documentation here: https://circleci.com/developer/orbs/orb/circleci/node
+  node: circleci/node@4.1
+
+jobs:
+  build-14:
+    docker:
+      - image: node:14
+    steps:
+      - checkout
+      - run:
+          name: Install dependencies
+          command: apt-get update && apt-get install -y build-essential libbluetooth-dev
+      - node/install-packages
+
+  build-16:
+    docker:
+      - image: node:16
+    steps:
+      - checkout
+      - run:
+          name: Install build dependencies
+          command: apt-get update && apt-get install -y build-essential libbluetooth-dev
+      - node/install-packages
+
+  build-18:
+    docker:
+      - image: node:18
+    steps:
+      - checkout
+      - run:
+          name: Install build dependencies
+          command: apt-get update && apt-get install -y build-essential libbluetooth-dev
+      - node/install-packages
+
+workflows:
+  build:
+    jobs:
+      - build-14
+      - build-16
+      - build-18

package/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:lts
+FROM node:14
 RUN apt-get update
 RUN apt-get install -y build-essential libbluetooth-dev
 ADD . node-bluetooth-serial-port

package/README.md

@@ -1,26 +1,35 @@
 # Bluetooth serial port communication for Node.js
 
-[![Build Status](https://travis-ci.org/eelcocramer/node-bluetooth-serial-port.svg)](https://travis-ci.org/eelcocramer/node-bluetooth-serial-port)
+## Consider a donation
+
+This piece of open source software is free (as in speech) to [use, modify and distribute](LICENSE.md), no strings attached. If this software saves you some cash and you want to do something for the good please consider making a donation to a [charity](https://www.doctorswithoutborders.org). Any charity will do. 🙏
+
+> MacOS support has (temporarily) been dropped as of version v3.0.0 of the module. If you use the module on a Mac please stay on v2 of this module.
+
+> _DEPRECATED_ Currently I have no plans to add support for NodeJS version 1.13 and up. If you want to help out by adding support please contact me. It was a great experience maintaining this project for almost 8 years. It was great to see people step in to improve this project. Thank you all!
+
+[![Build status](https://dl.circleci.com/status-badge/img/gh/eelcocramer/node-bluetooth-serial-port/tree/master.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/eelcocramer/node-bluetooth-serial-port/tree/master)
 [![Build status](https://ci.appveyor.com/api/projects/status/4p1r3ddoid98qc7k?svg=true)](https://ci.appveyor.com/project/eelcocramer/node-bluetooth-serial-port)
 
-This node module lets you communicate over Bluetooth serial port with devices using Node.js. The goal is have an easy to use API. This module is great for communicating with Bluetooth enabled Arduino devices.
+This node module lets you communicate over Bluetooth serial port with devices using NodeJS. The goal is have an easy to use API. This module is great for communicating with Bluetooth enabled Arduino devices.
 
 If you have any problems make sure to [checkout the FAQ](https://github.com/eelcocramer/node-bluetooth-serial-port/issues?q=label%3AFAQ).
 
 ## New in the last release
 
-* Changes node version to `lts` in the Dockerfile
+-   Changes node version to `lts` in the Dockerfile
 
 Check the [release notes](RELEASE_NOTES.md) for an overview of the change history.
 
 ## Prerequisites on Linux
 
-* Needs Bluetooth development packages to build
+-   Needs Bluetooth development packages to build
 
 `apt-get install build-essential libbluetooth-dev`
 
 ### Note on RFCOMM Server Sockets
-As the initial implementation of the RFCOMM server sockets is based on BlueZ4, in order to work with SDP we need to change the bluetoothd service configuration file by modifing the systemd unit file: bluetooth.service:
+
+As the initial implementation of the RFCOMM server sockets is based on BlueZ4, in order to work with SDP we need to change the bluetooth service configuration file by modifing the systemd unit file: bluetooth.service:
 
 (Debian based distro)
 
@@ -41,14 +50,10 @@ sudo systemctl daemon-reload
 sudo systemctl restart bluetooth
 ```
 
-## Prerequisites on macOS
-
-* Needs Xcode and Xcode command line tools installed.
-
 ## Prerequisites on Windows
 
-* Needs Visual Studio (Visual C++) and its command line tools installed.
-* Needs Python 2.x installed and accessible from the command line path.
+-   Needs Visual Studio (Visual C++) and its command line tools installed.
+-   Needs Python 2.x installed and accessible from the command line path.
 
 ## Install
 
@@ -63,64 +68,78 @@ sudo systemctl restart bluetooth
 ## Basic client usage
 
 ```javascript
-
-var btSerial = new (require('bluetooth-serial-port')).BluetoothSerialPort();
-
-btSerial.on('found', function(address, name) {
-	btSerial.findSerialPortChannel(address, function(channel) {
-		btSerial.connect(address, channel, function() {
-			console.log('connected');
-
-			btSerial.write(Buffer.from('my data', 'utf-8'), function(err, bytesWritten) {
-				if (err) console.log(err);
-			});
-
-			btSerial.on('data', function(buffer) {
-				console.log(buffer.toString('utf-8'));
-			});
-		}, function () {
-			console.log('cannot connect');
-		});
-
-		// close the connection when you're ready
-		btSerial.close();
-	}, function() {
-		console.log('found nothing');
-	});
+var btSerial = new (require("bluetooth-serial-port").BluetoothSerialPort)();
+
+btSerial.on("found", function (address, name) {
+    btSerial.findSerialPortChannel(
+        address,
+        function (channel) {
+            btSerial.connect(
+                address,
+                channel,
+                function () {
+                    console.log("connected");
+
+                    btSerial.write(
+                        Buffer.from("my data", "utf-8"),
+                        function (err, bytesWritten) {
+                            if (err) console.log(err);
+                        }
+                    );
+
+                    btSerial.on("data", function (buffer) {
+                        console.log(buffer.toString("utf-8"));
+                    });
+                },
+                function () {
+                    console.log("cannot connect");
+                }
+            );
+
+            // close the connection when you're ready
+            btSerial.close();
+        },
+        function () {
+            console.log("found nothing");
+        }
+    );
 });
 
 btSerial.inquire();
-
 ```
 
 ## Basic server usage (only on Linux)
 
 ```javascript
-var server = new(require('bluetooth-serial-port')).BluetoothSerialPortServer();
+var server = new (require("bluetooth-serial-port").BluetoothSerialPortServer)();
 
 var CHANNEL = 10; // My service channel. Defaults to 1 if omitted.
-var UUID = '38e851bc-7144-44b4-9cd8-80549c6f2912'; // My own service UUID. Defaults to '1101' if omitted
+var UUID = "38e851bc-7144-44b4-9cd8-80549c6f2912"; // My own service UUID. Defaults to '1101' if omitted
 
-server.on('data', function(buffer) {
-    console.log('Received data from client: ' + buffer);
+server.on("data", function (buffer) {
+    console.log("Received data from client: " + buffer);
 
     // ...
 
-    console.log('Sending data to the client');
-    server.write(Buffer.from('...'), function (err, bytesWritten) {
+    console.log("Sending data to the client");
+    server.write(Buffer.from("..."), function (err, bytesWritten) {
         if (err) {
-            console.log('Error!');
+            console.log("Error!");
         } else {
-            console.log('Send ' + bytesWritten + ' to the client!');
+            console.log("Send " + bytesWritten + " to the client!");
         }
     });
 });
 
-server.listen(function (clientAddress) {
-    console.log('Client: ' + clientAddress + ' connected!');
-}, function(error){
-	console.error("Something wrong happened!:" + error);
-}, {uuid: UUID, channel: CHANNEL} );
+server.listen(
+    function (clientAddress) {
+        console.log("Client: " + clientAddress + " connected!");
+    },
+    function (error) {
+        console.error("Something wrong happened!:" + error);
+    },
+    { uuid: UUID, channel: CHANNEL }
+);
 ```
 
 ## API
@@ -131,7 +150,7 @@ server.listen(function (clientAddress) {
 
 Emitted when data is read from the serial port connection.
 
-* buffer - the data that was read into a [Buffer](http://nodejs.org/api/buffer.html) object.
+-   buffer - the data that was read into a [Buffer](http://nodejs.org/api/buffer.html) object.
 
 #### Event: ('closed')
 
@@ -141,14 +160,14 @@ Emitted when a connection was closed either by the user (i.e. calling `close` or
 
 Emitted when reading from the serial port connection results in an error. The connection is closed.
 
-* err - an [Error object](http://docs.nodejitsu.com/articles/errors/what-is-the-error-object) describing the failure.
+-   err - an [Error object](http://docs.nodejitsu.com/articles/errors/what-is-the-error-object) describing the failure.
 
 #### Event: ('found', address, name)
 
 Emitted when a bluetooth device was found.
 
-* address - the address of the device
-* name - the name of the device (or the address if the name is unavailable)
+-   address - the address of the device
+-   name - the name of the device (or the address if the name is unavailable)
 
 #### Event: ('finished')
 
@@ -166,14 +185,14 @@ Starts searching synchronously for bluetooth devices. When a device is found a '
 
 Checks if a device has a serial port service running and if it is found it passes the channel id to use for the RFCOMM connection.
 
-* callback(channel) - called when finished looking for a serial port on the device.
-* errorCallback - called the search finished but no serial port channel was found on the device.
-Connects to a remote bluetooth device.
+-   callback(channel) - called when finished looking for a serial port on the device.
+-   errorCallback - called the search finished but no serial port channel was found on the device.
+    Connects to a remote bluetooth device.
 
-* bluetoothAddress - the address of the remote Bluetooth device.
-* channel - the channel to connect to.
-* [successCallback] - called when a connection has been established.
-* [errorCallback(err)] - called when the connection attempt results in an error. The parameter is an [Error object](http://docs.nodejitsu.com/articles/errors/what-is-the-error-object).
+-   bluetoothAddress - the address of the remote Bluetooth device.
+-   channel - the channel to connect to.
+-   [successCallback] - called when a connection has been established.
+-   [errorCallback(err)] - called when the connection attempt results in an error. The parameter is an [Error object](http://docs.nodejitsu.com/articles/errors/what-is-the-error-object).
 
 #### BluetoothSerialPort.close()
 
@@ -187,16 +206,16 @@ Check whether the connection is open or not.
 
 Writes a [Buffer](http://nodejs.org/api/buffer.html) to the serial port connection.
 
-* buffer - the [Buffer](http://nodejs.org/api/buffer.html) to be written.
-* callback(err, bytesWritten) - is called when the write action has been completed. When the `err` parameter is set an error has occured, in that case `err` is an [Error object](http://docs.nodejitsu.com/articles/errors/what-is-the-error-object). When `err` is not set the write action was successful and `bytesWritten` contains the amount of bytes that is written to the connection.
+-   buffer - the [Buffer](http://nodejs.org/api/buffer.html) to be written.
+-   callback(err, bytesWritten) - is called when the write action has been completed. When the `err` parameter is set an error has occured, in that case `err` is an [Error object](http://docs.nodejitsu.com/articles/errors/what-is-the-error-object). When `err` is not set the write action was successful and `bytesWritten` contains the amount of bytes that is written to the connection.
 
 #### BluetoothSerialPort.listPairedDevices(callback)
 
-__NOT AVAILABLE ON LINUX__
+**NOT AVAILABLE ON LINUX**
 
 Lists the devices that are currently paired with the host.
 
-* callback(pairedDevices) - is called when the paired devices object has been populated. See the [pull request](https://github.com/eelcocramer/node-bluetooth-serial-port/pull/30) for more information on the `pairedDevices` object.
+-   callback(pairedDevices) - is called when the paired devices object has been populated. See the [pull request](https://github.com/eelcocramer/node-bluetooth-serial-port/pull/30) for more information on the `pairedDevices` object.
 
 ### BluetoothSerialPortServer
 
@@ -204,24 +223,22 @@ Lists the devices that are currently paired with the host.
 
 Listens for an incoming bluetooth connection. It will automatically advertise the server via SDP
 
-* callback(address) - is called when a new client is connecting.
-* errorCallback(err) - is called when an error occurs.
-* options - An object with these properties:
-  * uuid - [String] The UUID of the server. If omitted the default value will be 1101 (corresponding to Serial Port Profile UUID). Can be a 16 bit or 32 bit UUID.
-  * channel - [Number] The RFCOMM channel the server is listening on, in the range of 1-30. If omitted the default value will be 1.
+-   callback(address) - is called when a new client is connecting.
+-   errorCallback(err) - is called when an error occurs.
+-   options - An object with these properties:
+
+    -   uuid - [String] The UUID of the server. If omitted the default value will be 1101 (corresponding to Serial Port Profile UUID). Can be a 16 bit or 32 bit UUID.
+    -   channel - [Number] The RFCOMM channel the server is listening on, in the range of 1-30. If omitted the default value will be 1.
 
-    Example:
-    `var options = {
-	    uuid: 'ffffffff-ffff-ffff-ffff-fffffffffff1',
-	    channel: 10
-     }`
+        Example:
+        `var options = { uuid: 'ffffffff-ffff-ffff-ffff-fffffffffff1', channel: 10 }`
 
 #### BluetoothSerialPortServer.write(buffer, callback)
 
 Writes data from a buffer to a connection.
 
-* buffer - the buffer to send over the connection.
-* callback(err, len) - called when the data is send or an error did occur. `error` contains the error is appropriated. `len` has the number of bytes that were written to the connection.
+-   buffer - the buffer to send over the connection.
+-   callback(err, len) - called when the data is send or an error did occur. `error` contains the error is appropriated. `len` has the number of bytes that were written to the connection.
 
 #### BluetoothSerialPortServer.close()
 
@@ -239,7 +256,7 @@ Checks is a server is listening or not.
 
 Emitted when data is read from the serial port connection.
 
-* buffer - the data that was read into a [Buffer](http://nodejs.org/api/buffer.html) object.
+-   buffer - the data that was read into a [Buffer](http://nodejs.org/api/buffer.html) object.
 
 #### Event: ('disconnected')
 
@@ -253,7 +270,7 @@ Emitted when the server is closed (i.e. from calling `close` or as the result of
 
 Emitted when reading from the serial port connection results in an error. The connection is closed.
 
-* err - an [Error object](http://docs.nodejitsu.com/articles/errors/what-is-the-error-object) describing the failure.
+-   err - an [Error object](http://docs.nodejitsu.com/articles/errors/what-is-the-error-object) describing the failure.
 
 ## Typescript support
 

package/RELEASE_NOTES.md

@@ -1,5 +1,14 @@
 ## RELEASE NOTES
 
+### 3.0.1
+
+* Fixes typescript definition for `listPairedDevices`.
+
+### 3.0.0
+
+* Fixes building issues with recent version of NodeJS.
+* Drops support for Darwin / MacOS for the moment. If you want to use the module on a Mac please install v2.2.7.
+
 ### 2.2.7
 
 * Changes node version to `lts` in the Dockerfile

package/appveyor.yml

@@ -4,14 +4,12 @@ environment:
   # Test against these versions of Node.js and io.js
   matrix:
     # node.js
-    - nodejs_version: "8"
-    - nodejs_version: "9"
-    - nodejs_version: "10"
-    - nodejs_version: "11"
-    - nodejs_version: "12"
+    - nodejs_version: "14"
+    - nodejs_version: "16"
+    - nodejs_version: "18"
+
 
 platform:
-  - x86
   - x64
 
 # Install scripts. (runs after repo cloning)
@@ -23,8 +21,8 @@ install:
   - npm -g install npm@latest
   - npm --version
   - node -e "console.log(process.arch);"
-  - if "%PLATFORM%" == "x64" SET PATH=C:\Python27-x64;%PATH%
-  - if "%PLATFORM%" == "x86" SET PATH=C:\python27;%PATH%
+  #- if "%PLATFORM%" == "x64" SET PATH=C:\Python27-x64;%PATH%
+  #- if "%PLATFORM%" == "x86" SET PATH=C:\python27;%PATH%
   - npm install node-gyp
   - npm update
   - npm run install-debug

package/binding.gyp

@@ -11,14 +11,6 @@
           'libraries': ['-lbluetooth'],
           'cflags':['-std=c++11']
         }],
-        [ 'OS=="mac"', {
-          'sources': ['src/osx/DeviceINQ.mm', 'src/osx/BluetoothWorker.mm', 'src/osx/pipe.c', 'src/osx/BluetoothDeviceResources.mm', 'src/osx/BluetoothSerialPort.mm', 'src/osx/BTSerialPortBinding.mm'],
-          'include_dirs' : [ "<!(node -e \"require('nan')\")", 'src', 'src/osx' ],
-          'libraries':['-framework Foundation', '-framework IOBluetooth', '-fobjc-arc'],
-          'cflags!': [ '-fno-exceptions' ],
-          'cflags_cc!': [ '-fno-exceptions' ],
-          'xcode_settings': { 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', 'OTHER_CFLAGS': [ '-Wno-unused-function' ] }
-        }],
         [ 'OS=="win"', {
           'sources': [ 'src/windows/BluetoothSerialPort.cc', 'src/windows/DeviceINQ.cc', 'src/windows/BTSerialPortBinding.cc', 'src/windows/BluetoothHelpers.cc' ],
           'include_dirs' : [ "<!(node -e \"require('nan')\")", 'src', 'src/windows' ],

package/lib/bluetooth-serial-port.d.ts

@@ -20,7 +20,7 @@ declare module BluetoothSerialPort {
     write(buffer: Buffer, cb: (err?: Error) => void): void;
     close(): void;
     isOpen(): boolean;
-    listPairedDevices(): void;
+    listPairedDevices(cb: (devices: any) => void): void;
   }
   class BluetoothSerialPortServer {
     constructor();

package/package.json

@@ -1,60 +1,58 @@
 {
-  "name": "bluetooth-serial-port",
-  "version": "2.2.7",
-  "description": "Bluetooth serial port communication for Node.js",
-  "author": "Eelco Cramer <eelco@hailendal.org>",
-  "keywords": [
-    "bluetooth",
-    "serial port",
-    "rfcomm",
-    "linux",
-    "os x",
-    "windows"
-  ],
-  "homepage": "https://github.com/eelcocramer/node-bluetooth-serial-port",
-  "bugs": "https://github.com/eelcocramer/node-bluetooth-serial-port/issues",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/eelcocramer/node-bluetooth-serial-port"
-  },
-  "directories": {
-    "lib": "./lib"
-  },
-  "main": "./lib/bluetooth-serial-port.js",
-  "types": "./lib/bluetooth-serial-port.d.ts",
-  "os": [
-    "darwin",
-    "linux",
-    "win32"
-  ],
-  "dependencies": {
-    "bindings": "1.2.x",
-    "nan": "latest",
-    "stable": "^0.1.8"
-  },
-  "optionalDependencies": {
-    "@types/node": "^7.0.10"
-  },
-  "engines": {
-    "node": ">= 6.x",
-    "npm": ">= 1.1.x"
-  },
-  "scripts": {
-    "install": "node-gyp configure build",
-    "install-debug": "node-gyp configure build --debug"
-  },
-  "license": "MIT",
-  "contributors": [
-    "Eric Smekens",
-    "Juho Vepsäläinen",
-    "Elmar Langholz",
-    "Donald Ness",
-    "Joost Verdoorn",
-    "Max Metral",
-    "Thomas Wickham",
-    "Adrián Estrada",
-    "Juan Gomez",
-    "Eric Lundby",
-    "Kevin Clarens"
-  ]
+    "name": "bluetooth-serial-port",
+    "version": "3.0.1",
+    "description": "Bluetooth serial port communication for Node.js",
+    "author": "Eelco Cramer <eelco@hailendal.org>",
+    "keywords": [
+        "bluetooth",
+        "serial port",
+        "rfcomm",
+        "linux",
+        "windows"
+    ],
+    "homepage": "https://github.com/eelcocramer/node-bluetooth-serial-port",
+    "bugs": "https://github.com/eelcocramer/node-bluetooth-serial-port/issues",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/eelcocramer/node-bluetooth-serial-port"
+    },
+    "directories": {
+        "lib": "./lib"
+    },
+    "main": "./lib/bluetooth-serial-port.js",
+    "types": "./lib/bluetooth-serial-port.d.ts",
+    "os": [
+        "linux",
+        "win32"
+    ],
+    "dependencies": {
+        "bindings": "1.5.x",
+        "nan": "2.16.x",
+        "stable": "^0.1.8"
+    },
+    "optionalDependencies": {
+        "@types/node": "^18.0.0"
+    },
+    "engines": {
+        "node": ">= 16.x",
+        "npm": ">= 8.x"
+    },
+    "scripts": {
+        "install": "node-gyp configure build",
+        "install-debug": "node-gyp configure build --debug"
+    },
+    "license": "MIT",
+    "contributors": [
+        "Eric Smekens",
+        "Juho Vepsäläinen",
+        "Elmar Langholz",
+        "Donald Ness",
+        "Joost Verdoorn",
+        "Max Metral",
+        "Thomas Wickham",
+        "Adrián Estrada",
+        "Juan Gomez",
+        "Eric Lundby",
+        "Kevin Clarens"
+    ]
 }

package/src/linux/BTSerialPortBinding.cc

@@ -79,15 +79,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()) {
@@ -140,7 +141,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);
@@ -202,17 +204,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);
@@ -239,7 +239,7 @@ void BTSerialPortBinding::Init(Local<Object> target) {
     Nan::SetPrototypeMethod(t, "write", Write);
     Nan::SetPrototypeMethod(t, "read", Read);
     Nan::SetPrototypeMethod(t, "close", Close);
-    target->Set(Nan::New("BTSerialPortBinding").ToLocalChecked(), t->GetFunction(ctx).ToLocalChecked());
+    Nan::Set(target, Nan::New("BTSerialPortBinding").ToLocalChecked(), t->GetFunction(ctx).ToLocalChecked());
 }
 
 BTSerialPortBinding::BTSerialPortBinding() :
@@ -388,8 +388,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;

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()));
-    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);
+    baton->cb->Call(2, argv, &resource);
 
     if (try_catch.HasCaught()) {
         Nan::FatalException(try_catch);
@@ -336,7 +337,7 @@ void BTSerialPortBindingServer::Init(Local<Object> target) {
     Nan::SetPrototypeMethod(t, "disconnectClient", DisconnectClient);
     Nan::SetPrototypeMethod(t, "isOpen", IsOpen);
 
-    target->Set(Nan::New("BTSerialPortBindingServer").ToLocalChecked(), t->GetFunction(ctx).ToLocalChecked());
+    Nan::Set(target, Nan::New("BTSerialPortBindingServer").ToLocalChecked(), t->GetFunction(ctx).ToLocalChecked());
 }
 
 BTSerialPortBindingServer::BTSerialPortBindingServer() :
@@ -389,9 +390,9 @@ NAN_METHOD(BTSerialPortBindingServer::New) {
     std::map<std::string, std::string> options;
 
     for (int i = 0; i < n ; i++) {
-        Local<Value>  property = properties->Get(Nan::New<Integer>(i));
+        Local<Value>  property = Nan::Get(properties, Nan::New<Integer>(i)).ToLocalChecked();
         string propertyName = std::string(*String::Utf8Value(isolate, property));
-        Local<Value> optionValue = jsOptions->Get(property);
+        Local<Value> optionValue = Nan::Get(jsOptions, property).ToLocalChecked();
         options[propertyName] = std::string(*String::Utf8Value(isolate, optionValue));
     }
 
@@ -606,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();
@@ -672,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!");
@@ -707,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/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);
@@ -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:

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);
@@ -361,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/{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;

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
@@ -102,29 +103,17 @@ 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];
+    dispatch_sync(worker_queue, ^{
+        [self disconnectFromDeviceTask: address];
+    });
 }
 
 /** Task on the worker to disconnect from a Bluetooth device */
@@ -167,7 +156,9 @@ static NSLock *globalConnectLock = nil;
         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];
+    dispatch_sync(worker_queue, ^{
+        [self connectDeviceTask:parameters];
+    });
     IOReturn result = connectResult;
     [connectLock unlock];
 
@@ -218,7 +209,9 @@ static NSLock *globalConnectLock = nil;
     writeData.address = address;
 
     // wait for the write to be performed on the worker thread
-    [self performSelector:@selector(writeAsyncTask:) onThread:worker withObject:writeData waitUntilDone:true];
+    dispatch_sync(worker_queue, ^{
+        [self writeAsyncTask:writeData];
+    });
 
     IOReturn result = writeResult;
     [writeLock unlock];
@@ -268,16 +261,20 @@ static NSLock *globalConnectLock = nil;
 {
     @synchronized(self) {
       inquiryProducer = pipe_producer_new(pipe);
-        [self performSelector:@selector(inquiryTask) onThread:worker withObject:nil waitUntilDone:false];
+      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 */
@@ -285,7 +282,9 @@ static NSLock *globalConnectLock = nil;
 {
     [sdpLock lock];
     // call the task on the worker thread and wait for the result
-    [self performSelector:@selector(getRFCOMMChannelIDTask:) onThread:worker withObject:address waitUntilDone:true];
+    dispatch_sync(worker_queue, ^{
+        [self getRFCOMMChannelIDTask:address];
+    });
     int returnValue = lastChannelID;
     [sdpLock unlock];
     return returnValue;
@@ -336,7 +335,7 @@ static NSLock *globalConnectLock = nil;
         }
     }
 
-    // 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;
 }
 
@@ -356,7 +355,7 @@ static NSLock *globalConnectLock = nil;
 /** 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 */
@@ -377,8 +376,8 @@ static NSLock *globalConnectLock = nil;
     @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]);
+            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);

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);
@@ -215,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;
 
@@ -224,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;
@@ -293,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);
@@ -304,18 +305,18 @@ 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] = {

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);
@@ -354,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;

package/src/windows/DeviceINQ.cc

@@ -415,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>());
                     {
@@ -445,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) {
@@ -476,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 {

package/.travis.yml

@@ -1,47 +0,0 @@
-language: cpp # node_js is not supported yet on osx
-compiler: gcc
-sudo: false
-
-os:
-  - linux
-  - osx
-
-env:
-  matrix:
-    - export NODE_VERSION="8"
-    - export NODE_VERSION="9"
-    - export NODE_VERSION="10"
-    - export NODE_VERSION="11"
-    - export NODE_VERSION="12"
-
-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
-