Improve getting stream

Author: ben221199

dht/node.go

@@ -37,13 +37,13 @@ const TYPE_ERROR = 2
 
 // Bootstrap seed nodes.
 var SeedNodes = []string{
-	"lbrynet3.lbry.com:4444",
 	"51.83.238.186:4444",
+	"dht.lbry.grin.io:4444",
+	"dht.lizard.technology:4444",
 	"lbrynet1.lbry.com:4444",
 	"lbrynet2.lbry.com:4444",
+	"lbrynet3.lbry.com:4444",
 	"lbrynet4.lbry.com:4444",
-	"dht.lbry.grin.io:4444",
-	"dht.lizard.technology:4444",
 	"s1.lbry.network:4444",
 	"s2.lbry.network:4444",
 }

main.go

@@ -12,12 +12,12 @@ import "sync"
 var wg sync.WaitGroup
 
 func main() {
+	node, _ := dht.NewNode(4444)
 	rpcServer := rpc.CreateServer()
-	contentServer := stream.CreateServer(nil)
+	contentServer := stream.CreateServer(stream.NewManager(node))
 
 	wg.Go(func() {
 		fmt.Println("Starting DHT server on port 4444.")
-		node, _ := dht.NewNode(4444)
 		// node.TCPPort = 5567
 		node.Start()
 	})

stream/server.go

@@ -5,6 +5,7 @@ import "log"
 import "lbry/daemon/blob"
 import "lbry/daemon/dht"
 import "net/http"
+import "runtime/debug"
 import "strconv"
 import "strings"
 import "sync"
@@ -40,12 +41,16 @@ func (m *Manager) GetStreamingURL(sdHash string, port int) string {
 }
 
 func (m *Manager) handleStream(w http.ResponseWriter, r *http.Request) {
+	fmt.Println("Incoming stream request")
+
 	sdHash := strings.TrimPrefix(r.URL.Path, "/stream/")
 	if sdHash == "" || len(sdHash) != blob.BlobHashLength {
 		http.Error(w, "invalid sd_hash", http.StatusBadRequest)
 		return
 	}
 
+	info, _ := debug.ReadBuildInfo()
+
 	// CORS for frontend
 	w.Header().Set("Access-Control-Allow-Origin", "*")
 	w.Header().Set("Access-Control-Allow-Headers", "Range")
@@ -153,12 +158,12 @@ func (m *Manager) handleStream(w http.ResponseWriter, r *http.Request) {
 }
 
 func (m *Manager) getDescriptor(sdHash string) (*blob.StreamDescriptor, error) {
-	m.sdCacheMu.RLock()
+	//m.sdCacheMu.RLock()
 	if sd, ok := m.sdCache[sdHash]; ok {
-		m.sdCacheMu.RUnlock()
+		//m.sdCacheMu.RUnlock()
 		return sd, nil
 	}
-	m.sdCacheMu.RUnlock()
+	//m.sdCacheMu.RUnlock()
 
 	// Download SD blob from peers
 	sdData, err := m.downloadBlob(sdHash)
@@ -171,9 +176,9 @@ func (m *Manager) getDescriptor(sdHash string) (*blob.StreamDescriptor, error) {
 		return nil, err
 	}
 
-	m.sdCacheMu.Lock()
+	//m.sdCacheMu.Lock()
 	m.sdCache[sdHash] = sd
-	m.sdCacheMu.Unlock()
+	//m.sdCacheMu.Unlock()
 	return sd, nil
 }