feat(ios): parse websocket url from bundle url

ios/sdk/base/HippyBatchedBridge.mm

@@ -488,13 +488,15 @@ - (void)setUpDevClientWithName:(NSString *)name {
                 devInfo.ipAddress = [url host];
                 devInfo.port = [NSString stringWithFormat:@"%@", [url port]];
                 devInfo.versionId = [HippyBundleURLProvider parseVersionId:[url path]];
+                [devInfo parseWsURLWithURLQuery:[url query]];
             }
             else {
                 HippyBundleURLProvider *bundleURLProvider = [HippyBundleURLProvider sharedInstance];
                 devInfo.scheme = bundleURLProvider.scheme;
                 devInfo.ipAddress = bundleURLProvider.localhostIP;
                 devInfo.port = bundleURLProvider.localhostPort;
                 devInfo.versionId = bundleURLProvider.versionId;
+                devInfo.wsURL = bundleURLProvider.wsURL;
             }
             _devManager = [[HippyDevManager alloc] initWithBridge:self.parentBridge devInfo:devInfo contextName:name];
         }

ios/sdk/base/HippyBundleURLProvider.h

@@ -29,6 +29,7 @@
 @property (nonatomic, copy, readonly) NSString *debugPathUrl;
 @property (nonatomic, copy, readonly) NSString *versionId;
 @property (nonatomic, copy, readonly) NSString *scheme;
