tt-minigame-ide-cli 0.0.1-beta.4 → 0.0.1-beta.5

package/README.en.md

@@ -96,7 +96,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 +115,7 @@ 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
 ```

package/README.md

@@ -97,7 +97,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 +116,7 @@ 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
 ```

package/bin/tmg.js

@@ -103,7 +103,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 +139,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);

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,27 @@ exports.checkRemoteVersion = async function () {
             msg: err.message
         }
     });
+}
+
+// 获取远程版本号
+exports.checkUploadVersion = async function (appId, version) {
+    try {
+        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()}`)
+        const current = res.data.data.version;
+        if (compareVersions(version, current) > 0) {
+            return {
+                success: true,
+            }
+        } else {
+            return {
+                success: false,
+                msg: `The version you uploaded must be greater than the current version ${current}.`,
+            }
+        }
+    } catch (err) {
+        return {
+            success: false,
+            msg: err.message
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-minigame-ide-cli",
-  "version": "0.0.1-beta.4",
+  "version": "0.0.1-beta.5",
   "description": "Command line interface for micro app development",
   "main": "lib/index.js",
   "bin": {
@@ -17,6 +17,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",