✨ feat(node): Add protocol

apps/admin/app/dashboard/server/form-schema.ts

@@ -0,0 +1,98 @@
+import { z } from '@shadcn/ui/lib/zod';
+
+export const protocols = ['shadowsocks', 'vmess', 'vless', 'trojan', 'hysteria2', 'tuic'];
+
+const nullableString = z.string().nullish();
+const portSchema = z.number().min(1).max(65535);
+const securityConfigSchema = z
+  .object({
+    sni: nullableString,
+    allow_insecure: z.boolean().nullable().default(false),
+    fingerprint: nullableString,
+    reality_private_key: nullableString,
+    reality_public_key: nullableString,
+    reality_short_id: nullableString,
+  })
+  .nullish();
+
+const transportConfigSchema = z
+  .object({
+    path: nullableString,
+    host: nullableString,
+    server_name: nullableString,
+  })
+  .nullish();
+
+const baseProtocolSchema = z.object({
+  port: portSchema,
+  transport: z.string(),
+  transport_config: transportConfigSchema,
+  security: z.string(),
+  security_config: securityConfigSchema,
+});
+
+const shadowsocksSchema = z.object({
+  method: z.string(),
+  port: portSchema,
+});
+
+const vmessSchema = baseProtocolSchema;
+
+const vlessSchema = baseProtocolSchema.extend({
+  flow: nullableString,
+});
+
+const trojanSchema = baseProtocolSchema;
+
+const hysteria2Schema = z.object({
+  port: portSchema,
+  hop_ports: nullableString,
+  hop_interval: z.number().nullish(),
+  obfs_password: nullableString,
+  security_config: securityConfigSchema,
+});
+
+const tuicSchema = z.object({
+  port: portSchema,
+  security_config: securityConfigSchema,
+});
+
+const protocolConfigSchema = z.discriminatedUnion('protocol', [
+  z.object({
+    protocol: z.literal('shadowsocks'),
+    config: shadowsocksSchema,
+  }),
+  z.object({
+    protocol: z.literal('vmess'),
+    config: vmessSchema,
+  }),
+  z.object({
+    protocol: z.literal('vless'),
+    config: vlessSchema,
+  }),
+  z.object({
+    protocol: z.literal('trojan'),
+    config: trojanSchema,
+  }),
+  z.object({
+    protocol: z.literal('hysteria2'),
+    config: hysteria2Schema,
+  }),
+  z.object({
+    protocol: z.literal('tuic'),
+    config: tuicSchema,
+  }),
+]);
+
+const baseFormSchema = z.object({
+  name: z.string(),
+  server_addr: z.string(),
+  speed_limit: z.number().nullish(),
+  traffic_ratio: z.number().default(1),
+  group_id: z.number().nullish(),
+  enable_relay: z.boolean().nullish().default(false),
+  relay_host: nullableString,
+  relay_port: z.number().nullish(),
+});
+
+export const formSchema = z.intersection(baseFormSchema, protocolConfigSchema);

apps/admin/app/dashboard/server/node-table.tsx

@@ -78,6 +78,8 @@ export default function NodeTable() {
                       'bg-rose-500': row.original.protocol === 'vmess',
                       'bg-blue-500': row.original.protocol === 'vless',
                       'bg-yellow-500': row.original.protocol === 'trojan',
+                      'bg-purple-500': row.original.protocol === 'hysteria2',
+                      'bg-cyan-500': row.original.protocol === 'tuic',
                     })}
                   >
                     {row.getValue('id')}

apps/admin/locales/en-US/server.json