+@property (nonatomic, copy, readonly) NSString *wsURL;
 
 /**
  * @return instancetype

ios/sdk/base/HippyBundleURLProvider.m

@@ -32,6 +32,7 @@ @interface HippyBundleURLProvider ()
 @property (nonatomic, copy) NSString *debugPathUrl;
 @property (nonatomic, copy) NSString *versionId;
 @property (nonatomic, copy) NSString *scheme;
+@property (nonatomic, copy) NSString *wsURL;
 
 @end
 
@@ -69,6 +70,8 @@ - (instancetype)init {
         _localhostIP = @"localhost";
         _localhostPort = @"38989";
         self.debugPathUrl = @"/index.bundle?platform=ios&dev=true&minify=false";
+        // websocket url after url encode
+        //_wsURL = @"debugURL=wss%3A%2F%2Fdevtools.hippy.myqcloud.com%3A443%2Fdebugger-proxy";
     }
     return self;
 }
@@ -103,7 +106,11 @@ - (NSString *)localhost {
 
 - (NSString *)bundleURLString {
     NSString *scheme = _scheme.length > 0 ? _scheme : HippyBundleURLSchemeHttp;
-    return [NSString stringWithFormat:@"%@://%@%@", scheme, self.localhost, self.debugPathUrl];
+    NSString *debugPath = _debugPathUrl;
+    if (_wsURL.length > 0) {
+        debugPath = [NSString stringWithFormat:@"%@&%@", debugPath, _wsURL];
+    }
+    return [NSString stringWithFormat:@"%@://%@%@", scheme, self.localhost, debugPath];
 }
 
 @end

ios/sdk/debug/devtools/HippyDevInfo.h

@@ -1,10 +1,24 @@
-//
-//  HippyDevInfo.h
-//  HippyDemo
-//
-//  Created by  nolantang on 2022/1/12.
-//  Copyright © 2022 tencent. All rights reserved.
-//
+/*!
+ * iOS SDK
+ *
+ * Tencent is pleased to support the open source community by making
+ * Hippy available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company.
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #import <Foundation/Foundation.h>
 
@@ -14,7 +28,10 @@
 @property (nonatomic, copy) NSString *ipAddress;
 @property (nonatomic, copy) NSString *port;
 @property (nonatomic, copy) NSString *versionId;
+@property (nonatomic, copy) NSString *wsURL;
 
 - (void)setScheme:(NSString *)scheme;
 
+- (void)parseWsURLWithURLQuery:(NSString *)query;
+
 @end

ios/sdk/debug/devtools/HippyDevInfo.m

@@ -1,15 +1,30 @@
-//
-//  HippyDevInfo.m
-//  HippyDemo
-//
-//  Created by  nolantang on 2022/1/12.
-//  Copyright © 2022 tencent. All rights reserved.
-//
+/*!
+ * iOS SDK
+ *
+ * Tencent is pleased to support the open source community by making
+ * Hippy available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company.
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #import "HippyDevInfo.h"
 
 NSString *const HippyDevWebSocketSchemeWs = @"ws";
 NSString *const HippyDevWebSocketSchemeWss = @"wss";
+NSString *const HippyDevWebSocketInfoDebugURL = @"debugURL=";
 
 @implementation HippyDevInfo
 
@@ -20,4 +35,30 @@ - (void)setScheme:(NSString *)scheme {
     }
 }
 
+- (void)parseWsURLWithURLQuery:(NSString *)query {
+    if (query.length <= 0) {
+        return;
+    }
+    NSArray<NSString *> *queryItems = [query componentsSeparatedByString:@"&"];
+    if (queryItems.count <= 0) {
+        return;
+    }
+    NSString *debugWsURL = @"";
+    for (NSString *item in queryItems) {
+        if ([item hasPrefix:HippyDevWebSocketInfoDebugURL]) {
+            debugWsURL = [item stringByRemovingPercentEncoding];
+            break;
+        }
+
+    }
+    if (debugWsURL.length <= 0) {
+        return;
+    }
+    NSRange range = [debugWsURL rangeOfString:HippyDevWebSocketInfoDebugURL];
+    if (range.location + range.length > debugWsURL.length) {
+        return;
+    }
+    _wsURL = [debugWsURL substringFromIndex:range.location + range.length];
+}
+
 @end

ios/sdk/debug/devtools/HippyDevWebSocketClient.m

@@ -87,7 +87,12 @@ - (instancetype)initWithDevInfo:(HippyDevInfo *)devInfo contextName:(NSString *)
         NSString *encodeName = [contextName stringByAddingPercentEncodingWithAllowedCharacters:allowedChar];
         NSString *deviceName = [[UIDevice currentDevice] name];
         NSString *encodedDeviceName = [deviceName stringByAddingPercentEncodingWithAllowedCharacters:allowedChar];
-        NSString *devAddress = [NSString stringWithFormat:@"%@://%@:%@/debugger-proxy?clientId=%@&platform=1&role=ios_client&contextName=%@&deviceName=%@", devInfo.scheme, devInfo.ipAddress, devInfo.port?:@"38989", uuid, encodeName, encodedDeviceName];
+        NSString *addressPrefix = [NSString stringWithFormat:@"%@://%@:%@/debugger-proxy", devInfo.scheme, devInfo.ipAddress, devInfo.port?:@"38989"];
+        if (devInfo.wsURL.length > 0) {
+            // wsURL has a high priority
+            addressPrefix = devInfo.wsURL;
+        }
+        NSString *devAddress = [NSString stringWithFormat:@"%@?clientId=%@&platform=1&role=ios_client&contextName=%@&deviceName=%@", addressPrefix, uuid, encodeName, encodedDeviceName];
         if (devInfo.versionId.length > 0) {
             devAddress = [NSString stringWithFormat:@"%@&hash=%@", devAddress, devInfo.versionId];
         }

ios/sdk/debug/devtools/inspector/model/HippyCSSPropsDefine.m

@@ -1,10 +1,24 @@
-//
-//  HippyCSSPropsDefine.m
-//  HippyDemo
-//
-//  Created by  nolantang on 2021/10/27.
-//  Copyright © 2021 tencent. All rights reserved.
-//
+/*!
+ * iOS SDK
+ *
+ * Tencent is pleased to support the open source community by making
+ * Hippy available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company.
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #import "HippyCSSPropsDefine.h"