@colyseus/core 0.16.23 → 0.17.0

package/build/MatchMaker.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -29,6 +30,8 @@ var MatchMaker_exports = {};
 __export(MatchMaker_exports, {
   MatchMakerState: () => MatchMakerState,
   accept: () => accept,
+  addRoomType: () => addRoomType,
+  buildSeatReservation: () => buildSeatReservation,
   controller: () => import_controller.default,
   create: () => create,
   createRoom: () => createRoom,
@@ -36,13 +39,13 @@ __export(MatchMaker_exports, {
   disconnectAll: () => disconnectAll,
   driver: () => driver,
   findOneRoomAvailable: () => findOneRoomAvailable,
+  getAllHandlers: () => getAllHandlers,
   getHandler: () => getHandler,
   getLocalRoomById: () => getLocalRoomById,
   getRoomById: () => getRoomById,
   getRoomClass: () => getRoomClass,
   gracefullyShutdown: () => gracefullyShutdown,
   handleCreateRoom: () => handleCreateRoom,
-  hasHandler: () => hasHandler,
   healthCheckAllProcesses: () => healthCheckAllProcesses,
   healthCheckProcessId: () => healthCheckProcessId,
   join: () => join,
@@ -56,6 +59,7 @@ __export(MatchMaker_exports, {
   reconnect: () => reconnect,
   remoteRoomCall: () => remoteRoomCall,
   removeRoomType: () => removeRoomType,
+  reserveMultipleSeatsFor: () => reserveMultipleSeatsFor,
   reserveSeatFor: () => reserveSeatFor,
   selectProcessIdToCreateRoom: () => selectProcessIdToCreateRoom,
   setHealthChecksEnabled: () => setHealthChecksEnabled,
@@ -65,22 +69,22 @@ __export(MatchMaker_exports, {
 });
 module.exports = __toCommonJS(MatchMaker_exports);
 var import_events = require("events");
-var import_Protocol = require("./Protocol.js");
-var import_IPC = require("./IPC.js");
-var import_Utils = require("./utils/Utils.js");
-var import_DevMode = require("./utils/DevMode.js");
-var import_RegisteredHandler = require("./matchmaker/RegisteredHandler.js");
-var import_Room = require("./Room.js");
-var import_LocalPresence = require("./presence/LocalPresence.js");
-var import_Debug = require("./Debug.js");
-var import_SeatReservationError = require("./errors/SeatReservationError.js");
-var import_ServerError = require("./errors/ServerError.js");
-var import_LocalDriver = require("./matchmaker/driver/local/LocalDriver.js");
-var import_controller = __toESM(require("./matchmaker/controller.js"));
-var stats = __toESM(require("./Stats.js"));
-var import_Logger = require("./Logger.js");
-var import_discovery = require("./discovery/index.js");
-var import_api = require("./matchmaker/driver/api.js");
+var import_Protocol = require("./Protocol.ts");
+var import_IPC = require("./IPC.ts");
+var import_Utils = require("./utils/Utils.ts");
+var import_DevMode = require("./utils/DevMode.ts");
+var import_RegisteredHandler = require("./matchmaker/RegisteredHandler.ts");
+var import_Room = require("./Room.ts");
+var import_LocalPresence = require("./presence/LocalPresence.ts");
+var import_Presence = require("./presence/Presence.ts");
+var import_Debug = require("./Debug.ts");
+var import_SeatReservationError = require("./errors/SeatReservationError.ts");
+var import_ServerError = require("./errors/ServerError.ts");
+var import_LocalDriver = require("./matchmaker/LocalDriver/LocalDriver.ts");
+var import_controller = __toESM(require("./matchmaker/controller.ts"), 1);
+var stats = __toESM(require("./Stats.ts"), 1);
+var import_Logger = require("./Logger.ts");
+var import_driver = require("./matchmaker/driver.ts");
 const handlers = {};
 const rooms = {};
 const events = new import_events.EventEmitter();
@@ -88,37 +92,41 @@ let publicAddress;
 let processId;
 let presence;
 let driver;
-let selectProcessIdToCreateRoom;
+let selectProcessIdToCreateRoom = async function() {
+  return (await stats.fetchAll()).sort((p1, p2) => p1.roomCount > p2.roomCount ? 1 : -1)[0]?.processId || processId;
+};
 let enableHealthChecks = true;
 function setHealthChecksEnabled(value) {
   enableHealthChecks = value;
 }
 let onReady = new import_Utils.Deferred();
-var MatchMakerState = /* @__PURE__ */ ((MatchMakerState2) => {
-  MatchMakerState2[MatchMakerState2["INITIALIZING"] = 0] = "INITIALIZING";
-  MatchMakerState2[MatchMakerState2["READY"] = 1] = "READY";
-  MatchMakerState2[MatchMakerState2["SHUTTING_DOWN"] = 2] = "SHUTTING_DOWN";
-  return MatchMakerState2;
-})(MatchMakerState || {});
+const MatchMakerState = {
+  INITIALIZING: 0,
+  READY: 1,
+  SHUTTING_DOWN: 2
+};
 let state;
 async function setup(_presence, _driver, _publicAddress, _selectProcessIdToCreateRoom) {
   if (onReady === void 0) {
     onReady = new import_Utils.Deferred();
   }
-  state = 0 /* INITIALIZING */;
+  state = MatchMakerState.INITIALIZING;
   presence = _presence || new import_LocalPresence.LocalPresence();
   driver = _driver || new import_LocalDriver.LocalDriver();
   publicAddress = _publicAddress;
   stats.reset(false);
   if (import_DevMode.isDevMode) {
-    processId = await (0, import_DevMode.getPreviousProcessId)(await (0, import_discovery.getHostname)());
+    processId = await (0, import_DevMode.getPreviousProcessId)();
   }
   if (!processId) {
     processId = (0, import_Utils.generateId)();
   }
-  selectProcessIdToCreateRoom = _selectProcessIdToCreateRoom || async function() {
-    return (await stats.fetchAll()).sort((p1, p2) => p1.roomCount > p2.roomCount ? 1 : -1)[0]?.processId || processId;
-  };
+  if (_selectProcessIdToCreateRoom) {
+    selectProcessIdToCreateRoom = _selectProcessIdToCreateRoom;
+  }
+  if (driver.boot) {
+    await driver.boot();
+  }
   onReady.resolve();
 }
 async function accept() {
@@ -134,7 +142,7 @@ async function accept() {
     await healthCheckAllProcesses();
     stats.setAutoPersistInterval();
   }
-  state = 1 /* READY */;
+  state = MatchMakerState.READY;
   await stats.persist();
   if (import_DevMode.isDevMode) {
     await (0, import_DevMode.reloadFromCache)();
@@ -147,7 +155,7 @@ async function joinOrCreate(roomName, clientOptions = {}, authContext) {
     if (!room) {
       const handler = getHandler(roomName);
       const filterOptions = handler.getFilterOptions(clientOptions);
-      const concurrencyKey = (0, import_api.getLockId)(filterOptions);
+      const concurrencyKey = (0, import_driver.getLockId)(filterOptions);
       await concurrentJoinOrCreateRoomLock(handler, concurrencyKey, async (roomId) => {
         if (roomId) {
           room = await driver.findOne({ roomId });
@@ -185,7 +193,7 @@ async function reconnect(roomId, clientOptions = {}) {
   if (!room) {
     if (process.env.NODE_ENV !== "production") {
       import_Logger.logger.info(`\u274C room "${roomId}" has been disposed. Did you miss .allowReconnection()?
-\u{1F449} https://docs.colyseus.io/server/room/#allowreconnection-client-seconds`);
+\u{1F449} https://docs.colyseus.io/server/room#allow-reconnection`);
     }
     throw new import_ServerError.ServerError(import_Protocol.ErrorCode.MATCHMAKE_INVALID_ROOM_ID, `room "${roomId}" has been disposed.`);
   }
@@ -195,11 +203,11 @@ async function reconnect(roomId, clientOptions = {}) {
   }
   const sessionId = await remoteRoomCall(room.roomId, "checkReconnectionToken", [reconnectionToken]);
   if (sessionId) {
-    return { room, sessionId };
+    return buildSeatReservation(room, sessionId);
   } else {
     if (process.env.NODE_ENV !== "production") {
       import_Logger.logger.info(`\u274C reconnection token invalid or expired. Did you miss .allowReconnection()?
-\u{1F449} https://docs.colyseus.io/server/room/#allowreconnection-client-seconds`);
+\u{1F449} https://docs.colyseus.io/server/room#allow-reconnection`);
     }
     throw new import_ServerError.ServerError(import_Protocol.ErrorCode.MATCHMAKE_EXPIRED, `reconnection token invalid or expired.`);
   }
@@ -239,7 +247,7 @@ async function remoteRoomCall(roomId, method, args, rejectionTimeout = import_Ut
       if (method === "_reserveSeat" && e.message === "ipc_timeout") {
         throw e;
       }
-      const request = `${method}${args && " with args " + JSON.stringify(args) || ""}`;
+      const request = `${String(method)}${args && " with args " + JSON.stringify(args) || ""}`;
       throw new import_ServerError.ServerError(
         import_Protocol.ErrorCode.MATCHMAKE_UNHANDLED,
         `remote room (${roomId}) timed out, requesting "${request}". (${rejectionTimeout}ms exceeded)`
@@ -250,7 +258,8 @@ async function remoteRoomCall(roomId, method, args, rejectionTimeout = import_Ut
   }
 }
 function defineRoomType(roomName, klass, defaultOptions) {
-  const registeredHandler = new import_RegisteredHandler.RegisteredHandler(roomName, klass, defaultOptions);
+  const registeredHandler = new import_RegisteredHandler.RegisteredHandler(klass, defaultOptions);
+  registeredHandler.name = roomName;
   handlers[roomName] = registeredHandler;
   if (klass.prototype["onAuth"] !== import_Room.Room.prototype["onAuth"]) {
     if (klass["onAuth"] !== import_Room.Room["onAuth"]) {
@@ -259,12 +268,14 @@ function defineRoomType(roomName, klass, defaultOptions) {
   }
   return registeredHandler;
 }
+function addRoomType(handler) {
+  handlers[handler.name] = handler;
+}
 function removeRoomType(roomName) {
   delete handlers[roomName];
 }
-function hasHandler(roomName) {
-  import_Logger.logger.warn("hasHandler() is deprecated. Use getHandler() instead.");
-  return handlers[roomName] !== void 0;
+function getAllHandlers() {
+  return handlers;
 }
 function getHandler(roomName) {
   const handler = handlers[roomName];
@@ -277,7 +288,7 @@ function getRoomClass(roomName) {
   return handlers[roomName]?.klass;
 }
 async function createRoom(roomName, clientOptions) {
-  const selectedProcessId = state === 1 /* READY */ ? await selectProcessIdToCreateRoom(roomName, clientOptions) : processId;
+  const selectedProcessId = state === MatchMakerState.READY ? await selectProcessIdToCreateRoom(roomName, clientOptions) : processId;
   let room;
   if (selectedProcessId === void 0) {
     if (import_DevMode.isDevMode && processId === void 0) {
@@ -328,16 +339,15 @@ async function handleCreateRoom(roomName, clientOptions, restoringRoomId) {
   }
   room["__init"]();
   room.roomName = roomName;
-  room.presence = presence;
-  const additionalListingData = handler.getFilterOptions(clientOptions);
-  if (publicAddress) {
-    additionalListingData.publicAddress = publicAddress;
-  }
-  room.listing = driver.createInstance({
+  room.presence = (0, import_Presence.createScopedPresence)(room, presence);
+  room["_listing"] = (0, import_driver.initializeRoomCache)({
     name: roomName,
     processId,
-    ...additionalListingData
+    ...handler.getMetadataFromOptions(clientOptions)
   });
+  if (publicAddress) {
+    room["_listing"].publicAddress = publicAddress;
+  }
   if (room.onCreate) {
     try {
       await room.onCreate((0, import_Utils.merge)({}, clientOptions, handler.options));
@@ -350,32 +360,38 @@ async function handleCreateRoom(roomName, clientOptions, restoringRoomId) {
     }
   }
   room["_internalState"] = import_Room.RoomInternalState.CREATED;
-  room.listing.roomId = room.roomId;
-  room.listing.maxClients = room.maxClients;
+  room["_listing"].roomId = room.roomId;
+  room["_listing"].maxClients = room.maxClients;
   (0, import_Debug.debugMatchMaking)("spawning '%s', roomId: %s, processId: %s", roomName, room.roomId, processId);
   stats.local.roomCount++;
   stats.persist();
-  room._events.on("lock", lockRoom.bind(this, room));
-  room._events.on("unlock", unlockRoom.bind(this, room));
-  room._events.on("join", onClientJoinRoom.bind(this, room));
-  room._events.on("leave", onClientLeaveRoom.bind(this, room));
-  room._events.on("visibility-change", onVisibilityChange.bind(this, room));
-  room._events.once("dispose", disposeRoom.bind(this, roomName, room));
-  room._events.once("disconnect", () => {
-    room._events.removeAllListeners("lock");
-    room._events.removeAllListeners("unlock");
-    room._events.removeAllListeners("visibility-change");
-    room._events.removeAllListeners("dispose");
+  room["_events"].on("lock", lockRoom.bind(void 0, room));
+  room["_events"].on("unlock", unlockRoom.bind(void 0, room));
+  room["_events"].on("join", onClientJoinRoom.bind(void 0, room));
+  room["_events"].on("leave", onClientLeaveRoom.bind(void 0, room));
+  room["_events"].once("dispose", disposeRoom.bind(void 0, roomName, room));
+  if (handler.realtimeListingEnabled) {
+    room["_events"].on("visibility-change", onVisibilityChange.bind(void 0, room));
+    room["_events"].on("metadata-change", onMetadataChange.bind(void 0, room));
+  }
+  room["_events"].once("disconnect", () => {
+    room["_events"].removeAllListeners("lock");
+    room["_events"].removeAllListeners("unlock");
+    room["_events"].removeAllListeners("dispose");
+    if (handler.realtimeListingEnabled) {
+      room["_events"].removeAllListeners("visibility-change");
+      room["_events"].removeAllListeners("metadata-change");
+    }
     if (stats.local.roomCount <= 0) {
       events.emit("no-active-rooms");
     }
   });
   await createRoomReferences(room, true);
-  if (state !== 2 /* SHUTTING_DOWN */) {
-    await room.listing.save();
+  if (state !== MatchMakerState.SHUTTING_DOWN) {
+    await driver.persist(room["_listing"], true);
   }
   handler.emit("create", room);
-  return room.listing;
+  return room["_listing"];
 }
 function getRoomById(roomId) {
   return driver.findOne({ roomId });
@@ -410,35 +426,33 @@ async function lockAndDisposeAll() {
     }
     const room = rooms[roomId];
     room.lock();
-    room.onBeforeShutdown();
+    if (import_DevMode.isDevMode) {
+      import_Room.Room.prototype.onBeforeShutdown.call(room);
+    } else {
+      room.onBeforeShutdown();
+    }
   }
   await noActiveRooms;
 }
 async function gracefullyShutdown() {
-  if (state === 2 /* SHUTTING_DOWN */) {
+  if (state === MatchMakerState.SHUTTING_DOWN) {
     return Promise.reject("already_shutting_down");
   }
   (0, import_Debug.debugMatchMaking)(`${processId} is shutting down!`);
-  state = 2 /* SHUTTING_DOWN */;
+  state = MatchMakerState.SHUTTING_DOWN;
   onReady = void 0;
-  await lockAndDisposeAll();
   if (import_DevMode.isDevMode) {
     await (0, import_DevMode.cacheRoomHistory)(rooms);
   }
+  await lockAndDisposeAll();
   await removeRoomsByProcessId(processId);
   presence.unsubscribe(getProcessChannel());
   return Promise.all(disconnectAll(
-    import_DevMode.isDevMode ? import_Protocol.Protocol.WS_CLOSE_DEVMODE_RESTART : void 0
+    import_DevMode.isDevMode ? import_Protocol.CloseCode.DEVMODE_RESTART : import_Protocol.CloseCode.SERVER_SHUTDOWN
   ));
 }
 async function reserveSeatFor(room, options, authData) {
   const sessionId = authData?.sessionId || (0, import_Utils.generateId)();
-  (0, import_Debug.debugMatchMaking)(
-    "reserving seat. sessionId: '%s', roomId: '%s', processId: '%s'",
-    sessionId,
-    room.roomId,
-    processId
-  );
   let successfulSeatReservation;
   try {
     successfulSeatReservation = await remoteRoomCall(
@@ -458,11 +472,55 @@ async function reserveSeatFor(room, options, authData) {
   if (!successfulSeatReservation) {
     throw new import_SeatReservationError.SeatReservationError(`${room.roomId} is already full.`);
   }
-  const response = { room, sessionId };
+  return buildSeatReservation(room, sessionId);
+}
+async function reserveMultipleSeatsFor(room, clientsData) {
+  let sessionIds = [];
+  let options = [];
+  let authData = [];
+  for (const clientData of clientsData) {
+    sessionIds.push(clientData.sessionId);
+    options.push(clientData.options);
+    authData.push(clientData.auth);
+  }
+  (0, import_Debug.debugMatchMaking)(
+    "reserving multiple seats. sessionIds: '%s', roomId: '%s', processId: '%s'",
+    sessionIds.join(", "),
+    room.roomId,
+    processId
+  );
+  let successfulSeatReservations;
+  try {
+    successfulSeatReservations = await remoteRoomCall(
+      room.roomId,
+      "_reserveMultipleSeats",
+      [sessionIds, options, authData],
+      import_Utils.REMOTE_ROOM_SHORT_TIMEOUT
+    );
+  } catch (e) {
+    (0, import_Debug.debugMatchMaking)(e);
+    if (e.message === "ipc_timeout" && !(enableHealthChecks && await healthCheckProcessId(room.processId))) {
+      throw new import_SeatReservationError.SeatReservationError(`process ${room.processId} is not available.`);
+    } else {
+      throw new import_SeatReservationError.SeatReservationError(`${room.roomId} is already full.`);
+    }
+  }
+  return successfulSeatReservations;
+}
+function buildSeatReservation(room, sessionId) {
+  const seatReservation = {
+    name: room.name,
+    sessionId,
+    roomId: room.roomId,
+    processId: room.processId
+  };
   if (import_DevMode.isDevMode) {
-    response.devMode = import_DevMode.isDevMode;
+    seatReservation.devMode = import_DevMode.isDevMode;
   }
-  return response;
+  if (room.publicAddress) {
+    seatReservation.publicAddress = room.publicAddress;
+  }
+  return seatReservation;
 }
 async function callOnAuth(roomName, clientOptions, authContext) {
   const roomClass = getRoomClass(roomName);
@@ -476,7 +534,7 @@ async function callOnAuth(roomName, clientOptions, authContext) {
 }
 async function healthCheckAllProcesses() {
   const allStats = await stats.fetchAll();
-  const activeProcessChannels = typeof presence.channels === "function" ? (await presence.channels("p:*")).map((c) => c.substring(2)) : [];
+  const activeProcessChannels = (await presence.channels("p:*")).map((c) => c.substring(2));
   if (allStats.length > 0) {
     await Promise.all(
       allStats.filter((stat) => stat.processId !== processId && // skip current process
@@ -504,8 +562,8 @@ function healthCheckProcessId(processId2) {
       resolve(true);
     } catch (e) {
       import_Logger.logger.debug(`\u274C Process '${processId2}' failed to respond. Cleaning it up.`);
-      const isProcessExcluded = await stats.excludeProcess(processId2);
-      if (isProcessExcluded && !import_DevMode.isDevMode) {
+      await stats.excludeProcess(processId2);
+      if (!import_DevMode.isDevMode) {
         await removeRoomsByProcessId(processId2);
       }
       resolve(false);
@@ -593,11 +651,14 @@ async function unlockRoom(room) {
 function onVisibilityChange(room, isInvisible) {
   handlers[room.roomName].emit("visibility-change", room, isInvisible);
 }
+function onMetadataChange(room) {
+  handlers[room.roomName].emit("metadata-change", room);
+}
 async function disposeRoom(roomName, room) {
-  (0, import_Debug.debugMatchMaking)("disposing '%s' (%s) on processId '%s' (graceful shutdown: %s)", roomName, room.roomId, processId, state === 2 /* SHUTTING_DOWN */);
-  room.listing.remove();
+  (0, import_Debug.debugMatchMaking)("disposing '%s' (%s) on processId '%s' (graceful shutdown: %s)", roomName, room.roomId, processId, state === MatchMakerState.SHUTTING_DOWN);
+  driver.remove(room["_listing"].roomId);
   stats.local.roomCount--;
-  if (state !== 2 /* SHUTTING_DOWN */) {
+  if (state !== MatchMakerState.SHUTTING_DOWN) {
     stats.persist();
     if (import_DevMode.isDevMode) {
       await presence.hdel((0, import_DevMode.getRoomRestoreListKey)(), room.roomId);
@@ -620,6 +681,8 @@ function getProcessChannel(id = processId) {
 0 && (module.exports = {
   MatchMakerState,
   accept,
+  addRoomType,
+  buildSeatReservation,
   controller,
   create,
   createRoom,
@@ -627,13 +690,13 @@ function getProcessChannel(id = processId) {
   disconnectAll,
   driver,
   findOneRoomAvailable,
+  getAllHandlers,
   getHandler,
   getLocalRoomById,
   getRoomById,
   getRoomClass,
   gracefullyShutdown,
   handleCreateRoom,
-  hasHandler,
   healthCheckAllProcesses,
   healthCheckProcessId,
   join,
@@ -647,6 +710,7 @@ function getProcessChannel(id = processId) {
   reconnect,
   remoteRoomCall,
   removeRoomType,
+  reserveMultipleSeatsFor,
   reserveSeatFor,
   selectProcessIdToCreateRoom,
   setHealthChecksEnabled,