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-06-16 02:37:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: produceArtifact 方法支持传入自定义 subscription; VLESS 非 reality 删除空 flow

Browse Source
This commit is contained in:
xream 2024-03-10 17:22:01 +08:00
parent aaef97cf5d
commit 078bf228de
No known key found for this signature in database
GPG Key ID: 1D2C5225471789F9
4 changed files with 17 additions and 4 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.244", "version": "2.14.245",
"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": {

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

@ -370,6 +370,10 @@ function lastParse(proxy) {
delete proxy.ports; delete proxy.ports;
} }
if (['vless'].includes(proxy.type)) { if (['vless'].includes(proxy.type)) {
// 非 reality, 空 flow 没有意义
if (!proxy['reality-opts'] && !proxy.flow) {
delete proxy.flow;
}
if (['http'].includes(proxy.network)) { if (['http'].includes(proxy.network)) {
let transportPath = proxy[`${proxy.network}-opts`]?.path; let transportPath = proxy[`${proxy.network}-opts`]?.path;
if (!transportPath) { if (!transportPath) {

1
backend/src/core/proxy-utils/parsers/index.js
View File

@ -444,6 +444,7 @@ function URI_VLESS() {
proxy[`${params.security}-opts`] = opts; proxy[`${params.security}-opts`] = opts;
} }
} }
proxy.network = params.type; proxy.network = params.type;
if (proxy.network === 'tcp' && params.headerType === 'http') { if (proxy.network === 'tcp' && params.headerType === 'http') {
proxy.network = 'http'; proxy.network = 'http';

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

@ -35,13 +35,21 @@ async function produceArtifact({
ignoreFailedRemoteFile, ignoreFailedRemoteFile,
produceType, produceType,
produceOpts = {}, produceOpts = {},
subscription,
}) { }) {
platform = platform || 'JSON'; platform = platform || 'JSON';
if (type === 'subscription') { if (type === 'subscription') {
const allSubs = $.read(SUBS_KEY); let sub;
const sub = findByName(allSubs, name); if (name) {
if (!sub) throw new Error(`找不到订阅 ${name}`); const allSubs = $.read(SUBS_KEY);
sub = findByName(allSubs, name);
if (!sub) throw new Error(`找不到订阅 ${name}`);
} else if (subscription) {
sub = subscription;
} else {
throw new Error('未提供订阅名称或订阅数据');
}
let raw; let raw;
if (content && !['localFirst', 'remoteFirst'].includes(mergeSources)) { if (content && !['localFirst', 'remoteFirst'].includes(mergeSources)) {
raw = content; raw = content;