From 349a906f3bce1ce91bb3fdd92a960e3735ec5385 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 26 Apr 2023 23:27:17 -0500 Subject: [PATCH] fix: null tier name in inspector list (#5462) --- web/src/inspector.js | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/web/src/inspector.js b/web/src/inspector.js index 7a9f26a4b..254a4cc65 100644 --- a/web/src/inspector.js +++ b/web/src/inspector.js @@ -724,6 +724,23 @@ export class Inspector extends EventTarget { }; } + static _getOrigin(tracker) { + try { + // `new URL` fails on FF and Chrome when the scheme is 'udp', + // so munge the URL to be something that won't break + const udp_prefix = 'udp://'; + const is_udp = tracker.announce.startsWith(udp_prefix); + if (is_udp) { + const http_prefix = 'http://'; + const munged = tracker.announce.replace(udp_prefix, http_prefix); + return new URL(munged).origin.replace(http_prefix, udp_prefix); + } + return new URL(tracker.announce).origin; + } catch { + return [tracker.sitename || tracker.host || tracker.announce]; + } + } + _updateTiers() { const na = 'N/A'; const { list } = this.elements.tiers; @@ -752,12 +769,7 @@ export class Inspector extends EventTarget { tier_div.classList.add('tier-list-row', index % 2 ? 'odd' : 'even'); let element = document.createElement('div'); - let site = ''; - try { - site = new URL(tracker.announce).origin; - } catch { - site = [tracker.sitename || tracker.host || tracker.announce]; - } + const site = Inspector._getOrigin(tracker); element.classList.add('tier-list-tracker'); setTextContent(element, `${site} - tier ${tracker.tier + 1}`); element.setAttribute('title', tracker.announce);