refactor(ios): add delegate method for remote debugging

update hippy demo
Tencent · Nov 4, 2024 · 6ac9a5d · 6ac9a5d
1 parent 6373ae5
commit 6ac9a5d
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 31 deletions.
diff --git a/framework/examples/ios-demo/HippyDemo.xcodeproj/project.pbxproj b/framework/examples/ios-demo/HippyDemo.xcodeproj/project.pbxproj
@@ -126,24 +126,12 @@
 		0632A691275B124491E38EA7 /* HippyDemo */ = {
 			isa = PBXGroup;
 			children = (
-				EF558AABDC113B410B8ED69C /* AppDelegate.h */,
-				6094F1F80FD70F9F9853EE15 /* AppDelegate.m */,
-				427F60D1B98DA953328F4E71 /* DemoBaseViewController.h */,
-				4708C41E8571123282E2B806 /* DemoBaseViewController.m */,
-				80D715362B1A0B0DCEAA813D /* DemoNavigationViewController.h */,
-				16348E2DEBFF10ADD6FCF7A9 /* DemoNavigationViewController.m */,
-				6045C301C6CFDC6C2E87AA66 /* IconUtils.h */,
-				17AB7FB6346FE861C9D953F5 /* IconUtils.m */,
 				177A9E8373F2682A9A831991 /* Info.plist */,
-				D2EE3455BE6DD7D2ADA20093 /* main.m */,
-				DDD052D2760E830B1E0095EA /* UIViewController+Title.h */,
-				C412B5D210F1E3359523628C /* UIViewController+Title.m */,
-				4CF6648308C60D57DD274D30 /* HomePage */,
-				DE44248AB3BFFAAE044EAB9E /* myview */,
-				73EF815F203E15B86205DFC3 /* PageManager */,
-				57D9249C5EA211061816F73B /* RenderPage */,
-				09FA8898DDD429EC19584446 /* SettingsPage */,
-				529ECDFF8342B9C9D950B1FA /* turbomodule */,
+				71EA01A72CD87C0500ED4D29 /* Others */,
+				DE44248AB3BFFAAE044EAB9E /* MyViewDemo */,
+				28C2DA6A96B596294158B364 /* HippyDemoViewController.h */,
+				9EB0CD5FCC3F38E3C7DC5E00 /* HippyDemoViewController.m */,
+				529ECDFF8342B9C9D950B1FA /* TurboModuleDemo */,
 			);
 			path = HippyDemo;
 			sourceTree = "<group>";
@@ -193,24 +181,36 @@
 			path = HomePage;
 			sourceTree = "<group>";
 		};
