🐛 fix server bundle

api/assets/2cbabd9369e777f06572.js

@@ -0,0 +1,2 @@
+(this.webpackJsonp=this.webpackJsonp||[]).push([[82],{7924:function(n,e,o){n.exports=function(){return new Worker(o.p+"9316137ca25a60d7180c.worker.js")}}}]);
+//# sourceMappingURL=2cbabd9369e777f06572.js.map

api/package.json

@@ -31,26 +31,26 @@
 	},
 	"homepage": "https://fosscord.com",
 	"devDependencies": {
-		"0x": "^4.10.2",
 		"@types/amqplib": "^0.8.1",
 		"@types/bcrypt": "^5.0.0",
 		"@types/express": "^4.17.9",
 		"@types/i18next-node-fs-backend": "^2.1.0",
 		"@types/jsonwebtoken": "^8.5.0",
+		"@types/mongodb": "^3.6.9",
+		"@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-fetch": "^2.5.7",
 		"@zerollup/ts-transform-paths": "^1.7.18",
-		"@types/mongodb": "^3.6.9",
+		"0x": "^4.10.2",
-		"@types/mongoose-autopopulate": "^0.10.1",
-		"@types/mongoose-lean-virtuals": "^0.5.1",
 		"caxa": "^2.1.0",
+		"image-size": "^1.0.0",
 		"jest": "^26.6.3",
 		"saslprep": "^1.0.3",
 		"ts-node": "^9.1.1",
-		"typescript": "^4.1.2",
 		"ts-node-dev": "^1.1.6",
-		"image-size": "^1.0.0"
+		"typescript": "^4.1.2"
 	},
 	"dependencies": {
 		"@fosscord/util": "file:../util",

api/src/Server.ts

@@ -69,11 +69,12 @@ export class FosscordServer extends Server {
 
 		this.routes = await this.registerRoutes(path.join(__dirname, "routes", "/"));
 
-		api.use("*", (req: Request, res: Response) => {
+		api.use("*", (req: Request, res: Response, next) => {
 			res.status(404).json({
 				message: "404: Not Found",
 				code: 0
 			});
+			next();
 		});
 
 		this.app = app;

bundle/package.json

@@ -10,6 +10,7 @@
 		"build:cdn": "cd ../cdn/ && npm run build",
 		"build:gateway": "cd ../gateway/ && npm run build",
 		"start": "npm run build && node dist/start.js",
+		"bundle": "npm run build && node dist/startBundle.js",
 		"test": "echo \"Error: no test specified\" && exit 1"
 	},
 	"repository": {
@@ -29,15 +30,15 @@
 		"@types/express": "^4.17.9",
 		"@types/i18next-node-fs-backend": "^2.1.0",
 		"@types/jsonwebtoken": "^8.5.0",
-		"@types/multer": "^1.4.5",
-		"@types/node": "^14.17.9",
-		"@types/node-fetch": "^2.5.7",
-		"@zerollup/ts-transform-paths": "^1.7.18",
 		"@types/mongodb": "^3.6.9",
 		"@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-fetch": "^2.5.7",
 		"@types/uuid": "^8.3.0",
 		"@types/ws": "^7.4.0",
+		"@zerollup/ts-transform-paths": "^1.7.18",
 		"typescript": "^4.3.5"
 	},
 	"dependencies": {
@@ -48,6 +49,6 @@
 		"async-exit-hook": "^2.0.1",
 		"express": "^4.17.1",
 		"mongodb-memory-server": "^7.3.6",
-		"node-os-utils": "^1.3.5",
+		"node-os-utils": "^1.3.5"
 	}
 }

bundle/src/BundledServer.ts

@@ -1,41 +0,0 @@
-process.on("unhandledRejection", console.error);
-process.on("uncaughtException", console.error);
-
-import http from "http";
-import { FosscordServer as APIServer } from "@fosscord/api";
-import { Server as GatewayServer } from "@fosscord/gateway";
-import { CDNServer } from "@fosscord/cdn/";
-import express from "express";
-import { Config } from "../../util/dist";
-
-const app = express();
-const server = http.createServer();
-const port = Number(process.env.PORT) || 8080;
-const production = true;
-server.on("request", app);
-
-// @ts-ignore
-const api = new APIServer({ server, port, production, app });
-// @ts-ignore
-const cdn = new CDNServer({ server, port, production, app });
-// @ts-ignore
-const gateway = new GatewayServer({ server, port, production });
-
-async function main() {
-	await Config.set({
-		cdn: {
-			endpointClient: "${location.host}",
-			endpoint: `http://localhost:${port}`,
-		},
-		gateway: {
-			endpointClient: '${location.protocol === "https:" ? "wss://" : "ws://"}${location.host}',
-			endpoint: `ws://localhost:${port}`,
-		},
-	});
-
-	await api.start();
-	await cdn.start();
-	await gateway.start();
-}
-
-main().catch(console.error);

bundle/src/Database.ts

@@ -2,7 +2,7 @@ import fs from "fs";
 import { MongoMemoryServer } from "mongodb-memory-server";
 import path from "path";
 import exitHook from "async-exit-hook";
-console.log(process.arch, process.platform);
+
 if (process.arch == "ia32") {
 	Object.defineProperty(process, "arch", {
 		value: "x64",

bundle/src/Server.ts

@@ -1,27 +1,35 @@
 process.on("unhandledRejection", console.error);
 process.on("uncaughtException", console.error);
 
+import http from "http";
 import { FosscordServer as APIServer } from "@fosscord/api";
 import { Server as GatewayServer } from "@fosscord/gateway";
 import { CDNServer } from "@fosscord/cdn/";
+import express from "express";
 import { Config } from "../../util/dist";
 
-const production = true;
+const app = express();
+const server = http.createServer();
+const port = Number(process.env.PORT) || 8080;
+const production = false;
+server.on("request", app);
 
-const api = new APIServer({ production, port: Number(process.env.API_PORT) || 3001 });
+// @ts-ignore
-const gateway = new GatewayServer({ port: Number(process.env.GATEWAY_PORT) || 3002 });
+const api = new APIServer({ server, port, production, app });
-const cdn = new CDNServer({ production, port: Number(process.env.CDN_PORT) || 3003 });
+// @ts-ignore
+const cdn = new CDNServer({ server, port, production, app });
+// @ts-ignore
+const gateway = new GatewayServer({ server, port, production });
 
 async function main() {
 	await Config.set({
 		cdn: {
 			endpointClient: "${location.host}",
-			endpoint: `http://localhost:${cdn.options.port}`,
+			endpoint: `http://localhost:${port}`,
 		},
 		gateway: {
-			endpointClient:
+			endpointClient: '${location.protocol === "https:" ? "wss://" : "ws://"}${location.host}',
-				'${location.protocol === "https:" ? "wss://" : "ws://"}${location.hostname}:' + gateway.port,
+			endpoint: `ws://localhost:${port}`,
-			endpoint: `ws://localhost:${gateway.port}`,
 		},
 	});
 

bundle/src/stats.ts

@@ -18,5 +18,5 @@ export function initStats() {
 				process.memoryUsage().rss / 1024 / 1024
 			)}mb/${memory.totalMemMb.toFixed(0)}mb`
 		);
-	}, 1000 * 60);
+	}, 1000 * 30);
 }

cdn/package-lock.json

@@ -10,15 +10,6 @@
 			"license": "ISC",
 			"dependencies": {
 				"@fosscord/util": "file:../util",
-				"@types/body-parser": "^1.19.0",
-				"@types/btoa": "^1.2.3",
-				"@types/dotenv": "^8.2.0",
-				"@types/express": "^4.17.12",
-				"@types/fs-extra": "^9.0.12",
-				"@types/multer": "^1.4.7",
-				"@types/node": "^14.17.0",
-				"@types/node-fetch": "^2.5.7",
-				"@types/uuid": "^8.3.0",
 				"body-parser": "^1.19.0",
 				"btoa": "^1.2.1",
 				"cheerio": "^1.0.0-rc.5",
@@ -36,6 +27,22 @@
 				"node-fetch": "^2.6.1",
 				"typescript": "^4.1.2",
 				"uuid": "^8.3.2"
+			},
+			"devDependencies": {
+				"@types/amqplib": "^0.8.1",
+				"@types/body-parser": "^1.19.0",
+				"@types/btoa": "^1.2.3",
+				"@types/dotenv": "^8.2.0",
+				"@types/express": "^4.17.12",
+				"@types/fs-extra": "^9.0.12",
+				"@types/jsonwebtoken": "^8.5.0",
+				"@types/mongodb": "^3.6.9",
+				"@types/mongoose-autopopulate": "^0.10.1",
+				"@types/mongoose-lean-virtuals": "^0.5.1",
+				"@types/multer": "^1.4.7",
+				"@types/node": "^14.17.0",
+				"@types/node-fetch": "^2.5.7",
+				"@types/uuid": "^8.3.0"
 			}
 		},
 		"../util": {
@@ -44,13 +51,6 @@
 			"hasInstallScript": true,
 			"license": "GPLV3",
 			"dependencies": {
-				"@types/amqplib": "^0.8.1",
-				"@types/jsonwebtoken": "^8.5.0",
-				"@types/mongodb": "^3.6.9",
-				"@types/mongoose-autopopulate": "^0.10.1",
-				"@types/mongoose-lean-virtuals": "^0.5.1",
-				"@types/node": "^14.17.9",
-				"@types/node-fetch": "^2.5.12",
 				"ajv": "^8.5.0",
 				"amqplib": "^0.8.0",
 				"dot-prop": "^6.0.1",
@@ -62,11 +62,21 @@
 				"mongoose-autopopulate": "^0.12.3",
 				"node-fetch": "^2.6.1",
 				"typescript": "^4.1.3"
+			},
+			"devDependencies": {
+				"@types/amqplib": "^0.8.1",
+				"@types/jsonwebtoken": "^8.5.0",
+				"@types/mongodb": "^3.6.9",
+				"@types/mongoose-autopopulate": "^0.10.1",
+				"@types/mongoose-lean-virtuals": "^0.5.1",
+				"@types/node": "^14.17.9",
+				"@types/node-fetch": "^2.5.12"
 			}
 		},
 		"../util/node_modules/@types/amqplib": {
 			"version": "0.8.1",
 			"integrity": "sha512-8dCjF+dHZ8Y6JOoHD1BMnxP0quAncvZq4wA/lS072NjX9vIzVRSMcmfKy2Os8ZQ8VWWp74MD09GMbVbKS6/Fxw==",
+			"dev": true,
 			"dependencies": {
 				"@types/bluebird": "*",
 				"@types/node": "*"
@@ -74,7 +84,8 @@
 		},
 		"../util/node_modules/@types/bluebird": {
 			"version": "3.5.36",
-			"integrity": "sha512-HBNx4lhkxN7bx6P0++W8E289foSu8kO8GCk2unhuVggO+cE7rh9DhZUyPhUxNRG9m+5B5BTKxZQ5ZP92x/mx9Q=="
+			"integrity": "sha512-HBNx4lhkxN7bx6P0++W8E289foSu8kO8GCk2unhuVggO+cE7rh9DhZUyPhUxNRG9m+5B5BTKxZQ5ZP92x/mx9Q==",
+			"dev": true
 		},
 		"../util/node_modules/@types/bson": {
 			"version": "4.0.5",
@@ -86,6 +97,7 @@
 		"../util/node_modules/@types/jsonwebtoken": {
 			"version": "8.5.4",
 			"integrity": "sha512-4L8msWK31oXwdtC81RmRBAULd0ShnAHjBuKT9MRQpjP0piNrZdXyTRcKY9/UIfhGeKIT4PvF5amOOUbbT/9Wpg==",
+			"dev": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
@@ -101,6 +113,7 @@
 		"../util/node_modules/@types/mongoose": {
 			"version": "5.10.5",
 			"integrity": "sha512-37QMIA954T3n+HSksSNLlxZsqF8fMJu5S4dyPBod6gRxGtsXlQ9jUtL8BE8Seimv99u79eLXI3bggoCnSQ/fxQ==",
+			"dev": true,
 			"dependencies": {
 				"@types/mongodb": "*",
 				"@types/node": "*"
@@ -109,6 +122,7 @@
 		"../util/node_modules/@types/mongoose-autopopulate": {
 			"version": "0.10.2",
 			"integrity": "sha512-YSxSEhszXK9E+7VRLdpYjkXqcRXOPFtG0xZea9n7A+oaHhZ1lSVBm/WvK2Rr746NPrTm/k1tR6uezyG6kyinyg==",
+			"dev": true,
 			"dependencies": {
 				"@types/mongoose": "5.10.5"
 			}
@@ -116,6 +130,7 @@
 		"../util/node_modules/@types/mongoose-lean-virtuals": {
 			"version": "0.5.2",
 			"integrity": "sha512-TpAX2RkFXLtNjyciiYxdvYpVuCAv/g1alFTl4ErJWvSOA+DuNDNvfXSH3c8/DXC1ZBzO47TCwHaxI/PET4sqxQ==",
+			"dev": true,
 			"dependencies": {
 				"@types/mongoose": "5.10.5"
 			}
@@ -657,9 +672,26 @@
 			"version": "0.3.0",
 			"integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="
 		},
+		"node_modules/@types/amqplib": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/@types/amqplib/-/amqplib-0.8.1.tgz",
+			"integrity": "sha512-8dCjF+dHZ8Y6JOoHD1BMnxP0quAncvZq4wA/lS072NjX9vIzVRSMcmfKy2Os8ZQ8VWWp74MD09GMbVbKS6/Fxw==",
+			"dev": true,
+			"dependencies": {
+				"@types/bluebird": "*",
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/bluebird": {
+			"version": "3.5.36",
+			"resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.36.tgz",
+			"integrity": "sha512-HBNx4lhkxN7bx6P0++W8E289foSu8kO8GCk2unhuVggO+cE7rh9DhZUyPhUxNRG9m+5B5BTKxZQ5ZP92x/mx9Q==",
+			"dev": true
+		},
 		"node_modules/@types/body-parser": {
 			"version": "1.19.1",
 			"integrity": "sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg==",
+			"dev": true,
 			"dependencies": {
 				"@types/connect": "*",
 				"@types/node": "*"
@@ -675,6 +707,7 @@
 		"node_modules/@types/btoa": {
 			"version": "1.2.3",
 			"integrity": "sha512-ANNCZICS/ofxhzUl8V1DniBJs+sFQ+Yg5am1ZwVEf/sxoKY/J2+h5Fuw3xUErlZ7eJLdgzukBjZwnsV6+/2Rmg==",
+			"dev": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
@@ -686,6 +719,7 @@
 		"node_modules/@types/connect": {
 			"version": "3.4.35",
 			"integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
+			"dev": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
@@ -694,6 +728,7 @@
 			"version": "8.2.0",
 			"integrity": "sha512-ylSC9GhfRH7m1EUXBXofhgx4lUWmFeQDINW5oLuS+gxWdfUeW4zJdeVTYVkexEW+e2VUvlZR2kGnGGipAWR7kw==",
 			"deprecated": "This is a stub types definition. dotenv provides its own type definitions, so you do not need this installed.",
+			"dev": true,
 			"dependencies": {
 				"dotenv": "*"
 			}
@@ -701,6 +736,7 @@
 		"node_modules/@types/express": {
 			"version": "4.17.13",
 			"integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
+			"dev": true,
 			"dependencies": {
 				"@types/body-parser": "*",
 				"@types/express-serve-static-core": "^4.17.18",
@@ -711,6 +747,7 @@
 		"node_modules/@types/express-serve-static-core": {
 			"version": "4.17.24",
 			"integrity": "sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA==",
+			"dev": true,
 			"dependencies": {
 				"@types/node": "*",
 				"@types/qs": "*",
@@ -720,13 +757,24 @@
 		"node_modules/@types/fs-extra": {
 			"version": "9.0.12",
 			"integrity": "sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/jsonwebtoken": {
+			"version": "8.5.4",
+			"resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.4.tgz",
+			"integrity": "sha512-4L8msWK31oXwdtC81RmRBAULd0ShnAHjBuKT9MRQpjP0piNrZdXyTRcKY9/UIfhGeKIT4PvF5amOOUbbT/9Wpg==",
+			"dev": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/mime": {
 			"version": "1.3.2",
-			"integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
+			"integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
+			"dev": true
 		},
 		"node_modules/@types/mocha": {
 			"version": "8.2.3",
@@ -740,9 +788,38 @@
 				"@types/node": "*"
 			}
 		},
+		"node_modules/@types/mongoose": {
+			"version": "5.10.5",
+			"resolved": "https://registry.npmjs.org/@types/mongoose/-/mongoose-5.10.5.tgz",
+			"integrity": "sha512-37QMIA954T3n+HSksSNLlxZsqF8fMJu5S4dyPBod6gRxGtsXlQ9jUtL8BE8Seimv99u79eLXI3bggoCnSQ/fxQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/mongodb": "*",
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/mongoose-autopopulate": {
+			"version": "0.10.2",
+			"resolved": "https://registry.npmjs.org/@types/mongoose-autopopulate/-/mongoose-autopopulate-0.10.2.tgz",
+			"integrity": "sha512-YSxSEhszXK9E+7VRLdpYjkXqcRXOPFtG0xZea9n7A+oaHhZ1lSVBm/WvK2Rr746NPrTm/k1tR6uezyG6kyinyg==",
+			"dev": true,
+			"dependencies": {
+				"@types/mongoose": "5.10.5"
+			}
+		},
+		"node_modules/@types/mongoose-lean-virtuals": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/@types/mongoose-lean-virtuals/-/mongoose-lean-virtuals-0.5.2.tgz",
+			"integrity": "sha512-TpAX2RkFXLtNjyciiYxdvYpVuCAv/g1alFTl4ErJWvSOA+DuNDNvfXSH3c8/DXC1ZBzO47TCwHaxI/PET4sqxQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/mongoose": "5.10.5"
+			}
+		},
 		"node_modules/@types/multer": {
 			"version": "1.4.7",
 			"integrity": "sha512-/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA==",
+			"dev": true,
 			"dependencies": {
 				"@types/express": "*"
 			}
@@ -754,6 +831,7 @@
 		"node_modules/@types/node-fetch": {
 			"version": "2.5.12",
 			"integrity": "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==",
+			"dev": true,
 			"dependencies": {
 				"@types/node": "*",
 				"form-data": "^3.0.0"
@@ -761,15 +839,18 @@
 		},
 		"node_modules/@types/qs": {
 			"version": "6.9.7",
-			"integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="
+			"integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
+			"dev": true
 		},
 		"node_modules/@types/range-parser": {
 			"version": "1.2.4",
-			"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
+			"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
+			"dev": true
 		},
 		"node_modules/@types/serve-static": {
 			"version": "1.13.10",
 			"integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
+			"dev": true,
 			"dependencies": {
 				"@types/mime": "^1",
 				"@types/node": "*"
@@ -784,7 +865,8 @@
 		},
 		"node_modules/@types/uuid": {
 			"version": "8.3.1",
-			"integrity": "sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg=="
+			"integrity": "sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg==",
+			"dev": true
 		},
 		"node_modules/accepts": {
 			"version": "1.3.7",
@@ -820,7 +902,8 @@
 		},
 		"node_modules/asynckit": {
 			"version": "0.4.0",
-			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+			"dev": true
 		},
 		"node_modules/bl": {
 			"version": "2.2.1",
@@ -978,6 +1061,7 @@
 		"node_modules/combined-stream": {
 			"version": "1.0.8",
 			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+			"dev": true,
 			"dependencies": {
 				"delayed-stream": "~1.0.0"
 			},
@@ -1064,6 +1148,7 @@
 		"node_modules/delayed-stream": {
 			"version": "1.0.0",
 			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+			"dev": true,
 			"engines": {
 				"node": ">=0.4.0"
 			}
@@ -1291,6 +1376,7 @@
 		"node_modules/form-data": {
 			"version": "3.0.1",
 			"integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+			"dev": true,
 			"dependencies": {
 				"asynckit": "^0.4.0",
 				"combined-stream": "^1.0.8",
@@ -2124,6 +2210,7 @@
 				"@types/amqplib": {
 					"version": "0.8.1",
 					"integrity": "sha512-8dCjF+dHZ8Y6JOoHD1BMnxP0quAncvZq4wA/lS072NjX9vIzVRSMcmfKy2Os8ZQ8VWWp74MD09GMbVbKS6/Fxw==",
+					"dev": true,
 					"requires": {
 						"@types/bluebird": "*",
 						"@types/node": "*"
@@ -2131,7 +2218,8 @@
 				},
 				"@types/bluebird": {
 					"version": "3.5.36",
-					"integrity": "sha512-HBNx4lhkxN7bx6P0++W8E289foSu8kO8GCk2unhuVggO+cE7rh9DhZUyPhUxNRG9m+5B5BTKxZQ5ZP92x/mx9Q=="
+					"integrity": "sha512-HBNx4lhkxN7bx6P0++W8E289foSu8kO8GCk2unhuVggO+cE7rh9DhZUyPhUxNRG9m+5B5BTKxZQ5ZP92x/mx9Q==",
+					"dev": true
 				},
 				"@types/bson": {
 					"version": "4.0.5",
@@ -2143,6 +2231,7 @@
 				"@types/jsonwebtoken": {
 					"version": "8.5.4",
 					"integrity": "sha512-4L8msWK31oXwdtC81RmRBAULd0ShnAHjBuKT9MRQpjP0piNrZdXyTRcKY9/UIfhGeKIT4PvF5amOOUbbT/9Wpg==",
+					"dev": true,
 					"requires": {
 						"@types/node": "*"
 					}
@@ -2158,6 +2247,7 @@
 				"@types/mongoose": {
 					"version": "5.10.5",
 					"integrity": "sha512-37QMIA954T3n+HSksSNLlxZsqF8fMJu5S4dyPBod6gRxGtsXlQ9jUtL8BE8Seimv99u79eLXI3bggoCnSQ/fxQ==",
+					"dev": true,
 					"requires": {
 						"@types/mongodb": "*",
 						"@types/node": "*"
@@ -2166,6 +2256,7 @@
 				"@types/mongoose-autopopulate": {
 					"version": "0.10.2",
 					"integrity": "sha512-YSxSEhszXK9E+7VRLdpYjkXqcRXOPFtG0xZea9n7A+oaHhZ1lSVBm/WvK2Rr746NPrTm/k1tR6uezyG6kyinyg==",
+					"dev": true,
 					"requires": {
 						"@types/mongoose": "5.10.5"
 					}
@@ -2173,6 +2264,7 @@
 				"@types/mongoose-lean-virtuals": {
 					"version": "0.5.2",
 					"integrity": "sha512-TpAX2RkFXLtNjyciiYxdvYpVuCAv/g1alFTl4ErJWvSOA+DuNDNvfXSH3c8/DXC1ZBzO47TCwHaxI/PET4sqxQ==",
+					"dev": true,
 					"requires": {
 						"@types/mongoose": "5.10.5"
 					}
@@ -2610,9 +2702,26 @@
 			"version": "0.3.0",
 			"integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="
 		},
+		"@types/amqplib": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/@types/amqplib/-/amqplib-0.8.1.tgz",
+			"integrity": "sha512-8dCjF+dHZ8Y6JOoHD1BMnxP0quAncvZq4wA/lS072NjX9vIzVRSMcmfKy2Os8ZQ8VWWp74MD09GMbVbKS6/Fxw==",
+			"dev": true,
+			"requires": {
+				"@types/bluebird": "*",
+				"@types/node": "*"
+			}
+		},
+		"@types/bluebird": {
+			"version": "3.5.36",
+			"resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.36.tgz",
+			"integrity": "sha512-HBNx4lhkxN7bx6P0++W8E289foSu8kO8GCk2unhuVggO+cE7rh9DhZUyPhUxNRG9m+5B5BTKxZQ5ZP92x/mx9Q==",
+			"dev": true
+		},
 		"@types/body-parser": {
 			"version": "1.19.1",
 			"integrity": "sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg==",
+			"dev": true,
 			"requires": {
 				"@types/connect": "*",
 				"@types/node": "*"
@@ -2628,6 +2737,7 @@
 		"@types/btoa": {
 			"version": "1.2.3",
 			"integrity": "sha512-ANNCZICS/ofxhzUl8V1DniBJs+sFQ+Yg5am1ZwVEf/sxoKY/J2+h5Fuw3xUErlZ7eJLdgzukBjZwnsV6+/2Rmg==",
+			"dev": true,
 			"requires": {
 				"@types/node": "*"
 			}
@@ -2639,6 +2749,7 @@
 		"@types/connect": {
 			"version": "3.4.35",
 			"integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
+			"dev": true,
 			"requires": {
 				"@types/node": "*"
 			}
@@ -2646,6 +2757,7 @@
 		"@types/dotenv": {
 			"version": "8.2.0",
 			"integrity": "sha512-ylSC9GhfRH7m1EUXBXofhgx4lUWmFeQDINW5oLuS+gxWdfUeW4zJdeVTYVkexEW+e2VUvlZR2kGnGGipAWR7kw==",
+			"dev": true,
 			"requires": {
 				"dotenv": "*"
 			}
@@ -2653,6 +2765,7 @@
 		"@types/express": {
 			"version": "4.17.13",
 			"integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
+			"dev": true,
 			"requires": {
 				"@types/body-parser": "*",
 				"@types/express-serve-static-core": "^4.17.18",
@@ -2663,6 +2776,7 @@
 		"@types/express-serve-static-core": {
 			"version": "4.17.24",
 			"integrity": "sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA==",
+			"dev": true,
 			"requires": {
 				"@types/node": "*",
 				"@types/qs": "*",
@@ -2672,13 +2786,24 @@
 		"@types/fs-extra": {
 			"version": "9.0.12",
 			"integrity": "sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*"
+			}
+		},
+		"@types/jsonwebtoken": {
+			"version": "8.5.4",
+			"resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.4.tgz",
+			"integrity": "sha512-4L8msWK31oXwdtC81RmRBAULd0ShnAHjBuKT9MRQpjP0piNrZdXyTRcKY9/UIfhGeKIT4PvF5amOOUbbT/9Wpg==",
+			"dev": true,
 			"requires": {
 				"@types/node": "*"
 			}
 		},
 		"@types/mime": {
 			"version": "1.3.2",
-			"integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
+			"integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
+			"dev": true
 		},
 		"@types/mocha": {
 			"version": "8.2.3",
@@ -2692,9 +2817,38 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/mongoose": {
+			"version": "5.10.5",
+			"resolved": "https://registry.npmjs.org/@types/mongoose/-/mongoose-5.10.5.tgz",
+			"integrity": "sha512-37QMIA954T3n+HSksSNLlxZsqF8fMJu5S4dyPBod6gRxGtsXlQ9jUtL8BE8Seimv99u79eLXI3bggoCnSQ/fxQ==",
+			"dev": true,
+			"requires": {
+				"@types/mongodb": "*",
+				"@types/node": "*"
+			}
+		},
+		"@types/mongoose-autopopulate": {
+			"version": "0.10.2",
+			"resolved": "https://registry.npmjs.org/@types/mongoose-autopopulate/-/mongoose-autopopulate-0.10.2.tgz",
+			"integrity": "sha512-YSxSEhszXK9E+7VRLdpYjkXqcRXOPFtG0xZea9n7A+oaHhZ1lSVBm/WvK2Rr746NPrTm/k1tR6uezyG6kyinyg==",
+			"dev": true,
+			"requires": {
+				"@types/mongoose": "5.10.5"
+			}
+		},
+		"@types/mongoose-lean-virtuals": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/@types/mongoose-lean-virtuals/-/mongoose-lean-virtuals-0.5.2.tgz",
+			"integrity": "sha512-TpAX2RkFXLtNjyciiYxdvYpVuCAv/g1alFTl4ErJWvSOA+DuNDNvfXSH3c8/DXC1ZBzO47TCwHaxI/PET4sqxQ==",
+			"dev": true,
+			"requires": {
+				"@types/mongoose": "5.10.5"
+			}
+		},
 		"@types/multer": {
 			"version": "1.4.7",
 			"integrity": "sha512-/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA==",
+			"dev": true,
 			"requires": {
 				"@types/express": "*"
 			}
@@ -2706,6 +2860,7 @@
 		"@types/node-fetch": {
 			"version": "2.5.12",
 			"integrity": "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==",
+			"dev": true,
 			"requires": {
 				"@types/node": "*",
 				"form-data": "^3.0.0"
@@ -2713,15 +2868,18 @@
 		},
 		"@types/qs": {
 			"version": "6.9.7",
-			"integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="
+			"integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
+			"dev": true
 		},
 		"@types/range-parser": {
 			"version": "1.2.4",
-			"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
+			"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
+			"dev": true
 		},
 		"@types/serve-static": {
 			"version": "1.13.10",
 			"integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
+			"dev": true,
 			"requires": {
 				"@types/mime": "^1",
 				"@types/node": "*"
@@ -2736,7 +2894,8 @@
 		},
 		"@types/uuid": {
 			"version": "8.3.1",
-			"integrity": "sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg=="
+			"integrity": "sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg==",
+			"dev": true
 		},
 		"accepts": {
 			"version": "1.3.7",
@@ -2763,7 +2922,8 @@
 		},
 		"asynckit": {
 			"version": "0.4.0",
-			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+			"dev": true
 		},
 		"bl": {
 			"version": "2.2.1",
@@ -2887,6 +3047,7 @@
 		"combined-stream": {
 			"version": "1.0.8",
 			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+			"dev": true,
 			"requires": {
 				"delayed-stream": "~1.0.0"
 			}
@@ -2948,7 +3109,8 @@
 		},
 		"delayed-stream": {
 			"version": "1.0.0",
-			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+			"dev": true
 		},
 		"denque": {
 			"version": "1.5.0",
@@ -3119,6 +3281,7 @@
 		"form-data": {
 			"version": "3.0.1",
 			"integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+			"dev": true,
 			"requires": {
 				"asynckit": "^0.4.0",
 				"combined-stream": "^1.0.8",

cdn/package.json

@@ -21,20 +21,20 @@
 	},
 	"homepage": "https://github.com/discord-open-source/discord-cdn#readme",
 	"devDependencies": {
+		"@types/amqplib": "^0.8.1",
 		"@types/body-parser": "^1.19.0",
 		"@types/btoa": "^1.2.3",
 		"@types/dotenv": "^8.2.0",
 		"@types/express": "^4.17.12",
 		"@types/fs-extra": "^9.0.12",
-		"@types/multer": "^1.4.7",
-		"@types/node": "^14.17.0",
-		"@types/node-fetch": "^2.5.7",
-		"@types/uuid": "^8.3.0",
-		"@types/amqplib": "^0.8.1",
 		"@types/jsonwebtoken": "^8.5.0",
 		"@types/mongodb": "^3.6.9",
 		"@types/mongoose-autopopulate": "^0.10.1",
-		"@types/mongoose-lean-virtuals": "^0.5.1"
+		"@types/mongoose-lean-virtuals": "^0.5.1",
+		"@types/multer": "^1.4.7",
+		"@types/node": "^14.17.0",
+		"@types/node-fetch": "^2.5.7",
+		"@types/uuid": "^8.3.0"
 	},
 	"dependencies": {
 		"@fosscord/util": "file:../util",

gateway/package.json

@@ -15,13 +15,13 @@
 	"devDependencies": {
 		"@types/amqplib": "^0.8.1",
 		"@types/jsonwebtoken": "^8.5.0",
-		"@types/mongoose-autopopulate": "^0.10.1",
-		"@types/uuid": "^8.3.0",
-		"@types/ws": "^7.4.0",
 		"@types/mongodb": "^3.6.9",
+		"@types/mongoose-autopopulate": "^0.10.1",
 		"@types/mongoose-lean-virtuals": "^0.5.1",
 		"@types/node": "^14.17.9",
 		"@types/node-fetch": "^2.5.12",
+		"@types/uuid": "^8.3.0",
+		"@types/ws": "^7.4.0",
 		"ts-node-dev": "^1.1.6",
 		"typescript": "^4.2.3"
 	},