zhangyuheng/MCSM-Daemon
1
0
Fork 0
forked from mirror/MCSM-Daemon
Code Pull Requests Activity

Feat: 新增优雅降级

Browse Source
This commit is contained in:
Suwings 2022-07-10 13:55:11 +08:00
parent 273e0a2412
commit b658fc50d2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/entity/commands/pty/pty_start.ts
View File

@ -32,6 +32,8 @@ import { ChildProcess, exec, spawn } from "child_process";
import { commandStringToArray } from "../base/command_parser"; import { commandStringToArray } from "../base/command_parser";
import { killProcess } from "../../../common/process_tools"; import { killProcess } from "../../../common/process_tools";
import GeneralStartCommand from "../general/general_start"; import GeneralStartCommand from "../general/general_start";
import FunctionDispatcher from "../dispatcher";
import StartCommand from "../start";
// 启动时错误异常 // 启动时错误异常
class StartupError extends Error { class StartupError extends Error {
@ -101,11 +103,13 @@ export default class PtyStartCommand extends InstanceCommand {
const ptyParameter = ["-dir", instance.config.cwd, "-cmd", commandList.join(" "), "-size", `${instance.config.terminalOption.ptyWindowCol},${instance.config.terminalOption.ptyWindowRow}`]; const ptyParameter = ["-dir", instance.config.cwd, "-cmd", commandList.join(" "), "-size", `${instance.config.terminalOption.ptyWindowCol},${instance.config.terminalOption.ptyWindowRow}`];
if (!fs.existsSync(ptyAppPath)) { if (!fs.existsSync(ptyAppPath)) {
// return instance.failure(new StartupError("PTY 转发程序不存在，请勿使用 PTY 模式，请在终端设置中更改"));
logger.info(`会话 ${source}: 请求开启实例，模式为 PTY 终端`); logger.info(`会话 ${source}: 请求开启实例，模式为 PTY 终端`);
logger.warn("PTY 终端转发程序不存在，自动降级到普通启动模式"); logger.warn("PTY 终端转发程序不存在，自动降级到普通启动模式");
instance.println("WARN", "PTY 终端转发程序不存在，自动降级到普通启动模式"); instance.println("ERROR", "PTY 终端转发程序不存在，自动降级到普通启动模式");
instance.forceExec(new GeneralStartCommand()); // 关闭 PTY 类型，重新配置实例功能组，重新启动实例
instance.config.terminalOption.pty = false;
await instance.forceExec(new FunctionDispatcher());
await instance.exec(new StartCommand());
return; return;
} }