@algocare/react-native-code-push 10.0.0 → 10.1.0

package/cli/commands/common.js

@@ -39,7 +39,7 @@ async function getIdentifierValue() {
   return identifier
 }
 
-async function getBinaryVersionValue(
+async function getBinaryVersionValueFromList(
   getBinaryVersionList,
   app,
   platform,
@@ -89,9 +89,6 @@ async function getBinaryVersionValue(
           if (!semverRegex.test(input)) {
             return 'Please enter a valid version number (x.y.z)'
           }
-          if (currentBinaryVersionList.includes(input)) {
-            return `Version ${input} already exists`
-          }
           return true
         },
       },
@@ -104,58 +101,18 @@ async function getBinaryVersionValue(
   return binaryVersion
 }
 
-async function getBinaryVersionValueForInput(
-  getBinaryVersionList,
-  app,
-  platform,
-  identifier
-) {
-  const [currentBinaryVersionList, lastBinaryVersion] = await getBinaryVersions(
-    getBinaryVersionList,
-    app,
-    platform,
-    identifier
-  )
-
-  const message = lastBinaryVersion
-    ? `Enter the target binary version (current latest: ${lastBinaryVersion})`
-    : 'Enter the target binary version (there is no latest version)'
-
-  const { binaryVersion } = await inquirer.prompt([
-    {
-      type: 'input',
-      name: 'binaryVersion',
-      message,
-      validate: (input) => {
-        const semverRegex = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/
-        if (!semverRegex.test(input)) {
-          return 'Please enter a valid version number (x.y.z)'
-        }
-        if (currentBinaryVersionList.includes(input)) {
-          return `Version ${input} already exists`
-        }
-        return true
-      },
-    },
-  ])
-
-  return binaryVersion
-}
-
-async function getAppVersionValue(
+async function getAppVersionValueFromList(
   getReleaseHistory,
   binaryVersion,
   app,
   platform,
-  identifier,
   count = 5
 ) {
   const [currentAppVersionList] = await getAppVersions(
     getReleaseHistory,
     binaryVersion,
     app,
-    platform,
-    identifier
+    platform
   )
 
   if (!currentAppVersionList.length) {
@@ -194,9 +151,6 @@ async function getAppVersionValue(
           if (!semverRegex.test(input)) {
             return 'Please enter a valid version number (x.y.z)'
           }
-          if (currentAppVersionList.includes(input)) {
-            return `Version ${input} already exists`
-          }
           return true
         },
       },
@@ -209,19 +163,51 @@ async function getAppVersionValue(
   return appVersion
 }
 
-async function getAppVersionValueForInput(
-  getReleaseHistory,
-  binaryVersion,
+async function getBinaryVersionValueFromInput(
+  getBinaryVersionList,
   app,
   platform,
   identifier
+) {
+  const [, lastBinaryVersion] = await getBinaryVersions(
+    getBinaryVersionList,
+    app,
+    platform,
+    identifier
+  )
+
+  const message = lastBinaryVersion
+    ? `Enter the target binary version (current latest: ${lastBinaryVersion})`
+    : 'Enter the target binary version (there is no latest version)'
+
+  const { binaryVersion } = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'binaryVersion',
+      message,
+      validate: (input) => {
+        if (!semverRegex.test(input)) {
+          return 'Please enter a valid version number (x.y.z)'
+        }
+        return true
+      },
+    },
+  ])
+
+  return binaryVersion
+}
+
+async function getAppVersionValueFromInput(
+  getReleaseHistory,
+  binaryVersion,
+  app,
+  platform
 ) {
   const [currentAppVersionList, lastAppVersion] = await getAppVersions(
     getReleaseHistory,
     binaryVersion,
     app,
-    platform,
-    identifier
+    platform
   )
 
   const message = lastAppVersion
@@ -252,8 +238,8 @@ module.exports = {
   getAppValue,
   getPlatformValue,
   getIdentifierValue,
-  getBinaryVersionValue,
-  getAppVersionValue,
-  getBinaryVersionValueForInput,
-  getAppVersionValueForInput,
+  getBinaryVersionValueFromList,
+  getAppVersionValueFromList,
+  getBinaryVersionValueFromInput,
+  getAppVersionValueFromInput,
 }

package/cli/commands/createHistoryCommand/createReleaseHistory.js

@@ -10,18 +10,15 @@ const path = require('path')
  *     jsonFilePath: string,
  *     releaseInfo: ReleaseHistoryInterface,
  *     platform: string,
- *     identifier: string
  *   ): Promise<void>}
  * @param platform {"ios" | "android"}
