From 5c67daf4cf49cc354b613195012db9e8eb6e94c7 Mon Sep 17 00:00:00 2001
From: Alex Kern <alex@kern.io>
Date: Wed, 12 Feb 2020 23:52:14 -0800
Subject: [PATCH] Make tracker configurable, add crypto donations (#114)

---
 src/components/App.js       |  2 +-
 src/server.js               | 12 ++++++++++--
 src/stores/DownloadStore.js |  4 ++--
 src/stores/UploadStore.js   | 10 +---------
 src/wt.js                   |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/components/App.js b/src/components/App.js
index d15bd7f..65bc43a 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -62,7 +62,7 @@ export default class App extends React.Component {
           </div>
           <footer className="footer">
             <p>
-              BTC Donations: <strong>1P7yFQAC3EmpvsB7K9s6bKPvXEP1LPoQnY</strong>
+              <strong>Like FilePizza?</strong> Support it&apos;s development with a <a href="https://commerce.coinbase.com/checkout/247b6ffe-fb4e-47a8-9a76-e6b7ef83ea22">donation in crypto</a>.
             </p>
 
             <p className="byline">
diff --git a/src/server.js b/src/server.js
index e6d35ba..b74d316 100644
--- a/src/server.js
+++ b/src/server.js
@@ -42,6 +42,14 @@ app.use([
   require("./middleware/react")
 ]);
 
+const TRACKERS = process.env.WEBTORRENT_TRACKERS
+  ? process.env.WEBTORRENT_TRACKERS.split(',').map(t => [t.trim()])
+  : [
+    ["wss://tracker.openwebtorrent.com"],
+    ["wss://tracker.btorrent.xyz"],
+    ["wss://tracker.fastcast.nz"]
+  ];
+
 function bootServer(server) {
   var io = socketIO(server);
   io.set("transports", ["polling"]);
@@ -61,9 +69,9 @@ function bootServer(server) {
       });
     });
 
-    socket.on("rtcConfig", function(_, res) {
+    socket.on("trackerConfig", function(_, res) {
       ice.getICEServers().then(function(iceServers) {
-        res({ iceServers: iceServers });
+        res({ rtcConfig: { iceServers }, announce: TRACKERS });
       });
     });
 
diff --git a/src/stores/DownloadStore.js b/src/stores/DownloadStore.js
index 3a7b4c6..a5c97fb 100644
--- a/src/stores/DownloadStore.js
+++ b/src/stores/DownloadStore.js
@@ -34,8 +34,8 @@ export default alt.createStore(class DownloadStore {
     if (this.status !== 'ready') return
     this.status = 'requesting'
 
-    getClient().then((client) => {
-      client.add(this.infoHash, (torrent) => {
+    getClient().then(client => {
+      client.add(this.infoHash, { announce: client.tracker.announce }, (torrent) => {
         this.setState({ status: 'downloading' })
 
         const updateSpeed = () => {
diff --git a/src/stores/UploadStore.js b/src/stores/UploadStore.js
index fac9fa0..0ca2942 100644
--- a/src/stores/UploadStore.js
+++ b/src/stores/UploadStore.js
@@ -3,14 +3,6 @@ import alt from "../alt";
 import socket from "filepizza-socket";
 import { getClient } from "../wt";
 
-const TRACKERS = process.env.WEBTORRENT_TRACKERS
-  ? process.env.WEBTORRENT_TRACKERS.split(',').map(t => t.trim())
-  : [
-    ["wss://tracker.openwebtorrent.com"],
-    ["wss://tracker.btorrent.xyz"],
-    ["wss://tracker.fastcast.nz"]
-  ];
-
 const SPEED_REFRESH_TIME = 2000;
 
 export default alt.createStore(
@@ -34,7 +26,7 @@ export default alt.createStore(
       this.status = "processing";
 
       getClient().then(client => {
-        client.seed(file, { announce: TRACKERS }, torrent => {
+        client.seed(file, { announce: client.tracker.announce }, torrent => {
           const updateSpeed = () => {
             this.setState({
               speedUp: torrent.uploadSpeed,
diff --git a/src/wt.js b/src/wt.js
index 7e81e42..e41493f 100644
--- a/src/wt.js
+++ b/src/wt.js
@@ -2,9 +2,9 @@ import socket from 'filepizza-socket'
 
 export function getClient() {
   return new Promise((resolve, reject) => {
-    socket.emit('rtcConfig', {}, (rtcConfig) => {
+    socket.emit('trackerConfig', {}, (trackerConfig) => {
       const client = new WebTorrent({
-        tracker: { rtcConfig }
+        tracker: trackerConfig
       })
       resolve(client)
     })