@pixui-dev/pxw 0.1.35 → 0.1.37

package/bin/pxw.js

@@ -1,56 +1,56 @@
-#!/usr/bin/env node
-let path = require('path');
-let http = require('http');
-let util = require('../config/util');
-let pfbs = require('../config/pfbs');
-let webpack = require('../config/webpack');
-let argv = require('yargs').argv;
-
-let runInWindows = process.platform == 'win32';
-let pr = path.resolve;
-
-let rootDir = pr(__dirname, '../');
-let projectConfig = util.loadProjectConfig();
-let appPort = parseInt(process.env['PXW_APP_PORT']) || projectConfig.port || 8001;
-
-process
-	.on('unhandledRejection', (err) => {
-		console.log('unhandledRejection', err);
-	})
-	.on('uncaughtException', (err) => {
-		console.log('uncaughtException', err);
-	});
-
-async function main() {
-	let express = require('express');
-
-	let app = express();
-	let server = http.createServer(app);
-
-	app.use(express.json());
-	app.use(pfbs.getMiddleware());
-
-	let { notifyAppReload } = await require('../config/devops').setupDevops(server, app);
-
-	if (!argv['no-webpack']) app.use(webpack.devServer.getMiddleware()(appPort, notifyAppReload));
-
-	app.use(function (err, req, res, next) {
-		console.error(err);
-		res.status(500).send('Internal Serverless Error');
-	});
-
-	server.listen(appPort, '0.0.0.0', () => {
-		let ipList = [];
-		util.getLocalIP().forEach((ip) => {
-			console.log(`Server start on http://${ip}:${appPort}`);
-		});
-	});
-}
-
-let isDaemonMode = argv.d;
-if (isDaemonMode) {
-	require('../config/daemon').start(main);
-}
-else {
-	main();
-}
+#!/usr/bin/env node
+let path = require('path');
+let http = require('http');
+let util = require('../config/util');
+let pfbs = require('../config/pfbs');
+let webpack = require('../config/webpack');
+let argv = require('yargs').argv;
+
+let runInWindows = process.platform == 'win32';
+let pr = path.resolve;
+
+let rootDir = pr(__dirname, '../');
+let projectConfig = util.loadProjectConfig();
+let appPort = parseInt(process.env['PXW_APP_PORT']) || projectConfig.port || 8001;
+
+process
+	.on('unhandledRejection', (err) => {
+		console.log('unhandledRejection', err);
+	})
+	.on('uncaughtException', (err) => {
+		console.log('uncaughtException', err);
+	});
+
+async function main() {
+	let express = require('express');
+
+	let app = express();
+	let server = http.createServer(app);
+
+	app.use(express.json());
+	app.use(pfbs.getMiddleware());
+
+	let { notifyAppReload } = await require('../config/devops').setupDevops(server, app);
+
+	if (!argv['no-webpack']) app.use(webpack.devServer.getMiddleware()(appPort, notifyAppReload));
+
+	app.use(function (err, req, res, next) {
+		console.error(err);
+		res.status(500).send('Internal Serverless Error');
+	});
+
+	server.listen(appPort, '0.0.0.0', () => {
+		let ipList = [];
+		util.getLocalIP().forEach((ip) => {
+			console.log(`Server start on http://${ip}:${appPort}`);
+		});
+	});
+}
+
+let isDaemonMode = argv.d;
+if (isDaemonMode) {
+	require('../config/daemon').start(main);
+}
+else {
+	main();
+}

package/bin/wpbuild.js

@@ -1,10 +1,10 @@
-const webpack = require('webpack');
-
-let config = require('../config/webpack');
-webpack(config, (err, stats) => {
-	if (err || stats.hasErrors()) {
-		console.log(err);
-		return;
-	}
-	console.log('done');
-});
+const webpack = require('webpack');
+
+let config = require('../config/webpack');
+webpack(config, (err, stats) => {
+	if (err || stats.hasErrors()) {
+		console.log(err);
+		return;
+	}
+	console.log('done');
+});

package/config/daemon.js

