feat(ios): add clientId and fix empty port (#1737)

* feat(ios): devtools modify debugURL key * feat(ios): add clientId and fix empty port Co-authored-by: luomy <mengyanluo@tencent.com>
Tencent · Apr 27, 2022 · aea12a3 · aea12a3
1 parent 5654164
commit aea12a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ios/sdk/base/executors/HippyJSCExecutor.mm b/ios/sdk/base/executors/HippyJSCExecutor.mm
@@ -217,6 +217,10 @@ static unicode_string_view NSStringToU8(NSString* str) {
                     [deviceInfo addEntriesFromDictionary:customObjects];
                 }
             }
+            NSString *deviceName = [[UIDevice currentDevice] name];
+            NSString *clientId = HippyMD5Hash([NSString stringWithFormat:@"%@%p", deviceName, strongSelf.bridge]);
+            NSDictionary *debugInfo = @{@"Debug" : @{@"debugClientId" : clientId}};
+            [deviceInfo addEntriesFromDictionary:debugInfo];
             NSError *JSONSerializationError = nil;
             NSData *data = [NSJSONSerialization dataWithJSONObject:deviceInfo options:0 error:&JSONSerializationError];
             if (JSONSerializationError) {

diff --git a/ios/sdk/debug/devtools/HippyDevWebSocketClient.m b/ios/sdk/debug/devtools/HippyDevWebSocketClient.m
@@ -101,7 +101,11 @@ - (instancetype)initWithDevInfo:(HippyDevInfo *)devInfo contextName:(NSString *)
         NSString *encodeName = [contextName stringByAddingPercentEncodingWithAllowedCharacters:allowedChar];
         NSString *deviceName = [[UIDevice currentDevice] name];
         NSString *encodedDeviceName = [deviceName stringByAddingPercentEncodingWithAllowedCharacters:allowedChar];
-        NSString *addressPrefix = [NSString stringWithFormat:@"%@://%@:%@/debugger-proxy", devInfo.scheme, devInfo.ipAddress, devInfo.port?:@"38989"];
+        NSString *port = devInfo.port;
+        if (port.length <= 0) {
+            port = [devInfo.scheme isEqualToString:@"wss"] ? @"443": @"80";
+        }
+        NSString *addressPrefix = [NSString stringWithFormat:@"%@://%@:%@/debugger-proxy", devInfo.scheme, devInfo.ipAddress, port];
         if (devInfo.wsURL.length > 0) {
             // wsURL has a high priority
             addressPrefix = devInfo.wsURL;