Skip to content

resolve aab package image hot update issue #512

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
merged 8 commits into from
Sep 23, 2025
Merged

resolve aab package image hot update issue #512

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
22d9587
modify harmony download logic to async
bozaigao Jun 17, 2025
7eab2f6
Merge branch 'reactnativecn:master' into master
bozaigao Jun 24, 2025
992883f
fix harmony image assets load fail issue
bozaigao Jun 25, 2025
efa45a3
Merge branch 'reactnativecn:master' into master
bozaigao Sep 13, 2025
89eca8e
Merge branch 'reactnativecn:master' into master
bozaigao Sep 23, 2025
0f9b45e
resolve aab package image hot update issue
bozaigao Sep 23, 2025
48d2ca4
update
bozaigao Sep 23, 2025
82dbcfe
udpate
bozaigao Sep 23, 2025
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
45 changes: 41 additions & 4 deletions android/src/main/java/cn/reactnative/modules/update/DownloadTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.util.Enumeration;
import java.util.Iterator;
import java.util.zip.ZipEntry;
import java.util.zip.CRC32;
import java.util.HashMap;

import okio.BufferedSink;
Expand Down Expand Up @@ -100,7 +101,7 @@ private void downloadFile(DownloadTaskParams param) throws IOException {
if (UpdateContext.DEBUG) {
Log.d("react-native-update", "Progress " + received + "/" + contentLength);
}

int percentage = (int)(received * 100.0 / contentLength + 0.5);
if (percentage > currentPercentage) {
currentPercentage = percentage;
Expand Down Expand Up @@ -198,6 +199,10 @@ private byte[] readFile(File file) throws IOException {
return fout.toByteArray();
}

private String getCRC32AsDecimal(long crc32Value) {
return String.valueOf(crc32Value & 0xFFFFFFFFL);
}

private void copyFilesWithBlacklist(String current, File from, File to, JSONObject blackList) throws IOException {
File[] files = from.listFiles();
for (File file : files) {
Expand Down Expand Up @@ -247,14 +252,19 @@ private void doFullPatch(DownloadTaskParams param) throws IOException {
}
}

private void copyFromResource(HashMap<String, ArrayList<File> > resToCopy) throws IOException {
private void copyFromResource(HashMap<String, ArrayList<File> > resToCopy, HashMap<String, ArrayList<File>> resToCopy2) throws IOException {
SafeZipFile zipFile = new SafeZipFile(new File(context.getPackageResourcePath()));
Enumeration<? extends ZipEntry> entries = zipFile.entries();
while (entries.hasMoreElements()) {
ZipEntry ze = entries.nextElement();

String fn = ze.getName();
ArrayList<File> targets = resToCopy.get(fn);
long zipCrc32 = ze.getCrc();
String crc32Decimal = getCRC32AsDecimal(zipCrc32);
ArrayList<File> targets = resToCopy2.get(crc32Decimal);
if(targets==null || targets.isEmpty()){
targets = resToCopy.get(fn);
}
if (targets != null) {
File lastTarget = null;
for (File target: targets) {
Expand All @@ -279,6 +289,7 @@ private void doPatchFromApk(DownloadTaskParams param) throws IOException, JSONEx
removeDirectory(param.unzipDirectory);
param.unzipDirectory.mkdirs();
HashMap<String, ArrayList<File>> copyList = new HashMap<String, ArrayList<File>>();
HashMap<String, ArrayList<File>> copiesv2List = new HashMap<String, ArrayList<File>>();

boolean foundDiff = false;
boolean foundBundlePatch = false;
Expand All @@ -297,7 +308,9 @@ private void doPatchFromApk(DownloadTaskParams param) throws IOException, JSONEx
JSONObject obj = (JSONObject)new JSONTokener(json).nextValue();

JSONObject copies = obj.getJSONObject("copies");
JSONObject copiesv2 = obj.getJSONObject("copiesv2");
Iterator<?> keys = copies.keys();
Iterator<?> keys2 = copiesv2.keys();
while( keys.hasNext() ) {
String to = (String)keys.next();
String from = copies.getString(to);
Expand All @@ -321,6 +334,30 @@ private void doPatchFromApk(DownloadTaskParams param) throws IOException, JSONEx
}
target.add(toFile);
}

while( keys2.hasNext() ) {
String from = (String)keys2.next();
String to = copiesv2.getString(from);
if (from.isEmpty()) {
from = to;
}
ArrayList<File> target = null;
if (!copiesv2List.containsKey(from)) {
target = new ArrayList<File>();
copiesv2List.put(from, target);
} else {
target = copiesv2List.get((from));
}
File toFile = new File(param.unzipDirectory, to);

// Fixing a Zip Path Traversal Vulnerability
// https://support.google.com/faqs/answer/9294009
String canonicalPath = toFile.getCanonicalPath();
if (!canonicalPath.startsWith(param.unzipDirectory.getCanonicalPath() + File.separator)) {
throw new SecurityException("Illegal name: " + to);
}
target.add(toFile);
}
continue;
}
if (fn.equals("index.bundlejs.patch")) {
Expand Down Expand Up @@ -348,7 +385,7 @@ private void doPatchFromApk(DownloadTaskParams param) throws IOException, JSONEx
throw new Error("bundle patch not found");
}

copyFromResource(copyList);
copyFromResource(copyList, copiesv2List);

if (UpdateContext.DEBUG) {
Log.d("react-native-update", "Unzip finished");
Expand Down