[outbound] update wireguard

2026-03-14 05:23:09 +00:00 · 2024-01-08 20:23:34 +01:00
parent 94ac29ba7f
commit 4df056f6a2
8 changed files with 149 additions and 38 deletions
--- a/web/assets/js/model/outbound.js
+++ b/web/assets/js/model/outbound.js
@@ -47,18 +47,27 @@ const ALPN_OPTION = {
    HTTP1: "http/1.1",
 };

-const outboundDomainStrategies = [
+const OutboundDomainStrategies = [
    "AsIs",
    "UseIP",
    "UseIPv4",
    "UseIPv6"
-]
+];
+
+const WireguardDomainStrategy = [
+    "ForceIP",
+    "ForceIPv4",
+    "ForceIPv4v6",
+    "ForceIPv6",
+    "ForceIPv6v4"
+];

 Object.freeze(Protocols);
 Object.freeze(SSMethods);
 Object.freeze(TLS_FLOW_CONTROL);
 Object.freeze(ALPN_OPTION);
-Object.freeze(outboundDomainStrategies);
+Object.freeze(OutboundDomainStrategies);
+Object.freeze(WireguardDomainStrategy);

 class CommonClass {

@@ -901,42 +910,82 @@ Outbound.HttpSettings = class extends CommonClass {
        };
    }
 };
