Merge pull request feross#754 from feross/add-type

Author: feross

index.js

@@ -256,6 +256,7 @@ class Peer extends stream.Duplex {
       }
     } else {
       this.emit('signal', { // request initiator to renegotiate
+        type: 'transceiverRequest',
         transceiverRequest: { kind, init }
       })
     }
@@ -390,6 +391,7 @@ class Peer extends stream.Duplex {
       } else {
         this._debug('requesting negotiation from initiator')
         this.emit('signal', { // request initiator to renegotiate
+          type: 'renegotiate',
           renegotiate: true
         })
       }
@@ -909,8 +911,8 @@ class Peer extends stream.Duplex {
         this._queuedNegotiation = false
         this._needsNegotiation() // negotiate again
       } else {
-        this._debug('negotiate')
-        this.emit('negotiate')
+        this._debug('negotiated')
+        this.emit('negotiated')
       }
     }
 
@@ -922,6 +924,7 @@ class Peer extends stream.Duplex {
     if (this.destroyed) return
     if (event.candidate && this.trickle) {
       this.emit('signal', {
+        type: 'candidate',
         candidate: {
           candidate: event.candidate.candidate,
           sdpMLineIndex: event.candidate.sdpMLineIndex,
@@ -984,6 +987,7 @@ class Peer extends stream.Duplex {
 
       this._remoteStreams.push(eventStream)
       queueMicrotask(() => {
+        this._debug('on stream')
         this.emit('stream', eventStream) // ensure all tracks have been added
       })
     })

test/negotiation.js

@@ -70,10 +70,10 @@ test('manual renegotiation', function (t) {
   peer1.on('connect', function () {
     peer1.negotiate()
 
-    peer1.on('negotiate', function () {
+    peer1.on('negotiated', function () {
       t.pass('peer1 negotiated')
     })
-    peer2.on('negotiate', function () {
+    peer2.on('negotiated', function () {
       t.pass('peer2 negotiated')
     })
   })
@@ -91,24 +91,24 @@ test('repeated manual renegotiation', function (t) {
   peer1.once('connect', function () {
     peer1.negotiate()
   })
-  peer1.once('negotiate', function () {
+  peer1.once('negotiated', function () {
     t.pass('peer1 negotiated')
     peer1.negotiate()
-    peer1.once('negotiate', function () {
+    peer1.once('negotiated', function () {
       t.pass('peer1 negotiated again')
       peer1.negotiate()
-      peer1.once('negotiate', function () {
+      peer1.once('negotiated', function () {
         t.pass('peer1 negotiated again')
       })
     })
   })
-  peer2.once('negotiate', function () {
+  peer2.once('negotiated', function () {
     t.pass('peer2 negotiated')
     peer2.negotiate()
-    peer2.once('negotiate', function () {
+    peer2.once('negotiated', function () {
       t.pass('peer2 negotiated again')
       peer1.negotiate()
-      peer1.once('negotiate', function () {
+      peer1.once('negotiated', function () {
         t.pass('peer1 negotiated again')
       })
     })