update RTCPeerConnection track Event shim

js/RTCPeerConnection.js

@@ -660,7 +660,6 @@ function onEvent(data) {
 	var type = data.type,
 		self = this,
 		event = new Event(type),
-		stream,
 		dataChannel,
 		id;
 
@@ -710,9 +709,9 @@ function onEvent(data) {
 
 		case 'track':
 			var track = new MediaStreamTrack(data.track),
-				stream = new MediaStream([track]),
-				receiver = { track: track },
-				transceiver = { receiver: receiver };
+				stream = new MediaStream([track]), // TODO lookup remoteStreams ?
+				receiver = { track: track }, // TODO new RTCRtpReceiver
+				transceiver = { receiver: receiver }; // TODO new RTCRtpTransceiver
 
 			event.track = track;
 			event.receiver = receiver;
@@ -721,11 +720,11 @@ function onEvent(data) {
 			break;
 
 		case 'addstream':
-			stream = MediaStream.create(data.stream);
-			event.stream = stream;
 
 			// Append to the remote streams.
-			this.remoteStreams[stream.id] = stream;
+			this.remoteStreams[stream.id] = MediaStream.create(data.stream);
+
+			event.stream = this.remoteStreams[data.streamId];
 
 			// Emit "connected" on the stream if ICE connected.
 			if (this.iceConnectionState === 'connected' || this.iceConnectionState === 'completed') {
@@ -734,11 +733,10 @@ function onEvent(data) {
 			break;
 
 		case 'removestream':
-			stream = this.remoteStreams[data.streamId];
-			event.stream = stream;
+			event.stream = this.remoteStreams[data.streamId];
 
 			// Remove from the remote streams.
-			delete this.remoteStreams[stream.id];
+			delete this.remoteStreams[data.streamId];
 			break;
 
 		case 'datachannel':