resource requester: avoid stucking

streamroot · Oct 22, 2014 · 07a3efb · 07a3efb
1 parent 2c1298e
commit 07a3efb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/p2p_manager.js b/src/p2p_manager.js
@@ -38,7 +38,7 @@ class P2PManager extends BaseObject {
   }
 
   requestResource(resource, callbackSuccess, callbackFail) {
-    if (this.swarm.size() === 0) {
+    if (this.swarm.utils.contributors === 0) {
       callbackFail()
     } else {
       this.swarm.sendInterested(resource, callbackSuccess, callbackFail)

diff --git a/src/resource_requester.js b/src/resource_requester.js
@@ -15,13 +15,18 @@ class ResourceRequester extends BaseObject {
     this.cdnRequester = new CDNRequester()
     this.p2pManager = new P2PManager(params)
     this.isInitialBuffer = true
+    this.sameSource = 0
   }
 
   requestResource(resource, bufferLength, callback) {
+    if (resource === this.resource) {
+      this.sameSource += 1
+    }
     this.resource = resource
     this.callback = callback
-    if (bufferLength < Settings.lowBufferLength || this.isInitialBuffer || _.size(this.p2pManager.swarm.utils.contributors) === 0) {
+    if (bufferLength < Settings.lowBufferLength || this.isInitialBuffer || _.size(this.p2pManager.swarm.utils.contributors) === 0 || this.sameSource >= 3) {
       this.requestToCDN()
+      this.sameSource = 0
     } else {
       this.requestToP2P()
     }