@pixui-dev/pxw 0.1.21 → 0.1.22

package/bin/pxw.js

@@ -129,15 +129,13 @@ if (isDaemonMode) {
 					if (!isSelf) {
 						if (argv.me) {
 							cp.execSync('taskkill /F /PID ' + tpid);
-						}
-						else {
+						} else {
 							return;
 						}
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			console.log('pgrep stdout\n', stdout);
 			let lines = stdout.trim().split('\n');
 			for (let line of lines) {
@@ -158,12 +156,10 @@ if (isDaemonMode) {
 								process.stdout.write('', () => {
 									cp.execSync('kill ' + tpid);
 								});
-							}
-							catch (e) {
+							} catch (e) {
 								console.log(e);
 							}
-						}
-						else {
+						} else {
 							// cp.execSync('ps -ef|grep test/html/app.js', { stdio: 'inherit' });
 							// cp.execSync(`ps -ef|grep ${stdout}`, { stdio: 'inherit' });
 							return console.log('process already exist, pid:', tpid);
@@ -177,23 +173,20 @@ if (isDaemonMode) {
 		if (argv.fg || process.env.restart) {
 			if (argv.fg) {
 				oldWrite(`pid[${process.pid}] run in fg，log已重定向到 ${logFile} \n`);
-			}
-			else {
+			} else {
 				let rc = parseInt(process.env.restart);
 				process.env.restart = rc + 1;
 				console.log(`pid[${process.pid}] run in restart: ${rc}`);
 			}
 			main();
 			watchSelf();
-		}
-		else {
+		} else {
 			console.log(`pid[${process.pid}] run in bg`);
 			oldWrite('pxtest-admin 默认后台运行，加--fg参数可前台运行，log已重定向到' + logFile + '\n');
 			process.env.restart = 1;
 			restart();
 		}
 	});
-}
-else {
+} else {
 	main();
 }

package/config/devops.js

@@ -87,8 +87,7 @@ 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(
@@ -125,8 +124,7 @@ module.exports.setupDevops = async function (server, app) {
 						detached: true,
 						env: { ...process.env, ...withEnv },
 					});
-				}
-				else if (command == 'buildAndroid') {
+				} else if (command == 'buildAndroid') {
 					let withEnv = { redirectLogcat: 1 };
 					let tasks = [];
 					if (options.java) withEnv['JAVA_HOME'] = options.java;
@@ -144,8 +142,7 @@ module.exports.setupDevops = async function (server, app) {
 						shell: true,
 						env: { ...process.env, ...withEnv },
 					});
-				}
-				else if (command == 'buildHarmony') {
+				} else if (command == 'buildHarmony') {
 					let withEnv = {};
 					if (options.java) {
 						withEnv['JAVA_HOME'] = options.java;
@@ -164,8 +161,7 @@ module.exports.setupDevops = async function (server, app) {
 						windowsHide: true,
 						env: { ...process.env, ...withEnv },
 					});
-				}
-				else if (command == 'buildMac') {
+				} else if (command == 'buildMac') {
 					let cfg = `--CFG=${options.debug ? 'Debug' : 'Release'}`;
 					let clean = `${options.rebuild ? '--clean' : ''}`;
 					let clfile = dirConfig.pxapp + '/cmake.local';
@@ -176,8 +172,7 @@ module.exports.setupDevops = async function (server, app) {
 						detached: true,
 						env: { ...process.env, echo: 1, xPX_TEST_FORCE_ALL: 1 },
 					});
-				}
-				else if (command == 'buildWin') {
+				} else if (command == 'buildWin') {
 					let cfg = `--CFG=${options.debug ? 'Debug' : 'Release'}`;
 					let clean = `${options.rebuild ? '--clean' : ''}`;
 					let clfile = dirConfig.pxapp + '/cmake.local';
@@ -190,16 +185,14 @@ module.exports.setupDevops = async function (server, app) {
 						windowsHide: true,
 						shell: true,
 					});
-				}
-				else if (command == 'buildWinMinGW') {
+				} else if (command == 'buildWinMinGW') {
 					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 == 'setDir') {
 					let { id, value } = options;
 					try {
 						if (id == 'pxkit') {
@@ -208,15 +201,13 @@ module.exports.setupDevops = async function (server, app) {
 						if (value && id in { pxkit: 1, pxembed: 1, pxapp: 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 }));
 					}
 				}
@@ -240,8 +231,7 @@ 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' }));
 				}
 			});
