@colyseus/core 0.17.19 → 0.17.21

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  // express v5 uses `app.router`, express v4 uses `app._router`\n  const stack = (expressApp as any)?.router?.stack ?? (expressApp as any)?._router?.stack;\n\n  if (!stack) {\n    throw new Error(\"Express app is not initialized\");\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;AAEzD,QAAM,QAAS,YAAoB,QAAQ,SAAU,YAAoB,SAAS;AAElF,MAAI,CAAC,OAAO;AACV,UAAM,IAAI,MAAM,gCAAgC;AAAA,EAClD;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 } 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;",
   "names": ["import_better_call", "pkg", "createBetterCallRouter"]
 }

package/build/router/index.mjs

@@ -52,9 +52,9 @@ function bindRouterToTransport(transport, router) {
   });
 }
 function expressRootRoute(expressApp) {
-  const stack = expressApp?.router?.stack ?? expressApp?._router?.stack;
+  const stack = expressApp?._router?.stack ?? expressApp?.router?.stack;
   if (!stack) {
-    throw new Error("Express app is not initialized");
+    return false;
   }
   return stack.find((layer) => layer.match("/") && !["query", "expressInit"].includes(layer.name));
 }

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  // express v5 uses `app.router`, express v4 uses `app._router`\n  const stack = (expressApp as any)?.router?.stack ?? (expressApp as any)?._router?.stack;\n\n  if (!stack) {\n    throw new Error(\"Express app is not initialized\");\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;AAEzD,QAAM,QAAS,YAAoB,QAAQ,SAAU,YAAoB,SAAS;AAElF,MAAI,CAAC,OAAO;AACV,UAAM,IAAI,MAAM,gCAAgC;AAAA,EAClD;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 } 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;",
   "names": ["createEndpoint"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colyseus/core",
-  "version": "0.17.19",
+  "version": "0.17.21",
   "description": "Multiplayer Framework for Node.js.",
   "type": "module",
   "input": "./src/index.ts",
@@ -51,7 +51,7 @@
     "@standard-schema/spec": "^1.0.0",
     "debug": "^4.3.4",
     "nanoid": "^3.3.11",
-    "@colyseus/shared-types": "^0.17.2",
+    "@colyseus/shared-types": "^0.17.3",
     "@colyseus/better-call": "^1.2.0",
     "@colyseus/greeting-banner": "^3.0.7"
   },
@@ -59,8 +59,8 @@
     "@colyseus/schema": "^4.0.4",
     "express": "^5.0.0",
     "@colyseus/redis-driver": "^0.17.5",
