mirror of
https://github.com/sub-store-org/Sub-Store.git
synced 2025-08-10 00:52:40 +00:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bf642ce0e6 | ||
|
|
1ecac9da92 | ||
|
|
c5a417da8f | ||
|
|
8cd0545023 |
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "sub-store",
|
||||
"version": "2.14.331",
|
||||
"version": "2.14.334",
|
||||
"description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
|
||||
"main": "src/main.js",
|
||||
"scripts": {
|
||||
|
||||
@@ -83,7 +83,7 @@ async function processFn(proxies, operators = [], targetPlatform, source) {
|
||||
const { mode, content } = item.args;
|
||||
if (mode === 'link') {
|
||||
let noCache;
|
||||
let url = content;
|
||||
let url = content || '';
|
||||
if (url.endsWith('#noCache')) {
|
||||
url = url.replace(/#noCache$/, '');
|
||||
noCache = true;
|
||||
@@ -438,6 +438,24 @@ function lastParse(proxy) {
|
||||
}
|
||||
}
|
||||
}
|
||||
if (['ws', 'http', 'h2'].includes(proxy.network)) {
|
||||
if (
|
||||
['ws', 'h2'].includes(proxy.network) &&
|
||||
!proxy[`${proxy.network}-opts`]?.path
|
||||
) {
|
||||
proxy[`${proxy.network}-opts`] =
|
||||
proxy[`${proxy.network}-opts`] || {};
|
||||
proxy[`${proxy.network}-opts`].path = '/';
|
||||
} else if (
|
||||
proxy.network === 'http' &&
|
||||
(!Array.isArray(proxy[`${proxy.network}-opts`]?.path) ||
|
||||
proxy[`${proxy.network}-opts`]?.path.every((i) => !i))
|
||||
) {
|
||||
proxy[`${proxy.network}-opts`] =
|
||||
proxy[`${proxy.network}-opts`] || {};
|
||||
proxy[`${proxy.network}-opts`].path = ['/'];
|
||||
}
|
||||
}
|
||||
if (['', 'off'].includes(proxy.sni)) {
|
||||
proxy['disable-sni'] = true;
|
||||
}
|
||||
|
||||
@@ -305,8 +305,9 @@ function URI_VMess() {
|
||||
if (params.net === 'ws' || params.obfs === 'websocket') {
|
||||
proxy.network = 'ws';
|
||||
} else if (
|
||||
['tcp', 'http'].includes(params.net) ||
|
||||
params.obfs === 'http'
|
||||
['http'].includes(params.net) ||
|
||||
['http'].includes(params.obfs) ||
|
||||
['http'].includes(params.type)
|
||||
) {
|
||||
proxy.network = 'http';
|
||||
} else if (['grpc'].includes(params.net)) {
|
||||
@@ -317,6 +318,8 @@ function URI_VMess() {
|
||||
) {
|
||||
proxy.network = 'ws';
|
||||
httpupgrade = true;
|
||||
} else if (params.net === 'h2' || proxy.network === 'h2') {
|
||||
proxy.network = 'h2';
|
||||
}
|
||||
if (proxy.network) {
|
||||
let transportHost = params.host ?? params.obfsParam;
|
||||
@@ -332,6 +335,10 @@ function URI_VMess() {
|
||||
|
||||
if (proxy.network === 'http') {
|
||||
if (transportHost) {
|
||||
// 1)http(tcp)->host中间逗号(,)隔开
|
||||
transportHost = transportHost
|
||||
.split(',')
|
||||
.map((i) => i.trim());
|
||||
transportHost = Array.isArray(transportHost)
|
||||
? transportHost[0]
|
||||
: transportHost;
|
||||
|
||||
@@ -123,10 +123,11 @@ async function downloadSubscription(req, res) {
|
||||
['localFirst', 'remoteFirst'].includes(sub.mergeSources)
|
||||
) {
|
||||
try {
|
||||
url = `${url || sub.url}`
|
||||
.split(/[\r\n]+/)
|
||||
.map((i) => i.trim())
|
||||
.filter((i) => i.length)?.[0];
|
||||
url =
|
||||
`${url || sub.url}`
|
||||
.split(/[\r\n]+/)
|
||||
.map((i) => i.trim())
|
||||
.filter((i) => i.length)?.[0] || '';
|
||||
|
||||
let $arguments = {};
|
||||
const rawArgs = url.split('#');
|
||||
@@ -283,10 +284,11 @@ async function downloadCollection(req, res) {
|
||||
['localFirst', 'remoteFirst'].includes(sub.mergeSources)
|
||||
) {
|
||||
try {
|
||||
let url = `${sub.url}`
|
||||
.split(/[\r\n]+/)
|
||||
.map((i) => i.trim())
|
||||
.filter((i) => i.length)?.[0];
|
||||
let url =
|
||||
`${sub.url}`
|
||||
.split(/[\r\n]+/)
|
||||
.map((i) => i.trim())
|
||||
.filter((i) => i.length)?.[0] || '';
|
||||
|
||||
let $arguments = {};
|
||||
const rawArgs = url.split('#');
|
||||
|
||||
@@ -68,10 +68,11 @@ async function getFlowInfo(req, res) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
let url = `${sub.url}`
|
||||
.split(/[\r\n]+/)
|
||||
.map((i) => i.trim())
|
||||
.filter((i) => i.length)?.[0];
|
||||
let url =
|
||||
`${sub.url}`
|
||||
.split(/[\r\n]+/)
|
||||
.map((i) => i.trim())
|
||||
.filter((i) => i.length)?.[0] || '';
|
||||
|
||||
let $arguments = {};
|
||||
const rawArgs = url.split('#');
|
||||
|
||||
@@ -15,7 +15,7 @@ import $ from '@/core/app';
|
||||
const tasks = new Map();
|
||||
|
||||
export default async function download(
|
||||
rawUrl,
|
||||
rawUrl = '',
|
||||
ua,
|
||||
timeout,
|
||||
proxy,
|
||||
|
||||
@@ -11,7 +11,7 @@ export function getFlowField(headers) {
|
||||
return headers[subkey];
|
||||
}
|
||||
export async function getFlowHeaders(rawUrl, ua, timeout, proxy, flowUrl) {
|
||||
let url = flowUrl || rawUrl;
|
||||
let url = flowUrl || rawUrl || '';
|
||||
let $arguments = {};
|
||||
const rawArgs = url.split('#');
|
||||
url = url.split('#')[0];
|
||||
|
||||
@@ -103,7 +103,7 @@ function operator(proxies = [], targetPlatform, context) {
|
||||
// 4. 一个比较折腾的方案: 在脚本操作中, 把内容同步到另一个 gist
|
||||
// 见 https://t.me/zhetengsha/1428
|
||||
//
|
||||
// const content = ProxyUtils.produce(proxies, platform)
|
||||
// const content = ProxyUtils.produce([...proxies], platform)
|
||||
|
||||
// // YAML
|
||||
// ProxyUtils.yaml.load('YAML String')
|
||||
|
||||
Reference in New Issue
Block a user