@@ -289,8 +279,7 @@ module.exports.setupDevops = async function (server, app) {
 		console.log('compareImage', 'diffNum', num, 'threshold', threshold, req.file.path, baseFile);
 		if (num) {
 			fs.writeFileSync(diffFile, PNG.sync.write(diff));
-		}
-		else {
+		} else {
 			if (fs.existsSync(diffFile)) fs.unlinkSync(diffFile);
 			if (fs.existsSync(baseFile)) fs.unlinkSync(baseFile);
 		}
@@ -311,8 +300,7 @@ 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/pfbs.js

@@ -40,13 +40,12 @@ let pfbsConvert = async (ver, isJS, input, fn) => {
 			if (typeof fetch !== 'undefined') {
 				let res = await fetch(url);
 				buffer = await res.arrayBuffer();
-			} 
-			else if (typeof XMLHttpRequest !== 'undefined') {
+			} else if (typeof XMLHttpRequest !== 'undefined') {
 				buffer = await new Promise((resolve, reject) => {
 					const xhr = new XMLHttpRequest();
 					xhr.open('GET', url, true);
 					xhr.responseType = 'arraybuffer';
-					
+
 					xhr.onload = () => {
 						if (xhr.status >= 200 && xhr.status < 300) {
 							resolve(xhr.response);
@@ -54,25 +53,25 @@ let pfbsConvert = async (ver, isJS, input, fn) => {
 							reject(new Error(`XHR failed with status ${xhr.status}`));
 						}
 					};
-					
+
 					xhr.onerror = () => reject(new Error('Network Error'));
 					xhr.send();
 				});
-			}else if (typeof require !== 'undefined' && require('http')) {
+			} else if (typeof require !== 'undefined' && require('http')) {
 				const http = require('http');
-				console.log('http: ', url)
+				console.log('http: ', url);
 				buffer = await new Promise((resolve, reject) => {
 					http.get(url, (res) => {
 						if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
 							return resolve(this._fetchBuffer(res.headers.location));
 						}
-		
+
 						const chunks = [];
 						res.on('data', (chunk) => chunks.push(chunk));
 						res.on('end', () => resolve(Buffer.concat(chunks)));
 					}).on('error', reject);
 				});
-			}else {
+			} else {
 				throw new Error('No supported HTTP client available');
 			}
 
@@ -145,6 +144,27 @@ module.exports.getMiddleware = () => {
 			return 'text/plain';
 		};
 
+		//往html中插入websocket控制脚本，插在body最后，注意不要重复插入
+		let appendWebsocketScript = (data) => {
+			let c1 = data.toString('utf-8');
+			let c2 = c1.replace(
+				'</body>',
+				`<script>
+(function() {
+	var ws = new WebSocket('ws://' + window.location.host+ '/notify?reloadMode=RELOAD_ON_SAVE&referrer=' + encodeURIComponent(window.location.pathname))
+	ws.onmessage = function (msg) {
+		if (msg.data === 'reload') {
+			window.location.reload();
+		}
+	};
+})();
+			</script></body>`,
+			);
+			console.log('insert hotreload to html', data.length, c1.length, c2.length);
+			// console.log(c1);
+			return c2;
+		};
+
 		let mime = '';
 		let _setHeader = res.setHeader;
 		res.setHeader = function (k, v) {
@@ -183,24 +203,8 @@ module.exports.getMiddleware = () => {
 			let isHTML = type.indexOf('text/html') >= 0;
 			let isJS = type.indexOf('javascript') >= 0;
 			let isCSS = type.indexOf('text/css') >= 0;
-			if (isHTML && !isAlreadyPfbs) {
-				let c1 = data.toString('utf-8');
-				let c2 = c1.replace(
-					'</body>',
-					`<script>
-(function() {
-	var ws = new WebSocket('ws://' + window.location.host+ '/notify?reloadMode=RELOAD_ON_SAVE&referrer=' + encodeURIComponent(window.location.pathname))
-	ws.onmessage = function (msg) {
-		if (msg.data === 'reload') {
-			window.location.reload();
-		}
-	};
-})();
-			</script></body>`,
-				);
-				console.log('insert hotreload to html', data.length, c1.length, c2.length);
-				// console.log(c1);
-				data = c2;
+			if (isHTML && !isAlreadyPfbs && !res.appendWebsocketScript) {
+				data = appendWebsocketScript(data);
 			}
 			if (isPixUI && !isAlreadyPfbs && !disablePFBS && (isHTML || isJS)) {
 				let ver = /(\d)\.(\d)\.(\d+)/.exec(ua); // 0.2.*以上
@@ -210,8 +214,7 @@ module.exports.getMiddleware = () => {
 					res.end = _end;
 					_end.call(this, out);
 				});
-			}
-			else {
+			} else {
 				console.log('directly call end...', data.length, type, _end);
 				_end.call(this, data);
 			}
@@ -226,6 +229,10 @@ module.exports.getMiddleware = () => {
 			let isCSS = type.indexOf('text/css') >= 0;
 			if (isPixUI && !disablePFBS && (isHTML || isJS)) {
 				log('hook send...', c.length, type);
+				if (isHTML) {
+					res.appendWebsocketScript = true;
+					c = appendWebsocketScript(c);
+				}
 				let ver = /(\d)\.(\d)\.(\d+)/.exec(ua); // 0.2.*以上
 				pfbsConvert(ver.splice(1), isJS, c, (out) => {
 					res.send = _send;
@@ -234,8 +241,7 @@ module.exports.getMiddleware = () => {
 					res.setHeader('Content-Type', 'application/octet-stream');
 					_send.call(res, out);
 				});
-			}
-			else {
+			} else {
 				console.log('directly call send...', c.length, type, _send);
 				_send.call(this, c);
 			}

package/config/util.js

@@ -49,8 +49,7 @@ module.exports.readRegKey = function (path, key) {
 			windowsHide: true,
 		});
 		return out.toString();
-	}
-	catch (error) {
+	} catch (error) {
 		console.error('Error executing PowerShell script:', error.message);
 		return '';
 	}
@@ -82,33 +81,31 @@ module.exports.loadProjectConfig = function () {
 		Object.entries(env || {}).forEach(([k, v]) => {
 			pienv['process.env.' + k] = JSON.stringify(v);
 		});
-	}
-	catch (e) {
+	} catch (e) {
 		console.warn('read entry.js failed');
 		if (!/Cannot find module/.test(e.message)) {
 			console.error(e);
 		}
 		projectConfig = { pages: [] };
-	}
-	finally {
+	} finally {
 	}
 	return projectConfig;
 };
 
-module.exports.getH5esType = function() {
+module.exports.getH5esType = function () {
 	const { parse } = require('comment-json');
 	const tsconfigPath = path.resolve(process.cwd(), 'tsconfig.json');
 	const fileContent = fs.readFileSync(tsconfigPath, 'utf8');
 	const tsconfig = parse(fileContent);
 	tsconfig.compilerOptions = tsconfig.compilerOptions || {};
 	const existingTypeRoots = tsconfig.compilerOptions.typeRoots || [];
-	const h5esTypeRoot = existingTypeRoots.find(root => root.includes('h5es-types'));
+	const h5esTypeRoot = existingTypeRoots.find((root) => root.includes('h5es-types'));
 	let slashIndex = h5esTypeRoot.lastIndexOf('/');
 	if (slashIndex !== -1) {
 		h5esType = h5esTypeRoot.substring(slashIndex + 1);
 	}
 	return h5esType;
-}
+};
 
 module.exports.setH5esType = function (newType) {
 	const { stringify, parse } = require('comment-json');
@@ -117,18 +114,17 @@ module.exports.setH5esType = function (newType) {
 	const tsconfig = parse(fileContent);
 	tsconfig.compilerOptions = tsconfig.compilerOptions || {};
 	const existingTypeRoots = tsconfig.compilerOptions.typeRoots || [];
-	let h5esTypeRoot = existingTypeRoots.find(root => root.includes('h5es-types'));
-	const updateTypeRoots = existingTypeRoots.filter(root => !root.includes('h5es-types'));
+	let h5esTypeRoot = existingTypeRoots.find((root) => root.includes('h5es-types'));
+	const updateTypeRoots = existingTypeRoots.filter((root) => !root.includes('h5es-types'));
 	if (h5esTypeRoot === undefined || h5esTypeRoot != newType) {
 		updateTypeRoots.push(newType);
-		console.log('newType ', newType)
+		console.log('newType ', newType);
 		h5esTypeRoot = newType;
 		tsconfig.compilerOptions.typeRoots = updateTypeRoots;
 		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

@@ -292,8 +292,7 @@ var getMiddleware = function (appPort, notifyAppReload) {
 						restartRecommended: true,
 						newConfig: h5esType,
 					});
-				}
-				catch (error) {
+				} catch (error) {
 					console.log(error);
 					res.status(500).json({
 						error: `更新配置失败: ${error.message}`,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@pixui-dev/pxw",
-	"version": "0.1.21",
+	"version": "0.1.22",
 	"private": false,
 	"directories": {
 		"lib": "lib"
@@ -26,6 +26,7 @@
 		"b": "npx webpack --mode=production --config config/webpack.js",
 		"d": "node scripts/run-pxw.js",
 		"p": "node scripts/pack.js",
+		"lint": "yarn prettier-eslint --write bin/*.js config/*.js scripts/*.js",
 		"postinstall": "node scripts/postinstall.js"
 	},
 	"dependencies": {

package/scripts/postinstall.js

@@ -9,4 +9,4 @@ function rmrf(target) {
 }
 
 rmrf(path.join(__dirname, '../node_modules/@types/react'));
-rmrf(path.join(__dirname, '../node_modules/preact'));
+rmrf(path.join(__dirname, '../node_modules/preact'));

package/scripts/run-pxw.js

@@ -8,6 +8,6 @@ const child = spawn('node', [path.join(__dirname, '../bin/pxw.js')], {
 	env: process.env,
 });
 
-child.on('exit', code => {
+child.on('exit', (code) => {
 	process.exit(code);
-});
+});