@pixui-dev/pxw 0.1.24 → 0.1.26

package/config/devops.js

@@ -7,17 +7,21 @@ let pr = path.resolve;
 
 let multer = require('multer');
 let express = require('express');
+let util = require('./util');
 
 let rootDir = pr(__dirname, '../');
+let runInWindows = process.platform == 'win32';
 
 let dirConfig = {
 	pxkit: '',
 	pxembed: '',
 	pxapp: '',
+	unreal: '',
 };
 
 function updateFile(file, targetLine) {
 	targetLine = '\n' + targetLine;
+	console.log('updateFile', file, targetLine);
 	fs.existsSync(file) ? fs.readFileSync(file, 'utf8').includes(targetLine) || fs.appendFileSync(file, targetLine) : fs.writeFileSync(file, targetLine);
 }
 
@@ -31,10 +35,10 @@ module.exports.setupDevops = async function (server, app) {
 
 	if (!runInVM) {
 		let chokidar = require('chokidar');
-		watcher = chokidar.watch(
-			['/**/*.html', '/**/*.js'].map((v) => pr('.') + v),
-			{ ignored: [/\.build\//, /node_modules/], persistent: true },
-		);
+		let watchPatterns = [];
+		watchPatterns = ['/pxtest/html/**/*.html', '/pxtest/**/*.js'].map((v) => pr('.') + v);
+		console.log('watchPatterns', watchPatterns);
+		watcher = chokidar.watch(watchPatterns, { persistent: true });
 
 		watcher
 			.on('change', function (path) {
@@ -55,14 +59,21 @@ module.exports.setupDevops = async function (server, app) {
 		watcher.emit('change', htmlPath);
 	}
 
+	let testImages = [];
 	let subProcesses = {};
 	let devopsConn;
+	let symbolConn;
 	let websocketServer = new ws.Server({ server });
 	websocketServer.on('connection', (conn, req) => {
 		let url = new URL(req.url, 'http://localhost');
 		//去掉第1个字符/，否则在windows上与path比较时会因为\而不一样
 		let referrer = url.searchParams.get('referrer')?.substring(1);
 		console.log('ws connection', url.pathname, referrer);
+		conn.send(JSON.stringify({ type: 'ipList', data: util.getLocalIP() }));
+		{
+			let br = cp.execSync('git branch --show-current', { stdio: 'pipe', cwd: rootDir, windowsHide: true });
+			conn.send(JSON.stringify({ type: 'setDirResult', id: 'pxw', value: rootDir, result: br.toString() }));
+		}
 		// console.log(url.pathname, url.searchParams);
 		if (url.pathname == '/notify') {
 			conn.on('message', (message) => {
@@ -87,7 +98,8 @@ module.exports.setupDevops = async function (server, app) {
 				watcher?.removeListener('change', changeHandler);
 				console.log('ws connection closed', url.pathname, url.searchParams);
 			});
-		} else if (url.pathname == '/devops') {
+		}
+		else if (url.pathname == '/devops') {
 			devopsConn = conn;
 			let notifySubProcesses = () => {
 				conn.send(
@@ -108,32 +120,108 @@ module.exports.setupDevops = async function (server, app) {
 				devopsConn = null;
 			});
 			conn.on('message', (data) => {
-				let { command, options } = JSON.parse(data);
+				let { seqId, command, options } = JSON.parse(data);
 				console.log('devops cmd', command, options);
 
 				let subprocess;
-				if (command == 'buildIOS') {
-					let withEnv = {
-						withPxKitSource: rootDir.replace(/\\/g, '/'),
-					};
-					if (options.rebuild) {
-						withEnv['rebuild'] = 1;
+				if (command == '') {
+				}
+				else if (command == 'setEntryUrl') {
+					let iniFile = `${dirConfig.pxkit}/.cache/pixui.ini`;
+					let lines = fs.readFileSync(iniFile).toString().split('\n');
+					// console.log(lines);
+					lines[0] = `entry_url=${options.url}`;
+					fs.writeFileSync(iniFile, lines.join('\n'));
+				}
+				else if (command == 'useNewImage') {
+					let newFile = options.new;
+					let dstFile = `${rootDir}/pxtest/capture/` + newFile.split('/caps/')[1];
+					try {
+						fs.copyFileSync(newFile, dstFile);
+						console.log('copy new image', newFile, 'to', dstFile);
+					}
+					catch (e) {
+						console.log('useNewImage error', e);
+					}
+				}
+				else if (command == 'killProcessById') {
+					try {
+						let output;
+						if (process.platform == 'win32') {
+							output = cp.execSync('taskkill /F /PID ' + options.pid, { windowsHide: true });
+						}
+						else {
+							output = cp.execSync(`kill ${options.pid}`, { stdio: 'pipe', cwd: rootDir, windowsHide: true });
+						}
+						devopsConn?.send(JSON.stringify({ type: 'stdout', data: `kill ${options.pid} 完成\n` }));
+					}
+					catch (e) {
+						devopsConn?.send(JSON.stringify({ type: 'stdout', data: e.message }));
+					}
+				}
+				else if (command == 'queryTestImage') {
+					devopsConn?.send(JSON.stringify({ seqId, testImages }));
+				}
+				else if (command == 'queryServerProcess') {
+					let output;
+					if (process.platform == 'win32') {
+						cmd = 'wmic /OUTPUT:STDOUT process get processid,commandline';
+						output = cp.execSync(cmd, { maxBuffer: 1024 * 1024 * 10, cwd: rootDir, windowsHide: true });
+						let psl = output.toString().trim().split('\n');
+						let psl2 = psl
+							.map((line) => {
+								if (line.indexOf('pixui_') < 0) return;
+								let info = line.trim().replace(/\s+/g, ' ').split(' ');
+								let pid = info[info.length - 1];
+								// console.log(info);
+								return `0 ${pid} ${info.slice(0, info.length - 1).join(' ')}`;
+							})
+							.filter((x) => !!x);
+						console.log('psl', psl.length, 'psl2', psl2.length);
+						output = psl2.join('\n');
 					}
-					subprocess = cp.spawn('node', [dirConfig.pxembed + '/src/script/itest.js'], {
+					else {
+						cmd = 'ps -ef|grep pixui_';
+						output = cp.execSync(cmd, { stdio: 'pipe', cwd: rootDir, windowsHide: true });
+					}
+
+					devopsConn?.send(JSON.stringify({ seqId, data: output.toString() }));
+				}
+				else if (command == 'killBuildProcess') {
+					let { name } = options;
+					if (name in subProcesses) {
+						let { subprocess } = subProcesses[name];
+						subprocess.kill();
+						delete subProcesses[name];
+					}
+					else {
+						console.log('process not found', name);
+					}
+					notifySubProcesses();
+				}
+				else if (command == 'buildIOS') {
+					testImages = [];
+					(options.withPxKitSource = dirConfig.pxkit.replace(/\\/g, '/')),
+					(subprocess = cp.spawn('node', [dirConfig.pxembed + '/src/script/itest.js'], {
 						cwd: dirConfig.pxembed,
 						detached: true,
-						env: { ...process.env, ...withEnv },
-					});
-				} else if (command == 'buildAndroid') {
+						env: { ...process.env, ...options, IPHONEOS_DEPLOYMENT_TARGET: '12.0' },
+					}));
+				}
+				else if (command == 'buildAndroid') {
+					testImages = [];
 					let withEnv = { redirectLogcat: 1 };
 					let tasks = [];
 					if (options.java) withEnv['JAVA_HOME'] = options.java;
 					if (options.rebuild) {
 						tasks.push('clean');
 					}
-					tasks.push('test');
+					tasks.push(options.test ? 'test' : 'assembleRelease');
+					if (1) {
+						tasks.push('-PskipLargeTest=true'); //跳过大文件测试
+					}
 					let clfile = dirConfig.pxembed + '/project/android_app/settings.local';
-					let targetLine = `gradle.ext.withPxKitSource = '${rootDir.replace(/\\/g, '/')}';`;
+					let targetLine = `gradle.ext.withPxKitSource = '${dirConfig.pxkit.replace(/\\/g, '/')}';`;
 					updateFile(clfile, targetLine);
 					subprocess = cp.spawn('gradlew' + (runInWindows ? '.bat' : ''), tasks, {
 						cwd: dirConfig.pxembed + '/project/android_app',
@@ -142,7 +230,9 @@ module.exports.setupDevops = async function (server, app) {
 						shell: true,
 						env: { ...process.env, ...withEnv },
 					});
-				} else if (command == 'buildHarmony') {
+				}
+				else if (command == 'buildHarmony') {
+					testImages = [];
 					let withEnv = {};
 					if (options.java) {
 						withEnv['JAVA_HOME'] = options.java;
@@ -152,31 +242,35 @@ module.exports.setupDevops = async function (server, app) {
 						withEnv['rebuild'] = 1;
 					}
 					let clfile = dirConfig.pxembed + '/project/hm_app/hvigorlocal.ts';
-					let targetLine = `export let withPxKit = '${rootDir.replace(/\\/g, '/')}';`;
+					let targetLine = `export let withPxKit = '${dirConfig.pxkit.replace(/\\/g, '/')}';`;
 					updateFile(clfile, targetLine);
-					subprocess = cp.spawn('node', [dirConfig.pxembed + '/src/script/htest.js', '-b', '-i', '-t'], {
+					subprocess = cp.spawn('node', [dirConfig.pxembed + '/src/script/htest.js', '-b', '-i', options.test ? '-t' : ''], {
 						cwd: dirConfig.pxembed,
 						detached: !runInWindows,
 						shell: true,
 						windowsHide: true,
 						env: { ...process.env, ...withEnv },
 					});
-				} else if (command == 'buildMac') {
+				}
+				else if (command == 'buildMac') {
+					testImages = [];
 					let cfg = `--CFG=${options.debug ? 'Debug' : 'Release'}`;
 					let clean = `${options.rebuild ? '--clean' : ''}`;
 					let clfile = dirConfig.pxapp + '/cmake.local';
-					let targetLine = `set(WITH_PX_SOURCE ${rootDir.replace(/\\/g, '/')})`;
+					let targetLine = `set(WITH_PX_SOURCE ${dirConfig.pxkit.replace(/\\/g, '/')})`;
 					updateFile(clfile, targetLine);
 					subprocess = cp.spawn('jtx', `pxide-build --mac --build ${cfg} ${clean} --test-pxkit`.split(' '), {
 						cwd: dirConfig.pxapp,
 						detached: true,
 						env: { ...process.env, echo: 1, xPX_TEST_FORCE_ALL: 1 },
 					});
-				} else if (command == 'buildWin') {
+				}
+				else if (command == 'buildWin') {
+					testImages = [];
 					let cfg = `--CFG=${options.debug ? 'Debug' : 'Release'}`;
-					let clean = `${options.rebuild ? '--clean' : ''}`;
+					let clean = `${options.rebuild ? '--rebuild' : ''}`;
 					let clfile = dirConfig.pxapp + '/cmake.local';
-					let targetLine = `set(WITH_PX_SOURCE ${rootDir.replace(/\\/g, '/')})`;
+					let targetLine = `set(WITH_PX_SOURCE ${dirConfig.pxkit.replace(/\\/g, '/')})`;
 					updateFile(clfile, targetLine);
 					subprocess = cp.spawn('jtx' + (runInWindows ? '.cmd' : ''), `pxide-build --win --build ${cfg} ${clean} --test-pxkit`.split(' '), {
 						cwd: dirConfig.pxapp,
@@ -185,29 +279,54 @@ module.exports.setupDevops = async function (server, app) {
 						windowsHide: true,
 						shell: true,
 					});
-				} else if (command == 'buildWinMinGW') {
+				}
+				else if (command == 'buildWinMinGW') {
+					testImages = [];
 					subprocess = cp.spawn('jtx', `build --mingw --build ${options.debug ? '--debug' : '--release'}`.split(' '), {
 						detached: !runInWindows,
 						env: { ...process.env, xPX_TEST_FORCE_ALL: 1 },
 						windowsHide: true,
 						shell: true,
 					});
-				} else if (command == 'setDir') {
+				}
+				else if (command == 'buildUE') {
+					testImages = [];
+					let testReportDir = pr(__dirname, './ue_test_report');
+					let args = [
+						'-game',
+						// '-log', // 是否开启日志窗口
+						'-RenderOffScreen', // 是否开启离屏渲染
+						'-unattended',
+						'-ExecCmds=Automation RunTests PixTest.UI;Quit',
+						'-TestServerUrl=http://localhost:8001/pxtest/auto',
+						'-ReportExportPath=' + testReportDir,
+						'-Tests=' + 'test_border.html;' + 'test_issue_446.html;' + 'test_stack_overflow.html;' + 'test_onscroll_get_value.html;' + 'test_xhr.html?test=basic&loadInPxAndroid=1;' + 'samples/project-wxcommunity/index.html',
+					];
+					subprocess = cp.spawn(dirConfig.unreal + '/PixUI_UE', args, {
+						cwd: '',
+						detached: !runInWindows,
+						env: { ...process.env, xPX_TEST_FORCE_ALL: 1 },
+						windowsHide: true,
+					});
+				}
+				else if (command == 'setDir') {
 					let { id, value } = options;
 					try {
-						if (id == 'pxkit') {
+						if (id == 'pxw') {
 							value = rootDir;
 						}
-						if (value && id in { pxkit: 1, pxembed: 1, pxapp: 1 }) {
+						if (value && id in { pxw: 1, pxkit: 1, pxembed: 1, pxapp: 1, unreal: 1 }) {
 							let br = cp.execSync('git branch --show-current', { stdio: 'pipe', cwd: value, windowsHide: true });
 							devopsConn?.send(JSON.stringify({ type: 'setDirResult', id, value, result: br.toString() }));
-						} else if (id in { java: 1 }) {
+						}
+						else if (id in { java: 1 }) {
 							// let ver = cp.spawnSync('java', ['-version'], { stdio: 'pipe' }).stderr.toString().split('\n')[0];
 							// console.log(value, ver);
 							// devopsConn?.send(JSON.stringify({ type: 'setDirResult', id, value, result: ver }));
 						}
 						dirConfig[id] = value;
-					} catch (e) {
+					}
+					catch (e) {
 						devopsConn?.send(JSON.stringify({ type: 'setDirResult', id, result: e.message }));
 					}
 				}
@@ -231,27 +350,77 @@ module.exports.setupDevops = async function (server, app) {
 						devopsConn?.send(JSON.stringify({ type: 'stderr', data: data.toString() }));
 					});
 					notifySubProcesses();
-				} else {
+				}
+				else {
+					// devopsConn?.send(JSON.stringify({ type: 'return', name: command, value: -1, err: 'unknown command' }));
+				}
+			});
+		}
+		else if (url.pathname == '/symbol') {
+			symbolConn = conn;
+			conn.on('close', () => {
+				symbolConn = null;
+			});
+			conn.on('message', (data) => {
+				let { add2linePath, soPath, stacks } = JSON.parse(data);
+
+				let subprocess;
+				subprocess = cp.spawn(add2linePath, ['-C', '-f', '-e', soPath].concat(stacks), {
+					cwd: dirConfig.pxembed,
+					detached: true,
+					env: { ...process.env },
+				});
+				if (subprocess) {
+					let output = '';
+					let errorOutput = '';
+					subprocess.stdout.on('data', (data) => {
+						output += data.toString();
+					});
+
+					subprocess.stderr.on('data', (data) => {
+						errorOutput += data.toString();
+					});
+
+					subprocess.on('error', (err) => {
+						symbolConn?.send(JSON.stringify({ type: 'return', value: -1, err: err.message }));
+					});
+
+					subprocess.on('close', (code, signal) => {
+						// 这里保证所有数据都收集完了
+						symbolConn?.send(JSON.stringify({ status: 'success', data: output }));
+						if (errorOutput) {
+							symbolConn?.send(JSON.stringify({ type: 'stderr', data: errorOutput }));
+						}
+						symbolConn?.send(JSON.stringify({ type: 'return', value: code }));
+					});
+				}
+				else {
 					// devopsConn?.send(JSON.stringify({ type: 'return', name: command, value: -1, err: 'unknown command' }));
 				}
 			});
 		}
 	});
 
-	let tCapDir = rootDir + '/.cache/devops/caps';
+	let pxTestDir = pr(__dirname, '../pxtest');
+	let serveIndex = require('serve-index');
+	let express = require('express');
+	app.use('/pxtest', serveIndex(pxTestDir, { view: 'details' }), express.static(pxTestDir));
+
+	let tCapDir = rootDir + '/.cache/caps';
 	if (!fs.existsSync(tCapDir)) fs.mkdirSync(tCapDir, { recursive: true });
 	var storage = multer.diskStorage({
 		destination: (req, file, cb) => {
+			console.log('body2:', req.body, req.body.platform);
 			let dir = tCapDir + '/' + req.body.platform;
 			if (!fs.existsSync(dir)) fs.mkdirSync(dir);
 			cb(null, dir);
 		},
 		filename: (req, file, cb) => cb(null, file.originalname),
 	});
+	app.use('/caps', serveIndex(tCapDir, { view: 'details' }), express.static(tCapDir));
 	app.use(express.urlencoded({ extended: true }));
 	app.post('/compareImage', multer({ storage }).single('file'), (req, res) => {
-		console.log('Uploaded file:', req.file, req.files);
-		console.log('body:', req.body);
+		console.log('upload file:', req.file, 'body:', req.body, req.body.platform);
 
 		if (!req.file) {
 			return res.status(400).send('No files were uploaded.');
@@ -267,24 +436,38 @@ module.exports.setupDevops = async function (server, app) {
 		const pixelmatch = require('pixelmatch');
 
 		let baseFile = `${req.file.path}`.replace('.png', '.base.png');
-		fs.copyFileSync(`${dirConfig.pxembed}/project/${platform}_app/caps/${req.file.originalname}`, baseFile);
+		let srcFile = `${rootDir}/pxtest/capture/${platform}/${req.file.originalname}`;
+		let ret = {};
+		if (fs.existsSync(srcFile)) {
+			fs.copyFileSync(srcFile, baseFile);
 
-		const img1 = PNG.sync.read(fs.readFileSync(req.file.path));
-		const img2 = PNG.sync.read(fs.readFileSync(baseFile));
-		const { width, height } = img1;
-		const diff = new PNG({ width, height });
+			const img1 = PNG.sync.read(fs.readFileSync(req.file.path));
+			const img2 = PNG.sync.read(fs.readFileSync(baseFile));
+			const { width, height } = img1;
+			const diff = new PNG({ width, height });
 
-		let num = pixelmatch(img1.data, img2.data, diff.data, width, height, { threshold, includeAA });
-		let diffFile = `${req.file.path}`.replace('.png', '.diff.png');
-		console.log('compareImage', 'diffNum', num, 'threshold', threshold, req.file.path, baseFile);
-		if (num) {
-			fs.writeFileSync(diffFile, PNG.sync.write(diff));
-		} else {
-			if (fs.existsSync(diffFile)) fs.unlinkSync(diffFile);
-			if (fs.existsSync(baseFile)) fs.unlinkSync(baseFile);
+			let num = pixelmatch(img1.data, img2.data, diff.data, width, height, { threshold, includeAA });
+			let diffFile = `${req.file.path}`.replace('.png', '.diff.png');
+			console.log('compareImage', 'diffNum', num, 'threshold', threshold, req.file.path, baseFile);
+			if (num) {
+				fs.writeFileSync(diffFile, PNG.sync.write(diff));
+				testImages.push({
+					base: baseFile,
+					new: req.file.path,
+					time: fs.statSync(req.file.path).mtime.getTime(),
+				});
+			}
+			else {
+				if (fs.existsSync(diffFile)) fs.unlinkSync(diffFile);
+				if (fs.existsSync(baseFile)) fs.unlinkSync(baseFile);
+			}
+			ret.diff = num;
+		}
+		else {
+			ret.diff = -1;
 		}
 		res.setHeader('Content-Type', 'application/json');
-		res.send(JSON.stringify({ diff: num }));
+		res.send(JSON.stringify(ret));
 	});
 
 	app.use('/proxy/', async (req, res, next) => {
@@ -300,7 +483,8 @@ module.exports.setupDevops = async function (server, app) {
 			console.log('req proxy', url, data.byteLength);
 			// res.setHeader('Content-Type', response.headers['Content-Type']);
 			res.send(data);
-		} catch (error) {
+		}
+		catch (error) {
 			console.log('req proxy failed', url, error);
 			res.sendStatus(500);
 		}

package/config/h5es.js

@@ -7,4 +7,8 @@ module.exports.h5esVersions = [
 		name: 'v3.5.0',
 		path: 'node_modules/@pixui-dev/pxw/lib/h5es-types/v3.5.0',
 	},
+	{
+		name: 'v3.5.6',
+		path: 'node_modules/@pixui-dev/pxw/lib/h5es-types/v3.5.6',
+	},
 ];

package/config/index.html

@@ -166,13 +166,13 @@
 			</div>
 		</div>
 		<div style="height: 20px"></div>
-		<div>
+		<!-- <div>
 			<div style="font-size: 36">测试:</div>
 			<div id="entry" style="margin-left: 20px; align-items: start">
 				<a style="font-size: 36px" href="/pxtest/auto">pxtest</a>
 				<a style="font-size: 36px" href="/pxtest/devops.html">devops</a>
 			</div>
-		</div>
+		</div> -->
 		<div class="custom-dd">
 			<div class="dd-header" onclick="toggleDD()" id="ddHeader">▼ 选择声明文件对应版本</div>
 			<div class="dd-list" id="ddList">

package/config/util.js

@@ -22,7 +22,7 @@ module.exports.getLocalIP = function () {
 			ipList.push(iface.address);
 		});
 	});
-	console.log('iplist', ipList);
+	// console.log('iplist', ipList);
 	return ipList;
 };
 
@@ -49,7 +49,8 @@ module.exports.readRegKey = function (path, key) {
 			windowsHide: true,
 		});
 		return out.toString();
-	} catch (error) {
+	}
+	catch (error) {
 		console.error('Error executing PowerShell script:', error.message);
 		return '';
 	}
@@ -68,7 +69,7 @@ module.exports.loadProjectConfig = function () {
 	try {
 		let cwd = process.cwd();
 		let ep = cwd + '/entry';
-		console.log('read entry.js', ep);
+		// console.log('read entry.js', ep);
 		projectConfig = require(ep);
 		// projectConfig.pages.forEach((p) => {
 		// 	p.entry = `${cwd}/${p.entry}`;
@@ -81,13 +82,15 @@ module.exports.loadProjectConfig = function () {
 		Object.entries(env || {}).forEach(([k, v]) => {
 			pienv['process.env.' + k] = JSON.stringify(v);
 		});
-	} catch (e) {
-		console.warn('read entry.js failed');
+	}
+	catch (e) {
+		// console.warn('read entry.js failed');
 		if (!/Cannot find module/.test(e.message)) {
 			console.error(e);
 		}
 		projectConfig = { pages: [] };
-	} finally {
+	}
+	finally {
 	}
 	return projectConfig;
 };
@@ -124,7 +127,8 @@ module.exports.setH5esType = function (newType) {
 		fs.writeFileSync(tsconfigPath, stringify(tsconfig, null, 2));
 		try {
 			cp.execSync('npx prettier-eslint --write tsconfig.json', {});
-		} catch (e) {
+		}
+		catch (e) {
 			console.error('prettier-eslint failed:', e.message);
 		}
 	}

package/config/webpack.js

@@ -20,8 +20,8 @@ const pr = path.resolve;
 let cwd = process.cwd();
 let isPxwSelf = cwd == pr(__dirname + '/..');
 let isShipping = argv.mode == 'production';
-console.log('isPxwSelf:', isPxwSelf);
-console.log('isShipping:', isShipping);
+// console.log('isPxwSelf:', isPxwSelf);
+// console.log('isShipping:', isShipping);
 let rootDir = pr(__dirname + '/../');
 let buildOutputPath = pr(cwd, 'dist', 'html' + (isShipping ? '-pro' : '-dev'));
 
@@ -292,7 +292,8 @@ var getMiddleware = function (appPort, notifyAppReload) {
 						restartRecommended: true,
 						newConfig: h5esType,
 					});
-				} catch (error) {
+				}
+				catch (error) {
 					console.log(error);
 					res.status(500).json({
 						error: `更新配置失败: ${error.message}`,