native-pack-tool support send message to builder

packages/native-pack-tool/source/base/default.ts

@@ -3,6 +3,7 @@ import * as fs from 'fs-extra';
 import { cchelper, Paths } from "../utils";
 import { CocosProjectTasks } from './cocosProjectTypes';
 import { gzipSync } from 'zlib';
+import { EventEmitter } from 'events';
 const globby = require('globby');
 const xxtea = require('xxtea-node');
 
@@ -68,7 +69,7 @@ export interface INativePlatformOptions {
     init: (params: CocosParams<Object>) => void;
 }
 
-export abstract class NativePackTool {
+export abstract class NativePackTool extends EventEmitter {
     // 传入的打包参数
     params!: CocosParams<Object>;
     // 收集初始化的一些路径信息
@@ -535,6 +536,11 @@ export abstract class NativePackTool {
         }
     }
 
+    // 平台统一更新日志消息
+    protected handleMessage(message: string) {
+        this.emit('update-message', message);
+    }
+
     abstract create(): Promise<boolean>;
     generate?(): Promise<boolean>;
     make?(): Promise<boolean>;

packages/native-pack-tool/source/base/manager.ts

@@ -9,6 +9,8 @@ export class NativePackToolManager {
 
     private PackToolMap: Record<string, NativePackTool> = {};
 
+    private updateMessage: Function | null = null;
+
     private getPackTool(platform: string): NativePackTool {
         const handler = this.PackToolMap[platform];
         if (!handler) {
@@ -53,6 +55,12 @@ export class NativePackToolManager {
         if (!tool.make) {
             return false;
         }
+        // 监听平台执行时的日志信息
+        tool.on('update-message', (message: string) => {
+            if (this.updateMessage) {
+                this.updateMessage(message);
+            }
+        });
         await tool.make();
         return true;
     }
@@ -65,6 +73,14 @@ export class NativePackToolManager {
         await tool.run();
         return true;
     }
+
+    setUpdateMessage(func: Function) {
+        this.updateMessage = func;
+    }
+
+    getUpdateMessage(): Function | null {
+        return this.updateMessage;
+    }
 }
 
 export const nativePackToolMg = new NativePackToolManager();

packages/native-pack-tool/source/platforms/android.ts

@@ -115,12 +115,15 @@ export class AndroidPackTool extends NativePackTool {
         const originDir = process.cwd();
         try {
             process.chdir(projDir);
+            // cchelper 需要先设置监听消息的方法，才能够在执行 runCmake 时传递消息
+            cchelper.handleMessage = this.handleMessage.bind(this);
             await cchelper.runCmd(gradle, [buildMode], false, projDir);
         } catch (e) {
             throw e;
         } finally {
             // popd
             process.chdir(originDir);
+            cchelper.handleMessage = null;
         }
 
 

packages/native-pack-tool/source/platforms/windows.ts

@@ -60,7 +60,10 @@ export class WindowsPackTool extends NativePackTool {
 
     async make() {
         const nativePrjDir = this.paths.nativePrjDir;
+        // toolHelper 需要先设置监听消息的方法，才能够在执行 runCmake 时传递消息
+        toolHelper.handleMessage = this.handleMessage.bind(this);
         await toolHelper.runCmake(['--build', `"${cchelper.fixPath(nativePrjDir)}"`, '--config', this.params.debug ? 'Debug' : 'Release', '--', '-verbosity:quiet']);
+        toolHelper.handleMessage = null;
         return true;
     }
 

packages/native-pack-tool/source/utils.ts

@@ -12,12 +12,13 @@ export const EXT_LIST = ['.js', '.ccc', '.ccd', '.jsg', '.jsc'];
 
 export class cchelper {
 
+    static handleMessage: Function | null = null;
+
     static replaceEnvVariables(str: string): string {
         return str.replace(/\$\{([^}]*)\}/g, (_, n) => process.env[n] === undefined ? _ : process.env[n]!)
             .replace(/(~)/g, (_, n) => process.env.HOME!);
     }
 
-
     static fixPath(p: string): string {
         p = this.replaceEnvVariables(p);
         if (os.platform() === 'win32') {
@@ -297,7 +298,6 @@ export class cchelper {
         await fs.writeFile(filepath, newContent);
     }
 
-
     static exactValueFromFile(regexp: RegExp, filename: string, idx: number): string | undefined {
         if (!(fs.existsSync(filename))) {
             console.error(`file ${filename} not exist!`);
@@ -326,6 +326,8 @@ export class cchelper {
             if (!slient) {
                 cp.stdout.on(`data`, (chunk) => {
                     console.log(`[runCmd ${cmd}] ${chunk}`);
+                    // TODO: 此处是在 cchelper 里示例，需要自定义消息过滤
+                    this.handleMessage && this.handleMessage(chunk);
                 });
                 cp.stderr.on(`data`, (chunk) => {
                     console.log(`[runCmd ${cmd} - error] ${chunk}`);
@@ -423,6 +425,8 @@ export class cchelper {
 }
 
 export const toolHelper = {
+    handleMessage: null as ((msg: string) => void) | null,
+
     getXcodeMajorVerion(): number {
         try {
             const output = execSync('xcrun xcodebuild -version').toString('utf8');
@@ -487,6 +491,9 @@ export const toolHelper = {
                     console.log(`[cmake-warn] ${msg}`);
                 } else {
                     console.log(`[cmake] ${msg}`);
+                    // TODO: 此处是在 toolHelper 里示例
+                    // 自定义过滤日志信息, 但目前 cmake 并没有抛出什么信息
+                    toolHelper.handleMessage && toolHelper.handleMessage(msg);
                 }
             });
             cp.stderr.on('data', (data: any) => {