✔ Torrent Tracker ~

bifeldy · Nov 9, 2023 · a8a33de · a8a33de
1 parent cbd4f70
commit a8a33de
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 37 deletions.
diff --git a/src/api/controllers/torrent.controller.ts b/src/api/controllers/torrent.controller.ts
@@ -28,7 +28,7 @@ export class TorrentController {
     try {
       if ('magnetHash' in req.body) {
         webtorrentHealth(req.body.magnetHash, {
-          trackers: environment.torrent.trackerAnnounce,
+          trackers: req.body.trackList || environment.torrent.trackerAnnounce,
           timeout: req.body.trackTimeout || 1234
         }, (err, data) => {
           if (err) {

diff --git a/src/app/_pages/torrent/torrent.component.ts b/src/app/_pages/torrent/torrent.component.ts
@@ -62,8 +62,6 @@ export class TorrentComponent implements OnInit, OnDestroy {
   subsUser = null;
   subsTableDataRow = null;
 
-  timedOut = null;
-
   constructor(
     private snackBar: MatSnackBar,
     private clipboard: Clipboard,
@@ -106,10 +104,6 @@ export class TorrentComponent implements OnInit, OnDestroy {
     this.subsDialog?.unsubscribe();
     this.subsUser?.unsubscribe();
     this.subsTableDataRow?.unsubscribe();
-    if (this.timedOut) {
-      clearTimeout(this.timedOut);
-      this.timedOut = null;
-    }
   }
 
   copyMagnetHashToClipboard(magnetHash: string): void {
@@ -140,8 +134,10 @@ export class TorrentComponent implements OnInit, OnDestroy {
   }
 
   reviveTorrent(): void {
+    this.bs.busy();
     this.torrent.resurrectFiles((error, result) => {
       this.refreshAllGraph();
+      this.bs.idle();
     });
   }
 
@@ -278,7 +274,7 @@ export class TorrentComponent implements OnInit, OnDestroy {
 
   refreshAllGraph(): void {
     for (const d of this.dataSource.data) {
-      this.timedOut = setTimeout(() => {
+      setTimeout(() => {
         this.refreshGraph(d);
       }, 1234);
     }

diff --git a/src/app/_shared/services/torrent.service.ts b/src/app/_shared/services/torrent.service.ts
@@ -7,7 +7,7 @@ import { BehaviorSubject, Observable } from 'rxjs';
 import { Options, Instance, Torrent, TorrentOptions } from 'webtorrent';
 import { Wire } from 'bittorrent-protocol';
 import { openDB } from 'idb';
-import { Buffer } from 'buffer'; 
+import { Buffer } from 'buffer';
 
 import { environment } from '../../../environments/app/environment';
 
@@ -211,7 +211,9 @@ export class TorrentService {
     this.refCallback = callback;
     this.checkHealthOnTracker({
       magnetHash,
-      trackTimeout: 1234
+      trackTimeout: 1234,
+      trackList: environment.torrent.trackerAnnounce,
+      iceServers: environment.torrent.iceServers
     }).subscribe({
       next: (res: any) => {
         this.gs.log('[TORRENT_CLIENT_HEALTH_SUCCESS]', res.result);

diff --git a/src/constants.ts b/src/constants.ts
@@ -83,6 +83,17 @@ export const CONSTANTS = {
   timeLoginRememberMe: 7 * 24 * 60 * 60, // 7 Days
   timeResetAccount: 5 * 60, // 5 Minutes
   timeMaxDaysNotification: 7 * 24 * 60 * 60 * 1000, // 7 Days
+  torrentIceStunServer: [
+    'stun:stun.cloudflare.com',
+    'stun:stun.l.google.com:19302',
+    'stun:tracker.fansub.id:11111'
+  ],
+  torrentTracker: [
+    'wss://tracker.fansub.id',
+    'wss://tracker.openwebtorrent.com',
+    'wss://tracker.webtorrent.dev',
+    'wss://tracker.btorrent.xyz'
+  ],
   verificationDomainCname: [
     'ghs.google.com'
   ],

diff --git a/src/environments/api/environment.ts b/src/environments/api/environment.ts
@@ -1,5 +1,7 @@
 import { SECRETS } from '../../secrets';
 
+import { CONSTANTS } from '../../constants';
+
 import { Anime } from '../../api/entities/Anime';
 import { Attachment } from '../../api/entities/Attachment';
 import { ApiKey } from '../../api/entities/ApiKey';
@@ -162,9 +164,7 @@ export const environment = {
   externalApiDorama: 'https://kuryana.vercel.app',
   externalApiImage: 'https://api.imgbb.com/1/upload',
   torrent: {
-    trackerAnnounce: [
-      `wss://tracker.fansub.id`
-    ],
+    trackerAnnounce: CONSTANTS.torrentTracker
   },
   malClientId: SECRETS().MAL_CLIENT_ID,                                                                          // '',
   idCloudHost: {

diff --git a/src/environments/app/environment.prod.ts b/src/environments/app/environment.prod.ts
@@ -1,3 +1,5 @@
+import { CONSTANTS } from "../../constants";
+
 export const environment = {
   production: true,
   siteName: 'FansubID',
@@ -13,19 +15,9 @@ export const environment = {
     guild_id: '342220398022098944'
   },
   torrent: {
-    trackerAnnounce: [
-      'wss://tracker.fansub.id',
-      'wss://tracker.btorrent.xyz',
-      'wss://tracker.openwebtorrent.com'
-    ],
+    trackerAnnounce: CONSTANTS.torrentTracker,
     iceServers: [
-      {
-        urls: [
-          'stun:tracker.fansub.id:11111',
-          'stun:openrelay.metered.ca:80',
-          'stun:stun.l.google.com:19302'
-        ]
-      }
+      { urls: CONSTANTS.torrentIceStunServer }
     ]
   }
 };
diff --git a/src/environments/app/environment.ts b/src/environments/app/environment.ts
@@ -2,6 +2,8 @@
 // `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
 // The list of file replacements can be found in `angular.json`.
 
+import { CONSTANTS } from "../../constants";
+
 export const environment = {
   production: false,
   siteName: 'FansubID',
@@ -17,19 +19,9 @@ export const environment = {
     guild_id: '342220398022098944'
   },
   torrent: {
-    trackerAnnounce: [
-      'wss://tracker.fansub.id',
-      'wss://tracker.btorrent.xyz',
-      'wss://tracker.openwebtorrent.com'
-    ],
+    trackerAnnounce: CONSTANTS.torrentTracker,
     iceServers: [
-      {
-        urls: [
-          'stun:tracker.fansub.id:11111',
-          'stun:openrelay.metered.ca:80',
-          'stun:stun.l.google.com:19302'
-        ]
-      }
+      { urls: CONSTANTS.torrentIceStunServer }
     ]
   }
 };