@colyseus/core 0.17.32 → 0.17.33

package/LICENSE

@@ -1,6 +1,4 @@
-Copyright (c) 2023 Endel Dreyer
-Copyright (c) 2021-2022 Lucid Sight
-Copyright (c) 2015-2021 Endel Dreyer
+Copyright (c) 2015-2026 Endel Dreyer
 
 MIT License:
 

package/README.md

@@ -7,19 +7,19 @@
   <a href="https://npmjs.com/package/colyseus">
     <img src="https://img.shields.io/npm/dm/colyseus.svg?style=for-the-badge&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAAHdElNRQfjAgETESWYxR33AAAAtElEQVQoz4WQMQrCQBRE38Z0QoTcwF4Qg1h4BO0sxGOk80iCtViksrIQRRBTewWxMI1mbELYjYu+4rPMDPtn12ChMT3gavb4US5Jym0tcBIta3oDHv4Gwmr7nC4QAxBrCdzM2q6XqUnm9m9r59h7Rc0n2pFv24k4ttGMUXW+sGELTJjSr7QDKuqLS6UKFChVWWuFkZw9Z2AAvAirKT+JTlppIRnd6XgaP4goefI2Shj++OnjB3tBmHYK8z9zAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE5LTAyLTAxVDE4OjE3OjM3KzAxOjAwGQQixQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOS0wMi0wMVQxODoxNzozNyswMTowMGhZmnkAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC">
   </a>
-  <a href="https://github.com/colyseus/colyseus/discussions" title="Discuss on Forum">
-    <img src="https://img.shields.io/badge/discuss-on%20forum-brightgreen.svg?style=for-the-badge&colorB=0069b8&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAAHdElNRQfjAgETDROxCNUzAAABB0lEQVQoz4WRvyvEARjGP193CnWRH+dHQmGwKZtFGcSmxHAL400GN95ktIpV2dzlLzDJgsGgGNRdDAzoQueS/PgY3HXHyT3T+/Y87/s89UANBKXBdoZo5J6L4K1K5ZxHfnjnlQUf3bKvkgy57a0r9hS3cXfMO1kWJMza++tj3Ac7/LY343x1NA9cNmYMwnSS/SP8JVFuSJmr44iFqvtmpjhmhBCrOOazCesq6H4P3bPBjFoIBydOk2bUA17I080Es+wSZ51B4DIA2zgjSpYcEe44Js01G0XjRcCU+y4ZMrDeLmfc9EnVd5M/o0VMeu6nJZxWJivLmhyw1WHTvrr2b4+2OFqra+ALwouTMDcqmjMAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTktMDItMDFUMTg6MTM6MTkrMDE6MDAC9f6fAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE5LTAyLTAxVDE4OjEzOjE5KzAxOjAwc6hGIwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAASUVORK5CYII=" alt="Discussion forum" />
-  </a>
   <a href="http://chat.colyseus.io">
     <img src="https://img.shields.io/discord/525739117951320081.svg?style=for-the-badge&colorB=7581dc&logo=discord&logoColor=white">
   </a>
+  <a href="https://github.com/colyseus/colyseus/discussions" title="Discuss Forum">
+    <img src="https://img.shields.io/badge/discuss-forum-brightgreen.svg?style=for-the-badge&colorB=0069b8&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAAHdElNRQfjAgETDROxCNUzAAABB0lEQVQoz4WRvyvEARjGP193CnWRH+dHQmGwKZtFGcSmxHAL400GN95ktIpV2dzlLzDJgsGgGNRdDAzoQueS/PgY3HXHyT3T+/Y87/s89UANBKXBdoZo5J6L4K1K5ZxHfnjnlQUf3bKvkgy57a0r9hS3cXfMO1kWJMza++tj3Ac7/LY343x1NA9cNmYMwnSS/SP8JVFuSJmr44iFqvtmpjhmhBCrOOazCesq6H4P3bPBjFoIBydOk2bUA17I080Es+wSZ51B4DIA2zgjSpYcEe44Js01G0XjRcCU+y4ZMrDeLmfc9EnVd5M/o0VMeu6nJZxWJivLmhyw1WHTvrr2b4+2OFqra+ALwouTMDcqmjMAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTktMDItMDFUMTg6MTM6MTkrMDE6MDAC9f6fAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE5LTAyLTAxVDE4OjEzOjE5KzAxOjAwc6hGIwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAASUVORK5CYII=" alt="Discussion forum" />
+  </a>
   <h3>
     Multiplayer Framework for Node.js. <br /><a href="https://docs.colyseus.io/">View documentation</a>
   </h3>
 </div>
 
