@srcpush/react-native-code-push 1.0.3-beta → 1.0.3-feat-new-architecture.1

package/CodePush.js

@@ -1,11 +1,11 @@
 import { AcquisitionManager as Sdk } from "code-push/script/acquisition-sdk";
 import { Alert } from "./AlertAdapter";
 import requestFetchAdapter from "./request-fetch-adapter";
-import { AppState, Platform } from "react-native";
+import { AppState, Platform, TurboModuleRegistry } from "react-native";
 import log from "./logging";
 import hoistStatics from 'hoist-non-react-statics';
 
-let NativeCodePush = require("react-native").NativeModules.CodePush;
+let NativeCodePush = (TurboModuleRegistry?.get('CodePush')) || require("react-native").NativeModules.CodePush;
 const PackageMixins = require("./package-mixins")(NativeCodePush);
 
 async function checkForUpdate(deploymentKey = null, handleBinaryVersionMismatchCallback = null) {

package/android/app/build.gradle

@@ -40,6 +40,16 @@ android {
     defaultConfig {
         consumerProguardFiles 'proguard-rules.pro'
     }
+
+    sourceSets {
+        main {
+            if (IS_NEW_ARCHITECTURE_ENABLED) {
+                java.srcDirs += ['src/newarch/java']
+            } else {
+                java.srcDirs += ['src/oldarch/java']
+            }
+        }
+    }
 }
 
 dependencies {

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

@@ -46,7 +46,7 @@ import java.util.Map;
 import java.util.UUID;
 
 @OptIn(markerClass = UnstableReactNativeAPI.class)
-public class CodePushNativeModule extends BaseJavaModule {
+public class CodePushNativeModule extends CodePushNativeModuleSpec {
     private String mBinaryContentsHash = null;
     private String mClientUniqueId = null;
     private LifecycleEventListener mLifecycleEventListener = null;
@@ -82,6 +82,11 @@ public class CodePushNativeModule extends BaseJavaModule {
 
     @Override
     public Map<String, Object> getConstants() {
+        return getTypedExportedConstants();
+    }
+
+    @Override
+    public Map<String, Object> getTypedExportedConstants() {
         final Map<String, Object> constants = new HashMap<>();
 
         constants.put("codePushInstallModeImmediate", CodePushInstallMode.IMMEDIATE.getValue());
@@ -500,8 +505,9 @@ public class CodePushNativeModule extends BaseJavaModule {
         }
     }
 
+    @Override
     @ReactMethod
-    public void getUpdateMetadata(final int updateState, final Promise promise) {
+    public void getUpdateMetadata(final double updateState, final Promise promise) {
         AsyncTask<Void, Void, Void> asyncTask = new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(Void... params) {
@@ -520,11 +526,11 @@ public class CodePushNativeModule extends BaseJavaModule {
                         currentUpdateIsPending = mSettingsManager.isPendingUpdate(currentHash);
                     }
 
-                    if (updateState == CodePushUpdateState.PENDING.getValue() && !currentUpdateIsPending) {
+                    if ((int)updateState == CodePushUpdateState.PENDING.getValue() && !currentUpdateIsPending) {
                         // The caller wanted a pending update
                         // but there isn't currently one.
                         promise.resolve(null);
-                    } else if (updateState == CodePushUpdateState.RUNNING.getValue() && currentUpdateIsPending) {
+                    } else if ((int)updateState == CodePushUpdateState.RUNNING.getValue() && currentUpdateIsPending) {
                         // The caller wants the running update, but the current
                         // one is pending, so we need to grab the previous.
                         JSONObject previousPackage = mUpdateManager.getPreviousPackage();
@@ -625,8 +631,9 @@ public class CodePushNativeModule extends BaseJavaModule {
         asyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 
+    @Override
     @ReactMethod
-    public void installUpdate(final ReadableMap updatePackage, final int installMode, final int minimumBackgroundDuration, final Promise promise) {
+    public void installUpdate(final ReadableMap updatePackage, final double installMode, final double minimumBackgroundDuration, final Promise promise) {
         AsyncTask<Void, Void, Void> asyncTask = new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(Void... params) {
@@ -640,17 +647,17 @@ public class CodePushNativeModule extends BaseJavaModule {
                         mSettingsManager.savePendingUpdate(pendingHash, /* isLoading */false);
                     }
 
-                    if (installMode == CodePushInstallMode.ON_NEXT_RESUME.getValue() ||
+                    if ((int)installMode == CodePushInstallMode.ON_NEXT_RESUME.getValue() ||
                         // We also add the resume listener if the installMode is IMMEDIATE, because
                         // if the current activity is backgrounded, we want to reload the bundle when
                         // it comes back into the foreground.
-                        installMode == CodePushInstallMode.IMMEDIATE.getValue() ||
-                        installMode == CodePushInstallMode.ON_NEXT_SUSPEND.getValue()) {
+                        (int)installMode == CodePushInstallMode.IMMEDIATE.getValue() ||
+                        (int)installMode == CodePushInstallMode.ON_NEXT_SUSPEND.getValue()) {
 
                         // Store the minimum duration on the native module as an instance
                         // variable instead of relying on a closure below, so that any
                         // subsequent resume-based installs could override it.
-                        CodePushNativeModule.this.mMinimumBackgroundDuration = minimumBackgroundDuration;
+                        CodePushNativeModule.this.mMinimumBackgroundDuration = (int)minimumBackgroundDuration;
 
                         if (mLifecycleEventListener == null) {
                             // Ensure we do not add the listener twice.
@@ -672,7 +679,7 @@ public class CodePushNativeModule extends BaseJavaModule {
                                     // the foreground, so explicitly wait for it to be backgrounded first
                                     if (lastPausedDate != null) {
                                         long durationInBackground = (new Date().getTime() - lastPausedDate.getTime()) / 1000;
-                                        if (installMode == CodePushInstallMode.IMMEDIATE.getValue()
+                                        if ((int)installMode == CodePushInstallMode.IMMEDIATE.getValue()
                                                 || durationInBackground >= CodePushNativeModule.this.mMinimumBackgroundDuration) {
                                             CodePushUtils.log("Loading bundle on resume");
                                             restartAppInternal(false);
@@ -686,8 +693,8 @@ public class CodePushNativeModule extends BaseJavaModule {
                                     // resumed, we can detect how long it was in the background.
                                     lastPausedDate = new Date();
 
-                                    if (installMode == CodePushInstallMode.ON_NEXT_SUSPEND.getValue() && mSettingsManager.isPendingUpdate(null)) {
-                                        appSuspendHandler.postDelayed(loadBundleRunnable, minimumBackgroundDuration * 1000);
+                                    if ((int)installMode == CodePushInstallMode.ON_NEXT_SUSPEND.getValue() && mSettingsManager.isPendingUpdate(null)) {
+                                        appSuspendHandler.postDelayed(loadBundleRunnable, (int)minimumBackgroundDuration * 1000);
                                     }
                                 }
 
@@ -700,7 +707,11 @@ public class CodePushNativeModule extends BaseJavaModule {
                         }
                     }
 
-                    promise.resolve("");
+                    if ((int)installMode == CodePushInstallMode.IMMEDIATE.getValue()) {
+                        loadBundle();
+                    }
+
+                    promise.resolve(null);
                 } catch(CodePushUnknownException e) {
                     CodePushUtils.log(e);
                     promise.reject(e);
@@ -822,13 +833,15 @@ public class CodePushNativeModule extends BaseJavaModule {
         mCodePush.clearUpdates();
     }
 
+    @Override
     @ReactMethod
     public void addListener(String eventName) {
         // Set up any upstream listeners or background tasks as necessary
     }
 
+    @Override
     @ReactMethod
-    public void removeListeners(Integer count) {
+    public void removeListeners(double count) {
         // Remove upstream listeners, stop unnecessary background tasks
     }
 

package/android/app/src/newarch/java/com/microsoft/codepush/react/CodePushNativeModuleSpec.java

@@ -0,0 +1,9 @@
+package com.microsoft.codepush.react;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+
+public abstract class CodePushNativeModuleSpec extends NativeRNCodePushSpec {
+    public CodePushNativeModuleSpec(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+}

package/android/app/src/oldarch/java/com/microsoft/codepush/react/CodePushNativeModuleSpec.java

@@ -0,0 +1,34 @@
+package com.microsoft.codepush.react;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReadableMap;
+
+public abstract class CodePushNativeModuleSpec extends ReactContextBaseJavaModule {
+    public CodePushNativeModuleSpec(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    public abstract void allow(Promise promise);
+    public abstract void clearPendingRestart(Promise promise);
+    public abstract void disallow(Promise promise);
+    public abstract void restartApp(boolean onlyIfUpdateIsPending, Promise promise);
+    public abstract void downloadUpdate(ReadableMap updatePackage, boolean notifyProgress, Promise promise);
+    public abstract void getConfiguration(Promise promise);
+    public abstract void getUpdateMetadata(double updateState, Promise promise);
+    public abstract void getNewStatusReport(Promise promise);
+    public abstract void installUpdate(ReadableMap updatePackage, double installMode, double minimumBackgroundDuration, Promise promise);
+    public abstract void isFailedUpdate(String packageHash, Promise promise);
+    public abstract void isFirstRun(String packageHash, Promise promise);
+    public abstract void notifyApplicationReady(Promise promise);
+    public abstract void recordStatusReported(ReadableMap statusReport);
+    public abstract void saveStatusReportForRetry(ReadableMap statusReport);
+    public abstract void downloadAndReplaceCurrentBundle(String remoteBundleUrl);
+    public abstract void clearUpdates();
+    public abstract void getLatestRollbackInfo(Promise promise);
+    public abstract void setLatestRollbackInfo(String packageHash, Promise promise);
+    public abstract void addListener(String eventName);
+    public abstract void removeListeners(double count);
+    public abstract java.util.Map<String, Object> getTypedExportedConstants();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@srcpush/react-native-code-push",
-  "version": "1.0.3-beta",
+  "version": "1.0.3-feat-new-architecture.1",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "code-push": "4.2.3",
-    "glob": "^7.1.7",
+    "glob": "^13.0.1",
     "hoist-non-react-statics": "^3.3.2",
     "inquirer": "^8.1.5",
     "plist": "^3.0.4",
@@ -58,7 +58,6 @@
     "archiver": "latest",
     "body-parser": "latest",
     "code-push-plugin-testing-framework": "file:./code-push-plugin-testing-framework",
-    "del": "v6.0.0",
     "express": "^5.1.0",
     "mkdirp": "latest",
     "mocha": "^11.7.2",
@@ -82,5 +81,13 @@
       "postlink": "node node_modules/@srcpush/react-native-code-push/scripts/postlink/run",
       "postunlink": "node node_modules/@srcpush/react-native-code-push/scripts/postunlink/run"
     }
+  },
+  "codegenConfig": {
+    "name": "RNCodePush",
+    "type": "modules",
+    "jsSrcsDir": "src",
+    "android": {
+      "javaPackageName": "com.microsoft.codepush.react"
+    }
   }
-}
+}

package/scripts/bump-version.js

@@ -0,0 +1,43 @@
+const { execSync } = require('child_process');
+const packageJson = require('../package.json');
+
+const branchName = process.argv[2];
+if (!branchName) {
+  console.error('Branch name is required');
+  process.exit(1);
+}
+
+const sanitizedBranch = branchName.replace(/[^a-zA-Z0-9]/g, '-').replace(/^-+|-+$/g, '');
+const baseVersion = packageJson.version;
+const versionPrefix = `${baseVersion}-${sanitizedBranch}`;
+
+console.error(`Prefix: ${versionPrefix}`);
+
+let versions = [];
+try {
+  const stdout = execSync(`npm view ${packageJson.name} versions --json`, { stdio: ['pipe', 'pipe', 'ignore'] }).toString();
+  versions = JSON.parse(stdout);
+  if (!Array.isArray(versions)) {
+    versions = [versions];
+  }
+} catch (e) {
+  console.error('Package not found or no versions. Starting from 1.');
+}
+
+let maxIncrement = 0;
+
+versions.forEach(v => {
+  if (v.startsWith(versionPrefix)) {
+    const suffix = v.slice(versionPrefix.length);
+    if (suffix.startsWith('.')) {
+      const numStr = suffix.substring(1);
+      const num = parseInt(numStr, 10);
+      if (!isNaN(num) && num > maxIncrement) {
+        maxIncrement = num;
+      }
+    }
+  }
+});
+
+const nextVersion = `${versionPrefix}.${maxIncrement + 1}`;
+console.log(nextVersion);

package/scripts/tools/linkToolsAndroid.js

@@ -52,6 +52,6 @@ function findMainApplication() {
     }
 
     var nameParts = appName.split('.');
-    var searchPath = glob.sync("**/" + nameParts[nameParts.length - 1] + ".java", ignoreFolders)[0];
+    var searchPath = globSync("**/" + nameParts[nameParts.length - 1] + ".java", ignoreFolders)[0];
     return searchPath;
 }

package/scripts/tools/linkToolsIos.js

@@ -5,7 +5,7 @@ var packageFile = require('../../../../package.json');
 
 var ignoreNodeModules = { ignore: "node_modules/**" };
 var ignoreNodeModulesAndPods = { ignore: ["node_modules/**", "ios/Pods/**"] };
-var appDelegatePaths = glob.sync("**/AppDelegate.+(mm|m)", ignoreNodeModules);
+var appDelegatePaths = glob.globSync ? glob.globSync("**/AppDelegate.+(mm|m)", ignoreNodeModules) : glob.sync("**/AppDelegate.+(mm|m)", ignoreNodeModules);
 
 exports.codePushHeaderImportStatement = `#import <CodePush/CodePush.h>`;
 exports.codePushHeaderImportStatementFormatted = `\n${this.codePushHeaderImportStatement}`;

package/src/NativeCodePush.ts

@@ -0,0 +1,39 @@
+import type { TurboModule } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
+
+export interface Spec extends TurboModule {
+  getConstants(): {
+    codePushInstallModeImmediate: number;
+    codePushInstallModeOnNextRestart: number;
+    codePushInstallModeOnNextResume: number;
+    codePushInstallModeOnNextSuspend: number;
+    codePushUpdateStateRunning: number;
+    codePushUpdateStatePending: number;
+    codePushUpdateStateLatest: number;
+  };
+
+  allow(): Promise<void>;
+  clearPendingRestart(): Promise<void>;
+  disallow(): Promise<void>;
+  restartApp(onlyIfUpdateIsPending: boolean): Promise<void>;
+  downloadUpdate(updatePackage: Object, notifyProgress: boolean): Promise<Object>;
+  getConfiguration(): Promise<Object>;
+  getUpdateMetadata(updateState: number): Promise<Object>;
+  getNewStatusReport(): Promise<Object>;
+  installUpdate(updatePackage: Object, installMode: number, minimumBackgroundDuration: number): Promise<void>;
+  isFailedUpdate(packageHash: string): Promise<boolean>;
+  isFirstRun(packageHash: string): Promise<boolean>;
+  notifyApplicationReady(): Promise<void>;
+  recordStatusReported(statusReport: Object): void;
+  saveStatusReportForRetry(statusReport: Object): void;
+  downloadAndReplaceCurrentBundle(remoteBundleUrl: string): void;
+  clearUpdates(): void;
+  getLatestRollbackInfo(): Promise<Object>;
+  setLatestRollbackInfo(packageHash: string): Promise<void>;
+  
+  // Events
+  addListener(eventName: string): void;
+  removeListeners(count: number): void;
+}
+
+export default TurboModuleRegistry.get<Spec>('CodePush');