@opentapd/tplugin-cli 0.21.0-beta.1 → 0.21.0-beta.3

package/lib/deploy.js

@@ -19,7 +19,7 @@ const archiver = require('archiver');
 const crypto = require('crypto');
 const path = require('path');
 const { get } = require('lodash');
-
+const getFolderHash = require('../util/getFolderHash');
 // CLI部署
 module.exports = async () => {
   // 先lint检查插件格式是否正常
@@ -39,7 +39,30 @@ module.exports = async () => {
   if (tpluginConf.tapd.pluginEnv === 'oa') {
     await oaEnvDeploy(docObj);
   } else {
-    otherEnvDeploy(docObj);
+    // 生成插件的文件hash;
+    const projectHash = (await getFolderHash(process.cwd(), new SimpleGit())).slice(0, 8);
+
+    // 检测版本是否被占用
+    await checkDeployVersion({
+      version: `v-${projectHash}`,
+      code: docObj.app.code,
+    });
+
+    // 版本别名
+    const { versionAlias } = await inquirer.prompt([{
+      type: 'input',
+      name: 'versionAlias',
+      message: `请填写发布的版本号(default:v-${projectHash})`,
+      default: `v-${projectHash}`,
+    }]);
+
+    const zipper = promisify(zipCurrentWorkspace);
+    const zipFilePath = await zipper(docObj.app.code);
+    await uploadZipFile(docObj.app.code, zipFilePath);
+    removeZipFile(zipFilePath);
+    await deploy('', projectHash, docObj.app.code, {
+      nick: versionAlias,
+    });
   }
 };
 
@@ -113,17 +136,12 @@ async function oaEnvDeploy(docObj) {
   }
 }
 
-// 其他环境部署
-function otherEnvDeploy(docObj) {
-  // 压缩本地代码
-  zipCurrentWorkspace(docObj.app.code, async (zipFilePath) => {
-    // 开始传附件到tapd
-    await uploadZipFile(docObj.app.code, zipFilePath);
-    // 删除文件
-    removeZipFile(zipFilePath);
-    // 开始触发部署流水线
-    deploy('', '', docObj.app.code);
-  });
+function promisify(fun) {
+  return function (...args) {
+    return new Promise(resolove => fun.apply(fun, [...args, (result) => {
+      resolove(result);
+    }]));
+  };
 }
 
 function removeZipFile(filePath) {
@@ -210,8 +228,9 @@ function uploadToCos(...args) {
  * @param commit 部署的commit点
  * @param code 插件code
  */
-async function deploy(branch, commit, code) {
+async function deploy(branch, commit, code, { nick } = {}) {
   let buildId = '';
+  const { pluginEnv } = tpluginConf.tapd;
   try {
     spinner.start('启动部署任务');
 
@@ -220,7 +239,8 @@ async function deploy(branch, commit, code) {
       branch,
       commit_id: commit,
       client_id: code,
-      plugin_env: tpluginConf.tapd.pluginEnv,
+      plugin_env: pluginEnv,
+      nick,
     }, method: 'POST' });
 
     // 流水线启动失败
@@ -257,14 +277,21 @@ async function deploy(branch, commit, code) {
 
     // 部署后，提示安装测试项目
     if (buildStatus === 'SUCCEED') {
-      if (tpluginConf.tapd.pluginEnv === 'oa') {
+      if (pluginEnv === 'oa') {
         spinner.succeed(`部署成功 => 分支[${branch}], 部署节点[${commit}]`);
       } else {
         spinner.succeed(`部署成功, 部署版本[${commit}]`);
       }
 
-      const tips = `前往TAPD开放平台，添加项目进行测试。${tpluginConf.tapd.openHost}/admin/${code}/testdeploy`;
-      console.log(chalk.green(tips));
+      if (pluginEnv === 'cloud') {
+        await switchTestVersionTips({
+          code,
+          version: `v-${commit}`,
+        });
+      } else {
+        const tips = `前往TAPD开放平台，添加项目进行测试。${tpluginConf.tapd.openHost}/admin/${code}/testdeploy`;
+        console.log(chalk.green(tips));
+      }
 
       return undefined;
     } if (buildStatus === 'FAILED') {
@@ -277,3 +304,48 @@ async function deploy(branch, commit, code) {
   const deployTips = `前往TAPD开放平台，查看部署进度。${tpluginConf.tapd.openHost}/admin/${code}/codedeploy`;
   spinner.fail(deployTips);
 }
+
+async function switchTestVersionTips({ code, version }) {
+  const currentVersion = await getAppTestVersion({ code });
+  if (currentVersion) {
+    const { switchVersion } = await inquirer.prompt({
+      type: 'confirm',
+      message: '是否将当前版本替换为测试版本',
+      name: 'switchVersion',
+    });
+
+    if (switchVersion) {
+      await switchTestVersion({ code, version });
+    }
+  }
+  spinner.succeed(`前往TAPD开放平台,测试应用。${tpluginConf.tapd.openHost}/admin/${code}/codedeploy`);
+}
+
+// 获取当前公司的测试版本
+async function getAppTestVersion({ code }) {
+  const { data } = await tapdsdk.request({ url: 'open_user_app/get_app_current_test_version', params: {
+    code,
+  } });
+  return data.data;
+}
+
+// 切换当前公司的测试版本
+async function switchTestVersion({ code, version }) {
+  const { data } = await tapdsdk.request({ url: 'open_user_app/switch_test_app_version', params: {
+    code,
+    version,
+  } });
+  return data;
+}
+
+async function checkDeployVersion({ version, code }) {
+  const { data } = await tapdsdk.request({ url: 'open_user_app/check_app_version', params: {
+    code,
+    version,
+  } });
+
+  if (data.data.exist !== false) {
+    throw new Error('该代码已经部署过了');
+  }
+  return true;
+}

package/lib/serve.js

@@ -382,8 +382,8 @@ class WebsocketClient {
         env: Object.assign(process.env, this.processEnv || {}),
       },  (error, stdout, stderr) => {
         error && console.log(chalk.red('serve处理请求失败'), error);
-        stdout && console.log(`debbug(serve):\n ${chalk.green(stdout)}`);
-        stderr && console.log(`debbug(serve):\n ${chalk.red(stderr)}`);
+        stdout && console.log(`debug(serve):\n ${chalk.green(stdout)}`);
+        stderr && console.log(`debug(serve):\n ${chalk.red(stderr)}`);
       });
     } catch (e) {
       console.log(chalk.red('serve服务启动失败'), e);
@@ -413,8 +413,8 @@ class WebsocketClient {
         env: Object.assign(process.env, this.processEnv || {}),
       },  (error, stdout, stderr) => {
         error && console.log(chalk.red('serve处理请求失败'), error);
-        stdout && console.log(`debbug(serve):\n ${chalk.green(stdout)}`);
-        stderr && console.log(`debbug(serve):\n ${chalk.red(stderr)}`);
+        stdout && console.log(`debug(serve):\n ${chalk.green(stdout)}`);
+        stderr && console.log(`debug(serve):\n ${chalk.red(stderr)}`);
       });
     } catch (e) {
       console.log(chalk.red('serve服务启动失败'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentapd/tplugin-cli",
-  "version": "0.21.0-beta.1",
+  "version": "0.21.0-beta.3",
   "description": "tplugin-cli",
   "bin": {
     "tplugin-cli": "index.js"