From d4ddf3acf06cb2063d4c4128fcda05ba8f2c78ab Mon Sep 17 00:00:00 2001 From: uurgothat Date: Mon, 4 Oct 2021 22:01:08 +0300 Subject: [PATCH 1/4] Rainbow the logs --- bundle/package-lock.json | Bin 99567 -> 99511 bytes bundle/package.json | 3 ++- bundle/src/Server.ts | 3 ++- bundle/src/start.ts | 20 +++++++++++++++++++- bundle/src/stats.ts | 1 + cdn/src/util/Storage.ts | 3 ++- util/package-lock.json | Bin 459116 -> 459139 bytes util/package.json | 1 + util/src/util/Database.ts | 5 +++-- 9 files changed, 30 insertions(+), 6 deletions(-) diff --git a/bundle/package-lock.json b/bundle/package-lock.json index aaa0c1eee885087de403cbf3094da6476dbcd8ee..220c917706724d160eb8d4692c8666548ab2e3b3 100644 GIT binary patch delta 563 zcmaFg$+o?dZNpYZ{^X3roNOg41*JF>JwrXC$q(3+HlJsdW@0ijnEXysY4Sd9fz7fk zaYFn$T%4SoO8EsPnfZB%IWCh8Pm4)amS$&WCsw8ECgqptrxxWDBql@5GMs!cN_caN zn6nzA(ey-4Myu&I?2LSq70nbw(>+atbBqm2ax)@|3$y*o@(bK5Qv%E#gOg2?jgo!R z-2DQJ!o2;ABPv05diu z>}3QorkkiSN^M@9q`^3O%WkpFKa<}nPQJNTdNSuB+0FWGwbo$87Y_QX%HsB{o`K%v zhujvMeV=cUr?-EnJ8(0yPhQQ<3-;*btG3UlJ1{azPVUp?n(T0#eex?irO69^uy42F zWDMq;E~U>XG-0e427%dqgOkh}WGH&-(XN;BIzRQI%$p|8BSI)SR F7XS;rzwrP7 delta 459 zcmdnq$@adJZNpZ^$vYlPP5${@Z?g!~TgJ)jM3pB82nlR9Wr-8od`HYjjmgk#@HUEGcHJ%bGcOnoyPBTTbHQ;JN?EDM7w3yUN5eX|nte6ot&k^(0isvB&U zu-hd#Ik#G6`blv{*~u$bD{fW^*eNi1Za3fL4Mt*{KPK#DoSYL2=1kX7W0cx_CrN{G zdZ|654sEs8lh1wPn7lzwW;$Crqr~Qy2hCL{ z_p<11E`7d5o_?NdRFau|{}cOm9uCIU{FAe*1*RLYFbZu4dXtTJ^6YLX_n``-CFA6% w?@HT&p5uggY`dL0V~FhJ7A48a4sGwZceyfV8BRX)iEFaK4T { 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 f412961430c0fff63d0f6f363743b7c9e0762666..26321ee9abcb1ba3f7adbd7747b5fe31b1bcd99e 100644 GIT binary patch delta 49 wcmaFUB-7k1vq6P%vUMFdv!R|*vovG7G$RNz0WmWWvj8zG5VK8}W@HZp07_K~{r~^~ delta 41 ocmZo}mU+`8vq6Qi*_yH4nh}JVfS4JGS%8=oh}ouFGqQUC0QTq#3IG5A 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; From 4ea441ca1d7d96e6f9b9fff6b379a48d98bb6ed0 Mon Sep 17 00:00:00 2001 From: uurgothat Date: Mon, 4 Oct 2021 22:31:12 +0300 Subject: [PATCH 2/4] Add warn for git + remove unnecessary import --- bundle/src/start.ts | 19 ++++++++++++++----- bundle/src/stats.ts | 1 - 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/bundle/src/start.ts b/bundle/src/start.ts index cc2053b9..85e15346 100644 --- a/bundle/src/start.ts +++ b/bundle/src/start.ts @@ -3,10 +3,20 @@ import cluster from "cluster"; import os from "os"; import { red, bold, yellow, cyan } from "chalk"; import { initStats } from "./stats"; +import { execSync } from "child_process"; // 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(); + +export function getCommitOrFail() { + try { + return execSync('git rev-parse HEAD').toString().trim(); + } catch(e) { + return null + } +} +const commit = getCommitOrFail() + console.log(bold(` ███████ ██████ ███████ ███████ ██████ ██████ ██████ ██████ @@ -16,13 +26,12 @@ console.log(bold(` ██ ██████ ███████ ███████ ██████ ██████ ██ ██ ██████ - fosscord-server | ${yellow(`Pre-relase (${commit.slice(0, 7)})`)} + fosscord-server | ${yellow(`Pre-relase (${commit !== null ? commit.slice(0, 7) : "Unknown (Git cannot be found)"})`)} -Current commit: ${cyan(commit)} (${yellow(commit.slice(0, 7))}) +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"; diff --git a/bundle/src/stats.ts b/bundle/src/stats.ts index 5dc69efe..e6941db2 100644 --- a/bundle/src/stats.ts +++ b/bundle/src/stats.ts @@ -1,6 +1,5 @@ import os from "os"; import osu from "node-os-utils"; -import {} from "chalk"; export function initStats() { console.log(`[Path] running in ${__dirname}`); From 1882beef0cacc3e25acd2cc6d0deeec27e3dfb6f Mon Sep 17 00:00:00 2001 From: uurgothat Date: Mon, 4 Oct 2021 22:39:50 +0300 Subject: [PATCH 3/4] replace chalk with nanocolors --- bundle/package-lock.json | Bin 99511 -> 100262 bytes bundle/package.json | 2 +- bundle/src/Server.ts | 2 +- bundle/src/start.ts | 2 +- cdn/package-lock.json | Bin 361944 -> 362526 bytes cdn/package.json | 1 + cdn/src/util/Storage.ts | 2 +- util/package-lock.json | Bin 459139 -> 459640 bytes util/package.json | 2 +- util/src/util/Database.ts | 2 +- 10 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bundle/package-lock.json b/bundle/package-lock.json index 220c917706724d160eb8d4692c8666548ab2e3b3..c06ab5ee5358a01d250c65da4a15517ef90c8db9 100644 GIT binary patch delta 589 zcmdnq$+oPYZNpZ^$vYlPP5${@Pc$zvFF!dyC%>pz$x1;f&Opyd&(LTy4^xqtFcz7~ zi~_2YA8^QT-XS4nJ~_8qW%@~RM%l?LRx55+3D_wxd2Tn~AuCyH(E}W1s*>0!K7$Q5lMM-k9L)-i9U9OClV&sKJ dIBi11cKh~dMqBC0XFhRFHn<_N9T*lHc>z@b)6oC` delta 201 zcmZ41&$hjjZNpZ^$!(|j7>y70ZG*hP7=4Wp>7&ot!^f8;vGf!l*WWaX; zFvBEqFC&OC{g*nU)Mou;4aUiz7m97JO?js{dDao>$=!!#H*aqHE4_K$;s$xJ!mpK# z5}UIQ$7=$O%-5N2)xan;Su#L&`xHsWmpowZ_W5dzmW&W4&{$4JPA*Q)S{)#v1T>hN iaq@$ILfb917|mt2H@Gnxif>;O$7m=GQ4chIBQF5R#!LzT diff --git a/bundle/package.json b/bundle/package.json index bd6080c9..0be37a8e 100644 --- a/bundle/package.json +++ b/bundle/package.json @@ -54,9 +54,9 @@ "@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", + "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 a5405fa7..1596d54f 100644 --- a/bundle/src/Server.ts +++ b/bundle/src/Server.ts @@ -6,7 +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 { red, green, bold } from "nanocolors"; import { Config, initDatabase } from "@fosscord/util"; const app = express(); diff --git a/bundle/src/start.ts b/bundle/src/start.ts index 85e15346..d0686c13 100644 --- a/bundle/src/start.ts +++ b/bundle/src/start.ts @@ -1,7 +1,7 @@ // process.env.MONGOMS_DEBUG = "true"; import cluster from "cluster"; import os from "os"; -import { red, bold, yellow, cyan } from "chalk"; +import { red, bold, yellow, cyan } from "nanocolors"; import { initStats } from "./stats"; import { execSync } from "child_process"; diff --git a/cdn/package-lock.json b/cdn/package-lock.json index d0b2c50e0c0d69236e796640237bddcc7dc2d571..b8d4f9242be796db9df1cd0c7b6184550c3c56d2 100644 GIT binary patch delta 427 zcmcc7EjDk0*oL!AB8hqV$@w|?Ma4>13QBPXdPaJNM$^v(Fsp2S!DPvTReC#6T9C0> zlcQaegK@hi2UETSJJgiPf?}e~Ktm=QtTB|$gPX0dtB>I5f-RZ+@R&kqu$y0sqfc2? zxOP!kPE}!QMP`awYC&X5iG_z{RDO5Vo_$kt6Q?0pMjT0zKL_BUsZ`?MQ%x2 zx_d}ikaMnEj;nuRVTMydzMH#uVX&ib>2yUUMyd8`9!%S(c`(~^VD&;f&Hf=DM7OVd&Z0FB0CD7yivR!s delta 73 zcmbO?LF`7i*oL!AlcU+CH?uNZvTWB1V&-6MPUdJ&=3v~O%)ylJ(0;*_Y5N6FW?PPS cpd?TM%gJfe#lABNOn>0Xw0`^IS1i?Y0g03v6aWAK 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 8ae44bbb..91f841a6 100644 --- a/cdn/src/util/Storage.ts +++ b/cdn/src/util/Storage.ts @@ -1,7 +1,7 @@ import { FileStorage } from "./FileStorage"; import path from "path"; import fse from "fs-extra"; -import { bgCyan, black } from "chalk"; +import { bgCyan, black } from "nanocolors"; process.cwd(); export interface Storage { diff --git a/util/package-lock.json b/util/package-lock.json index 26321ee9abcb1ba3f7adbd7747b5fe31b1bcd99e..d48403dd9e88a26ec4d7fa0fde3edc5c64b7df14 100644 GIT binary patch delta 382 zcmZo}mif^pvq6P%vNhu!k;J_Gy)c0MM??R-p3lN#8e z3ML!ciZTP`r#Hl~7|Q0s_37*CBRINX1139OQV0!p^Gk8`DXR+CE(*)3Dom}&OfgF> zh)gN5@UV=^&oQrX$q!5{%FK6lOLp@!@bbtvagOw>DsimHElEpv4+#r$&UMRi^)D>U za4N`mbN4O`cJwWsURcf~)jqF@35c12m}UFCCf4UUWV$h)CT>i(wN>Kc Date: Mon, 4 Oct 2021 22:01:05 +0200 Subject: [PATCH 4/4] :arrow_up: update dependencies --- api/package-lock.json | Bin 1010210 -> 1010268 bytes bundle/package-lock.json | Bin 100262 -> 100320 bytes bundle/package.json | 2 +- gateway/package-lock.json | Bin 514788 -> 514846 bytes 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/api/package-lock.json b/api/package-lock.json index 53088d5db68182a874a3380567f35b7d7ad5eacf..1633a945b4afbe51d2c8f173d6ab4f6db4ad152a 100644 GIT binary patch delta 132 zcmZ2<#rDn>+YOVsgcI}flk;=(i;9)36qMo&^o;ZjCkwE+G@s>aKg-1k#7scU48$xz x%nHP8K+F!r9NW)wajuucWx(XKT<6+bv^as73y8Uamh&Am-S~*D>j=nfp8Je*Apql-4om<5 delta 35 qcmaFR&$g_eZG)h|@HB8hqV$@w|?Ma4>13QBPXdPaJNMw34>s!U%O$?~;XpS@k5oe_wc efS7r^K08ZF5Kb-aKrKMb3dC&N*G00MH39(Zt0BGs delta 75 zcmbQYP5#MN`3>@HlYcQvPk#}~@^x}NQ^xd$$85sWWg=LLnk_lnEjbv0m