Fix packager liveness check broken on internal builds

javache · facebook-github-bot · commit ef66856bae59 · 2022-11-21T10:36:05.000-08:00
Summary: Changelog: [Internal]

Reviewed By: sammy-SC

Differential Revision: D41437735

fbshipit-source-id: 83dbea41512c196bfcb4b8b9e5d94847f2b11ce4
diff --git a/React/Base/RCTBundleURLProvider.mm b/React/Base/RCTBundleURLProvider.mm
@@ -74,14 +74,18 @@ - (void)resetToDefaults
                                                          (unsigned long)kRCTBundleURLProviderDefaultPort]];
 }
 
-#if RCT_DEV_MENU
+#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
 + (BOOL)isPackagerRunning:(NSString *)hostPort
 {
   return [RCTBundleURLProvider isPackagerRunning:hostPort scheme:nil];
 }
 
 + (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme
 {
+  if (!kRCTAllowPackagerAccess) {
+    return NO;
+  }
+
   NSURL *url = [serverRootWithHostPort(hostPort, scheme) URLByAppendingPathComponent:@"status"];
 
   NSURLSession *session = [NSURLSession sharedSession];

Original file line number	Diff line number	Diff line change
`@@ -74,14 +74,18 @@ - (void)resetToDefaults`
`74`	`74`	`(unsigned long)kRCTBundleURLProviderDefaultPort]];`
`75`	`75`	`}`
`76`	`76`
`77`		`-#if RCT_DEV_MENU`
	`77`	`+#if RCT_DEV_MENU \| RCT_PACKAGER_LOADING_FUNCTIONALITY`
`78`	`78`	`+ (BOOL)isPackagerRunning:(NSString *)hostPort`
`79`	`79`	`{`
`80`	`80`	`return [RCTBundleURLProvider isPackagerRunning:hostPort scheme:nil];`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`+ (BOOL)isPackagerRunning:(NSString )hostPort scheme:(NSString )scheme`
`84`	`84`	`{`
	`85`	`+ if (!kRCTAllowPackagerAccess) {`
	`86`	`+ return NO;`
	`87`	`+ }`
	`88`	`+`
`85`	`89`	`NSURL *url = [serverRootWithHostPort(hostPort, scheme) URLByAppendingPathComponent:@"status"];`
`86`	`90`
`87`	`91`	`NSURLSession *session = [NSURLSession sharedSession];`