@opentapd/tplugin-cli 0.32.1-alpha.1 → 0.32.1-alpha.10

package/cli.js

@@ -27,9 +27,17 @@ program.version(packageJson.version)
   .usage('<command> [options]');
 
 // create <code> 创建插件
-program.command('create <name>')
-  .description('通过CLI创建一个TAPD插件')
-  .action(actionRunner((code, opts) => require('./lib/create')(code, opts)));
+if (tpluginConf.tapd.pluginEnv !== 'cloud') {
+  program.command('create <code>')
+    .description('通过CLI创建一个TAPD插件')
+    .option('-n, --name <name>', '插件名字')
+    .action(actionRunner((code, opts) => require('./lib/create')(code, opts)));
+} else {
+  // 云端的code其实是name
+  program.command('create <code>')
+    .description('通过CLI创建一个TAPD插件')
+    .action(actionRunner((code, opts) => require('./lib/create')(code, opts)));
+}
 
 // login 登录
 program.command('login')

package/lib/create.js

@@ -3,7 +3,7 @@
  * Author: terrysxu@tencent.com
  * Author: raferzeng@tencent.com
  *
- * The implementation of CLI: create <name>
+ * The implementation of CLI: create <code>
  */
 const inquirer = require('inquirer');
 const chalk = require('chalk');
@@ -21,16 +21,24 @@ const { downloadAndUnzip } = require('../util/tools');
 const { promisify } = require('util');
 
 /**
- * @description 根据名称创建插件
- * @param name 插件名称
+ * @description 根据code和option配置，创建插件
+ * @param code 唯一标识
+ * @param options 选择的创建配置
  */
