openharmony/developtools_ace-ets2bundle
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_ace-ets2bundle.git synced 2026-07-20 00:54:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

modify condition of settimeout

Browse Source 
Signed-off-by: zhangrengao <zhangrengao1@huawei.com>
Change-Id: Icf76c3514fde066b1ce4a9961cca9cbbf7cddf97
This commit is contained in:
zhangrengao
2022-07-13 15:41:12 +08:00
parent 4a9c60b7a6
commit 7f9733692b
3 changed files with 64 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/src/compile_info.ts
+2 -34
View File
@@ -303,15 +303,11 @@ export class ResultStates {
if (this.noteCount > 0) {
resultInfo += ` NOTE:${this.noteCount}`;
}
if (result === 'SUCCESS ' && projectConfig.isPreview) {
this.printPreviewResult(resultInfo);
} else {
if (!(result === 'SUCCESS ' && projectConfig.isPreview)) {
logger.info(this.blue, 'COMPILE RESULT:' + result + `{${resultInfo}}`, this.reset);
}
} else {
if (projectConfig.isPreview) {
this.printPreviewResult();
} else {
if (!projectConfig.isPreview) {
console.info(this.blue, 'COMPILE RESULT:SUCCESS ', this.reset);
}
}
@@ -324,34 +320,6 @@ export class ResultStates {
this.noteCount = 0;
}
private printPreviewResult(resultInfo: string = ''): void {
const workerNum: number = Object.keys(cluster.workers).length;
let count_: number = 0;
const printSuccessInfo = this.printSuccessInfo;
const blue: string = this.blue;
const reset: string = this.reset;
if (workerNum > 0) {
for (const worker of Object.values(cluster.workers)) {
worker.on('exit', function(code, signal) {
count_++;
if (count_ === workerNum) {
printSuccessInfo(blue, reset, resultInfo);
}
});
}
} else {
printSuccessInfo(blue, reset, resultInfo);
}
}
private printSuccessInfo(blue: string, reset: string, resultInfo: string): void {
if (resultInfo.length === 0) {
console.info(blue, 'COMPILE RESULT:SUCCESS ', reset);
} else {
console.info(blue, 'COMPILE RESULT:SUCCESS ' + `{${resultInfo}}`, reset);
}
}
private printWarning(): void {
if (this.mWarningCount > 0) {
const warnings: Info[] = this.mStats.compilation.warnings;
compiler/src/gen_abc_plugin.ts
+62 -26
View File
@@ -56,6 +56,7 @@ let isDebug: boolean = false;
let arkDir: string;
let nodeJs: string;
let delayCount = 0;
interface File {
path: string,
size: number
@@ -73,6 +74,7 @@ let buildPathInfo: string = '';
const red: string = '\u001b[31m';
const reset: string = '\u001b[39m';
const blue = '\u001b[34m';
const hashFile: string = 'gen_hash.json';
const ARK: string = '/ark/';
@@ -174,9 +176,12 @@ export class GenAbcPlugin {
}
function clearGlobalInfo() {
intermediateJsBundle = [];
// fix bug of multi trigger
if (delayCount <= 1) {
intermediateJsBundle = [];
moduleInfos = [];
}
fileterIntermediateJsBundle = [];
moduleInfos = [];
filterModuleInfos = [];
commonJsModuleInfos = [];
ESMModuleInfos = [];
@@ -184,7 +189,6 @@ function clearGlobalInfo() {
hashJsonObject = {};
moduleHashJsonObject = {};
buildPathInfo = '';
process.env.compilerStatus = 'on';
}
function getEntryInfo(tempFilePath: string, resourceResolveData: any): void {
@@ -317,7 +321,8 @@ function handleFinishModules(modules, callback): any {
}
});
invokeWorkersModuleToGenAbc(moduleInfos);
judgeWorkersToGenAbc(invokeWorkersModuleToGenAbc);
processEntryToGenAbc(entryInfos);
}
@@ -403,16 +408,7 @@ function invokeWorkersModuleToGenAbc(moduleInfos: Array<ModuleInfo>): void {
if (fs.existsSync(projectConfig.nodeModulesPath)) {
fs.rmdirSync(projectConfig.nodeModulesPath, { recursive: true});
}
filterIntermediateModuleByHashJson(buildPathInfo, moduleInfos);
filterModuleInfos.forEach(moduleInfo => {
if (moduleInfo.isCommonJs) {
commonJsModuleInfos.push(moduleInfo);
} else {
ESMModuleInfos.push(moduleInfo);
}
});
judgeWorkersToGenAbc(invokeCluterModuleToAbc);
invokeCluterModuleToAbc();
}
function initAbcEnv() : string[] {
@@ -436,6 +432,14 @@ function initAbcEnv() : string[] {
}
function invokeCluterModuleToAbc(): void {
filterIntermediateModuleByHashJson(buildPathInfo, moduleInfos);
filterModuleInfos.forEach(moduleInfo => {
if (moduleInfo.isCommonJs) {
commonJsModuleInfos.push(moduleInfo);
} else {
ESMModuleInfos.push(moduleInfo);
}
});
const abcArgs: string[] = initAbcEnv();
const clusterNewApiVersion: number = 16;
@@ -454,6 +458,7 @@ function invokeCluterModuleToAbc(): void {
}
let totalWorkerNumber = 0;
commonJsModuleInfos = Array.from(new Set(commonJsModuleInfos));
if (commonJsModuleInfos.length > 0) {
const tempAbcArgs: string[] = abcArgs.slice(0);
tempAbcArgs.push('-c');
@@ -470,6 +475,8 @@ function invokeCluterModuleToAbc(): void {
cluster.fork(workerData);
}
}
ESMModuleInfos = Array.from(new Set(ESMModuleInfos));
if (ESMModuleInfos.length > 0) {
const tempAbcArgs: string[] = abcArgs.slice(0);
tempAbcArgs.push('-m');
@@ -489,13 +496,17 @@ function invokeCluterModuleToAbc(): void {
let count_ = 0;
cluster.on('exit', (worker, code, signal) => {
if (code === FAIL) {
if (code === FAIL || process.exitCode === FAIL) {
process.exitCode = FAIL;
return;
}
count_++;
if (count_ === totalWorkerNumber) {
writeModuleHashJson();
clearGlobalInfo();
if (projectConfig.isPreview) {
console.info(blue, 'COMPILE RESULT:SUCCESS ', reset);
}
}
logger.debug(`worker ${worker.process.pid} finished`);
});
@@ -524,16 +535,13 @@ function splitModulesByNumber(moduleInfos: Array<ModuleInfo>, workerNumber: numb
}
function judgeWorkersToGenAbc(callback: any): void {
let timeoutId: any = null;
if (process.env.compilerStatus && process.env.compilerStatus === 'on') {
callback();
process.env.compilerStatus = 'off';
if (timeoutId) {
clearTimeout(timeoutId);
}
const workerNum: number = Object.keys(cluster.workers).length;
if (workerNum === 0) {
callback(moduleInfos);
return;
} else {
timeoutId = setTimeout(judgeWorkersToGenAbc.bind(null, callback), 50);
delayCount++;
setTimeout(judgeWorkersToGenAbc.bind(null, callback, moduleInfos), 50);
}
}
@@ -581,13 +589,17 @@ function invokeWorkersToGenAbc(): void {
let count_ = 0;
cluster.on('exit', (worker, code, signal) => {
if (code === FAIL) {
if (code === FAIL || process.exitCode === FAIL) {
process.exitCode = FAIL;
return;
}
count_++;
if (count_ === workerNumber) {
writeHashJson();
clearGlobalInfo();
if (projectConfig.isPreview) {
console.info(red, 'COMPILE RESULT:SUCCESS ', reset);
}
}
logger.debug(`worker ${worker.process.pid} finished`);
});
@@ -595,6 +607,15 @@ function invokeWorkersToGenAbc(): void {
}
function filterIntermediateModuleByHashJson(buildPath: string, moduleInfos: Array<ModuleInfo>): void {
let tempModuleInfos = Array<ModuleInfo>();
moduleInfos.forEach((item) => {
let check = tempModuleInfos.every((newItem) => {
return item.tempFilePath != newItem.tempFilePath;
})
check ? tempModuleInfos.push(item) : ""
});
moduleInfos = tempModuleInfos;
for (let i = 0; i < moduleInfos.length; ++i) {
filterModuleInfos.push(moduleInfos[i]);
}
@@ -665,10 +686,22 @@ function writeModuleHashJson(): void {
if (hashFilePath.length === 0) {
return;
}
fs.writeFileSync(hashFilePath, JSON.stringify(moduleHashJsonObject));
// fix bug of multi trigger
if (delayCount <= 1) {
fs.writeFileSync(hashFilePath, JSON.stringify(moduleHashJsonObject));
}
}
function filterIntermediateJsBundleByHashJson(buildPath: string, inputPaths: File[]): void {
let tempInputPaths = Array<File>();
inputPaths.forEach((item) => {
let check = tempInputPaths.every((newItem) => {
return item.path != newItem.path;
})
check ? tempInputPaths.push(item) : ""
});
inputPaths = tempInputPaths;
for (let i = 0; i < inputPaths.length; ++i) {
fileterIntermediateJsBundle.push(inputPaths[i]);
}
@@ -729,7 +762,10 @@ function writeHashJson(): void {
if (hashFilePath.length === 0) {
return;
}
fs.writeFileSync(hashFilePath, JSON.stringify(hashJsonObject));
// fix bug of multi trigger
if (delayCount <= 1) {
fs.writeFileSync(hashFilePath, JSON.stringify(hashJsonObject));
}
}
function genHashJsonPath(buildPath: string): string {
compiler/webpack.config.js
-1
View File
@@ -312,7 +312,6 @@ function setTsConfigFile() {
function setGenAbcPlugin(env, config) {
process.env.compilerType = 'ark';
process.env.compilerStatus = "on";
let arkDir = path.join(__dirname, 'bin', 'ark');
if (env.arkFrontendDir) {
arkDir = env.arkFrontendDir;