-Colyseus is an Authoritative Multiplayer Framework for Node.js, with clients
-available for the Web, Unity3d, Defold, Haxe, and Cocos. ([See official clients](#%EF%B8%8F-official-client-integration))
+Colyseus is an Authoritative Multiplayer Framework for Node.js, with SDKs
+available for the Web, Unity, Defold, Haxe, Cocos and Construct3. ([See official SDKs](https://docs.colyseus.io/client/))
 
 The project focuses on providing synchronizable data structures for realtime and
 turn-based games, matchmaking, and ease of usage both on the server-side and
@@ -36,7 +36,7 @@ for any kind of project you can think of!
 - Matchmaking clients into game rooms/sessions
 - Scale vertically or horizontally
 
-See [public roadmap](https://github.com/colyseus/colyseus/wiki/Public-Roadmap) for future plans.
+See [public roadmap](https://docs.colyseus.io/roadmap) for version 1.0.
 
 # 🚀 Quickstart
 
@@ -87,7 +87,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
     <td align="center"><a href="https://github.com/TinyDobbins"><img src="https://avatars2.githubusercontent.com/u/20824844?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikita Borisov</b></sub></a><br /><a href="https://github.com/colyseus/colyseus/issues?q=author%3ATinyDobbins" title="Bug reports">🐛</a> <a href="https://github.com/colyseus/colyseus/commits?author=TinyDobbins" title="Code">💻</a> <a href="#business-TinyDobbins" title="Business development">💼</a> <a href="#ideas-TinyDobbins" title="Ideas, Planning, & Feedback">🤔</a></td>
     <td align="center"><a href="https://acemobe.com/"><img src="https://avatars2.githubusercontent.com/u/232101?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Phil Harvey</b></sub></a><br /><a href="https://github.com/colyseus/colyseus/commits?author=filharvey" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/serjek"><img src="https://avatars2.githubusercontent.com/u/18265157?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey</b></sub></a><br /><a href="https://github.com/colyseus/colyseus/issues?q=author%3Aserjek" title="Bug reports">🐛</a> <a href="https://github.com/colyseus/colyseus/commits?author=serjek" title="Code">💻</a></td>
-    <td align="center"><a href="https://oyed.io"><img src="https://avatars0.githubusercontent.com/u/853683?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tom</b></sub></a><br /><a href="#question-oyed" title="Answering Questions">💬</a> <a href="https://github.com/colyseus/colyseus/issues?q=author%3Aoyed" title="Bug reports">🐛</a> <a href="#ideas-oyed" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://devlsh.com"><img src="https://avatars0.githubusercontent.com/u/853683?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sophie</b></sub></a><br /><a href="#question-devlsh" title="Answering Questions">💬</a> <a href="https://github.com/colyseus/colyseus/issues?q=author%3Adevlsh" title="Bug reports">🐛</a> <a href="#ideas-devlsh" title="Ideas, Planning, & Feedback">🤔</a></td>
     <td align="center"><a href="https://github.com/supertommy"><img src="https://avatars0.githubusercontent.com/u/2236153?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tommy Leung</b></sub></a><br /><a href="#mentoring-supertommy" title="Mentoring">🧑‍🏫</a></td>
     <td align="center"><a href="https://github.com/digimbyte"><img src="https://avatars2.githubusercontent.com/u/6645396?v=4?s=100" width="100px;" alt=""/><br /><sub><b>digimbyte</b></sub></a><br /><a href="https://github.com/colyseus/colyseus/commits?author=digimbyte" title="Documentation">📖</a></td>
   </tr>

package/build/router/index.cjs

@@ -65,11 +65,20 @@ function bindRouterToTransport(transport, router) {
     transport.bindRouter(router);
     return;
   }
-  let next = (0, import_node.toNodeHandler)(router.handler);
+  let next;
   if (expressApp) {
     server.removeListener("request", expressApp);
-    expressApp.use(next);
-    next = expressApp;
+    next = async (req, res) => {
+      const protocol = req.headers["x-forwarded-proto"] || (req.socket.encrypted ? "https" : "http");
+      const base = `${protocol}://${req.headers[":authority"] || req.headers.host}`;
+      const response = await router.handler((0, import_node.getRequest)({ base, request: req }));
+      if (response.status === 404) {
+        return expressApp["handle"](req, res);
+      }
+      return (0, import_node.setResponse)(res, response);
+    };
+  } else {
+    next = (0, import_node.toNodeHandler)(router.handler);
   }
   server.prependListener("request", (req, res) => {
     const corsHeaders = {

package/build/router/index.cjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/router/index.ts"],
-  "sourcesContent": ["import type express from \"express\";\nimport type { IncomingMessage, ServerResponse } from \"http\";\nimport { type Endpoint, type Router, type RouterConfig, createRouter as createBetterCallRouter, createEndpoint } from \"@colyseus/better-call\";\nimport { toNodeHandler } from \"@colyseus/better-call/node\";\nimport { Transport } from \"../Transport.ts\";\nimport { controller } from \"../matchmaker/controller.ts\";\nimport pkg from \"../../package.json\" with { type: \"json\" };\n\nexport {\n  createEndpoint,\n  createMiddleware,\n  createInternalContext,\n\n  // Re-export types needed for declaration emit\n  type Router,\n  type RouterConfig,\n  type Endpoint,\n  type EndpointHandler,\n  type EndpointOptions,\n  type EndpointContext,\n  type StrictEndpoint,\n} from \"@colyseus/better-call\";\n\nexport { toNodeHandler };\n\nexport function bindRouterToTransport(transport: Transport, router: Router) {\n  // add default \"/__healthcheck\" endpoint\n  router.addEndpoint(createEndpoint(\"/__healthcheck\", { method: \"GET\" }, async (ctx) => {\n    return new Response(\"OK\", { status: 200 });\n  }));\n\n  // check if the server is bound to an express app\n  const expressApp = transport.getExpressApp() as express.Application;\n\n  // add default \"/\" route, if not provided.\n  const hasRootRoute = (\n    // check if express app has a root route\n    expressRootRoute(expressApp) !== undefined ||\n\n    // check if router has a root route\n    Object.values(router.endpoints).some(endpoint => endpoint.path === \"/\")\n  );\n\n  if (!hasRootRoute) {\n    router.addEndpoint(createEndpoint(\"/\", { method: \"GET\" }, async (ctx) => {\n      return new Response(`Colyseus ${pkg.version}`, { status: 200 });\n    }));\n  }\n\n  const server = transport.server;\n\n  // use custom bindRouter method if provided\n  if (!server && transport.bindRouter) {\n    transport.bindRouter(router);\n    return;\n  }\n\n  // main router handler\n  let next: any = toNodeHandler(router.handler);\n\n  if (expressApp) {\n    server.removeListener('request', expressApp);\n\n    // bind the router to the express app\n    expressApp.use(next);\n\n    // use the express app as the next function\n    next = expressApp;\n  }\n\n  // handle cors headers for all requests by default\n  server.prependListener('request', (req: IncomingMessage, res: ServerResponse) => {\n    const corsHeaders = {\n      ...controller.DEFAULT_CORS_HEADERS,\n      ...controller.getCorsHeaders(new Headers(req.headers as any)),\n    };\n\n    if (req.method === \"OPTIONS\") {\n      res.writeHead(204, corsHeaders);\n      res.end();\n      return;\n    }\n\n    Object.entries(corsHeaders).forEach(([key, value]) => {\n      res.setHeader(key, value);\n    });\n\n    next(req, res);\n  });\n}\n\nfunction expressRootRoute(expressApp: express.Application) {\n  //\n  // express v5 uses `app.router`, express v4 uses `app._router`\n  // check for `app._router` first, then `app.router`\n  //\n  // (express v4 will show a warning if `app.router` is used)\n  //\n  const stack = (expressApp as any)?._router?.stack ?? (expressApp as any)?.router?.stack;\n\n  if (!stack) {\n    return false;\n  }\n\n  return stack.find((layer: any) => layer.match('/') && !['query', 'expressInit'].includes(layer.name));\n}\n\n/**\n * Do not use this directly. This is used internally by `@colyseus/playground`.\n * TODO: refactor. Avoid using globals.\n * @internal\n */\nexport let __globalEndpoints: Record<string, Endpoint> = {};\n\nexport function createRouter<\n  E extends Record<string, Endpoint>,\n  Config extends RouterConfig\n>(endpoints: E, config: Config = {} as Config) {\n  // TODO: refactor. Avoid using globals.\n  __globalEndpoints = endpoints;\n\n  return createBetterCallRouter({ ...endpoints }, config);\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,yBAAsH;AACtH,kBAA8B;AAC9B,uBAA0B;AAC1B,wBAA2B;AAC3B,qBAAgB;AAEhB,IAAAA,sBAaO;AAIA,SAAS,sBAAsB,WAAsB,QAAgB;AAE1E,SAAO,gBAAY,mCAAe,kBAAkB,EAAE,QAAQ,MAAM,GAAG,OAAO,QAAQ;AACpF,WAAO,IAAI,SAAS,MAAM,EAAE,QAAQ,IAAI,CAAC;AAAA,EAC3C,CAAC,CAAC;AAGF,QAAM,aAAa,UAAU,cAAc;AAG3C,QAAM;AAAA;AAAA,IAEJ,iBAAiB,UAAU,MAAM;AAAA,IAGjC,OAAO,OAAO,OAAO,SAAS,EAAE,KAAK,cAAY,SAAS,SAAS,GAAG;AAAA;AAGxE,MAAI,CAAC,cAAc;AACjB,WAAO,gBAAY,mCAAe,KAAK,EAAE,QAAQ,MAAM,GAAG,OAAO,QAAQ;AACvE,aAAO,IAAI,SAAS,YAAY,eAAAC,QAAI,OAAO,IAAI,EAAE,QAAQ,IAAI,CAAC;AAAA,IAChE,CAAC,CAAC;AAAA,EACJ;AAEA,QAAM,SAAS,UAAU;AAGzB,MAAI,CAAC,UAAU,UAAU,YAAY;AACnC,cAAU,WAAW,MAAM;AAC3B;AAAA,EACF;AAGA,MAAI,WAAY,2BAAc,OAAO,OAAO;AAE5C,MAAI,YAAY;AACd,WAAO,eAAe,WAAW,UAAU;AAG3C,eAAW,IAAI,IAAI;AAGnB,WAAO;AAAA,EACT;AAGA,SAAO,gBAAgB,WAAW,CAAC,KAAsB,QAAwB;AAC/E,UAAM,cAAc;AAAA,MAClB,GAAG,6BAAW;AAAA,MACd,GAAG,6BAAW,eAAe,IAAI,QAAQ,IAAI,OAAc,CAAC;AAAA,IAC9D;AAEA,QAAI,IAAI,WAAW,WAAW;AAC5B,UAAI,UAAU,KAAK,WAAW;AAC9B,UAAI,IAAI;AACR;AAAA,IACF;AAEA,WAAO,QAAQ,WAAW,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM;AACpD,UAAI,UAAU,KAAK,KAAK;AAAA,IAC1B,CAAC;AAED,SAAK,KAAK,GAAG;AAAA,EACf,CAAC;AACH;AAEA,SAAS,iBAAiB,YAAiC;AAOzD,QAAM,QAAS,YAAoB,SAAS,SAAU,YAAoB,QAAQ;AAElF,MAAI,CAAC,OAAO;AACV,WAAO;AAAA,EACT;AAEA,SAAO,MAAM,KAAK,CAAC,UAAe,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,MAAM,IAAI,CAAC;AACtG;AAOO,IAAI,oBAA8C,CAAC;AAEnD,SAAS,aAGd,WAAc,SAAiB,CAAC,GAAa;AAE7C,sBAAoB;AAEpB,aAAO,mBAAAC,cAAuB,EAAE,GAAG,UAAU,GAAG,MAAM;AACxD;",
+  "sourcesContent": ["import type express from \"express\";\nimport type { IncomingMessage, ServerResponse } from \"http\";\nimport { type Endpoint, type Router, type RouterConfig, createRouter as createBetterCallRouter, createEndpoint } from \"@colyseus/better-call\";\nimport { toNodeHandler, getRequest, setResponse } from \"@colyseus/better-call/node\";\nimport { Transport } from \"../Transport.ts\";\nimport { controller } from \"../matchmaker/controller.ts\";\nimport pkg from \"../../package.json\" with { type: \"json\" };\n\nexport {\n  createEndpoint,\n  createMiddleware,\n  createInternalContext,\n\n  // Re-export types needed for declaration emit\n  type Router,\n  type RouterConfig,\n  type Endpoint,\n  type EndpointHandler,\n  type EndpointOptions,\n  type EndpointContext,\n  type StrictEndpoint,\n} from \"@colyseus/better-call\";\n\nexport { toNodeHandler };\n\nexport function bindRouterToTransport(transport: Transport, router: Router) {\n  // add default \"/__healthcheck\" endpoint\n  router.addEndpoint(createEndpoint(\"/__healthcheck\", { method: \"GET\" }, async (ctx) => {\n    return new Response(\"OK\", { status: 200 });\n  }));\n\n  // check if the server is bound to an express app\n  const expressApp = transport.getExpressApp() as express.Application;\n\n  // add default \"/\" route, if not provided.\n  const hasRootRoute = (\n    // check if express app has a root route\n    expressRootRoute(expressApp) !== undefined ||\n\n    // check if router has a root route\n    Object.values(router.endpoints).some(endpoint => endpoint.path === \"/\")\n  );\n\n  if (!hasRootRoute) {\n    router.addEndpoint(createEndpoint(\"/\", { method: \"GET\" }, async (ctx) => {\n      return new Response(`Colyseus ${pkg.version}`, { status: 200 });\n    }));\n  }\n\n  const server = transport.server;\n\n  // use custom bindRouter method if provided\n  if (!server && transport.bindRouter) {\n    transport.bindRouter(router);\n    return;\n  }\n\n  // which route handler to use\n  // (router + fallback to express, or just router)\n  let next: any;\n\n  if (expressApp) {\n    server.removeListener('request', expressApp);\n\n    // execute router first, fallback to express in case of 404\n    next = async (req: IncomingMessage, res: ServerResponse) => {\n      const protocol = req.headers[\"x-forwarded-proto\"] || ((req.socket as any).encrypted ? \"https\" : \"http\");\n      const base = `${protocol}://${req.headers[\":authority\"] || req.headers.host}`;\n      const response = await router.handler(getRequest({ base, request: req }));\n\n      // fallback to express if 404\n      if (response.status === 404) {\n        return expressApp['handle'](req, res);\n      }\n\n      return setResponse(res, response);\n    };\n\n  } else {\n    next = toNodeHandler(router.handler);\n  }\n\n  // handle cors headers for all requests by default\n  server.prependListener('request', (req: IncomingMessage, res: ServerResponse) => {\n    const corsHeaders = {\n      ...controller.DEFAULT_CORS_HEADERS,\n      ...controller.getCorsHeaders(new Headers(req.headers as any)),\n    };\n\n    if (req.method === \"OPTIONS\") {\n      res.writeHead(204, corsHeaders);\n      res.end();\n      return;\n    }\n\n    Object.entries(corsHeaders).forEach(([key, value]) => {\n      res.setHeader(key, value);\n    });\n\n    next(req, res);\n  });\n}\n\nfunction expressRootRoute(expressApp: express.Application) {\n  //\n  // express v5 uses `app.router`, express v4 uses `app._router`\n  // check for `app._router` first, then `app.router`\n  //\n  // (express v4 will show a warning if `app.router` is used)\n  //\n  const stack = (expressApp as any)?._router?.stack ?? (expressApp as any)?.router?.stack;\n\n  if (!stack) {\n    return false;\n  }\n\n  return stack.find((layer: any) => layer.match('/') && !['query', 'expressInit'].includes(layer.name));\n}\n\n/**\n * Do not use this directly. This is used internally by `@colyseus/playground`.\n * TODO: refactor. Avoid using globals.\n * @internal\n */\nexport let __globalEndpoints: Record<string, Endpoint> = {};\n\nexport function createRouter<\n  E extends Record<string, Endpoint>,\n  Config extends RouterConfig\n>(endpoints: E, config: Config = {} as Config) {\n  // TODO: refactor. Avoid using globals.\n  __globalEndpoints = endpoints;\n\n  return createBetterCallRouter({ ...endpoints }, config);\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,yBAAsH;AACtH,kBAAuD;AACvD,uBAA0B;AAC1B,wBAA2B;AAC3B,qBAAgB;AAEhB,IAAAA,sBAaO;AAIA,SAAS,sBAAsB,WAAsB,QAAgB;AAE1E,SAAO,gBAAY,mCAAe,kBAAkB,EAAE,QAAQ,MAAM,GAAG,OAAO,QAAQ;AACpF,WAAO,IAAI,SAAS,MAAM,EAAE,QAAQ,IAAI,CAAC;AAAA,EAC3C,CAAC,CAAC;AAGF,QAAM,aAAa,UAAU,cAAc;AAG3C,QAAM;AAAA;AAAA,IAEJ,iBAAiB,UAAU,MAAM;AAAA,IAGjC,OAAO,OAAO,OAAO,SAAS,EAAE,KAAK,cAAY,SAAS,SAAS,GAAG;AAAA;AAGxE,MAAI,CAAC,cAAc;AACjB,WAAO,gBAAY,mCAAe,KAAK,EAAE,QAAQ,MAAM,GAAG,OAAO,QAAQ;AACvE,aAAO,IAAI,SAAS,YAAY,eAAAC,QAAI,OAAO,IAAI,EAAE,QAAQ,IAAI,CAAC;AAAA,IAChE,CAAC,CAAC;AAAA,EACJ;AAEA,QAAM,SAAS,UAAU;AAGzB,MAAI,CAAC,UAAU,UAAU,YAAY;AACnC,cAAU,WAAW,MAAM;AAC3B;AAAA,EACF;AAIA,MAAI;AAEJ,MAAI,YAAY;AACd,WAAO,eAAe,WAAW,UAAU;AAG3C,WAAO,OAAO,KAAsB,QAAwB;AAC1D,YAAM,WAAW,IAAI,QAAQ,mBAAmB,MAAO,IAAI,OAAe,YAAY,UAAU;AAChG,YAAM,OAAO,GAAG,QAAQ,MAAM,IAAI,QAAQ,YAAY,KAAK,IAAI,QAAQ,IAAI;AAC3E,YAAM,WAAW,MAAM,OAAO,YAAQ,wBAAW,EAAE,MAAM,SAAS,IAAI,CAAC,CAAC;AAGxE,UAAI,SAAS,WAAW,KAAK;AAC3B,eAAO,WAAW,QAAQ,EAAE,KAAK,GAAG;AAAA,MACtC;AAEA,iBAAO,yBAAY,KAAK,QAAQ;AAAA,IAClC;AAAA,EAEF,OAAO;AACL,eAAO,2BAAc,OAAO,OAAO;AAAA,EACrC;AAGA,SAAO,gBAAgB,WAAW,CAAC,KAAsB,QAAwB;AAC/E,UAAM,cAAc;AAAA,MAClB,GAAG,6BAAW;AAAA,MACd,GAAG,6BAAW,eAAe,IAAI,QAAQ,IAAI,OAAc,CAAC;AAAA,IAC9D;AAEA,QAAI,IAAI,WAAW,WAAW;AAC5B,UAAI,UAAU,KAAK,WAAW;AAC9B,UAAI,IAAI;AACR;AAAA,IACF;AAEA,WAAO,QAAQ,WAAW,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM;AACpD,UAAI,UAAU,KAAK,KAAK;AAAA,IAC1B,CAAC;AAED,SAAK,KAAK,GAAG;AAAA,EACf,CAAC;AACH;AAEA,SAAS,iBAAiB,YAAiC;AAOzD,QAAM,QAAS,YAAoB,SAAS,SAAU,YAAoB,QAAQ;AAElF,MAAI,CAAC,OAAO;AACV,WAAO;AAAA,EACT;AAEA,SAAO,MAAM,KAAK,CAAC,UAAe,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,MAAM,IAAI,CAAC;AACtG;AAOO,IAAI,oBAA8C,CAAC;AAEnD,SAAS,aAGd,WAAc,SAAiB,CAAC,GAAa;AAE7C,sBAAoB;AAEpB,aAAO,mBAAAC,cAAuB,EAAE,GAAG,UAAU,GAAG,MAAM;AACxD;",
   "names": ["import_better_call", "pkg", "createBetterCallRouter"]
 }

package/build/router/index.mjs

@@ -1,6 +1,6 @@
 // packages/core/src/router/index.ts
 import { createRouter as createBetterCallRouter, createEndpoint } from "@colyseus/better-call";
-import { toNodeHandler } from "@colyseus/better-call/node";
+import { toNodeHandler, getRequest, setResponse } from "@colyseus/better-call/node";
 import "../Transport.mjs";
 import { controller } from "../matchmaker/controller.mjs";
 import pkg from "../../package.json" with { type: "json" };
@@ -29,11 +29,20 @@ function bindRouterToTransport(transport, router) {
     transport.bindRouter(router);
     return;
   }
-  let next = toNodeHandler(router.handler);
+  let next;
   if (expressApp) {
     server.removeListener("request", expressApp);
-    expressApp.use(next);
-    next = expressApp;
+    next = async (req, res) => {
+      const protocol = req.headers["x-forwarded-proto"] || (req.socket.encrypted ? "https" : "http");
+      const base = `${protocol}://${req.headers[":authority"] || req.headers.host}`;
+      const response = await router.handler(getRequest({ base, request: req }));
+      if (response.status === 404) {
+        return expressApp["handle"](req, res);
+      }
+      return setResponse(res, response);
+    };
+  } else {
+    next = toNodeHandler(router.handler);
   }
   server.prependListener("request", (req, res) => {
     const corsHeaders = {

package/build/router/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/router/index.ts"],
-  "sourcesContent": ["import type express from \"express\";\nimport type { IncomingMessage, ServerResponse } from \"http\";\nimport { type Endpoint, type Router, type RouterConfig, createRouter as createBetterCallRouter, createEndpoint } from \"@colyseus/better-call\";\nimport { toNodeHandler } from \"@colyseus/better-call/node\";\nimport { Transport } from \"../Transport.ts\";\nimport { controller } from \"../matchmaker/controller.ts\";\nimport pkg from \"../../package.json\" with { type: \"json\" };\n\nexport {\n  createEndpoint,\n  createMiddleware,\n  createInternalContext,\n\n  // Re-export types needed for declaration emit\n  type Router,\n  type RouterConfig,\n  type Endpoint,\n  type EndpointHandler,\n  type EndpointOptions,\n  type EndpointContext,\n  type StrictEndpoint,\n} from \"@colyseus/better-call\";\n\nexport { toNodeHandler };\n\nexport function bindRouterToTransport(transport: Transport, router: Router) {\n  // add default \"/__healthcheck\" endpoint\n  router.addEndpoint(createEndpoint(\"/__healthcheck\", { method: \"GET\" }, async (ctx) => {\n    return new Response(\"OK\", { status: 200 });\n  }));\n\n  // check if the server is bound to an express app\n  const expressApp = transport.getExpressApp() as express.Application;\n\n  // add default \"/\" route, if not provided.\n  const hasRootRoute = (\n    // check if express app has a root route\n    expressRootRoute(expressApp) !== undefined ||\n\n    // check if router has a root route\n    Object.values(router.endpoints).some(endpoint => endpoint.path === \"/\")\n  );\n\n  if (!hasRootRoute) {\n    router.addEndpoint(createEndpoint(\"/\", { method: \"GET\" }, async (ctx) => {\n      return new Response(`Colyseus ${pkg.version}`, { status: 200 });\n    }));\n  }\n\n  const server = transport.server;\n\n  // use custom bindRouter method if provided\n  if (!server && transport.bindRouter) {\n    transport.bindRouter(router);\n    return;\n  }\n\n  // main router handler\n  let next: any = toNodeHandler(router.handler);\n\n  if (expressApp) {\n    server.removeListener('request', expressApp);\n\n    // bind the router to the express app\n    expressApp.use(next);\n\n    // use the express app as the next function\n    next = expressApp;\n  }\n\n  // handle cors headers for all requests by default\n  server.prependListener('request', (req: IncomingMessage, res: ServerResponse) => {\n    const corsHeaders = {\n      ...controller.DEFAULT_CORS_HEADERS,\n      ...controller.getCorsHeaders(new Headers(req.headers as any)),\n    };\n\n    if (req.method === \"OPTIONS\") {\n      res.writeHead(204, corsHeaders);\n      res.end();\n      return;\n    }\n\n    Object.entries(corsHeaders).forEach(([key, value]) => {\n      res.setHeader(key, value);\n    });\n\n    next(req, res);\n  });\n}\n\nfunction expressRootRoute(expressApp: express.Application) {\n  //\n  // express v5 uses `app.router`, express v4 uses `app._router`\n  // check for `app._router` first, then `app.router`\n  //\n  // (express v4 will show a warning if `app.router` is used)\n  //\n  const stack = (expressApp as any)?._router?.stack ?? (expressApp as any)?.router?.stack;\n\n  if (!stack) {\n    return false;\n  }\n\n  return stack.find((layer: any) => layer.match('/') && !['query', 'expressInit'].includes(layer.name));\n}\n\n/**\n * Do not use this directly. This is used internally by `@colyseus/playground`.\n * TODO: refactor. Avoid using globals.\n * @internal\n */\nexport let __globalEndpoints: Record<string, Endpoint> = {};\n\nexport function createRouter<\n  E extends Record<string, Endpoint>,\n  Config extends RouterConfig\n>(endpoints: E, config: Config = {} as Config) {\n  // TODO: refactor. Avoid using globals.\n  __globalEndpoints = endpoints;\n\n  return createBetterCallRouter({ ...endpoints }, config);\n}\n"],
-  "mappings": ";AAEA,SAAwD,gBAAgB,wBAAwB,sBAAsB;AACtH,SAAS,qBAAqB;AAC9B,OAA0B;AAC1B,SAAS,kBAAkB;AAC3B,OAAO,SAAS,qBAAqB,KAAK,EAAE,MAAM,OAAO;AAEzD;AAAA,EACE,kBAAAA;AAAA,EACA;AAAA,EACA;AAAA,OAUK;AAIA,SAAS,sBAAsB,WAAsB,QAAgB;AAE1E,SAAO,YAAY,eAAe,kBAAkB,EAAE,QAAQ,MAAM,GAAG,OAAO,QAAQ;AACpF,WAAO,IAAI,SAAS,MAAM,EAAE,QAAQ,IAAI,CAAC;AAAA,EAC3C,CAAC,CAAC;AAGF,QAAM,aAAa,UAAU,cAAc;AAG3C,QAAM;AAAA;AAAA,IAEJ,iBAAiB,UAAU,MAAM;AAAA,IAGjC,OAAO,OAAO,OAAO,SAAS,EAAE,KAAK,cAAY,SAAS,SAAS,GAAG;AAAA;AAGxE,MAAI,CAAC,cAAc;AACjB,WAAO,YAAY,eAAe,KAAK,EAAE,QAAQ,MAAM,GAAG,OAAO,QAAQ;AACvE,aAAO,IAAI,SAAS,YAAY,IAAI,OAAO,IAAI,EAAE,QAAQ,IAAI,CAAC;AAAA,IAChE,CAAC,CAAC;AAAA,EACJ;AAEA,QAAM,SAAS,UAAU;AAGzB,MAAI,CAAC,UAAU,UAAU,YAAY;AACnC,cAAU,WAAW,MAAM;AAC3B;AAAA,EACF;AAGA,MAAI,OAAY,cAAc,OAAO,OAAO;AAE5C,MAAI,YAAY;AACd,WAAO,eAAe,WAAW,UAAU;AAG3C,eAAW,IAAI,IAAI;AAGnB,WAAO;AAAA,EACT;AAGA,SAAO,gBAAgB,WAAW,CAAC,KAAsB,QAAwB;AAC/E,UAAM,cAAc;AAAA,MAClB,GAAG,WAAW;AAAA,MACd,GAAG,WAAW,eAAe,IAAI,QAAQ,IAAI,OAAc,CAAC;AAAA,IAC9D;AAEA,QAAI,IAAI,WAAW,WAAW;AAC5B,UAAI,UAAU,KAAK,WAAW;AAC9B,UAAI,IAAI;AACR;AAAA,IACF;AAEA,WAAO,QAAQ,WAAW,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM;AACpD,UAAI,UAAU,KAAK,KAAK;AAAA,IAC1B,CAAC;AAED,SAAK,KAAK,GAAG;AAAA,EACf,CAAC;AACH;AAEA,SAAS,iBAAiB,YAAiC;AAOzD,QAAM,QAAS,YAAoB,SAAS,SAAU,YAAoB,QAAQ;AAElF,MAAI,CAAC,OAAO;AACV,WAAO;AAAA,EACT;AAEA,SAAO,MAAM,KAAK,CAAC,UAAe,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,MAAM,IAAI,CAAC;AACtG;AAOO,IAAI,oBAA8C,CAAC;AAEnD,SAAS,aAGd,WAAc,SAAiB,CAAC,GAAa;AAE7C,sBAAoB;AAEpB,SAAO,uBAAuB,EAAE,GAAG,UAAU,GAAG,MAAM;AACxD;",
+  "sourcesContent": ["import type express from \"express\";\nimport type { IncomingMessage, ServerResponse } from \"http\";\nimport { type Endpoint, type Router, type RouterConfig, createRouter as createBetterCallRouter, createEndpoint } from \"@colyseus/better-call\";\nimport { toNodeHandler, getRequest, setResponse } from \"@colyseus/better-call/node\";\nimport { Transport } from \"../Transport.ts\";\nimport { controller } from \"../matchmaker/controller.ts\";\nimport pkg from \"../../package.json\" with { type: \"json\" };\n\nexport {\n  createEndpoint,\n  createMiddleware,\n  createInternalContext,\n\n  // Re-export types needed for declaration emit\n  type Router,\n  type RouterConfig,\n  type Endpoint,\n  type EndpointHandler,\n  type EndpointOptions,\n  type EndpointContext,\n  type StrictEndpoint,\n} from \"@colyseus/better-call\";\n\nexport { toNodeHandler };\n\nexport function bindRouterToTransport(transport: Transport, router: Router) {\n  // add default \"/__healthcheck\" endpoint\n  router.addEndpoint(createEndpoint(\"/__healthcheck\", { method: \"GET\" }, async (ctx) => {\n    return new Response(\"OK\", { status: 200 });\n  }));\n\n  // check if the server is bound to an express app\n  const expressApp = transport.getExpressApp() as express.Application;\n\n  // add default \"/\" route, if not provided.\n  const hasRootRoute = (\n    // check if express app has a root route\n    expressRootRoute(expressApp) !== undefined ||\n\n    // check if router has a root route\n    Object.values(router.endpoints).some(endpoint => endpoint.path === \"/\")\n  );\n\n  if (!hasRootRoute) {\n    router.addEndpoint(createEndpoint(\"/\", { method: \"GET\" }, async (ctx) => {\n      return new Response(`Colyseus ${pkg.version}`, { status: 200 });\n    }));\n  }\n\n  const server = transport.server;\n\n  // use custom bindRouter method if provided\n  if (!server && transport.bindRouter) {\n    transport.bindRouter(router);\n    return;\n  }\n\n  // which route handler to use\n  // (router + fallback to express, or just router)\n  let next: any;\n\n  if (expressApp) {\n    server.removeListener('request', expressApp);\n\n    // execute router first, fallback to express in case of 404\n    next = async (req: IncomingMessage, res: ServerResponse) => {\n      const protocol = req.headers[\"x-forwarded-proto\"] || ((req.socket as any).encrypted ? \"https\" : \"http\");\n      const base = `${protocol}://${req.headers[\":authority\"] || req.headers.host}`;\n      const response = await router.handler(getRequest({ base, request: req }));\n\n      // fallback to express if 404\n      if (response.status === 404) {\n        return expressApp['handle'](req, res);\n      }\n\n      return setResponse(res, response);\n    };\n\n  } else {\n    next = toNodeHandler(router.handler);\n  }\n\n  // handle cors headers for all requests by default\n  server.prependListener('request', (req: IncomingMessage, res: ServerResponse) => {\n    const corsHeaders = {\n      ...controller.DEFAULT_CORS_HEADERS,\n      ...controller.getCorsHeaders(new Headers(req.headers as any)),\n    };\n\n    if (req.method === \"OPTIONS\") {\n      res.writeHead(204, corsHeaders);\n      res.end();\n      return;\n    }\n\n    Object.entries(corsHeaders).forEach(([key, value]) => {\n      res.setHeader(key, value);\n    });\n\n    next(req, res);\n  });\n}\n\nfunction expressRootRoute(expressApp: express.Application) {\n  //\n  // express v5 uses `app.router`, express v4 uses `app._router`\n  // check for `app._router` first, then `app.router`\n  //\n  // (express v4 will show a warning if `app.router` is used)\n  //\n  const stack = (expressApp as any)?._router?.stack ?? (expressApp as any)?.router?.stack;\n\n  if (!stack) {\n    return false;\n  }\n\n  return stack.find((layer: any) => layer.match('/') && !['query', 'expressInit'].includes(layer.name));\n}\n\n/**\n * Do not use this directly. This is used internally by `@colyseus/playground`.\n * TODO: refactor. Avoid using globals.\n * @internal\n */\nexport let __globalEndpoints: Record<string, Endpoint> = {};\n\nexport function createRouter<\n  E extends Record<string, Endpoint>,\n  Config extends RouterConfig\n>(endpoints: E, config: Config = {} as Config) {\n  // TODO: refactor. Avoid using globals.\n  __globalEndpoints = endpoints;\n\n  return createBetterCallRouter({ ...endpoints }, config);\n}\n"],
+  "mappings": ";AAEA,SAAwD,gBAAgB,wBAAwB,sBAAsB;AACtH,SAAS,eAAe,YAAY,mBAAmB;AACvD,OAA0B;AAC1B,SAAS,kBAAkB;AAC3B,OAAO,SAAS,qBAAqB,KAAK,EAAE,MAAM,OAAO;AAEzD;AAAA,EACE,kBAAAA;AAAA,EACA;AAAA,EACA;AAAA,OAUK;AAIA,SAAS,sBAAsB,WAAsB,QAAgB;AAE1E,SAAO,YAAY,eAAe,kBAAkB,EAAE,QAAQ,MAAM,GAAG,OAAO,QAAQ;AACpF,WAAO,IAAI,SAAS,MAAM,EAAE,QAAQ,IAAI,CAAC;AAAA,EAC3C,CAAC,CAAC;AAGF,QAAM,aAAa,UAAU,cAAc;AAG3C,QAAM;AAAA;AAAA,IAEJ,iBAAiB,UAAU,MAAM;AAAA,IAGjC,OAAO,OAAO,OAAO,SAAS,EAAE,KAAK,cAAY,SAAS,SAAS,GAAG;AAAA;AAGxE,MAAI,CAAC,cAAc;AACjB,WAAO,YAAY,eAAe,KAAK,EAAE,QAAQ,MAAM,GAAG,OAAO,QAAQ;AACvE,aAAO,IAAI,SAAS,YAAY,IAAI,OAAO,IAAI,EAAE,QAAQ,IAAI,CAAC;AAAA,IAChE,CAAC,CAAC;AAAA,EACJ;AAEA,QAAM,SAAS,UAAU;AAGzB,MAAI,CAAC,UAAU,UAAU,YAAY;AACnC,cAAU,WAAW,MAAM;AAC3B;AAAA,EACF;AAIA,MAAI;AAEJ,MAAI,YAAY;AACd,WAAO,eAAe,WAAW,UAAU;AAG3C,WAAO,OAAO,KAAsB,QAAwB;AAC1D,YAAM,WAAW,IAAI,QAAQ,mBAAmB,MAAO,IAAI,OAAe,YAAY,UAAU;AAChG,YAAM,OAAO,GAAG,QAAQ,MAAM,IAAI,QAAQ,YAAY,KAAK,IAAI,QAAQ,IAAI;AAC3E,YAAM,WAAW,MAAM,OAAO,QAAQ,WAAW,EAAE,MAAM,SAAS,IAAI,CAAC,CAAC;AAGxE,UAAI,SAAS,WAAW,KAAK;AAC3B,eAAO,WAAW,QAAQ,EAAE,KAAK,GAAG;AAAA,MACtC;AAEA,aAAO,YAAY,KAAK,QAAQ;AAAA,IAClC;AAAA,EAEF,OAAO;AACL,WAAO,cAAc,OAAO,OAAO;AAAA,EACrC;AAGA,SAAO,gBAAgB,WAAW,CAAC,KAAsB,QAAwB;AAC/E,UAAM,cAAc;AAAA,MAClB,GAAG,WAAW;AAAA,MACd,GAAG,WAAW,eAAe,IAAI,QAAQ,IAAI,OAAc,CAAC;AAAA,IAC9D;AAEA,QAAI,IAAI,WAAW,WAAW;AAC5B,UAAI,UAAU,KAAK,WAAW;AAC9B,UAAI,IAAI;AACR;AAAA,IACF;AAEA,WAAO,QAAQ,WAAW,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM;AACpD,UAAI,UAAU,KAAK,KAAK;AAAA,IAC1B,CAAC;AAED,SAAK,KAAK,GAAG;AAAA,EACf,CAAC;AACH;AAEA,SAAS,iBAAiB,YAAiC;AAOzD,QAAM,QAAS,YAAoB,SAAS,SAAU,YAAoB,QAAQ;AAElF,MAAI,CAAC,OAAO;AACV,WAAO;AAAA,EACT;AAEA,SAAO,MAAM,KAAK,CAAC,UAAe,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,MAAM,IAAI,CAAC;AACtG;AAOO,IAAI,oBAA8C,CAAC;AAEnD,SAAS,aAGd,WAAc,SAAiB,CAAC,GAAa;AAE7C,sBAAoB;AAEpB,SAAO,uBAAuB,EAAE,GAAG,UAAU,GAAG,MAAM;AACxD;",
   "names": ["createEndpoint"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colyseus/core",
-  "version": "0.17.32",
+  "version": "0.17.33",
   "description": "Multiplayer Framework for Node.js.",
   "type": "module",
   "input": "./src/index.ts",
@@ -52,23 +52,23 @@
     "debug": "^4.3.4",
     "nanoid": "^3.3.11",
     "@colyseus/shared-types": "^0.17.6",
-    "@colyseus/better-call": "^1.2.1",
+    "@colyseus/better-call": "^1.2.0",
     "@colyseus/greeting-banner": "^3.0.8"
   },
   "devDependencies": {
     "@colyseus/schema": "^4.0.7",
     "express": "^5.0.0",
     "@colyseus/redis-presence": "^0.17.6",
-    "@colyseus/redis-driver": "^0.17.6",
-    "@colyseus/tools": "^0.17.18"
+    "@colyseus/tools": "^0.17.18",
+    "@colyseus/redis-driver": "^0.17.6"
   },
   "peerDependencies": {
     "@colyseus/schema": "^4.0.7",
     "@pm2/io": "^6.1.0",
     "express": "^4.16.0 || ^5.0.0",
     "zod": "^4.1.12",
-    "@colyseus/better-call": "^1.2.1",
-    "@colyseus/ws-transport": "^0.17.9"
+    "@colyseus/ws-transport": "^0.17.9",
+    "@colyseus/better-call": "^1.2.0"
   },
   "optionalPeerDependencies": {
     "@colyseus/tools": "0.17.x",

package/src/router/index.ts

@@ -1,7 +1,7 @@
 import type express from "express";
 import type { IncomingMessage, ServerResponse } from "http";
 import { type Endpoint, type Router, type RouterConfig, createRouter as createBetterCallRouter, createEndpoint } from "@colyseus/better-call";
-import { toNodeHandler } from "@colyseus/better-call/node";
+import { toNodeHandler, getRequest, setResponse } from "@colyseus/better-call/node";
 import { Transport } from "../Transport.ts";
 import { controller } from "../matchmaker/controller.ts";
 import pkg from "../../package.json" with { type: "json" };
@@ -55,17 +55,29 @@ export function bindRouterToTransport(transport: Transport, router: Router) {
     return;
   }
 
-  // main router handler
-  let next: any = toNodeHandler(router.handler);
+  // which route handler to use
+  // (router + fallback to express, or just router)
+  let next: any;
 
   if (expressApp) {
     server.removeListener('request', expressApp);
 
-    // bind the router to the express app
-    expressApp.use(next);
+    // execute router first, fallback to express in case of 404
+    next = async (req: IncomingMessage, res: ServerResponse) => {
+      const protocol = req.headers["x-forwarded-proto"] || ((req.socket as any).encrypted ? "https" : "http");
+      const base = `${protocol}://${req.headers[":authority"] || req.headers.host}`;
+      const response = await router.handler(getRequest({ base, request: req }));
 
-    // use the express app as the next function
-    next = expressApp;
+      // fallback to express if 404
+      if (response.status === 404) {
+        return expressApp['handle'](req, res);
+      }
+
+      return setResponse(res, response);
+    };
+
+  } else {
+    next = toNodeHandler(router.handler);
   }
 
   // handle cors headers for all requests by default

package/build/rooms/RankedQueueRoom.cjs

@@ -1,240 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// packages/core/src/rooms/RankedQueueRoom.ts
-var RankedQueueRoom_exports = {};
-__export(RankedQueueRoom_exports, {
-  RankedQueueRoom: () => RankedQueueRoom
-});
-module.exports = __toCommonJS(RankedQueueRoom_exports);
-var import_Room = require("../Room.cjs");
-var matchMaker = __toESM(require("../MatchMaker.cjs"), 1);
-var import_Debug = require("../Debug.cjs");
-var import_ServerError = require("../errors/ServerError.cjs");
-var import_shared_types = require("@colyseus/shared-types");
-var DEFAULT_TEAM = /* @__PURE__ */ Symbol("$default_team");
-var DEFAULT_COMPARE = (client, matchGroup) => {
-  const diff = Math.abs(client.rank - matchGroup.averageRank);
-  const diffRatio = diff / matchGroup.averageRank;
-  return diff < 10 || diffRatio <= 2;
-};
-var RankedQueueRoom = class extends import_Room.Room {
-  constructor() {
-    super(...arguments);
-    this.maxPlayers = 4;
-    this.allowIncompleteGroups = false;
-    this.maxWaitingCycles = 15;
-    this.maxWaitingCyclesForPriority = 10;
-    /**
-     * Evaluate groups for each client at interval
-     */
-    this.cycleTickInterval = 1e3;
-    /**
-     * Groups of players per iteration
-     */
-    this.groups = [];
-    this.highPriorityGroups = [];
-    this.compare = DEFAULT_COMPARE;
-    this.onGroupReady = (group) => matchMaker.createRoom(this.matchRoomName, {});
-    this.messages = {
-      confirm: (client, _) => {
-        const queueData = client.userData;
-        if (queueData && queueData.group && typeof queueData.group.confirmed === "number") {
-          queueData.confirmed = true;
-          queueData.group.confirmed++;
-          client.leave();
-        }
-      }
-    };
-  }
-  onCreate(options) {
-    if (typeof options.maxWaitingCycles === "number") {
-      this.maxWaitingCycles = options.maxWaitingCycles;
-    }
-    if (typeof options.maxPlayers === "number") {
-      this.maxPlayers = options.maxPlayers;
-    }
-    if (typeof options.maxTeamSize === "number") {
-      this.maxTeamSize = options.maxTeamSize;
-    }
-    if (typeof options.allowIncompleteGroups !== "undefined") {
-      this.allowIncompleteGroups = options.allowIncompleteGroups;
-    }
-    if (typeof options.compare === "function") {
-      this.compare = options.compare;
-    }
-    if (typeof options.onGroupReady === "function") {
-      this.onGroupReady = options.onGroupReady;
-    }
-    if (options.matchRoomName) {
-      this.matchRoomName = options.matchRoomName;
-    } else {
-      throw new import_ServerError.ServerError(import_shared_types.ErrorCode.APPLICATION_ERROR, "RankedQueueRoom: 'matchRoomName' option is required.");
-    }
-    (0, import_Debug.debugMatchMaking)("RankedQueueRoom#onCreate() maxPlayers: %d, maxWaitingCycles: %d, maxTeamSize: %d, allowIncompleteGroups: %d, roomNameToCreate: %s", this.maxPlayers, this.maxWaitingCycles, this.maxTeamSize, this.allowIncompleteGroups, this.matchRoomName);
-    this.setSimulationInterval(() => this.reassignMatchGroups(), this.cycleTickInterval);
-  }
-  onJoin(client, options, auth) {
-    this.addToQueue(client, {
-      rank: options.rank,
-      teamId: options.teamId,
-      options
-    });
-  }
-  addToQueue(client, queueData) {
-    if (queueData.currentCycle === void 0) {
-      queueData.currentCycle = 0;
-    }
-    client.userData = queueData;
-    client.send("clients", 1);
-  }
-  createMatchGroup() {
-    const group = { clients: [], averageRank: 0 };
-    this.groups.push(group);
-    return group;
-  }
-  reassignMatchGroups() {
-    this.groups.length = 0;
-    this.highPriorityGroups.length = 0;
-    const sortedClients = this.clients.filter((client) => {
-      return client.userData && client.userData.group?.ready !== true;
-    }).sort((a, b) => {
-      return a.userData.rank - b.userData.rank;
-    });
-    if (typeof this.maxTeamSize === "number") {
-      this.redistributeTeams(sortedClients);
-    } else {
-      this.redistributeClients(sortedClients);
-    }
-    this.evaluateHighPriorityGroups();
-    this.processGroupsReady();
-  }
-  redistributeTeams(sortedClients) {
-    const teamsByID = {};
-    sortedClients.forEach((client) => {
-      const teamId = client.userData.teamId || DEFAULT_TEAM;
-      if (!teamsByID[teamId]) {
-        teamsByID[teamId] = { teamId, clients: [], averageRank: 0 };
-      }
-      teamsByID[teamId].averageRank += client.userData.rank;
-      teamsByID[teamId].clients.push(client);
-    });
-    let teams = Object.values(teamsByID).map((team) => {
-      team.averageRank /= team.clients.length;
-      return team;
-    }).sort((a, b) => {
-      return a.averageRank - b.averageRank;
-    });
-    do {
-      let currentGroup = this.createMatchGroup();
-      teams = teams.filter((team) => {
-        const totalRank = team.averageRank * team.clients.length;
-        currentGroup = this.redistributeClients(team.clients.splice(0, this.maxTeamSize), currentGroup, totalRank);
-        if (team.clients.length >= this.maxTeamSize) {
-          return true;
-        }
-        team.clients.forEach((client) => client.userData.currentCycle++);
-        return false;
-      });
-    } while (teams.length >= 2);
-  }
-  redistributeClients(sortedClients, currentGroup = this.createMatchGroup(), totalRank = 0) {
-    for (let i = 0, l = sortedClients.length; i < l; i++) {
-      const client = sortedClients[i];
-      const userData = client.userData;
-      const currentCycle = userData.currentCycle++;
-      if (currentGroup.averageRank > 0) {
-        if (!this.compare(userData, currentGroup) && !userData.highPriority) {
-          currentGroup = this.createMatchGroup();
-          totalRank = 0;
-        }
-      }
-      userData.group = currentGroup;
-      currentGroup.clients.push(client);
-      totalRank += userData.rank;
-      currentGroup.averageRank = totalRank / currentGroup.clients.length;
-      if (currentGroup.clients.length === this.maxPlayers) {
-        currentGroup.ready = true;
-        currentGroup = this.createMatchGroup();
-        totalRank = 0;
-        continue;
-      }
-      if (currentCycle >= this.maxWaitingCycles && this.allowIncompleteGroups) {
-        if (this.highPriorityGroups.indexOf(currentGroup) === -1) {
-          this.highPriorityGroups.push(currentGroup);
-        }
-      } else if (this.maxWaitingCyclesForPriority !== void 0 && currentCycle >= this.maxWaitingCyclesForPriority) {
-        userData.highPriority = true;
-      }
-    }
-    return currentGroup;
-  }
-  evaluateHighPriorityGroups() {
-    this.highPriorityGroups.forEach((group) => {
-      group.ready = group.clients.every((c) => {
-        return c.userData?.currentCycle > 1;
-      });
-    });
-  }
-  processGroupsReady() {
-    this.groups.forEach(async (group) => {
-      if (group.ready) {
-        group.confirmed = 0;
-        try {
-          const room = await this.onGroupReady.call(this, group);
-          await matchMaker.reserveMultipleSeatsFor(
-            room,
-            group.clients.map((client) => ({
-              sessionId: client.sessionId,
-              options: client.userData.options,
-              auth: client.auth
-            }))
-          );
-          group.clients.forEach((client, i) => {
-            client.send("seat", matchMaker.buildSeatReservation(room, client.sessionId));
-          });
-        } catch (e) {
-          group.clients.forEach((client) => client.leave(1011, e.message));
-        }
-      } else {
-        group.clients.forEach((client) => {
-          const queueClientCount = group.clients.length;
-          if (client.userData.lastQueueClientCount !== queueClientCount) {
-            client.userData.lastQueueClientCount = queueClientCount;
-            client.send("clients", queueClientCount);
-          }
-        });
-      }
-    });
-  }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  RankedQueueRoom
-});

package/build/rooms/RankedQueueRoom.cjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/rooms/RankedQueueRoom.ts"],
-  "sourcesContent": ["import { Room } from '../Room.ts';\nimport type { Client } from '../Transport.ts';\nimport type { IRoomCache } from '../matchmaker/driver.ts';\nimport * as matchMaker from '../MatchMaker.ts';\nimport { debugMatchMaking } from '../Debug.ts';\nimport { ServerError } from '../errors/ServerError.ts';\nimport { ErrorCode } from '@colyseus/shared-types';\n\nexport interface RankedQueueOptions {\n  /**\n   * number of players on each match\n   */\n  maxPlayers?: number;\n\n  /**\n   * name of the room to create\n   */\n  matchRoomName: string;\n\n  /**\n   * after these cycles, create a match with a bot\n   */\n  maxWaitingCycles?: number;\n\n  /**\n   * after this time, try to fit this client with a not-so-compatible group\n   */\n  maxWaitingCyclesForPriority?: number;\n\n  /**\n   * If set, teams must have the same size to be matched together\n   */\n  maxTeamSize?: number;\n\n  /**\n   * If `allowIncompleteGroups` is true, players inside an unmatched group (that\n   * did not reached `maxPlayers`, and `maxWaitingCycles` has been\n   * reached) will be matched together. Your room should fill the remaining\n   * spots with \"bots\" on this case.\n   */\n  allowIncompleteGroups?: boolean;\n\n  /**\n   * Comparison function for matching clients to groups\n   * Returns true if the client is compatible with the group\n   */\n  compare?: (client: ClientQueueData, matchGroup: MatchGroup) => boolean;\n\n  /**\n   *\n   * When onGroupReady is set, the \"roomNameToCreate\" option is ignored.\n   */\n  onGroupReady?: (this: RankedQueueRoom, group: MatchGroup) => Promise<IRoomCache>;\n}\n\nexport interface MatchGroup {\n  averageRank: number;\n  clients: Array<Client<{ userData: ClientQueueData }>>,\n  ready?: boolean;\n  confirmed?: number;\n}\n\nexport interface MatchTeam {\n  averageRank: number;\n  clients: Array<Client<{ userData: ClientQueueData }>>,\n  teamId: string | symbol;\n}\n\nexport interface ClientQueueData {\n  /**\n   * Rank of the client\n   */\n  rank: number;\n\n  /**\n   * Timestamp of when the client entered the queue\n   */\n  currentCycle?: number;\n\n  /**\n   * Optional: if matching with a team, the team ID\n   */\n  teamId?: string;\n\n  /**\n   * Additional options passed by the client when joining the room\n   */\n  options?: any;\n\n  /**\n   * Match group the client is currently in\n   */\n  group?: MatchGroup;\n\n  /**\n   * Whether the client has confirmed the connection to the room\n   */\n  confirmed?: boolean;\n\n  /**\n   * Whether the client should be prioritized in the queue\n   * (e.g. for players that are waiting for a long time)\n   */\n  highPriority?: boolean;\n\n  /**\n   * The last number of clients in the queue sent to the client\n   */\n  lastQueueClientCount?: number;\n}\n\nconst DEFAULT_TEAM = Symbol(\"$default_team\");\nconst DEFAULT_COMPARE = (client: ClientQueueData, matchGroup: MatchGroup) => {\n  const diff = Math.abs(client.rank - matchGroup.averageRank);\n  const diffRatio = (diff / matchGroup.averageRank);\n  // If diff ratio is too high, create a new match group\n  return (diff < 10 || diffRatio <= 2);\n}\n\nexport class RankedQueueRoom extends Room {\n  maxPlayers = 4;\n  maxTeamSize: number;\n  allowIncompleteGroups: boolean = false;\n\n  maxWaitingCycles = 15;\n  maxWaitingCyclesForPriority?: number = 10;\n\n  /**\n   * Evaluate groups for each client at interval\n   */\n  cycleTickInterval = 1000;\n\n  /**\n   * Groups of players per iteration\n   */\n  groups: MatchGroup[] = [];\n  highPriorityGroups: MatchGroup[] = [];\n\n  matchRoomName: string;\n\n  protected compare = DEFAULT_COMPARE;\n  protected onGroupReady = (group: MatchGroup) => matchMaker.createRoom(this.matchRoomName, {});\n\n  messages = {\n    confirm: (client: Client, _: unknown) => {\n      const queueData = client.userData;\n\n      if (queueData && queueData.group && typeof (queueData.group.confirmed) === \"number\") {\n        queueData.confirmed = true;\n        queueData.group.confirmed++;\n        client.leave();\n      }\n    },\n  }\n\n  onCreate(options: RankedQueueOptions) {\n    if (typeof(options.maxWaitingCycles) === \"number\") {\n      this.maxWaitingCycles = options.maxWaitingCycles;\n    }\n\n    if (typeof(options.maxPlayers) === \"number\") {\n      this.maxPlayers = options.maxPlayers;\n    }\n\n    if (typeof(options.maxTeamSize) === \"number\") {\n      this.maxTeamSize = options.maxTeamSize;\n    }\n\n    if (typeof(options.allowIncompleteGroups) !== \"undefined\") {\n      this.allowIncompleteGroups = options.allowIncompleteGroups;\n    }\n\n    if (typeof(options.compare) === \"function\") {\n      this.compare = options.compare;\n    }\n\n    if (typeof(options.onGroupReady) === \"function\") {\n      this.onGroupReady = options.onGroupReady;\n    }\n\n    if (options.matchRoomName) {\n      this.matchRoomName = options.matchRoomName;\n\n    } else {\n      throw new ServerError(ErrorCode.APPLICATION_ERROR, \"RankedQueueRoom: 'matchRoomName' option is required.\");\n    }\n\n    debugMatchMaking(\"RankedQueueRoom#onCreate() maxPlayers: %d, maxWaitingCycles: %d, maxTeamSize: %d, allowIncompleteGroups: %d, roomNameToCreate: %s\", this.maxPlayers, this.maxWaitingCycles, this.maxTeamSize, this.allowIncompleteGroups, this.matchRoomName);\n\n    /**\n     * Redistribute clients into groups at every interval\n     */\n    this.setSimulationInterval(() => this.reassignMatchGroups(), this.cycleTickInterval);\n  }\n\n  onJoin(client: Client, options: any, auth?: unknown) {\n    this.addToQueue(client, {\n      rank: options.rank,\n      teamId: options.teamId,\n      options,\n    });\n  }\n\n  addToQueue(client: Client, queueData: ClientQueueData) {\n    if (queueData.currentCycle === undefined) {\n      queueData.currentCycle = 0;\n    }\n    client.userData = queueData;\n\n    // FIXME: reassign groups upon joining [?] (without incrementing cycle count)\n    client.send(\"clients\", 1);\n  }\n\n  createMatchGroup() {\n    const group: MatchGroup = { clients: [], averageRank: 0 };\n    this.groups.push(group);\n    return group;\n  }\n\n  reassignMatchGroups() {\n    // Re-set all groups\n    this.groups.length = 0;\n    this.highPriorityGroups.length = 0;\n\n    const sortedClients = (this.clients)\n      .filter((client) => {\n        // Filter out:\n        // - clients that are not in the queue\n        // - clients that are already in a \"ready\" group\n        return (\n          client.userData &&\n          client.userData.group?.ready !== true\n        );\n      })\n      .sort((a, b) => {\n        //\n        // Sort by rank ascending\n        //\n        return a.userData.rank - b.userData.rank;\n      });\n\n    //\n    // The room either distribute by teams or by clients\n    //\n    if (typeof(this.maxTeamSize) === \"number\") {\n      this.redistributeTeams(sortedClients);\n\n    } else {\n      this.redistributeClients(sortedClients);\n    }\n\n    this.evaluateHighPriorityGroups();\n    this.processGroupsReady();\n  }\n\n  redistributeTeams(sortedClients: Client<{ userData: ClientQueueData }>[]) {\n    const teamsByID: { [teamId: string | symbol]: MatchTeam } = {};\n\n    sortedClients.forEach((client) => {\n      const teamId = client.userData.teamId || DEFAULT_TEAM;\n\n      // Create a new team if it doesn't exist\n      if (!teamsByID[teamId]) {\n        teamsByID[teamId] = { teamId: teamId, clients: [], averageRank: 0, };\n      }\n\n      teamsByID[teamId].averageRank += client.userData.rank;\n      teamsByID[teamId].clients.push(client);\n    });\n\n    // Calculate average rank for each team\n    let teams = Object.values(teamsByID).map((team) => {\n      team.averageRank /= team.clients.length;\n      return team;\n    }).sort((a, b) => {\n      // Sort by average rank ascending\n      return a.averageRank - b.averageRank;\n    });\n\n    // Iterate over teams multiple times until all clients are assigned to a group\n    do {\n      let currentGroup: MatchGroup = this.createMatchGroup();\n      teams = teams.filter((team) => {\n        // Remove clients from the team and add them to the current group\n        const totalRank = team.averageRank * team.clients.length;\n\n        // currentGroup.averageRank = (currentGroup.averageRank === undefined)\n        //   ? team.averageRank\n        //   : (currentGroup.averageRank + team.averageRank) / ;\n        currentGroup = this.redistributeClients(team.clients.splice(0, this.maxTeamSize), currentGroup, totalRank);\n\n        if (team.clients.length >= this.maxTeamSize) {\n          // team still has enough clients to form a group\n          return true;\n        }\n\n        // increment cycle count for all clients in the team\n        team.clients.forEach((client) => client.userData.currentCycle++);\n\n        return false;\n      });\n    } while (teams.length >= 2);\n  }\n\n  redistributeClients(\n    sortedClients: Client<{ userData: ClientQueueData }>[],\n    currentGroup: MatchGroup = this.createMatchGroup(),\n    totalRank: number = 0,\n  ) {\n    for (let i = 0, l = sortedClients.length; i < l; i++) {\n      const client = sortedClients[i];\n      const userData = client.userData;\n      const currentCycle = userData.currentCycle++;\n\n      if (currentGroup.averageRank > 0) {\n        if (\n          !this.compare(userData, currentGroup) &&\n          !userData.highPriority\n        ) {\n          currentGroup = this.createMatchGroup();\n          totalRank = 0;\n        }\n      }\n\n      userData.group = currentGroup;\n      currentGroup.clients.push(client);\n\n      totalRank += userData.rank;\n      currentGroup.averageRank = totalRank / currentGroup.clients.length;\n\n      // Enough players in the group, mark it as ready!\n      if (currentGroup.clients.length === this.maxPlayers) {\n        currentGroup.ready = true;\n        currentGroup = this.createMatchGroup();\n        totalRank = 0;\n        continue;\n      }\n\n      if (currentCycle >= this.maxWaitingCycles && this.allowIncompleteGroups) {\n        /**\n         * Match long-waiting clients with bots\n         */\n        if (this.highPriorityGroups.indexOf(currentGroup) === -1) {\n          this.highPriorityGroups.push(currentGroup);\n        }\n\n      } else if (\n        this.maxWaitingCyclesForPriority !== undefined &&\n        currentCycle >= this.maxWaitingCyclesForPriority\n      ) {\n        /**\n         * Force this client to join a group, even if rank is incompatible\n         */\n        userData.highPriority = true;\n      }\n    }\n\n    return currentGroup;\n  }\n\n  evaluateHighPriorityGroups() {\n    /**\n     * Evaluate groups with high priority clients\n     */\n    this.highPriorityGroups.forEach((group) => {\n      group.ready = group.clients.every((c) => {\n        // Give new clients another chance to join a group that is not \"high priority\"\n        return c.userData?.currentCycle > 1;\n        // return c.userData?.currentCycle >= this.maxWaitingCycles;\n      });\n    });\n  }\n\n  processGroupsReady() {\n    this.groups.forEach(async (group) => {\n      if (group.ready) {\n        group.confirmed = 0;\n\n        try {\n          /**\n           * Create room instance in the server.\n           */\n          const room = await this.onGroupReady.call(this, group);\n\n          /**\n           * Reserve a seat for each client in the group.\n           * (If one fails, force all clients to leave, re-queueing is up to the client-side logic)\n           */\n          await matchMaker.reserveMultipleSeatsFor(\n            room,\n            group.clients.map((client) => ({\n              sessionId: client.sessionId,\n              options: client.userData.options,\n              auth: client.auth,\n            })),\n          );\n\n          /**\n           * Send room data for new WebSocket connection!\n           */\n          group.clients.forEach((client, i) => {\n            client.send(\"seat\", matchMaker.buildSeatReservation(room, client.sessionId));\n          });\n\n        } catch (e: any) {\n          //\n          // If creating a room, or reserving a seat failed - fail all clients\n          // Whether the clients retry or not is up to the client-side logic\n          //\n          group.clients.forEach(client => client.leave(1011, e.message));\n        }\n\n      } else {\n        /**\n         * Notify clients within the group on how many players are in the queue\n         */\n        group.clients.forEach((client) => {\n          //\n          // avoid sending the same number of clients to the client if it hasn't changed\n          //\n          const queueClientCount = group.clients.length;\n          if (client.userData.lastQueueClientCount !== queueClientCount) {\n            client.userData.lastQueueClientCount = queueClientCount;\n            client.send(\"clients\", queueClientCount);\n          }\n        });\n      }\n    });\n  }\n\n}"],
-  "mappings": "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",
-  "names": []
-}