GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2025-12-12 09:10:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Chore: avoid adding too much pressure on backup source

Browse Source
This commit is contained in:
SukkaW 2025-07-28 00:29:28 +08:00
parent e9567f6488
commit 2954a1b7c4
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Build/lib/fetch-assets.ts
View File

@ -5,6 +5,7 @@ import { nullthrow } from 'foxts/guard';
import { TextLineStream } from 'foxts/text-line-stream'; import { TextLineStream } from 'foxts/text-line-stream';
import { ProcessLineStream } from './process-line'; import { ProcessLineStream } from './process-line';
import { AdGuardFilterIgnoreUnsupportedLinesStream } from './parse-filter/filters'; import { AdGuardFilterIgnoreUnsupportedLinesStream } from './parse-filter/filters';
import { appendArrayInPlace } from 'foxts/append-array-in-place';
// eslint-disable-next-line sukka/unicorn/custom-error-definition -- typescript is better // eslint-disable-next-line sukka/unicorn/custom-error-definition -- typescript is better
class CustomAbortError extends Error { class CustomAbortError extends Error {
@ -22,9 +23,9 @@ export async function fetchAssets(
const createFetchFallbackPromise = async (url: string, index: number) => { const createFetchFallbackPromise = async (url: string, index: number) => {
if (index >= 0) { if (index >= 0) {
// Most assets can be downloaded within 250ms. To avoid wasting bandwidth, we will wait for 500ms before downloading from the fallback URL. // To avoid wasting bandwidth, we will wait for a few time before downloading from the fallback URL.
try { try {
await waitWithAbort(50 + (index + 1) * 150, controller.signal); await waitWithAbort(200 + (index + 1) * 400, controller.signal);
} catch { } catch {
console.log(picocolors.gray('[fetch cancelled early]'), picocolors.gray(url)); console.log(picocolors.gray('[fetch cancelled early]'), picocolors.gray(url));
throw reusedCustomAbortError; throw reusedCustomAbortError;
@ -36,7 +37,9 @@ export async function fetchAssets(
} }
const res = await $$fetch(url, { signal: controller.signal, ...defaultRequestInit }); const res = await $$fetch(url, { signal: controller.signal, ...defaultRequestInit });
let stream = nullthrow(res.body, url + ' has an empty body').pipeThrough(new TextDecoderStream()).pipeThrough(new TextLineStream({ skipEmptyLines: processLine })); let stream = nullthrow(res.body, url + ' has an empty body')
.pipeThrough(new TextDecoderStream())
.pipeThrough(new TextLineStream({ skipEmptyLines: processLine }));
if (processLine) { if (processLine) {
stream = stream.pipeThrough(new ProcessLineStream()); stream = stream.pipeThrough(new ProcessLineStream());
} }
@ -53,11 +56,15 @@ export async function fetchAssets(
return arr; return arr;
}; };
const primaryPromise = createFetchFallbackPromise(url, -1);
if (!fallbackUrls || fallbackUrls.length === 0) { if (!fallbackUrls || fallbackUrls.length === 0) {
return createFetchFallbackPromise(url, -1); return primaryPromise;
} }
return Promise.any([ return Promise.any(
createFetchFallbackPromise(url, -1), appendArrayInPlace(
...fallbackUrls.map(createFetchFallbackPromise) [primaryPromise],
]); fallbackUrls.map(createFetchFallbackPromise)
)
);
} }