Skip to content

Commit 506d8c3

Browse files
committed
feat: Shadowrocket 支持 trusttunnel, 下发 XHTTP 并输出日志提示
1 parent 7be333d commit 506d8c3

3 files changed

Lines changed: 4 additions & 34 deletions

File tree

backend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sub-store",
3-
"version": "2.22.23",
3+
"version": "2.22.25",
44
"description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.",
55
"main": "src/main.js",
66
"scripts": {

backend/src/core/proxy-utils/producers/shadowrocket.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export default function Shadowrocket_Producer() {
3232
} else if (
3333
[
3434
'tailscale',
35-
'trusttunnel',
3635
'mieru',
3736
'sudoku',
3837
'naive',
@@ -49,10 +48,10 @@ export default function Shadowrocket_Producer() {
4948
) {
5049
return false;
5150
} else if (['xhttp'].includes(proxy.network)) {
52-
$.info(
53-
`Shadowrocket 不支持从 mihomo 格式读取 XHTTP, 请使用 V2Ray 格式输出`,
51+
$.warn(
52+
`VLESS XHTTP 结构复杂, Shadowrocket 可能无法完全兼容`,
5453
);
55-
return false;
54+
return true;
5655
}
5756
return true;
5857
})

backend/src/test/proxy-producers/structured.spec.js

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2274,33 +2274,4 @@ describe('Proxy structured producers', function () {
22742274
const ds = internal[0]['xhttp-opts']['download-settings'];
22752275
expect(ds).to.not.have.property('reality-opts');
22762276
});
2277-
2278-
it('filters xhttp proxies from Shadowrocket by default', function () {
2279-
const proxies = [
2280-
{
2281-
type: 'vless',
2282-
name: 'VLESS XHTTP',
2283-
server: 'vless.example.com',
2284-
port: 443,
2285-
uuid: UUID,
2286-
tls: true,
2287-
network: 'xhttp',
2288-
'xhttp-opts': { path: '/xhttp' },
2289-
},
2290-
{
2291-
type: 'vless',
2292-
name: 'VLESS WS',
2293-
server: 'vless.example.com',
2294-
port: 443,
2295-
uuid: UUID,
2296-
tls: true,
2297-
network: 'ws',
2298-
'ws-opts': { path: '/ws' },
2299-
},
2300-
];
2301-
2302-
const internal = produceInternal('Shadowrocket', proxies);
2303-
2304-
expect(internal.map((p) => p.name)).to.deep.equal(['VLESS WS']);
2305-
});
23062277
});

0 commit comments

Comments
 (0)