@@ -103,7 +103,7 @@ jsFlowTracker.prototype._onData = function (payload, from) {
103103 if ( Array . isArray ( payload . peers ) ) {
104104 payload . peers . forEach ( function ( peerInfo ) { //For all peers we receive - Open a WebRTC peer connection
105105 var peerId = peerInfo . peerId ;
106-
106+
107107 console . log ( 'Will handle connection for peer: ' , peerId ) ;
108108
109109 var peer = self . _peers [ peerId ] = new Peer ( {
@@ -150,7 +150,7 @@ jsFlowTracker.prototype._onWebRtcOffer = function (payload, from) {
150150 peer . id = from
151151
152152 peer . on ( 'signal' , function ( signalObject ) {
153- console . log ( 'GOT SIGNAL, expecting offer /ice' , signalObject ) ;
153+ console . log ( 'GOT SIGNAL, expecting answer /ice' , signalObject ) ;
154154 if ( signalObject . candidate ) { // The signalling is for ICE
155155 var params = {
156156 info_hash : self . client . _infoHash . toString ( 'base64' ) ,
@@ -182,7 +182,7 @@ jsFlowTracker.prototype._onWebRtcOffer = function (payload, from) {
182182}
183183
184184jsFlowTracker . prototype . _onWebRtcAnswer = function ( payload , from ) {
185- peer = self . _peers [ from ]
185+ var peer = self . _peers [ from ]
186186 if ( peer ) {
187187 peer . id = from
188188 peer . signal ( payload . answer )
@@ -196,11 +196,18 @@ jsFlowTracker.prototype._onWebRtcAnswer = function (payload, from) {
196196jsFlowTracker . prototype . _onWebRtcIce = function ( payload , from ) {
197197 //TODO: Buffer ICE ?
198198 console . log ( 'WILL ADD ICE CANDIDATE!!!' ) ;
199- if ( payload . candidate ) {
200- peer . signal ( payload . candidate )
199+ if ( ! self . _peers [ from ] ) {
200+ var peer = self . _peers [ from ]
201+
202+ if ( payload . candidate ) {
203+ peer . signal ( payload . candidate )
204+ }
205+ else {
206+ console . error ( 'Candidate did not exist as expected in payload' , payload ) ;
207+ }
201208 }
202209 else {
203- console . error ( 'Candidate did not exist as expected in payload ' , payload ) ;
210+ console . error ( 'Candidate refers to a peer not yet created. TODO: Buffer ICE! ' , payload ) ;
204211 }
205212}
206213
0 commit comments