@colyseus/tools 0.16.12 → 0.16.14

package/build/index.js

@@ -166,7 +166,6 @@ async function getTransport(options) {
   }
   if (app) {
     app.use((0, import_cors.default)({ origin: true, credentials: true }));
-    app.use(import_express.default.json());
     if (options.initializeExpress) {
       await options.initializeExpress(app);
     }

package/build/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/index.ts"],
-  "sourcesContent": ["import './loadenv.js';\nimport os from 'os';\nimport fs from \"fs\";\nimport net from \"net\";\nimport http from 'http';\nimport cors from 'cors';\nimport express from 'express';\nimport { logger, Server, ServerOptions, Transport, matchMaker } from '@colyseus/core';\nimport { WebSocketTransport } from '@colyseus/ws-transport';\n\nconst BunWebSockets = import('@colyseus/bun-websockets'); BunWebSockets.catch(() => {});\nconst RedisDriver = import('@colyseus/redis-driver'); RedisDriver.catch(() => {});\nconst RedisPresence = import('@colyseus/redis-presence'); RedisPresence.catch(() => {});\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 | Server,\n    port: number = Number(process.env.PORT || 2567),\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    let gameServer: Server;\n    let displayLogs = true;\n\n    if (options instanceof Server) {\n        gameServer = options;\n\n    } else {\n        gameServer = await buildServerFromOptions(options, port);\n        displayLogs = options.displayLogs;\n\n        await options.initializeGameServer?.(gameServer);\n        await matchMaker.onReady;\n        await options.beforeListen?.();\n    }\n\n    if (process.env.COLYSEUS_CLOUD !== undefined) {\n        // listening on socket\n        const socketPath: any = `/run/colyseus/${port}.sock`;\n\n        // check if .sock file is active\n        // (fixes \"ADDRINUSE\" issue when restarting the server)\n        await checkInactiveSocketFile(socketPath);\n\n        await gameServer.listen(socketPath);\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 (displayLogs) {\n        logger.info(`\u2694\uFE0F  Listening on http://localhost:${port}`);\n    }\n\n    return gameServer;\n}\n\nasync function buildServerFromOptions(options: ConfigOptions, port: number) {\n  const serverOptions = options.options || {};\n  options.displayLogs = options.displayLogs ?? true;\n\n  // automatically configure for production under Colyseus Cloud\n  if (process.env.COLYSEUS_CLOUD !== undefined) {\n\n    // special configuration is required when using multiple processes\n    const useRedisConfig = (os.cpus().length > 1) || (process.env.REDIS_URI !== undefined);\n\n    if (!serverOptions.driver && useRedisConfig) {\n      try {\n        const module = await RedisDriver;\n        serverOptions.driver = new module.RedisDriver(process.env.REDIS_URI);\n      } catch (e) {\n        console.error(e);\n        logger.warn(\"\");\n        logger.warn(\"\u274C could not initialize RedisDriver.\");\n        logger.warn(\"\uD83D\uDC49 npm install --save @colyseus/redis-driver\");\n        logger.warn(\"\");\n      }\n    }\n\n    if (!serverOptions.presence && useRedisConfig) {\n      try {\n        const module = await RedisPresence;\n        serverOptions.presence = new module.RedisPresence(process.env.REDIS_URI);\n      } catch (e) {\n        console.error(e);\n        logger.warn(\"\");\n        logger.warn(\"\u274C could not initialize RedisPresence.\");\n        logger.warn(\"\uD83D\uDC49 npm install --save @colyseus/redis-presence\");\n        logger.warn(\"\");\n      }\n    }\n\n    if (useRedisConfig) {\n      // force \"publicAddress\" when more than 1 process is available\n      serverOptions.publicAddress = process.env.SUBDOMAIN + \".\" + process.env.SERVER_NAME;\n\n      // nginx is responsible for forwarding /{port}/ to this process\n      serverOptions.publicAddress += \"/\" + port;\n    }\n  }\n\n  const transport = await getTransport(options);\n  return new Server({\n    ...serverOptions,\n    transport,\n  });\n}\n\nexport async function getTransport(options: ConfigOptions) {\n    let transport: Transport;\n\n    if (!options.initializeTransport) {\n        // @ts-ignore\n        if (typeof Bun !== \"undefined\") {\n          // @colyseus/bun-websockets\n          BunWebSockets.catch(() => {\n            logger.warn(\"\");\n            logger.warn(\"\u274C could not initialize BunWebSockets.\");\n            logger.warn(\"\uD83D\uDC49 npm install --save @colyseus/bun-websockets\");\n            logger.warn(\"\");\n          })\n          const module = await BunWebSockets;\n          options.initializeTransport = (options: any) => new module.BunWebSockets(options);\n\n        } else {\n          // use WebSocketTransport by default\n          options.initializeTransport = (options: any) => new WebSocketTransport(options);\n        }\n    }\n\n    let app: express.Express | undefined = express();\n    let server = http.createServer(app);\n\n    transport = await options.initializeTransport({ server, app });\n\n    //\n    // TODO: refactor me!\n    // BunWebSockets: There's no need to instantiate \"app\" and \"server\" above\n    //\n    if (transport['expressApp']) {\n      app = transport['expressApp'];\n    }\n\n    if (app) {\n      // Enable CORS\n      app.use(cors({ origin: true, credentials: true, }));\n\n      // Enable JSON parsing.\n      app.use(express.json());\n\n      if (options.initializeExpress) {\n          await options.initializeExpress(app);\n      }\n\n      // health check for load balancers\n      app.get(\"/__healthcheck\", (req, res) => {\n        res.status(200).end();\n      });\n\n      if (options.displayLogs) {\n          logger.info(\"\u2705 Express initialized\");\n      }\n    }\n\n    return transport;\n}\n\n/**\n * Check if a socket file is active and remove it if it's not.\n */\nfunction checkInactiveSocketFile(sockFilePath: string) {\n  return new Promise((resolve, reject) => {\n    const client = net.createConnection({ path: sockFilePath })\n      .on('connect', () => {\n        // socket file is active, close the connection\n        client.end();\n        throw new Error(`EADDRINUSE: Already listening on '${sockFilePath}'`);\n      })\n      .on('error', () => {\n        // socket file is inactive, remove it\n        fs.unlink(sockFilePath, () => resolve(true));\n      });\n  });\n}"],
-  "mappings": "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",
+  "sourcesContent": ["import './loadenv.js';\nimport os from 'os';\nimport fs from \"fs\";\nimport net from \"net\";\nimport http from 'http';\nimport cors from 'cors';\nimport express from 'express';\nimport { logger, Server, ServerOptions, Transport, matchMaker } from '@colyseus/core';\nimport { WebSocketTransport } from '@colyseus/ws-transport';\n\nconst BunWebSockets = import('@colyseus/bun-websockets'); BunWebSockets.catch(() => {});\nconst RedisDriver = import('@colyseus/redis-driver'); RedisDriver.catch(() => {});\nconst RedisPresence = import('@colyseus/redis-presence'); RedisPresence.catch(() => {});\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 | Server,\n    port: number = Number(process.env.PORT || 2567),\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    let gameServer: Server;\n    let displayLogs = true;\n\n    if (options instanceof Server) {\n        gameServer = options;\n\n    } else {\n        gameServer = await buildServerFromOptions(options, port);\n        displayLogs = options.displayLogs;\n\n        await options.initializeGameServer?.(gameServer);\n        await matchMaker.onReady;\n        await options.beforeListen?.();\n    }\n\n    if (process.env.COLYSEUS_CLOUD !== undefined) {\n        // listening on socket\n        const socketPath: any = `/run/colyseus/${port}.sock`;\n\n        // check if .sock file is active\n        // (fixes \"ADDRINUSE\" issue when restarting the server)\n        await checkInactiveSocketFile(socketPath);\n\n        await gameServer.listen(socketPath);\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 (displayLogs) {\n        logger.info(`\u2694\uFE0F  Listening on http://localhost:${port}`);\n    }\n\n    return gameServer;\n}\n\nasync function buildServerFromOptions(options: ConfigOptions, port: number) {\n  const serverOptions = options.options || {};\n  options.displayLogs = options.displayLogs ?? true;\n\n  // automatically configure for production under Colyseus Cloud\n  if (process.env.COLYSEUS_CLOUD !== undefined) {\n\n    // special configuration is required when using multiple processes\n    const useRedisConfig = (os.cpus().length > 1) || (process.env.REDIS_URI !== undefined);\n\n    if (!serverOptions.driver && useRedisConfig) {\n      try {\n        const module = await RedisDriver;\n        serverOptions.driver = new module.RedisDriver(process.env.REDIS_URI);\n      } catch (e) {\n        console.error(e);\n        logger.warn(\"\");\n        logger.warn(\"\u274C could not initialize RedisDriver.\");\n        logger.warn(\"\uD83D\uDC49 npm install --save @colyseus/redis-driver\");\n        logger.warn(\"\");\n      }\n    }\n\n    if (!serverOptions.presence && useRedisConfig) {\n      try {\n        const module = await RedisPresence;\n        serverOptions.presence = new module.RedisPresence(process.env.REDIS_URI);\n      } catch (e) {\n        console.error(e);\n        logger.warn(\"\");\n        logger.warn(\"\u274C could not initialize RedisPresence.\");\n        logger.warn(\"\uD83D\uDC49 npm install --save @colyseus/redis-presence\");\n        logger.warn(\"\");\n      }\n    }\n\n    if (useRedisConfig) {\n      // force \"publicAddress\" when more than 1 process is available\n      serverOptions.publicAddress = process.env.SUBDOMAIN + \".\" + process.env.SERVER_NAME;\n\n      // nginx is responsible for forwarding /{port}/ to this process\n      serverOptions.publicAddress += \"/\" + port;\n    }\n  }\n\n  const transport = await getTransport(options);\n  return new Server({\n    ...serverOptions,\n    transport,\n  });\n}\n\nexport async function getTransport(options: ConfigOptions) {\n    let transport: Transport;\n\n    if (!options.initializeTransport) {\n        // @ts-ignore\n        if (typeof Bun !== \"undefined\") {\n          // @colyseus/bun-websockets\n          BunWebSockets.catch(() => {\n            logger.warn(\"\");\n            logger.warn(\"\u274C could not initialize BunWebSockets.\");\n            logger.warn(\"\uD83D\uDC49 npm install --save @colyseus/bun-websockets\");\n            logger.warn(\"\");\n          })\n          const module = await BunWebSockets;\n          options.initializeTransport = (options: any) => new module.BunWebSockets(options);\n\n        } else {\n          // use WebSocketTransport by default\n          options.initializeTransport = (options: any) => new WebSocketTransport(options);\n        }\n    }\n\n    let app: express.Express | undefined = express();\n    let server = http.createServer(app);\n\n    transport = await options.initializeTransport({ server, app });\n\n    //\n    // TODO: refactor me!\n    // BunWebSockets: There's no need to instantiate \"app\" and \"server\" above\n    //\n    if (transport['expressApp']) {\n      app = transport['expressApp'];\n    }\n\n    if (app) {\n      // Enable CORS\n      app.use(cors({ origin: true, credentials: true, }));\n\n      if (options.initializeExpress) {\n          await options.initializeExpress(app);\n      }\n\n      // health check for load balancers\n      app.get(\"/__healthcheck\", (req, res) => {\n        res.status(200).end();\n      });\n\n      if (options.displayLogs) {\n          logger.info(\"\u2705 Express initialized\");\n      }\n    }\n\n    return transport;\n}\n\n/**\n * Check if a socket file is active and remove it if it's not.\n */\nfunction checkInactiveSocketFile(sockFilePath: string) {\n  return new Promise((resolve, reject) => {\n    const client = net.createConnection({ path: sockFilePath })\n      .on('connect', () => {\n        // socket file is active, close the connection\n        client.end();\n        throw new Error(`EADDRINUSE: Already listening on '${sockFilePath}'`);\n      })\n      .on('error', () => {\n        // socket file is inactive, remove it\n        fs.unlink(sockFilePath, () => resolve(true));\n      });\n  });\n}"],
+  "mappings": "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",
   "names": ["os", "module", "options", "express", "http", "cors", "net", "fs"]
 }

