@opentapd/tplugin-cli 0.20.0-beta.8 → 0.20.0

package/Readme.md

@@ -1,21 +1,13 @@
 # TAPD 托管命令行
 
 
-## IDC 网络的使用
-
-### 怎看自己是不是IDC网络
-
-查看这个[链接](https://iwiki.woa.com/tencent/static/iwiki-editor-pro/dist/preview.html?space=&page=1227785302&id=131410&name=6997554869969258912(1).MP4&size=1160018&language=zh)
-
-### 如果是 IDC 网路怎么办
-
 ```bash
-export TPLUGIN_ENV='idc'
-
 tplugin-cli logout 
 
 tplugin-cli login
 
 ```
 
+[快速入门](https://open.tapd.cn/document/plugin-doc/introduction/getting-started.html)
+
 ### 欢迎反馈

package/cli.js

@@ -58,12 +58,14 @@ program.command('serve')
   .action(actionRunner(() => require('./lib/serve')()));
 
 // install 安装指令，安装插件到某个项目
-program.command('install')
-  .description('安装测试项目')
-  .action(actionRunner(async () => {
-    await require('./lib/install')();
-    console.log('');
-  }));
+if (tpluginConf.tapd.pluginEnv !== 'cloud') {
+  program.command('install')
+    .description('安装测试项目')
+    .action(actionRunner(async () => {
+      await require('./lib/install')();
+      console.log('');
+    }));
+}
 
 // init 初始化插件
 program.command('init')

package/config.json

@@ -1,8 +1,8 @@
 {
     "tapd": {
         "openHost": "https://open.tapd.cn",
-        "tapdHost": "https://tapd.cn",
-        "websocketHost": "ws://proxifer.tapd.cn/proxy",
+        "tapdHost": "https://www.tapd.cn",
+        "websocketHost": "wss://proxifer.tapd.cn/proxy",
         "apiHost": "https://api.tapd.cn",
         "upgradeWebsocketHost": "wss://upgrader.tapd.cn",
         "pluginEnv": "cloud"

package/lib/create.js

@@ -71,22 +71,12 @@ module.exports = async (code, options) => {
     name: options.name || code,
     template: selectedTmpl.template,
     ...entranceConfigs,
+    async: true,
   };
 
   spinner.start('稍等片刻，正在创建...');
   // 调起创建插件
-  const res = await create(params);
-
-  if (!res || !res.status) {
-    spinner.fail('创建插件失败');
-    return;
-  }
-
-  if (res && res.status) {
-    spinner.stop();
-    // 创建完成后，拉取代码
-    await cloneRepo(res, code);
-  }
+  await create(params);
 };
 
 /**
@@ -139,7 +129,27 @@ async function getEntranceOpts() {
 // create(params)： 创建插件请求
 async function create(params) {
   const { data } = await tapdsdk.request({ url: '/open_user_app/create_app', method: 'POST', params });
-  return data;
+  if (!data || !data.status) {
+    spinner.fail('创建插件失败');
+    return ;
+  }
+
+  await getAppCreateStatus(params.code);
+}
+
+async function getAppCreateStatus(code)  {
+  const { data } = await tapdsdk.request({ url: `/open_user_app/get_create_app_status/${code}`, method: 'GET' });
+  if (!data || data.data.status === '7') {
+    spinner.fail('创建插件失败');
+    return;
+  }
+  if (data.data.status === '0') {
+    setTimeout(() => getAppCreateStatus(code), 1000);
+  } else if (data.data.status === '1') {
+    spinner.stop();
+    // 创建完成后，拉取代码
+    await cloneRepo(data, code);
+  }
 }
 
 /**

package/lib/login.js

@@ -23,18 +23,27 @@ const fs = require('fs-extra');
 module.exports = async (opts) => {
   // 当环境是工蜂的IDE时，直接发起静默登录，不需要选择登录方式
   if (opts.loginByTgit) {
-    // 获取工蜂身份凭证
-    const tgitTokenPath = '/home/theia/.git-credentials/credentials';
-    const tgitToken = fs.readFileSync(tgitTokenPath, 'utf8');
-    const matchData = tgitToken.match(/oauth2:(\S*)@git/) || [];
-
-    if (matchData.length) {
-      // 凭证中获取用户accessToken
-      const accessToken = matchData[1];
+    if (!!process.env.GF_IDE_OAUTH_TOKEN) {
+      // 新版本直接从环境变量里拿accessToken
+      const accessToken = process.env.GF_IDE_OAUTH_TOKEN;
       // 使用凭证accessToken发起登录请求
       const res = await loginByTgitaccessToken(accessToken);
       // 处理登录数据
       dealLoginData(res);
+    } else {
+      // 获取工蜂身份凭证
+      const tgitTokenPath = '/home/theia/.git-credentials/credentials';
+      const tgitToken = fs.readFileSync(tgitTokenPath, 'utf8');
+      const matchData = tgitToken.match(/oauth2:(\S*)@git/) || [];
+
+      if (matchData.length) {
+        // 凭证中获取用户accessToken
+        const accessToken = matchData[1];
+        // 使用凭证accessToken发起登录请求
+        const res = await loginByTgitaccessToken(accessToken);
+        // 处理登录数据
+        dealLoginData(res);
+      }
     }
     process.exit(0);
   }

package/package.json

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