@@ -1,157 +1,157 @@
-let fs = require('fs');
-let cp = require('child_process');
-let path = require('path');
-let http = require('http');
-let os = require('os');
-let util = require('./util');
-let pfbs = require('./pfbs');
-let webpack = require('./webpack');
-let argv = require('yargs').argv;
-
-let runInWindows = process.platform == 'win32';
-let pr = path.resolve;
-let log = console.log;
-log = () => {};
-
-let rootDir = pr(__dirname, '../');
-let projectConfig = util.loadProjectConfig();
-
-let isDaemonMode = argv.d;
-
-function restart() {
-	const scriptPath = process.argv[1];
-	let removeArgs = { '--fg': 1 };
-	let args = process.argv.slice(2);
-	args = args.filter((v) => !removeArgs[v]);
-	const subprocess = cp.spawn(process.execPath, [scriptPath, ...args], {
-		detached: true,
-		windowsHide: true,
-	});
-	subprocess.unref();
-	process.exit();
-}
-
-function watchSelf() {
-	//可以通过环境变量设置是否要监视重启
-	let restartWatchFile = process.env['PXW_WATCHFILE'];
-	if (restartWatchFile == 'none') return;
-	if (!restartWatchFile) restartWatchFile = __filename;
-	restartWatchFile = pr(restartWatchFile);
-	console.log('watchfile:', restartWatchFile);
-	let chokidar = require('chokidar');
-	let watcher = chokidar.watch(restartWatchFile, { ignored: /^\./, persistent: true });
-	watcher
-		.on('change', function (path) {
-			console.log(`pid[${process.pid}] observing '${path}' changed, will restart!`);
-			restart();
-		})
-		.on('error', function (error) {
-			console.error('watchSelf error:', error);
-		});
-}
-
-module.exports.start = function (main) {
-	//默认将log重定向到文件，不然在restart后会丢失
-	let logFile = pr(`.cache/app${runInWindows ? '.win' : ''}.log`);
-	if (!fs.existsSync(path.dirname(logFile))) fs.mkdirSync(path.dirname(logFile));
-	let oldWrite = process.stdout.write.bind(process.stdout);
-	var access = fs.createWriteStream(logFile, { flags: 'a' });
-	if (!process.env['PXW_NOREDIRECT_LOG']) {
-		process.stdout.write = process.stderr.write = access.write.bind(access);
-	}
-
-	let checkBinString = 'pxw/bin/pxw.js';
-	let checkCmd =
-		process.platform == 'win32' //
-			? 'wmic /OUTPUT:STDOUT process get processid,commandline'
-			: `ps -ef|grep "node"|grep "${checkBinString.replace(/(.)/, '[$1]')}"`; //第一个字符包在[]里可以避免grep命令自身出现在结果里
-
-	console.log(`\n*** pxw run: ${new Date().toLocaleString()} ***\npid[${process.pid}] check singleton:`, checkCmd);
-	cp.exec(checkCmd, { windowsHide: true, maxBuffer: 1024 * 1024 * 10 }, (error, stdout, stderr) => {
-		if (error) {
-			console.log('pgrep error', error);
-			// return;
-		}
-
-		let cpid = process.pid.toString();
-		if (process.platform == 'win32') {
-			let psl = stdout.trim().split('\n');
-			// console.log(psl.splice(300));
-
-			for (let cmd of psl) {
-				cmd = cmd.replace(/\\/g, '/');
-				if ((cmd.indexOf('/node.exe') > 0 || cmd.indexOf('node') == 0) && cmd.indexOf(checkBinString) > 0) {
-					let info = cmd.trim().replace(/\s+/g, ' ').split(' ');
-					console.log('find', info, process.pid);
-					let tpid = info[info.length - 1];
-					let isSelf = tpid == cpid;
-					console.log(`tpid[${tpid}],isSelf:${isSelf}`);
-					if (!isSelf) {
-						if (argv.me || argv.kill) {
-							cp.execSync('taskkill /F /PID ' + tpid);
-						}
-						else {
-							return;
-						}
-					}
-				}
-			}
-			if (argv.kill) return;
-		}
-		else {
-			console.log('pgrep stdout\n', stdout);
-			let lines = stdout.trim().split('\n');
-			for (let line of lines) {
-				line = line
-					.trim()
-					.split(' ')
-					.filter((x) => !!x);
-				// console.log(line);
-				if (line.length > 5) {
-					let tpid = line[1];
-					let isSelf = tpid == cpid;
-					console.log(`tpid[${tpid}],isSelf:${isSelf}`);
-					if (tpid && !isSelf) {
-						console.log(`found exist process:[${tpid}], cur[${process.pid}]`);
-						if ((argv.me || argv.kill) && !error) {
-							console.log(`force kill other process:[${tpid}]`);
-							try {
-								process.stdout.write('', () => {
-									cp.execSync('kill ' + tpid);
-								});
-							}
-							catch (e) {
-								console.log(e);
-							}
-						}
-						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);
-						}
-					}
-				}
-			}
-		}
-		if (argv.kill) return;
-
-		if (argv.fg || process.env.restart) {
-			if (argv.fg) {
-				oldWrite(`pid[${process.pid}] run in fg，log已重定向到 ${logFile} \n`);
-			}
-			else {
-				let rc = parseInt(process.env.restart);
-				process.env.restart = rc + 1;
-				console.log(`pid[${process.pid}] run in restart: ${rc}`);
-			}
-			main();
-			watchSelf();
-		}
-		else {
-			console.log(`pid[${process.pid}] run in bg`);
-			oldWrite('pxtest-admin 默认后台运行，加--fg参数可前台运行，log已重定向到' + logFile + '\n');
-			process.env.restart = 1;
-			restart();
-		}
-	});
-};
+let fs = require('fs');
+let cp = require('child_process');
+let path = require('path');
+let http = require('http');
+let os = require('os');
+let util = require('./util');
+let pfbs = require('./pfbs');
+let webpack = require('./webpack');
+let argv = require('yargs').argv;
+
+let runInWindows = process.platform == 'win32';
+let pr = path.resolve;
+let log = console.log;
+log = () => {};
+
+let rootDir = pr(__dirname, '../');
+let projectConfig = util.loadProjectConfig();
+
+let isDaemonMode = argv.d;
+
+function restart() {
+	const scriptPath = process.argv[1];
+	let removeArgs = { '--fg': 1 };
+	let args = process.argv.slice(2);
+	args = args.filter((v) => !removeArgs[v]);
+	const subprocess = cp.spawn(process.execPath, [scriptPath, ...args], {
+		detached: true,
+		windowsHide: true,
+	});
+	subprocess.unref();
+	process.exit();
+}
+
+function watchSelf() {
+	//可以通过环境变量设置是否要监视重启
+	let restartWatchFile = process.env['PXW_WATCHFILE'];
+	if (restartWatchFile == 'none') return;
+	if (!restartWatchFile) restartWatchFile = __filename;
+	restartWatchFile = pr(restartWatchFile);
+	console.log('watchfile:', restartWatchFile);
+	let chokidar = require('chokidar');
+	let watcher = chokidar.watch(restartWatchFile, { ignored: /^\./, persistent: true });
+	watcher
+		.on('change', function (path) {
+			console.log(`pid[${process.pid}] observing '${path}' changed, will restart!`);
+			restart();
+		})
+		.on('error', function (error) {
+			console.error('watchSelf error:', error);
+		});
+}
+
+module.exports.start = function (main) {
+	//默认将log重定向到文件，不然在restart后会丢失
+	let logFile = pr(`.cache/app${runInWindows ? '.win' : ''}.log`);
+	if (!fs.existsSync(path.dirname(logFile))) fs.mkdirSync(path.dirname(logFile));
+	let oldWrite = process.stdout.write.bind(process.stdout);
+	var access = fs.createWriteStream(logFile, { flags: 'a' });
+	if (!process.env['PXW_NOREDIRECT_LOG']) {
+		process.stdout.write = process.stderr.write = access.write.bind(access);
+	}
+
+	let checkBinString = 'pxw/bin/pxw.js';
+	let checkCmd =
+		process.platform == 'win32' //
+			? 'wmic /OUTPUT:STDOUT process get processid,commandline'
+			: `ps -ef|grep "node"|grep "${checkBinString.replace(/(.)/, '[$1]')}"`; //第一个字符包在[]里可以避免grep命令自身出现在结果里
+
+	console.log(`\n*** pxw run: ${new Date().toLocaleString()} ***\npid[${process.pid}] check singleton:`, checkCmd);
+	cp.exec(checkCmd, { windowsHide: true, maxBuffer: 1024 * 1024 * 10 }, (error, stdout, stderr) => {
+		if (error) {
+			console.log('pgrep error', error);
+			// return;
+		}
+
+		let cpid = process.pid.toString();
+		if (process.platform == 'win32') {
+			let psl = stdout.trim().split('\n');
+			// console.log(psl.splice(300));
+
+			for (let cmd of psl) {
+				cmd = cmd.replace(/\\/g, '/');
+				if ((cmd.indexOf('/node.exe') > 0 || cmd.indexOf('node') == 0) && cmd.indexOf(checkBinString) > 0) {
+					let info = cmd.trim().replace(/\s+/g, ' ').split(' ');
+					console.log('find', info, process.pid);
+					let tpid = info[info.length - 1];
+					let isSelf = tpid == cpid;
+					console.log(`tpid[${tpid}],isSelf:${isSelf}`);
+					if (!isSelf) {
+						if (argv.me || argv.kill) {
+							cp.execSync('taskkill /F /PID ' + tpid);
+						}
+						else {
+							return;
+						}
+					}
+				}
+			}
+			if (argv.kill) return;
+		}
+		else {
+			console.log('pgrep stdout\n', stdout);
+			let lines = stdout.trim().split('\n');
+			for (let line of lines) {
+				line = line
+					.trim()
+					.split(' ')
+					.filter((x) => !!x);
+				// console.log(line);
+				if (line.length > 5) {
+					let tpid = line[1];
+					let isSelf = tpid == cpid;
+					console.log(`tpid[${tpid}],isSelf:${isSelf}`);
+					if (tpid && !isSelf) {
+						console.log(`found exist process:[${tpid}], cur[${process.pid}]`);
+						if ((argv.me || argv.kill) && !error) {
+							console.log(`force kill other process:[${tpid}]`);
+							try {
+								process.stdout.write('', () => {
+									cp.execSync('kill ' + tpid);
+								});
+							}
+							catch (e) {
+								console.log(e);
+							}
+						}
+						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);
+						}
+					}
+				}
+			}
+		}
+		if (argv.kill) return;
+
+		if (argv.fg || process.env.restart) {
+			if (argv.fg) {
+				oldWrite(`pid[${process.pid}] run in fg，log已重定向到 ${logFile} \n`);
+			}
+			else {
+				let rc = parseInt(process.env.restart);
+				process.env.restart = rc + 1;
+				console.log(`pid[${process.pid}] run in restart: ${rc}`);
+			}
+			main();
+			watchSelf();
+		}
+		else {
+			console.log(`pid[${process.pid}] run in bg`);
+			oldWrite('pxtest-admin 默认后台运行，加--fg参数可前台运行，log已重定向到' + logFile + '\n');
+			process.env.restart = 1;
+			restart();
+		}
+	});
+};

package/config/default.conf

@@ -1,21 +1,21 @@
-server {
-
-				listen       80;
-				server_name  localhost;
-				
-				location / {
-					rewrite  ^/$ /web/home/;
-					rewrite  ^/home/(.*)$ /web/home/$1;
-					rewrite  ^/static/media/(.*)$ /web/static/media/$1;
-
-					root   /usr/share/nginx/html;
-					index  index.html index.htm;
-				}
-			
-			
-				error_page   500 502 503 504  /50x.html;
-				location = /50x.html {
-					root   /usr/share/nginx/html;
-				}
-			
+server {
+
+				listen       80;
+				server_name  localhost;
+				
+				location / {
+					rewrite  ^/$ /web/home/;
+					rewrite  ^/home/(.*)$ /web/home/$1;
+					rewrite  ^/static/media/(.*)$ /web/static/media/$1;
+
+					root   /usr/share/nginx/html;
+					index  index.html index.htm;
+				}
+			
+			
+				error_page   500 502 503 504  /50x.html;
+				location = /50x.html {
+					root   /usr/share/nginx/html;
+				}
+			
 }