From cc4fd0889310c7c51b7403f653d14644b4504dc0 Mon Sep 17 00:00:00 2001
From: SukkaW <isukkaw@gmail.com>
Date: Thu, 28 Dec 2023 11:33:49 +0800
Subject: [PATCH] Update CDN Hosts

---
 Build/build-speedtest-domainset.ts | 14 +++++++-------
 Source/domainset/cdn.conf          |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Build/build-speedtest-domainset.ts b/Build/build-speedtest-domainset.ts
index e9150e9e..8849e14a 100644
--- a/Build/build-speedtest-domainset.ts
+++ b/Build/build-speedtest-domainset.ts
@@ -21,6 +21,7 @@ const querySpeedtestApi = async (keyword: string): Promise<Array<string | null>>
     s.acquire()
   ]))[0];
 
+  let timer = null;
   try {
     const randomUserAgent = topUserAgents[Math.floor(Math.random() * topUserAgents.length)];
     const key = `fetch speedtest endpoints: ${keyword}`;
@@ -29,7 +30,7 @@ const querySpeedtestApi = async (keyword: string): Promise<Array<string | null>>
 
     // AbortSignal.timeout() is not supported by bun.
     const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), 4000);
+    timer = setTimeout(() => controller.abort(), 4000);
 
     const res = await fetchWithRetry(`https://www.speedtest.net/api/js/servers?engine=js&search=${keyword}&limit=100`, {
       headers: {
@@ -50,24 +51,23 @@ const querySpeedtestApi = async (keyword: string): Promise<Array<string | null>>
       },
       signal: controller.signal
     });
-
-    clearTimeout(timer);
-
     if (!res.ok) {
       throw new Error(`${res.statusText}\n${await res.text()}`);
     }
 
     const json = await res.json<Array<{ url: string }>>();
 
-    s.release();
-
     console.timeEnd(key);
 
     return json.map(({ url }) => tldts.getHostname(url, { detectIp: false }));
   } catch (e) {
-    s.release();
     console.log(e);
     return [];
+  } finally {
+    if (timer) {
+      clearTimeout(timer);
+    }
+    s.release();
   }
 };
 
diff --git a/Source/domainset/cdn.conf b/Source/domainset/cdn.conf
index 0d971271..e701c1f2 100644
--- a/Source/domainset/cdn.conf
+++ b/Source/domainset/cdn.conf
@@ -2296,3 +2296,4 @@ static-effect.reg.ru
 .espncdn.com
 cdn.matterhorn.app
 lumiere-a.akamaihd.net
+static.namebeta.com