Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Give each DevSupportManagerBase subclass a unique bundle filename and split bundle directory

Browse Source 
Summary:
With bridgeless mode enabled, there can be two instances of DevSupportManager. Previously, both of them wrote to the same files on disk. After this change, each instance will write the bundle to different files on disk.

Changelog: [Internal]

Reviewed By: sshic

Differential Revision: D29068794

fbshipit-source-id: 67270be17d084cc89ab618ea54f729f9b595b5f7
This commit is contained in:
Ramanpreet Nara
2021-06-15 12:15:39 -07:00
committed by Facebook GitHub Bot
parent 5f2fae0c2d
commit 6676d01033
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java
+5
View File
@@ -125,6 +125,11 @@ public final class BridgeDevSupportManager extends DevSupportManagerBase {
}
}
@Override
protected String getUniqueTag() {
return "Bridge";
}
@Override
public void loadSplitBundleFromServer(
final String bundlePath, final DevSplitBundleCallback callback) {
ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java
+13 -11
View File
@@ -68,8 +68,6 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
private static final int JAVA_ERROR_COOKIE = -1;
private static final int JSEXCEPTION_ERROR_COOKIE = -1;
private static final String JS_BUNDLE_FILE_NAME = "ReactNativeDevBundle.js";
private static final String JS_SPLIT_BUNDLES_DIR_NAME = "dev_js_split_bundles";
private static final String RELOAD_APP_ACTION_SUFFIX = ".RELOAD_APP_ACTION";
private static final String FLIPPER_DEBUGGER_URL =
"flipper://null/Hermesdebuggerrn?device=React%20Native";
@@ -87,7 +85,7 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
private final LinkedHashMap<String, DevOptionHandler> mCustomDevOptions = new LinkedHashMap<>();
private final ReactInstanceDevHelper mReactInstanceDevHelper;
private final @Nullable String mJSAppBundleName;
private final File mJSBundleTempFile;
private final File mJSBundleDownloadedFile;
private final File mJSSplitBundlesDir;
private final DefaultNativeModuleCallExceptionHandler mDefaultNativeModuleCallExceptionHandler;
private final DevLoadingViewController mDevLoadingViewController;
@@ -187,10 +185,12 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
// start reading first reload output while the second reload starts writing to the same
// file. As this should only be the case in dev mode we leave it as it is.
// TODO(6418010): Fix readers-writers problem in debug reload from HTTP server
mJSBundleTempFile = new File(applicationContext.getFilesDir(), JS_BUNDLE_FILE_NAME);
final String subclassTag = getUniqueTag();
final String bundleFile = subclassTag + "ReactNativeDevBundle.js";
mJSBundleDownloadedFile = new File(applicationContext.getFilesDir(), bundleFile);
mJSSplitBundlesDir =
mApplicationContext.getDir(JS_SPLIT_BUNDLES_DIR_NAME, Context.MODE_PRIVATE);
final String splitBundlesDir = subclassTag.toLowerCase() + "_dev_js_split_bundles";
mJSSplitBundlesDir = mApplicationContext.getDir(splitBundlesDir, Context.MODE_PRIVATE);
mDefaultNativeModuleCallExceptionHandler = new DefaultNativeModuleCallExceptionHandler();
@@ -200,6 +200,8 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
mDevLoadingViewController = new DevLoadingViewController(reactInstanceDevHelper);
}
protected abstract String getUniqueTag();
@Override
public void handleException(Exception e) {
if (mIsDevSupportEnabled) {
@@ -635,7 +637,7 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
@Override
public String getDownloadedJSBundleFile() {
return mJSBundleTempFile.getAbsolutePath();
return mJSBundleDownloadedFile.getAbsolutePath();
}
/**
@@ -645,19 +647,19 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
*/
@Override
public boolean hasUpToDateJSBundleInCache() {
if (mIsDevSupportEnabled && mJSBundleTempFile.exists()) {
if (mIsDevSupportEnabled && mJSBundleDownloadedFile.exists()) {
try {
String packageName = mApplicationContext.getPackageName();
PackageInfo thisPackage =
mApplicationContext.getPackageManager().getPackageInfo(packageName, 0);
if (mJSBundleTempFile.lastModified() > thisPackage.lastUpdateTime) {
if (mJSBundleDownloadedFile.lastModified() > thisPackage.lastUpdateTime) {
// Base APK has not been updated since we downloaded JS, but if app is using exopackage
// it may only be a single dex that has been updated. We check for exopackage dir update
// time in that case.
File exopackageDir =
new File(String.format(Locale.US, EXOPACKAGE_LOCATION_FORMAT, packageName));
if (exopackageDir.exists()) {
return mJSBundleTempFile.lastModified() > exopackageDir.lastModified();
return mJSBundleDownloadedFile.lastModified() > exopackageDir.lastModified();
}
return true;
}
@@ -963,7 +965,7 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
reportBundleLoadingFailure(cause);
}
},
mJSBundleTempFile,
mJSBundleDownloadedFile,
bundleURL,
bundleInfo);
}