@opentapd/tplugin-cli 0.69.0 → 0.69.1-alpha.0

package/lib/deploy.js

@@ -18,6 +18,7 @@ const SimpleGit = require('simple-git');
 const archiver = require('archiver');
 const crypto = require('crypto');
 const path = require('path');
+const { execSync } = require('child_process');
 const { get } = require('lodash');
 const getFolderHash = require('../util/getFolderHash');
 // CLI部署
@@ -39,6 +40,9 @@ module.exports = async () => {
   if (tpluginConf.tapd.pluginEnv === 'oa') {
     await oaEnvDeploy(docObj);
   } else {
+    if (tpluginConf.tapd.pluginEnv === 'cloud') {
+      await cloudPreDeal();
+    }
     // 生成插件的文件hash;
     const projectHash = (await getFolderHash(process.cwd(), new SimpleGit())).slice(0, 8);
 
@@ -183,13 +187,16 @@ function zipCurrentWorkspace(code, callback) {
   });
 
   archive.pipe(output);
-
+  let ignore = ['node_modules/**', '.git/**'];
+  if (tpluginConf.tapd.pluginEnv === 'cloud') {
+    ignore = ['.git/**'];
+  }
   archive.glob(
     '**/*',
     {
       cwd: `${process.cwd()}/`,
       dot: true,
-      ignore: ['node_modules/**', '.git/**'],
+      ignore,
     },
     {
       prefix: `${code}/`,
@@ -199,11 +206,18 @@ function zipCurrentWorkspace(code, callback) {
   archive.finalize();
 }
 
-function uploadZipFile(code, filePath) {
+async function readConfig() {
+  let content = '';
+  content = await fs.readFile(path.join(process.cwd(), 'plugin.yaml'));
+  return content.toString();
+}
+
+async function uploadZipFile(code, filePath) {
   spinner.start('开始上传压缩包');
   return uploadToCos({
     client_id: code,
     file: fs.createReadStream(filePath),
+    yaml_content: await readConfig(),
   })
     .then(() => {
       spinner.succeed('压缩包上传成功！');
@@ -235,13 +249,16 @@ async function deploy(branch, commit, code, { nick } = {}) {
     spinner.start('启动部署任务');
 
     // 触发部署流水线
-    const { data } = await tapdsdk.request({ url: 'open_user_app/bk_pipeline_start', params: {
-      branch,
-      commit_id: commit,
-      client_id: code,
-      plugin_env: pluginEnv,
-      nick,
-    }, method: 'POST' });
+    const { data } = await tapdsdk.request({
+      url: 'open_user_app/bk_pipeline_start', params: {
+        branch,
+        commit_id: commit,
+        client_id: code,
+        plugin_env: pluginEnv,
+        nick,
+        is_local_build: true,
+      }, method: 'POST'
+    });
 
     // 流水线启动失败
     if (!data.status || !data.data || !data.data.bk_build_id) {
@@ -264,10 +281,12 @@ async function deploy(branch, commit, code, { nick } = {}) {
   while (i++ < 120) {
     let buildStatus = '';
     try {
-      const { data } = await tapdsdk.request({ url: 'open_user_app/get_build_status', params: {
-        build_id: buildId,
-        client_id: code,
-      }, method: 'GET' });
+      const { data } = await tapdsdk.request({
+        url: 'open_user_app/get_build_status', params: {
+          build_id: buildId,
+          client_id: code,
+        }, method: 'GET'
+      });
       // 判断部署流水线状态
       buildStatus = get(data, 'data.build_status', '');
     } catch (err) {
@@ -323,29 +342,132 @@ async function switchTestVersionTips({ code, version }) {
 
 // 获取当前公司的测试版本
 async function getAppTestVersion({ code }) {
-  const { data } = await tapdsdk.request({ url: 'open_user_app/get_app_current_test_version', params: {
-    code,
-  } });
+  const { data } = await tapdsdk.request({
+    url: 'open_user_app/get_app_current_test_version', params: {
+      code,
+    }
+  });
   return get(data, 'data.test_deploy_info');
 }
 
 // 切换当前公司的测试版本
 async function switchTestVersion({ code, version }) {
-  const { data } = await tapdsdk.request({ url: 'open_user_app/switch_test_app_version', params: {
-    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,
-  } });
+  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;
 }
+
+async function checkAndInstallJsDeps(skipClean) {
+  spinner.start('正在安装 JS 依赖 (npm install)...');
+  try {
+    execSync('npm install --unsafe-perm', { stdio: 'inherit' });
+    spinner.succeed('JS 依赖安装完成');
+  } catch (e) {
+    spinner.fail('JS 依赖安装失败，请手动执行 npm install');
+    process.exit(1);
+  }
+}
+
+async function cloudPreDeal() {
+  const pluginRunEnv = getPluginRunEnv();
+  if (pluginRunEnv === 'js') {
+    await checkAndInstallJsDeps();
+    await runJsBuild();
+  } else if (pluginRunEnv === 'python') {
+    await checkAndInstallPythonDeps();
+  } else {
+    spinner.fail('未识别插件类型，请确认根目录下有 index.js 或 index.py');
+    process.exit(1);
+  }
+}
+
+async function runJsBuild() {
+  const distPath = 'resources/dist';
+  spinner.start('开始执行本地构建...');
+  // 清空 dist 目录
+  try {
+    if (fs.existsSync(distPath)) {
+      fs.rmSync(distPath, { recursive: true, force: true });
+      spinner.info('已清空 resources/dist 目录');
+    }
+  } catch (err) {
+    spinner.fail('清理 resources/dist 目录失败，请检查权限');
+    process.exit(1);
+  }
+
+  // 执行构建
+  try {
+    execSync('npm run build', { stdio: 'inherit' });
+    spinner.succeed('构建成功！');
+  } catch (e) {
+    spinner.fail('构建失败，请检查错误日志');
+    process.exit(1);
+  }
+
+  // 清除 node modules
+  try {
+    if (fs.existsSync('node_modules')) {
+      fs.rmSync('node_modules', { recursive: true, force: true });
+      spinner.info('已清空 node_modules 目录');
+    }
+  } catch (err) {
+    spinner.fail('清理 node_modules 目录失败，请检查权限');
+    process.exit(1);
+  }
+
+  // 安装后端Handler依赖包
+  try {
+    execSync('npm install  --unsafe-perm --production', { stdio: 'inherit' });
+    spinner.succeed('Handler依赖包安装成功！');
+  } catch (e) {
+    spinner.fail('Handler依赖包安装失败，请手动执行 npm install --unsafe-perm --production');
+    process.exit(1);
+  }
+}
+
+function getPluginRunEnv() {
+  const cwd = process.cwd();
+  const jsPath = path.join(cwd, 'index.js');
+  const pyPath = path.join(cwd, 'index.py');
+  if (fs.existsSync(jsPath)) {
+    return 'js';
+  }
+  if (fs.existsSync(pyPath)) {
+    return 'python';
+  }
+  return 'unknown';
+}
+
+async function checkAndInstallPythonDeps() {
+  if (!fs.existsSync('requirements.txt')) {
+    spinner.start('未找到 requirements.txt, 跳过依赖安装。');
+    spinner.succeed('跳过 Python 依赖安装。');
+    return;
+  }
+  spinner.start('检测到 Python 插件，正在安装依赖...');
+  try {
+    execSync('pip3 install -r requirements.txt -t .', { stdio: 'inherit' });
+    spinner.succeed('Python 依赖安装完成');
+  } catch (e) {
+    spinner.fail('Python依赖安装失败，请手动执行 pip install -r requirements.txt -t .');
+    process.exit(1);
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentapd/tplugin-cli",
-  "version": "0.69.0",
+  "version": "0.69.1-alpha.0",
   "description": "tplugin-cli",
   "bin": {
     "tplugin-cli": "index.js"
@@ -26,7 +26,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@opentapd/tplugin-core": "^1.44.0",
+    "@opentapd/tplugin-core": "^1.44.1-alpha.0",
     "address": "^1.2.2",
     "archiver": "^5.3.1",
     "axios": "^0.21.1",
@@ -79,5 +79,5 @@
     "node": ">=14.13.0"
   },
   "main": "index.js",
-  "gitHead": "f8ce70780573e282ea13a194c754ed505dd1bed4"
+  "gitHead": "040453b0bd43c1bef40f627e78dbfa823e9599ff"
 }

package/util/checkNodeVersion.js

@@ -7,6 +7,17 @@
 
 const semver = require('semver');
 const { engines } = require('../package.json');
+const tpluginConf = require('../config');
+
+if (tpluginConf.tapd.pluginEnv === 'cloud') {
+  const cloudRequiredNodeVersion = '16.13.x';
+  // 检查当前 Node 版本是否saas符合要求
+  if (!semver.satisfies(process.version, cloudRequiredNodeVersion)) {
+    console.log(`This project require node version: ${cloudRequiredNodeVersion}`);
+    process.exit(-1);
+  }
+}
+
 const requiredNodeVersion = engines.node;
 
 // 判断Node版本范围