use this.InternalConsole

This commit is contained in:
SrGooglo 2023-05-11 18:24:29 +02:00
parent 8da4349aab
commit 9919d81caf
3 changed files with 16 additions and 30 deletions

View File

@ -1,5 +1,4 @@
module.exports = { module.exports = {
serverManifest: require("./serverManifest"), serverManifest: require("./serverManifest"),
outputServerError: require("./outputServerError"),
internalConsole: require("./internalConsole"), internalConsole: require("./internalConsole"),
} }

View File

@ -1,9 +0,0 @@
function outputServerError({
message = "Unexpected error",
description,
ref = "SERVER",
}) {
global.InternalConsole.error(`\n\x1b[41m\x1b[37m🆘 [${ref}] ${message}\x1b[0m ${description ? `\n ${description}` : ""} \n`)
}
module.exports = outputServerError

View File

@ -16,7 +16,7 @@ const HTTPProtocolsInstances = {
const HTTPEngines = { const HTTPEngines = {
"hyper-express": () => { "hyper-express": () => {
global.InternalConsole.warn("Hyper-Express is not fully supported yet") console.warn("HyperExpress is not fully supported yet!")
const engine = require("hyper-express") const engine = require("hyper-express")
return new engine.Server() return new engine.Server()
@ -78,7 +78,7 @@ class Server {
eventsChannels: [], eventsChannels: [],
} }
this.internalConsole = global.InternalConsole = new internalConsole({ this.InternalConsole = new internalConsole({
server_name: this.params.name server_name: this.params.name
}) })
@ -114,12 +114,12 @@ class Server {
const MANIFEST_STAT = global.MANIFEST_STAT = serverManifest.stat() const MANIFEST_STAT = global.MANIFEST_STAT = serverManifest.stat()
if (typeof MANIFEST_DATA.created === "undefined") { if (typeof MANIFEST_DATA.created === "undefined") {
InternalConsole.warn("Server generation file not contains an creation date") this.InternalConsole.warn("Server generation file not contains an creation date")
serverManifest.write({ created: Date.parse(MANIFEST_STAT.birthtime) }) serverManifest.write({ created: Date.parse(MANIFEST_STAT.birthtime) })
} }
if (typeof MANIFEST_DATA.server_token === "undefined") { if (typeof MANIFEST_DATA.server_token === "undefined") {
InternalConsole.warn("Missing server token!") this.InternalConsole.warn("Missing server token!")
serverManifest.create() serverManifest.create()
} }
@ -130,14 +130,14 @@ class Server {
} }
initialize = async () => { initialize = async () => {
if (!this.params.no_brand) { // if (!this.params.no_brand) {
if (!this.params.minimal) { // if (!this.params.minimal) {
InternalConsole.log(linebridge_ascii) // this.InternalConsole.log(linebridge_ascii)
} // }
} // }
if (!this.params.minimal) { if (!this.params.minimal) {
InternalConsole.info(`🚀 Starting server...`) this.InternalConsole.info(`🚀 Starting server...`)
} }
//* set server defined headers //* set server defined headers
@ -157,7 +157,7 @@ class Server {
// initialize http server // initialize http server
await this.http_instance.listen(this.params.listen_port, this.params.listen_ip ?? "0.0.0.0", () => { await this.http_instance.listen(this.params.listen_port, this.params.listen_ip ?? "0.0.0.0", () => {
InternalConsole.info(`✅ Server ready on => ${this.params.listen_ip}:${this.params.listen_port}`) this.InternalConsole.info(`✅ Server ready on => ${this.params.listen_ip}:${this.params.listen_port}`)
if (!this.params.minimal) { if (!this.params.minimal) {
this.outputServerInfo() this.outputServerInfo()
@ -194,7 +194,7 @@ class Server {
} }
if (controller.disabled) { if (controller.disabled) {
InternalConsole.warn(`⏩ Controller [${controller.name}] is disabled! Initialization skipped...`) this.InternalConsole.warn(`⏩ Controller [${controller.name}] is disabled! Initialization skipped...`)
continue continue
} }
@ -214,11 +214,7 @@ class Server {
}) })
} catch (error) { } catch (error) {
if (!global.silentOutputServerErrors) { if (!global.silentOutputServerErrors) {
outputServerError({ this.InternalConsole.error(`\n\x1b[41m\x1b[37m🆘 [${controller.refName ?? controller.name}] Controller initialization failed:\x1b[0m ${error.stack} \n`)
message: "Controller initialization failed:",
description: error.stack,
ref: controller.refName ?? controller.name,
})
} }
} }
} }
@ -278,7 +274,7 @@ class Server {
registerBaseEndpoints() { registerBaseEndpoints() {
if (this.params.disableBaseEndpoint) { if (this.params.disableBaseEndpoint) {
InternalConsole.warn("‼️ [disableBaseEndpoint] Base endpoint is disabled! Endpoints mapping will not be available, so linebridge client bridges will not work! ‼️") this.InternalConsole.warn("‼️ [disableBaseEndpoint] Base endpoint is disabled! Endpoints mapping will not be available, so linebridge client bridges will not work! ‼️")
return false return false
} }
@ -325,7 +321,7 @@ class Server {
cleanupProcess = () => { cleanupProcess = () => {
InternalConsole.log("🛑 Stopping server...") this.InternalConsole.log("🛑 Stopping server...")
if (typeof this.engine_instance.close === "function") { if (typeof this.engine_instance.close === "function") {
this.engine_instance.close() this.engine_instance.close()
@ -408,7 +404,7 @@ class Server {
// public methods // public methods
outputServerInfo = () => { outputServerInfo = () => {
InternalConsole.table({ this.InternalConsole.table({
"linebridge_version": LINEBRIDGE_SERVER_VERSION, "linebridge_version": LINEBRIDGE_SERVER_VERSION,
"engine": this.params.engine, "engine": this.params.engine,
"http_address": this.params.http_address, "http_address": this.params.http_address,