Merge branch 'cedar2025:dev' into dev

.github/workflows/docker-publish.yml

@@ -32,6 +32,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+      - uses: satackey/action-docker-layer-caching@v0.0.11
+        continue-on-error: true
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3

app/Protocols/Shadowrocket.php

@@ -58,7 +58,11 @@ class Shadowrocket
             ['-', '_', ''],
             base64_encode("{$server['cipher']}:{$password}")
         );
-        return "ss://{$str}@{$server['host']}:{$server['port']}#{$name}\r\n";
+        $uri = "ss://{$str}@{$server['host']}:{$server['port']}";
+        if ($server['obfs'] == 'http') {
+            $uri .= "?plugin=obfs-local;obfs=http;obfs-host={$server['obfs-host']};obfs-uri={$server['obfs-path']}";
+        }
+        return $uri."#{$name}\r\n";
     }
 
     public static function buildVmess($uuid, $server)
@@ -283,4 +287,4 @@ class Shadowrocket
         }
         return $uri;
     }
-}
+}

app/Protocols/V2rayNG.php

@@ -46,7 +46,11 @@ class V2rayNG
             ['-', '_', ''],
             base64_encode("{$server['cipher']}:{$password}")
         );
-        return "ss://{$str}@{$server['host']}:{$server['port']}#{$name}\r\n";
+        $uri = "ss://{$str}@{$server['host']}:{$server['port']}";
+        if ($server['obfs'] == 'http') {
+            $uri .= "?plugin=obfs-local;obfs=http;obfs-host={$server['obfs-host']};path={$server['obfs-path']}";
+        }
+        return $uri."#{$name}\r\n";
     }
 
     public static function buildVmess($uuid, $server)

app/Services/ServerService.php

@@ -161,6 +161,11 @@ class ServerService
                 $userKey = Helper::uuidToBase64($user['uuid'], $config['userKeySize']);
                 $shadowsocks[$key]['password'] = "{$serverKey}:{$userKey}";
             }
+            if ($v['obfs'] === 'http') {
+                $shadowsocks[$key]['obfs'] = 'http';
+                $shadowsocks[$key]['obfs-host'] = $v['obfs_settings']['host'];
+                $shadowsocks[$key]['obfs-path'] = $v['obfs_settings']['path'];
+            }
             $servers[] = $shadowsocks[$key]->toArray();
         }
         return $servers;