feat: 远程订阅支持换行符连接的多个订阅链接(前端版本 > 2.14.13 可输入)

This commit is contained in:
xream
2023-11-29 02:24:03 +08:00
parent 5a645081d1
commit 3054d5cd5d
3 changed files with 49 additions and 10 deletions

View File

@@ -30,16 +30,31 @@ async function produceArtifact({ type, name, platform, url, ua, content }) {
const sub = findByName(allSubs, name);
let raw;
if (url) {
raw = await download(url, ua);
raw = await Promise.all(
url
.split(/[\r\n]+/)
.map((i) => i.trim())
.filter((i) => i.length)
.map((url) => download(url, ua)),
);
} else if (content) {
raw = content;
} else if (sub.source === 'local') {
raw = sub.content;
} else {
raw = await download(sub.url, sub.ua);
raw = await Promise.all(
sub.url
.split(/[\r\n]+/)
.map((i) => i.trim())
.filter((i) => i.length)
.map((url) => download(url, sub.ua)),
);
}
// parse proxies
let proxies = ProxyUtils.parse(raw);
let proxies = (Array.isArray(raw) ? raw : [raw])
.map((i) => ProxyUtils.parse(i))
.flat();
proxies.forEach((proxy) => {
proxy.subName = sub.name;
});
@@ -90,10 +105,18 @@ async function produceArtifact({ type, name, platform, url, ua, content }) {
if (sub.source === 'local') {
raw = sub.content;
} else {
raw = await download(sub.url, sub.ua);
raw = await await Promise.all(
sub.url
.split(/[\r\n]+/)
.map((i) => i.trim())
.filter((i) => i.length)
.map((url) => download(url, sub.ua)),
);
}
// parse proxies
let currentProxies = ProxyUtils.parse(raw);
let currentProxies = (Array.isArray(raw) ? raw : [raw])
.map((i) => ProxyUtils.parse(i))
.flat();
currentProxies.forEach((proxy) => {
proxy.subName = sub.name;