Gozargah · 4erdenko · Nov 28, 2025 · Nov 28, 2025 · Nov 28, 2025
diff --git a/.dockerignore b/.dockerignore
@@ -17,4 +17,4 @@ db.sqlite3-journal
 docker-compose*.yml
 v2ray-core
 venv
-xray-core
+xray-core
diff --git a/app/dashboard/README.md b/app/dashboard/README.md
@@ -38,3 +38,13 @@ Copy `example.env` to `.env` then set the backend api address:
 ## Contribution
 
 Feel free to contribute. Go on and fork the project. After commiting the changes, make a PR. It means a lot to us.
+### Локальная сборка фронта с собственным API-префиксом
+
+```bash
+cd app/dashboard
+VITE_BASE_API=/api/ npm ci
+VITE_BASE_API=/api/ npm run build -- --outDir build --assetsDir statics
+cp build/index.html build/404.html
+```
+
+Где `VITE_BASE_API` — базовый префикс для всех API‑запросов фронта (в продакшене `/api/`).
diff --git a/app/dashboard/build/404.html b/app/dashboard/build/404.html
@@ -34,8 +34,8 @@
     <meta name="msapplication-TileColor" content="#2b5797" />
     <meta name="msapplication-config" content="/statics/favicon/browserconfig.xml" />
     <meta name="theme-color" content="#3B81F6" />
-    <script type="module" crossorigin src="/statics/index.8d48a3d3.js"></script>
-    <link rel="modulepreload" crossorigin href="/statics/vendor.3f3f0bc0.js">
+    <script type="module" crossorigin src="/statics/index.4535663a.js"></script>
+    <link rel="modulepreload" crossorigin href="/statics/vendor.e36f197f.js">
     <link rel="stylesheet" href="/statics/index.9b97897c.css">
   </head>
   <body>

diff --git a/app/dashboard/build/index.html b/app/dashboard/build/index.html
@@ -34,8 +34,8 @@
     <meta name="msapplication-TileColor" content="#2b5797" />
     <meta name="msapplication-config" content="/statics/favicon/browserconfig.xml" />
     <meta name="theme-color" content="#3B81F6" />
-    <script type="module" crossorigin src="/statics/index.8d48a3d3.js"></script>
-    <link rel="modulepreload" crossorigin href="/statics/vendor.3f3f0bc0.js">
+    <script type="module" crossorigin src="/statics/index.4535663a.js"></script>
+    <link rel="modulepreload" crossorigin href="/statics/vendor.e36f197f.js">
     <link rel="stylesheet" href="/statics/index.9b97897c.css">
   </head>
   <body>

diff --git a/...board/build/statics/add_file.2cd9a851.svg → ...board/build/statics/add_file.4f1404b6.svg b/...board/build/statics/add_file.2cd9a851.svg → ...board/build/statics/add_file.4f1404b6.svg
diff --git a/app/dashboard/build/statics/index.4535663a.js b/app/dashboard/build/statics/index.4535663a.js
diff --git a/app/dashboard/build/statics/index.8d48a3d3.js b/app/dashboard/build/statics/index.8d48a3d3.js
diff --git a/app/dashboard/build/statics/locales/en.json b/app/dashboard/build/statics/locales/en.json
@@ -37,6 +37,7 @@
   "hostsDialog.addHost": "Add host",
   "hostsDialog.advancedOptions": "Advanced options",
   "hostsDialog.allowinsecure": "Allow Insecure",
+  "hostsDialog.useSniAsHost": "Use sni as host",
   "hostsDialog.alpn": "ALPN",
   "hostsDialog.apply": "Apply",
   "hostsDialog.currentServer": "IP Address of current server",

diff --git a/app/dashboard/build/statics/locales/fa.json b/app/dashboard/build/statics/locales/fa.json
@@ -42,6 +42,7 @@
   "hostsDialog.addHost": "افزودن هاست",
   "hostsDialog.advancedOptions": "تنظیمات پیشرفته",
   "hostsDialog.allowinsecure": "Allow Insecure",
+  "hostsDialog.useSniAsHost": "استفاده از sni به عنوان هاست",
   "hostsDialog.alpn": "ALPN",
   "hostsDialog.apply": "اعمال",
   "hostsDialog.currentServer": "IP کنونی سرور",

diff --git a/app/dashboard/build/statics/locales/ru.json b/app/dashboard/build/statics/locales/ru.json
@@ -37,6 +37,7 @@
   "hostsDialog.addHost": "Добавить хост",
   "hostsDialog.advancedOptions": "Дополнительные опции",
   "hostsDialog.allowinsecure": "Allow Insecure",
