Skip to content

fix: crash with Metro and delta bundle #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zamotany merged 1 commit into from
Jun 21, 2019
Merged

fix: crash with Metro and delta bundle #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,7 @@ private void processBundle(
File tmpFile = new File(outputFile.getPath() + ".tmp");

boolean bundleWritten;
boolean pushBundleNameToContainer = false;
NativeDeltaClient nativeDeltaClient = null;

if (BundleDeltaClient.isDeltaUrl(url)) {
Expand All @@ -507,17 +508,22 @@ private void processBundle(
Pair<Boolean, NativeDeltaClient> result = deltaClient.processDelta(headers, body, tmpFile);
bundleWritten = result.first;
nativeDeltaClient = result.second;
// Always push bundle name, regardless if it was written or not.
// If `bundleWritten` is `false` it means that the previously stored
// bundle is still valid, so we can safely add to `DevBundlesContainer`.
pushBundleNameToContainer = true;
} else {
mBundleDeltaClient = null;
bundleWritten = storePlainJSInFile(body, tmpFile);
pushBundleNameToContainer = bundleWritten;
}

if (bundleWritten) {
String bundleName = getBundleNameFromURL(url); // fallback
if (pushBundleNameToContainer && mDevBundlesContainer != null) {
String bundleName = getBundleNameFromURL(url);
mDevBundlesContainer.pushBundle(bundleName, url, outputFile.getPath());
}

if(mDevBundlesContainer != null) {
mDevBundlesContainer.pushBundle(bundleName, url, outputFile.getPath());
}
if (bundleWritten) {
if (!tmpFile.renameTo(outputFile)) {
throw new IOException("Couldn't rename " + tmpFile + " to " + outputFile);
}
Expand Down
6 changes: 3 additions & 3 deletions ReactAndroid/src/main/java/com/facebook/react/devsupport/DevBundlesContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public String getFileURLByName(String name) {
public String getNameBySourceURL(String sourceURL) {
for (String key : bundleNameMapping.keySet()) {
BundleURLs tmp = bundleNameMapping.get(key);
if(tmp.sourceURL.equals(sourceURL)) {
if(tmp.sourceURL.equals(sourceURL.split("\\?")[0])) {
return key;
}
}
Expand All @@ -102,7 +102,7 @@ public String getNameByFileURL(String fileURL) {
public String getFileURLBySourceURL(String sourceURL) {
for (String key : bundleNameMapping.keySet()) {
BundleURLs tmp = bundleNameMapping.get(key);
if(tmp.sourceURL.equals(sourceURL)) {
if(tmp.sourceURL.startsWith(sourceURL.split("\\?")[0])) {
return tmp.fileURL;
}
}
Expand Down Expand Up @@ -136,4 +136,4 @@ public DevBundlesContainer(JSONObject json) {
FLog.e(ReactConstants.TAG, "DevBundlesContainer is unable to create from JSON");
}
}
}
}