feat: 云构建build逻辑、完善构建日志输出

AKclown · Jun 6, 2022 · d353587 · d353587
1 parent e237052
commit d353587
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 41 deletions.
diff --git a/commands/publish/lib/index.js b/commands/publish/lib/index.js
@@ -66,6 +66,7 @@ class PublishCommand extends Command {
 }
 
 function publish(args) {
+  console.log('args: ', args);
   // $ 这个args就是执行脚手架传入的参数
   return new PublishCommand(args);
 }

diff --git a/core/exec/lib/index.js b/core/exec/lib/index.js
@@ -24,7 +24,7 @@ async function exec() {
   // $ 指定的本地init地址
   let targetPath = process.env.CLI_TARGET_PATH;
   // userHome 用户主目录
-  const homePath = process.env.DEFAULT_CLI_HOME;
+  const homePath = process.env.CLI_HOME_PATH;
   log.verbose('targetPath', targetPath);
   log.verbose('homePath', homePath);
 

diff --git a/models/cloudBuild/lib/index.js b/models/cloudBuild/lib/index.js
@@ -10,6 +10,9 @@ const TIME_OUT = 5 * 60 * 1000;
 // ws链接超时时间
 const WS_CONNECT_TIMEOUT = 5 * 1000;
 
+// socket错误code
+const FAILED_CODE = ['prepare failed'];
+
 // 解析socket的msg
 function parseMsg(msg) {
   const action = get(msg, 'data.action');
@@ -25,6 +28,7 @@ class CloudBuild {
     this.git = git; // git实例
     this.buildCmd = options.buildCmd;
     this.timeout = TIME_OUT;
+    this.socket = null;
   }
 
   // 超时方法
@@ -36,52 +40,79 @@ class CloudBuild {
 
   // 云构建初始化
   init() {
-    const socket = io(WS_SERVER, {
-      query: {
-        // 服务端需要下载源码、安装依赖。 需要客户端提供一些基础信息
-        repo: this.git.remote,
-        name: this.git.name,
-        branch: this.git.branch,
-        version: this.git.version,
-        buildCmd: this.buildCmd,
-      },
-    });
+    return new Promise((resolve, reject) => {
+      const socket = io(WS_SERVER, {
+        query: {
+          // 服务端需要下载源码、安装依赖。 需要客户端提供一些基础信息
+          repo: this.git.remote,
+          name: this.git.name,
+          branch: this.git.branch,
+          version: this.git.version,
+          buildCmd: this.buildCmd,
+        },
+      });
 
-    // connect事件
-    socket.on('connect', () => {
-      // 链接成功清除超时任务
-      clearTimeout(this.timer);
-      const { id } = socket;
-      log.success('云构建任务创建成功', `任务ID:${id}`);
-      socket.on(id, msg => {
-        const parsedMsg = parseMsg(msg);
-        log.success(parsedMsg.action, parsedMsg.message);
+      // connect事件
+      socket.on('connect', () => {
+        // 链接成功清除超时任务
+        clearTimeout(this.timer);
+        const { id } = socket;
+        log.success('云构建任务创建成功', `任务ID:${id}`);
+        socket.on(id, msg => {
+          const parsedMsg = parseMsg(msg);
+          log.success(parsedMsg.action, parsedMsg.message);
+        });
+        resolve();
       });
-    });
 
-    // 断开链接
-    const disconnect = () => {
-      clearTimeout(this.timer);
-      socket.disconnect();
-      socket.close();
-    };
+      // 断开链接
+      const disconnect = () => {
+        clearTimeout(this.timer);
+        socket.disconnect();
+        socket.close();
+      };
+
+      // 注册连接超时定时任务
+      this.doTimeout(() => {
+        log.error('云构建服务链接超时，自动终止');
+        disconnect();
+      }, WS_CONNECT_TIMEOUT);
 
-    // 注册连接超时定时任务
-    this.doTimeout(() => {
-      log.error('云构建服务链接超时，自动终止');
-      disconnect();
-    }, WS_CONNECT_TIMEOUT);
+      // disconnect - 服务端断开链接
+      socket.on('disconnect', () => {
+        log.success('disconnect', '云构建任务断开');
+        disconnect();
+      });
 
-    // disconnect - 服务端断开链接
-    socket.on('disconnect', () => {
-      log.success('disconnect', '云构建任务断开');
-      disconnect();
+      // 出现异常
+      socket.on('error', error => {
+        log.error('error', '云构建出错', error);
+        disconnect();
+        reject();
+      });
+      // 保存socket实例
+      this.socket = socket;
     });
+  }
 
-    // 出现异常
-    socket.on('error', error => {
-      log.error('error', '云构建出错', error);
-      disconnect();
+  // 执行云构建
+  build() {
+    return new Promise(() => {
+      this.socket.emit('build');
+      this.socket.on('build', msg => {
+        const parsedMsg = parseMsg(msg);
+        if (FAILED_CODE.indexOf(parsedMsg.action) >= 0) {
+          // $ 服务端出错，主动断开链接
+          log.error(parsedMsg.action, parsedMsg.message);
+          clearTimeout(this.timer);
+          this.socket.disconnect();
+          this.socket.close();
+        }
+        log.success(parsedMsg.action, parsedMsg.message);
+      });
+      this.socket.on('building', msg => {
+        console.log('msg: ', msg);
+      });
     });
   }
 }

diff --git a/models/git/lib/index.js b/models/git/lib/index.js
@@ -140,7 +140,8 @@ class Git {
   async publish() {
     await this.preparePublish();
     const cloudBuild = new CloudBuild(this, { buildCmd: this.buildCmd });
-    cloudBuild.init();
+    await cloudBuild.init();
+    await cloudBuild.build();
   }
 
   // 发布准备，做一些检查相关的操作