events: unwrap #once listeners in #listeners

Author: omsmith

lib/events.js

@@ -396,9 +396,9 @@ EventEmitter.prototype.listeners = function listeners(type) {
     if (!evlistener)
       ret = [];
     else if (typeof evlistener === 'function')
-      ret = [evlistener];
+      ret = [unwrapListener(evlistener)];
     else
-      ret = arrayClone(evlistener, evlistener.length);
+      ret = arrayMap(evlistener, unwrapListener);
   }
 
   return ret;
@@ -452,6 +452,14 @@ function arrayClone(arr, i) {
   return copy;
 }
 
+function arrayMap(arr, fn) {
+  var ret = new Array(arr.length);
+  for (var i = 0; i < ret.length; ++i) {
+    ret[i] = fn(arr[i]);
+  }
+  return ret;
+}
+
 function unwrapListener(listener) {
   return listener.listener ? listener.listener : listener;
 }

test/parallel/test-event-emitter-listeners.js

@@ -30,3 +30,12 @@ var e3ListenersCopy = e3.listeners('foo');
 e3.on('foo', listener2);
 assert.deepEqual(e3.listeners('foo'), [listener, listener2]);
 assert.deepEqual(e3ListenersCopy, [listener]);
+
+var e4 = new events.EventEmitter();
+e4.once('foo', listener);
+assert.deepEqual(e4.listeners('foo'), [listener]);
+
+var e5 = new events.EventEmitter();
+e5.on('foo', listener);
+e5.once('foo', listener2);
+assert.deepEqual(e5.listeners('foo'), [listener, listener2]);