react-native-update 10.14.0 → 10.15.1

package/android/bin/build/outputs/logs/manifest-merger-debug-report.txt

@@ -0,0 +1,49 @@
+-- Merging decision tree log ---
+manifest
+ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:1:1-15:12
+INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:1:1-15:12
+INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:1:1-15:12
+	package
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:2:5-44
+		INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+	xmlns:android
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:1:11-69
+application
+ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:3:5-14:19
+meta-data#pushy_build_time
+ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:4:9-95
+	android:value
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:4:52-92
+	android:name
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:4:20-51
+provider#cn.reactnative.modules.update.PushyFileProvider
+ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:5:9-13:20
+	android:grantUriPermissions
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:9:13-47
+	android:authorities
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:7:13-70
+	android:exported
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:8:13-37
+	android:name
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:6:13-46
+meta-data#android.support.FILE_PROVIDER_PATHS
+ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:10:13-12:56
+	android:resource
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:12:13-53
+	android:name
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:11:13-63
+uses-sdk
+INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+	android:targetSdkVersion
+		INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+	android:minSdkVersion
+		INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml

package/android/bin/build/outputs/logs/manifest-merger-release-report.txt

@@ -0,0 +1,57 @@
+-- Merging decision tree log ---
+manifest
+ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:2:1-19:12
+INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:2:1-19:12
+INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:2:1-19:12
+	package
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:3:5-44
+		INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+	xmlns:android
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:2:11-69
+uses-permission#android.permission.REQUEST_INSTALL_PACKAGES
+ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:4:5-83
+	android:name
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:4:22-80
+uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
+ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:6:5-81
+	android:name
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:6:22-78
+application
+ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:7:5-18:19
+meta-data#pushy_build_time
+ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:8:9-95
+	android:value
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:8:52-92
+	android:name
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:8:20-51
+provider#cn.reactnative.modules.update.PushyFileProvider
+ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:9:9-17:20
+	android:grantUriPermissions
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:13:13-47
+	android:authorities
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:11:13-70
+	android:exported
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:12:13-37
+	android:name
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:10:13-46
+meta-data#android.support.FILE_PROVIDER_PATHS
+ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:14:13-16:56
+	android:resource
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:16:13-53
+	android:name
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml:15:13-63
+uses-sdk
+INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+	android:targetSdkVersion
+		INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+	android:minSdkVersion
+		INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+		ADDED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/sunny/Documents/react-native-pushy/Example/testHotUpdate/node_modules/react-native-update/android/src/main/AndroidManifest.xml

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

@@ -430,6 +430,9 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
             if (sub.getName().charAt(0) == '.') {
                 continue;
             }
+            if (isFileUpdatedWithinDays(sub, 7)) {
+                continue;
+            }
             if (sub.isFile()) {
                 sub.delete();
             } else {
@@ -441,6 +444,13 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
         }
     }
 
+    private boolean isFileUpdatedWithinDays(File file, int days) {
+        long currentTime = System.currentTimeMillis();
+        long lastModified = file.lastModified();
+        long daysInMillis = days * 24 * 60 * 60 * 1000L;
+        return (currentTime - lastModified) < daysInMillis;
+    }
+
     @Override
     protected Void doInBackground(DownloadTaskParams... params) {
         int taskType = params[0].type;

package/ios/RCTPushy/RCTPushy.mm

@@ -536,7 +536,15 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
     
     for(NSString *fileName in list) {
         if (![fileName isEqualToString:curVersion]) {
-            [_fileManager removeFile:[downloadDir stringByAppendingPathComponent:fileName] completionHandler:nil];
+            NSString *filePath = [downloadDir stringByAppendingPathComponent:fileName];
+            NSDictionary *attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:&error];
+            if (error) {
+                continue;
+            }
+            NSDate *modificationDate = [attributes fileModificationDate];
+            if ([[NSDate date] timeIntervalSinceDate:modificationDate] > 7 * 24 * 60 * 60) {
+                [_fileManager removeFile:filePath completionHandler:nil];
+            }
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.14.0",
+  "version": "10.15.1",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {
@@ -74,5 +74,6 @@
     "react-native": "0.73",
     "ts-jest": "^29.0.3",
     "typescript": "^5.3.3"
-  }
-}
+  },
+  "packageManager": "yarn@4.5.1"
+}

package/src/client.ts

@@ -11,6 +11,7 @@ import {
   packageVersion,
   rolledBackVersion,
   setLocalHashInfo,
+  isFirstTime,
   isRolledBack,
 } from './core';
 
