@bravemobile/react-native-code-push 13.1.0 → 13.2.0

package/README.md

@@ -394,7 +394,18 @@ module.exports = Config;
   - Modifying an existing release history with the `update-history` command.
 
 
-**(2) For `code-push.config.ts` (TypeScript) to work properly, you may need to update your `tsconfig.json`.**
+**(2) A `code-push.config.ts` (TypeScript) file needs a loader installed.**
+
+Install `tsx`, which requires no further setup:
+
+```bash
+npm install --save-dev tsx
+```
+
+`ts-node` also keeps working, and is used when `tsx` is not installed. Note that `ts-node` is no
+longer maintained, so support for it is **deprecated and will be removed in a future major
+version** — please migrate to `tsx`. Until then, `ts-node` needs the following `tsconfig.json`
+setup:
 
 ```diff
   {
@@ -414,6 +425,8 @@ module.exports = Config;
 
 ```
 
+A `code-push.config.js` (JavaScript) file needs neither.
+
 
 ### 6. Diff Updates (Optional)
 

package/android/app/proguard-rules.pro

@@ -21,10 +21,6 @@
     private final ** mBundleLoader;
 }
 # bridgeless
--keepclassmembers class com.facebook.react.defaults.DefaultReactHostDelegate {
-    private ** jsBundleLoader;
-}
-# bridgeless
 -keepclassmembers class * extends com.facebook.react.runtime.ReactHostDelegate {
     private ** jsBundleLoader;
     private ** _jsBundleLoader;
@@ -35,9 +31,6 @@
     private final ** reactHostDelegate; # RN 0.81+
 }
 