-Outbound.WireguardSettings = class extends CommonClass{
-    constructor(mtu=1420, secretKey='', address='', publicKey='', allowedIPs='0.0.0.0/0,::/0', endpoint='', keepAlive=0) {
+Outbound.WireguardSettings = class extends CommonClass {
+    constructor(
+            mtu=1420, secretKey='', address='', workers=2, domainStrategy='', reserved='',
+            peers=[new Outbound.WireguardSettings.Peer()], kernelMode=false) {
        super();
-        this.mtu = mtu,
-        this.secretKey = secretKey,
-        this.address = address,
-        this.publicKey = publicKey,
-        this.allowedIPs = allowedIPs,
-        this.endpoint = endpoint,
-        this.keepAlive = keepAlive
+        this.mtu = mtu;
+        this.secretKey = secretKey;
+        this.address = address instanceof Array ? address.join(',') : address;
+        this.workers = workers;
+        this.domainStrategy = domainStrategy;
+        this.reserved = reserved instanceof Array ? reserved.join(',') : reserved;
+        this.peers = peers;
+        this.kernelMode = kernelMode;
+    }
+
+    addPeer() {
+        this.peers.push(new Outbound.WireguardSettings.Peer());
+    }
+
+    delPeer(index) {
+        this.peers.splice(index, 1);
    }

    static fromJson(json={}){
-        const peers = json.peers
        return new Outbound.WireguardSettings(
            json.mtu,
            json.secretKey,
-            json.address.toString(),
-            peers[0].publicKey,
-            peers[0].allowedIPs.toString(),
-            peers[0].endpoint,
-            peers[0].keepAlive
+            json.address,
+            json.workers,
+            json.domainStrategy,
+            json.reserved,
+            json.peers.map(peer => Outbound.WireguardSettings.Peer.fromJson(peer)),
+            json.kernelMode,
        );
    }

    toJson() {
        return {
-            mtu: this.mtu,
+            mtu: this.mtu?? undefined,
            secretKey: this.secretKey,
            address: this.address ? this.address.split(",") : [],
-            peers: [{
-                publicKey:this.publicKey,
-                allowedIPs: this.allowedIPs ? this.allowedIPs.split(",") : [],
-                keepAlive: this.keepAlive,
-                endpoint: this.endpoint
-            }]
+            workers: this.workers?? undefined,
+            domainStrategy: WireguardDomainStrategy.includes(this.domainStrategy) ? this.domainStrategy : undefined,
+            reserved: this.reserved ? this.reserved.split(",") : undefined,
+            peers: Outbound.WireguardSettings.Peer.toJsonArray(this.peers),
+            kernelMode: this.kernelMode,
        };
    }
-};
+};
+Outbound.WireguardSettings.Peer = class extends CommonClass {
+    constructor(publicKey='', psk='', allowedIPs='0.0.0.0/0,::/0', endpoint='', keepAlive=0) {
+        super();
+        this.publicKey = publicKey;
+        this.psk = psk;
+        this.allowedIPs = allowedIPs instanceof Array ? allowedIPs.join(',') : allowedIPs;
+        this.endpoint = endpoint;
+        this.keepAlive = keepAlive;
+    }
+
+    static fromJson(json={}){
+        return new Outbound.WireguardSettings.Peer(
+            json.publicKey,
+            json.preSharedKey,
+            json.allowedIPs,
+            json.endpoint,
+            json.keepAlive
+        );
+    }
+
+    toJson() {
+        return {
+            publicKey: this.publicKey,
+            preSharedKey: this.psk.length>0 ? this.psk : undefined,
+            allowedIPs: this.allowedIPs ? this.allowedIPs.split(",") : [],
+            keepAlive: this.keepAlive?? undefined,
+            endpoint: this.endpoint
+        };
+    }
+}
--- a/web/html/xui/form/outbound.html
+++ b/web/html/xui/form/outbound.html
@@ -18,7 +18,7 @@
            <a-select
            v-model="outbound.settings.domainStrategy"
            :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select-option v-for="s in outboundDomainStrategies" :value="s">[[ s ]]</a-select-option>
+                <a-select-option v-for="s in OutboundDomainStrategies" :value="s">[[ s ]]</a-select-option>
            </a-select>
        </a-form-item>
        <a-form-item label='Fragment'>
@@ -71,24 +71,76 @@
    <a-form-item label='MTU'>
        <a-input-number v-model.number="outbound.settings.mtu"></a-input-number>
    </a-form-item>
-    <a-form-item label='{{ i18n "pages.xray.outbound.address" }}'>
+    <a-form-item>
+        <template slot="label">
+            <a-tooltip>
+                <template slot="title">
+                    <span>{{ i18n "pages.xray.rules.useComma" }}</span>
+                </template>
+                {{ i18n "pages.xray.outbound.address" }} <a-icon type="question-circle"></a-icon>
+            </a-tooltip>
+        </template>
        <a-input v-model.trim="outbound.settings.address"></a-input>
    </a-form-item>
    <a-form-item label='{{ i18n "pages.xray.outbound.secretKey" }}'>
        <a-input v-model.trim="outbound.settings.secretKey"></a-input>
    </a-form-item>
-    <a-form-item label='{{ i18n "pages.xray.outbound.publicKey" }}'>
-        <a-input v-model.trim="outbound.settings.publicKey"></a-input>
+    <a-form-item label='{{ i18n "pages.xray.outbound.domainStrategy" }}'>
+        <a-select v-model="outbound.settings.domainStrategy" :dropdown-class-name="themeSwitcher.currentTheme">
+            <a-select-option v-for="wds in ['', ...WireguardDomainStrategy]" :value="wds">[[ wds ]]</a-select-option>
+        </a-select>
    </a-form-item>
-    <a-form-item label='{{ i18n "pages.xray.outbound.allowedIPs" }}'>
-        <a-input v-model.trim="outbound.settings.allowedIPs"></a-input>
+    <a-form-item label='Workers'>
+        <a-input-number min="0" v-model.number="outbound.settings.workers"></a-input>
    </a-form-item>
-    <a-form-item label='keepAlive'>
-        <a-input-number v-model.number="outbound.settings.keepAlive" :min="0"></a-input>
+    <a-form-item label='Kernel Mode'>
+        <a-switch v-model="outbound.settings.kernelMode"></a-switch>
    </a-form-item>
-    <a-form-item label='{{ i18n "pages.xray.outbound.endpoint" }}'>
-        <a-input v-model.trim="outbound.settings.endpoint"></a-input>
+    <a-form-item>
+        <template slot="label">
+            <a-tooltip>
+                <template slot="title">
+                    <span>{{ i18n "pages.xray.rules.useComma" }}</span>
+                </template>
+                Reserved <a-icon type="question-circle"></a-icon>
+            </a-tooltip>
+        </template>
+        <a-input v-model="outbound.settings.reserved"></a-input>
    </a-form-item>
+    <a-form-item label="Peers">
+        <a-button type="primary" size="small" @click="outbound.settings.addPeer()">+</a-button>
+    </a-form-item>
+    <a-form v-for="(peer, index) in outbound.settings.peers" :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
+        <a-divider style="margin:0;">
+            Peer [[ index + 1 ]]
+            <a-icon v-if="outbound.settings.peers.length>1" type="delete" @click="() => outbound.settings.delPeer(index)"
+                    style="color: rgb(255, 77, 79);cursor: pointer;"/>
+        </a-divider>
+
+        <a-form-item label='{{ i18n "pages.xray.outbound.endpoint" }}'>
+            <a-input v-model.trim="peer.endpoint"></a-input>
+        </a-form-item>
+        <a-form-item label='{{ i18n "pages.xray.outbound.publicKey" }}'>
+            <a-input v-model.trim="peer.publicKey"></a-input>
+        </a-form-item>
+        <a-form-item label='{{ i18n "pages.xray.outbound.psk" }}'>
+            <a-input v-model.trim="peer.psk"></a-input>
+        </a-form-item>
+        <a-form-item>
+            <template slot="label">
+                <a-tooltip>
+                    <template slot="title">
+                        <span>{{ i18n "pages.xray.rules.useComma" }}</span>
+                    </template>
+                    {{ i18n "pages.xray.outbound.allowedIPs" }} <a-icon type="question-circle"></a-icon>
+                </a-tooltip>
+            </template>
+            <a-input v-model.trim="peer.allowedIPs"></a-input>
+        </a-form-item>
+        <a-form-item label='keepAlive'>
+            <a-input-number v-model.number="peer.keepAlive" :min="0"></a-input>
+        </a-form-item>    
+    </a-form>
 </template>

 <!-- Address + Port -->
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@@ -127,7 +127,7 @@
                                                    <a-select
                                                        v-model="freedomStrategy"
                                                        style="width: 100%" :dropdown-class-name="themeSwitcher.currentTheme">
-                                                        <a-select-option v-for="s in outboundDomainStrategies" :value="s">[[ s ]]</a-select-option>
+                                                        <a-select-option v-for="s in OutboundDomainStrategies" :value="s">[[ s ]]</a-select-option>
                                                    </a-select>
                                                </template>
                                            </a-col>
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -392,6 +392,8 @@
 "publicKey" = "Public Key"
 "allowedIPs" = "Allowed IPs"
 "endpoint" = "End Point"
+"psk" = "PreShared Key"
+"domainStrategy" = "Domain Strategy"

 [tgbot]
 "noResult" = "❗ No result!"
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -389,8 +389,10 @@
 "intercon" = "اتصال میانی"
 "secretKey" = "کلید شخصی"
 "publicKey" = "کلید عمومی"
-"allowedIPs" = "های مجاز IP"
+"allowedIPs" = "آی‌پی‌های مجاز"
 "endpoint" = "نقطه پایانی"
+"psk" = "کلید مشترک"
+"domainStrategy" = "استراتژی حل دامنه"

 [tgbot]
 "noResult" = "❗نتیجه‌ای یافت نشد"
--- a/web/translation/translate.ru_RU.toml
+++ b/web/translation/translate.ru_RU.toml
@@ -392,6 +392,8 @@
 "publicKey" = "Открытый ключ"
 "allowedIPs" = "Разрешенные IP-адреса"
 "endpoint" = "Конечная точка"
+"psk" = "Общий ключ"
+"domainStrategy" = "Стратегия домена"

 [tgbot]
 "noResult" = "❗ Нет результатов!"
--- a/web/translation/translate.vi_VN.toml
+++ b/web/translation/translate.vi_VN.toml
@@ -392,6 +392,8 @@
 "publicKey" = "Khóa công khai"
 "allowedIPs" = "IP được phép"
 "endpoint" = "Điểm cuối"
+"psk" = "Khóa chia sẻ"
+"domainStrategy" = "Chiến lược tên miền"

 [tgbot]
 "noResult" = "❗ Không có kết quả!"
--- a/web/translation/translate.zh_Hans.toml
+++ b/web/translation/translate.zh_Hans.toml
@@ -392,6 +392,8 @@
 "publicKey" = "公钥"
 "allowedIPs" = "允许的 IP"
 "endpoint" = "终点"
+"psk" = "共享密钥"
+"domainStrategy" = "域策略"

 [tgbot]
 "noResult" = "❗ 没有结果！"