+  "hostsDialog.useSniAsHost": "Use sni as host",
   "hostsDialog.alpn": "ALPN",
   "hostsDialog.apply": "Применить",
   "hostsDialog.currentServer": "IP текущего сервера",
@@ -188,4 +189,4 @@
   "usersTable.noUserMatched": "Похоже, нет пользователя, соответствующего вашему запросу",
   "usersTable.status": "Статус",
   "usersTable.total": "Всего"
-}
+}
diff --git a/app/dashboard/build/statics/locales/zh.json b/app/dashboard/build/statics/locales/zh.json
@@ -37,6 +37,7 @@
   "hostsDialog.addHost": "添加主机",
   "hostsDialog.advancedOptions": "高级选项",
   "hostsDialog.allowinsecure": "允许不安全连接",
+  "hostsDialog.useSniAsHost": "Use sni as host",
   "hostsDialog.alpn": "ALPN",
   "hostsDialog.apply": "保存",
   "hostsDialog.currentServer": "当前服务器的 IP 地址",
@@ -188,5 +189,5 @@
   "usersTable.noUserMatched": "没有找到您搜索的用户",
   "usersTable.status": "状态",
   "usersTable.sortByExpire": "按过期时间排序",
-  "usersTable.total": "总共",
-}
+  "usersTable.total": "总共"
+}
diff --git a/...dashboard/build/statics/logo.2507bd68.svg → ...dashboard/build/statics/logo.3890828c.svg b/...dashboard/build/statics/logo.2507bd68.svg → ...dashboard/build/statics/logo.3890828c.svg
diff --git a/...ashboard/build/statics/vendor.3f3f0bc0.js → ...ashboard/build/statics/vendor.e36f197f.js b/...ashboard/build/statics/vendor.3f3f0bc0.js → ...ashboard/build/statics/vendor.e36f197f.js
diff --git a/app/dashboard/src/components/RadioGroup.tsx b/app/dashboard/src/components/RadioGroup.tsx
@@ -27,7 +27,14 @@ import {
   useDashboard,
 } from "contexts/DashboardContext";
 import { t } from "i18next";
