diff --git a/bundle/package-lock.json b/bundle/package-lock.json index aaa0c1ee..220c9177 100644 Binary files a/bundle/package-lock.json and b/bundle/package-lock.json differ diff --git a/bundle/package.json b/bundle/package.json index fa6fe669..bd6080c9 100644 --- a/bundle/package.json +++ b/bundle/package.json @@ -38,7 +38,7 @@ "@types/mongoose-autopopulate": "^0.10.1", "@types/mongoose-lean-virtuals": "^0.5.1", "@types/multer": "^1.4.5", - "@types/node": "^14.17.9", + "@types/node": "^14.17.20", "@types/node-fetch": "^2.5.7", "@types/node-os-utils": "^1.2.0", "@types/uuid": "^8.3.0", @@ -54,6 +54,7 @@ "@fosscord/gateway": "file:../gateway", "@fosscord/util": "file:../util", "async-exit-hook": "^2.0.1", + "chalk": "^4.1.2", "express": "^4.17.1", "missing-native-js-functions": "^1.2.15", "node-os-utils": "^1.3.5", diff --git a/bundle/src/Server.ts b/bundle/src/Server.ts index 3a56ee2e..a5405fa7 100644 --- a/bundle/src/Server.ts +++ b/bundle/src/Server.ts @@ -6,6 +6,7 @@ import { FosscordServer as APIServer } from "@fosscord/api"; import { Server as GatewayServer } from "@fosscord/gateway"; import { CDNServer } from "@fosscord/cdn/"; import express from "express"; +import { red, green, bold } from "chalk"; import { Config, initDatabase } from "@fosscord/util"; const app = express(); @@ -58,7 +59,7 @@ async function main() { } as any); await Promise.all([api.start(), cdn.start(), gateway.start()]); - console.log(`[Server] listening on port ${port}`); + console.log(`[Server] ${green(`listening on port ${bold(port)}`)}`); } main().catch(console.error); diff --git a/bundle/src/start.ts b/bundle/src/start.ts index f68a65bf..cc2053b9 100644 --- a/bundle/src/start.ts +++ b/bundle/src/start.ts @@ -1,10 +1,28 @@ // process.env.MONGOMS_DEBUG = "true"; import cluster from "cluster"; import os from "os"; +import { red, bold, yellow, cyan } from "chalk"; import { initStats } from "./stats"; // TODO: add tcp socket event transmission const cores = 1 || Number(process.env.threads) || os.cpus().length; +const commit = require('child_process').execSync('git rev-parse HEAD').toString().trim(); + +console.log(bold(` +███████ ██████ ███████ ███████ ██████ ██████ ██████ ██████ +██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ +█████ ██ ██ ███████ ███████ ██ ██ ██ ██████ ██ ██ +██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ +██ ██████ ███████ ███████ ██████ ██████ ██ ██ ██████ + + + fosscord-server | ${yellow(`Pre-relase (${commit.slice(0, 7)})`)} + +Current commit: ${cyan(commit)} (${yellow(commit.slice(0, 7))}) +`)) + + + if (cluster.isMaster && !process.env.masterStarted) { process.env.masterStarted = "true"; @@ -24,7 +42,7 @@ if (cluster.isMaster && !process.env.masterStarted) { cluster.on("exit", (worker: any, code: any, signal: any) => { console.log( - `[Worker] died with pid: ${worker.process.pid} , restarting ...` + `[Worker] ${red(`died with pid: ${worker.process.pid} , restarting ...`)}` ); cluster.fork(); }); diff --git a/bundle/src/stats.ts b/bundle/src/stats.ts index e6941db2..5dc69efe 100644 --- a/bundle/src/stats.ts +++ b/bundle/src/stats.ts @@ -1,5 +1,6 @@ import os from "os"; import osu from "node-os-utils"; +import {} from "chalk"; export function initStats() { console.log(`[Path] running in ${__dirname}`); diff --git a/cdn/src/util/Storage.ts b/cdn/src/util/Storage.ts index 5cf1eb80..8ae44bbb 100644 --- a/cdn/src/util/Storage.ts +++ b/cdn/src/util/Storage.ts @@ -1,6 +1,7 @@ import { FileStorage } from "./FileStorage"; import path from "path"; import fse from "fs-extra"; +import { bgCyan, black } from "chalk"; process.cwd(); export interface Storage { @@ -18,7 +19,7 @@ if (process.env.STORAGE_PROVIDER === "file" || !process.env.STORAGE_PROVIDER) { } else { location = path.join(process.cwd(), "files"); } - console.log(`[CDN] storage location: ${location}`); + console.log(`[CDN] storage location: ${bgCyan(`${black(location)}`)}`); fse.ensureDirSync(location); process.env.STORAGE_LOCATION = location; diff --git a/util/package-lock.json b/util/package-lock.json index f4129614..26321ee9 100644 Binary files a/util/package-lock.json and b/util/package-lock.json differ diff --git a/util/package.json b/util/package.json index 0e81a544..426b4e43 100644 --- a/util/package.json +++ b/util/package.json @@ -39,6 +39,7 @@ "dependencies": { "ajv": "^8.6.2", "amqplib": "^0.8.0", + "chalk": "^4.1.2", "class-validator": "^0.13.1", "dot-prop": "^6.0.1", "env-paths": "^2.2.1", diff --git a/util/src/util/Database.ts b/util/src/util/Database.ts index ab7c70c5..bf8c6fce 100644 --- a/util/src/util/Database.ts +++ b/util/src/util/Database.ts @@ -2,6 +2,7 @@ import path from "path"; import "reflect-metadata"; import { Connection, createConnection, ValueTransformer } from "typeorm"; import * as Models from "../entities"; +import { yellow, green} from "chalk"; // UUID extension option is only supported with postgres // We want to generate all id's with Snowflakes that's why we have our own BaseEntity class @@ -12,7 +13,7 @@ var dbConnection: Connection | undefined; export function initDatabase() { if (promise) return promise; // prevent initalizing multiple times - console.log("[Database] connecting ..."); + console.log(`[Database] ${yellow("connecting ...")}`); // @ts-ignore promise = createConnection({ type: "sqlite", @@ -32,7 +33,7 @@ export function initDatabase() { promise.then((connection) => { dbConnection = connection; - console.log("[Database] connected"); + console.log(`[Database] ${green("connected")}`); }); return promise;