package/build/index.mjs

@@ -133,7 +133,6 @@ async function getTransport(options) {
   }
   if (app) {
     app.use(cors({ origin: true, credentials: true }));
-    app.use(express.json());
     if (options.initializeExpress) {
       await options.initializeExpress(app);
     }

package/build/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/index.ts"],
-  "sourcesContent": ["import './loadenv.js';\nimport os from 'os';\nimport fs from \"fs\";\nimport net from \"net\";\nimport http from 'http';\nimport cors from 'cors';\nimport express from 'express';\nimport { logger, Server, ServerOptions, Transport, matchMaker } from '@colyseus/core';\nimport { WebSocketTransport } from '@colyseus/ws-transport';\n\nconst BunWebSockets = import('@colyseus/bun-websockets'); BunWebSockets.catch(() => {});\nconst RedisDriver = import('@colyseus/redis-driver'); RedisDriver.catch(() => {});\nconst RedisPresence = import('@colyseus/redis-presence'); RedisPresence.catch(() => {});\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 | Server,\n    port: number = Number(process.env.PORT || 2567),\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    let gameServer: Server;\n    let displayLogs = true;\n\n    if (options instanceof Server) {\n        gameServer = options;\n\n    } else {\n        gameServer = await buildServerFromOptions(options, port);\n        displayLogs = options.displayLogs;\n\n        await options.initializeGameServer?.(gameServer);\n        await matchMaker.onReady;\n        await options.beforeListen?.();\n    }\n\n    if (process.env.COLYSEUS_CLOUD !== undefined) {\n        // listening on socket\n        const socketPath: any = `/run/colyseus/${port}.sock`;\n\n        // check if .sock file is active\n        // (fixes \"ADDRINUSE\" issue when restarting the server)\n        await checkInactiveSocketFile(socketPath);\n\n        await gameServer.listen(socketPath);\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 (displayLogs) {\n        logger.info(`\u2694\uFE0F  Listening on http://localhost:${port}`);\n    }\n\n    return gameServer;\n}\n\nasync function buildServerFromOptions(options: ConfigOptions, port: number) {\n  const serverOptions = options.options || {};\n  options.displayLogs = options.displayLogs ?? true;\n\n  // automatically configure for production under Colyseus Cloud\n  if (process.env.COLYSEUS_CLOUD !== undefined) {\n\n    // special configuration is required when using multiple processes\n    const useRedisConfig = (os.cpus().length > 1) || (process.env.REDIS_URI !== undefined);\n\n    if (!serverOptions.driver && useRedisConfig) {\n      try {\n        const module = await RedisDriver;\n        serverOptions.driver = new module.RedisDriver(process.env.REDIS_URI);\n      } catch (e) {\n        console.error(e);\n        logger.warn(\"\");\n        logger.warn(\"\u274C could not initialize RedisDriver.\");\n        logger.warn(\"\uD83D\uDC49 npm install --save @colyseus/redis-driver\");\n        logger.warn(\"\");\n      }\n    }\n\n    if (!serverOptions.presence && useRedisConfig) {\n      try {\n        const module = await RedisPresence;\n        serverOptions.presence = new module.RedisPresence(process.env.REDIS_URI);\n      } catch (e) {\n        console.error(e);\n        logger.warn(\"\");\n        logger.warn(\"\u274C could not initialize RedisPresence.\");\n        logger.warn(\"\uD83D\uDC49 npm install --save @colyseus/redis-presence\");\n        logger.warn(\"\");\n      }\n    }\n\n    if (useRedisConfig) {\n      // force \"publicAddress\" when more than 1 process is available\n      serverOptions.publicAddress = process.env.SUBDOMAIN + \".\" + process.env.SERVER_NAME;\n\n      // nginx is responsible for forwarding /{port}/ to this process\n      serverOptions.publicAddress += \"/\" + port;\n    }\n  }\n\n  const transport = await getTransport(options);\n  return new Server({\n    ...serverOptions,\n    transport,\n  });\n}\n\nexport async function getTransport(options: ConfigOptions) {\n    let transport: Transport;\n\n    if (!options.initializeTransport) {\n        // @ts-ignore\n        if (typeof Bun !== \"undefined\") {\n          // @colyseus/bun-websockets\n          BunWebSockets.catch(() => {\n            logger.warn(\"\");\n            logger.warn(\"\u274C could not initialize BunWebSockets.\");\n            logger.warn(\"\uD83D\uDC49 npm install --save @colyseus/bun-websockets\");\n            logger.warn(\"\");\n          })\n          const module = await BunWebSockets;\n          options.initializeTransport = (options: any) => new module.BunWebSockets(options);\n\n        } else {\n          // use WebSocketTransport by default\n          options.initializeTransport = (options: any) => new WebSocketTransport(options);\n        }\n    }\n\n    let app: express.Express | undefined = express();\n    let server = http.createServer(app);\n\n    transport = await options.initializeTransport({ server, app });\n\n    //\n    // TODO: refactor me!\n    // BunWebSockets: There's no need to instantiate \"app\" and \"server\" above\n    //\n    if (transport['expressApp']) {\n      app = transport['expressApp'];\n    }\n\n    if (app) {\n      // Enable CORS\n      app.use(cors({ origin: true, credentials: true, }));\n\n      // Enable JSON parsing.\n      app.use(express.json());\n\n      if (options.initializeExpress) {\n          await options.initializeExpress(app);\n      }\n\n      // health check for load balancers\n      app.get(\"/__healthcheck\", (req, res) => {\n        res.status(200).end();\n      });\n\n      if (options.displayLogs) {\n          logger.info(\"\u2705 Express initialized\");\n      }\n    }\n\n    return transport;\n}\n\n/**\n * Check if a socket file is active and remove it if it's not.\n */\nfunction checkInactiveSocketFile(sockFilePath: string) {\n  return new Promise((resolve, reject) => {\n    const client = net.createConnection({ path: sockFilePath })\n      .on('connect', () => {\n        // socket file is active, close the connection\n        client.end();\n        throw new Error(`EADDRINUSE: Already listening on '${sockFilePath}'`);\n      })\n      .on('error', () => {\n        // socket file is inactive, remove it\n        fs.unlink(sockFilePath, () => resolve(true));\n      });\n  });\n}"],
-  "mappings": "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",
+  "sourcesContent": ["import './loadenv.js';\nimport os from 'os';\nimport fs from \"fs\";\nimport net from \"net\";\nimport http from 'http';\nimport cors from 'cors';\nimport express from 'express';\nimport { logger, Server, ServerOptions, Transport, matchMaker } from '@colyseus/core';\nimport { WebSocketTransport } from '@colyseus/ws-transport';\n\nconst BunWebSockets = import('@colyseus/bun-websockets'); BunWebSockets.catch(() => {});\nconst RedisDriver = import('@colyseus/redis-driver'); RedisDriver.catch(() => {});\nconst RedisPresence = import('@colyseus/redis-presence'); RedisPresence.catch(() => {});\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 | Server,\n    port: number = Number(process.env.PORT || 2567),\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    let gameServer: Server;\n    let displayLogs = true;\n\n    if (options instanceof Server) {\n        gameServer = options;\n\n    } else {\n        gameServer = await buildServerFromOptions(options, port);\n        displayLogs = options.displayLogs;\n\n        await options.initializeGameServer?.(gameServer);\n        await matchMaker.onReady;\n        await options.beforeListen?.();\n    }\n\n    if (process.env.COLYSEUS_CLOUD !== undefined) {\n        // listening on socket\n        const socketPath: any = `/run/colyseus/${port}.sock`;\n\n        // check if .sock file is active\n        // (fixes \"ADDRINUSE\" issue when restarting the server)\n        await checkInactiveSocketFile(socketPath);\n\n        await gameServer.listen(socketPath);\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 (displayLogs) {\n        logger.info(`\u2694\uFE0F  Listening on http://localhost:${port}`);\n    }\n\n    return gameServer;\n}\n\nasync function buildServerFromOptions(options: ConfigOptions, port: number) {\n  const serverOptions = options.options || {};\n  options.displayLogs = options.displayLogs ?? true;\n\n  // automatically configure for production under Colyseus Cloud\n  if (process.env.COLYSEUS_CLOUD !== undefined) {\n\n    // special configuration is required when using multiple processes\n    const useRedisConfig = (os.cpus().length > 1) || (process.env.REDIS_URI !== undefined);\n\n    if (!serverOptions.driver && useRedisConfig) {\n      try {\n        const module = await RedisDriver;\n        serverOptions.driver = new module.RedisDriver(process.env.REDIS_URI);\n      } catch (e) {\n        console.error(e);\n        logger.warn(\"\");\n        logger.warn(\"\u274C could not initialize RedisDriver.\");\n        logger.warn(\"\uD83D\uDC49 npm install --save @colyseus/redis-driver\");\n        logger.warn(\"\");\n      }\n    }\n\n    if (!serverOptions.presence && useRedisConfig) {\n      try {\n        const module = await RedisPresence;\n        serverOptions.presence = new module.RedisPresence(process.env.REDIS_URI);\n      } catch (e) {\n        console.error(e);\n        logger.warn(\"\");\n        logger.warn(\"\u274C could not initialize RedisPresence.\");\n        logger.warn(\"\uD83D\uDC49 npm install --save @colyseus/redis-presence\");\n        logger.warn(\"\");\n      }\n    }\n\n    if (useRedisConfig) {\n      // force \"publicAddress\" when more than 1 process is available\n      serverOptions.publicAddress = process.env.SUBDOMAIN + \".\" + process.env.SERVER_NAME;\n\n      // nginx is responsible for forwarding /{port}/ to this process\n      serverOptions.publicAddress += \"/\" + port;\n    }\n  }\n\n  const transport = await getTransport(options);\n  return new Server({\n    ...serverOptions,\n    transport,\n  });\n}\n\nexport async function getTransport(options: ConfigOptions) {\n    let transport: Transport;\n\n    if (!options.initializeTransport) {\n        // @ts-ignore\n        if (typeof Bun !== \"undefined\") {\n          // @colyseus/bun-websockets\n          BunWebSockets.catch(() => {\n            logger.warn(\"\");\n            logger.warn(\"\u274C could not initialize BunWebSockets.\");\n            logger.warn(\"\uD83D\uDC49 npm install --save @colyseus/bun-websockets\");\n            logger.warn(\"\");\n          })\n          const module = await BunWebSockets;\n          options.initializeTransport = (options: any) => new module.BunWebSockets(options);\n\n        } else {\n          // use WebSocketTransport by default\n          options.initializeTransport = (options: any) => new WebSocketTransport(options);\n        }\n    }\n\n    let app: express.Express | undefined = express();\n    let server = http.createServer(app);\n\n    transport = await options.initializeTransport({ server, app });\n\n    //\n    // TODO: refactor me!\n    // BunWebSockets: There's no need to instantiate \"app\" and \"server\" above\n    //\n    if (transport['expressApp']) {\n      app = transport['expressApp'];\n    }\n\n    if (app) {\n      // Enable CORS\n      app.use(cors({ origin: true, credentials: true, }));\n\n      if (options.initializeExpress) {\n          await options.initializeExpress(app);\n      }\n\n      // health check for load balancers\n      app.get(\"/__healthcheck\", (req, res) => {\n        res.status(200).end();\n      });\n\n      if (options.displayLogs) {\n          logger.info(\"\u2705 Express initialized\");\n      }\n    }\n\n    return transport;\n}\n\n/**\n * Check if a socket file is active and remove it if it's not.\n */\nfunction checkInactiveSocketFile(sockFilePath: string) {\n  return new Promise((resolve, reject) => {\n    const client = net.createConnection({ path: sockFilePath })\n      .on('connect', () => {\n        // socket file is active, close the connection\n        client.end();\n        throw new Error(`EADDRINUSE: Already listening on '${sockFilePath}'`);\n      })\n      .on('error', () => {\n        // socket file is inactive, remove it\n        fs.unlink(sockFilePath, () => resolve(true));\n      });\n  });\n}"],
+  "mappings": ";AAAA,OAAO;AACP,OAAO,QAAQ;AACf,OAAO,QAAQ;AACf,OAAO,SAAS;AAChB,OAAO,UAAU;AACjB,OAAO,UAAU;AACjB,OAAO,aAAa;AACpB,SAAS,QAAQ,QAAkC,kBAAkB;AACrE,SAAS,0BAA0B;AAEnC,IAAM,gBAAgB,OAAO,0BAA0B;AAAG,cAAc,MAAM,MAAM;AAAC,CAAC;AACtF,IAAM,cAAc,OAAO,wBAAwB;AAAG,YAAY,MAAM,MAAM;AAAC,CAAC;AAChF,IAAM,gBAAgB,OAAO,0BAA0B;AAAG,cAAc,MAAM,MAAM;AAAC,CAAC;AAYtF,IAAM,eAAyD;AAAA,EAC7D,eAAe;AAAA,EACf,WAAW;AAAA,EACX,SAAS;AAAA,EACT,uBAAuB;AAAA,EACvB,qBAAqB;AAAA,EACrB,wBAAwB;AAAA,EACxB,gBAAgB;AAClB;AAEe,SAAR,YAAkB,SAAwB;AAC/C,aAAW,UAAU,SAAS;AAC5B,QAAI,CAAC,aAAa,MAAM,GAAG;AACzB,YAAM,IAAI,MAAM,0BAAqB,MAAM,2BAA2B,OAAO,KAAK,YAAY,EAAE,KAAK,IAAI,CAAC,EAAE;AAAA,IAC9G;AACA,QAAG,QAAQ,MAAM,MAAM,UAAa,OAAO,QAAQ,MAAM,MAAO,aAAa,MAAM,GAAG;AACpF,YAAM,IAAI,MAAM,2BAAsB,MAAM,sBAAsB,aAAa,MAAM,CAAC,SAAS;AAAA,IACjG;AAAA,EACF;AAEA,SAAO;AACT;AAOA,eAAsB,OAClB,SACA,OAAe,OAAO,QAAQ,IAAI,QAAQ,IAAI,GAChD;AAEE,MAAI,QAAQ,IAAI,mBAAmB,QAAW;AAC1C,WAAO;AAAA,EACX;AAMA,QAAM,gBAAgB,OAAO,QAAQ,IAAI,qBAAqB,GAAG;AACjE,UAAQ;AAER,MAAI;AACJ,MAAI,cAAc;AAElB,MAAI,mBAAmB,QAAQ;AAC3B,iBAAa;AAAA,EAEjB,OAAO;AACH,iBAAa,MAAM,uBAAuB,SAAS,IAAI;AACvD,kBAAc,QAAQ;AAEtB,UAAM,QAAQ,uBAAuB,UAAU;AAC/C,UAAM,WAAW;AACjB,UAAM,QAAQ,eAAe;AAAA,EACjC;AAEA,MAAI,QAAQ,IAAI,mBAAmB,QAAW;AAE1C,UAAM,aAAkB,iBAAiB,IAAI;AAI7C,UAAM,wBAAwB,UAAU;AAExC,UAAM,WAAW,OAAO,UAAU;AAAA,EAEtC,OAAO;AAEH,UAAM,WAAW,OAAO,IAAI;AAAA,EAChC;AAGA,MAAI,OAAO,QAAQ,SAAU,YAAY;AACrC,YAAQ,KAAK,OAAO;AAAA,EACxB;AAEA,MAAI,aAAa;AACb,WAAO,KAAK,+CAAqC,IAAI,EAAE;AAAA,EAC3D;AAEA,SAAO;AACX;AAEA,eAAe,uBAAuB,SAAwB,MAAc;AAC1E,QAAM,gBAAgB,QAAQ,WAAW,CAAC;AAC1C,UAAQ,cAAc,QAAQ,eAAe;AAG7C,MAAI,QAAQ,IAAI,mBAAmB,QAAW;AAG5C,UAAM,iBAAkB,GAAG,KAAK,EAAE,SAAS,KAAO,QAAQ,IAAI,cAAc;AAE5E,QAAI,CAAC,cAAc,UAAU,gBAAgB;AAC3C,UAAI;AACF,cAAM,SAAS,MAAM;AACrB,sBAAc,SAAS,IAAI,OAAO,YAAY,QAAQ,IAAI,SAAS;AAAA,MACrE,SAAS,GAAG;AACV,gBAAQ,MAAM,CAAC;AACf,eAAO,KAAK,EAAE;AACd,eAAO,KAAK,0CAAqC;AACjD,eAAO,KAAK,qDAA8C;AAC1D,eAAO,KAAK,EAAE;AAAA,MAChB;AAAA,IACF;AAEA,QAAI,CAAC,cAAc,YAAY,gBAAgB;AAC7C,UAAI;AACF,cAAM,SAAS,MAAM;AACrB,sBAAc,WAAW,IAAI,OAAO,cAAc,QAAQ,IAAI,SAAS;AAAA,MACzE,SAAS,GAAG;AACV,gBAAQ,MAAM,CAAC;AACf,eAAO,KAAK,EAAE;AACd,eAAO,KAAK,4CAAuC;AACnD,eAAO,KAAK,uDAAgD;AAC5D,eAAO,KAAK,EAAE;AAAA,MAChB;AAAA,IACF;AAEA,QAAI,gBAAgB;AAElB,oBAAc,gBAAgB,QAAQ,IAAI,YAAY,MAAM,QAAQ,IAAI;AAGxE,oBAAc,iBAAiB,MAAM;AAAA,IACvC;AAAA,EACF;AAEA,QAAM,YAAY,MAAM,aAAa,OAAO;AAC5C,SAAO,IAAI,OAAO;AAAA,IAChB,GAAG;AAAA,IACH;AAAA,EACF,CAAC;AACH;AAEA,eAAsB,aAAa,SAAwB;AACvD,MAAI;AAEJ,MAAI,CAAC,QAAQ,qBAAqB;AAE9B,QAAI,OAAO,QAAQ,aAAa;AAE9B,oBAAc,MAAM,MAAM;AACxB,eAAO,KAAK,EAAE;AACd,eAAO,KAAK,4CAAuC;AACnD,eAAO,KAAK,uDAAgD;AAC5D,eAAO,KAAK,EAAE;AAAA,MAChB,CAAC;AACD,YAAM,SAAS,MAAM;AACrB,cAAQ,sBAAsB,CAACA,aAAiB,IAAI,OAAO,cAAcA,QAAO;AAAA,IAElF,OAAO;AAEL,cAAQ,sBAAsB,CAACA,aAAiB,IAAI,mBAAmBA,QAAO;AAAA,IAChF;AAAA,EACJ;AAEA,MAAI,MAAmC,QAAQ;AAC/C,MAAI,SAAS,KAAK,aAAa,GAAG;AAElC,cAAY,MAAM,QAAQ,oBAAoB,EAAE,QAAQ,IAAI,CAAC;AAM7D,MAAI,UAAU,YAAY,GAAG;AAC3B,UAAM,UAAU,YAAY;AAAA,EAC9B;AAEA,MAAI,KAAK;AAEP,QAAI,IAAI,KAAK,EAAE,QAAQ,MAAM,aAAa,KAAM,CAAC,CAAC;AAElD,QAAI,QAAQ,mBAAmB;AAC3B,YAAM,QAAQ,kBAAkB,GAAG;AAAA,IACvC;AAGA,QAAI,IAAI,kBAAkB,CAAC,KAAK,QAAQ;AACtC,UAAI,OAAO,GAAG,EAAE,IAAI;AAAA,IACtB,CAAC;AAED,QAAI,QAAQ,aAAa;AACrB,aAAO,KAAK,4BAAuB;AAAA,IACvC;AAAA,EACF;AAEA,SAAO;AACX;AAKA,SAAS,wBAAwB,cAAsB;AACrD,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,UAAM,SAAS,IAAI,iBAAiB,EAAE,MAAM,aAAa,CAAC,EACvD,GAAG,WAAW,MAAM;AAEnB,aAAO,IAAI;AACX,YAAM,IAAI,MAAM,qCAAqC,YAAY,GAAG;AAAA,IACtE,CAAC,EACA,GAAG,SAAS,MAAM;AAEjB,SAAG,OAAO,cAAc,MAAM,QAAQ,IAAI,CAAC;AAAA,IAC7C,CAAC;AAAA,EACL,CAAC;AACH;",
   "names": ["options"]
 }

