@algocare/react-native-code-push 12.1.1 → 12.3.0

package/cli/commands/common.js

@@ -8,7 +8,7 @@ async function getAppValue() {
       type: 'list',
       name: 'app',
       message: 'Select the target app',
-      choices: ['user', 'device'],
+      choices: ['user', 'device', 'b2c-device'],
     },
   ])
   return app
@@ -21,10 +21,10 @@ async function getPlatformValue(app) {
       name: 'platform',
       message: 'Select the target platform',
       choices: ['ios', 'android'],
-      when: () => app !== 'device',
+      when: () => app === 'user',
     },
   ])
-  return app === 'device' ? 'android' : platformAnswer.platform
+  return app === 'user' ? platformAnswer.platform : 'android'
 }
 
 async function getIdentifierValue() {
@@ -157,7 +157,7 @@ async function getAppVersionValueFromList(
     ])
     appVersion = appVersionAnswer.appVersion
   } else {
-    appVersion = appVersionSelectionAnswer.appVersion
+    appVersion = appVersionSelectionAnswer.appVersionChoice
   }
 
   return appVersion

package/cli/commands/createHistoryCommand/index.js

@@ -13,26 +13,63 @@ const {
 program
   .command('create-history')
   .description('Creates a new release history for the binary app.')
+  .option('-a, --app <string>', 'target app (user/device/b2c-device)')
+  .option('-p, --platform <string>', 'target platform (ios/android)')
+  .option('-i, --identifier <string>', 'target env identifier (dev/stg/prd)')
+  .option('-b, --binary-version <string>', 'target binary version (x.y.z)')
   .option(
     '-c, --config <path>',
     'set config file name (JS/TS)',
     COMPILED_CONFIG_FILE_NAME
   )
   .action(async (options) => {
-    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 (
+      options.app &&
+      !['user', 'device', 'b2c-device'].includes(options.app)
+    ) {
+      throw new Error('App must be either "user" or "device" or "b2c-device"')
+    }
+
+    if (options.platform && !['ios', 'android'].includes(options.platform)) {
+      throw new Error('Platform must be either "ios" or "android"')
+    }
+
+    if (options.app !== 'user' && options.platform === 'ios') {
+      throw new Error('Device app is not supported on iOS')
+    }
+
+    if (
+      options.identifier &&
+      !['dev', 'stg', 'prd'].includes(options.identifier)
+    ) {
+      throw new Error('Identifier must be either "dev" or "stg" or "prd"')
+    }
+
+    const semverRegex = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/
+    if (options.binaryVersion && !semverRegex.test(options.binaryVersion)) {
+      throw new Error('Binary version must be a valid semver format (x.y.z)')
+    }
+
+    const { setReleaseHistory, getBinaryVersionList, setBinaryVersionList } =
+      await findAndReadConfigFile(process.cwd(), options.config)
+
+    const app = options.app || (await getAppValue())
+
+    const platform =
+      options.platform ||
+      (app !== 'user' && 'android') ||
+      (await getPlatformValue(app))
+
+    const identifier = options.identifier || (await getIdentifierValue())
+
+    const binaryVersion =
+      options.binaryVersion ||
+      (await getBinaryVersionValueFromInput(
+        getBinaryVersionList,
+        app,
+        platform,
+        identifier
+      ))
 
     const answers = {
       app,
@@ -44,7 +81,7 @@ program
     await createReleaseHistory(
       answers.app,
       answers.binaryVersion,
-      config.setReleaseHistory,
+      setReleaseHistory,
       answers.platform
     )
 
@@ -52,7 +89,7 @@ program
       answers.app,
       answers.binaryVersion,
       answers.platform,
-      config.getBinaryVersionList,
-      config.setBinaryVersionList
+      getBinaryVersionList,
+      setBinaryVersionList
     )
   })

package/cli/commands/createPullRequestReleaseCommand/addToPullRequestRelease.js

@@ -1,5 +1,6 @@
 const path = require('path')
 const fs = require('fs')
+const { getTimestamp } = require('../../utils/datetime')
 
 async function addToPullRequestRelease(
   app,
@@ -32,6 +33,7 @@ async function addToPullRequestRelease(
     mandatory,
     downloadUrl: bundleDownloadUrl,
     packageHash,
+    createdAt: getTimestamp(),
   }
 
   try {

package/cli/commands/releaseCommand/addToReleaseHistory.js

@@ -1,5 +1,6 @@
 const path = require('path')
 const fs = require('fs')
+const { getTimestamp } = require('../../utils/datetime')
 
 /**
  * @param app {"user" | "device"}
@@ -52,6 +53,8 @@ async function addToReleaseHistory(
     mandatory: mandatory,
     downloadUrl: bundleDownloadUrl,
     packageHash: packageHash,
+    createdAt: getTimestamp(),
+    updatedAt: '-',
   }
 
   try {

package/cli/commands/releaseCommand/index.js

@@ -20,7 +20,7 @@ program
   .description(
     'Deploys a new CodePush update for a target binary app.\nAfter creating the CodePush bundle, it uploads the file and updates the ReleaseHistory information.\n`bundleUploader`, `getReleaseHistory`, and `setReleaseHistory` functions should be implemented in the config file.'
   )
-  .option('-a, --app <string>', 'target app (user/device)')
+  .option('-a, --app <string>', 'target app (user/device/b2c-device)')
   .option('-p, --platform <string>', 'target platform (ios/android)')
   .option('-i, --identifier <string>', 'target env identifier (dev/stg/prd)')
   .option('-b, --binary-version <string>', 'target binary version (x.y.z)')
@@ -55,15 +55,18 @@ program
     OUTPUT_BUNDLE_DIR
   )
   .action(async (options) => {
-    if (options.app && !['user', 'device'].includes(options.app)) {
-      throw new Error('App must be either "user" or "device"')
+    if (
+      options.app &&
+      !['user', 'device', 'b2c-device'].includes(options.app)
+    ) {
+      throw new Error('App must be either "user" or "device" or "b2c-device"')
     }
 
     if (options.platform && !['ios', 'android'].includes(options.platform)) {
       throw new Error('Platform must be either "ios" or "android"')
     }
 
-    if (options.app === 'device' && options.platform === 'ios') {
+    if (options.app !== 'user' && options.platform === 'ios') {
       throw new Error('Device app is not supported on iOS')
     }
 
@@ -83,7 +86,6 @@ program
       throw new Error('App version must be a valid semver format (x.y.z)')
     }
 
-    let answers = {}
     const {
       bundleUploader,
       getReleaseHistory,
@@ -91,49 +93,39 @@ program
       getBinaryVersionList,
     } = await findAndReadConfigFile(process.cwd(), options.config)
 
-    if (
-      options.app &&
-      options.identifier &&
-      options.binaryVersion &&
-      options.appVersion &&
-      (options.app === 'device' || options.platform)
-    ) {
-      answers = {
-        app: options.app,
-        platform: options.platform || (options.app === 'device' && 'android'),
-        identifier: options.identifier,
-        binaryVersion: options.binaryVersion,
-        appVersion: options.appVersion,
-      }
-    } else {
-      // app
-      const app = await getAppValue()
-      // platform
-      const platform = await getPlatformValue(app)
-      // identifier
-      const identifier = await getIdentifierValue()
-      // binaryVersion
-      const binaryVersion = await getBinaryVersionValueFromInput(
+    const app = options.app || (await getAppValue())
+
+    const platform =
+      options.platform ||
+      (app !== 'user' && 'android') ||
+      (await getPlatformValue(app))
+
+    const identifier = options.identifier || (await getIdentifierValue())
+
+    const binaryVersion =
+      options.binaryVersion ||
+      (await getBinaryVersionValueFromInput(
         getBinaryVersionList,
         app,
         platform,
         identifier
-      )
-      // appVersion
-      const appVersion = await getAppVersionValueFromInput(
+      ))
+
+    const appVersion =
+      options.appVersion ||
+      (await getAppVersionValueFromInput(
         getReleaseHistory,
         binaryVersion,
         app,
         platform
-      )
+      ))
 
-      answers = {
-        app,
-        platform,
-        identifier,
-        binaryVersion,
-        appVersion,
-      }
+    const answers = {
+      app,
+      platform,
+      identifier,
+      binaryVersion,
+      appVersion,
     }
 
     await release(

package/cli/commands/showHistoryCommand/index.js

@@ -13,26 +13,63 @@ program
   .description(
     'Retrieves and prints the release history of a specific binary version.\n`getReleaseHistory` function should be implemented in the config file.'
   )
+  .option('-a, --app <string>', 'target app (user/device/b2c-device)')
+  .option('-p, --platform <string>', 'target platform (ios/android)')
+  .option('-i, --identifier <string>', 'target env identifier (dev/stg/prd)')
+  .option('-b, --binary-version <string>', 'target binary version (x.y.z)')
   .option(
     '-c, --config <path>',
     'configuration file name (JS/TS)',
     COMPILED_CONFIG_FILE_NAME
   )
   .action(async (options) => {
-    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 (
+      options.app &&
+      !['user', 'device', 'b2c-device'].includes(options.app)
+    ) {
+      throw new Error('App must be either "user" or "device" or "b2c-device"')
+    }
+
+    if (options.platform && !['ios', 'android'].includes(options.platform)) {
+      throw new Error('Platform must be either "ios" or "android"')
+    }
+
+    if (options.app !== 'user' && options.platform === 'ios') {
+      throw new Error('Device app is not supported on iOS')
+    }
+
+    if (
+      options.identifier &&
+      !['dev', 'stg', 'prd'].includes(options.identifier)
+    ) {
+      throw new Error('Identifier must be either "dev" or "stg" or "prd"')
+    }
+
+    const semverRegex = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/
+    if (options.binaryVersion && !semverRegex.test(options.binaryVersion)) {
+      throw new Error('Binary version must be a valid semver format (x.y.z)')
+    }
+
+    const { getBinaryVersionList, getReleaseHistory } =
+      await findAndReadConfigFile(process.cwd(), options.config)
+
+    const app = options.app || (await getAppValue())
+
+    const platform =
+      options.platform ||
+      (app !== 'user' && 'android') ||
+      (await getPlatformValue(app))
+
+    const identifier = options.identifier || (await getIdentifierValue())
+
+    const binaryVersion =
+      options.binaryVersion ||
+      (await getBinaryVersionValueFromList(
+        getBinaryVersionList,
+        app,
+        platform,
+        identifier
+      ))
 
     const answers = {
       app,
@@ -41,7 +78,7 @@ program
       binaryVersion,
     }
 
-    const releaseHistory = await config.getReleaseHistory(
+    const releaseHistory = await getReleaseHistory(
       answers.app,
       answers.binaryVersion,
       answers.platform

package/cli/commands/updateHistoryCommand/index.js

@@ -15,6 +15,11 @@ program
   .description(
     'Updates the release history for a specific binary version.\n`getReleaseHistory`, `setReleaseHistory` functions should be implemented in the config file.'
   )
+  .option('-a, --app <string>', 'target app (user/device/b2c-device)')
+  .option('-p, --platform <string>', 'target platform (ios/android)')
+  .option('-i, --identifier <string>', 'target env identifier (dev/stg/prd)')
+  .option('-b, --binary-version <string>', 'target binary version (x.y.z)')
+  .option('-v, --app-version <string>', 'target codepush version (x.y.z)')
   .option(
     '-c, --config <path>',
     'set config file name (JS/TS)',
@@ -28,27 +33,66 @@ program
   )
   .option('--no-enable', 'make the release to be disabled')
   .action(async (options) => {
-    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
-    )
+    if (
+      options.app &&
+      !['user', 'device', 'b2c-device'].includes(options.app)
+    ) {
+      throw new Error('App must be either "user" or "device" or "b2c-device"')
+    }
+
+    if (options.platform && !['ios', 'android'].includes(options.platform)) {
+      throw new Error('Platform must be either "ios" or "android"')
+    }
+
+    if (options.app !== 'user' && options.platform === 'ios') {
+      throw new Error('Device app is not supported on iOS')
+    }
+
+    if (
+      options.identifier &&
+      !['dev', 'stg', 'prd'].includes(options.identifier)
+    ) {
+      throw new Error('Identifier must be either "dev" or "stg" or "prd"')
+    }
+
+    const semverRegex = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/
+    if (options.binaryVersion && !semverRegex.test(options.binaryVersion)) {
+      throw new Error('Binary version must be a valid semver format (x.y.z)')
+    }
+
+    if (options.appVersion && !semverRegex.test(options.appVersion)) {
+      throw new Error('App version must be a valid semver format (x.y.z)')
+    }
+
+    const { getBinaryVersionList, getReleaseHistory, setReleaseHistory } =
+      await findAndReadConfigFile(process.cwd(), options.config)
+
+    const app = options.app || (await getAppValue())
+
+    const platform =
+      options.platform ||
+      (app !== 'user' && 'android') ||
+      (await getPlatformValue(app))
+
+    const identifier = options.identifier || (await getIdentifierValue())
+
+    const binaryVersion =
+      options.binaryVersion ||
+      (await getBinaryVersionValueFromList(
+        getBinaryVersionList,
+        app,
+        platform,
+        identifier
+      ))
+
+    const appVersion =
+      options.appVersion ||
+      (await getAppVersionValueFromList(
+        getReleaseHistory,
+        binaryVersion,
+        app,
+        platform
+      ))
 
     const answers = {
       app,
@@ -70,8 +114,8 @@ program
       answers.app,
       answers.appVersion,
       answers.binaryVersion,
-      config.getReleaseHistory,
-      config.setReleaseHistory,
+      getReleaseHistory,
+      setReleaseHistory,
       answers.platform,
       options.mandatory,
       options.enable

package/cli/commands/updateHistoryCommand/updateReleaseHistory.js

@@ -1,6 +1,6 @@
 const fs = require('fs')
 const path = require('path')
-
+const { getTimestamp } = require('../../utils/datetime')
 /**
  * @param app {"user" | "device"}
  * @param appVersion {string}
@@ -35,10 +35,11 @@ async function updateReleaseHistory(
   const releaseHistory = await getReleaseHistory(app, binaryVersion, platform)
 
   const updateInfo = releaseHistory[appVersion]
-  if (!updateInfo) throw new Error(`v${appVersion} is not released`)
+  if (!updateInfo) throw new Error(`${appVersion} is not released`)
 
   if (typeof mandatory === 'boolean') updateInfo.mandatory = mandatory
   if (typeof enable === 'boolean') updateInfo.enabled = enable
+  updateInfo.updatedAt = getTimestamp()
 
   try {
     const JSON_FILE_NAME = `${binaryVersion}.json`

package/cli/utils/datetime.js

@@ -0,0 +1,22 @@
+const getTimestamp = () => {
+  const date = new Date()
+  const year = date.getFullYear()
+  const month = padWithZero(date.getMonth() + 1)
+  const day = padWithZero(date.getDate())
+  const hour = padWithZero(date.getHours())
+  const minute = padWithZero(date.getMinutes())
+  const second = padWithZero(date.getSeconds())
+
+  return `${year}-${month}-${day} ${hour}:${minute}:${second}`
+}
+
+const padWithZero = (value) => {
+  if (value < 10) {
+    return `0${value}`
+  }
+  return value
+}
+
+module.exports = {
+  getTimestamp,
+}

package/package.json

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