feat: add support for hysteria2 in Passwall and SSRPLUS

cedar2025 · Nov 9, 2024 · e79465c · e79465c
1 parent ab52e61
commit e79465c
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 52 deletions.
diff --git a/app/Protocols/General.php b/app/Protocols/General.php
@@ -36,6 +36,9 @@ public function handle()
             if ($item['type'] === 'trojan') {
                 $uri .= self::buildTrojan($user['uuid'], $item);
             }
+            if ($item['type'] === 'hysteria') {
+                $uri .= self::buildHysteria($user['uuid'], $item);
+            }
         }
         return base64_encode($uri);
     }
@@ -170,4 +173,33 @@ public static function buildTrojan($password, $server)
         return $uri;
     }
 
+    public static function buildHysteria($password, $server)
+    {
+        $params = [];
+        // Return empty if version is not 2
+        if ($server['version'] !== 2) {
+            return '';
+        }
+
+        if ($server['server_name']) {
+            $params['sni'] = $server['server_name'];
+            $params['security'] = 'tls';
+        }
+
+        if ($server['is_obfs']) {
+            $params['obfs'] = 'salamander';
+            $params['obfs-password'] = $server['server_key'];
+        }
+
+        $params['insecure'] = $server['insecure'] ? 1 : 0;
+
+        $query = http_build_query($params);
+        $name = rawurlencode($server['name']);
+
+        $uri = "hysteria2://{$password}@{$server['host']}:{$server['port']}?{$query}#{$name}";
+        $uri .= "\r\n";
+
+        return $uri;
+    }
+
 }
diff --git a/app/Protocols/Passwall.php b/app/Protocols/Passwall.php
@@ -34,6 +34,9 @@ public function handle()
             if ($item['type'] === 'trojan') {
                 $uri .= self::buildTrojan($user['uuid'], $item);
             }
+            if ($item['type'] === 'hysteria') {
+                $uri .= General::buildHysteria($user['uuid'], $item);
+            }
         }
         return base64_encode($uri);
     }

diff --git a/app/Protocols/SSRPlus.php b/app/Protocols/SSRPlus.php
@@ -34,6 +34,9 @@ public function handle()
             if ($item['type'] === 'trojan') {
                 $uri .= self::buildTrojan($user['uuid'], $item);
             }
+            if ($item['type'] === 'hysteria') {
+                $uri .= General::buildHysteria($user['uuid'], $item);
+            }
         }
         return base64_encode($uri);
     }

diff --git a/app/Protocols/V2rayN.php b/app/Protocols/V2rayN.php
@@ -37,7 +37,7 @@ public function handle()
                 $uri .= self::buildTrojan($user['uuid'], $item);
             }
             if ($item['type'] === 'hysteria') {
-                $uri .= self::buildHysteria($user['uuid'], $item);
+                $uri .= General::buildHysteria($user['uuid'], $item);
             }
 
         }
@@ -192,25 +192,5 @@ public static function buildTrojan($password, $server)
         return $uri;
     }
 
-    public static function buildHysteria($password, $server)
-    {
-        $name = rawurlencode($server['name']);
-        $params = [];
-        if ($server['server_name']) $params['sni'] = $server['server_name'];
-        $params['insecure'] = $server['insecure'] ? 1 : 0;
-        if($server['is_obfs']) {
-            $params['obfs'] = 'salamander';
-            $params['obfs-password'] = $server['server_key'];
-        }
-        $query = http_build_query($params);
-        if ($server['version'] == 2) {
-            $uri = "hysteria2://{$password}@{$server['host']}:{$server['port']}?{$query}#{$name}";
-            $uri .= "\r\n";
-        } else {
-            // V2rayN似乎不支持v1, 返回空
-            $uri = "";
-        }
-        return $uri;
-    }
 
 }
diff --git a/app/Protocols/V2rayNG.php b/app/Protocols/V2rayNG.php
@@ -35,7 +35,7 @@ public function handle()
                 $uri .= self::buildVless($user['uuid'], $item);
             }
             if ($item['type'] === 'hysteria') {
-                $uri .= self::buildHysteria($user['uuid'], $item);
+                $uri .= General::buildHysteria($user['uuid'], $item);
             }
         }
         return base64_encode($uri);
@@ -193,34 +193,4 @@ public static function buildTrojan($password, $server)
         return $uri;
     }
 
-    public static function buildHysteria($password, $server)
-    {
-        $params = [];
-        // Return empty if version is not 2
-        if ($server['version'] !== 2) {
-            return '';
-        }
-
-        if ($server['server_name']) {
-            $params['sni'] = $server['server_name'];
-            $params['security'] = 'tls';
-        }
-
-        if ($server['is_obfs']) {
-            $params['obfs'] = 'salamander';
-            $params['obfs-password'] = $server['server_key'];
-        }
-
-        $params['insecure'] = $server['insecure'] ? 1 : 0;
-
-        $query = http_build_query($params);
-        $name = rawurlencode($server['name']);
-
-        $uri = "hysteria2://{$password}@{$server['host']}:{$server['port']}?{$query}#{$name}";
-        $uri .= "\r\n";
-
-        return $uri;
-    }
-
-
 }