@@ -51,6 +52,16 @@ export class Pushy {
   marked = false;
   applyingUpdate = false;
   version = cInfo.pushy;
+  loggerPromise = (() => {
+    let resolve: (value?: unknown) => void = () => {};
+    const promise = new Promise(res => {
+      resolve = res;
+    });
+    return {
+      promise,
+      resolve,
+    };
+  })();
 
   constructor(options: PushyOptions) {
     if (Platform.OS === 'ios' || Platform.OS === 'android') {
@@ -59,6 +70,14 @@ export class Pushy {
       }
     }
     this.setOptions(options);
+    if (isRolledBack) {
+      this.report({
+        type: 'rollback',
+        data: {
+          rolledBackVersion,
+        },
+      });
+    }
   }
 
   setOptions = (options: Partial<PushyOptions>) => {
@@ -66,20 +85,13 @@ export class Pushy {
       if (value !== undefined) {
         (this.options as any)[key] = value;
         if (key === 'logger') {
-          if (isRolledBack) {
-            this.report({
-              type: 'rollback',
-              data: {
-                rolledBackVersion,
-              },
-            });
-          }
+          this.loggerPromise.resolve();
         }
       }
     }
   };
 
-  report = ({
+  report = async ({
     type,
     message = '',
     data = {},
@@ -89,6 +101,7 @@ export class Pushy {
     data?: Record<string, string | number>;
   }) => {
     log(type + ' ' + message);
+    await this.loggerPromise.promise;
     const { logger = noop, appKey } = this.options;
     logger({
       type,
@@ -118,7 +131,7 @@ export class Pushy {
     return true;
   };
   markSuccess = () => {
-    if (this.marked || __DEV__) {
+    if (this.marked || __DEV__ || !isFirstTime) {
       return;
     }
     this.marked = true;
@@ -186,6 +199,7 @@ export class Pushy {
       ...extra,
     };
     if (__DEV__) {
+      // @ts-ignore
       delete fetchBody.buildTime;
     }
     const body = JSON.stringify(fetchBody);

package/src/core.ts

@@ -21,14 +21,14 @@ const PushyConstants = isTurboModuleEnabled
   ? PushyModule.getConstants()
   : PushyModule;
 
-export const downloadRootDir = PushyConstants.downloadRootDir;
-export const packageVersion = PushyConstants.packageVersion;
-export const currentVersion = PushyConstants.currentVersion;
-export const isFirstTime = PushyConstants.isFirstTime;
-export const rolledBackVersion = PushyConstants.rolledBackVersion;
-export const isRolledBack = typeof rolledBackVersion === 'string';
+export const downloadRootDir: string = PushyConstants.downloadRootDir;
+export const packageVersion: string = PushyConstants.packageVersion;
+export const currentVersion: string = PushyConstants.currentVersion;
+export const isFirstTime: boolean = PushyConstants.isFirstTime;
+export const rolledBackVersion: string = PushyConstants.rolledBackVersion;
+export const isRolledBack: boolean = typeof rolledBackVersion === 'string';
 
-export const buildTime = PushyConstants.buildTime;
+export const buildTime: string = PushyConstants.buildTime;
 let uuid = PushyConstants.uuid;
 
 if (Platform.OS === 'android' && !PushyConstants.isUsingBundleUrl) {

package/src/provider.tsx

@@ -13,12 +13,7 @@ import {
   Linking,
 } from 'react-native';
 import { Pushy } from './client';
-import {
-  currentVersion,
-  isFirstTime,
-  packageVersion,
-  getCurrentVersionInfo,
-} from './core';
+import { currentVersion, packageVersion, getCurrentVersionInfo } from './core';
 import { CheckResult, ProgressData, PushyTestPayload } from './type';
 import { PushyContext } from './context';
 import { URL } from 'react-native-url-polyfill';
@@ -167,7 +162,7 @@ export const PushyProvider = ({
       if (!info) {
         return;
       }
-      const rollout = info.config?.rollout;
+      const rollout = info.config?.rollout?.[packageVersion];
       if (rollout) {
         if (!isInRollout(rollout)) {
           log(`not in ${rollout}% rollout, ignored`);
@@ -246,7 +241,7 @@ export const PushyProvider = ({
       return;
     }
     const { checkStrategy, dismissErrorAfter, autoMarkSuccess } = options;
-    if (isFirstTime && autoMarkSuccess) {
+    if (autoMarkSuccess) {
       markSuccess();
     }
     if (checkStrategy === 'both' || checkStrategy === 'onAppResume') {

package/src/type.ts

@@ -8,7 +8,9 @@ export interface CheckResult {
   description?: string;
   metaInfo?: string;
   config?: {
-    rollout?: number;
+    rollout?: {
+      [packageVersion: string]: number;
+    };
     [key: string]: any;
   };
   pdiff?: string;
@@ -47,7 +49,7 @@ export interface EventData {
     uuid: string;
   };
   packageVersion: string;
-  buildTime: number;
+  buildTime: string;
   message?: string;
   rolledBackVersion?: string;
   newVersion?: string;