Browse Source

update: latest Clash vmess-ws configuration style

DesperadoJ 3 years ago
parent
commit
546e53ed2e

+ 5 - 4
app/Http/Controllers/Client/Protocols/Clash.php

@@ -115,18 +115,19 @@ class Clash
             $array['network'] = 'ws';
             if ($server['networkSettings']) {
                 $wsSettings = $server['networkSettings'];
+                $array['ws-opts'] = [];
                 if (isset($wsSettings['path']) && !empty($wsSettings['path']))
-                    $array['ws-path'] = $wsSettings['path'];
+                    $array['ws-opts']['path'] = $wsSettings['path'];
                 if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
-                    $array['ws-headers'] = ['Host' => $wsSettings['headers']['Host']];
+                    $array['ws-opts']['headers'] = ['Host' => $wsSettings['headers']['Host']];
             }
         }
         if ($server['network'] === 'grpc') {
             $array['network'] = 'grpc';
             if ($server['networkSettings']) {
-                $grpcObject = $server['networkSettings'];
+                $grpcSettings = $server['networkSettings'];
                 $array['grpc-opts'] = [];
-                $array['grpc-opts']['grpc-service-name'] = $grpcObject['serviceName'];
+                $array['grpc-opts']['grpc-service-name'] = $grpcSettings['serviceName'];
             }
         }
 

+ 5 - 4
app/Http/Controllers/Client/Protocols/Stash.php

@@ -116,18 +116,19 @@ class Stash
             $array['network'] = 'ws';
             if ($server['networkSettings']) {
                 $wsSettings = $server['networkSettings'];
+                $array['ws-opts'] = [];
                 if (isset($wsSettings['path']) && !empty($wsSettings['path']))
-                    $array['ws-path'] = $wsSettings['path'];
+                    $array['ws-opts']['path'] = $wsSettings['path'];
                 if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
-                    $array['ws-headers'] = ['Host' => $wsSettings['headers']['Host']];
+                    $array['ws-opts']['headers'] = ['Host' => $wsSettings['headers']['Host']];
             }
         }
         if ($server['network'] === 'grpc') {
             $array['network'] = 'grpc';
             if ($server['networkSettings']) {
-                $grpcObject = $server['networkSettings'];
+                $grpcSettings = $server['networkSettings'];
                 $array['grpc-opts'] = [];
-                $array['grpc-opts']['grpc-service-name'] = $grpcObject['serviceName'];
+                $array['grpc-opts']['grpc-service-name'] = $grpcSettings['serviceName'];
             }
         }