diff --git a/api/package-lock.json b/api/package-lock.json index 53088d5d..1633a945 100644 --- a/api/package-lock.json +++ b/api/package-lock.json @@ -93,6 +93,7 @@ "lambert-server": "^1.2.10", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.3", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "patch-package": "^6.4.7", "pg": "^8.7.1", @@ -17292,6 +17293,7 @@ "lambert-server": "^1.2.10", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.3", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "patch-package": "^6.4.7", "pg": "^8.7.1", diff --git a/bundle/package-lock.json b/bundle/package-lock.json index 090935f4..53bfdf1c 100644 --- a/bundle/package-lock.json +++ b/bundle/package-lock.json @@ -18,6 +18,7 @@ "dotenv": "^10.0.0", "express": "^4.17.1", "missing-native-js-functions": "^1.2.15", + "nanocolors": "^0.2.12", "node-os-utils": "^1.3.5", "tsconfig-paths": "^3.11.0" }, @@ -32,7 +33,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", @@ -139,6 +140,7 @@ "lambert-server": "^1.2.8", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.2", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "supertest": "^6.1.6", "typescript": "^4.1.2", @@ -216,6 +218,7 @@ "lambert-server": "^1.2.10", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.3", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "patch-package": "^6.4.7", "pg": "^8.7.1", @@ -469,9 +472,9 @@ } }, "node_modules/@types/node": { - "version": "14.17.16", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.16.tgz", - "integrity": "sha512-WiFf2izl01P1CpeY8WqFAeKWwByMueBEkND38EcN8N68qb0aDG3oIS1P5MhAX5kUdr469qRyqsY/MjanLjsFbQ==", + "version": "14.17.20", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.20.tgz", + "integrity": "sha512-gI5Sl30tmhXsqkNvopFydP7ASc4c2cLfGNQrVKN3X90ADFWFsPEsotm/8JHSUJQKTHbwowAHtcJPeyVhtKv0TQ==", "dev": true }, "node_modules/@types/node-fetch": { @@ -1265,6 +1268,11 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, + "node_modules/nanocolors": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz", + "integrity": "sha512-SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug==" + }, "node_modules/negotiator": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", @@ -1802,6 +1810,7 @@ "lambert-server": "^1.2.8", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.2", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "supertest": "^6.1.6", "ts-patch": "^1.4.4", @@ -1859,6 +1868,7 @@ "lambert-server": "^1.2.10", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.3", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "patch-package": "^6.4.7", "pg": "^8.7.1", @@ -2053,9 +2063,9 @@ } }, "@types/node": { - "version": "14.17.16", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.16.tgz", - "integrity": "sha512-WiFf2izl01P1CpeY8WqFAeKWwByMueBEkND38EcN8N68qb0aDG3oIS1P5MhAX5kUdr469qRyqsY/MjanLjsFbQ==", + "version": "14.17.20", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.20.tgz", + "integrity": "sha512-gI5Sl30tmhXsqkNvopFydP7ASc4c2cLfGNQrVKN3X90ADFWFsPEsotm/8JHSUJQKTHbwowAHtcJPeyVhtKv0TQ==", "dev": true }, "@types/node-fetch": { @@ -2657,6 +2667,11 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, + "nanocolors": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz", + "integrity": "sha512-SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug==" + }, "negotiator": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", diff --git a/bundle/package.json b/bundle/package.json index f68ff0bd..5124fcdf 100644 --- a/bundle/package.json +++ b/bundle/package.json @@ -4,7 +4,7 @@ "description": "", "main": "src/start.js", "scripts": { - "setup": "cd ../util && npm --production=false i && cd ../api && npm --production=false i && cd ../cdn && npm --production=false i && cd ../gateway && npm --production=false i && npm install", + "setup": "npm install && cd ../util && npm --production=false i && cd ../api && npm --production=false i && cd ../cdn && npm --production=false i && cd ../gateway && npm --production=false i", "build": "npm run build:util && npm run build:api && npm run build:cdn && npm run build:gateway && npm run build:bundle", "postinstall": "ts-patch install -s", "build:bundle": "npx tsc -b .", @@ -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", @@ -57,6 +57,7 @@ "dotenv": "^10.0.0", "express": "^4.17.1", "missing-native-js-functions": "^1.2.15", + "nanocolors": "^0.2.12", "node-os-utils": "^1.3.5", "tsconfig-paths": "^3.11.0" } diff --git a/bundle/src/Server.ts b/bundle/src/Server.ts index 3a56ee2e..1596d54f 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 "nanocolors"; 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 be67a122..353ebfc6 100644 --- a/bundle/src/start.ts +++ b/bundle/src/start.ts @@ -1,13 +1,52 @@ // process.env.MONGOMS_DEBUG = "true"; import cluster from "cluster"; import os from "os"; +import { red, bold, yellow, cyan } from "nanocolors"; import { initStats } from "./stats"; import { config } from "dotenv"; config(); +import { execSync } from "child_process"; // TODO: add tcp socket event transmission const cores = 1 || Number(process.env.threads) || os.cpus().length; +export function getCommitOrFail() { + try { + return execSync("git rev-parse HEAD").toString().trim(); + } catch (e) { + return null; + } +} +const commit = getCommitOrFail(); + +console.log( + bold(` +███████ ██████ ███████ ███████ ██████ ██████ ██████ ██████ +██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ +█████ ██ ██ ███████ ███████ ██ ██ ██ ██████ ██ ██ +██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ +██ ██████ ███████ ███████ ██████ ██████ ██ ██ ██████ + + + fosscord-server | ${yellow( + `Pre-relase (${ + commit !== null + ? commit.slice(0, 7) + : "Unknown (Git cannot be found)" + })` + )} + +Current commit: ${ + commit !== null + ? `${cyan(commit)} (${yellow(commit.slice(0, 7))})` + : "Unknown (Git cannot be found)" + } +`) +); + +if (commit == null) + console.log(yellow(`Warning: Git is not installed or not in PATH.`)); + if (cluster.isMaster && !process.env.masterStarted) { process.env.masterStarted = "true"; @@ -26,7 +65,9 @@ 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/cdn/package-lock.json b/cdn/package-lock.json index d0b2c50e..b8d4f924 100644 --- a/cdn/package-lock.json +++ b/cdn/package-lock.json @@ -26,6 +26,7 @@ "lambert-server": "^1.2.8", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.2", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "supertest": "^6.1.6", "typescript": "^4.1.2", @@ -65,6 +66,7 @@ "lambert-server": "^1.2.10", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.3", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "patch-package": "^6.4.7", "pg": "^8.7.1", @@ -4329,6 +4331,11 @@ "node": ">= 0.10.0" } }, + "node_modules/nanocolors": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz", + "integrity": "sha512-SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug==" + }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -6212,6 +6219,7 @@ "lambert-server": "^1.2.10", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.3", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "patch-package": "^6.4.7", "pg": "^8.7.1", @@ -9006,6 +9014,11 @@ "xtend": "^4.0.0" } }, + "nanocolors": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz", + "integrity": "sha512-SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug==" + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", diff --git a/cdn/package.json b/cdn/package.json index bb4603be..62c21c9a 100644 --- a/cdn/package.json +++ b/cdn/package.json @@ -56,6 +56,7 @@ "lambert-server": "^1.2.8", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.2", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "supertest": "^6.1.6", "typescript": "^4.1.2", diff --git a/cdn/src/util/Storage.ts b/cdn/src/util/Storage.ts index 5cf1eb80..91f841a6 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 "nanocolors"; 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/gateway/package-lock.json b/gateway/package-lock.json index 8ea277fe..4296feae 100644 --- a/gateway/package-lock.json +++ b/gateway/package-lock.json @@ -57,6 +57,7 @@ "lambert-server": "^1.2.10", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.3", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "patch-package": "^6.4.7", "pg": "^8.7.1", @@ -9651,6 +9652,7 @@ "lambert-server": "^1.2.10", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.3", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "patch-package": "^6.4.7", "pg": "^8.7.1", diff --git a/util/package-lock.json b/util/package-lock.json index f4129614..d48403dd 100644 --- a/util/package-lock.json +++ b/util/package-lock.json @@ -19,6 +19,7 @@ "lambert-server": "^1.2.10", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.3", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "patch-package": "^6.4.7", "pg": "^8.7.1", @@ -4803,6 +4804,11 @@ "thenify-all": "^1.0.0" } }, + "node_modules/nanocolors": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz", + "integrity": "sha512-SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug==" + }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -11188,6 +11194,11 @@ "thenify-all": "^1.0.0" } }, + "nanocolors": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz", + "integrity": "sha512-SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug==" + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", diff --git a/util/package.json b/util/package.json index 0e81a544..3bdc04be 100644 --- a/util/package.json +++ b/util/package.json @@ -46,6 +46,7 @@ "lambert-server": "^1.2.10", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.3", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "patch-package": "^6.4.7", "pg": "^8.7.1", diff --git a/util/src/util/Database.ts b/util/src/util/Database.ts index 369a403c..5f622805 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 } from "typeorm"; import * as Models from "../entities"; +import { yellow, green } from "nanocolors"; // 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 @@ -16,7 +17,7 @@ export function initDatabase() { const type = dbConnectionString.includes(":") ? dbConnectionString.split(":")[0]?.replace("+srv", "") : "sqlite"; const isSqlite = type.includes("sqlite"); - console.log(`[Database] connecting to ${type} db`); + console.log(`[Database] ${yellow(`connecting to ${type} db`)}`); // @ts-ignore promise = createConnection({ type, @@ -34,7 +35,7 @@ export function initDatabase() { promise.then((connection) => { dbConnection = connection; - console.log("[Database] connected"); + console.log(`[Database] ${green("connected")}`); }); return promise;