GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2026-01-29 01:51:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Housekeeping & Minor Changes

Browse Source
This commit is contained in:
SukkaW
2025-01-10 00:33:06 +08:00
parent 7e5fad3362
commit 14976b94ea
5 changed files with 98 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Build/build-speedtest-domainset.ts
View File

@@ -44,10 +44,6 @@ const KEYWORDS = [
const s = newQueue(2);
const latestTopUserAgentsPromise = $fetch('https://raw.githubusercontent.com/microlinkhq/top-user-agents/master/src/desktop.json')
.then(res => res.json())
.then((userAgents: string[]) => userAgents.filter(ua => ua.startsWith('Mozilla/5.0 ')));
const getSpeedtestHostsGroupsPromise = Promise.all(KEYWORDS.flatMap(querySpeedtestApi));
export const buildSpeedtestDomainSet = task(require.main === module, __filename)(async (span) => {
@@ -78,6 +74,10 @@ export const buildSpeedtestDomainSet = task(require.main === module, __filename)
return output.write();
});
const latestTopUserAgentsPromise = $fetch('https://raw.githubusercontent.com/microlinkhq/top-user-agents/master/src/desktop.json')
.then(res => res.json())
.then((userAgents: string[]) => userAgents.filter(ua => ua.startsWith('Mozilla/5.0 ')));
async function querySpeedtestApi(keyword: string) {
const topUserAgents = await latestTopUserAgentsPromise;

3
Build/download-previous-build.ts
View File

@@ -8,6 +8,7 @@ import zlib from 'node:zlib';
import undici from 'undici';
import picocolors from 'picocolors';
import { PUBLIC_DIR } from './constants/dir';
import { requestWithLog } from './lib/fetch-retry';
const GITHUB_CODELOAD_URL = 'https://codeload.github.com/sukkalab/ruleset.skk.moe/tar.gz/master';
const GITLAB_CODELOAD_URL = 'https://gitlab.com/SukkaW/ruleset.skk.moe/-/archive/master/ruleset.skk.moe-master.tar.gz';
@@ -19,7 +20,7 @@ export const downloadPreviousBuild = task(require.main === module, __filename)(a
}
const tarGzUrl = await span.traceChildAsync('get tar.gz url', async () => {
const resp = await undici.request(GITHUB_CODELOAD_URL, { method: 'HEAD' });
const resp = await requestWithLog(GITHUB_CODELOAD_URL, { method: 'HEAD' });
if (resp.statusCode !== 200) {
console.warn('Download previous build from GitHub failed! Status:', resp.statusCode);
console.warn('Switch to GitLab');

2
Build/lib/is-domain-alive.ts
View File

@@ -64,7 +64,6 @@ const dohServers: Array<[string, DNS2.DnsResolver]> = ([
DNS2.DOHClient({
dns,
http: false
// get: (url: string) => undici.request(url).then(r => r.body)
})
] as const);
@@ -78,7 +77,6 @@ const domesticDohServers: Array<[string, DNS2.DnsResolver]> = ([
DNS2.DOHClient({
dns,
http: false
// get: (url: string) => undici.request(url).then(r => r.body)
})
] as const);