Compare commits

..

No commits in common. "master" and "2.19.55" have entirely different histories.

11 changed files with 29 additions and 91 deletions

View File

@ -42,7 +42,7 @@ Core functionalities:
- [x] Clash.Meta (Direct, SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria 2, TUIC, SSH, mieru, AnyTLS) - [x] Clash.Meta (Direct, SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria 2, TUIC, SSH, mieru, AnyTLS)
- [x] Stash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, TUIC, Juicity, SSH) - [x] Stash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, TUIC, Juicity, SSH)
Deprecated(The frontend doesn't show it, but the backend still supports it, with the query parameter `target=Clash`): Deprecated:
- [x] Clash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard) - [x] Clash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard)

View File

@ -1,6 +1,6 @@
{ {
"name": "sub-store", "name": "sub-store",
"version": "2.19.60", "version": "2.19.55",
"description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.", "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.",
"main": "src/main.js", "main": "src/main.js",
"scripts": { "scripts": {

View File

@ -142,9 +142,9 @@ async function processFn(
? `#${rawArgs[1]}` ? `#${rawArgs[1]}`
: '' : ''
}`; }`;
const downloadUrlMatch = url const downloadUrlMatch = url.match(
.split('#')[0] /^\/api\/(file|module)\/(.+)/,
.match(/^\/api\/(file|module)\/(.+)/); );
if (downloadUrlMatch) { if (downloadUrlMatch) {
let type = ''; let type = '';
try { try {
@ -174,17 +174,6 @@ async function processFn(
); );
throw new Error(`无法加载 ${type}: ${url}`); throw new Error(`无法加载 ${type}: ${url}`);
} }
} else if (url?.startsWith('/')) {
try {
const fs = eval(`require("fs")`);
script = fs.readFileSync(url.split('#')[0], 'utf8');
// $.info(`Script loaded: >>>\n ${script}`);
} catch (err) {
$.error(
`Error when reading local script: ${item.args.content}.\n Reason: ${err}`,
);
throw new Error(`无法从该路径读取脚本文件: ${url}`);
}
} else { } else {
// if this is a remote script, download it // if this is a remote script, download it
try { try {

View File

@ -519,7 +519,6 @@ const vlessParser = (proxy = {}) => {
}; };
if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535) if (parsedProxy.server_port < 0 || parsedProxy.server_port > 65535)
throw 'invalid port'; throw 'invalid port';
if (proxy.xudp) parsedProxy.packet_encoding = 'xudp';
if (proxy['fast-open']) parsedProxy.udp_fragment = true; if (proxy['fast-open']) parsedProxy.udp_fragment = true;
if (proxy.flow === 'xtls-rprx-vision') parsedProxy.flow = proxy.flow; if (proxy.flow === 'xtls-rprx-vision') parsedProxy.flow = proxy.flow;
if (proxy.network === 'ws') wsParser(proxy, parsedProxy); if (proxy.network === 'ws') wsParser(proxy, parsedProxy);

View File

@ -259,7 +259,7 @@ async function downloadSubscription(req, res) {
} }
} }
} }
if (!$arguments.noFlow && /^https?/.test(url)) { if (!$arguments.noFlow) {
// forward flow headers // forward flow headers
flowInfo = await getFlowHeaders( flowInfo = await getFlowHeaders(
$arguments?.insecure ? `${url}#insecure` : url, $arguments?.insecure ? `${url}#insecure` : url,
@ -506,7 +506,7 @@ async function downloadCollection(req, res) {
} }
} }
} }
if (!$arguments.noFlow && /^https?:/.test(url)) { if (!$arguments.noFlow) {
subUserInfoOfSub = await getFlowHeaders( subUserInfoOfSub = await getFlowHeaders(
$arguments?.insecure ? `${url}#insecure` : url, $arguments?.insecure ? `${url}#insecure` : url,
$arguments.flowUserAgent, $arguments.flowUserAgent,

View File

@ -150,7 +150,6 @@ async function getFile(req, res) {
proxy, proxy,
noCache, noCache,
produceType, produceType,
all: true,
}); });
try { try {
@ -185,15 +184,9 @@ async function getFile(req, res) {
)}`, )}`,
); );
} }
res.set('Content-Type', 'text/plain; charset=utf-8'); res.set('Content-Type', 'text/plain; charset=utf-8').send(
if (output?.$options?._res?.headers) { output ?? '',
Object.entries(output.$options._res.headers).forEach(
([key, value]) => {
res.set(key, value);
},
); );
}
res.send(output?.$content ?? '');
} catch (err) { } catch (err) {
$.notify( $.notify(
`🌍 Sub-Store 下载文件失败`, `🌍 Sub-Store 下载文件失败`,

View File

@ -140,7 +140,7 @@ async function getFlowInfo(req, res) {
} }
} }
} }
if ($arguments.noFlow || !/^https?/.test(url)) { if ($arguments.noFlow) {
failed( failed(
res, res,
new RequestInvalidError( new RequestInvalidError(

View File

@ -40,7 +40,6 @@ async function produceArtifact({
$options, $options,
proxy, proxy,
noCache, noCache,
all,
}) { }) {
platform = platform || 'JSON'; platform = platform || 'JSON';
@ -596,7 +595,7 @@ async function produceArtifact({
) )
: { $content: filesContent, $files: files, $options }; : { $content: filesContent, $files: files, $options };
return (all ? processed : processed?.$content) ?? ''; return processed?.$content ?? '';
} }
} }

View File

@ -1,4 +1,4 @@
import { SETTINGS_KEY, FILES_KEY, MODULES_KEY } from '@/constants'; import { SETTINGS_KEY } from '@/constants';
import { HTTP, ENV } from '@/vendor/open-api'; import { HTTP, ENV } from '@/vendor/open-api';
import { hex_md5 } from '@/vendor/md5'; import { hex_md5 } from '@/vendor/md5';
import { getPolicyDescriptor } from '@/utils'; import { getPolicyDescriptor } from '@/utils';
@ -11,8 +11,6 @@ import {
validCheck, validCheck,
} from '@/utils/flow'; } from '@/utils/flow';
import $ from '@/core/app'; import $ from '@/core/app';
import { findByName } from '@/utils/database';
import { produceArtifact } from '@/restful/sync';
import PROXY_PREPROCESSORS from '@/core/proxy-utils/preprocessors'; import PROXY_PREPROCESSORS from '@/core/proxy-utils/preprocessors';
const clashPreprocessor = PROXY_PREPROCESSORS.find( const clashPreprocessor = PROXY_PREPROCESSORS.find(
(processor) => processor.name === 'Clash Pre-processor', (processor) => processor.name === 'Clash Pre-processor',
@ -132,53 +130,22 @@ export default async function download(
} }
} }
const downloadUrlMatch = url // const downloadUrlMatch = url.match(/^\/api\/(file|module)\/(.+)/);
.split('#')[0] // if (downloadUrlMatch) {
.match(/^\/api\/(file|module)\/(.+)/); // let type = downloadUrlMatch?.[1];
if (downloadUrlMatch) { // let name = downloadUrlMatch?.[2];
let type = ''; // if (name == null) {
try { // throw new Error(`本地 ${type} URL 无效: ${url}`);
type = downloadUrlMatch?.[1]; // }
let name = downloadUrlMatch?.[2]; // name = decodeURIComponent(name);
if (name == null) { // const key = type === 'module' ? MODULES_KEY : FILES_KEY;
throw new Error(`本地 ${type} URL 无效: ${url}`); // const item = findByName($.read(key), name);
} // if (!item) {
name = decodeURIComponent(name); // throw new Error(`找不到本地 ${type}: ${name}`);
const key = type === 'module' ? MODULES_KEY : FILES_KEY; // }
const item = findByName($.read(key), name);
if (!item) {
throw new Error(`找不到 ${type}: ${name}`);
}
if (type === 'module') { // return item.content;
return item.content; // }
} else {
return await produceArtifact({
type: 'file',
name,
});
}
} catch (err) {
$.error(
`Error when loading ${type}: ${
url.split('#')[0]
}.\n Reason: ${err}`,
);
throw new Error(`无法加载 ${type}: ${url}`);
}
} else if (url?.startsWith('/')) {
try {
const fs = eval(`require("fs")`);
return fs.readFileSync(url.split('#')[0], 'utf8');
} catch (err) {
$.error(
`Error when reading local file: ${
url.split('#')[0]
}.\n Reason: ${err}`,
);
throw new Error(`无法从该路径读取文本内容: ${url}`);
}
}
if (!isNode && tasks.has(id)) { if (!isNode && tasks.has(id)) {
return tasks.get(id); return tasks.get(id);

View File

@ -49,7 +49,7 @@ export async function getFlowHeaders(
} }
} }
} }
if ($arguments?.noFlow || !/^https?/.test(url)) { if ($arguments?.noFlow) {
return; return;
} }
const { isStash, isLoon, isShadowRocket, isQX } = ENV(); const { isStash, isLoon, isShadowRocket, isQX } = ENV();

View File

@ -59,15 +59,6 @@ function operator(proxies = [], targetPlatform, context) {
// } // }
// console.log($options) // console.log($options)
// 若设置 $options._res.headers
// 则会在输出文件时设置响应头, 例如:
// $options._res = {
// headers: {
// 'X-Custom': '1'
// }
// }
// targetPlatform 为输出的目标平台 // targetPlatform 为输出的目标平台
// lodash // lodash