@colyseus/core 0.17.9 → 0.17.11

package/src/Protocol.ts

@@ -1,53 +1,6 @@
 import { Packr } from '@colyseus/msgpackr';
 import { encode, type Iterator } from '@colyseus/schema';
-
-/**
- * Colyseus protocol codes range between 0~100
- */
-export const Protocol = {
-  // Room-related (10~19)
-  JOIN_ROOM: 10,
-  ERROR: 11,
-  LEAVE_ROOM: 12,
-  ROOM_DATA: 13,
-  ROOM_STATE: 14,
-  ROOM_STATE_PATCH: 15,
-  // ROOM_DATA_SCHEMA: 16, // DEPRECATED: used to send schema instances via room.send()
-  ROOM_DATA_BYTES: 17,
-  PING: 18,
-} as const;
-export type Protocol = typeof Protocol[keyof typeof Protocol];
-
-/**
- * WebSocket close codes
- * (See https://github.com/Luka967/websocket-close-codes)
- */
-export const CloseCode = {
-  NORMAL_CLOSURE: 1000,
-  GOING_AWAY: 1001,
-  NO_STATUS_RECEIVED: 1005,
-  ABNORMAL_CLOSURE: 1006,
-
-  CONSENTED: 4000,
-  SERVER_SHUTDOWN: 4001,
-  WITH_ERROR: 4002,
-  DEVMODE_RESTART: 4010
-} as const;
-export type CloseCode = typeof CloseCode[keyof typeof CloseCode];
-
-export const ErrorCode = {
-  // HTTP MatchMaking Error Codes
-  MATCHMAKE_NO_HANDLER: 520,
-  MATCHMAKE_INVALID_CRITERIA: 521,
-  MATCHMAKE_INVALID_ROOM_ID: 522,
-  MATCHMAKE_UNHANDLED: 523, // generic exception during onCreate/onJoin
-  MATCHMAKE_EXPIRED: 524, // generic exception during onCreate/onJoin
-  AUTH_FAILED: 525,
-  APPLICATION_ERROR: 526,
-
-  INVALID_PAYLOAD: 4217,
-} as const;
-export type ErrorCode = typeof ErrorCode[keyof typeof ErrorCode];
+import { Protocol } from '@colyseus/shared-types';
 
 // Inter-process communication protocol
 export const IpcProtocol = {

package/src/Room.ts

@@ -12,7 +12,7 @@ import type { IRoomCache } from './matchmaker/driver.ts';
 import { NoneSerializer } from './serializer/NoneSerializer.ts';
 import { SchemaSerializer } from './serializer/SchemaSerializer.ts';
 
-import { CloseCode, ErrorCode, getMessageBytes, Protocol } from './Protocol.ts';
+import { getMessageBytes } from './Protocol.ts';
 import { type Type, Deferred, generateId, wrapTryCatch } from './utils/Utils.ts';
 import { createNanoEvents } from './utils/nanoevents.ts';
 import { isDevMode } from './utils/DevMode.ts';
@@ -25,6 +25,15 @@ import { type RoomMethodName, OnAuthException, OnCreateException, OnDisposeExcep
 import { standardValidate, type StandardSchemaV1 } from './utils/StandardSchema.ts';
 import { matchMaker } from '@colyseus/core';
 
+import {
+  CloseCode,
+  ErrorCode,
+  Protocol,
+  type MessageHandlerWithFormat as SharedMessageHandlerWithFormat,
+  type MessageHandler as SharedMessageHandler,
+  type Messages as SharedMessages,
+} from '@colyseus/shared-types';
+
 const DEFAULT_PATCH_RATE = 1000 / 20; // 20fps (50ms)
 const DEFAULT_SIMULATION_INTERVAL = 1000 / 60; // 60fps (16.66ms)
 const noneSerializer = new NoneSerializer();
@@ -52,32 +61,15 @@ export interface IBroadcastOptions extends ISendOptions {
  * Message handler with automatic type inference from format schema.
  * When a format is provided, the message type is automatically inferred from the schema.
  */
-export type MessageHandlerWithFormat<T extends StandardSchemaV1 = any, This = any> = {
-  format: T;
-  handler: (this: This, client: Client, message: StandardSchemaV1.InferOutput<T>) => void;
-};
-
-export type MessageHandler<This = any> =
-  | ((this: This, client: Client, message: any) => void)
-  | MessageHandlerWithFormat<any, This>;
+export type MessageHandlerWithFormat<T extends StandardSchemaV1 = any, This = any> =
+  SharedMessageHandlerWithFormat<T, Client, This>;
 
-/**
- * Extract the message payload type from a message handler.
- * Works with both function handlers and format handlers.
- *
- * (Imported from @colyseus/sdk, not used in the server-side)
- */
-export type ExtractMessageType<T> =
-  T extends { format: infer Format extends StandardSchemaV1; handler: any }
-    ? StandardSchemaV1.InferOutput<Format>
-    : T extends (this: any, client: any, message: infer Message) => void
-      ? Message
-      : any;
+export type MessageHandler<This = any> = SharedMessageHandler<Client, This>;
 
 /**
  * A map of message types to message handlers.
  */
-export type Messages<This extends Room> = Record<string, MessageHandler<This>>;
+export type Messages<This extends Room> = SharedMessages<This, Client>;
 
 /**
  * Helper function to create a validated message handler with automatic type inference.

package/src/Server.ts

@@ -16,6 +16,7 @@ import { logger, setLogger } from './Logger.ts';
 import { setDevMode, isDevMode } from './utils/DevMode.ts';
 import { bindRouterToServer, type Router } from './router/index.ts';
 import { getDefaultRouter } from "./router/default_routes.ts";
+import { type SDKTypes as SharedSDKTypes } from '@colyseus/shared-types';
 
 export type ServerOptions = {
   publicAddress?: string,
@@ -53,14 +54,12 @@ export type ServerOptions = {
 
 /**
  * Exposed types for the client-side SDK.
+ * Re-exported from @colyseus/shared-types with specific type constraints.
  */
 export interface SDKTypes<
   RoomTypes extends Record<string, RegisteredHandler> = any,
   Routes extends Router = any
-> {
-  '~rooms': RoomTypes;
-  '~routes': Routes;
-}
+> extends SharedSDKTypes<RoomTypes, Routes> {}
 
 export class Server<
   RoomTypes extends Record<string, RegisteredHandler> = any,
@@ -297,19 +296,26 @@ export class Server<
     () => Promise.resolve()
 }
 
+export type DefineServerOptions<
+  T extends Record<string, RegisteredHandler>,
+  R extends Router
+> = ServerOptions & {
+  rooms: T,
+  routes?: R,
+};
+
 export function defineServer<
   T extends Record<string, RegisteredHandler>,
   R extends Router
 >(
-  roomHandlers: T,
-  router?: R,
-  serverOptions?: ServerOptions
+  options: DefineServerOptions<T, R>,
 ): Server<T, R> {
+  const { rooms, routes, ...serverOptions } = options;
   const server = new Server<T, R>(serverOptions);
 
-  server.router = router;
+  server.router = routes;
 
-  for (const [name, handler] of Object.entries(roomHandlers)) {
+  for (const [name, handler] of Object.entries(rooms)) {
     handler.name = name;
     matchMaker.addRoomType(handler);
   }

package/src/Transport.ts

@@ -1,11 +1,13 @@
 import * as http from 'http';
 import * as https from 'https';
 
+import { ErrorCode } from '@colyseus/shared-types';
 import { StateView } from '@colyseus/schema';
+
 import { EventEmitter } from 'events';
 import { spliceOne } from './utils/Utils.ts';
 import { ServerError } from './errors/ServerError.ts';
-import { ErrorCode } from './Protocol.ts';
+
 import type { Room } from './Room.ts';
 
 export abstract class Transport {

package/src/errors/RoomExceptions.ts

@@ -1,4 +1,5 @@
-import type { ExtractMessageType, Room } from '../Room.ts';
+import type { ExtractMessageType } from '@colyseus/shared-types';
+import type { Room } from '../Room.ts';
 
 export type RoomMethodName = 'onCreate'
   | 'onAuth'

package/src/errors/ServerError.ts

@@ -1,4 +1,4 @@
-import { ErrorCode } from '../Protocol.ts';
+import { ErrorCode } from '@colyseus/shared-types';
 
 export class ServerError extends Error {
   public code: number;

package/src/index.ts

@@ -1,9 +1,19 @@
 import { ClockTimer as Clock, Delayed } from '@colyseus/timer';
 
+// Shared types - re-export from @colyseus/shared-types for convenience
+export {
+  Protocol,
+  ErrorCode,
+  CloseCode,
+  type InferState,
+  type ExtractRoomMessages,
+  type ExtractRoomClientMessages,
+} from '@colyseus/shared-types';
+
 // Core classes
 export { Server, defineRoom, defineServer, type ServerOptions, type SDKTypes } from './Server.ts';
-export { Room, room, RoomInternalState, validate, type RoomOptions, type MessageHandlerWithFormat, type ExtractMessageType, type Messages, type ExtractRoomState, type ExtractRoomMetadata, type ExtractRoomClient } from './Room.ts';
-export { Protocol, ErrorCode, getMessageBytes, CloseCode } from './Protocol.ts';
+export { Room, room, RoomInternalState, validate, type RoomOptions, type MessageHandlerWithFormat, type Messages, type ExtractRoomState, type ExtractRoomMetadata, type ExtractRoomClient } from './Room.ts';
+export { getMessageBytes } from './Protocol.ts';
 export { RegisteredHandler } from './matchmaker/RegisteredHandler.ts';
 export { ServerError } from './errors/ServerError.ts';
 

package/src/matchmaker/controller.ts

@@ -3,7 +3,7 @@
  * (for interoperability between different http frameworks, e.g. express, uWebSockets.js, etc)
  */
 
-import { ErrorCode } from '../Protocol.ts';
+import { ErrorCode } from '@colyseus/shared-types';
 import { ServerError } from '../errors/ServerError.ts';
 import * as matchMaker from '../MatchMaker.ts';
 import type { AuthContext } from '../Transport.ts';

package/src/rooms/RankedQueueRoom.ts

@@ -1,4 +1,10 @@
-import { Room, type Client, matchMaker, type IRoomCache, debugMatchMaking, ServerError, ErrorCode } from "@colyseus/core";
+import { Room } from '../Room.ts';
+import type { Client } from '../Transport.ts';
+import type { IRoomCache } from '../matchmaker/driver.ts';
+import * as matchMaker from '../MatchMaker.ts';
+import { debugMatchMaking } from '../Debug.ts';
+import { ServerError } from '../errors/ServerError.ts';
+import { ErrorCode } from '@colyseus/shared-types';
 
 export interface RankedQueueOptions {
   /**

package/src/rooms/RelayRoom.ts

@@ -1,8 +1,8 @@
+import { CloseCode } from '@colyseus/shared-types';
 import { defineTypes, MapSchema, Schema } from '@colyseus/schema';
 
 import { Room } from '../Room.ts';
 import type { Client } from '../Transport.ts';
-import { CloseCode } from '../Protocol.ts';
 
 class Player extends Schema {
   public connected: boolean;

package/src/serializer/SchemaSerializer.ts

@@ -1,9 +1,10 @@
+import { Protocol } from '@colyseus/shared-types';
+
 import type { Serializer } from './Serializer.ts';
 import { type Client, ClientState } from '../Transport.ts';
 
 import { type Iterator, Encoder, dumpChanges, Reflection, Schema, StateView } from '@colyseus/schema';
 import { debugPatch } from '../Debug.ts';
-import { Protocol } from '../Protocol.ts';
 
 const SHARED_VIEW = {};
 

package/src/serializer/SchemaSerializerDebug.ts

@@ -1,148 +0,0 @@
-/**
- * This serializer is a copy of SchemaSerializer,
- * but it writes debug information to a file.
- *
- * This script must be used
- */
-
-import fs from 'fs';
-import { Schema, dumpChanges, Iterator } from '@colyseus/schema';
-import { SchemaSerializer } from './SchemaSerializer.ts';
-import { Client, ClientState  } from "../Transport.ts";
-import { Protocol} from '../Protocol.ts';
-import { debugPatch } from '../Debug.ts';
-
-/*
-const SHARED_VIEW = {};
-
-export class SchemaSerializerDebug<T> extends SchemaSerializer<T> {
-  protected debugStream: fs.WriteStream;
-
-  constructor(fileName: string = "schema-debug.txt") {
-    super();
-
-    try { fs.unlinkSync(fileName); } catch (e) {}
-    this.debugStream = fs.createWriteStream(fileName, { flags: "a" });
-  }
-
-  public getFullState(client?: Client): Buffer {
-    const buf = super.getFullState(client);
-    this.debugStream.write(`state:${client.sessionId}:${Array.from(buf).slice(1).join(",")}\n`);
-    return buf;
-  }
-
-  public applyPatches(clients: Client[]) {
-    let numClients = clients.length;
-
-    const debugChangesDeep = Schema.debugChangesDeep(this.encoder.state);
-
-    if (
-      numClients == 0 ||
-      (
-        this.encoder.root.changes.size === 0 &&
-        (!this.hasFilters || this.encoder.root.filteredChanges.size === 0)
-      )
-    ) {
-      // skip patching state if:
-      // - no clients are connected
-      // - no changes were made
-      // - no "filtered changes" were made when using filters
-      return false;
-    }
-
-    this.needFullEncode = true;
-
-    // dump changes for patch debugging
-    if (debugPatch.enabled) {
-      (debugPatch as any).dumpChanges = dumpChanges(this.encoder.state);
-    }
-
-    // get patch bytes
-    const it: Iterator = { offset: 1 };
-    this.encoder.sharedBuffer[0] = Protocol.ROOM_STATE_PATCH;
-
-    // encode changes once, for all clients
-    const encodedChanges = this.encoder.encode(it);
-
-    if (!this.hasFilters) {
-      while (numClients--) {
-        const client = clients[numClients];
-
-        //
-        // FIXME: avoid this check for each client
-        //
-        if (client.state !== ClientState.JOINED) {
-          continue;
-        }
-
-        debugChangesDeep.split("\n").forEach((line) => {
-          this.debugStream.write(`#${client.sessionId}:${line}\n`);
-        });
-        this.debugStream.write(`patch:${client.sessionId}:${Array.from(encodedChanges).slice(1).join(",")}\n`);
-
-        client.raw(encodedChanges);
-      }
-
-    } else {
-      // cache shared offset
-      const sharedOffset = it.offset;
-
-      // encode state multiple times, for each client
-      while (numClients--) {
-        const client = clients[numClients];
-
-        //
-        // FIXME: avoid this check for each client
-        //
-        if (client.state !== ClientState.JOINED) {
-          continue;
-        }
-
-        const view = client.view || SHARED_VIEW;
-
-        let encodedView = this.views.get(view);
-
-        // allow to pass the same encoded view for multiple clients
-        if (encodedView === undefined) {
-          encodedView = (view === SHARED_VIEW)
-            ? encodedChanges
-            : this.encoder.encodeView(client.view, sharedOffset, it);
-          this.views.set(view, encodedView);
-        }
-
-        debugChangesDeep.split("\n").forEach((line) => {
-          this.debugStream.write(`#${client.sessionId}:${line}\n`);
-        });
-        this.debugStream.write(`patch:${client.sessionId}:${Array.from(encodedView).slice(1).join(",")}\n`);
-
-        client.raw(encodedView);
-      }
-
-      // clear views
-      this.views.clear();
-    }
-
-    // discard changes after sending
-    this.encoder.discardChanges();
-
-    // debug patches
-    if (debugPatch.enabled) {
-      debugPatch(
-        '%d bytes sent to %d clients, %j',
-        encodedChanges.length,
-        clients.length,
-        (debugPatch as any).dumpChanges,
-      );
-    }
-
-    return true;
-  }
-
-  public handshake(): Buffer {
-    const buf = super.handshake();
-    this.debugStream.write(`handshake:${Array.from(buf).join(",")}\n`);
-    return buf;
-  }
-}
-
-*/