Use EventEmitter stream for Endpoint Stream API

Author: kevinmehall

src/bindings.cc

@@ -10,7 +10,7 @@ Local<v8::Value> makeBuffer(const uint8_t* buf, unsigned length){
 	return scope.Close(actualBuffer);
 }
 
-void NodeUsb::doTransferCallback(Handle<Function> v8callback, libusb_transfer_status status, uint8_t* buffer, unsigned length){
+void NodeUsb::doTransferCallback(Handle<Function> v8callback, Handle<Object> v8this, libusb_transfer_status status, uint8_t* buffer, unsigned length){
 	HandleScope scope;
 	Local<Value> cbvalue = Local<Value>::New(Undefined());
 	Local<Value> cberror = Local<Value>::New(Undefined());
@@ -25,7 +25,7 @@ void NodeUsb::doTransferCallback(Handle<Function> v8callback, libusb_transfer_st
 
 	Local<Value> argv[2] = {cbvalue, cberror};
 	TryCatch try_catch;
-	v8callback->Call(Context::GetCurrent()->Global(), 2, argv);
+	v8callback->Call(v8this, 2, argv);
 	if (try_catch.HasCaught()) {
 		FatalException(try_catch);
 	}

src/bindings.h

@@ -123,7 +123,7 @@ namespace NodeUsb  {
 	class Transfer;
 	class Stream;
 
-	void doTransferCallback(Handle<Function> v8callback, libusb_transfer_status status, uint8_t* buffer, unsigned length);
+	void doTransferCallback(Handle<Function> v8callback, Handle<Object> v8this, libusb_transfer_status status, uint8_t* buffer, unsigned length);
 
 	struct nodeusb_endpoint_selection {
 		int interface_number;

src/stream.cc

@@ -90,7 +90,7 @@ extern "C" void LIBUSB_CALL usbThreadStreamCb(libusb_transfer *t){
 }
 
 void Stream::handleCompletion(CompletionData c){
-	doTransferCallback(c.stream->v8callback, c.status, c.data, c.length);
+	doTransferCallback(c.stream->v8callback, c.stream->v8endpoint, c.status, c.data, c.length);
 	free(c.data);
 
 	if (c.dead){

src/transfer.cc

@@ -80,7 +80,7 @@ void Transfer::handleCompletion(Transfer* t){
 		}
 	}
 
-	doTransferCallback(t->v8callback, t->transfer->status, buffer, length);
+	doTransferCallback(t->v8callback, Context::GetCurrent()->Global(), t->transfer->status, buffer, length);
 
 	uv_unref(uv_default_loop());
 	delete t;

tests/node-usb-test.coffee

@@ -123,15 +123,19 @@ test "Write to OUT endpoint", ->
 test "Stream from IN endpoint", ->
 	pkts = 0
 
-	inEndpoint.__stream_data_cb = (d, e) ->
-		console.log("Stream callback", d, e)
+	inEndpoint.on 'data', (d) ->
+		console.log("Stream callback", d)
 		pkts++
 
 		if pkts == 10
 			inEndpoint.stopStream()
 			console.log("Stopping stream")
 
-	inEndpoint.__stream_stop_cb = () ->
+	inEndpoint.on 'error', (e) ->
+		console.log("Stream error", e)
+		assert.equal(e, 3)
+			
+	inEndpoint.on 'end', ->
 		console.log("Stream stopped")
 		next()
 

usb.js

@@ -1,14 +1,15 @@
 /**
  * Expose complete node-usb binding to node.js
  */
-var exports = module.exports = require("./usb_bindings");
+var usb = exports = module.exports = require("./usb_bindings");
+var events = require('events');
 
 var devices = undefined;
 
 // singleton
 exports.getDevices = function() {
 	if (devices == undefined) {
-		devices = this._getDevices();
+		devices = usb._getDevices();
 
 		for (var i = 0, m = devices.length; i < m; i++) {
 			var device = devices[i];
@@ -32,3 +33,22 @@ exports.find_by_vid_and_pid = function(vid, pid) {
 
 	return r;
 }
+
+function inherits(target, source) {
+  for (var k in source.prototype)
+    target.prototype[k] = source.prototype[k];
+}
+
+inherits(usb.Endpoint, events.EventEmitter);
+
+usb.Endpoint.prototype.__stream_data_cb = function stream_data_cb(data, error){
+	if (!error){
+		this.emit("data", data)
+	}else{
+		this.emit("error", error)
+	}
+}
+
+usb.Endpoint.prototype.__stream_stop_cb = function stream_stop_cb(data, error){
+	this.emit("end")
+}