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

multi js to abc

Browse Source 
Signed-off-by: zhangrengao <zhangrengao1@huawei.com>
Change-Id: I08b4d3b84055cd959f4c31755501b24ba97a53b7
This commit is contained in:
zhangrengao
2022-05-14 14:25:52 +08:00
parent bd1a0eb2f7
commit 84a78cf259
3 changed files with 118 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/src/gen_abc_plugin.ts
+53 -31
View File
@@ -23,7 +23,10 @@ import { logger } from './compile_info';
import {
toUnixPath,
toHashData,
genTemporaryPath } from './utils';
genTemporaryPath,
genBuilldPath,
genAbcFileName,
mkdirsSync} from './utils';
import { Compilation } from 'webpack';
import { projectConfig } from '../main';
@@ -56,12 +59,14 @@ const ARK = '/ark/';
class ModuleInfo {
filePath: string;
tempFilePath: string;
buildFilePath: string;
abcFilePath: string;
isModuleJs: boolean;
constructor(filePath: string, buildFilePath: string, abcFilePath: string, isModuleJs: boolean) {
constructor(filePath: string, tempFilePath: string, buildFilePath: string, abcFilePath: string, isModuleJs: boolean) {
this.filePath = filePath;
this.tempFilePath = tempFilePath;
this.buildFilePath = buildFilePath;
this.abcFilePath = abcFilePath;
this.isModuleJs = isModuleJs;
@@ -126,7 +131,7 @@ export class GenAbcPlugin {
compiler.hooks.afterEmit.tap('GenAbcPluginMultiThread', () => {
buildPathInfo = output;
invokeWorkersToGenAbc();
// invokeWorkersToGenAbc();
});
@@ -134,46 +139,51 @@ export class GenAbcPlugin {
}
function handleFinishModules(modules, callback) {
console.error("==================handleFinishModules====================");
console.error("==================handleFinishModules====================");
let nodeModulesFile = new Array<string>();
modules.forEach(module => {
if (module != undefined && module.resourceResolveData != undefined) {
let filePath: string = module.resourceResolveData.path;
console.error(filePath);
let tempFilePath = genTemporaryPath(filePath, projectConfig.projectPath, projectConfig.buildPath);
let tempFilePath = genTemporaryPath(filePath, projectConfig.projectPath, process.env.cachePath);
let buildFilePath = genBuilldPath(filePath, projectConfig.projectPath, projectConfig.buildPath);
tempFilePath = toUnixPath(tempFilePath);
buildFilePath = toUnixPath(buildFilePath);
if (tempFilePath.length === 0) {
return ;
}
if (filePath.endsWith('ets')) {
if (process.env.processTs && process.env.processTs === 'true') {
tempFilePath = tempFilePath.replace(/\.ets$/, '.ets.ts');
buildFilePath = buildFilePath.replace(/\.ets$/, '.ets.ts');
} else {
tempFilePath = tempFilePath.replace(/\.ets$/, '.ets.js');
buildFilePath = buildFilePath.replace(/\.ets$/, '.ets.js');
}
tempFilePath = toUnixPath(tempFilePath);
const abcFilePath = genAbcFileName(tempFilePath);
let tempModuleInfo = new ModuleInfo(filePath, tempFilePath, abcFilePath, false);
let tempModuleInfo = new ModuleInfo(filePath, tempFilePath, buildFilePath, abcFilePath, false);
moduleInfos.push(tempModuleInfo);
} else if (filePath.endsWith('ts')) {
if (process.env.processTs && process.env.processTs === 'false') {
tempFilePath = tempFilePath.replace(/\.ts$/, '.ts.js');
buildFilePath = buildFilePath.replace(/\.ts$/, '.ts.js');
}
tempFilePath = toUnixPath(tempFilePath);
const abcFilePath = genAbcFileName(tempFilePath);
let tempModuleInfo = new ModuleInfo(filePath, tempFilePath, abcFilePath, false);
let tempModuleInfo = new ModuleInfo(filePath, tempFilePath, buildFilePath, abcFilePath, false);
moduleInfos.push(tempModuleInfo);
} else if (filePath.endsWith('js')) {
tempFilePath = toUnixPath(tempFilePath);
const parent: string = path.join(tempFilePath, '..');
if (!(fs.existsSync(parent) && fs.statSync(parent).isDirectory())) {
mkDir(parent);
}
if (tempFilePath.indexOf("node_modules") !== -1) {
const abcFilePath = genAbcFileName(tempFilePath);
let tempModuleInfo = new ModuleInfo(filePath, tempFilePath, abcFilePath, false);
moduleInfos.push(tempModuleInfo);
let tempModuleInfo = new ModuleInfo(filePath, tempFilePath, buildFilePath, abcFilePath, false);
moduleInfos.push(tempModuleInfo);
nodeModulesFile.push(tempFilePath);
} else {
const abcFilePath = genAbcFileName(tempFilePath);
let tempModuleInfo = new ModuleInfo(filePath, tempFilePath, abcFilePath, true);
let tempModuleInfo = new ModuleInfo(filePath, tempFilePath, buildFilePath, abcFilePath, true);
moduleInfos.push(tempModuleInfo);
}
} else {
@@ -184,20 +194,11 @@ function handleFinishModules(modules, callback) {
});
invokeWorkersModuleToGenAbc(moduleInfos);
processToAbcFile(nodeModulesFile);
}
function genAbcFileName(temporaryFile: string): string {
let abcFile: string = temporaryFile;
if (temporaryFile.endsWith('ts')) {
abcFile = temporaryFile.replace(/\.ts$/, '.abc');
} else {
abcFile = temporaryFile.replace(/\.js$/, '.abc');
}
return abcFile;
}
function processToAbcFile(tempFilePath, outPutFile) {
function processToAbcFile(nodeModulesFile: Array<string>) {
let js2abc: string = path.join(arkDir, 'build', 'src', 'index.js');
if (isWin) {
js2abc = path.join(arkDir, 'build-win', 'src', 'index.js');
@@ -207,14 +208,14 @@ function processToAbcFile(tempFilePath, outPutFile) {
const args: string[] = [
'--expose-gc',
js2abc,
'-o',
outPutFile
js2abc
];
if (isDebug) {
args.push('--debug');
}
args.push(tempFilePath);
nodeModulesFile.forEach(ele => {
args.push(ele);
});
child_process.execFileSync(nodeJs, args);
}
@@ -289,6 +290,9 @@ function invokeWorkersModuleToGenAbc(moduleInfos: Array<ModuleInfo>) {
js2abc = path.join(arkDir, 'build-mac', 'src', 'index.js');
}
if (fs.existsSync(buildPathInfo)) {
fs.rmdirSync(buildPathInfo, { recursive : true});
}
filterIntermediateModuleByHashJson(buildPathInfo, moduleInfos);
const maxWorkerNumber = 3;
const splitedBundles = splitModuleBySize(filterModuleInfos, maxWorkerNumber);
@@ -379,6 +383,7 @@ function invokeWorkersToGenAbc() {
});
}
var count_ = 0;
for (let i = 0; i < workerNumber; ++i) {
const workerData = {
'inputs': JSON.stringify(splitedBundles[i]),
@@ -388,9 +393,15 @@ function invokeWorkersToGenAbc() {
}
cluster.on('exit', (worker, code, signal) => {
count_++;
logger.debug(`worker ${worker.process.pid} finished`);
});
while(true) {
if (count_ === workerNumber) {
break;
}
}
process.on('exit', (code) => {
writeHashJson();
});
@@ -413,7 +424,7 @@ function filterIntermediateModuleByHashJson(buildPath: string, moduleInfos: Arra
jsonObject = JSON.parse(jsonFile);
filterModuleInfos = [];
for (let i = 0; i < moduleInfos.length; ++i) {
const input = moduleInfos[i].buildFilePath;
const input = moduleInfos[i].tempFilePath;
const abcPath = moduleInfos[i].abcFilePath;
if (!fs.existsSync(input)) {
logger.error(red, `ETS:ERROR ${input} is lost`, reset);
@@ -425,7 +436,11 @@ function filterIntermediateModuleByHashJson(buildPath: string, moduleInfos: Arra
if (jsonObject[input] === hashInputContentData && jsonObject[abcPath] === hashAbcContentData) {
updateJsonObject[input] = hashInputContentData;
updateJsonObject[abcPath] = hashAbcContentData;
// fs.unlinkSync(input);
console.error("===============filterIntermediateModuleByHashJson copy==============")
console.error(moduleInfos[i].tempFilePath);
mkdirsSync(path.dirname(moduleInfos[i].buildFilePath));
fs.copyFileSync(moduleInfos[i].tempFilePath, moduleInfos[i].buildFilePath);
fs.copyFileSync(genAbcFileName(moduleInfos[i].tempFilePath), genAbcFileName(moduleInfos[i].buildFilePath));
} else {
filterModuleInfos.push(moduleInfos[i]);
}
@@ -439,8 +454,10 @@ function filterIntermediateModuleByHashJson(buildPath: string, moduleInfos: Arra
}
function writeModuleHashJson() {
console.error("===============writeModuleHashJson==============")
console.error(filterModuleInfos);
for (let i = 0; i < filterModuleInfos.length; ++i) {
const input = filterModuleInfos[i].buildFilePath;
const input = filterModuleInfos[i].tempFilePath;
const abcPath = filterModuleInfos[i].abcFilePath;
if (!fs.existsSync(input) || !fs.existsSync(abcPath)) {
logger.error(red, `ETS:ERROR ${input} is lost`, reset);
@@ -450,6 +467,11 @@ function writeModuleHashJson() {
const hashAbcContentData = toHashData(abcPath);
moduleHashJsonObject[input] = hashInputContentData;
moduleHashJsonObject[abcPath] = hashAbcContentData;
mkdirsSync(path.dirname(filterModuleInfos[i].buildFilePath));
console.error("===============writeModuleHashJson copy==============")
console.error(filterModuleInfos[i].tempFilePath);
fs.copyFileSync(filterModuleInfos[i].tempFilePath, filterModuleInfos[i].buildFilePath);
fs.copyFileSync(genAbcFileName(filterModuleInfos[i].tempFilePath), genAbcFileName(filterModuleInfos[i].buildFilePath));
// fs.unlinkSync(input);
}
const hashFilePath = genHashJsonPath(buildPathInfo);
compiler/src/gen_module_abc.ts
+25 -10
View File
@@ -24,18 +24,33 @@ const reset: string = '\u001b[39m';
function js2abcByWorkers(jsonInput: string, cmd: string): Promise<void> {
const inputPaths = JSON.parse(jsonInput);
let inputs = [];
for (let i = 0; i < inputPaths.length; ++i) {
const input = inputPaths[i].buildFilePath;
const abcFilePathPath = inputPaths[i].abcFilePath;
const singleCmd = `${cmd} "${input}" -o "${abcFilePathPath}"`;
logger.debug('gen abc cmd is: ', singleCmd, ' ,file size is:', inputPaths[i].size, ' byte');
try {
childProcess.execSync(singleCmd);
} catch (e) {
logger.error(red, `ETS:ERROR Failed to convert file ${input} to abc `, reset);
return;
}
const input = inputPaths[i].tempFilePath;
inputs.push(input);
// const abcFilePathPath = inputPaths[i].abcFilePath;
// const singleCmd = `${cmd} "${input}" -o "${abcFilePathPath}"`;
// logger.debug('gen abc cmd is: ', singleCmd, ' ,file size is:', inputPaths[i].size, ' byte');
// try {
// console.error(singleCmd);
// childProcess.execSync(singleCmd);
// } catch (e) {
// logger.error(red, `ETS:ERROR Failed to convert file ${input} to abc `, reset);
// return;
// }
}
let inputsStr = inputs.join(',');
const singleCmd = `${cmd} "${inputs}"`;
logger.debug('gen abc cmd is: ', singleCmd);
try {
console.error(singleCmd);
childProcess.execSync(singleCmd);
} catch (e) {
logger.error(red, `ETS:ERROR Failed to convert file ${inputs} to abc `, reset);
return;
}
return ;
}
logger.debug('worker data is: ', JSON.stringify(process.env));
compiler/src/utils.ts
+40 -2
View File
@@ -246,6 +246,34 @@ export function genTemporaryPath(filePath: string, projectPath: string, buildPat
let hapPath = toUnixPath(path.resolve(projectPath, "../../../../../"));
let tempFilePath = filePath.replace(hapPath, "");
if (tempFilePath.indexOf('node_modules') !== -1) {
const dataTmps = tempFilePath.split('node_modules');
let output:string = "";
if (filePath.indexOf(hapPath) === -1) {
const sufStr = dataTmps[dataTmps.length-1];
output = path.join(buildPath, "temprary", 'main', 'node_modules', sufStr);
} else {
const sufStr = dataTmps[dataTmps.length-1];
output = path.join(buildPath, "temprary", 'auxiliary', 'node_modules', sufStr);
}
return output;
}
if (filePath.indexOf(projectPath) !== -1) {
const sufStr = filePath.replace(projectPath, "");
const output: string = path.join(buildPath, "temprary", sufStr);
return output;
}
return "";
}
export function genBuilldPath(filePath: string, projectPath: string, buildPath: string, toTsFile: boolean = true): string {
filePath = toUnixPath(filePath);
projectPath = toUnixPath(projectPath);
let hapPath = toUnixPath(path.resolve(projectPath, "../../../../../"));
let tempFilePath = filePath.replace(hapPath, "");
if (tempFilePath.indexOf('node_modules') !== -1) {
const dataTmps = tempFilePath.split('node_modules');
let output:string = "";
@@ -281,7 +309,7 @@ export function mkdirsSync(dirname: string): boolean {
}
export function writeFileSyncByString(sourcePath: string, sourceCode: string, toTsFile: boolean) {
let temporaryFile: string = genTemporaryPath(sourcePath, projectConfig.projectPath, projectConfig.buildPath, toTsFile);
let temporaryFile: string = genTemporaryPath(sourcePath, projectConfig.projectPath, process.env.cachePath, toTsFile);
if (temporaryFile.length === 0) {
return ;
}
@@ -337,7 +365,7 @@ export function writeFileSyncByNode(node: ts.SourceFile, toTsFile: boolean) {
content = result.replace(`${TS_NOCHECK};`, TS_NOCHECK);
}
const sourceMapContent = JSON.stringify(sourceMapJson);
let temporaryFile: string = genTemporaryPath(node.fileName, projectConfig.projectPath, projectConfig.buildPath, toTsFile);
let temporaryFile: string = genTemporaryPath(node.fileName, projectConfig.projectPath, process.env.cachePath, toTsFile);
if (temporaryFile.length === 0) {
return ;
}
@@ -362,3 +390,13 @@ export function writeFileSyncByNode(node: ts.SourceFile, toTsFile: boolean) {
fs.writeFileSync(temporarySourceMapFile, sourceMapContent);
}
}
export function genAbcFileName(temporaryFile: string): string {
let abcFile: string = temporaryFile;
if (temporaryFile.endsWith('ts')) {
abcFile = temporaryFile.replace(/\.ts$/, '.abc');
} else {
abcFile = temporaryFile.replace(/\.js$/, '.abc');
}
return abcFile;
}