@@ -41,8 +41,6 @@
     "editNode": "Edit Node",
     "enable": "Enable",
     "form": {
-      "Address or IP": "Address or IP",
-      "Host Name": "Host Name",
       "allowInsecure": "Allow Insecure",
       "cancel": "Cancel",
       "confirm": "Confirm",
@@ -50,19 +48,24 @@
       "editSecurity": "Edit Security Configuration",
       "enableRelay": "Enable Relay",
       "enableTLS": "Enable TLS",
-      "enableTls": "TLS",
       "encryptionMethod": "Encryption Method",
+      "flow": "Flow Control Algorithm",
+      "hopInterval": "Hop Interval",
+      "hopPorts": "Hop Ports",
+      "hopPortsPlaceholder": "Separate multiple ports with commas",
       "name": "Name",
-      "networkType": "Transport Protocol",
       "nodeGroupId": "Node Group ID",
-      "password": "Password",
+      "obfsPassword": "Obfuscation Password",
+      "obfsPasswordPlaceholder": "Leave blank for no obfuscation",
       "path": "Path",
+      "pleaseSelect": "Please Select",
       "port": "Server Port",
       "protocol": "Protocol",
       "relayHost": "Relay Host",
       "relayPort": "Relay Port",
       "remarks": "Remarks",
       "security": "Security",
+      "securityConfig": "Security Configuration",
       "security_config": {
         "fingerprint": "Fingerprint",
         "privateKey": "Private Key",
@@ -77,20 +80,22 @@
         "serverPort": "Server Port",
         "serverPortPlaceholder": "REALITY target port, default 443",
         "shortId": "Short ID",
-        "shortIdPlaceholder": "Leave blank for auto-generation"
+        "shortIdPlaceholder": "Leave blank for auto-generation",
+        "sni": "Server Name Indication (SNI)"
       },
       "selectEncryptionMethod": "Select Encryption Method",
       "selectNodeGroup": "Select Node Group",
       "selectProtocol": "Select Protocol",
       "serverAddr": "Server IP",
       "serverName": "Service Name",
-      "serviceName": "Service Name",
-      "sni": "Server Name Indication (SNI)",
       "speedLimit": "Speed Limit",
       "speedLimitPlaceholder": "Unlimited",
       "trafficRatio": "Traffic Rate",
       "transport": "Transport Protocol Configuration",
-      "xtls": "XTLS Flow Control Algorithm"
+      "transportConfig": "Transport Protocol Configuration",
+      "transportHost": "Transport Server Address",
+      "transportPath": "Transport Path",
+      "transportServerName": "Transport Server Name"
     },
     "name": "Name",
     "node": "Node",

apps/admin/locales/zh-CN/server.json

@@ -41,8 +41,6 @@
     "editNode": "编辑节点",
     "enable": "启用",
     "form": {
-      "Address or IP": "地址或IP",
-      "Host Name": "服务地址",
       "allowInsecure": "允许不安全",
       "cancel": "取消",
       "confirm": "确认",
@@ -50,19 +48,24 @@
       "editSecurity": "编辑安全性配置",
       "enableRelay": "启用中转",
       "enableTLS": "启用TLS",
-      "enableTls": "TLS",
       "encryptionMethod": "加密方法",
+      "flow": "流控算法",
+      "hopInterval": "中继间隔",
+      "hopPorts": "中继端口",
+      "hopPortsPlaceholder": "多个端口用逗号分隔",
       "name": "名称",
-      "networkType": "传输协议",
       "nodeGroupId": "节点组ID",
-      "password": "密码",
+      "obfsPassword": "混淆密码",
+      "obfsPasswordPlaceholder": "留空则不混淆",
       "path": "路径",
+      "pleaseSelect": "请选择",
       "port": "服务端口",
       "protocol": "协议",
       "relayHost": "中转地址",
       "relayPort": "中转端口",
       "remarks": "备注",
       "security": "安全性",
+      "securityConfig": "安全性配置",
       "security_config": {
         "fingerprint": "FingerPrint",
         "privateKey": "Private Key",
@@ -77,20 +80,22 @@
         "serverPort": "Server Port",
         "serverPortPlaceholder": "REALITY目标端口,默认443",
         "shortId": "ShortId",
-        "shortIdPlaceholder": "留空自动生成"
+        "shortIdPlaceholder": "留空自动生成",
+        "sni": "服务器名称指示(sni)"
       },
       "selectEncryptionMethod": "选择加密方法",
       "selectNodeGroup": "选择节点组",
       "selectProtocol": "选择协议",
       "serverAddr": "服务器IP",
       "serverName": "服务名称",
-      "serviceName": "服务名称",
-      "sni": "服务器名称指示(sni)",
       "speedLimit": "速度限制",
       "speedLimitPlaceholder": "无限制",
       "trafficRatio": "流量速率",
-      "transport": "传输协议配置",
+      "transport": "传输协议",
-      "xtls": "XTLS流控算法"
+      "transportConfig": "传输协议配置",
+      "transportHost": "传输服务地址",
+      "transportPath": "传输路径",
+      "transportServerName": "传输服务名称"
     },
     "name": "名称",
     "node": "节点",

