events: unwrap #once listeners in #listeners

omsmith · omsmith · commit ae7db769ed7b · 2016-03-10T21:40:13.000-05:00
diff --git a/lib/events.js b/lib/events.js
@@ -405,9 +405,9 @@ EventEmitter.prototype.listeners = function listeners(type) {
     if (!evlistener)
       ret = [];
     else if (typeof evlistener === 'function')
-      ret = [evlistener];
+      ret = [evlistener.listener ? evlistener.listener : evlistener];
     else
-      ret = arrayClone(evlistener, evlistener.length);
+      ret = unwrapListeners(evlistener);
   }
 
   return ret;
@@ -451,3 +451,11 @@ function arrayClone(arr, i) {
     copy[i] = arr[i];
   return copy;
 }
+
+function unwrapListeners(arr) {
+  var ret = new Array(arr.length);
+  for (var i = 0; i < ret.length; ++i) {
+    ret[i] = arr[i].listener ? arr[i].listener : arr[i];
+  }
+  return ret;
+}
diff --git a/test/parallel/test-event-emitter-listeners.js b/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]);
