From c59aea914c316c3597dd6e5842081d35bb305a4e Mon Sep 17 00:00:00 2001
From: root <wyx2685@gmail.com>
Date: Mon, 21 Aug 2023 13:36:55 +0900
Subject: [PATCH] =?UTF-8?q?=E4=B8=BAvless=E5=88=86=E4=BA=AB=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5grpc=E7=9A=84serviceName=E5=AD=97=E6=AE=B5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=AC=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Protocols/General.php      | 2 +-
 app/Protocols/Passwall.php     | 2 +-
 app/Protocols/SSRPlus.php      | 2 +-
 app/Protocols/SagerNet.php     | 2 +-
 app/Protocols/Shadowrocket.php | 2 +-
 app/Protocols/V2rayN.php       | 2 +-
 app/Protocols/V2rayNG.php      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Protocols/General.php b/app/Protocols/General.php
index 6bee5426..d864f9d7 100644
--- a/app/Protocols/General.php
+++ b/app/Protocols/General.php
@@ -173,7 +173,7 @@ class General
         }
         if ((string)$server['network'] === 'grpc') {
             $grpcSettings = $server['network_settings'];
-            if (isset($grpcSettings['serviceName'])) $config['serviceName'] = $grpcSettings['serviceName'];
+            if (isset($grpcSettings['serviceName'])) $config['serviceName'] = Helper::encodeURIComponent($grpcSettings['serviceName']);
             if (isset($grpcSettings['multiMode'])) $config['mode'] = $grpcSettings['multiMode'] ? "multi" : "gun";
             $output .= "&serviceName={$config['serviceName']}" . "&mode={$config['mode']}";
         }
diff --git a/app/Protocols/Passwall.php b/app/Protocols/Passwall.php
index c4942d28..2faa81a1 100644
--- a/app/Protocols/Passwall.php
+++ b/app/Protocols/Passwall.php
@@ -162,7 +162,7 @@ class Passwall
         }
         if ((string)$server['network'] === 'grpc') {
             $grpcSettings = $server['network_settings'];
-            if (isset($grpcSettings['serviceName'])) $config['serviceName'] = $grpcSettings['serviceName'];
+            if (isset($grpcSettings['serviceName'])) $config['serviceName'] = Helper::encodeURIComponent($grpcSettings['serviceName']);
             if (isset($grpcSettings['multiMode'])) $config['mode'] = $grpcSettings['multiMode'] ? "multi" : "gun";
             $output .= "&serviceName={$config['serviceName']}" . "&mode={$config['mode']}";
         }
diff --git a/app/Protocols/SSRPlus.php b/app/Protocols/SSRPlus.php
index 5cca08c1..9003be18 100644
--- a/app/Protocols/SSRPlus.php
+++ b/app/Protocols/SSRPlus.php
@@ -156,7 +156,7 @@ class SSRPlus
         }
         if ((string)$server['network'] === 'grpc') {
             $grpcSettings = $server['network_settings'];
-            if (isset($grpcSettings['serviceName'])) $config['serviceName'] = $grpcSettings['serviceName'];
+            if (isset($grpcSettings['serviceName'])) $config['serviceName'] = Helper::encodeURIComponent($grpcSettings['serviceName']);
             if (isset($grpcSettings['multiMode'])) $config['mode'] = $grpcSettings['multiMode'] ? "multi" : "gun";
             $output .= "&serviceName={$config['serviceName']}" . "&mode={$config['mode']}";
         }
diff --git a/app/Protocols/SagerNet.php b/app/Protocols/SagerNet.php
index 0c3b7779..7f743414 100644
--- a/app/Protocols/SagerNet.php
+++ b/app/Protocols/SagerNet.php
@@ -168,7 +168,7 @@ class SagerNet
         }
         if ((string)$server['network'] === 'grpc') {
             $grpcSettings = $server['network_settings'];
-            if (isset($grpcSettings['serviceName'])) $config['serviceName'] = $grpcSettings['serviceName'];
+            if (isset($grpcSettings['serviceName'])) $config['serviceName'] = Helper::encodeURIComponent($grpcSettings['serviceName']);
             if (isset($grpcSettings['multiMode'])) $config['mode'] = $grpcSettings['multiMode'] ? "multi" : "gun";
             $output .= "&serviceName={$config['serviceName']}" . "&mode={$config['mode']}";
         }
diff --git a/app/Protocols/Shadowrocket.php b/app/Protocols/Shadowrocket.php
index bfe73907..2062f16f 100644
--- a/app/Protocols/Shadowrocket.php
+++ b/app/Protocols/Shadowrocket.php
@@ -196,7 +196,7 @@ class Shadowrocket
         }
         if ((string)$server['network'] === 'grpc') {
             $grpcSettings = $server['network_settings'];
-            if (isset($grpcSettings['serviceName'])) $config['serviceName'] = $grpcSettings['serviceName'];
+            if (isset($grpcSettings['serviceName'])) $config['serviceName'] = Helper::encodeURIComponent($grpcSettings['serviceName']);
             if (isset($grpcSettings['multiMode'])) $config['mode'] = $grpcSettings['multiMode'] ? "multi" : "gun";
             $output .= "&serviceName={$config['serviceName']}" . "&mode={$config['mode']}";
         }
diff --git a/app/Protocols/V2rayN.php b/app/Protocols/V2rayN.php
index 30abc2d5..1ed77193 100644
--- a/app/Protocols/V2rayN.php
+++ b/app/Protocols/V2rayN.php
@@ -173,7 +173,7 @@ class V2rayN
         }
         if ((string)$server['network'] === 'grpc') {
             $grpcSettings = $server['network_settings'];
-            if (isset($grpcSettings['serviceName'])) $config['serviceName'] = $grpcSettings['serviceName'];
+            if (isset($grpcSettings['serviceName'])) $config['serviceName'] = Helper::encodeURIComponent($grpcSettings['serviceName']);
             if (isset($grpcSettings['multiMode'])) $config['mode'] = $grpcSettings['multiMode'] ? "multi" : "gun";
             $output .= "&serviceName={$config['serviceName']}" . "&mode={$config['mode']}";
         }
diff --git a/app/Protocols/V2rayNG.php b/app/Protocols/V2rayNG.php
index baf8aaaa..aeebd1a5 100644
--- a/app/Protocols/V2rayNG.php
+++ b/app/Protocols/V2rayNG.php
@@ -162,7 +162,7 @@ class V2rayNG
         }
         if ((string)$server['network'] === 'grpc') {
             $grpcSettings = $server['network_settings'];
-            if (isset($grpcSettings['serviceName'])) $config['serviceName'] = $grpcSettings['serviceName'];
+            if (isset($grpcSettings['serviceName'])) $config['serviceName'] = Helper::encodeURIComponent($grpcSettings['serviceName']);
             if (isset($grpcSettings['multiMode'])) $config['mode'] = $grpcSettings['multiMode'] ? "multi" : "gun";
             $output .= "&serviceName={$config['serviceName']}" . "&mode={$config['mode']}";
         }