apps/admin/services/admin/typings.d.ts

@@ -112,15 +112,15 @@ declare namespace API {
   type CreateNodeRequest = {
     name: string;
     server_addr: string;
+    enable_relay: boolean;
+    relay_host: string;
+    relay_port: number;
     speed_limit: number;
     traffic_ratio: number;
-    groupId: number;
+    group_id: number;
     protocol: string;
+    config: Record<string, any>;
     enable: boolean;
-    vmess?: Vmess;
-    vless?: Vless;
-    trojan?: Trojan;
-    shadowsocks?: Shadowsocks;
   };
 
   type CreateOrderRequest = {
@@ -467,6 +467,14 @@ declare namespace API {
     list: User[];
   };
 
+  type Hysteria2 = {
+    port: number;
+    hop_ports: string;
+    hop_interval: number;
+    obfs_password: string;
+    security_config: SecurityConfig;
+  };
+
   type InviteConfig = {
     forced_invite: boolean;
     referral_percentage: number;
@@ -559,29 +567,27 @@ declare namespace API {
   };
 
   type SecurityConfig = {
-    server_address?: string;
+    sni: string;
-    server_name?: string;
+    allow_insecure: boolean;
-    server_port?: number;
+    fingerprint: string;
-    fingerprint?: string;
+    reality_private_key: string;
-    private_key?: string;
+    reality_public_key: string;
-    public_key?: string;
+    reality_short_id: string;
-    short_id?: string;
-    allow_insecure?: boolean;
   };
 
   type Server = {
     id: number;
     name: string;
     server_addr: string;
+    enable_relay: boolean;
+    relay_host: string;
+    relay_port: number;
     speed_limit: number;
     traffic_ratio: number;
-    groupId: number;
+    group_id: number;
     protocol: string;
+    config: Record<string, any>;
     enable: boolean;
-    vmess?: Vmess;
-    vless?: Vless;
-    trojan?: Trojan;
-    shadowsocks?: Shadowsocks;
     created_at: number;
     updated_at: number;
     last: Push;
@@ -598,9 +604,7 @@ declare namespace API {
   type Shadowsocks = {
     method: string;
     port: number;
-    enable_relay: boolean;
+    server_key: string;
-    relay_host: string;
-    relay_port: number;
   };
 
   type SiteConfig = {
@@ -676,25 +680,27 @@ declare namespace API {
     updated_at: number;
   };
 
-  type TLSConfig = {
-    server_name?: string;
-    allow_insecure?: boolean;
-  };
-
   type TosConfig = {
     tos_content: string;
   };
 
-  type Trojan = {
+  type TransportConfig = {
-    network: string;
+    path: string;
-    port: number;
     host: string;
-    sni: string;
+    server_name: string;
-    allow_insecure: boolean;
+  };
-    transport: Record<string, any>;
+
-    enable_relay: boolean;
+  type Trojan = {
-    relay_host: string;
+    port: number;
-    relay_port: number;
+    transport: string;
+    transport_config: TransportConfig;
+    security: string;
+    security_config: SecurityConfig;
+  };
+
+  type Tuic = {
+    port: number;
+    security_config: SecurityConfig;
   };
 
   type UpdateAnnouncementEnableRequest = {
@@ -750,15 +756,15 @@ declare namespace API {
     id: number;
     name: string;
     server_addr: string;
+    enable_relay: boolean;
+    relay_host: string;
+    relay_port: number;
     speed_limit: number;
     traffic_ratio: number;
-    groupId: number;
+    group_id: number;
     protocol: string;
+    config: Record<string, any>;
     enable: boolean;
-    vmess?: Vmess;
-    vless?: Vless;
-    trojan?: Trojan;
-    shadowsocks?: Shadowsocks;
   };
 
   type UpdateOrderStatusRequest = {
@@ -884,27 +890,19 @@ declare namespace API {
   };
 
   type Vless = {
-    host: string;
     port: number;
-    network: string;
+    flow: string;
-    transport: Record<string, any>;
+    transport: string;
+    transport_config: TransportConfig;
     security: string;
     security_config: SecurityConfig;
-    xtls: string;
-    enable_relay: boolean;
-    relay_host: string;
-    relay_port: number;
   };
 
   type Vmess = {
-    host: string;
     port: number;
-    enable_tls: boolean;
+    transport: string;
-    tls_config: TLSConfig;
+    transport_config: TransportConfig;
-    network: string;
+    security: string;
-    transport: Record<string, any>;
+    security_config: SecurityConfig;
-    enable_relay: boolean;
-    relay_host: string;
-    relay_port: number;
   };
 }

apps/admin/services/common/typings.d.ts

@@ -115,6 +115,14 @@ declare namespace API {
     tos_content: string;
   };
 
+  type Hysteria2 = {
+    port: number;
+    hop_ports: string;
+    hop_interval: number;
+    obfs_password: string;
+    security_config: SecurityConfig;
+  };
+
   type InviteConfig = {
     forced_invite: boolean;
     referral_percentage: number;
@@ -218,14 +226,12 @@ declare namespace API {
   };
 
   type SecurityConfig = {
-    server_address?: string;
+    sni: string;
-    server_name?: string;
+    allow_insecure: boolean;
-    server_port?: number;
+    fingerprint: string;
-    fingerprint?: string;
+    reality_private_key: string;
-    private_key?: string;
+    reality_public_key: string;
-    public_key?: string;
+    reality_short_id: string;
-    short_id?: string;
-    allow_insecure?: boolean;
   };
 
   type SendCodeRequest = {
@@ -241,15 +247,15 @@ declare namespace API {
     id: number;
     name: string;
     server_addr: string;
+    enable_relay: boolean;
+    relay_host: string;
+    relay_port: number;
     speed_limit: number;
     traffic_ratio: number;
-    groupId: number;
+    group_id: number;
     protocol: string;
+    config: Record<string, any>;
     enable: boolean;
-    vmess?: Vmess;
-    vless?: Vless;
-    trojan?: Trojan;
-    shadowsocks?: Shadowsocks;
     created_at: number;
     updated_at: number;
     last: Push;
@@ -266,9 +272,7 @@ declare namespace API {
   type Shadowsocks = {
     method: string;
     port: number;
-    enable_relay: boolean;
+    server_key: string;
-    relay_host: string;
-    relay_port: number;
   };
 
   type SiteConfig = {
@@ -340,25 +344,27 @@ declare namespace API {
     updated_at: number;
   };
 
-  type TLSConfig = {
-    server_name?: string;
-    allow_insecure?: boolean;
-  };
-
   type TosConfig = {
     tos_content: string;
   };
 
-  type Trojan = {
+  type TransportConfig = {
-    network: string;
+    path: string;
-    port: number;
     host: string;
-    sni: string;
+    server_name: string;
-    allow_insecure: boolean;
+  };
-    transport: Record<string, any>;
+
-    enable_relay: boolean;
+  type Trojan = {
-    relay_host: string;
+    port: number;
-    relay_port: number;
+    transport: string;
+    transport_config: TransportConfig;
+    security: string;
+    security_config: SecurityConfig;
+  };
+
+  type Tuic = {
+    port: number;
+    security_config: SecurityConfig;
   };
 
   type User = {
@@ -448,27 +454,19 @@ declare namespace API {
   };
 
   type Vless = {
-    host: string;
     port: number;
-    network: string;
+    flow: string;
-    transport: Record<string, any>;
+    transport: string;
+    transport_config: TransportConfig;
     security: string;
     security_config: SecurityConfig;
-    xtls: string;
-    enable_relay: boolean;
-    relay_host: string;
-    relay_port: number;
   };
 
   type Vmess = {
-    host: string;
     port: number;
-    enable_tls: boolean;
+    transport: string;
-    tls_config: TLSConfig;
+    transport_config: TransportConfig;
-    network: string;
+    security: string;
-    transport: Record<string, any>;
+    security_config: SecurityConfig;
-    enable_relay: boolean;
-    relay_host: string;
-    relay_port: number;
   };
 }

apps/user/services/common/typings.d.ts

@@ -115,6 +115,14 @@ declare namespace API {
     tos_content: string;
   };
 
+  type Hysteria2 = {
+    port: number;
+    hop_ports: string;
+    hop_interval: number;
+    obfs_password: string;
+    security_config: SecurityConfig;
+  };
+
   type InviteConfig = {
     forced_invite: boolean;
     referral_percentage: number;
@@ -218,14 +226,12 @@ declare namespace API {
   };
 
   type SecurityConfig = {
-    server_address?: string;
+    sni: string;
-    server_name?: string;
+    allow_insecure: boolean;
-    server_port?: number;
+    fingerprint: string;
-    fingerprint?: string;
+    reality_private_key: string;
-    private_key?: string;
+    reality_public_key: string;
-    public_key?: string;
+    reality_short_id: string;
-    short_id?: string;
-    allow_insecure?: boolean;
   };
 
   type SendCodeRequest = {
@@ -241,15 +247,15 @@ declare namespace API {
     id: number;
     name: string;
     server_addr: string;
+    enable_relay: boolean;
+    relay_host: string;
+    relay_port: number;
     speed_limit: number;
     traffic_ratio: number;
-    groupId: number;
+    group_id: number;
     protocol: string;
+    config: Record<string, any>;
     enable: boolean;
-    vmess?: Vmess;
-    vless?: Vless;
-    trojan?: Trojan;
-    shadowsocks?: Shadowsocks;
     created_at: number;
     updated_at: number;
     last: Push;
@@ -266,9 +272,7 @@ declare namespace API {
   type Shadowsocks = {
     method: string;
     port: number;
-    enable_relay: boolean;
+    server_key: string;
-    relay_host: string;
-    relay_port: number;
   };
 
   type SiteConfig = {
@@ -340,25 +344,27 @@ declare namespace API {
     updated_at: number;
   };
 
-  type TLSConfig = {
-    server_name?: string;
-    allow_insecure?: boolean;
-  };
-
   type TosConfig = {
     tos_content: string;
   };
 
-  type Trojan = {
+  type TransportConfig = {
-    network: string;
+    path: string;
-    port: number;
     host: string;
-    sni: string;
+    server_name: string;
-    allow_insecure: boolean;
+  };
-    transport: Record<string, any>;
+
-    enable_relay: boolean;
+  type Trojan = {
-    relay_host: string;
+    port: number;
-    relay_port: number;
+    transport: string;
+    transport_config: TransportConfig;
+    security: string;
+    security_config: SecurityConfig;
+  };
+
+  type Tuic = {
+    port: number;
+    security_config: SecurityConfig;
   };
 
   type User = {
@@ -448,27 +454,19 @@ declare namespace API {
   };
 
   type Vless = {
-    host: string;
     port: number;
-    network: string;
+    flow: string;
-    transport: Record<string, any>;
+    transport: string;
+    transport_config: TransportConfig;
     security: string;
     security_config: SecurityConfig;
-    xtls: string;
-    enable_relay: boolean;
-    relay_host: string;
-    relay_port: number;
   };
 
   type Vmess = {
-    host: string;
     port: number;
-    enable_tls: boolean;
+    transport: string;
-    tls_config: TLSConfig;
+    transport_config: TransportConfig;
-    network: string;
+    security: string;
-    transport: Record<string, any>;
+    security_config: SecurityConfig;
-    enable_relay: boolean;
-    relay_host: string;
-    relay_port: number;
   };
 }

apps/user/services/user/typings.d.ts

@@ -136,6 +136,14 @@ declare namespace API {
     list: Ticket[];
   };
 
+  type Hysteria2 = {
+    port: number;
+    hop_ports: string;
+    hop_interval: number;
+    obfs_password: string;
+    security_config: SecurityConfig;
+  };
+
   type InviteConfig = {
     forced_invite: boolean;
     referral_percentage: number;
@@ -360,29 +368,27 @@ declare namespace API {
   };
 
   type SecurityConfig = {
-    server_address?: string;
+    sni: string;
-    server_name?: string;
+    allow_insecure: boolean;
-    server_port?: number;
+    fingerprint: string;
-    fingerprint?: string;
+    reality_private_key: string;
-    private_key?: string;
+    reality_public_key: string;
-    public_key?: string;
+    reality_short_id: string;
-    short_id?: string;
-    allow_insecure?: boolean;
   };
 
   type Server = {
     id: number;
     name: string;
     server_addr: string;
+    enable_relay: boolean;
+    relay_host: string;
+    relay_port: number;
     speed_limit: number;
     traffic_ratio: number;
-    groupId: number;
+    group_id: number;
     protocol: string;
+    config: Record<string, any>;
     enable: boolean;
-    vmess?: Vmess;
-    vless?: Vless;
-    trojan?: Trojan;
-    shadowsocks?: Shadowsocks;
     created_at: number;
     updated_at: number;
     last: Push;
@@ -399,9 +405,7 @@ declare namespace API {
   type Shadowsocks = {
     method: string;
     port: number;
-    enable_relay: boolean;
+    server_key: string;
-    relay_host: string;
-    relay_port: number;
   };
 
   type SiteConfig = {
@@ -479,25 +483,27 @@ declare namespace API {
     updated_at: number;
   };
 
-  type TLSConfig = {
-    server_name?: string;
-    allow_insecure?: boolean;
-  };
-
   type TosConfig = {
     tos_content: string;
   };
 
-  type Trojan = {
+  type TransportConfig = {
-    network: string;
+    path: string;
-    port: number;
     host: string;
-    sni: string;
+    server_name: string;
-    allow_insecure: boolean;
+  };
-    transport: Record<string, any>;
+
-    enable_relay: boolean;
+  type Trojan = {
-    relay_host: string;
+    port: number;
-    relay_port: number;
+    transport: string;
+    transport_config: TransportConfig;
+    security: string;
+    security_config: SecurityConfig;
+  };
+
+  type Tuic = {
+    port: number;
+    security_config: SecurityConfig;
   };
 
   type UpdateUserNotifyRequest = {
@@ -588,27 +594,19 @@ declare namespace API {
   };
 
   type Vless = {
-    host: string;
     port: number;
-    network: string;
+    flow: string;
-    transport: Record<string, any>;
+    transport: string;
+    transport_config: TransportConfig;
     security: string;
     security_config: SecurityConfig;
-    xtls: string;
-    enable_relay: boolean;
-    relay_host: string;
-    relay_port: number;
   };
 
   type Vmess = {
-    host: string;
     port: number;
-    enable_tls: boolean;
+    transport: string;
-    tls_config: TLSConfig;
+    transport_config: TransportConfig;
-    network: string;
+    security: string;
-    transport: Record<string, any>;
+    security_config: SecurityConfig;
-    enable_relay: boolean;
-    relay_host: string;
-    relay_port: number;
   };
 }