Merge 769f3a8a4f into 31c5cf1c2b

app/Http/Controllers/V1/Admin/Server/VlessController.php

@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Models\ServerVless;
 use Illuminate\Http\Request;
 use ParagonIE_Sodium_Compat as SodiumCompat;
+use App\Utils\Helper;
 
 class VlessController extends Controller
 {
@@ -19,7 +20,7 @@ class VlessController extends Controller
             'host' => 'required',
             'port' => 'required',
             'server_port' => 'required',
-            'tls' => 'required|in:0,1',
+            'tls' => 'required|in:0,1,2',
             'tls_settings' => 'nullable|array',
             'flow' => 'nullable|in:xtls-rprx-vision',
             'network' => 'required',
@@ -30,13 +31,14 @@ class VlessController extends Controller
             'sort' => 'nullable'
         ]);
 
-        if (isset($params['tls_settings']) && (int)$params['tls_settings']['reality']) {
+        if (isset($params['tls']) && (int)$params['tls'] === 2) {
             $keyPair = SodiumCompat::crypto_box_keypair();
+            $params['tls_settings'] = $params['tls_settings'] ?? [];
             if (!isset($params['tls_settings']['public_key'])) {
-                $params['tls_settings']['public_key'] = base64_encode(SodiumCompat::crypto_box_publickey($keyPair));
+                $params['tls_settings']['public_key'] = Helper::base64EncodeUrlSafe(SodiumCompat::crypto_box_publickey($keyPair));
             }
             if (!isset($params['tls_settings']['private_key'])) {
-                $params['tls_settings']['private_key'] = base64_encode(SodiumCompat::crypto_box_secretkey($keyPair));
+                $params['tls_settings']['private_key'] = Helper::base64EncodeUrlSafe(SodiumCompat::crypto_box_secretkey($keyPair));
             }
         }
 

app/Http/Controllers/V1/Admin/StatController.php

@@ -8,6 +8,7 @@ use App\Models\Order;
 use App\Models\ServerShadowsocks;
 use App\Models\ServerTrojan;
 use App\Models\ServerVmess;
+use App\Models\ServerHysteria;
 use App\Models\Stat;
 use App\Models\StatServer;
 use App\Models\StatUser;
@@ -99,7 +100,8 @@ class StatController extends Controller
             'shadowsocks' => ServerShadowsocks::where('parent_id', null)->get()->toArray(),
             'v2ray' => ServerVmess::where('parent_id', null)->get()->toArray(),
             'trojan' => ServerTrojan::where('parent_id', null)->get()->toArray(),
-            'vmess' => ServerVmess::where('parent_id', null)->get()->toArray()
+            'vmess' => ServerVmess::where('parent_id', null)->get()->toArray(),
+            'hysteria' => ServerHysteria::where('parent_id', null)->get()->toArray()
         ];
         $startAt = strtotime('-1 day', strtotime(date('Y-m-d')));
         $endAt = strtotime(date('Y-m-d'));

app/Http/Controllers/V1/Server/UniProxyController.php

@@ -111,6 +111,16 @@ class UniProxyController extends Controller
                     'obfs' => Helper::getServerKey($this->nodeInfo->created_at, 16)
                 ];
                 break;
+            case "vless":
+                $response = [
+                    'server_port' => $this->nodeInfo->server_port,
+                    'network' => $this->nodeInfo->network,
+                    'network_settings' => $this->nodeInfo->network_settings,
+                    'tls' => $this->nodeInfo->tls,
+                    'flow' => $this->nodeInfo->flow,
+                    'tls_settings' => $this->nodeInfo->tls_settings
+                ];
+                break;
         }
         $response['base_config'] = [
             'push_interval' => (int)config('v2board.server_push_interval', 60),

app/Utils/Helper.php

@@ -120,4 +120,10 @@ class Helper
         $portRange = explode('-', $range);
         return rand($portRange[0], $portRange[1]);
     }
+
+    public static function base64EncodeUrlSafe($data)
+    {
+        $encoded = base64_encode($data);
+        return str_replace(['+', '/', '='], ['-', '_', ''], $encoded);
+    }
 }