Skip to content

Commit 6d5e278

Browse files
committed
chore: remove relay group type
1 parent 9f6f14a commit 6d5e278

File tree

7 files changed

+5
-23
lines changed

7 files changed

+5
-23
lines changed

frontend/src/constant/kernel.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,6 @@ export const GroupsTypeOptions = [
106106
label: 'kernel.proxyGroups.type.fallback',
107107
value: ProxyGroup.Fallback,
108108
},
109-
{
110-
label: 'kernel.proxyGroups.type.relay',
111-
value: ProxyGroup.Relay,
112-
},
113109
{
114110
label: 'kernel.proxyGroups.type.load-balance',
115111
value: ProxyGroup.LoadBalance,

frontend/src/enums/kernel.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,13 @@ export enum ProxyGroup {
3333
Select = 'select',
3434
UrlTest = 'url-test',
3535
Fallback = 'fallback',
36-
Relay = 'relay',
3736
LoadBalance = 'load-balance',
3837
}
3938

4039
export enum ProxyGroupType {
4140
Selector = 'Selector',
4241
UrlTest = 'URLTest',
4342
Fallback = 'Fallback',
44-
Relay = 'Relay',
4543
LoadBalance = 'LoadBalance',
4644
}
4745

frontend/src/lang/locale/en.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,10 @@ export default {
184184
select: 'select',
185185
'url-test': 'url-test',
186186
fallback: 'fallback',
187-
relay: 'relay',
188187
'load-balance': 'load-balance',
189188
Selector: 'Selector',
190189
UrlTest: 'UrlTest',
191190
Fallback: 'Fallback',
192-
Relay: 'Relay',
193191
LoadBalance: 'LoadBalance',
194192
},
195193
strategy: {

frontend/src/lang/locale/zh.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,10 @@ export default {
184184
select: '手动选择',
185185
'url-test': '自动选择',
186186
fallback: '自动回退',
187-
relay: '链式代理',
188187
'load-balance': '负载均衡',
189188
Selector: '手动选择',
190189
UrlTest: '自动选择',
191190
Fallback: '自动回退',
192-
Relay: '链式代理',
193191
LoadBalance: '负载均衡',
194192
},
195193
strategy: {

frontend/src/utils/generator.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,6 @@ export const generateProxyGroup = (
180180
'disable-udp': disableUDP,
181181
strategy,
182182
})
183-
} else if (type === ProxyGroup.Relay) {
184-
Object.assign(group, {})
185183
}
186184

187185
return group

frontend/src/utils/tray.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ const getTrayMenus = () => {
9393
ProxyGroupType.Selector,
9494
ProxyGroupType.UrlTest,
9595
ProxyGroupType.Fallback,
96-
ProxyGroupType.Relay,
9796
ProxyGroupType.LoadBalance,
9897
].includes(v.type as ProxyGroupType)
9998
})

frontend/src/views/HomeView/components/GroupsController.vue

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ const groups = computed(() => {
4444
ProxyGroupType.Selector,
4545
ProxyGroupType.UrlTest,
4646
ProxyGroupType.Fallback,
47-
ProxyGroupType.Relay,
4847
ProxyGroupType.LoadBalance,
4948
].includes(v.type as ProxyGroupType)
5049
})
@@ -79,15 +78,11 @@ const groups = computed(() => {
7978
})
8079
8180
const chains = []
82-
if (group.type === ProxyGroupType.Relay) {
83-
chains.push(...group.all)
84-
} else {
85-
chains.push(group.now)
86-
let tmp = proxies[group.now]
87-
while (tmp) {
88-
tmp.now && chains.push(tmp.now)
89-
tmp = proxies[tmp.now]
90-
}
81+
chains.push(group.now)
82+
let tmp = proxies[group.now]
83+
while (tmp) {
84+
tmp.now && chains.push(tmp.now)
85+
tmp = proxies[tmp.now]
9186
}
9287
9388
return { ...group, all, chains }

0 commit comments

Comments
 (0)