@bravemobile/react-native-code-push 12.0.0-beta.2 → 12.0.0-beta.5

package/CodePush.js

@@ -9,6 +9,54 @@ const PackageMixins = require("./package-mixins")(NativeCodePush);
 
 const DEPLOYMENT_KEY = 'deprecated_deployment_key';
 
+/**
+ * @param deviceId {string}
+ * @returns {number}
+ */
+function hashDeviceId(deviceId) {
+  let hash = 0;
+  for (let i = 0; i < deviceId.length; i++) {
+    hash = ((hash << 5) - hash) + deviceId.charCodeAt(i);
+    hash |= 0; // Convert to 32bit int
+  }
+  return Math.abs(hash);
+}
+
+/**
+ * @param clientId {string}
+ * @param packageHash {string}
+ * @returns {number}
+ */
+function getBucket(clientId, packageHash) {
+  const hash = hashDeviceId(`${clientId ?? ''}_${packageHash ?? ''}`);
+  return (Math.abs(hash) % 100);
+}
+
+/**
+ * Note that the `clientUniqueId` value may not guarantee the same value if the app is deleted and re-installed.
+ * In other words, if a user re-installs the app, the result of this function may change.
+ * @returns {Promise<boolean>}
+ */
+async function decideLatestReleaseIsInRollout(versioning, clientId, onRolloutSkipped) {
+  const [latestVersion, latestReleaseInfo] = versioning.findLatestRelease();
+
+  if (latestReleaseInfo.rollout === undefined || latestReleaseInfo.rollout >= 100) {
+    return true;
+  }
+
+  const bucket = getBucket(clientId, latestReleaseInfo.packageHash);
+  const inRollout = bucket < latestReleaseInfo.rollout;
+
+  log(`Bucket: ${bucket}, rollout: ${latestReleaseInfo.rollout} → ${inRollout ? 'IN' : 'OUT'}`);
+
+  if (!inRollout) {
+    log(`Skipping update due to rollout. Bucket ${bucket} is not smaller than rollout range ${latestReleaseInfo.rollout}.`);
+    onRolloutSkipped?.(latestVersion);
+  }
+
+  return inRollout;
+}
+
 async function checkForUpdate(handleBinaryVersionMismatchCallback = null) {
   /*
    * Before we ask the server if an update exists, we
@@ -42,6 +90,9 @@ async function checkForUpdate(handleBinaryVersionMismatchCallback = null) {
     }
   }
 
+  /**
+   * @type {RemotePackage|null|undefined}
+   */
   const update = await (async () => {
     try {
       const updateRequest = {
@@ -58,8 +109,8 @@ async function checkForUpdate(handleBinaryVersionMismatchCallback = null) {
        */
       const updateChecker = sharedCodePushOptions.updateChecker;
       if (updateChecker) {
+        // We do not provide rollout functionality. This could be implemented in the `updateChecker`.
         const { update_info } = await updateChecker(updateRequest);
-
         return mapToRemotePackageMetadata(update_info);
       } else {
         /**
@@ -77,6 +128,9 @@ async function checkForUpdate(handleBinaryVersionMismatchCallback = null) {
 
         const versioning = new SemverVersioning(releaseHistory);
 
+        const isInRollout = await decideLatestReleaseIsInRollout(versioning, nativeConfig.clientUniqueId, sharedCodePushOptions?.onRolloutSkipped);
+        versioning.setIsLatestReleaseInRollout(isInRollout);
+
         const shouldRollbackToBinary = versioning.shouldRollbackToBinary(runtimeVersion)
         if (shouldRollbackToBinary) {
           // Reset to latest major version and restart
@@ -217,7 +271,7 @@ async function getCurrentPackage() {
 async function getUpdateMetadata(updateState) {
   let updateMetadata = await NativeCodePush.getUpdateMetadata(updateState || CodePush.UpdateState.RUNNING);
   if (updateMetadata) {
-    updateMetadata = {...PackageMixins.local, ...updateMetadata};
+    updateMetadata = { ...PackageMixins.local, ...updateMetadata };
     updateMetadata.failedInstall = await NativeCodePush.isFailedUpdate(updateMetadata.packageHash);
     updateMetadata.isFirstRun = await NativeCodePush.isFirstRun(updateMetadata.packageHash);
   }
@@ -424,47 +478,47 @@ async function syncInternal(options = {}, syncStatusChangeCallback, downloadProg
     mandatoryInstallMode: CodePush.InstallMode.IMMEDIATE,
     minimumBackgroundDuration: 0,
     updateDialog: null,
-    ...options
+    ...options,
   };
 
   syncStatusChangeCallback = typeof syncStatusChangeCallback === "function"
     ? syncStatusChangeCallback
     : (syncStatus) => {
-        switch(syncStatus) {
-          case CodePush.SyncStatus.CHECKING_FOR_UPDATE:
-            log("Checking for update.");
-            break;
-          case CodePush.SyncStatus.AWAITING_USER_ACTION:
-            log("Awaiting user action.");
-            break;
-          case CodePush.SyncStatus.DOWNLOADING_PACKAGE:
-            log("Downloading package.");
-            break;
-          case CodePush.SyncStatus.INSTALLING_UPDATE:
-            log("Installing update.");
-            break;
-          case CodePush.SyncStatus.UP_TO_DATE:
-            log("App is up to date.");
-            break;
-          case CodePush.SyncStatus.UPDATE_IGNORED:
-            log("User cancelled the update.");
-            break;
-          case CodePush.SyncStatus.UPDATE_INSTALLED:
-            if (resolvedInstallMode == CodePush.InstallMode.ON_NEXT_RESTART) {
-              log("Update is installed and will be run on the next app restart.");
-            } else if (resolvedInstallMode == CodePush.InstallMode.ON_NEXT_RESUME) {
-              if (syncOptions.minimumBackgroundDuration > 0) {
-                log(`Update is installed and will be run after the app has been in the background for at least ${syncOptions.minimumBackgroundDuration} seconds.`);
-              } else {
-                log("Update is installed and will be run when the app next resumes.");
-              }
+      switch (syncStatus) {
+        case CodePush.SyncStatus.CHECKING_FOR_UPDATE:
+          log("Checking for update.");
+          break;
+        case CodePush.SyncStatus.AWAITING_USER_ACTION:
+          log("Awaiting user action.");
+          break;
+        case CodePush.SyncStatus.DOWNLOADING_PACKAGE:
+          log("Downloading package.");
+          break;
+        case CodePush.SyncStatus.INSTALLING_UPDATE:
+          log("Installing update.");
+          break;
+        case CodePush.SyncStatus.UP_TO_DATE:
+          log("App is up to date.");
+          break;
+        case CodePush.SyncStatus.UPDATE_IGNORED:
+          log("User cancelled the update.");
+          break;
+        case CodePush.SyncStatus.UPDATE_INSTALLED:
+          if (resolvedInstallMode == CodePush.InstallMode.ON_NEXT_RESTART) {
+            log("Update is installed and will be run on the next app restart.");
+          } else if (resolvedInstallMode == CodePush.InstallMode.ON_NEXT_RESUME) {
+            if (syncOptions.minimumBackgroundDuration > 0) {
+              log(`Update is installed and will be run after the app has been in the background for at least ${syncOptions.minimumBackgroundDuration} seconds.`);
+            } else {
+              log("Update is installed and will be run when the app next resumes.");
             }
-            break;
-          case CodePush.SyncStatus.UNKNOWN_ERROR:
-            log("An unknown error occurred.");
-            break;
-        }
-      };
+          }
+          break;
+        case CodePush.SyncStatus.UNKNOWN_ERROR:
+          log("An unknown error occurred.");
+          break;
+      }
+    };
 
   let remotePackageLabel;
   try {
@@ -497,7 +551,7 @@ async function syncInternal(options = {}, syncStatusChangeCallback, downloadProg
 
     if (!remotePackage || updateShouldBeIgnored) {
       if (updateShouldBeIgnored) {
-          log("An update is available, but it is being ignored due to having been previously rolled back.");
+        log("An update is available, but it is being ignored due to having been previously rolled back.");
       }
 
       const currentPackage = await CodePush.getCurrentPackage();
@@ -536,7 +590,7 @@ async function syncInternal(options = {}, syncStatusChangeCallback, downloadProg
             onPress: () => {
               syncStatusChangeCallback(CodePush.SyncStatus.UPDATE_IGNORED);
               resolve(CodePush.SyncStatus.UPDATE_IGNORED);
-            }
+            },
           });
         }
 
@@ -544,10 +598,10 @@ async function syncInternal(options = {}, syncStatusChangeCallback, downloadProg
         // right of any other button, add it last
         dialogButtons.push({
           text: installButtonText,
-          onPress:() => {
+          onPress: () => {
             doDownloadAndInstall()
               .then(resolve, reject);
-          }
+          },
         })
 
         // If the update has a description, and the developer
@@ -609,6 +663,9 @@ let CodePush;
  *
  *   onSyncError: (label: string, error: Error) => void | undefined,
  *   setOnSyncError(onSyncErrorFunction: (label: string, error: Error) => void | undefined): void,
+ *
+ *   onRolloutSkipped: (label: string, error: Error) => void | undefined,
+ *   setOnRolloutSkipped(onRolloutSkippedFunction: (label: string, error: Error) => void | undefined): void,
  * }}
  */
 const sharedCodePushOptions = {
@@ -653,6 +710,12 @@ const sharedCodePushOptions = {
     if (typeof onSyncErrorFunction !== 'function') throw new Error('Please pass a function to onSyncError');
     this.onSyncError = onSyncErrorFunction;
   },
+  onRolloutSkipped: undefined,
+  setOnRolloutSkipped(onRolloutSkippedFunction) {
+    if (!onRolloutSkippedFunction) return;
+    if (typeof onRolloutSkippedFunction !== 'function') throw new Error('Please pass a function to onRolloutSkipped');
+    this.onRolloutSkipped = onRolloutSkippedFunction;
+  },
 }
 
 function codePushify(options = {}) {
@@ -671,7 +734,7 @@ function codePushify(options = {}) {
     throw new Error(
 `Unable to find the "Component" class, please either:
 1. Upgrade to a newer version of React Native that supports it, or
-2. Call the codePush.sync API in your component instead of using the @codePush decorator`
+2. Call the codePush.sync API in your component instead of using the @codePush decorator`,
     );
   }
 
@@ -688,6 +751,7 @@ function codePushify(options = {}) {
   sharedCodePushOptions.setOnDownloadStart(options.onDownloadStart);
   sharedCodePushOptions.setOnDownloadSuccess(options.onDownloadSuccess);
   sharedCodePushOptions.setOnSyncError(options.onSyncError);
+  sharedCodePushOptions.setOnRolloutSkipped(options.onRolloutSkipped);
 
   const decorator = (RootComponent) => {
     class CodePushComponent extends React.Component {
@@ -730,7 +794,7 @@ function codePushify(options = {}) {
       }
 
       render() {
-        const props = {...this.props};
+        const props = { ...this.props };
 
         // We can set ref property on class components only (not stateless)
         // Check it by render method
@@ -777,7 +841,7 @@ if (NativeCodePush) {
       IMMEDIATE: NativeCodePush.codePushInstallModeImmediate, // Restart the app immediately
       ON_NEXT_RESTART: NativeCodePush.codePushInstallModeOnNextRestart, // Don't artificially restart the app. Allow the update to be "picked up" on the next app restart
       ON_NEXT_RESUME: NativeCodePush.codePushInstallModeOnNextResume, // Restart the app the next time it is resumed from the background
-      ON_NEXT_SUSPEND: NativeCodePush.codePushInstallModeOnNextSuspend // Restart the app _while_ it is in the background,
+      ON_NEXT_SUSPEND: NativeCodePush.codePushInstallModeOnNextSuspend, // Restart the app _while_ it is in the background,
       // but only after it has been in the background for "minimumBackgroundDuration" seconds (0 by default),
       // so that user context isn't lost unless the app suspension is long enough to not matter
     },
@@ -790,17 +854,17 @@ if (NativeCodePush) {
       CHECKING_FOR_UPDATE: 5,
       AWAITING_USER_ACTION: 6,
       DOWNLOADING_PACKAGE: 7,
-      INSTALLING_UPDATE: 8
+      INSTALLING_UPDATE: 8,
     },
     CheckFrequency: {
       ON_APP_START: 0,
       ON_APP_RESUME: 1,
-      MANUAL: 2
+      MANUAL: 2,
     },
     UpdateState: {
       RUNNING: NativeCodePush.codePushUpdateStateRunning,
       PENDING: NativeCodePush.codePushUpdateStatePending,
-      LATEST: NativeCodePush.codePushUpdateStateLatest
+      LATEST: NativeCodePush.codePushUpdateStateLatest,
     },
     DeploymentStatus: {
       FAILED: "DeploymentFailed",
@@ -814,11 +878,11 @@ if (NativeCodePush) {
       optionalIgnoreButtonLabel: "Ignore",
       optionalInstallButtonLabel: "Install",
       optionalUpdateMessage: "An update is available. Would you like to install it?",
-      title: "Update available"
+      title: "Update available",
     },
     DEFAULT_ROLLBACK_RETRY_OPTIONS: {
       delayInHours: 24,
-      maxRetryAttempts: 1
+      maxRetryAttempts: 1,
     },
   });
 } else {

package/README.md

@@ -21,11 +21,13 @@ npm remove react-native-code-push
 npm install @bravemobile/react-native-code-push
 ```
 
-Then, follow the installation guide starting from **'4. "CodePush-ify" your app'**.
+1. Edit `android/app/build.gradle` file to remove the `apply from: "../../node_modules/..../codepush.gradle"` line.
 
-The following changes are optional but recommended for cleaning up the old configuration:
-- Since the deployment key is no longer needed due to the retirement of AppCenter, it is recommended to remove it from your `Info.plist`, `strings.xml`, or JavaScript code.
-- Thanks to Auto Linking, you can remove the `react-native-code-push` module settings from `settings.gradle`.
+2. The following changes are optional but recommended for cleaning up the old configuration:
+   - Since the deployment key is no longer needed due to the retirement of AppCenter, it is recommended to remove it from your `Info.plist`, `strings.xml`, or JavaScript code.
+   - Thanks to Auto Linking, you can remove the `react-native-code-push` module settings from `settings.gradle`.
+
+3. Follow the installation guide starting from **'4. "CodePush-ify" your app'**.
 
 
 ## ⚙️ Installation
@@ -35,7 +37,31 @@ The following changes are optional but recommended for cleaning up the old confi
 npm install @bravemobile/react-native-code-push
 ```
 
-### 2. iOS Setup
+### 2. Run init command
+
+For React Native CLI projects, you can use the automatic setup command to configure your project for CodePush.
+
+This command will automatically edit your `AppDelegate` and `MainApplication` files to integrate CodePush.
+
+```bash
+npx code-push init
+```
+
+And run the following command to install CocoaPods dependencies for iOS:
+
+```bash
+cd ios && pod install && cd ..
+```
+(or `npx pod-install`, `bundle exec pod install --project-directory=./ios`, ..)
+
+### 2-1. Manual Setup
+
+If you prefer manual setup or if the automatic configuration fails, you can follow the manual setup instructions below.
+
+<details><summary>Click to see the manual setup instructions.</summary>
+<p>
+
+### iOS Manual Setup
 
 #### (1) Install CocoaPods Dependencies
 
@@ -54,7 +80,7 @@ Run `cd ios && pod install && cd ..`
 
 1. Open your project with Xcode (e.g. CodePushDemoApp.xcworkspace)
 2. File → New → File from Template
-3. Select 'Objective-C File' and click 'Next' and write any name as you like.  
+3. Select 'Objective-C File' and click 'Next' and write any name as you like.
 4. Then Xcode will ask you to create a bridging header file. Click 'Create'.
 5. Delete the file created in step 3.
 
@@ -110,17 +136,9 @@ Then, edit `AppDelegate.swift` like below.
 ```
 
 
-### 3. Android Setup
-
-#### (1) Edit `android/app/build.gradle`
-
-Add the following line to the end of the file.
-```diff
-  // ...
-+ apply from: "../../node_modules/@bravemobile/react-native-code-push/android/codepush.gradle"
-```
+### Android Manual Setup
 
-#### (2) Edit `MainApplication` Code
+#### Edit `MainApplication` Code
 
 **If you have `MainApplication.kt` (>= RN 0.73)**
 
@@ -161,7 +179,11 @@ Add the following line to the end of the file.
   }
 ```
 
-### 4. Expo Setup
+</p>
+</details>
+
+
+### 3. Expo Setup
 For Expo projects, you can use the automated config plugin instead of manual setup.
 
 **Add plugin to your Expo configuration:**
@@ -185,7 +207,8 @@ npx expo prebuild
 **Requirements**
 Expo SDK: 50.0.0 or higher
 
-### 5. "CodePush-ify" Your App
+
+### 4. "CodePush-ify" Your App
 
 The root component of your app should be wrapped with a higher-order component.
 
@@ -199,8 +222,8 @@ At runtime, the library fetches this information to keep the app up to date.
 
 ```typescript
 import CodePush, {
-    ReleaseHistoryInterface,
-    UpdateCheckRequest,
+  ReleaseHistoryInterface,
+  UpdateCheckRequest,
 } from "@bravemobile/react-native-code-push";
 
 // ... MyApp Component
@@ -229,7 +252,7 @@ export default CodePush({
 > The URL for fetching the release history should point to the resource location generated by the CLI tool.
 
 
-#### 5-1. Telemetry Callbacks
+#### 4-1. Telemetry Callbacks
 
 Please refer to the [CodePushOptions](https://github.com/Soomgo-Mobile/react-native-code-push/blob/f0d26f7614af41c6dd4daecd9f7146e2383b2b0d/typings/react-native-code-push.d.ts#L76-L95) type for more details.
 - **onUpdateSuccess:** Triggered when the update bundle is executed successfully.
@@ -239,7 +262,7 @@ Please refer to the [CodePushOptions](https://github.com/Soomgo-Mobile/react-nat
 - **onSyncError:** Triggered when an unknown error occurs during the update process. (`CodePush.SyncStatus.UNKNOWN_ERROR` status)
 
 
-### 6. Configure the CLI Tool
+### 5. Configure the CLI Tool
 
 > [!TIP]
 > For a more detailed and practical example, refer to the `CodePushDemoApp` in `example` directory. ([link](https://github.com/Soomgo-Mobile/react-native-code-push/tree/master/Examples/CodePushDemoApp))
@@ -352,7 +375,7 @@ Create a new release history for a specific binary app version.
   This ensures that the library runtime recognizes the binary app as the latest version and determines that no CodePush update is available for it.
 
 **Example:**
-- Create a new release history for the binary app version `1.0.0`. 
+- Create a new release history for the binary app version `1.0.0`.
 
 ```bash
 npx code-push create-history --binary-version 1.0.0 --platform ios --identifier staging

package/cli/commands/initCommand/index.js

@@ -0,0 +1,14 @@
+const { initAndroid } = require('./initAndroid');
+const { initIos } = require('./initIos');
+const { program } = require('commander');
+
+program
+    .command('init')
+    .description('Automatically performs iOS/Android native configurations to initialize the CodePush project.')
+    .action(async () => {
+        console.log('log: Start initializing CodePush...');
+        await initAndroid();
+        await initIos();
+        console.log('log: CodePush has been successfully initialized.');
+    });
+

package/cli/commands/initCommand/initAndroid.js

@@ -0,0 +1,48 @@
+const path = require('path');
+const fs = require('fs');
+const { EOL } = require('os');
+
+function modifyMainApplicationKt(mainApplicationContent) {
+    if (mainApplicationContent.includes('CodePush.getJSBundleFile()')) {
+        console.log('log: MainApplication.kt already has CodePush initialized.');
+        return mainApplicationContent;
+    }
+    return mainApplicationContent
+        .replace('import com.facebook.react.ReactApplication', `import com.facebook.react.ReactApplication${EOL}import com.microsoft.codepush.react.CodePush`)
+        .replace('override fun getJSMainModuleName(): String = "index"', `override fun getJSMainModuleName(): String = "index"${EOL}        override fun getJSBundleFile(): String = CodePush.getJSBundleFile()`)
+}
+
+async function initAndroid() {
+    console.log('log: Running Android setup...');
+    await applyMainApplication();
+}
+
+async function applyMainApplication() {
+    const mainApplicationPath = await findMainApplication();
+    if (!mainApplicationPath) {
+        console.log('log: Could not find MainApplication.kt');
+        return;
+    }
+
+    if (mainApplicationPath.endsWith('.java')) {
+        console.log('log: MainApplication.java is not supported. Please migrate to MainApplication.kt.');
+        return;
+    }
+
+    const mainApplicationContent = fs.readFileSync(mainApplicationPath, 'utf-8');
+    const newContent = modifyMainApplicationKt(mainApplicationContent);
+    fs.writeFileSync(mainApplicationPath, newContent);
+    console.log('log: Successfully updated MainApplication.kt.');
+}
+
+async function findMainApplication() {
+    const searchPath = path.join(process.cwd(), 'android', 'app', 'src', 'main', 'java');
+    const files = fs.readdirSync(searchPath, { recursive: true });
+    const mainApplicationFile = files.find(file => file.endsWith('MainApplication.java') || file.endsWith('MainApplication.kt'));
+    return mainApplicationFile ? path.join(searchPath, mainApplicationFile) : null;
+}
+
+module.exports = {
+    initAndroid: initAndroid,
+    modifyMainApplicationKt: modifyMainApplicationKt,
+};

package/cli/commands/initCommand/initIos.js

@@ -0,0 +1,128 @@
+const path = require('path');
+const fs = require('fs');
+const xcode = require('xcode');
+
+async function initIos() {
+    console.log('log: Running iOS setup...');
+    const projectDir = path.join(process.cwd(), 'ios');
+    const files = fs.readdirSync(projectDir);
+    const xcodeprojFile = files.find(file => file.endsWith('.xcodeproj'));
+    if (!xcodeprojFile) {
+        console.log('log: Could not find .xcodeproj file in ios directory');
+        return;
+    }
+    const projectName = xcodeprojFile.replace('.xcodeproj', '');
+    const appDelegatePath = findAppDelegate(path.join(projectDir, projectName));
+
+    if (!appDelegatePath) {
+        console.log('log: Could not find AppDelegate file');
+        return;
+    }
+
+    if (appDelegatePath.endsWith('.swift')) {
+        await setupSwift(appDelegatePath, projectDir, projectName);
+    } else {
+        await setupObjectiveC(appDelegatePath);
+    }
+
+    console.log('log: Please run `cd ios && pod install` to complete the setup.');
+}
+
+function findAppDelegate(searchPath) {
+    if (!fs.existsSync(searchPath)) return null;
+    const files = fs.readdirSync(searchPath);
+    const appDelegateFile = files.find(file => file.startsWith('AppDelegate') && (file.endsWith('.m') || file.endsWith('.mm') || file.endsWith('.swift')));
+    return appDelegateFile ? path.join(searchPath, appDelegateFile) : null;
+}
+
+function modifyObjectiveCAppDelegate(appDelegateContent) {
+    const IMPORT_STATEMENT = '#import <CodePush/CodePush.h>';
+    if (appDelegateContent.includes(IMPORT_STATEMENT)) {
+        console.log('log: AppDelegate already has CodePush imported.');
+        return appDelegateContent;
+    }
+
+    return appDelegateContent
+        .replace('#import "AppDelegate.h"\n', `#import "AppDelegate.h"\n${IMPORT_STATEMENT}\n`)
+        .replace('[[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];', '[CodePush bundleURL];');
+}
+
+function modifySwiftAppDelegate(appDelegateContent) {
+    const CODEPUSH_CALL_STATEMENT = 'CodePush.bundleURL()';
+    if (appDelegateContent.includes(CODEPUSH_CALL_STATEMENT)) {
+        console.log('log: AppDelegate.swift already configured for CodePush.');
+        return appDelegateContent;
+    }
+
+    return appDelegateContent
+        .replace('Bundle.main.url(forResource: "main", withExtension: "jsbundle")', CODEPUSH_CALL_STATEMENT);
+}
+
+async function setupObjectiveC(appDelegatePath) {
+    const appDelegateContent = fs.readFileSync(appDelegatePath, 'utf-8');
+    const newContent = modifyObjectiveCAppDelegate(appDelegateContent);
+    fs.writeFileSync(appDelegatePath, newContent);
+    console.log('log: Successfully updated AppDelegate.m/mm.');
+}
+
+async function setupSwift(appDelegatePath, projectDir, projectName) {
+    const bridgingHeaderPath = await ensureBridgingHeader(projectDir, projectName);
+    if (!bridgingHeaderPath) {
+        console.log('log: Failed to create or find bridging header.');
+        return;
+    }
+
+    const appDelegateContent = fs.readFileSync(appDelegatePath, 'utf-8');
+    const newContent = modifySwiftAppDelegate(appDelegateContent);
+    fs.writeFileSync(appDelegatePath, newContent);
+    console.log('log: Successfully updated AppDelegate.swift.');
+}
+
+async function ensureBridgingHeader(projectDir, projectName) {
+    const projectPath = path.join(projectDir, `${projectName}.xcodeproj`, 'project.pbxproj');
+    const myProj = xcode.project(projectPath);
+
+    return new Promise((resolve, reject) => {
+        myProj.parse(function (err) {
+            if (err) {
+                console.error(`Error parsing Xcode project: ${err}`);
+                return reject(err);
+            }
+
+            const bridgingHeaderRelativePath = `${projectName}/${projectName}-Bridging-Header.h`;
+            const bridgingHeaderAbsolutePath = path.join(projectDir, bridgingHeaderRelativePath);
+
+            const configurations = myProj.pbxXCBuildConfigurationSection();
+            for (const name in configurations) {
+                const config = configurations[name];
+                if (config.buildSettings) {
+                    config.buildSettings.SWIFT_OBJC_BRIDGING_HEADER = `"${bridgingHeaderRelativePath}"`;
+                }
+            }
+
+            if (!fs.existsSync(bridgingHeaderAbsolutePath)) {
+                fs.mkdirSync(path.dirname(bridgingHeaderAbsolutePath), { recursive: true });
+                fs.writeFileSync(bridgingHeaderAbsolutePath, '#import <CodePush/CodePush.h>\n');
+                console.log(`log: Created bridging header at ${bridgingHeaderAbsolutePath}`);
+                const groupKey = myProj.findPBXGroupKey({ name: projectName });
+                myProj.addHeaderFile(bridgingHeaderRelativePath, { public: true }, groupKey);
+            } else {
+                const headerContent = fs.readFileSync(bridgingHeaderAbsolutePath, 'utf-8');
+                if (!headerContent.includes('#import <CodePush/CodePush.h>')) {
+                    fs.appendFileSync(bridgingHeaderAbsolutePath, '\n#import <CodePush/CodePush.h>\n');
+                    console.log(`log: Updated bridging header at ${bridgingHeaderAbsolutePath}`);
+                }
+            }
+
+            fs.writeFileSync(projectPath, myProj.writeSync());
+            console.log('log: Updated Xcode project with bridging header path.');
+            resolve(bridgingHeaderAbsolutePath);
+        });
+    });
+}
+
+module.exports = {
+    initIos: initIos,
+    modifyObjectiveCAppDelegate: modifyObjectiveCAppDelegate,
+    modifySwiftAppDelegate: modifySwiftAppDelegate,
+}

package/cli/commands/initCommand/test/initAndroid.test.js

@@ -0,0 +1,85 @@
+const fs = require('fs');
+const path = require('path');
+const { initAndroid, modifyMainApplicationKt } = require('../initAndroid');
+
+const tempDir = path.join(__dirname, 'temp');
+
+// https://github.com/react-native-community/template/blob/0.80.2/template/android/app/src/main/java/com/helloworld/MainApplication.kt
+const ktTemplate = `
+package com.helloworld
+
+import android.app.Application
+import com.facebook.react.PackageList
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactHost
+import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactPackage
+import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
+import com.facebook.react.defaults.DefaultReactNativeHost
+
+class MainApplication : Application(), ReactApplication {
+
+  override val reactNativeHost: ReactNativeHost =
+      object : DefaultReactNativeHost(this) {
+        override fun getPackages(): List<ReactPackage> =
+            PackageList(this).packages.apply {
+              // Packages that cannot be autolinked yet can be added manually here, for example:
+              // add(MyReactNativePackage())
+            }
+
+        override fun getJSMainModuleName(): String = "index"
+
+        override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
+
+        override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+        override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
+      }
+
+  override val reactHost: ReactHost
+    get() = getDefaultReactHost(applicationContext, reactNativeHost)
+
+  override fun onCreate() {
+    super.onCreate()
+    loadReactNative(this)
+  }
+}
+`;
+
+describe('Android init command', () => {
+    it('should correctly modify Kotlin MainApplication content', () => {
+        const modifiedContent = modifyMainApplicationKt(ktTemplate);
+        expect(modifiedContent).toContain('import com.microsoft.codepush.react.CodePush');
+        expect(modifiedContent).toContain('override fun getJSBundleFile(): String = CodePush.getJSBundleFile()');
+    });
+
+    it('should log a message and exit if MainApplication.java is found', async () => {
+        const originalCwd = process.cwd();
+
+        fs.mkdirSync(tempDir, { recursive: true });
+        process.chdir(tempDir);
+
+        // Arrange
+        const javaAppDir = path.join(tempDir, 'android', 'app', 'src', 'main', 'java', 'com', 'helloworld');
+        fs.mkdirSync(javaAppDir, { recursive: true });
+        const javaFilePath = path.join(javaAppDir, 'MainApplication.java');
+        const originalContent = '// Java file content';
+        fs.writeFileSync(javaFilePath, originalContent);
+
+        const consoleSpy = jest.spyOn(console, 'log').mockImplementation(() => {
+        });
+
+        // Act
+        await initAndroid();
+
+        // Assert
+        expect(consoleSpy).toHaveBeenCalledWith('MainApplication.java is not supported. Please migrate to MainApplication.kt.');
+        const finalContent = fs.readFileSync(javaFilePath, 'utf-8');
+        expect(finalContent).toBe(originalContent); // Ensure file is not modified
+
+        consoleSpy.mockRestore();
+
+        process.chdir(originalCwd);
+        fs.rmSync(tempDir, { recursive: true, force: true });
+    });
+});

package/cli/commands/initCommand/test/initIos.test.js

@@ -0,0 +1,98 @@
+const { modifyObjectiveCAppDelegate, modifySwiftAppDelegate } = require('../initIos');
+
+// https://github.com/react-native-community/template/blob/0.80.2/template/ios/HelloWorld/AppDelegate.swift
+const swiftTemplate = `
+import UIKit
+import React
+import React_RCTAppDelegate
+import ReactAppDependencyProvider
+
+@main
+class AppDelegate: UIResponder, UIApplicationDelegate {
+  var window: UIWindow?
+  var reactNativeDelegate: ReactNativeDelegate?
+  var reactNativeFactory: RCTReactNativeFactory?
+
+  func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+  ) -> Bool {
+    let delegate = ReactNativeDelegate()
+    let factory = RCTReactNativeFactory(delegate: delegate)
+    delegate.dependencyProvider = RCTAppDependencyProvider()
+    reactNativeDelegate = delegate
+    reactNativeFactory = factory
+    window = UIWindow(frame: UIScreen.main.bounds)
+    factory.startReactNative(
+      withModuleName: "HelloWorld",
+      in: window,
+      launchOptions: launchOptions
+    )
+    return true
+  }
+}
+
+class ReactNativeDelegate: RCTDefaultReactNativeFactoryDelegate {
+  override func sourceURL(for bridge: RCTBridge) -> URL? {
+    self.bundleURL()
+  }
+
+  override func bundleURL() -> URL? {
+    #if DEBUG
+    RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
+    #else
+    Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+    #endif
+  }
+}
+`;
+
+// https://github.com/react-native-community/template/blob/0.76.9/template/ios/HelloWorld/AppDelegate.mm
+const objcTemplate = `
+#import "AppDelegate.h"
+
+#import <React/RCTBundleURLProvider.h>
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+  self.moduleName = @"HelloWorld";
+  // You can add your custom initial props in the dictionary below.
+  // They will be passed down to the ViewController used by React Native.
+  self.initialProps = @{};
+
+  return [super application:application didFinishLaunchingWithOptions:launchOptions];
+}
+
+- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+{
+  return [self bundleURL];
+}
+
+- (NSURL *)bundleURL
+{
+#if DEBUG
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
+#else
+  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+#endif
+}
+
+@end
+`;
+
+describe('iOS init command - pure functions', () => {
+    it('should correctly modify Swift AppDelegate content', () => {
+        const modifiedContent = modifySwiftAppDelegate(swiftTemplate);
+        expect(modifiedContent).toContain('CodePush.bundleURL()');
+        expect(modifiedContent).not.toContain('Bundle.main.url(forResource: "main", withExtension: "jsbundle")');
+    });
+
+    it('should correctly modify Objective-C AppDelegate content', () => {
+        const modifiedContent = modifyObjectiveCAppDelegate(objcTemplate);
+        expect(modifiedContent).toContain('#import <CodePush/CodePush.h>');
+        expect(modifiedContent).toContain('[CodePush bundleURL]');
+        expect(modifiedContent).not.toContain('[[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];');
+    });
+});

package/cli/commands/releaseCommand/addToReleaseHistory.js

@@ -25,6 +25,7 @@ const fs = require("fs");
  * @param identifier {string?}
  * @param mandatory {boolean?}
  * @param enable {boolean?}
+ * @param rollout {number?}
  * @returns {Promise<void>}
  */
 async function addToReleaseHistory(
@@ -38,6 +39,7 @@ async function addToReleaseHistory(
     identifier,
     mandatory,
     enable,
+    rollout
 ) {
     const releaseHistory = await getReleaseHistory(binaryVersion, platform, identifier);
 
@@ -54,6 +56,10 @@ async function addToReleaseHistory(
         mandatory: mandatory,
         downloadUrl: bundleDownloadUrl,
         packageHash: packageHash,
+    };
+
+    if (typeof rollout === 'number') {
+        newReleaseHistory[appVersion].rollout = rollout;
     }
 
     try {

package/cli/commands/releaseCommand/index.js

@@ -16,6 +16,7 @@ program.command('release')
     .option('-j, --js-bundle-name <string>', 'JS bundle file name (default-ios: "main.jsbundle" / default-android: "index.android.bundle")')
     .option('-m, --mandatory <bool>', 'make the release to be mandatory', parseBoolean, false)
     .option('--enable <bool>', 'make the release to be enabled', parseBoolean, true)
+    .option('--rollout <number>', 'rollout percentage (0-100)', parseFloat)
     .option('--skip-bundle <bool>', 'skip bundle process', parseBoolean, false)
     .option('--skip-cleanup <bool>', 'skip cleanup process', parseBoolean, false)
     .option('--output-bundle-dir <string>', 'name of directory containing the bundle file created by the "bundle" command', OUTPUT_BUNDLE_DIR)
@@ -32,6 +33,7 @@ program.command('release')
      * @param {string} options.bundleName
      * @param {string} options.mandatory
      * @param {string} options.enable
+     * @param {number} options.rollout
      * @param {string} options.skipBundle
      * @param {string} options.skipCleanup
      * @param {string} options.outputBundleDir
@@ -40,6 +42,11 @@ program.command('release')
     .action(async (options) => {
         const config = findAndReadConfigFile(process.cwd(), options.config);
 
+        if (typeof options.rollout === 'number' && (options.rollout < 0 || options.rollout > 100)) {
+            console.error('Rollout percentage number must be between 0 and 100 (inclusive).');
+            process.exit(1);
+        }
+
         await release(
             config.bundleUploader,
             config.getReleaseHistory,
@@ -54,6 +61,7 @@ program.command('release')
             options.bundleName,
             options.mandatory,
             options.enable,
+            options.rollout,
             options.skipBundle,
             options.skipCleanup,
             `${options.outputPath}/${options.outputBundleDir}`,

package/cli/commands/releaseCommand/release.js

@@ -33,6 +33,7 @@ const { addToReleaseHistory } = require("./addToReleaseHistory");
  * @param jsBundleName {string}
  * @param mandatory {boolean}
  * @param enable {boolean}
+ * @param rollout {number}
  * @param skipBundle {boolean}
  * @param skipCleanup {boolean}
  * @param bundleDirectory {string}
@@ -52,6 +53,7 @@ async function release(
     jsBundleName,
     mandatory,
     enable,
+    rollout,
     skipBundle,
     skipCleanup,
     bundleDirectory,
@@ -82,6 +84,7 @@ async function release(
         identifier,
         mandatory,
         enable,
+        rollout,
     )
 
     if (!skipCleanup) {

package/cli/commands/updateHistoryCommand/index.js

@@ -12,6 +12,7 @@ program.command('update-history')
     .option('-c, --config <path>', 'set config file name (JS/TS)', CONFIG_FILE_NAME)
     .option('-m, --mandatory <bool>', 'make the release to be mandatory', parseBoolean, undefined)
     .option('-e, --enable <bool>', 'make the release to be enabled', parseBoolean, undefined)
+    .option('--rollout <number>', 'rollout percentage (0-100)', parseFloat, undefined)
     /**
      * @param {Object} options
      * @param {string} options.appVersion
@@ -21,6 +22,7 @@ program.command('update-history')
      * @param {string} options.config
      * @param {string} options.mandatory
      * @param {string} options.enable
+     * @param {number} options.rollout
      * @return {void}
      */
     .action(async (options) => {
@@ -40,6 +42,7 @@ program.command('update-history')
             options.identifier,
             options.mandatory,
             options.enable,
+            options.rollout
         )
     });
 

package/cli/commands/updateHistoryCommand/updateReleaseHistory.js

@@ -23,6 +23,7 @@ const path = require('path');
  * @param identifier {string?}
  * @param mandatory {boolean?}
  * @param enable {boolean?}
+ * @param rollout {number?}
  * @returns {Promise<void>}
  */
 async function updateReleaseHistory(
@@ -34,6 +35,7 @@ async function updateReleaseHistory(
     identifier,
     mandatory,
     enable,
+    rollout
 ) {
     const releaseHistory = await getReleaseHistory(binaryVersion, platform, identifier);
 
@@ -42,6 +44,7 @@ async function updateReleaseHistory(
 
     if (typeof mandatory === "boolean") updateInfo.mandatory = mandatory;
     if (typeof enable === "boolean") updateInfo.enabled = enable;
+    if (typeof rollout === "number") updateInfo.rollout = rollout;
 
     try {
         const JSON_FILE_NAME = `${binaryVersion}.json`;

package/cli/index.js

@@ -40,4 +40,10 @@ require('./commands/releaseCommand');
  */
 require('./commands/showHistoryCommand')
 
+/**
+ * npx code-push init
+ */
+require('./commands/initCommand')
+
+
 program.parse();

package/expo/plugin/withCodePushAndroid.js

@@ -21,7 +21,7 @@ function androidMainApplicationApplyImplementation(
     Please add "${add.replace(/\n/g, '').trim()}" to the MainApplication.kt.
     Supported format: Expo SDK default template.
 
-    Android manual setup: https://github.com/Soomgo-Mobile/react-native-code-push#3-android-setup
+    Android manual setup: https://github.com/Soomgo-Mobile/react-native-code-push#2-1-manual-setup
     `,
   );
 

package/expo/plugin/withCodePushIos.js

@@ -24,7 +24,7 @@ function iosApplyImplementation(
     Please ${replace ? 'replace' : 'add'} "${add.replace(/\n/g, '').trim()}" to the AppDelegate.(m|swift).
     Supported format: Expo SDK default template.
 
-    iOS manual setup: https://github.com/Soomgo-Mobile/react-native-code-push#2-ios-setup
+    iOS manual setup: https://github.com/Soomgo-Mobile/react-native-code-push#2-1-manual-setup
     `,
   );
 
@@ -126,7 +126,7 @@ const withIosBridgingHeader = (config) => {
         #import <CodePush/CodePush.h>
 
         Supported format: Expo SDK default template.
-        iOS manual setup: https://github.com/Soomgo-Mobile/react-native-code-push#2-edit-appdelegate-code
+        iOS manual setup: https://github.com/Soomgo-Mobile/react-native-code-push#2-1-manual-setup
         `
       );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bravemobile/react-native-code-push",
-  "version": "12.0.0-beta.2",
+  "version": "12.0.0-beta.5",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",
@@ -89,7 +89,8 @@
     "ts-node": "^10.9.2",
     "tslint": "^6.1.3",
     "typescript": "5.0.4",
-    "typescript-eslint": "^8.11.0"
+    "typescript-eslint": "^8.11.0",
+    "xcode": "^3.0.1"
   },
   "engines": {
     "node": ">=18"

package/typings/react-native-code-push.d.ts

@@ -29,6 +29,7 @@ export interface ReleaseInfo {
     mandatory: boolean;
     downloadUrl: string;
     packageHash: string;
+    rollout?: number;
 }
 
 // from code-push SDK
@@ -93,6 +94,10 @@ export interface CodePushOptions extends SyncOptions {
      * Callback function that is called when sync process failed.
      */
     onSyncError?: (label: string, error: Error) => void;
+    /**
+     * Callback function that is called when rollout is skipped.
+     */
+    onRolloutSkipped?: (label: string, error: Error) => void;
 }
 
 export interface DownloadProgress {

package/versioning/BaseVersioning.js

@@ -24,13 +24,19 @@ class BaseVersioning {
     this.sortedReleaseHistory = Object.entries(releaseHistory).sort(
       ([a], [b]) => this.sortingMethod(a, b)
     );
+
+    /** @type {boolean} */
+    this.isLatestReleaseInRollout = true;
   }
 
   /**
    * @return {[ReleaseVersion, ReleaseInfo][]}
    */
   get sortedEnabledReleaseHistory() {
-    return this.sortedReleaseHistory.filter(([_, bundle]) => bundle.enabled);
+    const list = this.sortedReleaseHistory.filter(([_, bundle]) => bundle.enabled)
+    // If the latest release is not a rollout target, exclude it from the list.
+    // - This also means that rollout deployment can only be applied to the latest release.
+    return this.isLatestReleaseInRollout ? list : list.slice(1);
   }
 
   /**
@@ -42,6 +48,11 @@ class BaseVersioning {
     );
   }
 
+  /** @param isLatestReleaseInRollout {boolean} */
+  setIsLatestReleaseInRollout(isLatestReleaseInRollout) {
+    this.isLatestReleaseInRollout = isLatestReleaseInRollout;
+  }
+
   /**
    * find latest release in releaseHistory
    * @return {[ReleaseVersion, ReleaseInfo]}

package/versioning/SemverVersioning.test.js

@@ -48,6 +48,36 @@ describe('Semver Versioning Test', () => {
                 { enabled: true, mandatory: true, downloadUrl: 'R3', packageHash: 'P3' }
             ])
         })
+
+        it('should return the previous enabled release if the latest release is not a rollout target', () => {
+            const RELEASED_BUNDLES = {
+                '1.0.0': { enabled: true, mandatory: false, ...MOCK_INFOS },
+                '1.1.0': { enabled: false, mandatory: false, ...MOCK_INFOS }, // not enabled
+                '1.2.0': { enabled: true, mandatory: false, ...MOCK_INFOS, rollout: 30 },
+            };
+            const LATEST_IS_ROLLOUT_TARGET = false;
+
+            const versioning = new SemverVersioning(RELEASED_BUNDLES);
+            versioning.setIsLatestReleaseInRollout(LATEST_IS_ROLLOUT_TARGET);
+
+            const [latestVersion] = versioning.findLatestRelease();
+            expect(latestVersion).toEqual('1.0.0');
+        })
+
+        it('should return the latest release if the latest release is a rollout target', () => {
+            const RELEASED_BUNDLES = {
+                '1.0.0': { enabled: true, mandatory: false, ...MOCK_INFOS },
+                '1.1.0': { enabled: true, mandatory: false, ...MOCK_INFOS },
+                '1.2.0': { enabled: true, mandatory: false, ...MOCK_INFOS, rollout: 30 },
+            };
+            const LATEST_IS_ROLLOUT_TARGET = true;
+
+            const versioning = new SemverVersioning(RELEASED_BUNDLES);
+            versioning.setIsLatestReleaseInRollout(LATEST_IS_ROLLOUT_TARGET);
+
+            const [latestVersion] = versioning.findLatestRelease();
+            expect(latestVersion).toEqual('1.2.0');
+        })
     })
 
     describe('checkIsMandatory', () => {
@@ -159,6 +189,26 @@ describe('Semver Versioning Test', () => {
                 expect(new SemverVersioning(RELEASED_BUNDLES).checkIsMandatory('1.1.1')).toBe(false);
                 expect(new SemverVersioning(RELEASED_BUNDLES).checkIsMandatory('1.2.0')).toBe(true);
             });
+
+            it('When having not-enabled releases and latest mandatory version is not a rollout target', () => {
+                const RELEASED_BUNDLES = {
+                    '1.0.0': FIRST_RELEASE_INFO,
+                    '1.0.1': { enabled: true, mandatory: true, ...MOCK_INFOS },
+                    '1.1.0': { enabled: false, mandatory: false, ...MOCK_INFOS },
+                    '1.1.1': { enabled: true, mandatory: true, ...MOCK_INFOS },
+                    '1.2.0': { enabled: true, mandatory: true, ...MOCK_INFOS, rollout: 30 },
+                };
+                const LATEST_IS_ROLLOUT_TARGET = false;
+
+                const versioning = new SemverVersioning(RELEASED_BUNDLES);
+                versioning.setIsLatestReleaseInRollout(LATEST_IS_ROLLOUT_TARGET);
+
+                expect(versioning.checkIsMandatory('1.0.0')).toBe(true); // update to 1.1.1
+                expect(versioning.checkIsMandatory('1.0.1')).toBe(true); // update to 1.1.1
+                expect(versioning.checkIsMandatory('1.1.0')).toBe(true); // update to 1.1.1
+                expect(versioning.checkIsMandatory('1.1.1')).toBe(false); // up to date
+                expect(versioning.checkIsMandatory('1.2.0')).toBe(true); // rollback target is treated as mandatory
+            })
         })
     })
 
@@ -201,5 +251,33 @@ describe('Semver Versioning Test', () => {
             expect(new SemverVersioning(RELEASED_BUNDLES_1).shouldRollbackToBinary('1.2.0')).toBe(false)
             expect(new SemverVersioning(RELEASED_BUNDLES_2).shouldRollbackToBinary('1.2.0-rc.2')).toBe(false)
         })
+
+        it ('should return true if the latest release is not a rollout target', () => {
+            const RELEASED_BUNDLES = {
+                '1.0.0': { enabled: true, mandatory: false, ...MOCK_INFOS },
+                '1.1.0': { enabled: true, mandatory: false, ...MOCK_INFOS, rollout: 30 },
+            };
+            const LATEST_IS_ROLLOUT_TARGET = false;
+
+            const versioning = new SemverVersioning(RELEASED_BUNDLES);
+            versioning.setIsLatestReleaseInRollout(LATEST_IS_ROLLOUT_TARGET);
+
+            // If the latest release was a rollout target and the rollout value is later reduced, the app might run on version 1.1.0.
+            expect(versioning.shouldRollbackToBinary('1.1.0')).toBe(true);
+        })
+
+        it ('should return false if the latest release and the previous release are both rollout targets', () => {
+            const RELEASED_BUNDLES = {
+                '1.0.0': { enabled: true, mandatory: false, ...MOCK_INFOS },
+                '1.1.0': { enabled: true, mandatory: false, ...MOCK_INFOS, rollout: 30 },
+                '1.2.0': { enabled: true, mandatory: false, ...MOCK_INFOS, rollout: 30 },
+            };
+            const LATEST_IS_ROLLOUT_TARGET = true;
+
+            const versioning = new SemverVersioning(RELEASED_BUNDLES);
+            versioning.setIsLatestReleaseInRollout(LATEST_IS_ROLLOUT_TARGET);
+
+            expect(versioning.shouldRollbackToBinary('1.0.0')).toBe(false); // update to 1.1.0
+        })
     })
 })