- * @param identifier {string}
  * @returns {Promise<void>}
  */
 async function createReleaseHistory(
   app,
   targetVersion,
   setReleaseHistory,
-  platform,
-  identifier
+  platform
 ) {
   try {
     const JSON_FILE_NAME = `${targetVersion}.json`
@@ -33,14 +30,7 @@ async function createReleaseHistory(
     )
     fs.writeFileSync(JSON_FILE_PATH, JSON.stringify({}))
 
-    await setReleaseHistory(
-      targetVersion,
-      JSON_FILE_PATH,
-      {},
-      app,
-      platform,
-      identifier
-    )
+    await setReleaseHistory(targetVersion, JSON_FILE_PATH, {}, app, platform)
 
     fs.unlinkSync(JSON_FILE_PATH)
   } catch (error) {

package/cli/commands/createHistoryCommand/createReleaseHistoryList.js

@@ -5,12 +5,10 @@ const path = require('path')
  * @param app {"user" | "device"}
  * @param targetVersion {string}
  * @param platform {"ios" | "android"}
- * @param identifier {string}
  * @param getBinaryVersionList {
  *   function(
  *     app: string,
  *     platform: string,
- *     identifier: string
  *   ): Promise<{ [version: string]: string }>
  * }
  * @param setBinaryVersionList {
@@ -18,7 +16,6 @@ const path = require('path')
  *     targetVersion: string,
  *     app: string,
  *     platform: string,
- *     identifier: string
  *   ): Promise<void>
  * }
  * @returns {Promise<void>}
@@ -27,7 +24,6 @@ async function createReleaseHistoryList(
   app,
   targetVersion,
   platform,
-  identifier,
   getBinaryVersionList,
   setBinaryVersionList
 ) {
@@ -35,7 +31,7 @@ async function createReleaseHistoryList(
     const JSON_FILE_NAME = 'list.json'
     const JSON_FILE_PATH = path.resolve(process.cwd(), JSON_FILE_NAME)
 
-    const currentList = await getBinaryVersionList(app, platform, identifier)
+    const currentList = await getBinaryVersionList(app, platform)
 
     if (currentList[targetVersion]) {
       console.error(`Version ${targetVersion} is already released`)
@@ -44,13 +40,7 @@ async function createReleaseHistoryList(
 
     fs.writeFileSync(JSON_FILE_PATH, JSON.stringify(currentList))
 
-    await setBinaryVersionList(
-      targetVersion,
-      JSON_FILE_PATH,
-      app,
-      platform,
-      identifier
-    )
+    await setBinaryVersionList(targetVersion, JSON_FILE_PATH, app, platform)
 
     fs.unlinkSync(JSON_FILE_PATH)
   } catch (error) {

package/cli/commands/createHistoryCommand/index.js

@@ -7,7 +7,7 @@ const {
   getAppValue,
   getPlatformValue,
   getIdentifierValue,
-  getBinaryVersionValueForInput,
+  getBinaryVersionValueFromInput,
 } = require('../common')
 
 program
@@ -27,7 +27,7 @@ program
     // identifier
     const identifier = await getIdentifierValue()
     // binaryVersion
-    const binaryVersion = await getBinaryVersionValueForInput(
+    const binaryVersion = await getBinaryVersionValueFromInput(
       config.getBinaryVersionList,
       app,
       platform,
@@ -45,15 +45,13 @@ program
       answers.app,
       answers.binaryVersion,
       config.setReleaseHistory,
-      answers.platform,
-      answers.identifier
+      answers.platform
     )
 
     await createReleaseHistoryList(
       answers.app,
       answers.binaryVersion,
       answers.platform,
-      answers.identifier,
       config.getBinaryVersionList,
       config.setBinaryVersionList
     )

package/cli/commands/releaseCommand/addToReleaseHistory.js

@@ -19,10 +19,8 @@ const fs = require('fs')
  *     jsonFilePath: string,
  *     releaseInfo: ReleaseHistoryInterface,
  *     platform: string,
- *     identifier?: string
  *   ): Promise<void>}
  * @param platform {"ios" | "android"}
- * @param identifier {string?}
  * @param mandatory {boolean?}
  * @param enable {boolean?}
  * @returns {Promise<void>}
@@ -36,16 +34,10 @@ async function addToReleaseHistory(
   getReleaseHistory,
   setReleaseHistory,
   platform,
-  identifier,
   mandatory,
   enable
 ) {
-  const releaseHistory = await getReleaseHistory(
-    app,
-    binaryVersion,
-    platform,
-    identifier
-  )
+  const releaseHistory = await getReleaseHistory(app, binaryVersion, platform)
 
   const updateInfo = releaseHistory[appVersion]
   if (updateInfo) {
@@ -77,8 +69,7 @@ async function addToReleaseHistory(
       JSON_FILE_PATH,
       newReleaseHistory,
       app,
-      platform,
-      identifier
+      platform
     )
 
     fs.unlinkSync(JSON_FILE_PATH)

package/cli/commands/releaseCommand/index.js

@@ -11,8 +11,8 @@ const {
   getAppValue,
   getPlatformValue,
   getIdentifierValue,
-  getBinaryVersionValueForInput,
-  getAppVersionValueForInput,
+  getBinaryVersionValueFromInput,
+  getAppVersionValueFromInput,
 } = require('../common')
 
 program
@@ -110,19 +110,18 @@ program
       // identifier
       const identifier = await getIdentifierValue()
       // binaryVersion
-      const binaryVersion = await getBinaryVersionValueForInput(
+      const binaryVersion = await getBinaryVersionValueFromInput(
         getBinaryVersionList,
         app,
         platform,
         identifier
       )
       // appVersion
-      const appVersion = await getAppVersionValueForInput(
+      const appVersion = await getAppVersionValueFromInput(
         getReleaseHistory,
         binaryVersion,
         app,
-        platform,
-        identifier
+        platform
       )
 
       answers = {
@@ -142,7 +141,6 @@ program
       answers.binaryVersion,
       answers.appVersion,
       answers.platform,
-      answers.identifier,
       options.outputPath,
       options.entryFile,
       options.bundleName,

package/cli/commands/releaseCommand/release.js

@@ -7,13 +7,11 @@ const { addToReleaseHistory } = require('./addToReleaseHistory')
  *   function(
  *       source: string,
  *       platform: "ios" | "android",
- *       identifier?: string
  *   ): Promise<{ downloadUrl: string }>}
  * @param getReleaseHistory {
  *   function(
  *     targetBinaryVersion: string,
  *     platform: "ios" | "android",
- *     identifier?: string
  *   ): Promise<ReleaseHistoryInterface>}
  * @param setReleaseHistory {
  *   function(
@@ -21,13 +19,11 @@ const { addToReleaseHistory } = require('./addToReleaseHistory')
  *     jsonFilePath: string,
  *     releaseInfo: ReleaseHistoryInterface,
  *     platform: "ios" | "android",
- *     identifier?: string
  *   ): Promise<void>}
  * @param app {"user" | "device"}
  * @param binaryVersion {string}
  * @param appVersion {string}
  * @param platform {"ios" | "android"}
- * @param identifier {string?}
  * @param outputPath {string}
  * @param entryFile {string}
  * @param jsBundleName {string}
@@ -46,7 +42,6 @@ async function release(
   binaryVersion,
   appVersion,
   platform,
-  identifier,
   outputPath,
   entryFile,
   jsBundleName,
@@ -73,8 +68,7 @@ async function release(
       const { downloadUrl } = await bundleUploader(
         bundleFilePath,
         app,
-        platform,
-        identifier
+        platform
       )
       console.log('Bundle File uploaded:', downloadUrl)
       return downloadUrl
@@ -96,7 +90,6 @@ async function release(
     getReleaseHistory,
     setReleaseHistory,
     platform,
-    identifier,
     mandatory,
     enable
   )

package/cli/commands/showHistoryCommand/index.js

@@ -5,7 +5,7 @@ const {
   getAppValue,
   getPlatformValue,
   getIdentifierValue,
-  getBinaryVersionValue,
+  getBinaryVersionValueFromList,
 } = require('../common')
 
 program
@@ -27,7 +27,7 @@ program
     // identifier
     const identifier = await getIdentifierValue()
     // binaryVersion
-    const binaryVersion = await getBinaryVersionValue(
+    const binaryVersion = await getBinaryVersionValueFromList(
       config.getBinaryVersionList,
       app,
       platform,
@@ -44,8 +44,7 @@ program
     const releaseHistory = await config.getReleaseHistory(
       answers.app,
       answers.binaryVersion,
-      answers.platform,
-      answers.identifier
+      answers.platform
     )
 
     console.log(JSON.stringify(releaseHistory, null, 2))

package/cli/commands/updateHistoryCommand/index.js

@@ -6,8 +6,8 @@ const {
   getAppValue,
   getPlatformValue,
   getIdentifierValue,
-  getBinaryVersionValue,
-  getAppVersionValue,
+  getBinaryVersionValueFromList,
+  getAppVersionValueFromList,
 } = require('../common')
 
 program
@@ -36,19 +36,18 @@ program
     // identifier
     const identifier = await getIdentifierValue()
     // binaryVersion
-    const binaryVersion = await getBinaryVersionValue(
+    const binaryVersion = await getBinaryVersionValueFromList(
       config.getBinaryVersionList,
       app,
       platform,
       identifier
     )
     // appVersion
-    const appVersion = await getAppVersionValue(
+    const appVersion = await getAppVersionValueFromList(
       config.getReleaseHistory,
       binaryVersion,
       app,
-      platform,
-      identifier
+      platform
     )
 
     const answers = {
@@ -74,7 +73,6 @@ program
       config.getReleaseHistory,
       config.setReleaseHistory,
       answers.platform,
-      answers.identifier,
       options.mandatory,
       options.enable
     )

package/cli/commands/updateHistoryCommand/updateReleaseHistory.js

@@ -9,7 +9,6 @@ const path = require('path')
  *   function(
  *     targetBinaryVersion: string,
  *     platform: string,
- *     identifier?: string
  *   ): Promise<ReleaseHistoryInterface>}
  * @param setReleaseHistory {
  *   function(
@@ -17,10 +16,8 @@ const path = require('path')
  *     jsonFilePath: string,
  *     releaseInfo: ReleaseHistoryInterface,
  *     platform: string,
- *     identifier?: string
  *   ): Promise<void>}
  * @param platform {"ios" | "android"}
- * @param identifier {string?}
  * @param mandatory {boolean?}
  * @param enable {boolean?}
  * @returns {Promise<void>}
@@ -32,16 +29,10 @@ async function updateReleaseHistory(
   getReleaseHistory,
   setReleaseHistory,
   platform,
-  identifier,
   mandatory,
   enable
 ) {
-  const releaseHistory = await getReleaseHistory(
-    app,
-    binaryVersion,
-    platform,
-    identifier
-  )
+  const releaseHistory = await getReleaseHistory(app, binaryVersion, platform)
 
   const updateInfo = releaseHistory[appVersion]
   if (!updateInfo) throw new Error(`v${appVersion} is not released`)
@@ -64,8 +55,7 @@ async function updateReleaseHistory(
       JSON_FILE_PATH,
       releaseHistory,
       app,
-      platform,
-      identifier
+      platform
     )
 
     fs.unlinkSync(JSON_FILE_PATH)

package/cli/utils/version.js

@@ -15,19 +15,8 @@ async function getBinaryVersions(
   ]
 }
 
-async function getAppVersions(
-  getReleaseHistory,
-  binaryVersion,
-  app,
-  platform,
-  identifier
-) {
-  const releaseHistory = await getReleaseHistory(
-    app,
-    binaryVersion,
-    platform,
-    identifier
-  )
+async function getAppVersions(getReleaseHistory, binaryVersion, app, platform) {
+  const releaseHistory = await getReleaseHistory(app, binaryVersion, platform)
   return [Object.keys(releaseHistory), Object.keys(releaseHistory).pop()]
 }
 

package/code-push.config.js

@@ -14,18 +14,8 @@ const s3Client = new S3Client({
   },
 })
 
-function getBucketName(identifier) {
-  return identifier === 'prd'
-    ? process.env.AWS_S3_BUCKET_PRD || 'codepush-bucket'
-    : process.env.AWS_S3_BUCKET_STG || 'codepush-bucket'
-}
-
-function getCDNUrl(identifier) {
-  const BUCKET_NAME = getBucketName(identifier)
-  return identifier === 'prd'
-    ? process.env.CDN_URL_PRD || `https://${BUCKET_NAME}.s3.amazonaws.com`
-    : process.env.CDN_URL_STG || `https://${BUCKET_NAME}.s3.amazonaws.com`
-}
+const BUCKET_NAME = process.env.AWS_S3_BUCKET || 'codepush-bucket'
+const CDN_URL = process.env.CDN_URL || `https://${BUCKET_NAME}.s3.amazonaws.com`
 
 function historyJsonFileRemotePath(app, platform, binaryVersion) {
   return `histories/${app}/${platform}/${binaryVersion}.json`
@@ -36,12 +26,10 @@ function bundleFileRemotePath(app, platform, fileName) {
 }
 
 const Config = {
-  bundleUploader: async (source, app, platform, identifier) => {
+  bundleUploader: async (source, app, platform) => {
     const fileName = source.split('/').pop()
     const fileContent = fs.readFileSync(source)
     const remotePath = bundleFileRemotePath(app, platform, fileName)
-    const BUCKET_NAME = getBucketName(identifier)
-    const CDN_URL = getCDNUrl(identifier)
 
     try {
       await s3Client.send(
@@ -63,8 +51,7 @@ const Config = {
       throw error
     }
   },
-  getReleaseHistory: async (app, targetBinaryVersion, platform, identifier) => {
-    const CDN_URL = getCDNUrl(identifier)
+  getReleaseHistory: async (app, targetBinaryVersion, platform) => {
     const remoteJsonPath = historyJsonFileRemotePath(
       app,
       platform,
@@ -79,8 +66,7 @@ const Config = {
     jsonFilePath,
     releaseInfo,
     app,
-    platform,
-    identifier
+    platform
   ) => {
     const fileContent = fs.readFileSync(jsonFilePath, 'utf8')
     const remoteJsonPath = historyJsonFileRemotePath(
@@ -88,8 +74,6 @@ const Config = {
       platform,
       targetBinaryVersion
     )
-    const BUCKET_NAME = getBucketName(identifier)
-    const CDN_URL = getCDNUrl(identifier)
 
     try {
       await s3Client.send(
@@ -111,8 +95,7 @@ const Config = {
       throw error
     }
   },
-  getBinaryVersionList: async (app, platform, identifier) => {
-    const CDN_URL = getCDNUrl(identifier)
+  getBinaryVersionList: async (app, platform) => {
     const remoteJsonPath = `histories/${app}/${platform}/list.json`
     let currentList = {}
     try {
@@ -127,16 +110,8 @@ const Config = {
     }
     return currentList
   },
-  setBinaryVersionList: async (
-    targetVersion,
-    jsonFilePath,
-    app,
-    platform,
-    identifier
-  ) => {
+  setBinaryVersionList: async (targetVersion, jsonFilePath, app, platform) => {
     const remoteJsonPath = `histories/${app}/${platform}/list.json`
-    const BUCKET_NAME = getBucketName(identifier)
-    const CDN_URL = getCDNUrl(identifier)
 
     const currentList = JSON.parse(fs.readFileSync(jsonFilePath, 'utf8'))
     const targetVersionPath = historyJsonFileRemotePath(

package/package.json

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