tt-minigame-ide-cli 0.0.1-beta.4 → 1.0.1-beta.0

package/README.en.md

@@ -9,12 +9,11 @@
 
 - [Installation](#installation)
 - [Usage](#usage)
-  <!-- - [Create Project](#create-project)
-  - [Open existing project](#open-existing-project) -->
   - [Login](#login)
   - [Login by email](#login-by-email)
   - [Preview project](#preview-project)
   - [Upload project](#upload-project)
+  - [Get project version](#get-project-version)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -28,33 +27,6 @@ npm install -g tt-minigame-ide-cli
 
 ## Usage
 
-<!-- ### Create Project
-
-Create a new blank miniprogram project with given name in current folder.
-
-```
-Usage: tmg create <project-name>
-
-Create a new project with given name in current folder
-
-Options:
-
-  -f, --force        Overwrite target directory if it exists
-  -h, --help         Output usage information
-``` -->
-
-<!-- ### Open existing project
-
-Open existing project with given path in microapp IDE.
-
-If the path is not available, start up the IDE only.
-
-```
-Usage: tmg open <project-path>
-
-Open target project by path
-``` -->
-
 ### Login
 
 Login to the developer Platform. Proxy is supported.
@@ -96,7 +68,7 @@ Options:
   -f, --force          Preview project without local cache(deprecated)
   --disable-cache      Preview project without local cache
   -s, --small          Use small QR Code, but it does not take effect in some environments
-  -c, --copy           Copy remote url to clipboard
+  -u, --copy           Copy remote url to clipboard
   -p, --proxy <proxy>  Preview with proxy
   -h, --help           output usage information
   -o, --output <path>  QRCode image output path
@@ -115,7 +87,18 @@ Options:
   -v, --app-version <version>  App version (eg: [major].[minor].[patch])
   -c, --app-changelog <log>    Changelog for this version
   -p, --proxy <proxy>          Update request proxy
-  -cp, --copy                  Copy remote url to clipboard
+  -u, --copy                  Copy remote url to clipboard
   -h, --help                   output usage information
   -o, --output <path>          QRCode image output path
 ```
+
+### Get project version
+
+Get latest released version of project.
+
+```
+Usage: tmg version [entry]
+
+Get latest released version of project
+```
+

package/README.md

@@ -9,12 +9,11 @@
 
 - [安装](#%E5%AE%89%E8%A3%85)
 - [使用](#%E4%BD%BF%E7%94%A8)
-  <!-- - [创建新项目](#%E5%88%9B%E5%BB%BA%E6%96%B0%E9%A1%B9%E7%9B%AE)
-  - [打开已有项目](#%E6%89%93%E5%BC%80%E5%B7%B2%E6%9C%89%E9%A1%B9%E7%9B%AE) -->
   - [登录](#%E7%99%BB%E5%BD%95)
   - [通过 email 登录](#%E9%80%9A%E8%BF%87-email-%E7%99%BB%E5%BD%95)
-  - [预览小游戏](#%E9%A2%84%E8%A7%88%E5%B0%8F%E7%A8%8B%E5%BA%8F)
+  - [预览小游戏](#%E9%A2%84%E8%A7%88%E5%B0%8F%E6%B8%B8%E6%88%8F)
   - [上传项目](#%E4%B8%8A%E4%BC%A0%E9%A1%B9%E7%9B%AE)
+  - [获取项目版本](#%E8%8E%B7%E5%8F%96%E9%A1%B9%E7%9B%AE%E7%89%88%E6%9C%AC)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -28,33 +27,6 @@ npm install -g tt-minigame-ide-cli
 
 ## 使用
 
-<!-- ### 创建新项目
-
-在当前目录下，以给定的项目名字创建一个空白的小程序项目。
-
-```
-Usage: tmg create <project-name>
-
-Create a new project with given name in current folder
-
-Options:
-
-  -f, --force        Overwrite target directory if it exists
-  -h, --help         Output usage information
-``` -->
-
-<!-- ### 打开已有项目
-
-在小程序开发者工具中打开给定目录的项目。
-
-如果给定的目录不存在，则仅打开开发者工具。
-
-```
-Usage: tmg open <project-path>
-
-Open target project by path
-``` -->
-
 ### 登录
 
 登录到开发者平台。支持代理设置。
@@ -97,7 +69,7 @@ Options:
   -f, --force          Preview project without local cache(deprecated)
   --disable-cache      Preview project without local cache
   -s, --small          Use small QR Code, but it does not take effect in some environments
-  -c, --copy           Copy remote url to clipboard
+  -u, --copy           Copy remote url to clipboard
   -p, --proxy <proxy>  Preview with proxy
   -h, --help           output usage information
   -o, --output <path>  QRCode image output path
@@ -116,7 +88,17 @@ Options:
   -v, --app-version <version>  App version (eg: [major].[minor].[patch])
   -c, --app-changelog <log>    Changelog for this version
   -p, --proxy <proxy>          Update request proxy
-  -cp, --copy                  Copy remote url to clipboard
+  -u, --copy                  Copy remote url to clipboard
   -h, --help                   output usage information
   -o, --output <path>          QRCode image output path
 ```
+
+### 获取项目版本
+
+获取项目线上版本号。
+
+```
+Usage: tmg version [entry]
+
+Get latest released version of project
+```

package/bin/tmg.js

@@ -13,55 +13,6 @@ checkNodeVersion(requiredVersion);
 // Get version
 program.version(getVersion(), '-V, --version', 'Output the current version');
 
-//#region open project
-
-// program
-//   .command('open <project-path>')
-//   .description('Open target project by path')
-//   .action((projectPath) => {
-//     const isMac = process.platform === 'darwin',
-//       IDE_SCHEMA = 'bytedanceide:';
-//     const openCmd = isMac ? `open ${IDE_SCHEMA}` : `explorer ${IDE_SCHEMA}`;
-//     let openPath;
-//     if (!path.isAbsolute(projectPath)) {
-//       projectPath = path.join(process.cwd(), projectPath);
-//     }
-//     if (fs.existsSync(projectPath)) {
-//       // open project with existing path
-//       console.log(chalk.green(`open projectPath: ${projectPath}`));
-//       openPath = `${openCmd}?path=${projectPath}`;
-//     } else {
-//       // project folder not exist,
-//       // open IDE
-//       console.log(chalk.green(`open IDE`));
-//       openPath = openCmd;
-//     }
-
-//     cp.exec(openPath, (error) => {
-//       if (!error) {
-//         console.log('打开IDE成功');
-//       } else {
-//         console.log(chalk.red('打开IDE失败', error));
-//       }
-//     });
-//   });
-
-//#endregion
-
-//#region create new project
-
-// program
-//   .command('create <project-name>')
-//   .description('Create a new project with given name in current folder')
-//   .option('-f, --force', 'Overwrite target directory if it exists')
-//   .action((name, cmd) => {
-//     const options = cleanArgs(cmd);
-//     checkArgNum(1);
-//     require('../lib/create')(name, options);
-//   });
-
-//#endregion
-
 //#region Login by mobile or email
 
 program
@@ -103,7 +54,7 @@ program
   .option('-f, --force', 'Preview project without local cache(deprecated)')
   .option('--disable-cache', 'Preview project without local cache')
   .option('-s, --small', 'Use small QR Code, it may fail in some environments')
-  .option('-c, --copy', 'Copy remote url to clipboard')
+  .option('-u, --copy', 'Copy remote url to clipboard')
   .option('-p, --proxy <proxy>', 'Preview with proxy')
   .option('-o, --output <path>', 'QRCode image output path')
   .action((entry, cmd) => {
@@ -139,7 +90,7 @@ program
   )
   .requiredOption('-c, --app-changelog <log>', 'Changelog for this version')
   .option('-p, --proxy <proxy>', 'Update request proxy')
-  .option('-cp, --copy', 'Copy remote url to clipboard')
+  .option('-u, --copy', 'Copy remote url to clipboard')
   .option('-o, --output <path>', 'QRCode image output path')
   .action((entry, cmd) => {
     const options = cleanArgs(cmd);
@@ -150,6 +101,17 @@ program
 
 //#endregion
 
+//#region version
+program
+  .command('version [entry]')
+  .description('Get latest released version of project')
+  .action((entry, cmd) => {
+    const options = cleanArgs(cmd);
+    checkArgNum(1);
+    require('../lib/version')(entry, options);
+  });
+//#endregion
+
 program.parse(process.argv);
 
 //#region helpers

package/lib/upload.js

@@ -17,7 +17,8 @@ const {
     uploadProject,
     getCompileProgress,
     checkUserPermissions,
-    getQrCode
+    getQrCode,
+    checkUploadVersion,
 } = require('./util/request');
 const {
     generateQrCode
@@ -50,6 +51,17 @@ async function upload(entry, options) {
         console.log(chalk.red(errMsg));
         throw new Error(errMsg);
     }
+
+    const {
+        success: checkVersionSuccess,
+        msg: checkVersionMsg,
+    } = await checkUploadVersion(appId, options.appVersion);
+    if (!checkVersionSuccess) {
+        const errMsg = `[CLI UPLOAD ERROR]: ${checkVersionMsg}`;
+        console.log(chalk.red(errMsg));
+        throw new Error(errMsg);
+    }
+
     const tempDir = options.tempDir || path.join(__dirname, '../temp');
     await fs.emptyDir(tempDir);
 

package/lib/util/request.js

@@ -4,6 +4,7 @@ const querystring = require('querystring');
 const url = require('url');
 const fs = require('fs');
 const execa = require('execa');
+const compareVersions = require('compare-versions');
 const {
     getUserCookies
 } = require('./cookie');
@@ -32,8 +33,8 @@ axios.interceptors.request.use(config => {
     config.headers.Referer = REFERER;
     if (config.data instanceof FormData) {
         Object.assign(config.headers, config.data.getHeaders());
-      }
-    if(config.proxy) {
+    }
+    if (config.proxy) {
         const parseURL = URL.parse(config.proxy.host);
         config.httpsAgent = require('tunnel').httpsOverHttp({
             proxy: {
@@ -340,6 +341,7 @@ exports.checkUserPermissions = function (appId, proxy) {
         }
     });
 }
+
 // 该方法暂无调用
 exports.checkRemoteVersion = async function () {
     const registry = (await execa('npm', ['config', 'get', 'registry'])).stdout;
@@ -359,4 +361,34 @@ exports.checkRemoteVersion = async function () {
             msg: err.message
         }
     });
-}
+}
+
+// 获取远程版本号
+exports.checkUploadVersion = async function (appId, version) {
+    try {
+        const current = await getProjectReleaseVersion(appId);
+        if (compareVersions(version, current) > 0) {
+            return {
+                current,
+                success: true,
+            }
+        } else {
+            return {
+                current,
+                success: false,
+                msg: `The version you uploaded must be greater than ${current}.`,
+            }
+        }
+    } catch (err) {
+        return {
+            success: false,
+            msg: err.message
+        }
+    }
+}
+
+const getProjectReleaseVersion = async function (appId) {
+    const res = await axios.get(`/api/apps/v3/meta?appid=${appId}&aid=13&version=current&ttcode=OVCNW/U0UREwv0sHdY9Rm16vBgGrCQIBOWurUCmJ1H6d/2XHLKeOYTYfEJIEeC0AOCwBZAR2j34C4tFN7Nqfq9tHVEpM4OuJM2b8qz0INtUs1qLhKFOtnGa9/Ey0WW86GGocJk074eP72MMhzNmePzaTQzXwn/eqEq4GHwyF2Tg=&t=${new Date().getTime()}`)
+    return res.data.data.version;
+}
+exports.getProjectReleaseVersion = getProjectReleaseVersion;

package/lib/version.js

@@ -0,0 +1,44 @@
+// Get project version
+const path = require('path');
+const chalk = require('chalk');
+const {
+    checkBeforeUpload,
+    isValidAppVersion,
+} = require('./util/check');
+const {
+    getProjectReleaseVersion
+} = require('./util/request');
+
+async function version(entry, options) {
+    const cwd = options.cwd || process.cwd();
+    if (!entry) {
+        entry = cwd
+    } else if (path.isAbsolute(entry)) {
+        // skip if entry if absolute path
+    } else {
+        // resolve the relative entry with cwd
+        entry = path.resolve(cwd, entry);
+    }
+
+    const {
+        success: beforeSuccess,
+        msg: beforeMsg,
+        appId
+    } = await checkBeforeUpload(entry);
+    if (!beforeSuccess) {
+        const errMsg = `[CLI VERSION ERROR]: ${beforeMsg}`;
+        console.log(chalk.red(errMsg));
+        throw new Error(errMsg);
+    }
+
+    const version = await getProjectReleaseVersion(appId);
+    console.log(version);
+}
+
+module.exports = (...args) => {
+    return version(...args).catch(err => {
+        const errMsg = `[CLI VERSION ERROR]: ${err}`;
+        console.log(chalk.red(errMsg));
+        throw new Error(errMsg);
+    });
+}

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "tt-minigame-ide-cli",
-  "version": "0.0.1-beta.4",
+  "version": "1.0.1-beta.0",
   "description": "Command line interface for micro app development",
   "main": "lib/index.js",
   "bin": {
     "tmg": "bin/tmg.js"
   },
-  "scripts": {},
+  "scripts": {
+    "doctoc": "doctoc README.md README.en.md"
+  },
   "author": "liubowen.howard@bytedance.com",
   "license": "ISC",
   "dependencies": {
@@ -17,6 +19,7 @@
     "chalk": "^3.0.0",
     "clipboardy": "^2.2.0",
     "commander": "^4.1.1",
+    "compare-versions": "^4.1.3",
     "execa": "^4.0.0",
     "folder-hash": "^3.3.0",
     "form-data": "^3.0.0",
@@ -31,5 +34,8 @@
   },
   "engines": {
     "node": ">=8.9"
+  },
+  "devDependencies": {
+    "doctoc": "^2.2.0"
   }
 }