-module.exports = async (name) => {
+module.exports = async (code, options) => {
   // 初始化Session
   const session = new Session();
 
   // 校验登录态
   session.checkAuth();
 
+  if (tpluginConf.tapd.pluginEnv !== 'cloud') {
+    await checkAppParams({
+      code,
+      name: options.name || code,
+    });
+  }
+
   spinner.start('加载应用模板...');
   // 加载创建模板
   const createTmpl = await getCreateTmpl();
@@ -61,17 +69,30 @@ module.exports = async (name) => {
   const entranceConfigs  = supportEntrances ? await selectEntrances() : {};
 
   const params = {
-    name,
+    name: options.name || code,
     template: selectedTmpl.template,
     ...entranceConfigs,
     async: true,
   };
 
+  if (tpluginConf.tapd.pluginEnv !== 'cloud') {
+    params.code = code;
+  }
+
   spinner.start('稍等片刻，正在创建...');
   // 调起创建插件
   await create(params);
 };
 
+/**
+ * checkAppParams(): 检查插件参数
+ * @return array data
+ */
+async function checkAppParams(params) {
+  const { data } = await tapdsdk.request({ url: '/open_user_app/check_app_params', method: 'POST', params });
+  return data;
+}
+
 /**
  * getCreateTmpl(): 获取创建模板列表
  * @return array data

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentapd/tplugin-cli",
-  "version": "0.32.1-alpha.1",
+  "version": "0.32.1-alpha.10",
   "description": "tplugin-cli",
   "bin": {
     "tplugin-cli": "index.js"
@@ -26,7 +26,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@opentapd/tplugin-core": "^1.20.0",
+    "@opentapd/tplugin-core": "^1.20.1-alpha.7",
     "address": "^1.2.2",
     "archiver": "^5.3.1",
     "axios": "^0.21.1",
@@ -71,7 +71,6 @@
     "scf-bin",
     "util",
     "cli.js",
-    "config.js",
     "index.js",
     "config.json"
   ],
@@ -79,5 +78,5 @@
     "node": ">=14.13.0"
   },
   "main": "index.js",
-  "gitHead": "e4ee96999c4f4efc2307e46ed16975a45f777fef"
+  "gitHead": "5dc7094c7ef5f13c7dc69ec3b1818474fe2f20a3"
 }

package/config.js

@@ -1,93 +0,0 @@
-const env = process.env.TPLUGIN_ENV ? process.env.TPLUGIN_ENV : 'oa';
-
-const proApiHostConfigMap = {
-  test: 'http://wolf.woa.com/tapdapi',
-  extest: 'http://apiv2.wolfex.woa.com',
-  cloudtest: 'http://apiv2.wolfcloud.woa.com',
-  ex: 'https://apiv2.tapd.tencent.com',
-  oa: 'http://apiv2.tapd.woa.com',
-  idc: 'http://oss.apiv2.tapd.woa.com',
-  cloud: 'https://api.tapd.cn',
-};
-const websocketHostConfigMap = {
-  test: 'ws://proxifer.wolf.woa.com/proxy',
-  extest: 'ws://proxifer.wolf.woa.com/proxy',
-  cloudtest: 'ws://proxifer.wolfcloud.woa.com/proxy',
-  ex: 'wss://proxifer.tapd.tencent.com/proxy',
-  oa: 'ws://proxifer.tapd.woa.com/proxy',
-  idc: 'ws://proxifer.tapd.woa.com/proxy',
-  cloud: 'wss://proxifer.tapd.cn/proxy',
-};
-const tapdHostConfigMap = {
-  test: 'https://wolf.woa.com',
-  extest: 'https://wolfex.woa.com',
-  cloudtest: 'https://wolfcloud.woa.com',
-  ex: 'https://tapd.tencent.com',
-  oa: 'https://tapd.woa.com',
-  idc: 'https://tapd.woa.com',
-  cloud: 'https://www.tapd.cn',
-};
-const openHostConfigMap = {
-  test: 'http://o.wolf.woa.com',
-  extest: 'http://o.wolf.woa.com',
-  cloudtest: 'http://o.wolfcloud.woa.com',
-  ex: 'https://o.tapd.tencent.com',
-  oa: 'https://o.tapd.woa.com',
-  idc: 'https://o.tapd.woa.com',
-  cloud: 'https://open.tapd.cn',
-};
-const upgradeWebsocketHostConfigMap = {
-  test: 'ws://upgrader.devops.tiger.oa.com',
-  extest: 'ws://upgrader.devops.tiger.oa.com',
-  cloudtest: 'ws://upgrader.wolfcloud.woa.com',
-  ex: 'wss://upgrader.tapd.tencent.com',
-  oa: 'wss://upgrader.tapd.woa.com',
-  idc: 'wss://upgrader.tapd.woa.com',
-  cloud: 'wss://upgrader.tapd.cn',
-};
-const pluginEnvConfigMap = {
-  test: 'oa',
-  extest: 'ex',
-  ex: 'ex',
-  cloudtest: 'cloud',
-  cloud: 'cloud',
-  oa: 'oa',
-  idc: 'oa',
-};
-
-const npmRegistry = {
-  test: 'https://mirrors.tencent.com/npm/',
-  oa: 'https://mirrors.tencent.com/npm/',
-  idc: 'https://mirrors.tencent.com/npm/',
-};
-
-const pipBaseURL = {
-  test: 'https://mirrors.tencent.com/repository/pypi/tencent_pypi/simple',
-  oa: 'https://mirrors.tencent.com/repository/pypi/tencent_pypi/simple',
-  idc: 'https://mirrors.tencent.com/repository/pypi/tencent_pypi/simple',
-};
-
-const pipExtraURL = {
-  test: 'https://mirrors.tencent.com/pypi/simple/',
-  oa: 'https://mirrors.tencent.com/pypi/simple/',
-  idc: 'https://mirrors.tencent.com/pypi/simple/',
-};
-
-// 地址配置
-module.exports = {
-  tapd: {
-    openHost: openHostConfigMap[env],  // 开放平台地址
-    tapdHost: tapdHostConfigMap[env],      // TAPD平台地址
-    websocketHost: websocketHostConfigMap[env],  // Socket地址
-    apiHost: proApiHostConfigMap[env], // API地址
-    upgradeWebsocketHost: upgradeWebsocketHostConfigMap[env], // 热更新代理地址
-    pluginEnv: pluginEnvConfigMap[env], // 插件环境
-  },
-  npm: {
-    registry: npmRegistry[env],
-  },
-  pip: {
-    baseURL: pipBaseURL[env],
-    extralURL: pipExtraURL[env],
-  },
-};