react-native-update-cli 1.7.0 → 1.8.1

package/lib/api.js

@@ -166,11 +166,7 @@ async function uploadFile(fn, key) {
       bar.tick(data.length);
     });
     _request2.default.post(realUrl, {
-      formData,
-      headers: {
-        'User-Agent': userAgent,
-        'X-AccessToken': session ? session.token : ''
-      }
+      formData
     }, (err, resp, body) => {
       if (err) {
         return reject(err);

package/lib/app.js

@@ -105,7 +105,7 @@ const commands = exports.commands = {
   },
   selectApp: async function ({ args, options }) {
     const platform = checkPlatform(options.platform || (await (0, _utils.question)('平台(ios/android):')));
-    const id = args[0] || (await chooseApp(platform)).id;
+    const id = args[0] ? parseInt(args[0]) : (await chooseApp(platform)).id;
 
     let updateInfo = {};
     if (_fs2.default.existsSync('update.json')) {

package/lib/package.js

@@ -22,18 +22,25 @@ const Table = require('tty-table');
 async function listPackage(appId) {
   const { data } = await get(`/app/${appId}/package/list?limit=1000`);
 
-  const header = [{ value: 'Package Id' }, { value: 'Version' }];
+  const header = [{ value: '原生包 Id' }, { value: '原生版本' }];
   const rows = [];
   for (const pkg of data) {
     const { version } = pkg;
     let versionInfo = '';
     if (version) {
-      versionInfo = ` - ${version.id} ${version.hash.slice(0, 8)} ${version.name}`;
+      versionInfo = `, 已绑定：${version.name} (${version.id})`;
     } else {
-      versionInfo = ' (newest)';
+      // versionInfo = ' (newest)';
     }
-
-    rows.push([pkg.id, `${pkg.name}(${pkg.status})${versionInfo}`]);
+    let output = pkg.name;
+    if (pkg.status === 'paused') {
+      output += '(已暂停)';
+    }
+    if (pkg.status === 'expired') {
+      output += '(已过期)';
+    }
+    output += versionInfo;
+    rows.push([pkg.id, output]);
   }
 
   console.log(Table(header, rows).render());

package/lib/versions.js

@@ -118,20 +118,22 @@ const commands = exports.commands = {
     const platform = (0, _app.checkPlatform)(options.platform || (await (0, _utils.question)('平台(ios/android):')));
     const { appId } = await (0, _app.getSelectedApp)(platform);
     const versionId = options.versionId || (await chooseVersion(appId)).id;
-    let pkgId = options.packageId;
-    if (!pkgId) {
-      let pkgVersion = options.packageVersion;
-      if (pkgVersion) {
-        pkgVersion = pkgVersion.trim();
-        const { data } = await get(`/app/${appId}/package/list?limit=1000`);
-        const pkg = data.find(d => d.name === pkgVersion);
-        if (pkg) {
-          pkgId = pkg.id;
-        } else {
-          throw new Error(`未查询到匹配原生版本：${pkgVersion}`);
-        }
+
+    let pkgId;
+    let pkgVersion = options.packageVersion;
+    if (pkgVersion) {
+      pkgVersion = pkgVersion.trim();
+      const { data } = await get(`/app/${appId}/package/list?limit=1000`);
+      const pkg = data.find(d => d.name === pkgVersion);
+      if (pkg) {
+        pkgId = pkg.id;
+      } else {
+        throw new Error(`未查询到匹配原生版本：${pkgVersion}`);
       }
     }
+    if (!pkgId) {
+      pkgId = options.packageId || (await (0, _package.choosePackage)(appId)).id;
+    }
 
     if (!pkgId) {
       throw new Error('请提供 packageId 或 packageVersion 参数');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {

package/src/api.js

@@ -159,10 +159,6 @@ async function uploadFile(fn, key) {
       realUrl,
       {
         formData,
-        headers: {
-          'User-Agent': userAgent,
-          'X-AccessToken': session ? session.token : '',
-        },
       },
       (err, resp, body) => {
         if (err) {

package/src/app.js

@@ -100,7 +100,7 @@ export const commands = {
     const platform = checkPlatform(
       options.platform || (await question('平台(ios/android):')),
     );
-    const id = args[0] || (await chooseApp(platform)).id;
+    const id = args[0] ? parseInt(args[0]) : (await chooseApp(platform)).id;
 
     let updateInfo = {};
     if (fs.existsSync('update.json')) {

package/src/package.js

@@ -13,20 +13,25 @@ const Table = require('tty-table');
 export async function listPackage(appId) {
   const { data } = await get(`/app/${appId}/package/list?limit=1000`);
 
-  const header = [{ value: 'Package Id' }, { value: 'Version' }];
+  const header = [{ value: '原生包 Id' }, { value: '原生版本' }];
   const rows = [];
   for (const pkg of data) {
     const { version } = pkg;
     let versionInfo = '';
     if (version) {
-      versionInfo = ` - ${version.id} ${version.hash.slice(0, 8)} ${
-        version.name
-      }`;
+      versionInfo = `, 已绑定：${version.name} (${version.id})`;
     } else {
-      versionInfo = ' (newest)';
+      // versionInfo = ' (newest)';
     }
-
-    rows.push([pkg.id, `${pkg.name}(${pkg.status})${versionInfo}`]);
+    let output = pkg.name;
+    if (pkg.status === 'paused') {
+      output += '(已暂停)';
+    }
+    if (pkg.status === 'expired') {
+      output += '(已过期)';
+    }
+    output += versionInfo;
+    rows.push([pkg.id, output]);
   }
 
   console.log(Table(header, rows).render());

package/src/versions.js

@@ -124,20 +124,22 @@ export const commands = {
     );
     const { appId } = await getSelectedApp(platform);
     const versionId = options.versionId || (await chooseVersion(appId)).id;
-    let pkgId = options.packageId;
-    if (!pkgId) {
-      let pkgVersion = options.packageVersion;
-      if (pkgVersion) {
-        pkgVersion = pkgVersion.trim();
-        const { data } = await get(`/app/${appId}/package/list?limit=1000`);
-        const pkg = data.find((d) => d.name === pkgVersion);
-        if (pkg) {
-          pkgId = pkg.id;
-        } else {
-          throw new Error(`未查询到匹配原生版本：${pkgVersion}`);
-        }
+
+    let pkgId;
+    let pkgVersion = options.packageVersion;
+    if (pkgVersion) {
+      pkgVersion = pkgVersion.trim();
+      const { data } = await get(`/app/${appId}/package/list?limit=1000`);
+      const pkg = data.find((d) => d.name === pkgVersion);
+      if (pkg) {
+        pkgId = pkg.id;
+      } else {
+        throw new Error(`未查询到匹配原生版本：${pkgVersion}`);
       }
     }
+    if (!pkgId) {
+      pkgId = options.packageId || (await choosePackage(appId)).id;
+    }
 
     if (!pkgId) {
       throw new Error('请提供 packageId 或 packageVersion 参数');