feat: 文件支持设置代理/策略, 链接支持传入 proxy 参数指定代理/策略; 修复代理/策略优先级

This commit is contained in:
xream
2024-10-07 22:05:07 +08:00
parent 8ffb060cb4
commit ef85b6d0e9
4 changed files with 28 additions and 10 deletions

View File

@@ -69,7 +69,7 @@ async function produceArtifact({
url,
ua || sub.ua,
undefined,
sub.proxy || proxy,
proxy || sub.proxy,
undefined,
awaitCustomCache,
);
@@ -116,7 +116,7 @@ async function produceArtifact({
url,
ua || sub.ua,
undefined,
sub.proxy || proxy,
proxy || sub.proxy,
undefined,
awaitCustomCache,
);
@@ -221,9 +221,9 @@ async function produceArtifact({
url,
sub.ua,
undefined,
sub.proxy ||
collection.proxy ||
proxy,
proxy ||
sub.proxy ||
collection.proxy,
);
} catch (err) {
errors[url] = err;
@@ -392,7 +392,12 @@ async function produceArtifact({
.filter((i) => i.length)
.map(async (url) => {
try {
return await download(url, ua || file.ua);
return await download(
url,
ua || file.ua,
undefined,
file.proxy || proxy,
);
} catch (err) {
errors[url] = err;
$.error(
@@ -435,7 +440,12 @@ async function produceArtifact({
.filter((i) => i.length)
.map(async (url) => {
try {
return await download(url, ua || file.ua);
return await download(
url,
ua || file.ua,
undefined,
file.proxy || proxy,
);
} catch (err) {
errors[url] = err;
$.error(