From a4e1ba40168a72f8e2ad571e696370f19301549a Mon Sep 17 00:00:00 2001 From: tokumeikoi Date: Fri, 2 Jul 2021 21:57:00 +0900 Subject: [PATCH] fix: shadowrocket grpc --- app/Utils/Shadowrocket.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Utils/Shadowrocket.php b/app/Utils/Shadowrocket.php index bbf79974..493a5891 100644 --- a/app/Utils/Shadowrocket.php +++ b/app/Utils/Shadowrocket.php @@ -47,13 +47,13 @@ class Shadowrocket if ($server['network'] === 'grpc') { $config['obfs'] = "grpc"; if (isset($server['networkSettings'])) { - $grpcObject = json_decode($server['networkSettings'], true); - if (isset($grpcObject['serviceName'])) { - $config['obfsParam'] = json_encode([ - 'Host' => $grpcObject['serviceName'] - ]); - $config['path'] = '/'; - } + $grpcSettings = json_decode($server['networkSettings'], true); + if (isset($grpcSettings['serviceName']) && !empty($grpcSettings['serviceName'])) + $config['path'] = $grpcSettings['serviceName']; + if (isset($grpcSettings['host']) && !empty($grpcSettings['host'])) + $config['obfsParam'] = $grpcSettings['host']; + if (!isset($grpcSettings['host']) && !empty($tlsSettings['serverName'])) + $config['obfsParam'] = $tlsSettings['serverName']; } } $query = http_build_query($config, '', '&', PHP_QUERY_RFC3986);