@algocare/react-native-code-push 11.2.0 → 12.1.0

package/CodePush.js

@@ -8,8 +8,9 @@ let NativeCodePush = require('react-native').NativeModules.CodePush
 const PackageMixins = require('./package-mixins')(NativeCodePush)
 
 async function checkForUpdate(
-  prNumber,
-  packageHash,
+  prNumber = null,
+  packageHash = null,
+  deploymentKey = null,
   handleBinaryVersionMismatchCallback = null
 ) {
   /*
@@ -29,7 +30,9 @@ async function checkForUpdate(
    * dynamically "redirecting" end-users at different
    * deployments (e.g. an early access deployment for insiders).
    */
-  const config = nativeConfig
+  const config = deploymentKey
+    ? { ...nativeConfig, ...{ deploymentKey } }
+    : nativeConfig
 
   // Use dynamically overridden getCurrentPackage() during tests.
   const localPackage = await module.exports.getCurrentPackage()
@@ -64,6 +67,9 @@ async function checkForUpdate(
         client_unique_id: config.clientUniqueId,
       }
 
+      console.log('updateRequest')
+      console.log(updateRequest)
+
       /**
        * @type {updateChecker|undefined}
        * @deprecated
@@ -81,28 +87,52 @@ async function checkForUpdate(
         const releaseHistory =
           await sharedCodePushOptions.releaseHistoryFetcher(updateRequest)
 
-        const filteredReleaseHistory = Object.entries(releaseHistory)
-          .filter(([key]) => key.includes(prNumber))
-          .reduce((acc, [key, value]) => {
-            const version = key.split('-')[1]
-            acc[version] = value
-            return acc
-          }, {})
+        const releaseHistoryVersions = Object.keys(releaseHistory)
+
+        console.log('releaseHistory')
+        console.log(releaseHistory)
 
-        const _releaseHistory = packageHash
-          ? filteredReleaseHistory
-          : releaseHistory
+        console.log('prNumber')
+        console.log(prNumber)
+
+        if (
+          !prNumber &&
+          updateRequest.label.includes('-') &&
+          releaseHistoryVersions.includes(updateRequest.label)
+        ) {
+          // Pull Request 업데이트 체크 후 재시작 시 다시 시작 방지
+          console.log('after updating pull request, skip update check')
+          return
+        }
 
+        const filteredReleaseHistory = prNumber
+          ? Object.entries(releaseHistory)
+              .filter(([key]) => key.includes(prNumber))
+              .reduce((acc, [key, value]) => {
+                const version = key.split('-')[1]
+                acc[version] = value
+                return acc
+              }, {})
+          : Object.entries(releaseHistory)
+              .filter(([key]) => !key.includes('-'))
+              .reduce((acc, [key, value]) => {
+                acc[key] = value
+                return acc
+              }, {})
+
+        console.log('filteredReleaseHistory')
+        console.log(filteredReleaseHistory)
         /**
          * `runtimeVersion`
          * The version of currently running CodePush update. (It can be undefined if the app is running without CodePush update.)
          * @type {string|undefined}
          */
-        const runtimeVersion = packageHash
-          ? updateRequest.label.split('-')[1]
-          : updateRequest.label
+        const runtimeVersion =
+          updateRequest.label && updateRequest.label.includes('-')
+            ? updateRequest.label.split('-')[1]
+            : updateRequest.label
 
-        const versioning = new SemverVersioning(_releaseHistory)
+        const versioning = new SemverVersioning(filteredReleaseHistory)
 
         const shouldRollbackToBinary =
           versioning.shouldRollbackToBinary(runtimeVersion)
@@ -117,6 +147,9 @@ async function checkForUpdate(
           versioning.findLatestRelease()
         const isMandatory = versioning.checkIsMandatory(runtimeVersion)
 
+        console.log('latestVersion')
+        console.log(latestVersion)
+
         /**
          * Convert the update information decided from `ReleaseHistoryInterface` to be passed to the library core (original CodePush library).
          *
@@ -136,7 +169,7 @@ async function checkForUpdate(
            * Retrieve the update version from the ReleaseHistory and store it in the label.
            * This information can be accessed at runtime through the CodePush bundle metadata.
            */
-          label: latestVersion,
+          label: prNumber ? `${prNumber}-${latestVersion}` : latestVersion,
           // false 전달해야 정상 동작함
           update_app_version: false,
           // 그닥 쓸모 없음
@@ -202,7 +235,7 @@ async function checkForUpdate(
     remotePackage.failedInstall = await NativeCodePush.isFailedUpdate(
       remotePackage.packageHash
     )
-    remotePackage.deploymentKey = nativeConfig.deploymentKey
+    remotePackage.deploymentKey = deploymentKey || nativeConfig.deploymentKey
     return remotePackage
   }
 }
@@ -257,6 +290,7 @@ async function getUpdateMetadata(updateState) {
   let updateMetadata = await NativeCodePush.getUpdateMetadata(
     updateState || CodePush.UpdateState.RUNNING
   )
+
   if (updateMetadata) {
     updateMetadata = { ...PackageMixins.local, ...updateMetadata }
     updateMetadata.failedInstall = await NativeCodePush.isFailedUpdate(
@@ -561,9 +595,12 @@ async function syncInternal(
     await CodePush.notifyApplicationReady()
 
     syncStatusChangeCallback(CodePush.SyncStatus.CHECKING_FOR_UPDATE)
+    console.log('syncOptions')
+    console.log(syncOptions)
     const remotePackage = await checkForUpdate(
       syncOptions.prNumber,
       syncOptions.packageHash,
+      syncOptions.deploymentKey,
       handleBinaryVersionMismatchCallback
     )
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@algocare/react-native-code-push",
-  "version": "11.2.0",
+  "version": "12.1.0",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",