@algocare/react-native-code-push 9.1.0 → 10.0.1

package/cli/commands/common.js

@@ -0,0 +1,249 @@
+const inquirer = require('inquirer').default
+const { getBinaryVersions, getAppVersions } = require('../utils/version')
+const semverRegex = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/
+
+async function getAppValue() {
+  const { app } = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'app',
+      message: 'Select the target app',
+      choices: ['user', 'device'],
+    },
+  ])
+  return app
+}
+
+async function getPlatformValue(app) {
+  const platformAnswer = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'platform',
+      message: 'Select the target platform',
+      choices: ['ios', 'android'],
+      when: () => app !== 'device',
+    },
+  ])
+  return app === 'device' ? 'android' : platformAnswer.platform
+}
+
+async function getIdentifierValue() {
+  const { identifier } = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'identifier',
+      message: 'Select the target env identifier',
+      choices: ['stg', 'prd'],
+    },
+  ])
+  return identifier
+}
+
+async function getBinaryVersionValueFromList(
+  getBinaryVersionList,
+  app,
+  platform,
+  identifier,
+  count = 5
+) {
+  const [currentBinaryVersionList] = await getBinaryVersions(
+    getBinaryVersionList,
+    app,
+    platform,
+    identifier
+  )
+
+  if (!currentBinaryVersionList.length) {
+    console.log('There is no binary version list')
+    return []
+  }
+
+  if (typeof count !== 'number' || count < 1) {
+    console.warn('count must be a number and greater than 1')
+    return []
+  }
+
+  const latestBinaryVersion = currentBinaryVersionList.slice(-count)
+  const binaryVersionChoices = [
+    ...latestBinaryVersion,
+    new inquirer.Separator(),
+    'Enter manually',
+  ]
+  const binaryVersionSelectionAnswer = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'versionChoice',
+      message:
+        'This is last 5 versions. Select a binary version or enter manually',
+      choices: binaryVersionChoices,
+    },
+  ])
+  let binaryVersion
+  if (binaryVersionSelectionAnswer.versionChoice === 'Enter manually') {
+    const binaryVersionAnswer = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'binaryVersion',
+        message: 'Enter the target binary version',
+        validate: (input) => {
+          if (!semverRegex.test(input)) {
+            return 'Please enter a valid version number (x.y.z)'
+          }
+          return true
+        },
+      },
+    ])
+    binaryVersion = binaryVersionAnswer.binaryVersion
+  } else {
+    binaryVersion = binaryVersionSelectionAnswer.versionChoice
+  }
+
+  return binaryVersion
+}
+
+async function getAppVersionValueFromList(
+  getReleaseHistory,
+  binaryVersion,
+  app,
+  platform,
+  identifier,
+  count = 5
+) {
+  const [currentAppVersionList] = await getAppVersions(
+    getReleaseHistory,
+    binaryVersion,
+    app,
+    platform,
+    identifier
+  )
+
+  if (!currentAppVersionList.length) {
+    console.log('There is no app version list')
+    return
+  }
+
+  if (typeof count !== 'number' || count < 1) {
+    console.warn('count must be a number and greater than 1')
+    return
+  }
+
+  const latestAppVersion = currentAppVersionList.slice(-count)
+  const appVersionChoices = [
+    ...latestAppVersion,
+    new inquirer.Separator(),
+    'Enter manually',
+  ]
+  const appVersionSelectionAnswer = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'appVersionChoice',
+      message:
+        'This is last 5 versions. Select a binary version or enter manually',
+      choices: appVersionChoices,
+    },
+  ])
+  let appVersion
+  if (appVersionSelectionAnswer.versionChoice === 'Enter manually') {
+    const appVersionAnswer = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'appVersion',
+        message: 'Enter the target app version',
+        validate: (input) => {
+          if (!semverRegex.test(input)) {
+            return 'Please enter a valid version number (x.y.z)'
+          }
+          return true
+        },
+      },
+    ])
+    appVersion = appVersionAnswer.appVersion
+  } else {
+    appVersion = appVersionSelectionAnswer.appVersion
+  }
+
+  return appVersion
+}
+
+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,
+  identifier
+) {
+  const [currentAppVersionList, lastAppVersion] = await getAppVersions(
+    getReleaseHistory,
+    binaryVersion,
+    app,
+    platform,
+    identifier
+  )
+
+  const message = lastAppVersion
+    ? `Enter the target app version (current latest: ${lastAppVersion})`
+    : 'Enter the target app version (there is no latest version)'
+
+  const { appVersion } = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'appVersion',
+      message,
+      validate: (input) => {
+        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
+      },
+    },
+  ])
+
+  return appVersion
+}
+
+module.exports = {
+  getAppValue,
+  getPlatformValue,
+  getIdentifierValue,
+  getBinaryVersionValueFromList,
+  getAppVersionValueFromList,
+  getBinaryVersionValueFromInput,
+  getAppVersionValueFromInput,
+}

