summary refs log tree commit diff
path: root/bundle
diff options
context:
space:
mode:
authorFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-10-18 17:38:31 +0200
committerFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-10-18 17:38:31 +0200
commit45efdb7ce488f160c961e881d2ae3e598426d7f8 (patch)
tree6fdda55c144d2c768618fcccb2579ca89d26e1c1 /bundle
parentRevert "fix: make the CDN build correctly" (diff)
downloadserver-45efdb7ce488f160c961e881d2ae3e598426d7f8.tar.xz
:zap: vertically scale bundle
Diffstat (limited to 'bundle')
-rw-r--r--bundle/src/Server.ts3
-rw-r--r--bundle/src/start.ts65
2 files changed, 39 insertions, 29 deletions
diff --git a/bundle/src/Server.ts b/bundle/src/Server.ts
index d541735f..f29cd649 100644
--- a/bundle/src/Server.ts
+++ b/bundle/src/Server.ts
@@ -12,7 +12,7 @@ import { Config, initDatabase } from "@fosscord/util";
 const app = express();
 const server = http.createServer();
 const port = Number(process.env.PORT) || 3001;
-const production = false;
+const production = true;
 server.on("request", app);
 
 // @ts-ignore
@@ -23,6 +23,7 @@ const cdn = new CDNServer({ server, port, production, app });
 const gateway = new Gateway.Server({ server, port, production });
 
 async function main() {
+	server.listen(port);
 	await initDatabase();
 	await Config.init();
 	// only set endpointPublic, if not already set
diff --git a/bundle/src/start.ts b/bundle/src/start.ts
index 8e7c3129..ee914b8b 100644
--- a/bundle/src/start.ts
+++ b/bundle/src/start.ts
@@ -1,6 +1,6 @@
 // process.env.MONGOMS_DEBUG = "true";
 import "reflect-metadata";
-import cluster from "cluster";
+import cluster, { Worker } from "cluster";
 import os from "os";
 import { red, bold, yellow, cyan } from "nanocolors";
 import { initStats } from "./stats";
@@ -8,20 +8,21 @@ 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;
+// TODO: add socket event transmission
+let cores = Number(process.env.THREADS) || os.cpus().length;
 
-function getCommitOrFail() {
-	try {
-		return execSync("git rev-parse HEAD").toString().trim();
-	} catch (e) {
-		return null;
+if (cluster.isMaster) {
+	function getCommitOrFail() {
+		try {
+			return execSync("git rev-parse HEAD").toString().trim();
+		} catch (e) {
+			return null;
+		}
 	}
-}
-const commit = getCommitOrFail();
+	const commit = getCommitOrFail();
 
-console.log(
-	bold(`
+	console.log(
+		bold(`
 ███████╗ ██████╗ ███████╗███████╗ ██████╗ ██████╗ ██████╗ ██████╗
 ██╔════╝██╔═══██╗██╔════╝██╔════╝██╔════╝██╔═══██╗██╔══██╗██╔══██╗
 █████╗  ██║   ██║███████╗███████╗██║     ██║   ██║██████╔╝██║  ██║
@@ -38,32 +39,40 @@ console.log(
 		)}
 
 Current commit: ${
-		commit !== null
-			? `${cyan(commit)} (${yellow(commit.slice(0, 7))})`
-			: "Unknown (Git cannot be found)"
-	}
+			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 (commit == null) {
+		console.log(yellow(`Warning: Git is not installed or not in PATH.`));
+	}
 
-if (cluster.isMaster && !process.env.masterStarted) {
-	process.env.masterStarted = "true";
+	initStats();
 
-	(async () => {
-		initStats();
+	console.log(`[Process] starting with ${cores} threads`);
 
-		if (cores === 1) {
-			require("./Server");
-			return;
-		}
+	if (cores === 1) {
+		require("./Server");
+	} else {
+		process.env.EVENT_TRANSMISSION = "process";
 
 		// Fork workers.
 		for (let i = 0; i < cores; i++) {
 			cluster.fork();
+			console.log(`[Process] worker ${i} started.`);
 		}
 
+		cluster.on("message", (sender: Worker, message: any) => {
+			for (const id in cluster.workers) {
+				const worker = cluster.workers[id];
+				if (worker === sender || !worker) continue;
+				worker.send(message);
+			}
+		});
+
 		cluster.on("exit", (worker: any, code: any, signal: any) => {
 			console.log(
 				`[Worker] ${red(
@@ -72,7 +81,7 @@ if (cluster.isMaster && !process.env.masterStarted) {
 			);
 			cluster.fork();
 		});
-	})();
+	}
 } else {
 	require("./Server");
 }