From e1bb07bc4e4e684e0e98f497a5b9f5f050199b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= Date: Fri, 3 Apr 2020 18:12:31 +0200 Subject: [PATCH] Make tracker configurable, fixes #171 --- app/src/RoomClient.js | 7 ++++++- server/config/config.example.js | 1 + server/lib/Room.js | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js index 4f94d8c..b73a63a 100644 --- a/app/src/RoomClient.js +++ b/app/src/RoomClient.js @@ -160,6 +160,8 @@ export default class RoomClient if (displayName) store.dispatch(settingsActions.setDisplayName(displayName)); + this._tracker = 'wss://tracker.lab.vvc.niif.hu:443'; + // Torrent support this._torrentSupport = null; @@ -781,7 +783,7 @@ export default class RoomClient this._webTorrent.seed( files, - { announceList: [ [ 'wss://tracker.lab.vvc.niif.hu:443' ] ] }, + { announceList: [ [ this._tracker ] ] }, (newTorrent) => { store.dispatch(requestActions.notify( @@ -2526,6 +2528,7 @@ export default class RoomClient authenticated, roles, peers, + tracker, permissionsFromRoles, userRoles } = await this.sendRequest( @@ -2543,6 +2546,8 @@ export default class RoomClient roles ); + tracker && (this._tracker = tracker); + store.dispatch(meActions.loggedIn(authenticated)); store.dispatch(roomActions.setUserRoles(userRoles)); diff --git a/server/config/config.example.js b/server/config/config.example.js index 1d8baf8..3787b33 100644 --- a/server/config/config.example.js +++ b/server/config/config.example.js @@ -48,6 +48,7 @@ module.exports = credential : 'example' } ], + fileTracker : 'wss://tracker.lab.vvc.niif.hu:443', redisOptions : {}, // session cookie secret cookieSecret : 'T0P-S3cR3t_cook!e', diff --git a/server/lib/Room.js b/server/lib/Room.js index 7495e8f..f75ec29 100644 --- a/server/lib/Room.js +++ b/server/lib/Room.js @@ -551,6 +551,7 @@ class Room extends EventEmitter cb(null, { roles : peer.roles, peers : peerInfos, + tracker : config.fileTracker, authenticated : peer.authenticated, permissionsFromRoles : config.permissionsFromRoles, userRoles : userRoles