From 5c3cff86e02232719511f143c7a6ec5b2c472e42 Mon Sep 17 00:00:00 2001 From: vincss Date: Sun, 24 Dec 2023 15:48:47 +0100 Subject: [PATCH] wip --- package.json | 2 +- sleepingSettings.yml | 2 +- src/sleepingLogger.ts | 14 ++++++++++---- src/sleepingMcJava.ts | 11 ++++++----- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index f56511c..545e9b7 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "express": "^4.18.2", "express-handlebars": "^7.0.4", "js-yaml": "^4.1.0", - "minecraft-protocol": "git://github.com:vincss/node-minecraft-protocol.git", + "minecraft-protocol": "file:/../node-minecraft-protocol", "prismarine-chat": "^1.8.0", "winston": "^3.8.2" }, diff --git a/sleepingSettings.yml b/sleepingSettings.yml index 785b700..1411ea5 100644 --- a/sleepingSettings.yml +++ b/sleepingSettings.yml @@ -14,7 +14,7 @@ webStopOnStart: false # webServeDynmap: true # true or false to enable, by default it will serve ./plugins/dynmap/web/. You can specify an absolute path to serve instead or an url to redirect to. startMinecraft: true # false to disable -minecraftCommand: "java -jar paper.jar nogui" # or paper.jar or whatever flavor you like +minecraftCommand: "ping 127.0.0.1 -n 1" # or paper.jar or whatever flavor you like # preventStop: true # Prevent the user to stop the server (trought web-server or cli). diff --git a/src/sleepingLogger.ts b/src/sleepingLogger.ts index 1dc5587..c194983 100644 --- a/src/sleepingLogger.ts +++ b/src/sleepingLogger.ts @@ -4,10 +4,10 @@ import { createLogger, format, transports, transport } from "winston"; export const { version } = require("../package.json"); // eslint-disable-line const DefaultLogger = { - info: (...params: any) => console.info(params), - error: (...params: any) => console.error(params), - warn: (...params: any) => console.warn(params), - silly: (...params: any) => console.trace(params), + info: console.info, + error: console.error, + warn: console.warn, + silly: console.trace, }; export type LoggerType = typeof DefaultLogger; @@ -22,6 +22,12 @@ export const getLogger = () => { return logger; } + if (process.env.DEFAULT_LOGGER) { + initialized = true; + logger.info("... Default Logger ..."); + return logger; + } + const loggers: transport[] = [new transports.Console()]; if ( !process.env.DISABLE_FILE_LOGS || diff --git a/src/sleepingMcJava.ts b/src/sleepingMcJava.ts index 23b6e19..5411ea8 100644 --- a/src/sleepingMcJava.ts +++ b/src/sleepingMcJava.ts @@ -41,6 +41,7 @@ export class SleepingMcJava implements ISleepingServer { errorHandler: (client, error) => console.warn("SleepingMcJava.errorHandler: ", client, error), enforceSecureProfile: this.settings.serverOnlineMode, + hideErrors: true, // encryption: false, // host: '0.0.0.0', }); @@ -51,11 +52,11 @@ export class SleepingMcJava implements ISleepingServer { this.server.on("connection", (client: Client) => { !this.settings.hideOnConnectionLogs && - this.logger.info( - `A Prince has taken a quick peek. [${client.version}${this.getIp( - client - )}]` - ); + this.logger.info( + `A Prince has taken a quick peek. [${client.version}${this.getIp( + client + )}]` + ); }); this.server.on("listening", () => {