Merge pull request #67 from nodo-digital/fix-stream-support

Fix stream support

Author: mattinsler

dist/longjohn.js

@@ -154,24 +154,25 @@ EventEmitter.prototype.addListener = (event, callback) ->
 
 EventEmitter.prototype.on = (event, callback) ->
   args = Array::slice.call(arguments)
-  args[1] = wrap_callback(callback, 'EventEmitter.on')
-  _on.apply(this, args)
 
-EventEmitter.prototype.once = (event, callback) ->
-  args = Array::slice.call(arguments)
-  if typeof callback != 'function'
-    throw TypeError('callback must be a function');
-  fired = false
-  wrap = wrap_callback(callback, 'EventEmitter.once');
-  g = () ->
-    this.removeListener(event, g)
-    if !fired
-      fired = true
-      wrap.apply(this, arguments)
-  g.listener = callback
+  # Coming from EventEmitter.prototype.once
+  if callback.listener
+    wrap = wrap_callback(callback.listener, 'EventEmitter.once');
+
+    g = () ->
+      this.removeListener(event, g)
+
+      if !fired
+        fired = true
+        wrap.apply(this, arguments)
+
+    g.listener = callback.listener;
+  else
+    g = wrap_callback(callback, 'EventEmitter.on')
+
   args[1] = g;
+
   _on.apply(this, args)
-  return this;
 
 EventEmitter.prototype.listeners = (event) ->
   listeners = _listeners.call(this, event)

lib/longjohn.coffee

@@ -168,3 +168,13 @@ describe 'longjohn', ->
         clearImmediate(immediate_id)
         done()
       , 1, 2, 3
+
+  it 'once should call overriden on', (done) ->
+    Transform = require('stream').Transform
+
+    emitter = new Transform()
+
+    emitter.once('data', () -> )
+    emitter.once('end', done)
+
+    emitter.push(null)