-		529ECDFF8342B9C9D950B1FA /* turbomodule */ = {
+		529ECDFF8342B9C9D950B1FA /* TurboModuleDemo */ = {
 			isa = PBXGroup;
 			children = (
 				C629FDE26F7B6DBC976FB63A /* TurboBaseModule.h */,
 				CC8AEAE8BF116954FB41BDF9 /* TurboBaseModule.mm */,
 				041D598BDAC3735B5A06ECE7 /* TurboConfig.h */,
 				46034630F6D4A25199673157 /* TurboConfig.m */,
 			);
-			path = turbomodule;
+			path = TurboModuleDemo;
 			sourceTree = "<group>";
 		};
-		57D9249C5EA211061816F73B /* RenderPage */ = {
+		71EA01A72CD87C0500ED4D29 /* Others */ = {
 			isa = PBXGroup;
 			children = (
-				28C2DA6A96B596294158B364 /* HippyDemoViewController.h */,
-				9EB0CD5FCC3F38E3C7DC5E00 /* HippyDemoViewController.m */,
+				D2EE3455BE6DD7D2ADA20093 /* main.m */,
+				EF558AABDC113B410B8ED69C /* AppDelegate.h */,
+				6094F1F80FD70F9F9853EE15 /* AppDelegate.m */,
+				09FA8898DDD429EC19584446 /* SettingsPage */,
+				73EF815F203E15B86205DFC3 /* PageManager */,
+				4CF6648308C60D57DD274D30 /* HomePage */,
+				6045C301C6CFDC6C2E87AA66 /* IconUtils.h */,
+				17AB7FB6346FE861C9D953F5 /* IconUtils.m */,
+				427F60D1B98DA953328F4E71 /* DemoBaseViewController.h */,
+				4708C41E8571123282E2B806 /* DemoBaseViewController.m */,
+				80D715362B1A0B0DCEAA813D /* DemoNavigationViewController.h */,
+				16348E2DEBFF10ADD6FCF7A9 /* DemoNavigationViewController.m */,
+				DDD052D2760E830B1E0095EA /* UIViewController+Title.h */,
+				C412B5D210F1E3359523628C /* UIViewController+Title.m */,
 			);
-			path = RenderPage;
+			name = Others;
 			sourceTree = "<group>";
 		};
 		73EF815F203E15B86205DFC3 /* PageManager */ = {
@@ -253,15 +253,15 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		DE44248AB3BFFAAE044EAB9E /* myview */ = {
+		DE44248AB3BFFAAE044EAB9E /* MyViewDemo */ = {
 			isa = PBXGroup;
 			children = (
 				16E50FF2E97E0CF6CD4B1EE1 /* MyView.h */,
 				90F34E176169143334EDFC28 /* MyView.m */,
 				73A859BDC9C3189E38FD082F /* MyViewManager.h */,
 				834EC46509EC221C787A9F23 /* MyViewManager.mm */,
 			);
-			path = myview;
+			path = MyViewDemo;
 			sourceTree = "<group>";
 		};
 		F3C07E1B41FBB8BA0834C6BC /* fonts */ = {

diff --git a/...Demo/RenderPage/HippyDemoViewController.h → ...-demo/HippyDemo/HippyDemoViewController.h b/...Demo/RenderPage/HippyDemoViewController.h → ...-demo/HippyDemo/HippyDemoViewController.h
diff --git a/...Demo/RenderPage/HippyDemoViewController.m → ...-demo/HippyDemo/HippyDemoViewController.m b/...Demo/RenderPage/HippyDemoViewController.m → ...-demo/HippyDemo/HippyDemoViewController.m
@@ -129,7 +129,7 @@ - (void)runHippyDemo {
                                                 delegate:self];
     }
 
-    // // Config whether jsc is inspectable, Highly recommended setting,
+    // Config whether jsc is inspectable, Highly recommended setting,
     // since inspectable of JSC is disabled by default since iOS 16.4
     [bridge setInspectable:YES];
     _hippyBridge = bridge;
@@ -203,6 +203,12 @@ - (BOOL)shouldStartInspector:(HippyBridge *)bridge {
     return bridge.debugMode;
 }
 
+- (NSURL *)inspectorSourceURLForBridge:(HippyBridge *)bridge {
+    // You can customize to any url.
+    // By default, we resolve the devtools address from the debug url passed to the bridge.
+    return bridge.debugURL;
+}
+
 
 #pragma mark - Optional - HippyMethodInterceptorProtocol
 

diff --git a/...amples/ios-demo/HippyDemo/myview/MyView.h → ...es/ios-demo/HippyDemo/MyViewDemo/MyView.h b/...amples/ios-demo/HippyDemo/myview/MyView.h → ...es/ios-demo/HippyDemo/MyViewDemo/MyView.h
diff --git a/...amples/ios-demo/HippyDemo/myview/MyView.m → ...es/ios-demo/HippyDemo/MyViewDemo/MyView.m b/...amples/ios-demo/HippyDemo/myview/MyView.m → ...es/ios-demo/HippyDemo/MyViewDemo/MyView.m
diff --git a/...ios-demo/HippyDemo/myview/MyViewManager.h → ...demo/HippyDemo/MyViewDemo/MyViewManager.h b/...ios-demo/HippyDemo/myview/MyViewManager.h → ...demo/HippyDemo/MyViewDemo/MyViewManager.h
diff --git a/...os-demo/HippyDemo/myview/MyViewManager.mm → ...emo/HippyDemo/MyViewDemo/MyViewManager.mm b/...os-demo/HippyDemo/myview/MyViewManager.mm → ...emo/HippyDemo/MyViewDemo/MyViewManager.mm
diff --git a/...o/HippyDemo/turbomodule/TurboBaseModule.h → ...ppyDemo/TurboModuleDemo/TurboBaseModule.h b/...o/HippyDemo/turbomodule/TurboBaseModule.h → ...ppyDemo/TurboModuleDemo/TurboBaseModule.h
diff --git a/.../HippyDemo/turbomodule/TurboBaseModule.mm → ...pyDemo/TurboModuleDemo/TurboBaseModule.mm b/.../HippyDemo/turbomodule/TurboBaseModule.mm → ...pyDemo/TurboModuleDemo/TurboBaseModule.mm
diff --git a/...-demo/HippyDemo/turbomodule/TurboConfig.h → ...o/HippyDemo/TurboModuleDemo/TurboConfig.h b/...-demo/HippyDemo/turbomodule/TurboConfig.h → ...o/HippyDemo/TurboModuleDemo/TurboConfig.h
diff --git a/...-demo/HippyDemo/turbomodule/TurboConfig.m → ...o/HippyDemo/TurboModuleDemo/TurboConfig.m b/...-demo/HippyDemo/turbomodule/TurboConfig.m → ...o/HippyDemo/TurboModuleDemo/TurboConfig.m
diff --git a/framework/ios/base/bridge/HippyBridge.h b/framework/ios/base/bridge/HippyBridge.h
@@ -388,8 +388,7 @@ HIPPY_EXTERN NSString *HippyBridgeModuleNameForClass(Class bridgeModuleClass);
 @property (nonatomic, assign) BOOL debugMode;
 
 /// Debug URL for devtools
-/// TODO: debugURL not working ?
-@property (nonatomic, strong, readonly) NSURL *debugURL;
+@property (nonatomic, strong, nullable, readonly) NSURL *debugURL;
 
 /// Sets whether the context is inspectable in Web Inspector.
 /// Default value is NO.

diff --git a/framework/ios/base/bridge/HippyBridge.mm b/framework/ios/base/bridge/HippyBridge.mm
@@ -231,6 +231,9 @@ - (instancetype)initWithDelegate:(id<HippyBridgeDelegate>)delegate
         _bundleURLs = [NSMutableArray array];
         _shareOptions = [NSMutableDictionary dictionary];
         _debugMode = [launchOptions[@"DebugMode"] boolValue];
+        if (_debugMode) {
+            _debugURL = bundleURL;
+        }
         _enableTurbo = !!launchOptions[@"EnableTurbo"] ? [launchOptions[@"EnableTurbo"] boolValue] : YES;
         _engineKey = executorKey.length > 0 ? executorKey : [NSString stringWithFormat:@"%p", self];
         HippyLogInfo(@"HippyBridge init begin, self:%p", self);

diff --git a/framework/ios/base/bridge/HippyBridgeDelegate.h b/framework/ios/base/bridge/HippyBridgeDelegate.h
@@ -54,6 +54,13 @@
  */
 - (BOOL)shouldStartInspector:(HippyBridge *)bridge;
 
+/**
+ * Ask delegate URL for web inspector (devtools)
+ *
+ * To use remote debugging, must implement this method.
+ */
+- (NSURL *)inspectorSourceURLForBridge:(HippyBridge *)bridge;
+
 /**
  * Get code cache, not working for Javascriptcore engine
  *

diff --git a/framework/ios/base/executors/HippyJSExecutor.mm b/framework/ios/base/executors/HippyJSExecutor.mm
@@ -754,8 +754,8 @@ - (NSString *)completeWSURLWithBridge:(HippyBridge *)bridge {
         return @"";
     }
     HippyDevInfo *devInfo = [[HippyDevInfo alloc] init];
-    if (bridge.debugURL) {
-        NSURL *debugURL = bridge.debugURL;
+    if ([bridge.delegate respondsToSelector:@selector(inspectorSourceURLForBridge:)]) {
+        NSURL *debugURL = [bridge.delegate inspectorSourceURLForBridge:bridge];
         devInfo.scheme = [debugURL scheme];
         devInfo.ipAddress = [debugURL host];
         devInfo.port = [NSString stringWithFormat:@"%@", [debugURL port]];
@@ -771,7 +771,6 @@ - (NSString *)completeWSURLWithBridge:(HippyBridge *)bridge {
     }
     NSString *deviceName = [[UIDevice currentDevice] name];
     NSString *clientId = HippyMD5Hash([NSString stringWithFormat:@"%@%p", deviceName, bridge]);
-
     return [devInfo assembleFullWSURLWithClientId:clientId contextName:bridge.contextName];
 }