package/cli/commands/createHistoryCommand/createReleaseHistory.js

@@ -23,19 +23,6 @@ async function createReleaseHistory(
   platform,
   identifier
 ) {
-  const BINARY_RELEASE = {
-    enabled: true,
-    mandatory: false,
-    downloadUrl: '',
-    packageHash: '',
-  }
-
-  /** @type {ReleaseHistoryInterface} */
-  // not use
-  const INITIAL_HISTORY = {
-    [targetVersion]: BINARY_RELEASE,
-  }
-
   try {
     const JSON_FILE_NAME = `${targetVersion}.json`
     const JSON_FILE_PATH = path.resolve(process.cwd(), JSON_FILE_NAME)

package/cli/commands/createHistoryCommand/createReleaseHistoryList.js

@@ -0,0 +1,62 @@
+const fs = require('fs')
+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 {
+ *   function(
+ *     targetVersion: string,
+ *     app: string,
+ *     platform: string,
+ *     identifier: string
+ *   ): Promise<void>
+ * }
+ * @returns {Promise<void>}
+ */
+async function createReleaseHistoryList(
+  app,
+  targetVersion,
+  platform,
+  identifier,
+  getBinaryVersionList,
+  setBinaryVersionList
+) {
+  try {
+    const JSON_FILE_NAME = 'list.json'
+    const JSON_FILE_PATH = path.resolve(process.cwd(), JSON_FILE_NAME)
+
+    const currentList = await getBinaryVersionList(app, platform, identifier)
+
+    if (currentList[targetVersion]) {
+      console.error(`Version ${targetVersion} is already released`)
+      process.exit(1)
+    }
+
+    fs.writeFileSync(JSON_FILE_PATH, JSON.stringify(currentList))
+
+    await setBinaryVersionList(
+      targetVersion,
+      JSON_FILE_PATH,
+      app,
+      platform,
+      identifier
+    )
+
+    fs.unlinkSync(JSON_FILE_PATH)
+  } catch (error) {
+    console.error('Error occurred while creating new history list:', error)
+    process.exit(1)
+  }
+}
+
+module.exports = { createReleaseHistoryList }

package/cli/commands/createHistoryCommand/index.js

@@ -1,8 +1,14 @@
 const { program } = require('commander')
-const inquirer = require('inquirer').default
 const { findAndReadConfigFile } = require('../../utils/fsUtils')
 const { createReleaseHistory } = require('./createReleaseHistory')
+const { createReleaseHistoryList } = require('./createReleaseHistoryList')
 const { COMPILED_CONFIG_FILE_NAME } = require('../../constant')
+const {
+  getAppValue,
+  getPlatformValue,
+  getIdentifierValue,
+  getBinaryVersionValueFromInput,
+} = require('../common')
 
 program
   .command('create-history')
@@ -13,44 +19,28 @@ program
     COMPILED_CONFIG_FILE_NAME
   )
   .action(async (options) => {
-    const answers = await inquirer.prompt([
-      {
-        type: 'list',
-        name: 'app',
-        message: 'Select the target app',
-        choices: ['user', 'device'],
-      },
-      {
-        type: 'list',
-        name: 'platform',
-        message: 'Select the target platform',
-        choices: ['ios', 'android'],
-        when: (answers) => answers.app !== 'device',
-      },
-      {
-        type: 'list',
-        name: 'identifier',
-        message: 'Select the target env identifier',
-        choices: ['stg', 'prd'],
-      },
-      {
-        type: 'input',
-        name: 'binaryVersion',
-        message: 'Enter the target binary version',
-        validate: (input) => {
-          const semverRegex = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/
-          if (semverRegex.test(input)) return true
-          return 'Please enter a valid version number (x.y.z)'
-        },
-      },
-    ])
+    const config = await findAndReadConfigFile(process.cwd(), options.config)
+    // app
+    const app = await getAppValue()
+    // platform
+    const platform = await getPlatformValue(app)
+    // identifier
+    const identifier = await getIdentifierValue()
+    // binaryVersion
+    const binaryVersion = await getBinaryVersionValueFromInput(
+      config.getBinaryVersionList,
+      app,
+      platform,
+      identifier
+    )
 
-    if (answers.app === 'device') {
-      answers.platform = 'android'
+    const answers = {
+      app,
+      platform,
+      identifier,
+      binaryVersion,
     }
 
-    const config = await findAndReadConfigFile(process.cwd(), options.config)
-
     await createReleaseHistory(
       answers.app,
       answers.binaryVersion,
@@ -58,4 +48,13 @@ program
       answers.platform,
       answers.identifier
     )
+
+    await createReleaseHistoryList(
+      answers.app,
+      answers.binaryVersion,
+      answers.platform,
+      answers.identifier,
+      config.getBinaryVersionList,
+      config.setBinaryVersionList
+    )
   })

package/cli/commands/releaseCommand/index.js

@@ -1,5 +1,4 @@
 const { program } = require('commander')
-const inquirer = require('inquirer').default
 const { findAndReadConfigFile } = require('../../utils/fsUtils')
 const { release } = require('./release')
 const {
@@ -8,6 +7,13 @@ const {
   ROOT_OUTPUT_DIR,
   ENTRY_FILE,
 } = require('../../constant')
+const {
+  getAppValue,
+  getPlatformValue,
+  getIdentifierValue,
+  getBinaryVersionValueFromInput,
+  getAppVersionValueFromInput,
+} = require('../common')
 
 program
   .command('release')
@@ -75,6 +81,12 @@ program
     }
 
     let answers = {}
+    const {
+      bundleUploader,
+      getReleaseHistory,
+      setReleaseHistory,
+      getBinaryVersionList,
+    } = await findAndReadConfigFile(process.cwd(), options.config)
 
     if (
       options.app &&
@@ -91,57 +103,41 @@ program
         appVersion: options.appVersion,
       }
     } else {
-      answers = await inquirer.prompt([
-        {
-          type: 'list',
-          name: 'app',
-          message: 'Select the target app',
-          choices: ['user', 'device'],
-        },
-        {
-          type: 'list',
-          name: 'platform',
-          message: 'Select the target platform',
-          choices: ['ios', 'android'],
-          when: (answers) => answers.app !== 'device',
-        },
-        {
-          type: 'list',
-          name: 'identifier',
-          message: 'Select the target env identifier',
-          choices: ['stg', 'prd'],
-        },
-        {
-          type: 'input',
-          name: 'binaryVersion',
-          message: 'Enter the target binary version',
-          validate: (input) => {
-            if (semverRegex.test(input)) return true
-            return 'Please enter a valid version number (x.y.z)'
-          },
-        },
-        {
-          type: 'input',
-          name: 'appVersion',
-          message: 'Enter the target codepush version',
-          validate: (input) => {
-            if (semverRegex.test(input)) return true
-            return 'Please enter a valid version number (x.y.z)'
-          },
-        },
-      ])
+      // app
+      const app = await getAppValue()
+      // platform
+      const platform = await getPlatformValue(app)
+      // identifier
+      const identifier = await getIdentifierValue()
+      // binaryVersion
+      const binaryVersion = await getBinaryVersionValueFromInput(
+        getBinaryVersionList,
+        app,
+        platform,
+        identifier
+      )
+      // appVersion
+      const appVersion = await getAppVersionValueFromInput(
+        getReleaseHistory,
+        binaryVersion,
+        app,
+        platform,
+        identifier
+      )
 
-      if (answers.app === 'device') {
-        answers.platform = 'android'
+      answers = {
+        app,
+        platform,
+        identifier,
+        binaryVersion,
+        appVersion,
       }
     }
 
-    const config = await findAndReadConfigFile(process.cwd(), options.config)
-
     await release(
-      config.bundleUploader,
-      config.getReleaseHistory,
-      config.setReleaseHistory,
+      bundleUploader,
+      getReleaseHistory,
+      setReleaseHistory,
       answers.app,
       answers.binaryVersion,
       answers.appVersion,

package/cli/commands/showHistoryCommand/index.js

@@ -1,7 +1,12 @@
 const { program } = require('commander')
-const inquirer = require('inquirer').default
 const { findAndReadConfigFile } = require('../../utils/fsUtils')
 const { COMPILED_CONFIG_FILE_NAME } = require('../../constant')
+const {
+  getAppValue,
+  getPlatformValue,
+  getIdentifierValue,
+  getBinaryVersionValueFromList,
+} = require('../common')
 
 program
   .command('show-history')
@@ -14,44 +19,28 @@ program
     COMPILED_CONFIG_FILE_NAME
   )
   .action(async (options) => {
-    const answers = await inquirer.prompt([
-      {
-        type: 'list',
-        name: 'app',
-        message: 'Select the target app',
-        choices: ['user', 'device'],
-      },
-      {
-        type: 'list',
-        name: 'platform',
-        message: 'Select the target platform',
-        choices: ['ios', 'android'],
-        when: (answers) => answers.app !== 'device',
-      },
-      {
-        type: 'list',
-        name: 'identifier',
-        message: 'Select the target env identifier',
-        choices: ['stg', 'prd'],
-      },
-      {
-        type: 'input',
-        name: 'binaryVersion',
-        message: 'Enter the target binary version',
-        validate: (input) => {
-          const semverRegex = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/
-          if (semverRegex.test(input)) return true
-          return 'Please enter a valid version number (x.y.z)'
-        },
-      },
-    ])
+    const config = await findAndReadConfigFile(process.cwd(), options.config)
+    // app
+    const app = await getAppValue()
+    // platform
+    const platform = await getPlatformValue(app)
+    // identifier
+    const identifier = await getIdentifierValue()
+    // binaryVersion
+    const binaryVersion = await getBinaryVersionValueFromList(
+      config.getBinaryVersionList,
+      app,
+      platform,
+      identifier
+    )
 
-    if (answers.app === 'device') {
-      answers.platform = 'android'
+    const answers = {
+      app,
+      platform,
+      identifier,
+      binaryVersion,
     }
 
-    const config = await findAndReadConfigFile(process.cwd(), options.config)
-
     const releaseHistory = await config.getReleaseHistory(
       answers.app,
       answers.binaryVersion,

package/cli/commands/updateHistoryCommand/index.js

@@ -1,8 +1,14 @@
 const { program } = require('commander')
-const inquirer = require('inquirer').default
 const { findAndReadConfigFile } = require('../../utils/fsUtils')
 const { updateReleaseHistory } = require('./updateReleaseHistory')
 const { COMPILED_CONFIG_FILE_NAME } = require('../../constant')
+const {
+  getAppValue,
+  getPlatformValue,
+  getIdentifierValue,
+  getBinaryVersionValueFromList,
+  getAppVersionValueFromList,
+} = require('../common')
 
 program
   .command('update-history')
@@ -22,53 +28,37 @@ program
   )
   .option('--no-enable', 'make the release to be disabled')
   .action(async (options) => {
-    const semverRegex = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/
-    const answers = await inquirer.prompt([
-      {
-        type: 'list',
-        name: 'app',
-        message: 'Select the target app',
-        choices: ['user', 'device'],
-      },
-      {
-        type: 'list',
-        name: 'platform',
-        message: 'Select the target platform',
-        choices: ['ios', 'android'],
-        when: (answers) => answers.app !== 'device',
-      },
-      {
-        type: 'list',
-        name: 'identifier',
-        message: 'Select the target env identifier',
-        choices: ['stg', 'prd'],
-      },
-      {
-        type: 'input',
-        name: 'binaryVersion',
-        message: 'Enter the target binary version',
-        validate: (input) => {
-          if (semverRegex.test(input)) return true
-          return 'Please enter a valid version number (x.y.z)'
-        },
-      },
-      {
-        type: 'input',
-        name: 'appVersion',
-        message: 'Enter the target codepush version',
-        validate: (input) => {
-          if (semverRegex.test(input)) return true
-          return 'Please enter a valid version number (x.y.z)'
-        },
-      },
-    ])
+    const config = await findAndReadConfigFile(process.cwd(), options.config)
+    // app
+    const app = await getAppValue()
+    // platform
+    const platform = await getPlatformValue(app)
+    // identifier
+    const identifier = await getIdentifierValue()
+    // binaryVersion
+    const binaryVersion = await getBinaryVersionValueFromList(
+      config.getBinaryVersionList,
+      app,
+      platform,
+      identifier
+    )
+    // appVersion
+    const appVersion = await getAppVersionValueFromList(
+      config.getReleaseHistory,
+      binaryVersion,
+      app,
+      platform,
+      identifier
+    )
 
-    if (answers.app === 'device') {
-      answers.platform = 'android'
+    const answers = {
+      app,
+      platform,
+      identifier,
+      binaryVersion,
+      appVersion,
     }
 
-    const config = await findAndReadConfigFile(process.cwd(), options.config)
-
     if (
       typeof options.mandatory !== 'boolean' &&
       typeof options.enable !== 'boolean'

package/cli/utils/version.js

@@ -0,0 +1,37 @@
+async function getBinaryVersions(
+  getBinaryVersionList,
+  app,
+  platform,
+  identifier
+) {
+  const currentVersionList = await getBinaryVersionList(
+    app,
+    platform,
+    identifier
+  )
+  return [
+    Object.keys(currentVersionList),
+    Object.keys(currentVersionList).pop(),
+  ]
+}
+
+async function getAppVersions(
+  getReleaseHistory,
+  binaryVersion,
+  app,
+  platform,
+  identifier
+) {
+  const releaseHistory = await getReleaseHistory(
+    app,
+    binaryVersion,
+    platform,
+    identifier
+  )
+  return [Object.keys(releaseHistory), Object.keys(releaseHistory).pop()]
+}
+
+module.exports = {
+  getBinaryVersions,
+  getAppVersions,
+}

package/code-push.config.js

@@ -63,7 +63,6 @@ const Config = {
       throw error
     }
   },
-
   getReleaseHistory: async (app, targetBinaryVersion, platform, identifier) => {
     const CDN_URL = getCDNUrl(identifier)
     const remoteJsonPath = historyJsonFileRemotePath(
@@ -112,6 +111,63 @@ const Config = {
       throw error
     }
   },
+  getBinaryVersionList: async (app, platform, identifier) => {
+    const CDN_URL = getCDNUrl(identifier)
+    const remoteJsonPath = `histories/${app}/${platform}/list.json`
+    let currentList = {}
+    try {
+      console.log('Getting existing version list file')
+      const { data } = await axios.get(`${CDN_URL}/${remoteJsonPath}`)
+      currentList = { ...data }
+    } catch (error) {
+      console.error(
+        'Error occurred while getting existing version list file, maybe it is not exist.',
+        error.status
+      )
+    }
+    return currentList
+  },
+  setBinaryVersionList: async (
+    targetVersion,
+    jsonFilePath,
+    app,
+    platform,
+    identifier
+  ) => {
+    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(
+      app,
+      platform,
+      targetVersion
+    )
+    currentList[targetVersion] = `${CDN_URL}/${targetVersionPath}`
+
+    try {
+      await s3Client.send(
+        new PutObjectCommand({
+          Bucket: BUCKET_NAME,
+          Key: remoteJsonPath,
+          Body: JSON.stringify(currentList),
+          ContentType: 'application/json',
+          CacheControl: 'max-age=5',
+        })
+      )
+
+      console.log(
+        'Binary version list uploaded:',
+        `${CDN_URL}/${remoteJsonPath}`,
+        '\nContent:',
+        JSON.stringify(currentList, null, 2)
+      )
+    } catch (error) {
+      console.error('Error uploading binary version list:', error)
+      throw error
+    }
+  },
 }
 
 module.exports = Config

package/package.json

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