-# Can't find referenced class org.bouncycastle.**
--dontwarn com.nimbusds.jose.**
-
 # The binary patch applier is found by name from the native library.
 -keepclasseswithmembernames class com.microsoft.codepush.react.HDiffPatchNative {
     native <methods>;

package/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java

@@ -51,6 +51,9 @@ public class CodePush extends TurboReactPackage {
         return mServerUrl;
     }
 
+    /**
+     * Entry point used by React Native autolinking to create and retain the package instance.
+     */
     public static synchronized CodePush getInstance(Context context, boolean isDebugMode) {
         if (mCurrentInstance == null) {
             mCurrentInstance = new CodePush(context, isDebugMode);

package/android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java

@@ -59,6 +59,15 @@ public class CodePushNativeModule extends NativeCodePushSpec {
     private  boolean _restartInProgress = false;
     private  ArrayList<Boolean> _restartQueue = new ArrayList<>();
 
+    /**
+     * Whether the React Native instance this module was created for is still the one running.
+     *
+     * A reload replaces the instance while work this module started can still be in flight,
+     * and a frame callback posted to the process-wide choreographer outlives the executor
+     * this module shuts down. Read from whichever thread that work is on, so it is volatile.
+     */
+    private volatile boolean mGenerationAlive = true;
+
     public CodePushNativeModule(ReactApplicationContext reactContext, CodePush codePush, CodePushUpdateManager codePushUpdateManager, CodePushTelemetryManager codePushTelemetryManager, SettingsManager settingsManager) {
         super(reactContext);
 
@@ -85,6 +94,7 @@ public class CodePushNativeModule extends NativeCodePushSpec {
 
     @Override
     public void invalidate() {
+        mGenerationAlive = false;
         clearLifecycleEventListener();
         mBackgroundExecutor.shutdownNow();
         super.invalidate();
@@ -264,6 +274,14 @@ public class CodePushNativeModule extends NativeCodePushSpec {
     }
 
     private void emitDownloadProgressEvent(DownloadProgress downloadProgress) {
+        // Every progress event arrives here, including the ones a frame callback delivers
+        // after this module was invalidated: shutting the executor down does not cancel a
+        // callback already posted to the choreographer, and the context it would emit
+        // through has been destroyed by then.
+        if (!mGenerationAlive) {
+            return;
+        }
+
         if (mEventEmitterCallback != null) {
             emitOnDownloadProgress(downloadProgress.createWritableMap());
             return;
@@ -275,6 +293,13 @@ public class CodePushNativeModule extends NativeCodePushSpec {
     }
 
     private void restartAppInternal(boolean onlyIfUpdateIsPending) {
+        // A restart requested by an instance that has been replaced would reload the one
+        // that replaced it, which nobody asked for.
+        if (!mGenerationAlive) {
+            CodePushUtils.log("Ignoring a restart requested by a React Native instance that is no longer running");
+            return;
+        }
+
         if (this._restartInProgress) {
             CodePushUtils.log("Restart request queued until the current restart is completed");
             this._restartQueue.add(onlyIfUpdateIsPending);

package/cli/dist/utils/fsUtils.js

@@ -1,20 +1,15 @@
 import fs from "fs";
 import path from "path";
 import { createRequire } from "module";
-const nodeRequire = createRequire(import.meta.url);
 /**
  * allows to require a config file with .ts extension
  */
 function requireConfig(filePath) {
     const ext = path.extname(filePath);
+    // Resolve the loader from the project the config file lives in, not from the CLI install.
+    const projectRequire = createRequire(filePath);
     if (ext === '.ts') {
-        try {
-            nodeRequire('ts-node/register');
-        }
-        catch {
-            console.error('ts-node not found. Please install ts-node as a devDependency.');
-            process.exit(1);
-        }
+        return unwrapDefaultExport(requireTsConfig(projectRequire, filePath));
     }
     else if (ext === '.js') {
         // do nothing
@@ -22,7 +17,38 @@ function requireConfig(filePath) {
     else {
         throw new Error(`Unsupported file extension: ${ext}`);
     }
-    return nodeRequire(filePath);
+    return unwrapDefaultExport(projectRequire(filePath));
+}
+/**
+ * tsx is preferred: it needs no tsconfig setup and resolves tsconfig `paths` aliases on its own.
+ * ts-node keeps working for projects that already have it configured.
+ */
+function requireTsConfig(projectRequire, filePath) {
+    if (canResolve(projectRequire, 'tsx/cjs/api')) {
+        const { require: tsxRequire } = projectRequire('tsx/cjs/api');
+        return tsxRequire(filePath, filePath);
+    }
+    if (canResolve(projectRequire, 'ts-node/register')) {
+        console.warn('warn: Loading the config file with ts-node, which is no longer maintained. Support for it ' +
+            'will be removed in a future major version - please install tsx instead (`npm i -D tsx`).');
+        projectRequire('ts-node/register');
+        return projectRequire(filePath);
+    }
+    console.error('A TypeScript config file needs a loader. Please install tsx as a devDependency (`npm i -D tsx`).');
+    process.exit(1);
+}
+function canResolve(projectRequire, id) {
+    try {
+        projectRequire.resolve(id);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+// `export default` compiles to `exports.default`; `module.exports =` is returned as is.
+function unwrapDefaultExport(loaded) {
+    return (loaded.default ?? loaded);
 }
 export function findAndReadConfigFile(startDir, configFileName) {
     let dir = startDir;

package/cli/package.json

@@ -19,11 +19,15 @@
     "yauzl": "^3.2.0"
   },
   "peerDependencies": {
-    "ts-node": ">=10"
+    "ts-node": ">=10",
+    "tsx": ">=4"
   },
   "peerDependenciesMeta": {
     "ts-node": {
       "optional": true
+    },
+    "tsx": {
+      "optional": true
     }
   },
   "engines": {

package/cli/utils/fsUtils.ts

@@ -3,28 +3,62 @@ import path from "path";
 import { createRequire } from "module";
 import type { CliConfigInterface } from "../../typings/react-native-code-push.d.ts";
 
-const nodeRequire = createRequire(import.meta.url);
-
 /**
  * allows to require a config file with .ts extension
  */
 function requireConfig(filePath: string): CliConfigInterface {
   const ext = path.extname(filePath);
+  // Resolve the loader from the project the config file lives in, not from the CLI install.
+  const projectRequire = createRequire(filePath);
 
   if (ext === '.ts') {
-    try {
-      nodeRequire('ts-node/register');
-    } catch {
-      console.error('ts-node not found. Please install ts-node as a devDependency.');
-      process.exit(1);
-    }
+    return unwrapDefaultExport(requireTsConfig(projectRequire, filePath));
   } else if (ext === '.js') {
     // do nothing
   } else {
     throw new Error(`Unsupported file extension: ${ext}`);
   }
 
-  return nodeRequire(filePath) as CliConfigInterface;
+  return unwrapDefaultExport(projectRequire(filePath));
+}
+
+/**
+ * tsx is preferred: it needs no tsconfig setup and resolves tsconfig `paths` aliases on its own.
+ * ts-node keeps working for projects that already have it configured.
+ */
+function requireTsConfig(projectRequire: NodeRequire, filePath: string): { default?: unknown } {
+  if (canResolve(projectRequire, 'tsx/cjs/api')) {
+    const { require: tsxRequire } = projectRequire('tsx/cjs/api') as {
+      require: (id: string, fromFile: string) => { default?: unknown };
+    };
+    return tsxRequire(filePath, filePath);
+  }
+
+  if (canResolve(projectRequire, 'ts-node/register')) {
+    console.warn(
+      'warn: Loading the config file with ts-node, which is no longer maintained. Support for it ' +
+        'will be removed in a future major version - please install tsx instead (`npm i -D tsx`).',
+    );
+    projectRequire('ts-node/register');
+    return projectRequire(filePath);
+  }
+
+  console.error('A TypeScript config file needs a loader. Please install tsx as a devDependency (`npm i -D tsx`).');
+  process.exit(1);
+}
+
+function canResolve(projectRequire: NodeRequire, id: string): boolean {
+  try {
+    projectRequire.resolve(id);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// `export default` compiles to `exports.default`; `module.exports =` is returned as is.
+function unwrapDefaultExport(loaded: { default?: unknown }): CliConfigInterface {
+  return (loaded.default ?? loaded) as CliConfigInterface;
 }
 
 export function findAndReadConfigFile(startDir: string, configFileName: string): CliConfigInterface {

package/ios/CodePush/CodePush.h

@@ -36,6 +36,10 @@
 @interface CodePush : RCTEventEmitter
 #endif
 
+/*
+ * Returns the bundle embedded in the binary, without resolving an installed update.
+ * The update pipeline uses this as the base for binary patches and asset diffs.
+ */
 + (NSURL *)binaryBundleURL;
 /*
  * This method is used to retrieve the URL for the most recent
@@ -64,8 +68,10 @@
                    subdirectory:(NSString *)resourceSubdirectory
                          bundle:(NSBundle *)resourceBundle;
 
+/* Internal storage root used by CodePushPackage. */
 + (NSString *)getApplicationSupportDirectory;
 
+/* Returns the embedded assets path used as the base for asset diffs. */
 + (NSString *)bundleAssetsPath;
 
 /*
@@ -76,9 +82,8 @@
 + (void)overrideAppVersion:(NSString *)appVersion;
 
 /*
- * This method allows dynamically setting the app's
- * deployment key, in addition to setting it via
- * the Info.plist file's CodePushDeploymentKey setting.
+ * Retained for compatibility. The current implementation ignores the argument
+ * and uses the deprecated deployment key placeholder.
  */
 + (void)setDeploymentKey:(NSString *)deploymentKey;
 

package/ios/CodePush/CodePush.mm

@@ -1,6 +1,7 @@
 #import <React/RCTAssert.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTConvert.h>
+#import <React/RCTInvalidating.h>
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTRootView.h>
 #import <React/RCTUtils.h>
@@ -8,7 +9,9 @@
 
 #import "CodePush.h"
 
-@interface CodePush () <RCTFrameUpdateObserver
+#include <atomic>
+
+@interface CodePush () <RCTFrameUpdateObserver, RCTInvalidating
 #ifdef RCT_NEW_ARCH_ENABLED
 , NativeCodePushSpec
 #endif
@@ -32,6 +35,17 @@
     BOOL _allowed;
     BOOL _restartInProgress;
     NSMutableArray *_restartQueue;
+
+    /*
+     * Whether the React Native instance this module was created for is still the one
+     * running.
+     *
+     * A reload starts the next instance before the one being replaced has finished being
+     * torn down, so work this instance started can still be running with nothing left to
+     * hand its result to. Read from whichever thread that work is on, written when the
+     * instance is invalidated, so it is atomic.
+     */
+    std::atomic<bool> _generationAlive;
 }
 
 RCT_EXPORT_MODULE()
@@ -307,7 +321,42 @@ static NSString *const LatestRollbackCountKey = @"count";
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
+/*
+ * Called when the React Native instance this module belongs to is being replaced.
+ *
+ * A download in flight keeps this module alive past that point, and the suspend timer and
+ * the resume notifications keep it reachable too. None of them may act afterwards: the
+ * runtime they would report to is gone, and the restart they would trigger belongs to a
+ * generation that is no longer on screen.
+ */
+- (void)invalidate
+{
+    _generationAlive.store(false);
+
+    [_appSuspendTimer invalidate];
+    _appSuspendTimer = nil;
+    _hasResumeListener = NO;
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+
+#ifndef RCT_NEW_ARCH_ENABLED
+    [super invalidate];
+#endif
+}
+
+/* Whether this module still belongs to the React Native instance that is running. */
+- (BOOL)isGenerationAlive
+{
+    return _generationAlive.load();
+}
+
 - (void)dispatchDownloadProgressEvent {
+  // The download that is reporting here can be one this module started before the app was
+  // reloaded, in which case the event emitter it would reach belongs to a runtime that has
+  // been torn down.
+  if (![self isGenerationAlive]) {
+    return;
+  }
+
   // Notify the script-side about the progress
   NSDictionary *progress = @{
     @"totalBytes" : [NSNumber numberWithLongLong:_latestExpectedContentLength],
@@ -375,6 +424,7 @@ static NSString *const LatestRollbackCountKey = @"count";
     _restartInProgress = NO;
     _restartQueue = [NSMutableArray arrayWithCapacity:1];
     _lastProgressEventTime = 0;
+    _generationAlive.store(true);
 
     self = [super init];
     if (self) {
@@ -533,6 +583,11 @@ static NSString *const LatestRollbackCountKey = @"count";
  */
 - (void)loadBundle
 {
+    if (![self isGenerationAlive]) {
+        CPLog(@"Ignoring a reload requested by a React Native instance that is no longer running.");
+        return;
+    }
+
     @synchronized([CodePush class]) {
         hasInitializedUpdateAfterRestartForCurrentLoad = NO;
     }
@@ -802,6 +857,11 @@ RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage
 
 - (void)restartAppInternal:(BOOL)onlyIfUpdateIsPending
 {
+    if (![self isGenerationAlive]) {
+        CPLog(@"Ignoring a restart requested by a React Native instance that is no longer running.");
+        return;
+    }
+
     if (_restartInProgress) {
         CPLog(@"Restart request queued until the current restart is completed.");
         [_restartQueue addObject:@(onlyIfUpdateIsPending)];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bravemobile/react-native-code-push",
-  "version": "13.1.0",
+  "version": "13.2.0",
   "description": "React Native plugin for the CodePush service",
   "main": "src/CodePush.js",
   "react-native": "src/CodePush.js",
@@ -71,8 +71,8 @@
   ],
   "scripts": {
     "setup": "npm install --quiet --no-progress",
-    "setup-example-app": "ts-node --project scripts/setupExampleApp/tsconfig.json scripts/setupExampleApp/runSetupExampleApp.ts",
-    "setup-expo-example-app": "ts-node --project scripts/setupExampleApp/tsconfig.json scripts/setupExpoExampleApp/runSetupExpoExampleApp.ts",
+    "setup-example-app": "tsx scripts/setupExampleApp/runSetupExampleApp.ts",
+    "setup-expo-example-app": "tsx scripts/setupExpoExampleApp/runSetupExpoExampleApp.ts",
     "type:src": "tsc --project tsconfig.json --noEmit",
     "type:cli": "npm run --workspace cli typecheck",
     "type:scripts": "tsc --project scripts/tsconfig.json --noEmit",
@@ -82,7 +82,7 @@
     "prepack": "npm run build:cli",
     "eslint": "eslint --quiet .",
     "jest": "jest src/CodePush.test.js src/versioning/* expo/* && npm run --workspace cli test",
-    "e2e": "ts-node --project e2e/tsconfig.json e2e/run.ts"
+    "e2e": "tsx e2e/run.ts"
   },
   "publishConfig": {
     "access": "public"
@@ -102,11 +102,19 @@
   },
   "peerDependencies": {
     "expo": ">=50.0.0",
-    "react-native": "*"
+    "react-native": "*",
+    "ts-node": ">=10",
+    "tsx": ">=4"
   },
   "peerDependenciesMeta": {
     "expo": {
       "optional": true
+    },
+    "ts-node": {
+      "optional": true
+    },
+    "tsx": {
+      "optional": true
     }
   },
   "devDependencies": {
@@ -128,7 +136,7 @@
     "jest": "^29.7.0",
     "react": "19.2.3",
     "react-native": "0.84.1",
-    "ts-node": "^10.9.2",
+    "tsx": "^4.23.13",
     "typescript": "5.0.4",
     "typescript-eslint": "^8.11.0"
   },