@colyseus/tools 0.15.14 → 0.15.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/index.js +42 -11
- package/build/index.js.map +3 -3
- package/build/index.mjs +43 -12
- package/build/index.mjs.map +2 -2
- package/package.json +4 -3
- package/post-deploy.js +14 -2
package/build/index.js
CHANGED
|
@@ -35,6 +35,7 @@ var import_path = __toESM(require("path"));
|
|
|
35
35
|
var import_cors = __toESM(require("cors"));
|
|
36
36
|
var import_express = __toESM(require("express"));
|
|
37
37
|
var import_dotenv = __toESM(require("dotenv"));
|
|
38
|
+
var import_node_os_utils = __toESM(require("node-os-utils"));
|
|
38
39
|
var import_core = require("@colyseus/core");
|
|
39
40
|
var import_ws_transport = require("@colyseus/ws-transport");
|
|
40
41
|
let uWebSocketsExpressCompatibility;
|
|
@@ -47,9 +48,8 @@ function getNodeEnv() {
|
|
|
47
48
|
}
|
|
48
49
|
function getRegion() {
|
|
49
50
|
return (process.env.REGION || "unknown").toLowerCase();
|
|
50
|
-
;
|
|
51
51
|
}
|
|
52
|
-
function loadEnvFile(envFileOptions, log =
|
|
52
|
+
function loadEnvFile(envFileOptions, log = "none") {
|
|
53
53
|
const envPaths = [];
|
|
54
54
|
envFileOptions.forEach((envFilename) => {
|
|
55
55
|
envPaths.push(import_path.default.resolve(import_path.default.dirname(require?.main?.filename || process.cwd()), "..", envFilename));
|
|
@@ -58,17 +58,20 @@ function loadEnvFile(envFileOptions, log = false) {
|
|
|
58
58
|
const envPath = envPaths.find((envPath2) => import_fs.default.existsSync(envPath2));
|
|
59
59
|
if (envPath) {
|
|
60
60
|
import_dotenv.default.config({ path: envPath });
|
|
61
|
-
if (log) {
|
|
61
|
+
if (log !== "none") {
|
|
62
62
|
import_core.logger.info(`\u2705 ${import_path.default.basename(envPath)} loaded.`);
|
|
63
63
|
}
|
|
64
|
-
} else if (log) {
|
|
65
|
-
import_core.logger.info(`\
|
|
64
|
+
} else if (log === "both") {
|
|
65
|
+
import_core.logger.info(`\u2139\uFE0F optional .env file not found: ${envFileOptions.join(", ")}`);
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
68
|
if (process.env.COLYSEUS_CLOUD !== void 0) {
|
|
69
69
|
loadEnvFile([`.env.cloud`]);
|
|
70
70
|
}
|
|
71
|
-
loadEnvFile([`.env.${
|
|
71
|
+
loadEnvFile([`.env.${getNodeEnv()}`, `.env`], "both");
|
|
72
|
+
if (process.env.REGION !== void 0) {
|
|
73
|
+
loadEnvFile([`.env.${getRegion()}.${getNodeEnv()}`], "success");
|
|
74
|
+
}
|
|
72
75
|
const ALLOWED_KEYS = {
|
|
73
76
|
"displayLogs": "boolean",
|
|
74
77
|
"options": "object",
|
|
@@ -174,13 +177,41 @@ async function getTransport(options) {
|
|
|
174
177
|
app = void 0;
|
|
175
178
|
}
|
|
176
179
|
}
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
+
}
|
|
181
|
+
if (app) {
|
|
182
|
+
app.use((0, import_cors.default)());
|
|
183
|
+
app.use(import_express.default.json());
|
|
184
|
+
if (options.initializeExpress) {
|
|
180
185
|
await options.initializeExpress(app);
|
|
181
|
-
|
|
182
|
-
|
|
186
|
+
}
|
|
187
|
+
app.get("/__cloudstats", async (req, res) => {
|
|
188
|
+
if (req.headers.authorization !== process.env.CLOUD_SECRET) {
|
|
189
|
+
res.status(401).end();
|
|
190
|
+
return;
|
|
191
|
+
}
|
|
192
|
+
const roomCountPerProcess = await import_core.matchMaker.presence.hgetall("roomcount");
|
|
193
|
+
let rooms = 0;
|
|
194
|
+
for (const processId in roomCountPerProcess) {
|
|
195
|
+
rooms += Number(roomCountPerProcess[processId]);
|
|
183
196
|
}
|
|
197
|
+
const mem = await import_node_os_utils.default.mem.used();
|
|
198
|
+
const totalMem = mem.totalMemMb / 1024;
|
|
199
|
+
const usedMem = mem.usedMemMb / 1024;
|
|
200
|
+
const cpu = 1 / import_os.default.loadavg()[1];
|
|
201
|
+
const ccu = await import_core.matchMaker.presence.get("_ccu");
|
|
202
|
+
res.json({
|
|
203
|
+
memory: {
|
|
204
|
+
total: totalMem,
|
|
205
|
+
used: usedMem
|
|
206
|
+
},
|
|
207
|
+
mem: usedMem / totalMem,
|
|
208
|
+
cpu,
|
|
209
|
+
ccu,
|
|
210
|
+
rooms
|
|
211
|
+
});
|
|
212
|
+
});
|
|
213
|
+
if (options.displayLogs) {
|
|
214
|
+
import_core.logger.info("\u2705 Express initialized");
|
|
184
215
|
}
|
|
185
216
|
}
|
|
186
217
|
return transport;
|
package/build/index.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/index.ts"],
|
|
4
|
-
"sourcesContent": ["import fs from \"fs\";\nimport os from \"os\";\nimport http from \"http\";\nimport path from \"path\";\nimport cors from \"cors\";\nimport express from \"express\";\nimport dotenv from \"dotenv\";\nimport { logger, Server, ServerOptions, Transport } from '@colyseus/core';\nimport { WebSocketTransport } from '@colyseus/ws-transport';\n\n// try to import uWebSockets-express compatibility layer.\nlet uWebSocketsExpressCompatibility: any;\ntry {\n uWebSocketsExpressCompatibility = require('uwebsockets-express').default;\n} catch (e) {}\n\nfunction getNodeEnv() {\n return process.env.NODE_ENV || \"development\";\n}\n\nfunction getRegion() {\n // EU, NA, AS, AF, AU, SA, UNKNOWN\n return (process.env.REGION || \"unknown\").toLowerCase()
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBAAe;AACf,gBAAe;AACf,kBAAiB;AACjB,kBAAiB;AACjB,kBAAiB;AACjB,qBAAoB;AACpB,oBAAmB;AACnB,
|
|
6
|
-
"names": ["path", "envPath", "fs", "dotenv", "os", "options", "express", "http", "cors"]
|
|
4
|
+
"sourcesContent": ["import fs from \"fs\";\nimport os from \"os\";\nimport http from \"http\";\nimport path from \"path\";\nimport cors from \"cors\";\nimport express from \"express\";\nimport dotenv from \"dotenv\";\nimport osUtils from \"node-os-utils\";\nimport { logger, Server, ServerOptions, Transport, matchMaker } from '@colyseus/core';\nimport { WebSocketTransport } from '@colyseus/ws-transport';\n\n// try to import uWebSockets-express compatibility layer.\nlet uWebSocketsExpressCompatibility: any;\ntry {\n uWebSocketsExpressCompatibility = require('uwebsockets-express').default;\n} catch (e) {}\n\nfunction getNodeEnv() {\n return process.env.NODE_ENV || \"development\";\n}\n\nfunction getRegion() {\n // EU, NA, AS, AF, AU, SA, UNKNOWN\n return (process.env.REGION || \"unknown\").toLowerCase();\n}\n\nfunction loadEnvFile(envFileOptions: string[], log: 'none' | 'success' | 'both' = 'none') {\n const envPaths = [];\n envFileOptions.forEach((envFilename) => {\n envPaths.push(path.resolve(path.dirname(require?.main?.filename || process.cwd()), \"..\", envFilename));\n envPaths.push(path.resolve(process.cwd(), envFilename));\n });\n\n // return the first .env path found\n const envPath = envPaths.find((envPath) => fs.existsSync(envPath));\n\n if (envPath) {\n dotenv.config({ path: envPath });\n\n if (log !== \"none\") {\n logger.info(`\u2705 ${path.basename(envPath)} loaded.`);\n }\n\n } else if (log === \"both\") {\n logger.info(`\u2139\uFE0F optional .env file not found: ${envFileOptions.join(\", \")}`);\n }\n}\n\n// load .env.cloud defined on admin panel\nif (process.env.COLYSEUS_CLOUD !== undefined) {\n loadEnvFile([`.env.cloud`]);\n}\n\n// (overrides previous env configs)\nloadEnvFile([`.env.${getNodeEnv()}`, `.env`], 'both');\n\nif (process.env.REGION !== undefined) {\n loadEnvFile([`.env.${getRegion()}.${getNodeEnv()}`], 'success');\n}\n\nexport interface ConfigOptions {\n options?: ServerOptions,\n displayLogs?: boolean,\n getId?: () => string,\n initializeTransport?: (options: any) => Transport,\n initializeExpress?: (app: express.Express) => void,\n initializeGameServer?: (app: Server) => void,\n beforeListen?: () => void,\n}\n\nconst ALLOWED_KEYS: { [key in keyof ConfigOptions]: string } = {\n 'displayLogs': \"boolean\",\n 'options': \"object\",\n 'getId': \"function\",\n 'initializeTransport': \"function\",\n 'initializeExpress': \"function\",\n 'initializeGameServer': \"function\",\n 'beforeListen': \"function\"\n};\n\nexport default function (options: ConfigOptions) {\n for (const option in options) {\n if (!ALLOWED_KEYS[option]) {\n throw new Error(`\u274C Invalid option '${option}'. Allowed options are: ${Object.keys(ALLOWED_KEYS).join(\", \")}`);\n }\n if(options[option] !== undefined && typeof(options[option]) !== ALLOWED_KEYS[option]) {\n throw new Error(`\u274C Invalid type for ${option}: please provide a ${ALLOWED_KEYS[option]} value.`);\n }\n }\n\n return options;\n}\n\n/**\n * Listen on your development environment\n * @param options Application options\n * @param port Port number to bind Colyseus + Express\n */\nexport async function listen(\n options: ConfigOptions,\n port: number = Number(process.env.PORT || 2567),\n) {\n const serverOptions = options.options || {};\n options.displayLogs = options.displayLogs ?? true;\n\n // Force 2567 port on Colyseus Cloud\n if (process.env.COLYSEUS_CLOUD !== undefined) {\n port = 2567;\n }\n\n //\n // Handling multiple processes\n // Use NODE_APP_INSTANCE to play nicely with pm2\n //\n const processNumber = Number(process.env.NODE_APP_INSTANCE || \"0\");\n port += processNumber;\n\n // automatically configure for production under Colyseus Cloud\n if (process.env.COLYSEUS_CLOUD !== undefined) {\n // special configuration is required when using multiple processes\n const isMultiProcess = (os.cpus().length > 1);\n\n if (!serverOptions.driver && isMultiProcess) {\n let RedisDriver: any = undefined;\n try {\n RedisDriver = require('@colyseus/redis-driver').RedisDriver;\n serverOptions.driver = new RedisDriver();\n } catch (e) {\n logger.warn(\"\");\n logger.warn(\"\u274C coult not initialize RedisDriver.\");\n logger.warn(\"\uD83D\uDC49 npm install --save @colyseus/redis-driver\");\n logger.warn(\"\");\n }\n }\n\n if (!serverOptions.presence && isMultiProcess) {\n let RedisPresence: any = undefined;\n try {\n RedisPresence = require('@colyseus/redis-presence').RedisPresence;\n serverOptions.presence = new RedisPresence();\n } catch (e) {\n logger.warn(\"\");\n logger.warn(\"\u274C coult not initialize RedisPresence.\");\n logger.warn(\"\uD83D\uDC49 npm install --save @colyseus/redis-presence\");\n logger.warn(\"\");\n }\n }\n\n // force \"publicAddress\" when deployed on \"Colyseus Cloud\".\n serverOptions.publicAddress = process.env.SUBDOMAIN + \".\" + process.env.SERVER_NAME;\n\n // nginx is responsible for forwarding /{port}/ to this process\n if (isMultiProcess) {\n serverOptions.publicAddress += \"/\" + port;\n }\n }\n\n const transport = await getTransport(options);\n const gameServer = new Server({\n ...serverOptions,\n transport,\n });\n await options.initializeGameServer?.(gameServer);\n await options.beforeListen?.();\n\n\n if (process.env.COLYSEUS_CLOUD !== undefined) {\n // listening on socket\n // @ts-ignore\n await gameServer.listen(`/run/colyseus/${port}.sock`);\n\n } else {\n // listening on port\n await gameServer.listen(port);\n }\n\n // notify process manager (production)\n if (typeof(process.send) === \"function\") {\n process.send('ready');\n }\n\n if (options.displayLogs) {\n logger.info(`\u2694\uFE0F Listening on http://localhost:${port}`);\n }\n return gameServer;\n}\n\n\nexport async function getTransport(options: ConfigOptions) {\n let transport: Transport;\n\n if (!options.initializeTransport) {\n // use WebSocketTransport by default\n options.initializeTransport = (options: any) => new WebSocketTransport(options);\n }\n\n let app: express.Express | undefined = express();\n let server = http.createServer(app);\n\n transport = await options.initializeTransport({ server });\n\n if (options.initializeExpress) {\n // uWebSockets.js + Express compatibility layer.\n // @ts-ignore\n if (transport['app']) {\n if (typeof (uWebSocketsExpressCompatibility) === \"function\") {\n if (options.displayLogs){\n logger.info(\"\u2705 uWebSockets.js + Express compatibility enabled\");\n }\n\n // @ts-ignore\n server = undefined;\n // @ts-ignore\n app = uWebSocketsExpressCompatibility(transport['app']);\n\n } else {\n if (options.displayLogs) {\n logger.warn(\"\");\n logger.warn(\"\u274C uWebSockets.js + Express compatibility mode couldn't be loaded, run the following command to fix:\");\n logger.warn(\"\uD83D\uDC49 npm install --save uwebsockets-express\");\n logger.warn(\"\");\n }\n app = undefined;\n }\n }\n }\n\n if (app) {\n // Enable CORS + JSON parsing.\n app.use(cors());\n app.use(express.json());\n\n if (options.initializeExpress) {\n await options.initializeExpress(app);\n }\n\n app.get(\"/__cloudstats\", async (req, res) => {\n if (req.headers.authorization !== process.env.CLOUD_SECRET) {\n res.status(401).end();\n return;\n }\n\n const roomCountPerProcess = await matchMaker.presence.hgetall(\"roomcount\");\n let rooms = 0;\n for (const processId in roomCountPerProcess) {\n rooms += Number(roomCountPerProcess[processId]);\n }\n\n const mem = await osUtils.mem.used();\n const totalMem = mem.totalMemMb / 1024;\n const usedMem = mem.usedMemMb / 1024;\n\n const cpu = (1 / os.loadavg()[1]);\n const ccu = await matchMaker.presence.get(\"_ccu\");\n\n res.json({\n memory: {\n total: totalMem,\n used: usedMem,\n },\n mem: (usedMem / totalMem),\n cpu,\n ccu,\n rooms,\n });\n });\n\n if (options.displayLogs) {\n logger.info(\"\u2705 Express initialized\");\n }\n }\n\n return transport;\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["path", "envPath", "fs", "dotenv", "os", "options", "express", "http", "cors", "osUtils"]
|
|
7
7
|
}
|
package/build/index.mjs
CHANGED
|
@@ -5,7 +5,8 @@ import path from "path";
|
|
|
5
5
|
import cors from "cors";
|
|
6
6
|
import express from "express";
|
|
7
7
|
import dotenv from "dotenv";
|
|
8
|
-
import
|
|
8
|
+
import osUtils from "node-os-utils";
|
|
9
|
+
import { logger, Server, matchMaker } from "@colyseus/core";
|
|
9
10
|
import { WebSocketTransport } from "@colyseus/ws-transport";
|
|
10
11
|
let uWebSocketsExpressCompatibility;
|
|
11
12
|
try {
|
|
@@ -17,9 +18,8 @@ function getNodeEnv() {
|
|
|
17
18
|
}
|
|
18
19
|
function getRegion() {
|
|
19
20
|
return (process.env.REGION || "unknown").toLowerCase();
|
|
20
|
-
;
|
|
21
21
|
}
|
|
22
|
-
function loadEnvFile(envFileOptions, log =
|
|
22
|
+
function loadEnvFile(envFileOptions, log = "none") {
|
|
23
23
|
const envPaths = [];
|
|
24
24
|
envFileOptions.forEach((envFilename) => {
|
|
25
25
|
envPaths.push(path.resolve(path.dirname(require?.main?.filename || process.cwd()), "..", envFilename));
|
|
@@ -28,17 +28,20 @@ function loadEnvFile(envFileOptions, log = false) {
|
|
|
28
28
|
const envPath = envPaths.find((envPath2) => fs.existsSync(envPath2));
|
|
29
29
|
if (envPath) {
|
|
30
30
|
dotenv.config({ path: envPath });
|
|
31
|
-
if (log) {
|
|
31
|
+
if (log !== "none") {
|
|
32
32
|
logger.info(`\u2705 ${path.basename(envPath)} loaded.`);
|
|
33
33
|
}
|
|
34
|
-
} else if (log) {
|
|
35
|
-
logger.info(`\
|
|
34
|
+
} else if (log === "both") {
|
|
35
|
+
logger.info(`\u2139\uFE0F optional .env file not found: ${envFileOptions.join(", ")}`);
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
if (process.env.COLYSEUS_CLOUD !== void 0) {
|
|
39
39
|
loadEnvFile([`.env.cloud`]);
|
|
40
40
|
}
|
|
41
|
-
loadEnvFile([`.env.${
|
|
41
|
+
loadEnvFile([`.env.${getNodeEnv()}`, `.env`], "both");
|
|
42
|
+
if (process.env.REGION !== void 0) {
|
|
43
|
+
loadEnvFile([`.env.${getRegion()}.${getNodeEnv()}`], "success");
|
|
44
|
+
}
|
|
42
45
|
const ALLOWED_KEYS = {
|
|
43
46
|
"displayLogs": "boolean",
|
|
44
47
|
"options": "object",
|
|
@@ -144,13 +147,41 @@ async function getTransport(options) {
|
|
|
144
147
|
app = void 0;
|
|
145
148
|
}
|
|
146
149
|
}
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
+
}
|
|
151
|
+
if (app) {
|
|
152
|
+
app.use(cors());
|
|
153
|
+
app.use(express.json());
|
|
154
|
+
if (options.initializeExpress) {
|
|
150
155
|
await options.initializeExpress(app);
|
|
151
|
-
|
|
152
|
-
|
|
156
|
+
}
|
|
157
|
+
app.get("/__cloudstats", async (req, res) => {
|
|
158
|
+
if (req.headers.authorization !== process.env.CLOUD_SECRET) {
|
|
159
|
+
res.status(401).end();
|
|
160
|
+
return;
|
|
161
|
+
}
|
|
162
|
+
const roomCountPerProcess = await matchMaker.presence.hgetall("roomcount");
|
|
163
|
+
let rooms = 0;
|
|
164
|
+
for (const processId in roomCountPerProcess) {
|
|
165
|
+
rooms += Number(roomCountPerProcess[processId]);
|
|
153
166
|
}
|
|
167
|
+
const mem = await osUtils.mem.used();
|
|
168
|
+
const totalMem = mem.totalMemMb / 1024;
|
|
169
|
+
const usedMem = mem.usedMemMb / 1024;
|
|
170
|
+
const cpu = 1 / os.loadavg()[1];
|
|
171
|
+
const ccu = await matchMaker.presence.get("_ccu");
|
|
172
|
+
res.json({
|
|
173
|
+
memory: {
|
|
174
|
+
total: totalMem,
|
|
175
|
+
used: usedMem
|
|
176
|
+
},
|
|
177
|
+
mem: usedMem / totalMem,
|
|
178
|
+
cpu,
|
|
179
|
+
ccu,
|
|
180
|
+
rooms
|
|
181
|
+
});
|
|
182
|
+
});
|
|
183
|
+
if (options.displayLogs) {
|
|
184
|
+
logger.info("\u2705 Express initialized");
|
|
154
185
|
}
|
|
155
186
|
}
|
|
156
187
|
return transport;
|
package/build/index.mjs.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/index.ts"],
|
|
4
|
-
"sourcesContent": ["import fs from \"fs\";\nimport os from \"os\";\nimport http from \"http\";\nimport path from \"path\";\nimport cors from \"cors\";\nimport express from \"express\";\nimport dotenv from \"dotenv\";\nimport { logger, Server, ServerOptions, Transport } from '@colyseus/core';\nimport { WebSocketTransport } from '@colyseus/ws-transport';\n\n// try to import uWebSockets-express compatibility layer.\nlet uWebSocketsExpressCompatibility: any;\ntry {\n uWebSocketsExpressCompatibility = require('uwebsockets-express').default;\n} catch (e) {}\n\nfunction getNodeEnv() {\n return process.env.NODE_ENV || \"development\";\n}\n\nfunction getRegion() {\n // EU, NA, AS, AF, AU, SA, UNKNOWN\n return (process.env.REGION || \"unknown\").toLowerCase()
|
|
5
|
-
"mappings": "AAAA,OAAO,QAAQ;AACf,OAAO,QAAQ;AACf,OAAO,UAAU;AACjB,OAAO,UAAU;AACjB,OAAO,UAAU;AACjB,OAAO,aAAa;AACpB,OAAO,YAAY;AACnB,SAAS,QAAQ,
|
|
4
|
+
"sourcesContent": ["import fs from \"fs\";\nimport os from \"os\";\nimport http from \"http\";\nimport path from \"path\";\nimport cors from \"cors\";\nimport express from \"express\";\nimport dotenv from \"dotenv\";\nimport osUtils from \"node-os-utils\";\nimport { logger, Server, ServerOptions, Transport, matchMaker } from '@colyseus/core';\nimport { WebSocketTransport } from '@colyseus/ws-transport';\n\n// try to import uWebSockets-express compatibility layer.\nlet uWebSocketsExpressCompatibility: any;\ntry {\n uWebSocketsExpressCompatibility = require('uwebsockets-express').default;\n} catch (e) {}\n\nfunction getNodeEnv() {\n return process.env.NODE_ENV || \"development\";\n}\n\nfunction getRegion() {\n // EU, NA, AS, AF, AU, SA, UNKNOWN\n return (process.env.REGION || \"unknown\").toLowerCase();\n}\n\nfunction loadEnvFile(envFileOptions: string[], log: 'none' | 'success' | 'both' = 'none') {\n const envPaths = [];\n envFileOptions.forEach((envFilename) => {\n envPaths.push(path.resolve(path.dirname(require?.main?.filename || process.cwd()), \"..\", envFilename));\n envPaths.push(path.resolve(process.cwd(), envFilename));\n });\n\n // return the first .env path found\n const envPath = envPaths.find((envPath) => fs.existsSync(envPath));\n\n if (envPath) {\n dotenv.config({ path: envPath });\n\n if (log !== \"none\") {\n logger.info(`\u2705 ${path.basename(envPath)} loaded.`);\n }\n\n } else if (log === \"both\") {\n logger.info(`\u2139\uFE0F optional .env file not found: ${envFileOptions.join(\", \")}`);\n }\n}\n\n// load .env.cloud defined on admin panel\nif (process.env.COLYSEUS_CLOUD !== undefined) {\n loadEnvFile([`.env.cloud`]);\n}\n\n// (overrides previous env configs)\nloadEnvFile([`.env.${getNodeEnv()}`, `.env`], 'both');\n\nif (process.env.REGION !== undefined) {\n loadEnvFile([`.env.${getRegion()}.${getNodeEnv()}`], 'success');\n}\n\nexport interface ConfigOptions {\n options?: ServerOptions,\n displayLogs?: boolean,\n getId?: () => string,\n initializeTransport?: (options: any) => Transport,\n initializeExpress?: (app: express.Express) => void,\n initializeGameServer?: (app: Server) => void,\n beforeListen?: () => void,\n}\n\nconst ALLOWED_KEYS: { [key in keyof ConfigOptions]: string } = {\n 'displayLogs': \"boolean\",\n 'options': \"object\",\n 'getId': \"function\",\n 'initializeTransport': \"function\",\n 'initializeExpress': \"function\",\n 'initializeGameServer': \"function\",\n 'beforeListen': \"function\"\n};\n\nexport default function (options: ConfigOptions) {\n for (const option in options) {\n if (!ALLOWED_KEYS[option]) {\n throw new Error(`\u274C Invalid option '${option}'. Allowed options are: ${Object.keys(ALLOWED_KEYS).join(\", \")}`);\n }\n if(options[option] !== undefined && typeof(options[option]) !== ALLOWED_KEYS[option]) {\n throw new Error(`\u274C Invalid type for ${option}: please provide a ${ALLOWED_KEYS[option]} value.`);\n }\n }\n\n return options;\n}\n\n/**\n * Listen on your development environment\n * @param options Application options\n * @param port Port number to bind Colyseus + Express\n */\nexport async function listen(\n options: ConfigOptions,\n port: number = Number(process.env.PORT || 2567),\n) {\n const serverOptions = options.options || {};\n options.displayLogs = options.displayLogs ?? true;\n\n // Force 2567 port on Colyseus Cloud\n if (process.env.COLYSEUS_CLOUD !== undefined) {\n port = 2567;\n }\n\n //\n // Handling multiple processes\n // Use NODE_APP_INSTANCE to play nicely with pm2\n //\n const processNumber = Number(process.env.NODE_APP_INSTANCE || \"0\");\n port += processNumber;\n\n // automatically configure for production under Colyseus Cloud\n if (process.env.COLYSEUS_CLOUD !== undefined) {\n // special configuration is required when using multiple processes\n const isMultiProcess = (os.cpus().length > 1);\n\n if (!serverOptions.driver && isMultiProcess) {\n let RedisDriver: any = undefined;\n try {\n RedisDriver = require('@colyseus/redis-driver').RedisDriver;\n serverOptions.driver = new RedisDriver();\n } catch (e) {\n logger.warn(\"\");\n logger.warn(\"\u274C coult not initialize RedisDriver.\");\n logger.warn(\"\uD83D\uDC49 npm install --save @colyseus/redis-driver\");\n logger.warn(\"\");\n }\n }\n\n if (!serverOptions.presence && isMultiProcess) {\n let RedisPresence: any = undefined;\n try {\n RedisPresence = require('@colyseus/redis-presence').RedisPresence;\n serverOptions.presence = new RedisPresence();\n } catch (e) {\n logger.warn(\"\");\n logger.warn(\"\u274C coult not initialize RedisPresence.\");\n logger.warn(\"\uD83D\uDC49 npm install --save @colyseus/redis-presence\");\n logger.warn(\"\");\n }\n }\n\n // force \"publicAddress\" when deployed on \"Colyseus Cloud\".\n serverOptions.publicAddress = process.env.SUBDOMAIN + \".\" + process.env.SERVER_NAME;\n\n // nginx is responsible for forwarding /{port}/ to this process\n if (isMultiProcess) {\n serverOptions.publicAddress += \"/\" + port;\n }\n }\n\n const transport = await getTransport(options);\n const gameServer = new Server({\n ...serverOptions,\n transport,\n });\n await options.initializeGameServer?.(gameServer);\n await options.beforeListen?.();\n\n\n if (process.env.COLYSEUS_CLOUD !== undefined) {\n // listening on socket\n // @ts-ignore\n await gameServer.listen(`/run/colyseus/${port}.sock`);\n\n } else {\n // listening on port\n await gameServer.listen(port);\n }\n\n // notify process manager (production)\n if (typeof(process.send) === \"function\") {\n process.send('ready');\n }\n\n if (options.displayLogs) {\n logger.info(`\u2694\uFE0F Listening on http://localhost:${port}`);\n }\n return gameServer;\n}\n\n\nexport async function getTransport(options: ConfigOptions) {\n let transport: Transport;\n\n if (!options.initializeTransport) {\n // use WebSocketTransport by default\n options.initializeTransport = (options: any) => new WebSocketTransport(options);\n }\n\n let app: express.Express | undefined = express();\n let server = http.createServer(app);\n\n transport = await options.initializeTransport({ server });\n\n if (options.initializeExpress) {\n // uWebSockets.js + Express compatibility layer.\n // @ts-ignore\n if (transport['app']) {\n if (typeof (uWebSocketsExpressCompatibility) === \"function\") {\n if (options.displayLogs){\n logger.info(\"\u2705 uWebSockets.js + Express compatibility enabled\");\n }\n\n // @ts-ignore\n server = undefined;\n // @ts-ignore\n app = uWebSocketsExpressCompatibility(transport['app']);\n\n } else {\n if (options.displayLogs) {\n logger.warn(\"\");\n logger.warn(\"\u274C uWebSockets.js + Express compatibility mode couldn't be loaded, run the following command to fix:\");\n logger.warn(\"\uD83D\uDC49 npm install --save uwebsockets-express\");\n logger.warn(\"\");\n }\n app = undefined;\n }\n }\n }\n\n if (app) {\n // Enable CORS + JSON parsing.\n app.use(cors());\n app.use(express.json());\n\n if (options.initializeExpress) {\n await options.initializeExpress(app);\n }\n\n app.get(\"/__cloudstats\", async (req, res) => {\n if (req.headers.authorization !== process.env.CLOUD_SECRET) {\n res.status(401).end();\n return;\n }\n\n const roomCountPerProcess = await matchMaker.presence.hgetall(\"roomcount\");\n let rooms = 0;\n for (const processId in roomCountPerProcess) {\n rooms += Number(roomCountPerProcess[processId]);\n }\n\n const mem = await osUtils.mem.used();\n const totalMem = mem.totalMemMb / 1024;\n const usedMem = mem.usedMemMb / 1024;\n\n const cpu = (1 / os.loadavg()[1]);\n const ccu = await matchMaker.presence.get(\"_ccu\");\n\n res.json({\n memory: {\n total: totalMem,\n used: usedMem,\n },\n mem: (usedMem / totalMem),\n cpu,\n ccu,\n rooms,\n });\n });\n\n if (options.displayLogs) {\n logger.info(\"\u2705 Express initialized\");\n }\n }\n\n return transport;\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["envPath", "options"]
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@colyseus/tools",
|
|
3
|
-
"version": "0.15.
|
|
3
|
+
"version": "0.15.16",
|
|
4
4
|
"description": "Colyseus Tools for Production",
|
|
5
5
|
"input": "./src/index.ts",
|
|
6
6
|
"main": "./build/index.js",
|
|
@@ -44,10 +44,11 @@
|
|
|
44
44
|
"@colyseus/ws-transport": "^0.15.0",
|
|
45
45
|
"cors": "^2.8.5",
|
|
46
46
|
"dotenv": "^8.2.0",
|
|
47
|
-
"express": "^4.16.2"
|
|
47
|
+
"express": "^4.16.2",
|
|
48
|
+
"node-os-utils": "^1.3.7"
|
|
48
49
|
},
|
|
49
50
|
"publishConfig": {
|
|
50
51
|
"access": "public"
|
|
51
52
|
},
|
|
52
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "1be49aafe1e249e0047480e9d4b40df1a13e3e04"
|
|
53
54
|
}
|
package/post-deploy.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
const pm2 = require('pm2');
|
|
3
3
|
const os = require('os');
|
|
4
4
|
const fs = require('fs');
|
|
5
|
+
const path = require('path');
|
|
5
6
|
|
|
6
7
|
const opts = { env: process.env.NODE_ENV || "production" };
|
|
7
8
|
const maxCPU = os.cpus().length;
|
|
@@ -14,16 +15,27 @@ if (process.env.npm_config_local_prefix) {
|
|
|
14
15
|
pm2.cwd = process.env.npm_config_local_prefix;
|
|
15
16
|
}
|
|
16
17
|
|
|
18
|
+
const CONFIG_FILE = [
|
|
19
|
+
'ecosystem.config.cjs',
|
|
20
|
+
'ecosystem.config.js',
|
|
21
|
+
'pm2.config.cjs',
|
|
22
|
+
'pm2.config.js',
|
|
23
|
+
].find((filename) => fs.existsSync(path.resolve(pm2.cwd, filename)));
|
|
24
|
+
|
|
25
|
+
if (!CONFIG_FILE) {
|
|
26
|
+
throw new Error('missing ecosystem config file. make sure to provide one with a valid "script" entrypoint file path.');
|
|
27
|
+
}
|
|
28
|
+
|
|
17
29
|
pm2.list(function(err, apps) {
|
|
18
30
|
bailOnErr(err);
|
|
19
31
|
|
|
20
32
|
if (apps.length === 0) {
|
|
21
33
|
// first deploy
|
|
22
|
-
pm2.start(
|
|
34
|
+
pm2.start(CONFIG_FILE, {...opts}, updateAndReloadNginx);
|
|
23
35
|
|
|
24
36
|
} else {
|
|
25
37
|
// reload existing apps
|
|
26
|
-
pm2.reload(
|
|
38
|
+
pm2.reload(CONFIG_FILE, {...opts}, function(err, apps) {
|
|
27
39
|
bailOnErr(err);
|
|
28
40
|
|
|
29
41
|
const name = apps[0].name;
|