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

完善 重启输出报错&细节问题

Browse Source
This commit is contained in:
Suwings 2022-03-16 11:17:10 +08:00
parent ce254b2a21
commit 72fcf0819d
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/entity/commands/general/general _restart.ts
View File

@ -51,7 +51,7 @@ export default class GeneralRestartCommand extends InstanceCommand {
} catch (error) { } catch (error) {
clearInterval(task); clearInterval(task);
instance.setLock(false); instance.setLock(false);
throw error; instance.failure(error);
} }
}, 1000); }, 1000);
} catch (error) { } catch (error) {

1
src/entity/instance/instance.ts
View File

@ -293,6 +293,7 @@ export default class Instance extends EventEmitter {
return 0; return 0;
} }
// 执行预设命令动作
async execPreset(action: string, p?: any) { async execPreset(action: string, p?: any) {
if (this.presetCommandManager) { if (this.presetCommandManager) {
return await this.presetCommandManager.execPreset(action, p); return await this.presetCommandManager.execPreset(action, p);

2
src/routers/stream_router.ts
View File

@ -36,7 +36,7 @@ routerApp.use(async (event, ctx, data, next) => {
if (ctx.session.stream && ctx.session.stream.check === true && ctx.session.type === "STREAM") { if (ctx.session.stream && ctx.session.stream.check === true && ctx.session.type === "STREAM") {
return await next(); return await next();
} }
return protocol.error(ctx, "error", "权限不足，非法访问"); return protocol.error(ctx, "error", "[Unauthorized Access] 权限不足，非法访问");
} }
return await next(); return await next();
}); });

8
src/service/protocol.ts
View File

@ -53,7 +53,9 @@ export function responseError(ctx: RouterContext, err: Error | string) {
if (err) errinfo = err.toString(); if (err) errinfo = err.toString();
else errinfo = err; else errinfo = err;
const packet = new Packet(ctx.uuid, STATUS_ERR, ctx.event, errinfo); const packet = new Packet(ctx.uuid, STATUS_ERR, ctx.event, errinfo);
logger.error(`会话 ${ctx.socket.id}(${ctx.socket.handshake.address})/${ctx.event} 响应数据时异常:\n`, err); // 忽略因为重启守护进程没有刷新网页的权限不足错误
if (err.toString().includes("[Unauthorized Access]")) return ctx.socket.emit(ctx.event, packet);
logger.warn(`会话 ${ctx.socket.id}(${ctx.socket.handshake.address})/${ctx.event} 响应数据时异常:\n`, err);
ctx.socket.emit(ctx.event, packet); ctx.socket.emit(ctx.event, packet);
} }
@ -64,7 +66,9 @@ export function msg(ctx: RouterContext, event: string, data: any) {
export function error(ctx: RouterContext, event: string, err: any) { export function error(ctx: RouterContext, event: string, err: any) {
const packet = new Packet(ctx.uuid, STATUS_ERR, event, err); const packet = new Packet(ctx.uuid, STATUS_ERR, event, err);
logger.error(`会话 ${ctx.socket.id}(${ctx.socket.handshake.address})/${event} 响应数据时异常:\n`, err); // 忽略因为重启守护进程没有刷新网页的权限不足错误
if (err.toString().includes("[Unauthorized Access]")) return ctx.socket.emit(ctx.event, packet);
logger.warn(`会话 ${ctx.socket.id}(${ctx.socket.handshake.address})/${event} 响应数据时异常:\n`, err);
ctx.socket.emit(event, packet); ctx.socket.emit(event, packet);
} }