package/build/loadenv.js

@@ -36,8 +36,12 @@ function getRegion() {
 function loadEnvFile(envFileOptions, log = "none") {
   const envPaths = [];
   envFileOptions.forEach((envFilename) => {
-    envPaths.push(import_path.default.resolve(import_path.default.dirname(require?.main?.filename || process.cwd()), "..", envFilename));
-    envPaths.push(import_path.default.resolve(process.cwd(), envFilename));
+    if (envFilename.startsWith("/")) {
+      envPaths.push(envFilename);
+    } else {
+      envPaths.push(import_path.default.resolve(import_path.default.dirname(require?.main?.filename || process.cwd()), "..", envFilename));
+      envPaths.push(import_path.default.resolve(process.cwd(), envFilename));
+    }
   });
   const envPath = envPaths.find((envPath2) => import_fs.default.existsSync(envPath2));
   if (envPath) {
@@ -49,8 +53,15 @@ function loadEnvFile(envFileOptions, log = "none") {
     console.info(`\u2139\uFE0F  optional .env file not found: ${envFileOptions.join(", ")}`);
   }
 }
+if (import_fs.default.existsSync("/etc/environment")) {
+  import_dotenv.default.config({ path: "/etc/environment", override: true });
+}
 if (process.env.COLYSEUS_CLOUD !== void 0) {
-  loadEnvFile([`.env.cloud`]);
+  const cloudEnvFileNames = [".env.cloud"];
+  if (process.env.APP_ROOT_PATH) {
+    cloudEnvFileNames.unshift(`${process.env.APP_ROOT_PATH}${process.env.APP_ROOT_PATH.endsWith("/") ? "" : "/"}.env.cloud`);
+  }
+  loadEnvFile(cloudEnvFileNames);
 }
 loadEnvFile([`.env.${getNodeEnv()}`, `.env`], "both");
 if (process.env.REGION !== void 0) {

package/build/loadenv.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/loadenv.ts"],
-  "sourcesContent": ["import fs from 'fs';\nimport path from 'path';\nimport dotenv from 'dotenv';\n\nfunction getEnvFromArgv() {\n  const envIndex = process.argv.indexOf(\"--env\");\n  return (envIndex !== -1) ? process.argv[envIndex + 1] : undefined;\n}\n\nfunction getNodeEnv() {\n  return process.env.NODE_ENV || getEnvFromArgv() || \"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            console.info(`\u2705 ${path.basename(envPath)} loaded.`);\n        }\n\n    } else if (log === \"both\") {\n        console.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}"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA,gBAAe;AACf,kBAAiB;AACjB,oBAAmB;AAEnB,SAAS,iBAAiB;AACxB,QAAM,WAAW,QAAQ,KAAK,QAAQ,OAAO;AAC7C,SAAQ,aAAa,KAAM,QAAQ,KAAK,WAAW,CAAC,IAAI;AAC1D;AAEA,SAAS,aAAa;AACpB,SAAO,QAAQ,IAAI,YAAY,eAAe,KAAK;AACrD;AAEA,SAAS,YAAY;AAEnB,UAAQ,QAAQ,IAAI,UAAU,WAAW,YAAY;AACvD;AAEA,SAAS,YAAY,gBAA0B,MAAoC,QAAQ;AACvF,QAAM,WAAW,CAAC;AAClB,iBAAe,QAAQ,CAAC,gBAAgB;AACtC,aAAS,KAAK,YAAAA,QAAK,QAAQ,YAAAA,QAAK,QAAQ,SAAS,MAAM,YAAY,QAAQ,IAAI,CAAC,GAAG,MAAM,WAAW,CAAC;AACrG,aAAS,KAAK,YAAAA,QAAK,QAAQ,QAAQ,IAAI,GAAG,WAAW,CAAC;AAAA,EACxD,CAAC;AAGD,QAAM,UAAU,SAAS,KAAK,CAACC,aAAY,UAAAC,QAAG,WAAWD,QAAO,CAAC;AAEjE,MAAI,SAAS;AACT,kBAAAE,QAAO,OAAO,EAAE,MAAM,QAAQ,CAAC;AAE/B,QAAI,QAAQ,QAAQ;AAChB,cAAQ,KAAK,UAAK,YAAAH,QAAK,SAAS,OAAO,CAAC,UAAU;AAAA,IACtD;AAAA,EAEJ,WAAW,QAAQ,QAAQ;AACvB,YAAQ,KAAK,+CAAqC,eAAe,KAAK,IAAI,CAAC,EAAE;AAAA,EACjF;AACJ;AAGA,IAAI,QAAQ,IAAI,mBAAmB,QAAW;AAC1C,cAAY,CAAC,YAAY,CAAC;AAC9B;AAGA,YAAY,CAAC,QAAQ,WAAW,CAAC,IAAI,MAAM,GAAG,MAAM;AAEpD,IAAI,QAAQ,IAAI,WAAW,QAAW;AACpC,cAAY,CAAC,QAAQ,UAAU,CAAC,IAAI,WAAW,CAAC,EAAE,GAAG,SAAS;AAChE;",
+  "sourcesContent": ["import fs from 'fs';\nimport path from 'path';\nimport dotenv from 'dotenv';\n\nfunction getEnvFromArgv() {\n  const envIndex = process.argv.indexOf(\"--env\");\n  return (envIndex !== -1) ? process.argv[envIndex + 1] : undefined;\n}\n\nfunction getNodeEnv() {\n  return process.env.NODE_ENV || getEnvFromArgv() || \"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      if (envFilename.startsWith(\"/\")) {\n        envPaths.push(envFilename);\n      } else {\n        envPaths.push(path.resolve(path.dirname(require?.main?.filename || process.cwd()), \"..\", envFilename));\n        envPaths.push(path.resolve(process.cwd(), envFilename));\n      }\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            console.info(`\u2705 ${path.basename(envPath)} loaded.`);\n        }\n\n    } else if (log === \"both\") {\n        console.info(`\u2139\uFE0F  optional .env file not found: ${envFileOptions.join(\", \")}`);\n    }\n}\n\n// reload /etc/environment, if exists\nif (fs.existsSync(\"/etc/environment\")) {\n  dotenv.config({ path: \"/etc/environment\", override: true })\n}\n\n// load .env.cloud defined on admin panel\nif (process.env.COLYSEUS_CLOUD !== undefined) {\n    const cloudEnvFileNames = [\".env.cloud\"];\n\n    // prepend .env.cloud file from APP_ROOT_PATH\n    if (process.env.APP_ROOT_PATH) {\n      cloudEnvFileNames.unshift(`${process.env.APP_ROOT_PATH}${(process.env.APP_ROOT_PATH.endsWith(\"/\") ? \"\" : \"/\")}.env.cloud`);\n    }\n\n    loadEnvFile(cloudEnvFileNames);\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}"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA,gBAAe;AACf,kBAAiB;AACjB,oBAAmB;AAEnB,SAAS,iBAAiB;AACxB,QAAM,WAAW,QAAQ,KAAK,QAAQ,OAAO;AAC7C,SAAQ,aAAa,KAAM,QAAQ,KAAK,WAAW,CAAC,IAAI;AAC1D;AAEA,SAAS,aAAa;AACpB,SAAO,QAAQ,IAAI,YAAY,eAAe,KAAK;AACrD;AAEA,SAAS,YAAY;AAEnB,UAAQ,QAAQ,IAAI,UAAU,WAAW,YAAY;AACvD;AAEA,SAAS,YAAY,gBAA0B,MAAoC,QAAQ;AACvF,QAAM,WAAW,CAAC;AAClB,iBAAe,QAAQ,CAAC,gBAAgB;AACtC,QAAI,YAAY,WAAW,GAAG,GAAG;AAC/B,eAAS,KAAK,WAAW;AAAA,IAC3B,OAAO;AACL,eAAS,KAAK,YAAAA,QAAK,QAAQ,YAAAA,QAAK,QAAQ,SAAS,MAAM,YAAY,QAAQ,IAAI,CAAC,GAAG,MAAM,WAAW,CAAC;AACrG,eAAS,KAAK,YAAAA,QAAK,QAAQ,QAAQ,IAAI,GAAG,WAAW,CAAC;AAAA,IACxD;AAAA,EACF,CAAC;AAGD,QAAM,UAAU,SAAS,KAAK,CAACC,aAAY,UAAAC,QAAG,WAAWD,QAAO,CAAC;AAEjE,MAAI,SAAS;AACT,kBAAAE,QAAO,OAAO,EAAE,MAAM,QAAQ,CAAC;AAE/B,QAAI,QAAQ,QAAQ;AAChB,cAAQ,KAAK,UAAK,YAAAH,QAAK,SAAS,OAAO,CAAC,UAAU;AAAA,IACtD;AAAA,EAEJ,WAAW,QAAQ,QAAQ;AACvB,YAAQ,KAAK,+CAAqC,eAAe,KAAK,IAAI,CAAC,EAAE;AAAA,EACjF;AACJ;AAGA,IAAI,UAAAE,QAAG,WAAW,kBAAkB,GAAG;AACrC,gBAAAC,QAAO,OAAO,EAAE,MAAM,oBAAoB,UAAU,KAAK,CAAC;AAC5D;AAGA,IAAI,QAAQ,IAAI,mBAAmB,QAAW;AAC1C,QAAM,oBAAoB,CAAC,YAAY;AAGvC,MAAI,QAAQ,IAAI,eAAe;AAC7B,sBAAkB,QAAQ,GAAG,QAAQ,IAAI,aAAa,GAAI,QAAQ,IAAI,cAAc,SAAS,GAAG,IAAI,KAAK,GAAI,YAAY;AAAA,EAC3H;AAEA,cAAY,iBAAiB;AACjC;AAGA,YAAY,CAAC,QAAQ,WAAW,CAAC,IAAI,MAAM,GAAG,MAAM;AAEpD,IAAI,QAAQ,IAAI,WAAW,QAAW;AACpC,cAAY,CAAC,QAAQ,UAAU,CAAC,IAAI,WAAW,CAAC,EAAE,GAAG,SAAS;AAChE;",
   "names": ["path", "envPath", "fs", "dotenv"]
 }

package/build/loadenv.mjs

@@ -22,8 +22,12 @@ function getRegion() {
 function loadEnvFile(envFileOptions, log = "none") {
   const envPaths = [];
   envFileOptions.forEach((envFilename) => {
-    envPaths.push(path.resolve(path.dirname(__require?.main?.filename || process.cwd()), "..", envFilename));
-    envPaths.push(path.resolve(process.cwd(), envFilename));
+    if (envFilename.startsWith("/")) {
+      envPaths.push(envFilename);
+    } else {
+      envPaths.push(path.resolve(path.dirname(__require?.main?.filename || process.cwd()), "..", envFilename));
+      envPaths.push(path.resolve(process.cwd(), envFilename));
+    }
   });
   const envPath = envPaths.find((envPath2) => fs.existsSync(envPath2));
   if (envPath) {
@@ -35,8 +39,15 @@ function loadEnvFile(envFileOptions, log = "none") {
     console.info(`\u2139\uFE0F  optional .env file not found: ${envFileOptions.join(", ")}`);
   }
 }
+if (fs.existsSync("/etc/environment")) {
+  dotenv.config({ path: "/etc/environment", override: true });
+}
 if (process.env.COLYSEUS_CLOUD !== void 0) {
-  loadEnvFile([`.env.cloud`]);
+  const cloudEnvFileNames = [".env.cloud"];
+  if (process.env.APP_ROOT_PATH) {
+    cloudEnvFileNames.unshift(`${process.env.APP_ROOT_PATH}${process.env.APP_ROOT_PATH.endsWith("/") ? "" : "/"}.env.cloud`);
+  }
+  loadEnvFile(cloudEnvFileNames);
 }
 loadEnvFile([`.env.${getNodeEnv()}`, `.env`], "both");
 if (process.env.REGION !== void 0) {

package/build/loadenv.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/loadenv.ts"],
-  "sourcesContent": ["import fs from 'fs';\nimport path from 'path';\nimport dotenv from 'dotenv';\n\nfunction getEnvFromArgv() {\n  const envIndex = process.argv.indexOf(\"--env\");\n  return (envIndex !== -1) ? process.argv[envIndex + 1] : undefined;\n}\n\nfunction getNodeEnv() {\n  return process.env.NODE_ENV || getEnvFromArgv() || \"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            console.info(`\u2705 ${path.basename(envPath)} loaded.`);\n        }\n\n    } else if (log === \"both\") {\n        console.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}"],
-  "mappings": ";;;;;;;;AAAA,OAAO,QAAQ;AACf,OAAO,UAAU;AACjB,OAAO,YAAY;AAEnB,SAAS,iBAAiB;AACxB,QAAM,WAAW,QAAQ,KAAK,QAAQ,OAAO;AAC7C,SAAQ,aAAa,KAAM,QAAQ,KAAK,WAAW,CAAC,IAAI;AAC1D;AAEA,SAAS,aAAa;AACpB,SAAO,QAAQ,IAAI,YAAY,eAAe,KAAK;AACrD;AAEA,SAAS,YAAY;AAEnB,UAAQ,QAAQ,IAAI,UAAU,WAAW,YAAY;AACvD;AAEA,SAAS,YAAY,gBAA0B,MAAoC,QAAQ;AACvF,QAAM,WAAW,CAAC;AAClB,iBAAe,QAAQ,CAAC,gBAAgB;AACtC,aAAS,KAAK,KAAK,QAAQ,KAAK,QAAQ,WAAS,MAAM,YAAY,QAAQ,IAAI,CAAC,GAAG,MAAM,WAAW,CAAC;AACrG,aAAS,KAAK,KAAK,QAAQ,QAAQ,IAAI,GAAG,WAAW,CAAC;AAAA,EACxD,CAAC;AAGD,QAAM,UAAU,SAAS,KAAK,CAACA,aAAY,GAAG,WAAWA,QAAO,CAAC;AAEjE,MAAI,SAAS;AACT,WAAO,OAAO,EAAE,MAAM,QAAQ,CAAC;AAE/B,QAAI,QAAQ,QAAQ;AAChB,cAAQ,KAAK,UAAK,KAAK,SAAS,OAAO,CAAC,UAAU;AAAA,IACtD;AAAA,EAEJ,WAAW,QAAQ,QAAQ;AACvB,YAAQ,KAAK,+CAAqC,eAAe,KAAK,IAAI,CAAC,EAAE;AAAA,EACjF;AACJ;AAGA,IAAI,QAAQ,IAAI,mBAAmB,QAAW;AAC1C,cAAY,CAAC,YAAY,CAAC;AAC9B;AAGA,YAAY,CAAC,QAAQ,WAAW,CAAC,IAAI,MAAM,GAAG,MAAM;AAEpD,IAAI,QAAQ,IAAI,WAAW,QAAW;AACpC,cAAY,CAAC,QAAQ,UAAU,CAAC,IAAI,WAAW,CAAC,EAAE,GAAG,SAAS;AAChE;",
+  "sourcesContent": ["import fs from 'fs';\nimport path from 'path';\nimport dotenv from 'dotenv';\n\nfunction getEnvFromArgv() {\n  const envIndex = process.argv.indexOf(\"--env\");\n  return (envIndex !== -1) ? process.argv[envIndex + 1] : undefined;\n}\n\nfunction getNodeEnv() {\n  return process.env.NODE_ENV || getEnvFromArgv() || \"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      if (envFilename.startsWith(\"/\")) {\n        envPaths.push(envFilename);\n      } else {\n        envPaths.push(path.resolve(path.dirname(require?.main?.filename || process.cwd()), \"..\", envFilename));\n        envPaths.push(path.resolve(process.cwd(), envFilename));\n      }\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            console.info(`\u2705 ${path.basename(envPath)} loaded.`);\n        }\n\n    } else if (log === \"both\") {\n        console.info(`\u2139\uFE0F  optional .env file not found: ${envFileOptions.join(\", \")}`);\n    }\n}\n\n// reload /etc/environment, if exists\nif (fs.existsSync(\"/etc/environment\")) {\n  dotenv.config({ path: \"/etc/environment\", override: true })\n}\n\n// load .env.cloud defined on admin panel\nif (process.env.COLYSEUS_CLOUD !== undefined) {\n    const cloudEnvFileNames = [\".env.cloud\"];\n\n    // prepend .env.cloud file from APP_ROOT_PATH\n    if (process.env.APP_ROOT_PATH) {\n      cloudEnvFileNames.unshift(`${process.env.APP_ROOT_PATH}${(process.env.APP_ROOT_PATH.endsWith(\"/\") ? \"\" : \"/\")}.env.cloud`);\n    }\n\n    loadEnvFile(cloudEnvFileNames);\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}"],
+  "mappings": ";;;;;;;;AAAA,OAAO,QAAQ;AACf,OAAO,UAAU;AACjB,OAAO,YAAY;AAEnB,SAAS,iBAAiB;AACxB,QAAM,WAAW,QAAQ,KAAK,QAAQ,OAAO;AAC7C,SAAQ,aAAa,KAAM,QAAQ,KAAK,WAAW,CAAC,IAAI;AAC1D;AAEA,SAAS,aAAa;AACpB,SAAO,QAAQ,IAAI,YAAY,eAAe,KAAK;AACrD;AAEA,SAAS,YAAY;AAEnB,UAAQ,QAAQ,IAAI,UAAU,WAAW,YAAY;AACvD;AAEA,SAAS,YAAY,gBAA0B,MAAoC,QAAQ;AACvF,QAAM,WAAW,CAAC;AAClB,iBAAe,QAAQ,CAAC,gBAAgB;AACtC,QAAI,YAAY,WAAW,GAAG,GAAG;AAC/B,eAAS,KAAK,WAAW;AAAA,IAC3B,OAAO;AACL,eAAS,KAAK,KAAK,QAAQ,KAAK,QAAQ,WAAS,MAAM,YAAY,QAAQ,IAAI,CAAC,GAAG,MAAM,WAAW,CAAC;AACrG,eAAS,KAAK,KAAK,QAAQ,QAAQ,IAAI,GAAG,WAAW,CAAC;AAAA,IACxD;AAAA,EACF,CAAC;AAGD,QAAM,UAAU,SAAS,KAAK,CAACA,aAAY,GAAG,WAAWA,QAAO,CAAC;AAEjE,MAAI,SAAS;AACT,WAAO,OAAO,EAAE,MAAM,QAAQ,CAAC;AAE/B,QAAI,QAAQ,QAAQ;AAChB,cAAQ,KAAK,UAAK,KAAK,SAAS,OAAO,CAAC,UAAU;AAAA,IACtD;AAAA,EAEJ,WAAW,QAAQ,QAAQ;AACvB,YAAQ,KAAK,+CAAqC,eAAe,KAAK,IAAI,CAAC,EAAE;AAAA,EACjF;AACJ;AAGA,IAAI,GAAG,WAAW,kBAAkB,GAAG;AACrC,SAAO,OAAO,EAAE,MAAM,oBAAoB,UAAU,KAAK,CAAC;AAC5D;AAGA,IAAI,QAAQ,IAAI,mBAAmB,QAAW;AAC1C,QAAM,oBAAoB,CAAC,YAAY;AAGvC,MAAI,QAAQ,IAAI,eAAe;AAC7B,sBAAkB,QAAQ,GAAG,QAAQ,IAAI,aAAa,GAAI,QAAQ,IAAI,cAAc,SAAS,GAAG,IAAI,KAAK,GAAI,YAAY;AAAA,EAC3H;AAEA,cAAY,iBAAiB;AACjC;AAGA,YAAY,CAAC,QAAQ,WAAW,CAAC,IAAI,MAAM,GAAG,MAAM;AAEpD,IAAI,QAAQ,IAAI,WAAW,QAAW;AACpC,cAAY,CAAC,QAAQ,UAAU,CAAC,IAAI,WAAW,CAAC,EAAE,GAAG,SAAS;AAChE;",
   "names": ["envPath"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colyseus/tools",
-  "version": "0.16.12",
+  "version": "0.16.14",
   "description": "Simplify the development and production settings for your Colyseus project.",
   "input": "./src/index.ts",
   "main": "./build/index.js",
@@ -43,19 +43,19 @@
   "dependencies": {
     "@pm2/io": "^6.0.1",
     "cors": "^2.8.5",
-    "dotenv": "^8.2.0",
+    "dotenv": ">=14.1.0",
     "express": ">=4.16.0"
   },
   "devDependencies": {
     "@types/cors": "^2.8.10",
     "@types/dotenv": "^8.2.0",
     "uwebsockets-express": "^1.1.10",
-    "@colyseus/bun-websockets": "^0.16.4",
-    "@colyseus/core": "^0.16.18",
-    "@colyseus/redis-driver": "^0.16.1",
     "@colyseus/ws-transport": "^0.16.5",
-    "@colyseus/redis-presence": "^0.16.3",
-    "@colyseus/uwebsockets-transport": "^0.16.9"
+    "@colyseus/redis-presence": "^0.16.4",
+    "@colyseus/bun-websockets": "^0.16.5",
+    "@colyseus/redis-driver": "^0.16.1",
+    "@colyseus/core": "^0.16.21",
+    "@colyseus/uwebsockets-transport": "^0.16.10"
   },
   "peerDependencies": {
     "@colyseus/core": "0.16.x",