Fix: auto open page & npm command

This commit is contained in:
unitwk 2024-01-15 14:41:51 +08:00
parent 68659d7dd8
commit 9b07f1568c
6 changed files with 15 additions and 12 deletions

View File

@ -21,7 +21,6 @@
"@koa/router": "^10.0.0", "@koa/router": "^10.0.0",
"archiver": "^5.3.1", "archiver": "^5.3.1",
"axios": "^1.1.3", "axios": "^1.1.3",
"common": "file:../common",
"compressing": "^1.5.1", "compressing": "^1.5.1",
"crypto": "^1.0.1", "crypto": "^1.0.1",
"dockerode": "3.1.0", "dockerode": "3.1.0",
@ -32,7 +31,6 @@
"koa-body": "^4.2.0", "koa-body": "^4.2.0",
"koa-send": "^5.0.1", "koa-send": "^5.0.1",
"log4js": "^6.4.0", "log4js": "^6.4.0",
"mcsmanager-common": "file:../common/dist",
"module-alias": "^2.2.3", "module-alias": "^2.2.3",
"node-disk-info": "^1.3.0", "node-disk-info": "^1.3.0",
"node-schedule": "^2.0.0", "node-schedule": "^2.0.0",
@ -46,6 +44,7 @@
"yaml": "^1.10.2" "yaml": "^1.10.2"
}, },
"devDependencies": { "devDependencies": {
"common": "file:../common",
"@types/archiver": "^5.3.1", "@types/archiver": "^5.3.1",
"@types/axios": "^0.14.0", "@types/axios": "^0.14.0",
"@types/dockerode": "^3.2.7", "@types/dockerode": "^3.2.7",

View File

@ -3,7 +3,7 @@
currentPath="$(pwd)" currentPath="$(pwd)"
for action in "daemon" "panel" "frontend" for action in "daemon" "panel" "frontend"
do do
terminalCmd="tell app \"Terminal\" to do script \"cd $currentPath && npm run start-$action\"" terminalCmd="tell app \"Terminal\" to do script \"cd $currentPath && npm run $action\""
echo "Run: $terminalCmd" echo "Run: $terminalCmd"
osascript -e "$terminalCmd" osascript -e "$terminalCmd"
done done

View File

@ -1,5 +1,5 @@
start npm run start-daemon start npm run daemon
start npm run start-panel start npm run panel
start npm run start-frontend start npm run frontend

View File

@ -4,9 +4,9 @@
"scripts": { "scripts": {
"i18n": "i18next-scanner --config i18-scanner.config.js", "i18n": "i18next-scanner --config i18-scanner.config.js",
"preview-build": "cd common && npm install && npm run build", "preview-build": "cd common && npm install && npm run build",
"start-daemon": "cd daemon && npm run dev", "daemon": "cd daemon && npm run dev",
"start-frontend": "cd frontend && npm run dev", "frontend": "cd frontend && npm run dev",
"start-panel": "cd panel && npm run dev" "panel": "cd panel && npm run dev"
}, },
"dependencies": { "dependencies": {
"crc": "^4.3.2", "crc": "^4.3.2",

View File

@ -21,7 +21,6 @@
"@koa/router": "^10.0.0", "@koa/router": "^10.0.0",
"axios": "^1.6.2", "axios": "^1.6.2",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"common": "file:../common",
"crypto": "^1.0.1", "crypto": "^1.0.1",
"i18n": "^0.15.0", "i18n": "^0.15.0",
"i18next": "^21.8.14", "i18next": "^21.8.14",
@ -42,6 +41,7 @@
"uuid": "^8.3.2" "uuid": "^8.3.2"
}, },
"devDependencies": { "devDependencies": {
"common": "file:../common",
"@types/bcryptjs": "^2.4.2", "@types/bcryptjs": "^2.4.2",
"@types/fs-extra": "^9.0.11", "@types/fs-extra": "^9.0.11",
"@types/koa": "^2.13.1", "@types/koa": "^2.13.1",

View File

@ -20,6 +20,10 @@ import { middleware as protocolMiddleware } from "./app/middleware/protocol";
import { mountRouters } from "./app/index"; import { mountRouters } from "./app/index";
import versionAdapter from "./app/service/version_adapter"; import versionAdapter from "./app/service/version_adapter";
function hasParams(name: string) {
return process.argv.includes(name);
}
function setupHttp(koaApp: Koa, port: number, host?: string) { function setupHttp(koaApp: Koa, port: number, host?: string) {
const httpServer = http.createServer(koaApp.callback()); const httpServer = http.createServer(koaApp.callback());
@ -38,8 +42,8 @@ function setupHttp(koaApp: Koa, port: number, host?: string) {
logger.info($t("TXT_CODE_app.exitTip", { port })); logger.info($t("TXT_CODE_app.exitTip", { port }));
logger.info("=================================="); logger.info("==================================");
if (os.platform() == "win32") { if (os.platform() == "win32" && hasParams("--open")) {
open(`http://localhost:${port}/`).then(() => {}); open(`http://localhost:${port}/`);
} }
} }