diff options
| author | surbiks <43953720+surbiks@users.noreply.github.com> | 2026-02-09 23:43:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-09 23:43:17 +0300 |
| commit | 4779939424eb047d30161631fd89a9876104084c (patch) | |
| tree | 89e2682aa528281879b3afb535f2b34124a17335 /web/html | |
| parent | 4a455aa5322e0803005da2d5d65b85a19dfc42e5 (diff) | |
Add url speed test for outbound (#3767)
* add outbound testing functionality with configurable test URL
* use no kernel tun for conflict errors
Diffstat (limited to 'web/html')
| -rw-r--r-- | web/html/settings/xray/basics.html | 163 | ||||
| -rw-r--r-- | web/html/settings/xray/outbounds.html | 77 | ||||
| -rw-r--r-- | web/html/xray.html | 156 |
3 files changed, 304 insertions, 92 deletions
diff --git a/web/html/settings/xray/basics.html b/web/html/settings/xray/basics.html index 71aa0d7c..9a31038a 100644 --- a/web/html/settings/xray/basics.html +++ b/web/html/settings/xray/basics.html @@ -4,18 +4,22 @@ <a-row :xs="24" :sm="24" :lg="12"> <a-alert type="warning" :style="{ textAlign: 'center' }"> <template slot="message"> - <a-icon type="exclamation-circle" theme="filled" :style="{ color: '#FFA031' }"></a-icon> + <a-icon type="exclamation-circle" theme="filled" + :style="{ color: '#FFA031' }"></a-icon> <span>{{ i18n "pages.xray.generalConfigsDesc" }}</span> </template> </a-alert> </a-row> <a-setting-list-item paddings="small"> <template #title>{{ i18n "pages.xray.FreedomStrategy" }}</template> - <template #description>{{ i18n "pages.xray.FreedomStrategyDesc" }}</template> + <template #description>{{ i18n "pages.xray.FreedomStrategyDesc" + }}</template> <template #control> - <a-select v-model="freedomStrategy" :dropdown-class-name="themeSwitcher.currentTheme" + <a-select v-model="freedomStrategy" + :dropdown-class-name="themeSwitcher.currentTheme" :style="{ width: '100%' }"> - <a-select-option v-for="s in OutboundDomainStrategies" :value="s"> + <a-select-option v-for="s in OutboundDomainStrategies" + :value="s"> <span>[[ s ]]</span> </a-select-option> </a-select> @@ -23,42 +27,63 @@ </a-setting-list-item> <a-setting-list-item paddings="small"> <template #title>{{ i18n "pages.xray.RoutingStrategy" }}</template> - <template #description>{{ i18n "pages.xray.RoutingStrategyDesc" }}</template> + <template #description>{{ i18n "pages.xray.RoutingStrategyDesc" + }}</template> <template #control> - <a-select v-model="routingStrategy" :dropdown-class-name="themeSwitcher.currentTheme" + <a-select v-model="routingStrategy" + :dropdown-class-name="themeSwitcher.currentTheme" :style="{ width: '100%' }"> - <a-select-option v-for="s in routingDomainStrategies" :value="s"> + <a-select-option v-for="s in routingDomainStrategies" + :value="s"> <span>[[ s ]]</span> </a-select-option> </a-select> </template> </a-setting-list-item> + <a-setting-list-item paddings="small"> + <template #title>{{ i18n "pages.xray.outboundTestUrl" }}</template> + <template #description>{{ i18n "pages.xray.outboundTestUrlDesc" + }}</template> + <template #control> + <a-input v-model="outboundTestUrl" + :placeholder="'https://www.google.com/generate_204'" + :style="{ width: '100%' }"></a-input> + </template> + </a-setting-list-item> </a-collapse-panel> <a-collapse-panel key="2" header='{{ i18n "pages.xray.statistics" }}'> <a-setting-list-item paddings="small"> - <template #title>{{ i18n "pages.xray.statsInboundUplink" }}</template> - <template #description>{{ i18n "pages.xray.statsInboundUplinkDesc" }}</template> + <template #title>{{ i18n "pages.xray.statsInboundUplink" + }}</template> + <template #description>{{ i18n "pages.xray.statsInboundUplinkDesc" + }}</template> <template #control> <a-switch v-model="statsInboundUplink"></a-switch> </template> </a-setting-list-item> <a-setting-list-item paddings="small"> - <template #title>{{ i18n "pages.xray.statsInboundDownlink" }}</template> - <template #description>{{ i18n "pages.xray.statsInboundDownlinkDesc" }}</template> + <template #title>{{ i18n "pages.xray.statsInboundDownlink" + }}</template> + <template #description>{{ i18n "pages.xray.statsInboundDownlinkDesc" + }}</template> <template #control> <a-switch v-model="statsInboundDownlink"></a-switch> </template> </a-setting-list-item> <a-setting-list-item paddings="small"> - <template #title>{{ i18n "pages.xray.statsOutboundUplink" }}</template> - <template #description>{{ i18n "pages.xray.statsOutboundUplinkDesc" }}</template> + <template #title>{{ i18n "pages.xray.statsOutboundUplink" + }}</template> + <template #description>{{ i18n "pages.xray.statsOutboundUplinkDesc" + }}</template> <template #control> <a-switch v-model="statsOutboundUplink"></a-switch> </template> </a-setting-list-item> <a-setting-list-item paddings="small"> - <template #title>{{ i18n "pages.xray.statsOutboundDownlink" }}</template> - <template #description>{{ i18n "pages.xray.statsOutboundDownlinkDesc" }}</template> + <template #title>{{ i18n "pages.xray.statsOutboundDownlink" + }}</template> + <template #description>{{ i18n + "pages.xray.statsOutboundDownlinkDesc" }}</template> <template #control> <a-switch v-model="statsOutboundDownlink"></a-switch> </template> @@ -68,16 +93,20 @@ <a-row :xs="24" :sm="24" :lg="12"> <a-alert type="warning" :style="{ textAlign: 'center' }"> <template slot="message"> - <a-icon type="exclamation-circle" theme="filled" :style="{ color: '#FFA031' }"></a-icon> + <a-icon type="exclamation-circle" theme="filled" + :style="{ color: '#FFA031' }"></a-icon> <span>{{ i18n "pages.xray.logConfigsDesc" }}</span> </template> </a-alert> </a-row> <a-setting-list-item paddings="small"> <template #title>{{ i18n "pages.xray.logLevel" }}</template> - <template #description>{{ i18n "pages.xray.logLevelDesc" }}</template> + <template #description>{{ i18n "pages.xray.logLevelDesc" + }}</template> <template #control> - <a-select v-model="logLevel" :dropdown-class-name="themeSwitcher.currentTheme" :style="{ width: '100%' }"> + <a-select v-model="logLevel" + :dropdown-class-name="themeSwitcher.currentTheme" + :style="{ width: '100%' }"> <a-select-option v-for="s in log.loglevel" :value="s"> <span>[[ s ]]</span> </a-select-option> @@ -86,10 +115,13 @@ </a-setting-list-item> <a-setting-list-item paddings="small"> <template #title>{{ i18n "pages.xray.accessLog" }}</template> - <template #description>{{ i18n "pages.xray.accessLogDesc" }}</template> + <template #description>{{ i18n "pages.xray.accessLogDesc" + }}</template> <template #control> - <a-select v-model="accessLog" :dropdown-class-name="themeSwitcher.currentTheme" :style="{ width: '100%' }"> - <a-select-option value=''> + <a-select v-model="accessLog" + :dropdown-class-name="themeSwitcher.currentTheme" + :style="{ width: '100%' }"> + <a-select-option value> <span>Empty</span> </a-select-option> <a-select-option v-for="s in log.access" :value="s"> @@ -100,10 +132,13 @@ </a-setting-list-item> <a-setting-list-item paddings="small"> <template #title>{{ i18n "pages.xray.errorLog" }}</template> - <template #description>{{ i18n "pages.xray.errorLogDesc" }}</template> + <template #description>{{ i18n "pages.xray.errorLogDesc" + }}</template> <template #control> - <a-select v-model="errorLog" :dropdown-class-name="themeSwitcher.currentTheme" :style="{ width: '100%' }"> - <a-select-option value=''> + <a-select v-model="errorLog" + :dropdown-class-name="themeSwitcher.currentTheme" + :style="{ width: '100%' }"> + <a-select-option value> <span>Empty</span> </a-select-option> <a-select-option v-for="s in log.error" :value="s"> @@ -114,11 +149,13 @@ </a-setting-list-item> <a-setting-list-item paddings="small"> <template #title>{{ i18n "pages.xray.maskAddress" }}</template> - <template #description>{{ i18n "pages.xray.maskAddressDesc" }}</template> + <template #description>{{ i18n "pages.xray.maskAddressDesc" + }}</template> <template #control> - <a-select v-model="maskAddressLog" :dropdown-class-name="themeSwitcher.currentTheme" + <a-select v-model="maskAddressLog" + :dropdown-class-name="themeSwitcher.currentTheme" :style="{ width: '100%' }"> - <a-select-option value=''> + <a-select-option value> <span>Empty</span> </a-select-option> <a-select-option v-for="s in log.maskAddress" :value="s"> @@ -139,7 +176,8 @@ <a-row :xs="24" :sm="24" :lg="12"> <a-alert type="warning" :style="{ textAlign: 'center' }"> <template slot="message"> - <a-icon type="exclamation-circle" theme="filled" :style="{ color: '#FFA031' }"></a-icon> + <a-icon type="exclamation-circle" theme="filled" + :style="{ color: '#FFA031' }"></a-icon> <span>{{ i18n "pages.xray.blockConfigsDesc" }}</span> </template> </a-alert> @@ -153,17 +191,21 @@ <a-row :xs="24" :sm="24" :lg="12"> <a-alert type="warning" :style="{ textAlign: 'center' }"> <template slot="message"> - <a-icon type="exclamation-circle" theme="filled" :style="{ color: '#FFA031' }"></a-icon> - <span>{{ i18n "pages.xray.blockConnectionsConfigsDesc" }}</span> + <a-icon type="exclamation-circle" theme="filled" + :style="{ color: '#FFA031' }"></a-icon> + <span>{{ i18n "pages.xray.blockConnectionsConfigsDesc" + }}</span> </template> </a-alert> </a-row> <a-setting-list-item paddings="small"> <template #title>{{ i18n "pages.xray.blockips" }}</template> <template #control> - <a-select mode="tags" v-model="blockedIPs" :style="{ width: '100%' }" + <a-select mode="tags" v-model="blockedIPs" + :style="{ width: '100%' }" :dropdown-class-name="themeSwitcher.currentTheme"> - <a-select-option :value="p.value" :label="p.label" v-for="p in settingsData.IPsOptions"> + <a-select-option :value="p.value" :label="p.label" + v-for="p in settingsData.IPsOptions"> <span>[[ p.label ]]</span> </a-select-option> </a-select> @@ -172,28 +214,35 @@ <a-setting-list-item paddings="small"> <template #title>{{ i18n "pages.xray.blockdomains" }}</template> <template #control> - <a-select mode="tags" v-model="blockedDomains" :style="{ width: '100%' }" + <a-select mode="tags" v-model="blockedDomains" + :style="{ width: '100%' }" :dropdown-class-name="themeSwitcher.currentTheme"> - <a-select-option :value="p.value" :label="p.label" v-for="p in settingsData.BlockDomainsOptions"> + <a-select-option :value="p.value" :label="p.label" + v-for="p in settingsData.BlockDomainsOptions"> <span>[[ p.label ]]</span> </a-select-option> </a-select> </template> </a-setting-list-item> <a-row :xs="24" :sm="24" :lg="12"> - <a-alert type="warning" :style="{ textAlign: 'center', marginTop: '20px' }"> + <a-alert type="warning" + :style="{ textAlign: 'center', marginTop: '20px' }"> <template slot="message"> - <a-icon type="exclamation-circle" theme="filled" :style="{ color: '#FFA031' }"></a-icon> - <span>{{ i18n "pages.xray.directConnectionsConfigsDesc" }}</span> + <a-icon type="exclamation-circle" theme="filled" + :style="{ color: '#FFA031' }"></a-icon> + <span>{{ i18n "pages.xray.directConnectionsConfigsDesc" + }}</span> </template> </a-alert> </a-row> <a-setting-list-item paddings="small"> <template #title>{{ i18n "pages.xray.directips" }}</template> <template #control> - <a-select mode="tags" :style="{ width: '100%' }" v-model="directIPs" + <a-select mode="tags" :style="{ width: '100%' }" + v-model="directIPs" :dropdown-class-name="themeSwitcher.currentTheme"> - <a-select-option :value="p.value" :label="p.label" v-for="p in settingsData.IPsOptions"> + <a-select-option :value="p.value" :label="p.label" + v-for="p in settingsData.IPsOptions"> <span>[[ p.label ]]</span> </a-select-option> </a-select> @@ -202,18 +251,22 @@ <a-setting-list-item paddings="small"> <template #title>{{ i18n "pages.xray.directdomains" }}</template> <template #control> - <a-select mode="tags" :style="{ width: '100%' }" v-model="directDomains" + <a-select mode="tags" :style="{ width: '100%' }" + v-model="directDomains" :dropdown-class-name="themeSwitcher.currentTheme"> - <a-select-option :value="p.value" :label="p.label" v-for="p in settingsData.DomainsOptions"> + <a-select-option :value="p.value" :label="p.label" + v-for="p in settingsData.DomainsOptions"> <span>[[ p.label ]]</span> </a-select-option> </a-select> </template> </a-setting-list-item> <a-row :xs="24" :sm="24" :lg="12"> - <a-alert type="warning" :style="{ textAlign: 'center', marginTop: '20px' }"> + <a-alert type="warning" + :style="{ textAlign: 'center', marginTop: '20px' }"> <template slot="message"> - <a-icon type="exclamation-circle" theme="filled" :style="{ color: '#FFA031' }"></a-icon> + <a-icon type="exclamation-circle" theme="filled" + :style="{ color: '#FFA031' }"></a-icon> <span>{{ i18n "pages.xray.ipv4RoutingDesc" }}</span> </template> </a-alert> @@ -221,18 +274,22 @@ <a-setting-list-item paddings="small"> <template #title>{{ i18n "pages.xray.ipv4Routing" }}</template> <template #control> - <a-select mode="tags" :style="{ width: '100%' }" v-model="ipv4Domains" + <a-select mode="tags" :style="{ width: '100%' }" + v-model="ipv4Domains" :dropdown-class-name="themeSwitcher.currentTheme"> - <a-select-option :value="p.value" :label="p.label" v-for="p in settingsData.ServicesOptions"> + <a-select-option :value="p.value" :label="p.label" + v-for="p in settingsData.ServicesOptions"> <span>[[ p.label ]]</span> </a-select-option> </a-select> </template> </a-setting-list-item> <a-row :xs="24" :sm="24" :lg="12"> - <a-alert type="warning" :style="{ textAlign: 'center', marginTop: '20px' }"> + <a-alert type="warning" + :style="{ textAlign: 'center', marginTop: '20px' }"> <template slot="message"> - <a-icon type="exclamation-circle" theme="filled" :style="{ color: '#FFA031' }"></a-icon> + <a-icon type="exclamation-circle" theme="filled" + :style="{ color: '#FFA031' }"></a-icon> {{ i18n "pages.xray.warpRoutingDesc" }} </template> </a-alert> @@ -241,20 +298,24 @@ <template #title>{{ i18n "pages.xray.warpRouting" }}</template> <template #control> <template v-if="WarpExist"> - <a-select mode="tags" :style="{ width: '100%' }" v-model="warpDomains" + <a-select mode="tags" :style="{ width: '100%' }" + v-model="warpDomains" :dropdown-class-name="themeSwitcher.currentTheme"> - <a-select-option :value="p.value" :label="p.label" v-for="p in settingsData.ServicesOptions"> + <a-select-option :value="p.value" :label="p.label" + v-for="p in settingsData.ServicesOptions"> <span>[[ p.label ]]</span> </a-select-option> </a-select> </template> <template v-else> - <a-button type="primary" icon="cloud" @click="showWarp()">WARP</a-button> + <a-button type="primary" icon="cloud" + @click="showWarp()">WARP</a-button> </template> </template> </a-setting-list-item> </a-collapse-panel> - <a-collapse-panel key="6" header='{{ i18n "pages.settings.resetDefaultConfig"}}'> + <a-collapse-panel key="6" + header='{{ i18n "pages.settings.resetDefaultConfig"}}'> <a-space direction="horizontal" :style="{ padding: '0 20px' }"> <a-button type="danger" @click="resetXrayConfigToDefault"> <span>{{ i18n "pages.settings.resetDefaultConfig" }}</span> diff --git a/web/html/settings/xray/outbounds.html b/web/html/settings/xray/outbounds.html index 1c099308..3995760f 100644 --- a/web/html/settings/xray/outbounds.html +++ b/web/html/settings/xray/outbounds.html @@ -4,17 +4,22 @@ <a-col :xs="12" :sm="12" :lg="12"> <a-space direction="horizontal" size="small"> <a-button type="primary" icon="plus" @click="addOutbound"> - <span v-if="!isMobile">{{ i18n "pages.xray.outbound.addOutbound" }}</span> + <span v-if="!isMobile">{{ i18n + "pages.xray.outbound.addOutbound" }}</span> </a-button> - <a-button type="primary" icon="cloud" @click="showWarp()">WARP</a-button> + <a-button type="primary" icon="cloud" + @click="showWarp()">WARP</a-button> </a-space> </a-col> <a-col :xs="12" :sm="12" :lg="12" :style="{ textAlign: 'right' }"> <a-button-group> - <a-button icon="sync" @click="refreshOutboundTraffic()" :loading="refreshing"></a-button> - <a-popconfirm placement="topRight" @confirm="resetOutboundTraffic(-1)" + <a-button icon="sync" @click="refreshOutboundTraffic()" + :loading="refreshing"></a-button> + <a-popconfirm placement="topRight" + @confirm="resetOutboundTraffic(-1)" title='{{ i18n "pages.inbounds.resetTrafficContent"}}' - :overlay-class-name="themeSwitcher.currentTheme" ok-text='{{ i18n "reset"}}' + :overlay-class-name="themeSwitcher.currentTheme" + ok-text='{{ i18n "reset"}}' cancel-text='{{ i18n "cancel"}}'> <a-icon slot="icon" type="question-circle-o" :style="{ color: themeSwitcher.isDarkTheme ? '#008771' : '#008771' }"></a-icon> @@ -23,8 +28,10 @@ </a-button-group> </a-col> </a-row> - <a-table :columns="outboundColumns" bordered :row-key="r => r.key" :data-source="outboundData" - :scroll="isMobile ? {} : { x: 800 }" :pagination="false" :indent-size="0" + <a-table :columns="outboundColumns" bordered :row-key="r => r.key" + :data-source="outboundData" + :scroll="isMobile ? {} : { x: 800 }" :pagination="false" + :indent-size="0" :locale='{ filterConfirm: `{{ i18n "confirm" }}`, filterReset: `{{ i18n "reset" }}` }'> <template slot="action" slot-scope="text, outbound, index"> <span>[[ index+1 ]]</span> @@ -32,7 +39,8 @@ <a-icon @click="e => e.preventDefault()" type="more" :style="{ fontSize: '16px', textDecoration: 'bold' }"></a-icon> <a-menu slot="overlay" :theme="themeSwitcher.currentTheme"> - <a-menu-item v-if="index>0" @click="setFirstOutbound(index)"> + <a-menu-item v-if="index>0" + @click="setFirstOutbound(index)"> <a-icon type="vertical-align-top"></a-icon> <span>{{ i18n "pages.xray.rules.first"}}</span> </a-menu-item> @@ -56,21 +64,64 @@ </a-dropdown> </template> <template slot="address" slot-scope="text, outbound, index"> - <p :style="{ margin: '0 5px' }" v-for="addr in findOutboundAddress(outbound)">[[ addr ]]</p> + <p :style="{ margin: '0 5px' }" + v-for="addr in findOutboundAddress(outbound)">[[ addr ]]</p> </template> <template slot="protocol" slot-scope="text, outbound, index"> - <a-tag :style="{ margin: '0' }" color="purple">[[ outbound.protocol ]]</a-tag> + <a-tag :style="{ margin: '0' }" color="purple">[[ outbound.protocol + ]]</a-tag> <template v-if="[Protocols.VMess, Protocols.VLESS, Protocols.Trojan, Protocols.Shadowsocks].includes(outbound.protocol)"> - <a-tag :style="{ margin: '0' }" color="blue">[[ outbound.streamSettings.network ]]</a-tag> - <a-tag :style="{ margin: '0' }" v-if="outbound.streamSettings.security=='tls'" color="green">tls</a-tag> - <a-tag :style="{ margin: '0' }" v-if="outbound.streamSettings.security=='reality'" + <a-tag :style="{ margin: '0' }" color="blue">[[ + outbound.streamSettings.network ]]</a-tag> + <a-tag :style="{ margin: '0' }" + v-if="outbound.streamSettings.security=='tls'" + color="green">tls</a-tag> + <a-tag :style="{ margin: '0' }" + v-if="outbound.streamSettings.security=='reality'" color="green">reality</a-tag> </template> </template> <template slot="traffic" slot-scope="text, outbound, index"> <a-tag color="green">[[ findOutboundTraffic(outbound) ]]</a-tag> </template> + <template slot="test" slot-scope="text, outbound, index"> + <a-tooltip> + <template slot="title">{{ i18n "pages.xray.outbound.test" + }}</template> + <a-button + type="primary" + shape="circle" + icon="thunderbolt" + :loading="outboundTestStates[index] && outboundTestStates[index].testing" + @click="testOutbound(index)" + :disabled="(outbound.protocol === 'blackhole' || outbound.tag === 'blocked') || (outboundTestStates[index] && outboundTestStates[index].testing)"> + </a-button> + </a-tooltip> + </template> + <template slot="testResult" slot-scope="text, outbound, index"> + <div + v-if="outboundTestStates[index] && outboundTestStates[index].result"> + <a-tag v-if="outboundTestStates[index].result.success" + color="green"> + [[ outboundTestStates[index].result.delay ]]ms + <span v-if="outboundTestStates[index].result.statusCode"> + ([[ outboundTestStates[index].result.statusCode + ]])</span> + </a-tag> + <a-tooltip v-else + :title="outboundTestStates[index].result.error"> + <a-tag color="red"> + Failed + </a-tag> + </a-tooltip> + </div> + <span + v-else-if="outboundTestStates[index] && outboundTestStates[index].testing"> + <a-icon type="loading" /> + </span> + <span v-else>-</span> + </template> </a-table> </a-space> {{end}}
\ No newline at end of file diff --git a/web/html/xray.html b/web/html/xray.html index 186156ff..a350ee57 100644 --- a/web/html/xray.html +++ b/web/html/xray.html @@ -1,7 +1,10 @@ {{ template "page/head_start" .}} -<link rel="stylesheet" href="{{ .base_path }}assets/codemirror/codemirror.min.css?{{ .cur_ver }}"> -<link rel="stylesheet" href="{{ .base_path }}assets/codemirror/fold/foldgutter.css"> -<link rel="stylesheet" href="{{ .base_path }}assets/codemirror/xq.min.css?{{ .cur_ver }}"> +<link rel="stylesheet" + href="{{ .base_path }}assets/codemirror/codemirror.min.css?{{ .cur_ver }}"> +<link rel="stylesheet" + href="{{ .base_path }}assets/codemirror/fold/foldgutter.css"> +<link rel="stylesheet" + href="{{ .base_path }}assets/codemirror/xq.min.css?{{ .cur_ver }}"> <link rel="stylesheet" href="{{ .base_path }}assets/codemirror/lint/lint.css"> {{ template "page/head_end" .}} @@ -10,10 +13,13 @@ <a-sidebar></a-sidebar> <a-layout id="content-layout"> <a-layout-content> - <a-spin :spinning="loadingStates.spinning" :delay="500" tip='{{ i18n "loading"}}'> + <a-spin :spinning="loadingStates.spinning" :delay="500" + tip='{{ i18n "loading"}}'> <transition name="list" appear> - <a-alert type="error" v-if="showAlert && loadingStates.fetched" :style="{ marginBottom: '10px' }" - message='{{ i18n "secAlertTitle" }}' color="red" description='{{ i18n "secAlertSsl" }}' show-icon closable> + <a-alert type="error" v-if="showAlert && loadingStates.fetched" + :style="{ marginBottom: '10px' }" + message='{{ i18n "secAlertTitle" }}' color="red" + description='{{ i18n "secAlertSsl" }}' show-icon closable> </a-alert> </transition> <transition name="list" appear> @@ -26,19 +32,25 @@ <a-row :gutter="[isMobile ? 8 : 16, isMobile ? 0 : 12]" v-else> <a-col> <a-card hoverable> - <a-row :style="{ display: 'flex', flexWrap: 'wrap', alignItems: 'center' }"> + <a-row + :style="{ display: 'flex', flexWrap: 'wrap', alignItems: 'center' }"> <a-col :xs="24" :sm="10" :style="{ padding: '4px' }"> <a-space direction="horizontal"> - <a-button type="primary" :disabled="saveBtnDisable" @click="updateXraySetting"> + <a-button type="primary" :disabled="saveBtnDisable" + @click="updateXraySetting"> {{ i18n "pages.xray.save" }} </a-button> - <a-button type="danger" :disabled="!saveBtnDisable" @click="restartXray"> + <a-button type="danger" :disabled="!saveBtnDisable" + @click="restartXray"> {{ i18n "pages.xray.restart" }} </a-button> - <a-popover v-if="restartResult" :overlay-class-name="themeSwitcher.currentTheme"> - <span slot="title">{{ i18n "pages.index.xrayErrorPopoverTitle" }}</span> + <a-popover v-if="restartResult" + :overlay-class-name="themeSwitcher.currentTheme"> + <span slot="title">{{ i18n + "pages.index.xrayErrorPopoverTitle" }}</span> <template slot="content"> - <span :style="{ maxWidth: '400px' }" v-for="line in restartResult.split('\n')">[[ line + <span :style="{ maxWidth: '400px' }" + v-for="line in restartResult.split('\n')">[[ line ]]</span> </template> <a-icon type="question-circle"></a-icon> @@ -48,10 +60,13 @@ <a-col :xs="24" :sm="14"> <template> <div> - <a-back-top :target="() => document.getElementById('content-layout')" + <a-back-top + :target="() => document.getElementById('content-layout')" visibility-height="200"></a-back-top> - <a-alert type="warning" :style="{ float: 'right', width: 'fit-content' }" - message='{{ i18n "pages.settings.infoDesc" }}' show-icon> + <a-alert type="warning" + :style="{ float: 'right', width: 'fit-content' }" + message='{{ i18n "pages.settings.infoDesc" }}' + show-icon> </a-alert> </div> </template> @@ -60,7 +75,8 @@ </a-card> </a-col> <a-col> - <a-tabs default-active-key="tpl-basic" @change="(activeKey) => { this.changePage(activeKey); }" + <a-tabs default-active-key="tpl-basic" + @change="(activeKey) => { this.changePage(activeKey); }" :class="themeSwitcher.currentTheme"> <a-tab-pane key="tpl-basic" :style="{ paddingTop: '20px' }"> <template #tab> @@ -83,21 +99,24 @@ </template> {{ template "settings/xray/outbounds" . }} </a-tab-pane> - <a-tab-pane key="tpl-reverse" :style="{ paddingTop: '20px' }" force-render="true"> + <a-tab-pane key="tpl-reverse" :style="{ paddingTop: '20px' }" + force-render="true"> <template #tab> <a-icon type="import"></a-icon> <span>{{ i18n "pages.xray.outbound.reverse"}}</span> </template> {{ template "settings/xray/reverse" . }} </a-tab-pane> - <a-tab-pane key="tpl-balancer" :style="{ paddingTop: '20px' }" force-render="true"> + <a-tab-pane key="tpl-balancer" :style="{ paddingTop: '20px' }" + force-render="true"> <template #tab> <a-icon type="cluster"></a-icon> <span>{{ i18n "pages.xray.Balancers"}}</span> </template> {{ template "settings/xray/balancers" . }} </a-tab-pane> - <a-tab-pane key="tpl-dns" :style="{ paddingTop: '20px' }" force-render="true"> + <a-tab-pane key="tpl-dns" :style="{ paddingTop: '20px' }" + force-render="true"> <template #tab> <a-icon type="database"></a-icon> <span>DNS</span> @@ -120,14 +139,18 @@ </a-layout> </a-layout> {{template "page/body_scripts" .}} -<script src="{{ .base_path }}assets/js/model/outbound.js?{{ .cur_ver }}"></script> -<script src="{{ .base_path }}assets/codemirror/codemirror.min.js?{{ .cur_ver }}"></script> +<script + src="{{ .base_path }}assets/js/model/outbound.js?{{ .cur_ver }}"></script> +<script + src="{{ .base_path }}assets/codemirror/codemirror.min.js?{{ .cur_ver }}"></script> <script src="{{ .base_path }}assets/codemirror/javascript.js"></script> <script src="{{ .base_path }}assets/codemirror/jshint.js"></script> <script src="{{ .base_path }}assets/codemirror/jsonlint.js"></script> <script src="{{ .base_path }}assets/codemirror/lint/lint.js"></script> -<script src="{{ .base_path }}assets/codemirror/lint/javascript-lint.js"></script> -<script src="{{ .base_path }}assets/codemirror/hint/javascript-hint.js"></script> +<script + src="{{ .base_path }}assets/codemirror/lint/javascript-lint.js"></script> +<script + src="{{ .base_path }}assets/codemirror/hint/javascript-hint.js"></script> <script src="{{ .base_path }}assets/codemirror/fold/foldcode.js"></script> <script src="{{ .base_path }}assets/codemirror/fold/foldgutter.js"></script> <script src="{{ .base_path }}assets/codemirror/fold/brace-fold.js"></script> @@ -181,11 +204,13 @@ ]; const outboundColumns = [ - { title: "#", align: 'center', width: 20, scopedSlots: { customRender: 'action' } }, + { title: "#", align: 'center', width: 60, scopedSlots: { customRender: 'action' } }, { title: '{{ i18n "pages.xray.outbound.tag"}}', dataIndex: 'tag', align: 'center', width: 50 }, { title: '{{ i18n "protocol"}}', align: 'center', width: 50, scopedSlots: { customRender: 'protocol' } }, { title: '{{ i18n "pages.xray.outbound.address"}}', align: 'center', width: 50, scopedSlots: { customRender: 'address' } }, { title: '{{ i18n "pages.inbounds.traffic" }}', align: 'center', width: 50, scopedSlots: { customRender: 'traffic' } }, + { title: '{{ i18n "pages.xray.outbound.testResult" }}', align: 'center', width: 120, scopedSlots: { customRender: 'testResult' } }, + { title: '{{ i18n "pages.xray.outbound.test" }}', align: 'center', width: 60, scopedSlots: { customRender: 'test' } }, ]; const reverseColumns = [ @@ -228,8 +253,11 @@ }, oldXraySetting: '', xraySetting: '', + outboundTestUrl: 'https://www.google.com/generate_204', + oldOutboundTestUrl: 'https://www.google.com/generate_204', inboundTags: [], outboundsTraffic: [], + outboundTestStates: {}, // Track testing state and results for each outbound saveBtnDisable: true, refreshing: false, restartResult: '', @@ -337,14 +365,14 @@ }, defaultObservatory: { subjectSelector: [], - probeURL: "http://www.google.com/gen_204", + probeURL: "https://www.google.com/generate_204", probeInterval: "10m", enableConcurrency: true }, defaultBurstObservatory: { subjectSelector: [], pingConfig: { - destination: "http://www.google.com/gen_204", + destination: "https://www.google.com/generate_204", interval: "30m", connectivity: "http://connectivitycheck.platform.hicloud.com/generate_204", timeout: "10s", @@ -375,12 +403,17 @@ this.oldXraySetting = xs; this.xraySetting = xs; this.inboundTags = result.inboundTags; + this.outboundTestUrl = result.outboundTestUrl || 'https://www.google.com/generate_204'; + this.oldOutboundTestUrl = this.outboundTestUrl; this.saveBtnDisable = true; } }, async updateXraySetting() { this.loading(true); - const msg = await HttpUtil.post("/panel/xray/update", { xraySetting: this.xraySetting }); + const msg = await HttpUtil.post("/panel/xray/update", { + xraySetting: this.xraySetting, + outboundTestUrl: this.outboundTestUrl || 'https://www.google.com/generate_204' + }); this.loading(false); if (msg.success) { await this.getXraySetting(); @@ -595,6 +628,73 @@ outbounds.splice(0, 0, outbounds.splice(index, 1)[0]); this.outboundSettings = JSON.stringify(outbounds); }, + async testOutbound(index) { + const outbound = this.templateSettings.outbounds[index]; + if (!outbound) { + Vue.prototype.$message.error('{{ i18n "pages.xray.outbound.testError" }}'); + return; + } + + if (outbound.protocol === 'blackhole' || outbound.tag === 'blocked') { + Vue.prototype.$message.warning('{{ i18n "pages.xray.outbound.testError" }}: blocked/blackhole outbound'); + return; + } + + // Initialize test state for this outbound if not exists + if (!this.outboundTestStates[index]) { + this.$set(this.outboundTestStates, index, { + testing: false, + result: null + }); + } + contacts: admin@thfree.ru |