-import { FC, forwardRef, PropsWithChildren, useState } from "react";
+import {
+  FC,
+  forwardRef,
+  PropsWithChildren,
+  useEffect,
+  useMemo,
+  useState,
+} from "react";
 import {
   ControllerRenderProps,
   useFormContext,
@@ -136,6 +143,7 @@ const RadioCard: FC<
       description: string;
       toggleAccordion: () => void;
       isSelected: boolean;
+      ss2022Method?: string | null;
     }
   >
 > = ({
@@ -144,6 +152,7 @@ const RadioCard: FC<
   description,
   toggleAccordion,
   isSelected,
+  ss2022Method,
   ...props
 }) => {
   const form = useFormContext();
@@ -437,11 +446,13 @@ const RadioCard: FC<
                   fontSize="xs"
                   size="sm"
                   borderRadius="6px"
+                  isDisabled={Boolean(ss2022Method)}
                   {...form.register("proxies.shadowsocks.method")}
                 >
                   {shadowsocksMethods.map((method) => (
                     <option key={method} value={method}>
                       {method}
+                      {ss2022Method && method === ss2022Method ? " (inbound)" : ""}
                     </option>
                   ))}
                 </Select>
@@ -467,6 +478,23 @@ export type RadioGroupProps = ControllerRenderProps & {
 export const RadioGroup = forwardRef<any, RadioGroupProps>(
   ({ name, list, onChange, disabled, ...props }, ref) => {
     const form = useFormContext();
+    const ssInbounds =
+      useDashboard.getState().inbounds.get("shadowsocks") || [];
+    const ss2022Method = useMemo(() => {
+      const methods = ssInbounds
+        .map((i) => i.method)
+        .filter((m): m is string => Boolean(m));
+      if (methods.length && methods.every((m) => m.startsWith("2022-"))) {
+        return methods[0];
+      }
+      return null;
+    }, [ssInbounds]);
+
+    useEffect(() => {
+      if (ss2022Method) {
+        form.setValue("proxies.shadowsocks.method", ss2022Method);
+      }
+    }, [form, ss2022Method]);
     const [expandedAccordions, setExpandedAccordions] = useState<number[]>([]);
 
     const toggleAccordion = (i: number) => {
@@ -526,6 +554,7 @@ export const RadioGroup = forwardRef<any, RadioGroupProps>(
                 isSelected={
                   !!(props.value as string[]).find((v) => v === value.title)
                 }
+                ss2022Method={ss2022Method}
                 {...getCheckboxProps({ value: value.title })}
               />
             );

diff --git a/app/dashboard/src/constants/Proxies.tsx b/app/dashboard/src/constants/Proxies.tsx
@@ -72,6 +72,9 @@ export const XTLSFlows = [
 ];
 
 export const shadowsocksMethods = [
+  "2022-blake3-aes-256-gcm",
+  "2022-blake3-aes-128-gcm",
+  "2022-blake3-chacha20-poly1305",
   "aes-128-gcm",
   "aes-256-gcm",
   "chacha20-ietf-poly1305",

diff --git a/app/dashboard/src/contexts/DashboardContext.tsx b/app/dashboard/src/contexts/DashboardContext.tsx
@@ -25,7 +25,9 @@ export type InboundType = {
   protocol: ProtocolType;
   network: string;
   tls: string;
-  port?: number;
+  port?: number | string | null;
+  method?: string | null;
+  server_psk?: string | null;
 };
 export type Inbounds = Map<ProtocolType, InboundType[]>;
 

diff --git a/app/models/proxy.py b/app/models/proxy.py
@@ -1,12 +1,14 @@
+import base64
+import binascii
 import json
 import re
 from enum import Enum
 from typing import Optional, Union
 from uuid import UUID, uuid4
 
-from pydantic import BaseModel, ConfigDict, Field, field_validator
+from pydantic import BaseModel, ConfigDict, Field, ValidationInfo, field_validator
 
-from app.utils.system import random_password
+from app.utils.system import generate_ss2022_key, random_password
 from xray_api.types.account import (
     ShadowsocksAccount,
     ShadowsocksMethods,
@@ -94,6 +96,29 @@ class ShadowsocksSettings(ProxySettings):
     def revoke(self):
         self.password = random_password()
 
+    @field_validator("password", mode="after")
+    @classmethod
+    def ensure_ss2022_key(cls, v: str, info: ValidationInfo):
+        method = info.data.get("method")
+
+        if isinstance(method, ShadowsocksMethods):
+            method_value = method.value
+        else:
+            method_value = str(method) if method else ""
+
+        if not method_value.startswith("2022-"):
+            return v
+
+        expected_size = 16 if method_value.endswith("aes-128-gcm") else 32
+        try:
+            decoded = base64.b64decode(v or "", validate=True)
+            if len(decoded) == expected_size:
+                return v
+        except (binascii.Error, TypeError, ValueError):
+            pass
+
+        return generate_ss2022_key(method_value)
+
 
 class ProxyHostSecurity(str, Enum):
     inbound_default = "inbound_default"
@@ -204,4 +229,6 @@ class ProxyInbound(BaseModel):
     protocol: ProxyTypes
     network: str
     tls: str
-    port: Union[int, str]
+    port: Optional[Union[int, str]] = None
+    method: Optional[str] = None
+    server_psk: Optional[str] = None
diff --git a/app/subscription/clash.py b/app/subscription/clash.py
@@ -260,6 +260,9 @@ def add(self, remark: str, address: str, inbound: dict, settings: dict):
 
         proxy_remark = self._remark_validation(remark)
 
+        inbound_method = inbound.get("method") or inbound.get("settings", {}).get("method", "")
+        inbound_psk = inbound.get("server_psk") or inbound.get("settings", {}).get("password", "")
+
         node = self.make_node(
             name=remark,
             remark=proxy_remark,
@@ -288,8 +291,12 @@ def add(self, remark: str, address: str, inbound: dict, settings: dict):
             node['password'] = settings['password']
 
         elif inbound['protocol'] == 'shadowsocks':
-            node['password'] = settings['password']
-            node['cipher'] = settings['method']
+            if inbound_method.startswith("2022-"):
+                node['password'] = f"{inbound_psk}:{settings['password']}"
+                node['cipher'] = inbound_method
+            else:
+                node['password'] = settings['password']
+                node['cipher'] = settings['method']
 
         else:
             return
@@ -351,6 +358,9 @@ def add(self, remark: str, address: str, inbound: dict, settings: dict):
 
         proxy_remark = self._remark_validation(remark)
 
+        inbound_method = inbound.get("method") or inbound.get("settings", {}).get("method", "")
+        inbound_psk = inbound.get("server_psk") or inbound.get("settings", {}).get("password", "")
+
         node = self.make_node(
             name=remark,
             remark=proxy_remark,
@@ -388,8 +398,12 @@ def add(self, remark: str, address: str, inbound: dict, settings: dict):
             node['password'] = settings['password']
 
         elif inbound['protocol'] == 'shadowsocks':
-            node['password'] = settings['password']
-            node['cipher'] = settings['method']
+            if inbound_method.startswith("2022-"):
+                node['password'] = f"{inbound_psk}:{settings['password']}"
+                node['cipher'] = inbound_method
+            else:
+                node['password'] = settings['password']
+                node['cipher'] = settings['method']
 
         else:
             return

diff --git a/app/subscription/singbox.py b/app/subscription/singbox.py
@@ -287,6 +287,8 @@ def add(self, remark: str, address: str, inbound: dict, settings: dict):
 
         net = inbound["network"]
         path = inbound["path"]
+        inbound_method = inbound.get("method") or inbound.get("settings", {}).get("method", "")
+        inbound_psk = inbound.get("server_psk") or inbound.get("settings", {}).get("password", "")
 
         # not supported by sing-box
         if net in ("kcp", "splithttp", "xhttp") or (net == "quic" and inbound["header_type"] != "none"):
@@ -330,7 +332,11 @@ def add(self, remark: str, address: str, inbound: dict, settings: dict):
             outbound['password'] = settings['password']
 
         elif inbound['protocol'] == 'shadowsocks':
-            outbound['password'] = settings['password']
-            outbound['method'] = settings['method']
+            if inbound_method.startswith("2022-"):
+                outbound['password'] = f"{inbound_psk}:{settings['password']}"
+                outbound['method'] = inbound_method
+            else:
+                outbound['password'] = settings['password']
+                outbound['method'] = settings['method']
 
         self.add_outbound(outbound)
diff --git a/app/subscription/v2ray.py b/app/subscription/v2ray.py
@@ -148,12 +148,23 @@ def add(self, remark: str, address: str, inbound: dict, settings: dict):
             )
 
         elif inbound["protocol"] == "shadowsocks":
+            inbound_method = inbound.get("method") or inbound.get("settings", {}).get("method", "")
+            inbound_psk = inbound.get("server_psk") or inbound.get("settings", {}).get("password", "")
+
+            if inbound_method.startswith("2022-"):
+                user_key = settings.get("password", "")
+                password = f"{inbound_psk}:{user_key}"
+                method = inbound_method
+            else:
+                password = settings["password"]
+                method = settings["method"]
+
             link = self.shadowsocks(
                 remark=remark,
                 address=address,
                 port=inbound["port"],
-                password=settings["password"],
-                method=settings["method"],
+                password=password,
+                method=method,
             )
         else:
             return
@@ -998,6 +1009,8 @@ def add(self, remark: str, address: str, inbound: dict, settings: dict):
         noise = inbound['noise_setting']
         path = inbound["path"]
         multi_mode = inbound.get("multiMode", False)
+        inbound_method = inbound.get("method") or inbound.get("settings", {}).get("method", "")
+        inbound_psk = inbound.get("server_psk") or inbound.get("settings", {}).get("password", "")
 
         if net in ["grpc", "gun"]:
             if multi_mode:
@@ -1032,10 +1045,20 @@ def add(self, remark: str, address: str, inbound: dict, settings: dict):
                                                       password=settings['password'])
 
         elif inbound['protocol'] == 'shadowsocks':
-            outbound["settings"] = self.shadowsocks_config(address=address,
-                                                           port=port,
-                                                           password=settings['password'],
-                                                           method=settings['method'])
+            if inbound_method.startswith("2022-"):
+                outbound["settings"] = self.shadowsocks_config(
+                    address=address,
+                    port=port,
+                    password=f"{inbound_psk}:{settings['password']}",
+                    method=inbound_method,
+                )
+            else:
+                outbound["settings"] = self.shadowsocks_config(
+                    address=address,
+                    port=port,
+                    password=settings['password'],
+                    method=settings['method'],
+                )
 
         outbounds = [outbound]
         dialer_proxy = ''

diff --git a/app/utils/system.py b/app/utils/system.py
@@ -1,3 +1,4 @@
+import base64
 import ipaddress
 import math
 import secrets
@@ -97,6 +98,13 @@ def random_password() -> str:
     return secrets.token_urlsafe(16)
 
 
+def generate_ss2022_key(method: str = "2022-blake3-aes-256-gcm") -> str:
+    """Generate a base64-encoded PSK for Shadowsocks 2022."""
+
+    size = 16 if method.endswith("aes-128-gcm") else 32
+    return base64.b64encode(secrets.token_bytes(size)).decode()
+
+
 def check_port(port: int) -> bool:
     s = socket.socket()
     try: