Local-GitHub-Proxy/Sub-Store
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/sub-store-org/Sub-Store.git synced 2025-08-11 16:09:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 找不到资源时报错; 调整脚本操作类型判断; 执行脚本失败时, 同时输出普通脚本和快捷脚本错误

Browse Source
This commit is contained in:
xream 2024-01-14 15:45:08 +08:00
parent 27a14bb255
commit 88f3198320
No known key found for this signature in database
GPG Key ID: 1D2C5225471789F9
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "sub-store", "name": "sub-store",
"version": "2.14.157", "version": "2.14.158",
"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": {

19
backend/src/core/proxy-utils/processors/index.js
View File

@ -319,7 +319,11 @@ function ScriptOperator(script, targetPlatform, $arguments, source) {
const operator = createDynamicFunction( const operator = createDynamicFunction(
'operator', 'operator',
`async function operator(input = []) { `async function operator(input = []) {
if (Array.isArray(input)) { if (input?.$files || input?.$content) {
let { $content, $files } = input
${script}
return { $content, $files }
} else {
let proxies = input let proxies = input
let list = [] let list = []
for await (let $server of proxies) { for await (let $server of proxies) {
@ -327,12 +331,7 @@ function ScriptOperator(script, targetPlatform, $arguments, source) {
list.push($server) list.push($server)
} }
return list return list
} else {
let { $content, $files } = input
${script}
return { $content, $files }
} }
}`, }`,
$arguments, $arguments,
); );
@ -689,7 +688,7 @@ async function ApplyFilter(filter, objs) {
nodeErr = ''; nodeErr = '';
funcErr = `执行失败 ${funcErrMsg}`; funcErr = `执行失败 ${funcErrMsg}`;
} else { } else {
nodeErr = `执行节点快捷过滤脚本 失败 ${nodeErr}`; nodeErr = `执行节点快捷过滤脚本 失败 ${nodeErrMsg}`;
} }
throw new Error(`脚本过滤 ${funcErr}${nodeErr}`); throw new Error(`脚本过滤 ${funcErr}${nodeErr}`);
} }
@ -708,7 +707,9 @@ async function ApplyOperator(operator, objs) {
if ( if (
funcErrMsg.includes('$server is not defined') || funcErrMsg.includes('$server is not defined') ||
funcErrMsg.includes('$content is not defined') || funcErrMsg.includes('$content is not defined') ||
funcErrMsg.includes('$files is not defined') funcErrMsg.includes('$files is not defined') ||
output?.$files ||
output?.$content
) { ) {
funcErr = ''; funcErr = '';
} else { } else {
@ -730,7 +731,7 @@ async function ApplyOperator(operator, objs) {
nodeErr = ''; nodeErr = '';
funcErr = `执行失败 ${funcErrMsg}`; funcErr = `执行失败 ${funcErrMsg}`;
} else { } else {
nodeErr = `执行节点快捷脚本 失败 ${nodeErr}`; nodeErr = `执行节点快捷脚本 失败 ${nodeErrMsg}`;
} }
throw new Error(`脚本操作 ${funcErr}${nodeErr}`); throw new Error(`脚本操作 ${funcErr}${nodeErr}`);
} }

3
backend/src/restful/sync.js
View File

@ -41,6 +41,7 @@ async function produceArtifact({
if (type === 'subscription') { if (type === 'subscription') {
const allSubs = $.read(SUBS_KEY); const allSubs = $.read(SUBS_KEY);
const sub = findByName(allSubs, name); const sub = findByName(allSubs, name);
if (!sub) throw new Error(`找不到订阅 ${name}`);
let raw; let raw;
if (content && !['localFirst', 'remoteFirst'].includes(mergeSources)) { if (content && !['localFirst', 'remoteFirst'].includes(mergeSources)) {
raw = content; raw = content;
@ -161,6 +162,7 @@ async function produceArtifact({
const allSubs = $.read(SUBS_KEY); const allSubs = $.read(SUBS_KEY);
const allCols = $.read(COLLECTIONS_KEY); const allCols = $.read(COLLECTIONS_KEY);
const collection = findByName(allCols, name); const collection = findByName(allCols, name);
if (!collection) throw new Error(`找不到组合订阅 ${name}`);
const subnames = collection.subscriptions; const subnames = collection.subscriptions;
const results = {}; const results = {};
const errors = {}; const errors = {};
@ -307,6 +309,7 @@ async function produceArtifact({
} else if (type === 'rule') { } else if (type === 'rule') {
const allRules = $.read(RULES_KEY); const allRules = $.read(RULES_KEY);
const rule = findByName(allRules, name); const rule = findByName(allRules, name);
if (!rule) throw new Error(`找不到规则 ${name}`);
let rules = []; let rules = [];
for (let i = 0; i < rule.urls.length; i++) { for (let i = 0; i < rule.urls.length; i++) {
const url = rule.urls[i]; const url = rule.urls[i];