-    "@colyseus/tools": "^0.17.15",
-    "@colyseus/redis-presence": "^0.17.5"
+    "@colyseus/redis-presence": "^0.17.5",
+    "@colyseus/tools": "^0.17.15"
   },
   "peerDependencies": {
     "@colyseus/schema": "^4.0.4",

package/src/MatchMaker.ts

@@ -390,8 +390,8 @@ export function defineRoomType<T extends Type<Room>>(
   roomName: string,
   klass: T,
   defaultOptions?: OnCreateOptions<T>,
-) {
-  const registeredHandler = new RegisteredHandler(klass, defaultOptions);
+): RegisteredHandler<InstanceType<T>> {
+  const registeredHandler = new RegisteredHandler(klass, defaultOptions) as unknown as RegisteredHandler<InstanceType<T>>;
   registeredHandler.name = roomName;
 
   handlers[roomName] = registeredHandler;

package/src/Server.ts

@@ -384,6 +384,6 @@ export function defineServer<
 export function defineRoom<T extends Type<Room>>(
   roomKlass: T,
   defaultOptions?: Parameters<NonNullable<InstanceType<T>['onCreate']>>[0],
-): RegisteredHandler<T> {
-  return new RegisteredHandler(roomKlass, defaultOptions);
+): RegisteredHandler<InstanceType<T>> {
+  return new RegisteredHandler(roomKlass, defaultOptions) as unknown as RegisteredHandler<InstanceType<T>>;
 }

package/src/Transport.ts

@@ -30,7 +30,7 @@ export abstract class Transport {
      * For uWebSockets transport, this uses the uwebsockets-express module.
      * This method is called lazily only when an express callback is provided in server options.
      */
-    public getExpressApp?(resolved?: boolean): Promise<import('express').Application> | import('express').Application | undefined;
+    public getExpressApp?(): Promise<import('express').Application> | import('express').Application | undefined;
 
     /**
      * Binds a router to the transport.

package/src/index.ts

@@ -73,7 +73,7 @@ export {
 // Default rooms
 export { LobbyRoom } from './rooms/LobbyRoom.ts';
 export { RelayRoom } from './rooms/RelayRoom.ts';
-export { RankedQueueRoom, type RankedQueueOptions, type MatchGroup, type MatchTeam, type ClientQueueData } from './rooms/RankedQueueRoom.ts';
+export { QueueRoom, type QueueOptions, type QueueMatchGroup, type QueueMatchTeam, type QueueClientData } from './rooms/QueueRoom.ts';
 
 // Router / Endpoints
 export {

package/src/matchmaker/RegisteredHandler.ts

@@ -36,32 +36,32 @@ type SortByKeys<RoomType extends Room> =
       ? keyof ExtractRoomCacheMetadata<RoomType> & string
       : never);
 
-export interface RegisteredHandlerEvents<RoomType extends Type<Room> = any> {
-  create: [room: InstanceType<RoomType>];
-  lock: [room: InstanceType<RoomType>];
-  unlock: [room: InstanceType<RoomType>];
-  join: [room: InstanceType<RoomType>, client: Client];
-  leave: [room: InstanceType<RoomType>, client: Client, willDispose: boolean];
-  dispose: [room: InstanceType<RoomType>];
-  'visibility-change': [room: InstanceType<RoomType>, isVisible: boolean];
-  'metadata-change': [room: InstanceType<RoomType>];
+export interface RegisteredHandlerEvents<RoomType extends Room = any> {
+  create: [room: RoomType];
+  lock: [room: RoomType];
+  unlock: [room: RoomType];
+  join: [room: RoomType, client: Client];
+  leave: [room: RoomType, client: Client, willDispose: boolean];
+  dispose: [room: RoomType];
+  'visibility-change': [room: RoomType, isVisible: boolean];
+  'metadata-change': [room: RoomType];
 }
 
 export class RegisteredHandler<
-  RoomType extends Type<Room> = any
+  RoomType extends Room = any
 > extends EventEmitter<RegisteredHandlerEvents<RoomType>> {
   '~room': RoomType;
 
-  public klass: RoomType;
+  public klass: Type<RoomType>;
   public options: any;
 
   public name: string;
-  public filterOptions: Array<FilterByKeys<InstanceType<RoomType>>> = [];
+  public filterOptions: Array<FilterByKeys<RoomType>> = [];
   public sortOptions?: SortOptions;
 
   public realtimeListingEnabled: boolean = false;
 
-  constructor(klass: RoomType, options?: any) {
+  constructor(klass: Type<RoomType>, options?: any) {
     super();
 
     this.klass = klass;
@@ -106,7 +106,7 @@ export class RegisteredHandler<
    * // Mix both
    * .filterBy(['mode', 'difficulty', 'maxClients'])
    */
-  public filterBy<T extends FilterByKeys<InstanceType<RoomType>>>(
+  public filterBy<T extends FilterByKeys<RoomType>>(
     options: T[]
   ) {
     this.filterOptions = options;
@@ -129,7 +129,7 @@ export class RegisteredHandler<
    * // Multiple sort criteria
    * .sortBy({ 'metadata.skillLevel': 1, clients: -1 })
    */
-  public sortBy<T extends SortByKeys<InstanceType<RoomType>>>(
+  public sortBy<T extends SortByKeys<RoomType>>(
     options: { [K in T]: SortOptions[string] }
   ): this {
     this.sortOptions = options as unknown as SortOptions;

package/src/rooms/{RankedQueueRoom.ts → QueueRoom.ts}

@@ -6,7 +6,7 @@ import { debugMatchMaking } from '../Debug.ts';
 import { ServerError } from '../errors/ServerError.ts';
 import { ErrorCode } from '@colyseus/shared-types';
 
-export interface RankedQueueOptions {
+export interface QueueOptions {
   /**
    * number of players on each match
    */
@@ -44,29 +44,29 @@ export interface RankedQueueOptions {
    * Comparison function for matching clients to groups
    * Returns true if the client is compatible with the group
    */
-  compare?: (client: ClientQueueData, matchGroup: MatchGroup) => boolean;
+  compare?: (client: QueueClientData, matchGroup: QueueMatchGroup) => boolean;
 
   /**
    *
    * When onGroupReady is set, the "roomNameToCreate" option is ignored.
    */
-  onGroupReady?: (this: RankedQueueRoom, group: MatchGroup) => Promise<IRoomCache>;
+  onGroupReady?: (this: QueueRoom, group: QueueMatchGroup) => Promise<IRoomCache>;
 }
 
-export interface MatchGroup {
+export interface QueueMatchGroup {
   averageRank: number;
-  clients: Array<Client<{ userData: ClientQueueData }>>,
+  clients: Array<Client<{ userData: QueueClientData }>>,
   ready?: boolean;
   confirmed?: number;
 }
 
-export interface MatchTeam {
+export interface QueueMatchTeam {
   averageRank: number;
-  clients: Array<Client<{ userData: ClientQueueData }>>,
+  clients: Array<Client<{ userData: QueueClientData }>>,
   teamId: string | symbol;
 }
 
-export interface ClientQueueData {
+export interface QueueClientData {
   /**
    * Rank of the client
    */
@@ -90,7 +90,7 @@ export interface ClientQueueData {
   /**
    * Match group the client is currently in
    */
-  group?: MatchGroup;
+  group?: QueueMatchGroup;
 
   /**
    * Whether the client has confirmed the connection to the room
@@ -110,14 +110,14 @@ export interface ClientQueueData {
 }
 
 const DEFAULT_TEAM = Symbol("$default_team");
-const DEFAULT_COMPARE = (client: ClientQueueData, matchGroup: MatchGroup) => {
+const DEFAULT_COMPARE = (client: QueueClientData, matchGroup: QueueMatchGroup) => {
   const diff = Math.abs(client.rank - matchGroup.averageRank);
   const diffRatio = (diff / matchGroup.averageRank);
   // If diff ratio is too high, create a new match group
   return (diff < 10 || diffRatio <= 2);
 }
 
-export class RankedQueueRoom extends Room {
+export class QueueRoom extends Room {
   maxPlayers = 4;
   maxTeamSize: number;
   allowIncompleteGroups: boolean = false;
@@ -133,13 +133,13 @@ export class RankedQueueRoom extends Room {
   /**
    * Groups of players per iteration
    */
-  groups: MatchGroup[] = [];
-  highPriorityGroups: MatchGroup[] = [];
+  groups: QueueMatchGroup[] = [];
+  highPriorityGroups: QueueMatchGroup[] = [];
 
   matchRoomName: string;
 
   protected compare = DEFAULT_COMPARE;
-  protected onGroupReady = (group: MatchGroup) => matchMaker.createRoom(this.matchRoomName, {});
+  protected onGroupReady = (group: QueueMatchGroup) => matchMaker.createRoom(this.matchRoomName, {});
 
   messages = {
     confirm: (client: Client, _: unknown) => {
@@ -153,7 +153,7 @@ export class RankedQueueRoom extends Room {
     },
   }
 
-  onCreate(options: RankedQueueOptions) {
+  onCreate(options: QueueOptions) {
     if (typeof(options.maxWaitingCycles) === "number") {
       this.maxWaitingCycles = options.maxWaitingCycles;
     }
@@ -182,10 +182,10 @@ export class RankedQueueRoom extends Room {
       this.matchRoomName = options.matchRoomName;
 
     } else {
-      throw new ServerError(ErrorCode.APPLICATION_ERROR, "RankedQueueRoom: 'matchRoomName' option is required.");
+      throw new ServerError(ErrorCode.APPLICATION_ERROR, "QueueRoom: 'matchRoomName' option is required.");
     }
 
-    debugMatchMaking("RankedQueueRoom#onCreate() maxPlayers: %d, maxWaitingCycles: %d, maxTeamSize: %d, allowIncompleteGroups: %d, roomNameToCreate: %s", this.maxPlayers, this.maxWaitingCycles, this.maxTeamSize, this.allowIncompleteGroups, this.matchRoomName);
+    debugMatchMaking("QueueRoom#onCreate() maxPlayers: %d, maxWaitingCycles: %d, maxTeamSize: %d, allowIncompleteGroups: %d, roomNameToCreate: %s", this.maxPlayers, this.maxWaitingCycles, this.maxTeamSize, this.allowIncompleteGroups, this.matchRoomName);
 
     /**
      * Redistribute clients into groups at every interval
@@ -201,7 +201,7 @@ export class RankedQueueRoom extends Room {
     });
   }
 
-  addToQueue(client: Client, queueData: ClientQueueData) {
+  addToQueue(client: Client, queueData: QueueClientData) {
     if (queueData.currentCycle === undefined) {
       queueData.currentCycle = 0;
     }
@@ -212,7 +212,7 @@ export class RankedQueueRoom extends Room {
   }
 
   createMatchGroup() {
-    const group: MatchGroup = { clients: [], averageRank: 0 };
+    const group: QueueMatchGroup = { clients: [], averageRank: 0 };
     this.groups.push(group);
     return group;
   }
@@ -253,8 +253,8 @@ export class RankedQueueRoom extends Room {
     this.processGroupsReady();
   }
 
-  redistributeTeams(sortedClients: Client<{ userData: ClientQueueData }>[]) {
-    const teamsByID: { [teamId: string | symbol]: MatchTeam } = {};
+  redistributeTeams(sortedClients: Client<{ userData: QueueClientData }>[]) {
+    const teamsByID: { [teamId: string | symbol]: QueueMatchTeam } = {};
 
     sortedClients.forEach((client) => {
       const teamId = client.userData.teamId || DEFAULT_TEAM;
@@ -279,7 +279,7 @@ export class RankedQueueRoom extends Room {
 
     // Iterate over teams multiple times until all clients are assigned to a group
     do {
-      let currentGroup: MatchGroup = this.createMatchGroup();
+      let currentGroup: QueueMatchGroup = this.createMatchGroup();
       teams = teams.filter((team) => {
         // Remove clients from the team and add them to the current group
         const totalRank = team.averageRank * team.clients.length;
@@ -303,8 +303,8 @@ export class RankedQueueRoom extends Room {
   }
 
   redistributeClients(
-    sortedClients: Client<{ userData: ClientQueueData }>[],
-    currentGroup: MatchGroup = this.createMatchGroup(),
+    sortedClients: Client<{ userData: QueueClientData }>[],
+    currentGroup: QueueMatchGroup = this.createMatchGroup(),
     totalRank: number = 0,
   ) {
     for (let i = 0, l = sortedClients.length; i < l; i++) {

package/src/router/index.ts

@@ -99,7 +99,7 @@ function expressRootRoute(expressApp: express.Application) {
   const stack = (expressApp as any)?._router?.stack ?? (expressApp as any)?.router?.stack;
 
   if (!stack) {
-    throw new Error("Express app is not initialized");
+    return false;
   }
 
   return stack.find((layer: any) => layer.match('/') && !['query', 'expressInit'].includes(layer.name));