From fadd17f4d1df5410180e7d6eb34104caf9307198 Mon Sep 17 00:00:00 2001
From: "web@ppanel" <web@ppanel.dev>
Date: Thu, 12 Dec 2024 22:45:34 +0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(node):=20Reality=20config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/app/dashboard/server/form-schema.ts |  2 +
 apps/admin/app/dashboard/server/node-form.tsx | 37 +++----------------
 apps/admin/locales/en-US/server.json          |  1 -
 apps/admin/locales/zh-CN/server.json          |  1 -
 4 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/apps/admin/app/dashboard/server/form-schema.ts b/apps/admin/app/dashboard/server/form-schema.ts
index 84603bc..6c43a19 100644
--- a/apps/admin/app/dashboard/server/form-schema.ts
+++ b/apps/admin/app/dashboard/server/form-schema.ts
@@ -12,6 +12,8 @@ const securityConfigSchema = z
     reality_private_key: nullableString,
     reality_public_key: nullableString,
     reality_short_id: nullableString,
+    reality_server_addr: nullableString,
+    reality_server_port: portSchema,
   })
   .nullish();
 
diff --git a/apps/admin/app/dashboard/server/node-form.tsx b/apps/admin/app/dashboard/server/node-form.tsx
index 9aaac5c..cf60d07 100644
--- a/apps/admin/app/dashboard/server/node-form.tsx
+++ b/apps/admin/app/dashboard/server/node-form.tsx
@@ -637,7 +637,7 @@ export default function NodeForm<T extends { [x: string]: any }>({
                           <>
                             <FormField
                               control={form.control}
-                              name='config.security_config.server_address'
+                              name='config.security_config.reality_server_addr'
                               render={({ field }) => (
                                 <FormItem>
                                   <FormLabel>{t('form.security_config.serverAddress')}</FormLabel>
@@ -658,7 +658,7 @@ export default function NodeForm<T extends { [x: string]: any }>({
                             />
                             <FormField
                               control={form.control}
-                              name='config.security_config.server_port'
+                              name='config.security_config.reality_server_port'
                               render={({ field }) => (
                                 <FormItem>
                                   <FormLabel>{t('form.security_config.serverPort')}</FormLabel>
@@ -678,34 +678,7 @@ export default function NodeForm<T extends { [x: string]: any }>({
                             />
                             <FormField
                               control={form.control}
-                              name='config.security_config.proxy_protocol'
-                              render={({ field }) => (
-                                <FormItem>
-                                  <FormLabel>{t('form.security_config.proxyProtocol')}</FormLabel>
-                                  <Select
-                                    value={field.value}
-                                    onValueChange={(value) => {
-                                      form.setValue(field.name, value);
-                                    }}
-                                  >
-                                    <FormControl>
-                                      <SelectTrigger>
-                                        <SelectValue placeholder={t('form.security')} />
-                                      </SelectTrigger>
-                                    </FormControl>
-                                    <SelectContent>
-                                      <SelectItem value='0'>0</SelectItem>
-                                      <SelectItem value='1'>1</SelectItem>
-                                      <SelectItem value='2'>2</SelectItem>
-                                    </SelectContent>
-                                  </Select>
-                                  <FormMessage />
-                                </FormItem>
-                              )}
-                            />
-                            <FormField
-                              control={form.control}
-                              name='config.security_config.private_key'
+                              name='config.security_config.reality_private_key'
                               render={({ field }) => (
                                 <FormItem>
                                   <FormLabel>{t('form.security_config.privateKey')}</FormLabel>
@@ -724,7 +697,7 @@ export default function NodeForm<T extends { [x: string]: any }>({
                             />
                             <FormField
                               control={form.control}
-                              name='config.security_config.public_key'
+                              name='config.security_config.reality_public_key'
                               render={({ field }) => (
                                 <FormItem>
                                   <FormLabel>{t('form.security_config.publicKey')}</FormLabel>
@@ -743,7 +716,7 @@ export default function NodeForm<T extends { [x: string]: any }>({
                             />
                             <FormField
                               control={form.control}
-                              name='config.security_config.short_id'
+                              name='config.security_config.reality_short_id'
                               render={({ field }) => (
                                 <FormItem>
                                   <FormLabel>{t('form.security_config.shortId')}</FormLabel>
diff --git a/apps/admin/locales/en-US/server.json b/apps/admin/locales/en-US/server.json
index 8317cb4..84bcc53 100644
--- a/apps/admin/locales/en-US/server.json
+++ b/apps/admin/locales/en-US/server.json
@@ -70,7 +70,6 @@
         "fingerprint": "Fingerprint",
         "privateKey": "Private Key",
         "privateKeyPlaceholder": "Leave blank for auto-generation",
-        "proxyProtocol": "Proxy Protocol",
         "publicKey": "Public Key",
         "publicKeyPlaceholder": "Leave blank for auto-generation",
         "serverAddress": "Server Address",
diff --git a/apps/admin/locales/zh-CN/server.json b/apps/admin/locales/zh-CN/server.json
index 709b11f..bb41e92 100644
--- a/apps/admin/locales/zh-CN/server.json
+++ b/apps/admin/locales/zh-CN/server.json
@@ -70,7 +70,6 @@
         "fingerprint": "FingerPrint",
         "privateKey": "Private Key",
         "privateKeyPlaceholder": "留空自动生成",
-        "proxyProtocol": "Proxy Protocol",
         "publicKey": "Public Key",
         "publicKeyPlaceholder": "留空自动生成",
         "serverAddress": "Server Address",