Rewrite based around napi and context aware

README.md

@@ -15,28 +15,6 @@
 npm install usb-detection
 ```
 
-## Install for Electron
-
-This module uses native extensions and needs to be compiled for your target version of Electron. Precompiled binaries for recent Node.js and Electron versions are built and published using [prebuild][] and can be installed automatically using [electron-rebuild][].
-
-See the [Electron docs for using native modules][electron-native-modules] to ensure your project is set up to correctly use the prebuilt binaries for your version of Electron.
-
-[prebuild]: https://github.com/prebuild/prebuild
-[electron-rebuild]: https://github.com/electron/electron-rebuild
-[electron-native-modules]: https://www.electronjs.org/docs/tutorial/using-native-node-modules
-
----
-
-If you run into the following error, here are the exact steps you can use:
-
-```
-detection.node was compiled against a different Node.js version using NODE_MODULE_VERSION 72. This version of Node.js requires NODE_MODULE_VERSION 80. Please try re-compiling or re-installing 
-```
-
- 1. `npm i electron-rebuild --save-dev`
- 1. `./node_modules/.bin/electron-rebuild`
-
-
 # Usage
 
 ```js

binding.gyp

@@ -2,13 +2,30 @@
   "targets": [
     {
       "target_name": "detection",
+      "cflags!": [ "-fno-exceptions" ],
+      "cflags_cc!": [ "-fno-exceptions" ],
+      "xcode_settings": { "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
+        # "CLANG_CXX_LIBRARY": "libc++",
+        "MACOSX_DEPLOYMENT_TARGET": "10.7",
+        "OTHER_CFLAGS": [
+          "-arch x86_64",
+          "-arch arm64"
+        ],
+        "OTHER_LDFLAGS": [
+            "-arch x86_64",
+            "-arch arm64"
+          ]
+      },
+      "msvs_settings": {
+        "VCCLCompilerTool": { "ExceptionHandling": 1 },
+      },
       "sources": [
         "src/detection.cpp",
         "src/detection.h",
         "src/deviceList.cpp"
       ],
       "include_dirs" : [
-        "<!(node -e \"require('nan')\")"
+        "<!@(node -p \"require('node-addon-api').include\")" 
       ],
       'conditions': [
         ['OS=="win"',

index.d.ts

@@ -20,6 +20,7 @@ export function find(vid: number): Promise<Device[]>;
 export function find(callback: (error: any, devices: Device[]) => any): void;
 export function find(): Promise<Device[]>;
 
+export function isMonitoring(): boolean;
 export function startMonitoring(): void;
 export function stopMonitoring(): void;
 export function on(event: string, callback: (device: Device) => void): void;

index.js

@@ -1,5 +1,5 @@
-//var SegfaultHandler = require('segfault-handler');
-//SegfaultHandler.registerHandler();
+// var SegfaultHandler = require('segfault-handler');
+// SegfaultHandler.registerHandler();
 
 var index = require('./package.json');
 
@@ -10,9 +10,11 @@ function isFunction(functionToCheck) {
 if(global[index.name] && global[index.name].version === index.version) {
 	module.exports = global[index.name];
 } else {
-	var detection = require('bindings')('detection.node');
+	var binding = require('bindings')('detection.node');
 	var EventEmitter2 = require('eventemitter2').EventEmitter2;
 
+	var detection = new binding.Detection();
+
 	var detector = new EventEmitter2({
 		wildcard: true,
 		delimiter: ':',
@@ -34,34 +36,25 @@ if(global[index.name] && global[index.name].version === index.version) {
 			// Assemble the optional args into something we can use with `apply`
 			var args = [];
 			if(vid) {
-				args = args.concat(vid);
+				args.push(vid);
 			}
 			if(pid) {
-				args = args.concat(pid);
+				args.push(pid);
 			}
 
-			// Tack on our own callback that takes care of things
-			args = args.concat(function(err, devices) {
-
-				// We call the callback if they passed one
-				if(callback) {
-					callback.call(callback, err, devices);
-				}
-
-				// But also do the promise stuff
-				if(err) {
-					reject(err);
-					return;
-				}
-				resolve(devices);
-			});
-
 			// Fire off the `find` function that actually does all of the work
-			detection.find.apply(detection, args);
+			const devices = detection.findDevices.apply(detection, args);
+
+			// We call the callback if they passed one
+			if(callback) {
+				callback.call(callback, undefined, devices);
+			}
+
+			resolve(devices)
 		});
 	};
 
-	detection.registerAdded(function(device) {
+	function fireAdded(device) {
 		detector.emit('add:' + device.vendorId + ':' + device.productId, device);
 		detector.emit('insert:' + device.vendorId + ':' + device.productId, device);
 		detector.emit('add:' + device.vendorId, device);
@@ -72,35 +65,41 @@ if(global[index.name] && global[index.name].version === index.version) {
 		detector.emit('change:' + device.vendorId + ':' + device.productId, device);
 		detector.emit('change:' + device.vendorId, device);
 		detector.emit('change', device);
-	});
+	}
 
-	detection.registerRemoved(function(device) {
+	function fireRemoved(device) {
 		detector.emit('remove:' + device.vendorId + ':' + device.productId, device);
 		detector.emit('remove:' + device.vendorId, device);
 		detector.emit('remove', device);
 
 		detector.emit('change:' + device.vendorId + ':' + device.productId, device);
 		detector.emit('change:' + device.vendorId, device);
 		detector.emit('change', device);
-	});
+	}
+
+	function fireEvent(type, device) {
+		switch (type) {
+		case 'add':
+			fireAdded(device);
+			break;
+		case 'remove':
+			fireRemoved(device);
+			break;
+		default:
+			// Ignore
+			break;
+		}
+	}
 
-	var started = false;
+	detector.isMonitoring = function() {
+		return detection.isMonitoring();
+	};
 
 	detector.startMonitoring = function() {
-		if(started) {
-			return;
-		}
-
-		started = true;
-		detection.startMonitoring();
+		detection.startMonitoring(fireEvent);
 	};
 
 	detector.stopMonitoring = function() {
-		if(!started) {
-			return;
-		}
-
-		started = false;
 		detection.stopMonitoring();
 	};