improve errorUpdate message

Author: sunnylqm

Example/testHotUpdate/bun.lock

@@ -23,7 +23,7 @@
     "react-native-paper": "^5.13.1",
     "react-native-safe-area-context": "^5.2.0",
     "react-native-svg": "^15.11.1",
-    "react-native-update": "^10.25.0",
+    "react-native-update": "^10.25.2",
     "react-native-vector-icons": "^10.2.0"
   },
   "devDependencies": {

Example/testHotUpdate/package.json

@@ -49,7 +49,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
 
     private void removeDirectory(File file) throws IOException {
         if (UpdateContext.DEBUG) {
-            Log.d("RNUpdate", "Removing " + file);
+            Log.d("react-native-update", "Removing " + file);
         }
         if (file.isDirectory()) {
             File[] files = file.listFiles();
@@ -88,7 +88,7 @@ private void downloadFile(DownloadTaskParams param) throws IOException {
         BufferedSink sink = Okio.buffer(Okio.sink(writePath));
 
         if (UpdateContext.DEBUG) {
-            Log.d("RNUpdate", "Downloading " + url);
+            Log.d("react-native-update", "Downloading " + url);
         }
 
         long bytesRead = 0;
@@ -98,7 +98,7 @@ private void downloadFile(DownloadTaskParams param) throws IOException {
             received += bytesRead;
             sink.emit();
             if (UpdateContext.DEBUG) {
-                Log.d("RNUpdate", "Progress " + received + "/" + contentLength);
+                Log.d("react-native-update", "Progress " + received + "/" + contentLength);
             }
 
             int percentage = (int)(received * 100.0 / contentLength + 0.5);
@@ -115,7 +115,7 @@ private void downloadFile(DownloadTaskParams param) throws IOException {
         sink.close();
 
         if (UpdateContext.DEBUG) {
-            Log.d("RNUpdate", "Download finished");
+            Log.d("react-native-update", "Download finished");
         }
     }
 
@@ -244,7 +244,7 @@ private void doFullPatch(DownloadTaskParams param) throws IOException {
 
 
         if (UpdateContext.DEBUG) {
-            Log.d("RNUpdate", "Unzip finished");
+            Log.d("react-native-update", "Unzip finished");
         }
     }
 
@@ -260,7 +260,7 @@ private void copyFromResource(HashMap<String, ArrayList<File> > resToCopy) throw
                 File lastTarget = null;
                 for (File target: targets) {
                     if (UpdateContext.DEBUG) {
-                        Log.d("RNUpdate", "Copying from resource " + fn + " to " + target);
+                        Log.d("react-native-update", "Copying from resource " + fn + " to " + target);
                     }
                     if (lastTarget != null) {
                         copyFile(lastTarget, target);
@@ -352,7 +352,7 @@ private void doPatchFromApk(DownloadTaskParams param) throws IOException, JSONEx
         copyFromResource(copyList);
 
         if (UpdateContext.DEBUG) {
-            Log.d("RNUpdate", "Unzip finished");
+            Log.d("react-native-update", "Unzip finished");
         }
 
     }
@@ -418,12 +418,12 @@ private void doPatchFromPpk(DownloadTaskParams param) throws IOException, JSONEx
             throw new Error("bundle patch not found");
         }
         if (UpdateContext.DEBUG) {
-            Log.d("RNUpdate", "Unzip finished");
+            Log.d("react-native-update", "Unzip finished");
         }
     }
     private void doCleanUp(DownloadTaskParams param) throws IOException {
         if (UpdateContext.DEBUG) {
-            Log.d("RNUpdate", "Start cleaning up");
+            Log.d("react-native-update", "Start cleaning up");
         }
         File root = param.unzipDirectory;
         for (File sub : root.listFiles()) {
@@ -499,7 +499,7 @@ protected Void doInBackground(DownloadTaskParams... params) {
                 default:
                     break;
             }
-            Log.e("pushy", "download task failed", e);
+            Log.e("react-native-update", "download task failed", e);
 
             if (params[0].listener != null) {
                 params[0].listener.onDownloadFailed(e);

android/src/main/java/cn/reactnative/modules/update/DownloadTask.java

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.25.2",
+  "version": "10.25.3",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {

package.json

@@ -361,6 +361,7 @@ export class Pushy {
     let succeeded = '';
     this.report({ type: 'downloading' });
     let lastError: any;
+    let errorMessages: string[] = [];
     const diffUrl = await testUrls(joinUrls(paths, diff));
     if (diffUrl) {
       log('downloading diff');
@@ -372,11 +373,13 @@ export class Pushy {
         });
         succeeded = 'diff';
       } catch (e: any) {
-        lastError = e;
+        const errorMessage = `diff error: ${e.message}`;
+        errorMessages.push(errorMessage);
+        lastError = new Error(errorMessage);
         if (__DEV__) {
           succeeded = 'diff';
         } else {
-          log(`diff error: ${e.message}, try pdiff`);
+          log(errorMessage);
         }
       }
     }
@@ -390,11 +393,13 @@ export class Pushy {
         });
         succeeded = 'pdiff';
       } catch (e: any) {
-        lastError = e;
+        const errorMessage = `pdiff error: ${e.message}`;
+        errorMessages.push(errorMessage);
+        lastError = new Error(errorMessage);
         if (__DEV__) {
           succeeded = 'pdiff';
         } else {
-          log(`pdiff error: ${e.message}, try full patch`);
+          log(errorMessage);
         }
       }
     }
@@ -408,11 +413,13 @@ export class Pushy {
         });
         succeeded = 'full';
       } catch (e: any) {
-        lastError = e;
+        const errorMessage = `full patch error: ${e.message}`;
+        errorMessages.push(errorMessage);
+        lastError = new Error(errorMessage);
         if (__DEV__) {
           succeeded = 'full';
         } else {
-          log(`full patch error: ${e.message}`);
+          log(errorMessage);
         }
       }
     }
@@ -427,6 +434,7 @@ export class Pushy {
       this.report({
         type: 'errorUpdate',
         data: { newVersion: hash },
+        message: errorMessages.join(';'),
       });
       if (lastError) {
         throw lastError;