@colyseus/core 0.15.11-alpha.1 → 0.15.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/MatchMaker.d.ts +13 -11
- package/build/MatchMaker.js +53 -66
- package/build/MatchMaker.js.map +2 -2
- package/build/MatchMaker.mjs +52 -62
- package/build/MatchMaker.mjs.map +2 -2
- package/build/Room.d.ts +2 -5
- package/build/Room.js +32 -23
- package/build/Room.js.map +2 -2
- package/build/Room.mjs +32 -23
- package/build/Room.mjs.map +2 -2
- package/build/Server.d.ts +9 -5
- package/build/Server.js +4 -12
- package/build/Server.js.map +2 -2
- package/build/Server.mjs +4 -12
- package/build/Server.mjs.map +2 -2
- package/build/Stats.d.ts +12 -0
- package/build/Stats.js +84 -0
- package/build/Stats.js.map +7 -0
- package/build/Stats.mjs +56 -0
- package/build/Stats.mjs.map +7 -0
- package/build/index.d.ts +4 -4
- package/build/index.js +0 -10
- package/build/index.js.map +2 -2
- package/build/index.mjs +4 -9
- package/build/index.mjs.map +2 -2
- package/build/matchmaker/RegisteredHandler.d.ts +3 -7
- package/build/matchmaker/RegisteredHandler.js +0 -5
- package/build/matchmaker/RegisteredHandler.js.map +2 -2
- package/build/matchmaker/RegisteredHandler.mjs +0 -5
- package/build/matchmaker/RegisteredHandler.mjs.map +2 -2
- package/build/matchmaker/controller.d.ts +1 -3
- package/build/matchmaker/controller.js +3 -6
- package/build/matchmaker/controller.js.map +2 -2
- package/build/matchmaker/controller.mjs +3 -6
- package/build/matchmaker/controller.mjs.map +2 -2
- package/build/matchmaker/driver/index.d.ts +1 -1
- package/build/matchmaker/driver/index.js +2 -13
- package/build/matchmaker/driver/index.js.map +2 -2
- package/build/matchmaker/driver/index.mjs +1 -7
- package/build/matchmaker/driver/index.mjs.map +2 -2
- package/build/matchmaker/driver/interfaces.d.ts +1 -1
- package/build/matchmaker/driver/interfaces.js.map +1 -1
- package/build/utils/types.d.ts +1 -0
- package/build/utils/types.js +15 -0
- package/build/utils/types.js.map +7 -0
- package/build/utils/types.mjs +0 -0
- package/build/utils/types.mjs.map +7 -0
- package/package.json +2 -2
package/build/MatchMaker.mjs
CHANGED
|
@@ -3,13 +3,14 @@ import { requestFromIPC, subscribeIPC } from "./IPC";
|
|
|
3
3
|
import { Deferred, generateId, merge, REMOTE_ROOM_SHORT_TIMEOUT, retry } from "./utils/Utils";
|
|
4
4
|
import { isDevMode, cacheRoomHistory, getPreviousProcessId, getRoomRestoreListKey, reloadFromCache } from "./utils/DevMode";
|
|
5
5
|
import { RegisteredHandler } from "./matchmaker/RegisteredHandler";
|
|
6
|
-
import {
|
|
6
|
+
import { RoomInternalState } from "./Room";
|
|
7
7
|
import { LocalPresence } from "./presence/LocalPresence";
|
|
8
8
|
import { debugAndPrintError, debugMatchMaking } from "./Debug";
|
|
9
9
|
import { SeatReservationError } from "./errors/SeatReservationError";
|
|
10
10
|
import { ServerError } from "./errors/ServerError";
|
|
11
|
-
import {
|
|
11
|
+
import { LocalDriver } from "./matchmaker/driver";
|
|
12
12
|
import controller from "./matchmaker/controller";
|
|
13
|
+
import * as stats from "./Stats";
|
|
13
14
|
import { logger } from "./Logger";
|
|
14
15
|
import { getHostname } from "./discovery";
|
|
15
16
|
const handlers = {};
|
|
@@ -18,10 +19,10 @@ let publicAddress;
|
|
|
18
19
|
let processId;
|
|
19
20
|
let presence;
|
|
20
21
|
let driver;
|
|
22
|
+
let selectProcessIdToCreateRoom;
|
|
21
23
|
let isGracefullyShuttingDown;
|
|
22
24
|
let onReady;
|
|
23
|
-
|
|
24
|
-
async function setup(_presence, _driver, _publicAddress) {
|
|
25
|
+
async function setup(_presence, _driver, _publicAddress, _selectProcessIdToCreateRoom) {
|
|
25
26
|
onReady = new Deferred();
|
|
26
27
|
presence = _presence || new LocalPresence();
|
|
27
28
|
driver = _driver || new LocalDriver();
|
|
@@ -33,10 +34,13 @@ async function setup(_presence, _driver, _publicAddress) {
|
|
|
33
34
|
processId = generateId();
|
|
34
35
|
}
|
|
35
36
|
isGracefullyShuttingDown = false;
|
|
37
|
+
selectProcessIdToCreateRoom = _selectProcessIdToCreateRoom || async function() {
|
|
38
|
+
return (await stats.fetchAll()).sort((p1, p2) => p1.roomCount > p2.roomCount ? 1 : -1)[0].processId;
|
|
39
|
+
};
|
|
36
40
|
subscribeIPC(presence, processId, getProcessChannel(), (_, args) => {
|
|
37
41
|
return handleCreateRoom.apply(void 0, args);
|
|
38
42
|
});
|
|
39
|
-
await
|
|
43
|
+
await stats.reset();
|
|
40
44
|
if (isDevMode) {
|
|
41
45
|
await reloadFromCache();
|
|
42
46
|
}
|
|
@@ -67,8 +71,10 @@ async function join(roomName, clientOptions = {}) {
|
|
|
67
71
|
async function reconnect(roomId, clientOptions = {}) {
|
|
68
72
|
const room = await driver.findOne({ roomId });
|
|
69
73
|
if (!room) {
|
|
70
|
-
|
|
74
|
+
if (process.env.NODE_ENV !== "production") {
|
|
75
|
+
logger.info(`\u274C room "${roomId}" has been disposed. Did you missed .allowReconnection()?
|
|
71
76
|
\u{1F449} https://docs.colyseus.io/server/room/#allowreconnection-client-seconds`);
|
|
77
|
+
}
|
|
72
78
|
throw new ServerError(ErrorCode.MATCHMAKE_INVALID_ROOM_ID, `room "${roomId}" has been disposed.`);
|
|
73
79
|
}
|
|
74
80
|
const reconnectionToken = clientOptions.reconnectionToken;
|
|
@@ -79,8 +85,10 @@ async function reconnect(roomId, clientOptions = {}) {
|
|
|
79
85
|
if (sessionId) {
|
|
80
86
|
return { room, sessionId };
|
|
81
87
|
} else {
|
|
82
|
-
|
|
88
|
+
if (process.env.NODE_ENV !== "production") {
|
|
89
|
+
logger.info(`\u274C reconnection token invalid or expired. Did you missed .allowReconnection()?
|
|
83
90
|
\u{1F449} https://docs.colyseus.io/server/room/#allowreconnection-client-seconds`);
|
|
91
|
+
}
|
|
84
92
|
throw new ServerError(ErrorCode.MATCHMAKE_EXPIRED, `reconnection token invalid or expired.`);
|
|
85
93
|
}
|
|
86
94
|
}
|
|
@@ -98,7 +106,10 @@ async function query(conditions = {}) {
|
|
|
98
106
|
}
|
|
99
107
|
async function findOneRoomAvailable(roomName, clientOptions) {
|
|
100
108
|
return await awaitRoomAvailable(roomName, async () => {
|
|
101
|
-
const handler =
|
|
109
|
+
const handler = handlers[roomName];
|
|
110
|
+
if (!handler) {
|
|
111
|
+
throw new ServerError(ErrorCode.MATCHMAKE_NO_HANDLER, `provided room name "${roomName}" not defined`);
|
|
112
|
+
}
|
|
102
113
|
const roomQuery = driver.findOne({
|
|
103
114
|
locked: false,
|
|
104
115
|
name: roomName,
|
|
@@ -115,7 +126,7 @@ async function remoteRoomCall(roomId, method, args, rejectionTimeout = REMOTE_RO
|
|
|
115
126
|
const room = rooms[roomId];
|
|
116
127
|
if (!room) {
|
|
117
128
|
try {
|
|
118
|
-
return await requestFromIPC(presence, getRoomChannel(roomId), method, args);
|
|
129
|
+
return await requestFromIPC(presence, getRoomChannel(roomId), method, args, rejectionTimeout);
|
|
119
130
|
} catch (e) {
|
|
120
131
|
const request = `${method}${args && " with args " + JSON.stringify(args) || ""}`;
|
|
121
132
|
throw new ServerError(
|
|
@@ -127,57 +138,40 @@ async function remoteRoomCall(roomId, method, args, rejectionTimeout = REMOTE_RO
|
|
|
127
138
|
return !args && typeof room[method] !== "function" ? room[method] : await room[method].apply(room, args && args.map((arg) => JSON.parse(JSON.stringify(arg))));
|
|
128
139
|
}
|
|
129
140
|
}
|
|
130
|
-
function defineRoomType(
|
|
141
|
+
function defineRoomType(name, klass, defaultOptions) {
|
|
131
142
|
const registeredHandler = new RegisteredHandler(klass, defaultOptions);
|
|
132
|
-
handlers[
|
|
133
|
-
if (klass.prototype["onAuth"] !== Room.prototype["onAuth"]) {
|
|
134
|
-
console.warn("onAuth() at the instance level will be deprecated soon. Please use static onAuth() instead.");
|
|
135
|
-
}
|
|
143
|
+
handlers[name] = registeredHandler;
|
|
136
144
|
if (!isDevMode) {
|
|
137
|
-
cleanupStaleRooms(
|
|
145
|
+
cleanupStaleRooms(name);
|
|
138
146
|
}
|
|
139
147
|
return registeredHandler;
|
|
140
148
|
}
|
|
141
|
-
function removeRoomType(
|
|
142
|
-
delete handlers[
|
|
149
|
+
function removeRoomType(name) {
|
|
150
|
+
delete handlers[name];
|
|
143
151
|
if (!isDevMode) {
|
|
144
|
-
cleanupStaleRooms(
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
function hasHandler(roomName) {
|
|
148
|
-
console.warn("hasHandler() is deprecated. Use getHandler() instead.");
|
|
149
|
-
return handlers[roomName] !== void 0;
|
|
150
|
-
}
|
|
151
|
-
function getHandler(roomName) {
|
|
152
|
-
const handler = handlers[roomName];
|
|
153
|
-
if (!handler) {
|
|
154
|
-
throw new ServerError(ErrorCode.MATCHMAKE_NO_HANDLER, `provided room name "${roomName}" not defined`);
|
|
152
|
+
cleanupStaleRooms(name);
|
|
155
153
|
}
|
|
156
|
-
return handler;
|
|
157
154
|
}
|
|
158
|
-
function
|
|
159
|
-
return
|
|
155
|
+
function hasHandler(name) {
|
|
156
|
+
return handlers[name] !== void 0;
|
|
160
157
|
}
|
|
161
158
|
async function createRoom(roomName, clientOptions) {
|
|
162
|
-
const
|
|
163
|
-
const processIdWithFewerRooms = Object.keys(roomsSpawnedByProcessId).sort((p1, p2) => {
|
|
164
|
-
return Number(roomsSpawnedByProcessId[p1]) > Number(roomsSpawnedByProcessId[p2]) ? 1 : -1;
|
|
165
|
-
})[0] || processId;
|
|
159
|
+
const selectedProcessId = await selectProcessIdToCreateRoom(roomName, clientOptions);
|
|
166
160
|
let room;
|
|
167
|
-
if (
|
|
161
|
+
if (selectedProcessId === processId) {
|
|
168
162
|
room = await handleCreateRoom(roomName, clientOptions);
|
|
169
163
|
} else {
|
|
170
164
|
try {
|
|
171
165
|
room = await requestFromIPC(
|
|
172
166
|
presence,
|
|
173
|
-
getProcessChannel(
|
|
167
|
+
getProcessChannel(selectedProcessId),
|
|
174
168
|
void 0,
|
|
175
169
|
[roomName, clientOptions],
|
|
176
170
|
REMOTE_ROOM_SHORT_TIMEOUT
|
|
177
171
|
);
|
|
178
172
|
} catch (e) {
|
|
179
|
-
await presence.hdel(getRoomCountKey(), processIdWithFewerRooms);
|
|
180
173
|
debugAndPrintError(e);
|
|
174
|
+
await stats.excludeProcess(selectedProcessId);
|
|
181
175
|
room = await handleCreateRoom(roomName, clientOptions);
|
|
182
176
|
}
|
|
183
177
|
}
|
|
@@ -191,8 +185,11 @@ async function createRoom(roomName, clientOptions) {
|
|
|
191
185
|
return room;
|
|
192
186
|
}
|
|
193
187
|
async function handleCreateRoom(roomName, clientOptions, restoringRoomId) {
|
|
194
|
-
const
|
|
195
|
-
|
|
188
|
+
const registeredHandler = handlers[roomName];
|
|
189
|
+
if (!registeredHandler) {
|
|
190
|
+
throw new ServerError(ErrorCode.MATCHMAKE_NO_HANDLER, `provided room name "${roomName}" not defined`);
|
|
191
|
+
}
|
|
192
|
+
const room = new registeredHandler.klass();
|
|
196
193
|
if (restoringRoomId && isDevMode) {
|
|
197
194
|
room.roomId = restoringRoomId;
|
|
198
195
|
} else {
|
|
@@ -200,7 +197,7 @@ async function handleCreateRoom(roomName, clientOptions, restoringRoomId) {
|
|
|
200
197
|
}
|
|
201
198
|
room.roomName = roomName;
|
|
202
199
|
room.presence = presence;
|
|
203
|
-
const additionalListingData =
|
|
200
|
+
const additionalListingData = registeredHandler.getFilterOptions(clientOptions);
|
|
204
201
|
if (publicAddress) {
|
|
205
202
|
additionalListingData.publicAddress = publicAddress;
|
|
206
203
|
}
|
|
@@ -211,9 +208,7 @@ async function handleCreateRoom(roomName, clientOptions, restoringRoomId) {
|
|
|
211
208
|
});
|
|
212
209
|
if (room.onCreate) {
|
|
213
210
|
try {
|
|
214
|
-
await room.onCreate(merge({}, clientOptions,
|
|
215
|
-
roomCount++;
|
|
216
|
-
presence.hset(getRoomCountKey(), processId, roomCount.toString());
|
|
211
|
+
await room.onCreate(merge({}, clientOptions, registeredHandler.options));
|
|
217
212
|
} catch (e) {
|
|
218
213
|
debugAndPrintError(e);
|
|
219
214
|
throw new ServerError(
|
|
@@ -226,6 +221,8 @@ async function handleCreateRoom(roomName, clientOptions, restoringRoomId) {
|
|
|
226
221
|
room.listing.roomId = room.roomId;
|
|
227
222
|
room.listing.maxClients = room.maxClients;
|
|
228
223
|
debugMatchMaking("spawning '%s', roomId: %s, processId: %s", roomName, room.roomId, processId);
|
|
224
|
+
stats.local.roomCount++;
|
|
225
|
+
stats.persist();
|
|
229
226
|
room._events.on("lock", lockRoom.bind(this, room));
|
|
230
227
|
room._events.on("unlock", unlockRoom.bind(this, room));
|
|
231
228
|
room._events.on("join", onClientJoinRoom.bind(this, room));
|
|
@@ -234,7 +231,7 @@ async function handleCreateRoom(roomName, clientOptions, restoringRoomId) {
|
|
|
234
231
|
room._events.once("disconnect", () => room._events.removeAllListeners());
|
|
235
232
|
await createRoomReferences(room, true);
|
|
236
233
|
await room.listing.save();
|
|
237
|
-
|
|
234
|
+
registeredHandler.emit("create", room);
|
|
238
235
|
return room.listing;
|
|
239
236
|
}
|
|
240
237
|
function getRoomById(roomId) {
|
|
@@ -259,7 +256,7 @@ async function gracefullyShutdown() {
|
|
|
259
256
|
if (isDevMode) {
|
|
260
257
|
await cacheRoomHistory(rooms);
|
|
261
258
|
}
|
|
262
|
-
|
|
259
|
+
stats.excludeProcess(processId);
|
|
263
260
|
presence.unsubscribe(getProcessChannel());
|
|
264
261
|
return Promise.all(disconnectAll(
|
|
265
262
|
isDevMode ? Protocol.WS_CLOSE_DEVMODE_RESTART : void 0
|
|
@@ -341,11 +338,13 @@ async function awaitRoomAvailable(roomToJoin, callback) {
|
|
|
341
338
|
});
|
|
342
339
|
}
|
|
343
340
|
function onClientJoinRoom(room, client) {
|
|
344
|
-
|
|
341
|
+
stats.local.ccu++;
|
|
342
|
+
stats.persist();
|
|
345
343
|
handlers[room.roomName].emit("join", room, client);
|
|
346
344
|
}
|
|
347
345
|
function onClientLeaveRoom(room, client, willDispose) {
|
|
348
|
-
|
|
346
|
+
stats.local.ccu--;
|
|
347
|
+
stats.persist();
|
|
349
348
|
handlers[room.roomName].emit("leave", room, client, willDispose);
|
|
350
349
|
}
|
|
351
350
|
function lockRoom(room) {
|
|
@@ -359,8 +358,8 @@ async function unlockRoom(room) {
|
|
|
359
358
|
async function disposeRoom(roomName, room) {
|
|
360
359
|
debugMatchMaking("disposing '%s' (%s) on processId '%s'", roomName, room.roomId, processId);
|
|
361
360
|
if (!isGracefullyShuttingDown) {
|
|
362
|
-
roomCount--;
|
|
363
|
-
|
|
361
|
+
stats.local.roomCount--;
|
|
362
|
+
stats.persist();
|
|
364
363
|
if (isDevMode) {
|
|
365
364
|
await presence.hdel(getRoomRestoreListKey(), room.roomId);
|
|
366
365
|
}
|
|
@@ -370,9 +369,6 @@ async function disposeRoom(roomName, room) {
|
|
|
370
369
|
presence.unsubscribe(getRoomChannel(room.roomId));
|
|
371
370
|
delete rooms[room.roomId];
|
|
372
371
|
}
|
|
373
|
-
function getRoomCountKey() {
|
|
374
|
-
return "roomcount";
|
|
375
|
-
}
|
|
376
372
|
function getRoomChannel(roomId) {
|
|
377
373
|
return `$${roomId}`;
|
|
378
374
|
}
|
|
@@ -382,11 +378,7 @@ function getHandlerConcurrencyKey(name) {
|
|
|
382
378
|
function getProcessChannel(id = processId) {
|
|
383
379
|
return `p:${id}`;
|
|
384
380
|
}
|
|
385
|
-
function getGlobalCCUCounter() {
|
|
386
|
-
return "_ccu";
|
|
387
|
-
}
|
|
388
381
|
export {
|
|
389
|
-
MatchMakerDriver,
|
|
390
382
|
controller,
|
|
391
383
|
create,
|
|
392
384
|
createRoom,
|
|
@@ -394,10 +386,7 @@ export {
|
|
|
394
386
|
disconnectAll,
|
|
395
387
|
driver,
|
|
396
388
|
findOneRoomAvailable,
|
|
397
|
-
getHandler,
|
|
398
389
|
getRoomById,
|
|
399
|
-
getRoomClass,
|
|
400
|
-
getRoomCountKey,
|
|
401
390
|
gracefullyShutdown,
|
|
402
391
|
handleCreateRoom,
|
|
403
392
|
hasHandler,
|
|
@@ -414,6 +403,7 @@ export {
|
|
|
414
403
|
remoteRoomCall,
|
|
415
404
|
removeRoomType,
|
|
416
405
|
reserveSeatFor,
|
|
417
|
-
|
|
418
|
-
setup
|
|
406
|
+
selectProcessIdToCreateRoom,
|
|
407
|
+
setup,
|
|
408
|
+
stats
|
|
419
409
|
};
|
package/build/MatchMaker.mjs.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/MatchMaker.ts"],
|
|
4
|
-
"sourcesContent": ["import { ErrorCode, Protocol } from './Protocol';\n\nimport { requestFromIPC, subscribeIPC } from './IPC';\n\nimport { Deferred, generateId, merge, REMOTE_ROOM_SHORT_TIMEOUT, retry } from './utils/Utils';\nimport { isDevMode, cacheRoomHistory, getPreviousProcessId, getRoomRestoreListKey, reloadFromCache } from './utils/DevMode';\n\nimport { RegisteredHandler } from './matchmaker/RegisteredHandler';\nimport { Room, RoomInternalState } from './Room';\n\nimport { LocalPresence } from './presence/LocalPresence';\nimport { Presence } from './presence/Presence';\n\nimport { debugAndPrintError, debugMatchMaking } from './Debug';\nimport { SeatReservationError } from './errors/SeatReservationError';\nimport { ServerError } from './errors/ServerError';\n\nimport { IRoomListingData, MatchMakerDriver, RoomListingData, LocalDriver } from './matchmaker/driver';\nimport controller from './matchmaker/controller';\n\nimport { logger } from './Logger';\nimport { Client } from './Transport';\nimport { Type } from './types';\nimport { getHostname } from \"./discovery\";\n\nexport { MatchMakerDriver, controller };\n\nexport type ClientOptions = any;\n\nexport interface SeatReservation {\n sessionId: string;\n room: RoomListingData;\n devMode?: boolean;\n}\n\nconst handlers: {[id: string]: RegisteredHandler} = {};\nconst rooms: {[roomId: string]: Room} = {};\n\nexport let publicAddress: string;\nexport let processId: string;\nexport let presence: Presence;\nexport let driver: MatchMakerDriver;\n\nexport let isGracefullyShuttingDown: boolean;\nexport let onReady: Deferred;\n\nexport let roomCount = 0;\n\nexport async function setup(\n _presence?: Presence,\n _driver?: MatchMakerDriver,\n _publicAddress?: string,\n) {\n onReady = new Deferred();\n presence = _presence || new LocalPresence();\n driver = _driver || new LocalDriver();\n publicAddress = _publicAddress;\n\n // devMode: try to retrieve previous processId\n if (isDevMode) { processId = await getPreviousProcessId(await getHostname()); }\n\n // ensure processId is set\n if (!processId) { processId = generateId(); }\n\n isGracefullyShuttingDown = false;\n\n /**\n * Subscribe to remote `handleCreateRoom` calls.\n */\n subscribeIPC(presence, processId, getProcessChannel(), (_, args) => {\n return handleCreateRoom.apply(undefined, args);\n });\n\n await presence.hset(getRoomCountKey(), processId, roomCount.toString());\n\n if (isDevMode) {\n await reloadFromCache();\n }\n\n onReady.resolve();\n}\n\n/**\n * Join or create into a room and return seat reservation\n */\nexport async function joinOrCreate(roomName: string, clientOptions: ClientOptions = {}) {\n return await retry<Promise<SeatReservation>>(async () => {\n let room = await findOneRoomAvailable(roomName, clientOptions);\n\n if (!room) {\n room = await createRoom(roomName, clientOptions);\n }\n\n return await reserveSeatFor(room, clientOptions);\n }, 5, [SeatReservationError]);\n}\n\n/**\n * Create a room and return seat reservation\n */\nexport async function create(roomName: string, clientOptions: ClientOptions = {}) {\n const room = await createRoom(roomName, clientOptions);\n return reserveSeatFor(room, clientOptions);\n}\n\n/**\n * Join a room and return seat reservation\n */\nexport async function join(roomName: string, clientOptions: ClientOptions = {}) {\n return await retry<Promise<SeatReservation>>(async () => {\n const room = await findOneRoomAvailable(roomName, clientOptions);\n\n if (!room) {\n throw new ServerError(ErrorCode.MATCHMAKE_INVALID_CRITERIA, `no rooms found with provided criteria`);\n }\n\n return reserveSeatFor(room, clientOptions);\n });\n}\n\n/**\n * Join a room by id and return seat reservation\n */\nexport async function reconnect(roomId: string, clientOptions: ClientOptions = {}) {\n const room = await driver.findOne({ roomId });\n if (!room) {\n logger.info(`\u274C room \"${roomId}\" has been disposed. Did you missed .allowReconnection()?\\n\uD83D\uDC49 https://docs.colyseus.io/server/room/#allowreconnection-client-seconds`);\n throw new ServerError(ErrorCode.MATCHMAKE_INVALID_ROOM_ID, `room \"${roomId}\" has been disposed.`);\n }\n\n // check for reconnection\n const reconnectionToken = clientOptions.reconnectionToken;\n if (!reconnectionToken) { throw new ServerError(ErrorCode.MATCHMAKE_UNHANDLED, `'reconnectionToken' must be provided for reconnection.`); }\n\n // respond to re-connection!\n const sessionId = await remoteRoomCall(room.roomId, 'checkReconnectionToken', [reconnectionToken]);\n if (sessionId) {\n return { room, sessionId };\n\n } else {\n logger.info(`\u274C reconnection token invalid or expired. Did you missed .allowReconnection()?\\n\uD83D\uDC49 https://docs.colyseus.io/server/room/#allowreconnection-client-seconds`);\n throw new ServerError(ErrorCode.MATCHMAKE_EXPIRED, `reconnection token invalid or expired.`);\n }\n}\n\n/**\n * Join a room by id and return client seat reservation. An exception is thrown if a room is not found for roomId.\n *\n * @param roomId - The Id of the specific room instance.\n * @param clientOptions - Options for the client seat reservation (for `onJoin`/`onAuth`)\n *\n * @returns Promise<SeatReservation> - A promise which contains `sessionId` and `RoomListingData`.\n */\nexport async function joinById(roomId: string, clientOptions: ClientOptions = {}) {\n const room = await driver.findOne({ roomId });\n\n if (!room) {\n throw new ServerError(ErrorCode.MATCHMAKE_INVALID_ROOM_ID, `room \"${roomId}\" not found`);\n\n } else if (room.locked) {\n throw new ServerError(ErrorCode.MATCHMAKE_INVALID_ROOM_ID, `room \"${roomId}\" is locked`);\n }\n\n return reserveSeatFor(room, clientOptions);\n}\n\n/**\n * Perform a query for all cached rooms\n */\nexport async function query(conditions: Partial<IRoomListingData> = {}) {\n return await driver.find(conditions);\n}\n\n/**\n * Find for a public and unlocked room available.\n *\n * @param roomName - The Id of the specific room.\n * @param clientOptions - Options for the client seat reservation (for `onJoin`/`onAuth`).\n *\n * @returns Promise<RoomListingData> - A promise contaning an object which includes room metadata and configurations.\n */\nexport async function findOneRoomAvailable(roomName: string, clientOptions: ClientOptions): Promise<RoomListingData> {\n return await awaitRoomAvailable(roomName, async () => {\n const handler = getHandler(roomName);\n\n const roomQuery = driver.findOne({\n locked: false,\n name: roomName,\n private: false,\n ...handler.getFilterOptions(clientOptions),\n });\n\n if (handler.sortOptions) {\n roomQuery.sort(handler.sortOptions);\n }\n\n return await roomQuery;\n });\n}\n\n/**\n * Call a method or return a property on a remote room.\n *\n * @param roomId - The Id of the specific room instance.\n * @param method - Method or attribute to call or retrive.\n * @param args - Array of arguments for the method\n *\n * @returns Promise<any> - Returned value from the called or retrieved method/attribute.\n */\nexport async function remoteRoomCall<R= any>(\n roomId: string,\n method: string,\n args?: any[],\n rejectionTimeout = REMOTE_ROOM_SHORT_TIMEOUT,\n): Promise<R> {\n const room = rooms[roomId];\n\n if (!room) {\n try {\n return await requestFromIPC<R>(presence, getRoomChannel(roomId), method, args);\n\n } catch (e) {\n const request = `${method}${args && ' with args ' + JSON.stringify(args) || ''}`;\n throw new ServerError(\n ErrorCode.MATCHMAKE_UNHANDLED,\n `remote room (${roomId}) timed out, requesting \"${request}\". (${rejectionTimeout}ms exceeded)`,\n );\n }\n\n } else {\n return (!args && typeof (room[method]) !== 'function')\n ? room[method]\n : (await room[method].apply(room, args && args.map((arg) => JSON.parse(JSON.stringify(arg)))));\n }\n}\n\nexport function defineRoomType<T extends Type<Room>>(\n roomName: string,\n klass: T,\n defaultOptions?: Parameters<NonNullable<InstanceType<T>['onCreate']>>[0],\n) {\n const registeredHandler = new RegisteredHandler(klass, defaultOptions);\n\n handlers[roomName] = registeredHandler;\n\n // TODO: remove this check on version 0.16\n if (klass.prototype['onAuth'] !== Room.prototype['onAuth']) {\n console.warn(\"onAuth() at the instance level will be deprecated soon. Please use static onAuth() instead.\");\n }\n\n if (!isDevMode) {\n cleanupStaleRooms(roomName);\n }\n\n return registeredHandler;\n}\n\nexport function removeRoomType(roomName: string) {\n delete handlers[roomName];\n\n if (!isDevMode) {\n cleanupStaleRooms(roomName);\n }\n}\n\n// TODO: legacy; remove me on 1.0\nexport function hasHandler(roomName: string) {\n console.warn(\"hasHandler() is deprecated. Use getHandler() instead.\");\n return handlers[roomName] !== undefined;\n}\n\nexport function getHandler(roomName: string) {\n const handler = handlers[roomName];\n\n if (!handler) {\n throw new ServerError(ErrorCode.MATCHMAKE_NO_HANDLER, `provided room name \"${roomName}\" not defined`);\n }\n\n return handler;\n}\n\nexport function getRoomClass(roomName: string) {\n return getHandler(roomName).klass as unknown as typeof Room\n}\n\n/**\n * Creates a new room.\n *\n * @param roomName - The identifier you defined on `gameServer.define()`\n * @param clientOptions - Options for `onCreate`\n *\n * @returns Promise<RoomListingData> - A promise contaning an object which includes room metadata and configurations.\n */\nexport async function createRoom(roomName: string, clientOptions: ClientOptions): Promise<RoomListingData> {\n const roomsSpawnedByProcessId = await presence.hgetall(getRoomCountKey());\n\n const processIdWithFewerRooms = (\n Object.keys(roomsSpawnedByProcessId).sort((p1, p2) => {\n return (Number(roomsSpawnedByProcessId[p1]) > Number(roomsSpawnedByProcessId[p2]))\n ? 1\n : -1;\n })[0]\n ) || processId;\n\n let room: RoomListingData;\n if (processIdWithFewerRooms === processId) {\n // create the room on this process!\n room = await handleCreateRoom(roomName, clientOptions);\n } else {\n // ask other process to create the room!\n try {\n room = await requestFromIPC<RoomListingData>(\n presence,\n getProcessChannel(processIdWithFewerRooms),\n undefined,\n [roomName, clientOptions],\n REMOTE_ROOM_SHORT_TIMEOUT,\n );\n\n } catch (e) {\n //\n // clean-up possibly stale process from redis.\n // when a process disconnects ungracefully, it may leave its previous processId under \"roomcount\"\n // if the process is still alive, it will re-add itself shortly after the load-balancer selects it again.\n //\n await presence.hdel(getRoomCountKey(), processIdWithFewerRooms);\n\n // if other process failed to respond, create the room on this process\n debugAndPrintError(e);\n room = await handleCreateRoom(roomName, clientOptions);\n }\n }\n\n if (isDevMode) {\n presence.hset(getRoomRestoreListKey(), room.roomId, JSON.stringify({\n \"clientOptions\": clientOptions,\n \"roomName\": roomName,\n \"processId\": processId\n }));\n }\n\n return room;\n}\n\nexport async function handleCreateRoom(roomName: string, clientOptions: ClientOptions, restoringRoomId?: string): Promise<RoomListingData> {\n const handler = getHandler(roomName);\n const room = new handler.klass();\n\n // set room public attributes\n if (restoringRoomId && isDevMode) {\n room.roomId = restoringRoomId;\n\n } else {\n room.roomId = generateId();\n }\n\n room.roomName = roomName;\n room.presence = presence;\n\n const additionalListingData: any = handler.getFilterOptions(clientOptions);\n\n // assign public host\n if (publicAddress) {\n additionalListingData.publicAddress = publicAddress;\n }\n\n // create a RoomCache reference.\n room.listing = driver.createInstance({\n name: roomName,\n processId,\n ...additionalListingData\n });\n\n if (room.onCreate) {\n try {\n await room.onCreate(merge({}, clientOptions, handler.options));\n\n // increment amount of rooms this process is handling\n roomCount++;\n presence.hset(getRoomCountKey(), processId, roomCount.toString());\n } catch (e) {\n debugAndPrintError(e);\n throw new ServerError(\n e.code || ErrorCode.MATCHMAKE_UNHANDLED,\n e.message,\n );\n }\n }\n\n room['_internalState'] = RoomInternalState.CREATED;\n\n room.listing.roomId = room.roomId;\n room.listing.maxClients = room.maxClients;\n\n // imediatelly ask client to join the room\n debugMatchMaking('spawning \\'%s\\', roomId: %s, processId: %s', roomName, room.roomId, processId);\n\n room._events.on('lock', lockRoom.bind(this, room));\n room._events.on('unlock', unlockRoom.bind(this, room));\n room._events.on('join', onClientJoinRoom.bind(this, room));\n room._events.on('leave', onClientLeaveRoom.bind(this, room));\n room._events.once('dispose', disposeRoom.bind(this, roomName, room));\n room._events.once('disconnect', () => room._events.removeAllListeners());\n\n // room always start unlocked\n await createRoomReferences(room, true);\n await room.listing.save();\n\n handler.emit('create', room);\n\n return room.listing;\n}\n\nexport function getRoomById(roomId: string) {\n return rooms[roomId];\n}\n\n/**\n * Disconnects every client on every room in the current process.\n */\nexport function disconnectAll(closeCode?: number) {\n const promises: Array<Promise<any>> = [];\n\n for (const roomId in rooms) {\n if (!rooms.hasOwnProperty(roomId)) { continue; }\n promises.push(rooms[roomId].disconnect(closeCode));\n }\n\n return promises;\n}\n\nexport async function gracefullyShutdown(): Promise<any> {\n if (isGracefullyShuttingDown) {\n return Promise.reject('already_shutting_down');\n }\n\n isGracefullyShuttingDown = true;\n\n debugMatchMaking(`${processId} is shutting down!`);\n\n if (isDevMode) {\n await cacheRoomHistory(rooms);\n }\n\n // remove processId from room count key\n presence.hdel(getRoomCountKey(), processId);\n\n // unsubscribe from process id channel\n presence.unsubscribe(getProcessChannel());\n\n return Promise.all(disconnectAll(\n (isDevMode)\n ? Protocol.WS_CLOSE_DEVMODE_RESTART\n : undefined\n ));\n}\n\n/**\n * Reserve a seat for a client in a room\n */\nexport async function reserveSeatFor(room: RoomListingData, options: any) {\n const sessionId: string = generateId();\n\n debugMatchMaking(\n 'reserving seat. sessionId: \\'%s\\', roomId: \\'%s\\', processId: \\'%s\\'',\n sessionId, room.roomId, processId,\n );\n\n let successfulSeatReservation: boolean;\n\n try {\n successfulSeatReservation = await remoteRoomCall(room.roomId, '_reserveSeat', [sessionId, options]);\n\n } catch (e) {\n debugMatchMaking(e);\n successfulSeatReservation = false;\n }\n\n if (!successfulSeatReservation) {\n throw new SeatReservationError(`${room.roomId} is already full.`);\n }\n\n const response: SeatReservation = { room, sessionId };\n\n if (isDevMode) {\n response.devMode = isDevMode;\n }\n\n return response;\n}\n\nasync function cleanupStaleRooms(roomName: string) {\n //\n // clean-up possibly stale room ids\n // (ungraceful shutdowns using Redis can result on stale room ids still on memory.)\n //\n const cachedRooms = await driver.find({ name: roomName }, { _id: 1 });\n\n // remove connecting counts\n await presence.del(getHandlerConcurrencyKey(roomName));\n\n await Promise.all(cachedRooms.map(async (room) => {\n try {\n // use hardcoded short timeout for cleaning up stale rooms.\n await remoteRoomCall(room.roomId, 'roomId');\n\n } catch (e) {\n debugMatchMaking(`cleaning up stale room '${roomName}', roomId: ${room.roomId}`);\n room.remove();\n }\n }));\n}\n\nasync function createRoomReferences(room: Room, init: boolean = false): Promise<boolean> {\n rooms[room.roomId] = room;\n\n if (init) {\n await subscribeIPC(\n presence,\n processId,\n getRoomChannel(room.roomId),\n (method, args) => {\n return (!args && typeof (room[method]) !== 'function')\n ? room[method]\n : room[method].apply(room, args);\n },\n );\n }\n\n return true;\n}\n\nasync function awaitRoomAvailable(roomToJoin: string, callback: Function): Promise<RoomListingData> {\n return new Promise(async (resolve, reject) => {\n const concurrencyKey = getHandlerConcurrencyKey(roomToJoin);\n const concurrency = await presence.incr(concurrencyKey) - 1;\n\n //\n // avoid having too long timeout if 10+ clients ask to join at the same time\n //\n // TODO: we need a better solution here. either a lock or queue system should be implemented instead.\n // https://github.com/colyseus/colyseus/issues/466\n //\n const concurrencyTimeout = Math.min(concurrency * 100, 500);\n\n if (concurrency > 0) {\n debugMatchMaking(\n 'receiving %d concurrent requests for joining \\'%s\\' (waiting %d ms)',\n concurrency, roomToJoin, concurrencyTimeout,\n );\n }\n\n setTimeout(async () => {\n try {\n const result = await callback();\n resolve(result);\n\n } catch (e) {\n reject(e);\n\n } finally {\n await presence.decr(concurrencyKey);\n }\n }, concurrencyTimeout);\n });\n}\n\nfunction onClientJoinRoom(room: Room, client: Client) {\n // increment global CCU\n presence.incr(getGlobalCCUCounter());\n handlers[room.roomName].emit('join', room, client);\n}\n\nfunction onClientLeaveRoom(room: Room, client: Client, willDispose: boolean) {\n // decrement global CCU\n presence.decr(getGlobalCCUCounter());\n handlers[room.roomName].emit('leave', room, client, willDispose);\n}\n\nfunction lockRoom(room: Room): void {\n // emit public event on registered handler\n handlers[room.roomName].emit('lock', room);\n}\n\nasync function unlockRoom(room: Room) {\n if (await createRoomReferences(room)) {\n // emit public event on registered handler\n handlers[room.roomName].emit('unlock', room);\n }\n}\n\nasync function disposeRoom(roomName: string, room: Room) {\n debugMatchMaking('disposing \\'%s\\' (%s) on processId \\'%s\\'', roomName, room.roomId, processId);\n\n // decrease amount of rooms this process is handling\n if (!isGracefullyShuttingDown) {\n roomCount--;\n presence.hset(getRoomCountKey(), processId, roomCount.toString());\n\n // remove from devMode restore list\n if (isDevMode) {\n await presence.hdel(getRoomRestoreListKey(), room.roomId);\n }\n }\n\n // emit disposal on registered session handler\n handlers[roomName].emit('dispose', room);\n\n // remove concurrency key\n presence.del(getHandlerConcurrencyKey(roomName));\n\n // unsubscribe from remote connections\n presence.unsubscribe(getRoomChannel(room.roomId));\n\n // remove actual room reference\n delete rooms[room.roomId];\n}\n\n//\n// Presence keys\n//\nexport function getRoomCountKey() {\n return 'roomcount';\n}\n\nfunction getRoomChannel(roomId: string) {\n return `$${roomId}`;\n}\n\nfunction getHandlerConcurrencyKey(name: string) {\n return `c:${name}`;\n}\n\nfunction getProcessChannel(id: string = processId) {\n return `p:${id}`;\n}\n\nfunction getGlobalCCUCounter() {\n return \"_ccu\";\n}\n"],
|
|
5
|
-
"mappings": "AAAA,SAAS,WAAW,gBAAgB;AAEpC,SAAS,gBAAgB,oBAAoB;AAE7C,SAAS,UAAU,YAAY,OAAO,2BAA2B,aAAa;AAC9E,SAAS,WAAW,kBAAkB,sBAAsB,uBAAuB,uBAAuB;AAE1G,SAAS,yBAAyB;AAClC,
|
|
4
|
+
"sourcesContent": ["import { ErrorCode, Protocol } from './Protocol';\n\nimport { requestFromIPC, subscribeIPC } from './IPC';\n\nimport { Deferred, generateId, merge, REMOTE_ROOM_SHORT_TIMEOUT, retry } from './utils/Utils';\nimport { isDevMode, cacheRoomHistory, getPreviousProcessId, getRoomRestoreListKey, reloadFromCache } from './utils/DevMode';\n\nimport { RegisteredHandler } from './matchmaker/RegisteredHandler';\nimport { Room, RoomInternalState } from './Room';\n\nimport { LocalPresence } from './presence/LocalPresence';\nimport { Presence } from './presence/Presence';\n\nimport { debugAndPrintError, debugMatchMaking } from './Debug';\nimport { SeatReservationError } from './errors/SeatReservationError';\nimport { ServerError } from './errors/ServerError';\n\nimport { IRoomListingData, RoomListingData, LocalDriver, MatchMakerDriver } from './matchmaker/driver';\nimport controller from './matchmaker/controller';\nimport * as stats from \"./Stats\";\n\nimport { logger } from './Logger';\nimport { Client } from './Transport';\nimport { Type } from './utils/types';\nimport { getHostname } from \"./discovery\";\n\nexport { controller, stats, type MatchMakerDriver };\n\nexport type ClientOptions = any;\nexport type SelectProcessIdCallback = (roomName: string, clientOptions: ClientOptions) => Promise<string>;\n\nexport interface SeatReservation {\n sessionId: string;\n room: RoomListingData;\n devMode?: boolean;\n}\n\nconst handlers: {[id: string]: RegisteredHandler} = {};\nconst rooms: {[roomId: string]: Room} = {};\n\nexport let publicAddress: string;\nexport let processId: string;\nexport let presence: Presence;\nexport let driver: MatchMakerDriver;\nexport let selectProcessIdToCreateRoom: SelectProcessIdCallback;\n\nexport let isGracefullyShuttingDown: boolean;\nexport let onReady: Deferred;\n\n/**\n * @private\n */\nexport async function setup(\n _presence?: Presence,\n _driver?: MatchMakerDriver,\n _publicAddress?: string,\n _selectProcessIdToCreateRoom?: SelectProcessIdCallback,\n) {\n onReady = new Deferred();\n presence = _presence || new LocalPresence();\n driver = _driver || new LocalDriver();\n publicAddress = _publicAddress;\n\n // devMode: try to retrieve previous processId\n if (isDevMode) { processId = await getPreviousProcessId(await getHostname()); }\n\n // ensure processId is set\n if (!processId) { processId = generateId(); }\n\n isGracefullyShuttingDown = false;\n\n /**\n * Define default `assignRoomToProcessId` method.\n * By default, return the process with least amount of rooms created\n */\n selectProcessIdToCreateRoom = _selectProcessIdToCreateRoom || async function () {\n return (await stats.fetchAll())\n .sort((p1, p2) => p1.roomCount > p2.roomCount ? 1 : -1)[0]\n .processId;\n };\n\n /**\n * Subscribe to remote `handleCreateRoom` calls.\n */\n subscribeIPC(presence, processId, getProcessChannel(), (_, args) => {\n return handleCreateRoom.apply(undefined, args);\n });\n\n await stats.reset();\n\n if (isDevMode) {\n await reloadFromCache();\n }\n\n onReady.resolve();\n}\n\n/**\n * Join or create into a room and return seat reservation\n */\nexport async function joinOrCreate(roomName: string, clientOptions: ClientOptions = {}) {\n return await retry<Promise<SeatReservation>>(async () => {\n let room = await findOneRoomAvailable(roomName, clientOptions);\n\n if (!room) {\n room = await createRoom(roomName, clientOptions);\n }\n\n return await reserveSeatFor(room, clientOptions);\n }, 5, [SeatReservationError]);\n}\n\n/**\n * Create a room and return seat reservation\n */\nexport async function create(roomName: string, clientOptions: ClientOptions = {}) {\n const room = await createRoom(roomName, clientOptions);\n return reserveSeatFor(room, clientOptions);\n}\n\n/**\n * Join a room and return seat reservation\n */\nexport async function join(roomName: string, clientOptions: ClientOptions = {}) {\n return await retry<Promise<SeatReservation>>(async () => {\n const room = await findOneRoomAvailable(roomName, clientOptions);\n\n if (!room) {\n throw new ServerError(ErrorCode.MATCHMAKE_INVALID_CRITERIA, `no rooms found with provided criteria`);\n }\n\n return reserveSeatFor(room, clientOptions);\n });\n}\n\n/**\n * Join a room by id and return seat reservation\n */\nexport async function reconnect(roomId: string, clientOptions: ClientOptions = {}) {\n const room = await driver.findOne({ roomId });\n if (!room) {\n // TODO: support a \"logLevel\" out of the box?\n if (process.env.NODE_ENV !== 'production') {\n logger.info(`\u274C room \"${roomId}\" has been disposed. Did you missed .allowReconnection()?\\n\uD83D\uDC49 https://docs.colyseus.io/server/room/#allowreconnection-client-seconds`);\n }\n\n throw new ServerError(ErrorCode.MATCHMAKE_INVALID_ROOM_ID, `room \"${roomId}\" has been disposed.`);\n }\n\n // check for reconnection\n const reconnectionToken = clientOptions.reconnectionToken;\n if (!reconnectionToken) { throw new ServerError(ErrorCode.MATCHMAKE_UNHANDLED, `'reconnectionToken' must be provided for reconnection.`); }\n\n // respond to re-connection!\n const sessionId = await remoteRoomCall(room.roomId, 'checkReconnectionToken', [reconnectionToken]);\n if (sessionId) {\n return { room, sessionId };\n\n } else {\n // TODO: support a \"logLevel\" out of the box?\n if (process.env.NODE_ENV !== 'production') {\n logger.info(`\u274C reconnection token invalid or expired. Did you missed .allowReconnection()?\\n\uD83D\uDC49 https://docs.colyseus.io/server/room/#allowreconnection-client-seconds`);\n }\n throw new ServerError(ErrorCode.MATCHMAKE_EXPIRED, `reconnection token invalid or expired.`);\n }\n}\n\n/**\n * Join a room by id and return client seat reservation. An exception is thrown if a room is not found for roomId.\n *\n * @param roomId - The Id of the specific room instance.\n * @param clientOptions - Options for the client seat reservation (for `onJoin`/`onAuth`)\n *\n * @returns Promise<SeatReservation> - A promise which contains `sessionId` and `RoomListingData`.\n */\nexport async function joinById(roomId: string, clientOptions: ClientOptions = {}) {\n const room = await driver.findOne({ roomId });\n\n if (!room) {\n throw new ServerError(ErrorCode.MATCHMAKE_INVALID_ROOM_ID, `room \"${roomId}\" not found`);\n\n } else if (room.locked) {\n throw new ServerError(ErrorCode.MATCHMAKE_INVALID_ROOM_ID, `room \"${roomId}\" is locked`);\n }\n\n return reserveSeatFor(room, clientOptions);\n}\n\n/**\n * Perform a query for all cached rooms\n */\nexport async function query(conditions: Partial<IRoomListingData> = {}) {\n return await driver.find(conditions);\n}\n\n/**\n * Find for a public and unlocked room available.\n *\n * @param roomName - The Id of the specific room.\n * @param clientOptions - Options for the client seat reservation (for `onJoin`/`onAuth`).\n *\n * @returns Promise<RoomListingData> - A promise contaning an object which includes room metadata and configurations.\n */\nexport async function findOneRoomAvailable(roomName: string, clientOptions: ClientOptions): Promise<RoomListingData> {\n return await awaitRoomAvailable(roomName, async () => {\n const handler = handlers[roomName];\n if (!handler) {\n throw new ServerError( ErrorCode.MATCHMAKE_NO_HANDLER, `provided room name \"${roomName}\" not defined`);\n }\n\n const roomQuery = driver.findOne({\n locked: false,\n name: roomName,\n private: false,\n ...handler.getFilterOptions(clientOptions),\n });\n\n if (handler.sortOptions) {\n roomQuery.sort(handler.sortOptions);\n }\n\n return await roomQuery;\n });\n}\n\n/**\n * Call a method or return a property on a remote room.\n *\n * @param roomId - The Id of the specific room instance.\n * @param method - Method or attribute to call or retrive.\n * @param args - Array of arguments for the method\n *\n * @returns Promise<any> - Returned value from the called or retrieved method/attribute.\n */\nexport async function remoteRoomCall<R= any>(\n roomId: string,\n method: string,\n args?: any[],\n rejectionTimeout = REMOTE_ROOM_SHORT_TIMEOUT,\n): Promise<R> {\n const room = rooms[roomId];\n\n if (!room) {\n try {\n return await requestFromIPC<R>(presence, getRoomChannel(roomId), method, args, rejectionTimeout);\n\n } catch (e) {\n const request = `${method}${args && ' with args ' + JSON.stringify(args) || ''}`;\n throw new ServerError(\n ErrorCode.MATCHMAKE_UNHANDLED,\n `remote room (${roomId}) timed out, requesting \"${request}\". (${rejectionTimeout}ms exceeded)`,\n );\n }\n\n } else {\n return (!args && typeof (room[method]) !== 'function')\n ? room[method]\n : (await room[method].apply(room, args && args.map((arg) => JSON.parse(JSON.stringify(arg)))));\n }\n}\n\nexport function defineRoomType<T extends Type<Room>>(\n name: string,\n klass: T,\n defaultOptions?: Parameters<NonNullable<InstanceType<T>['onCreate']>>[0],\n) {\n const registeredHandler = new RegisteredHandler(klass, defaultOptions);\n\n handlers[name] = registeredHandler;\n\n if (!isDevMode) {\n cleanupStaleRooms(name);\n }\n\n return registeredHandler;\n}\n\nexport function removeRoomType(name: string) {\n delete handlers[name];\n\n if (!isDevMode) {\n cleanupStaleRooms(name);\n }\n}\n\nexport function hasHandler(name: string) {\n return handlers[ name ] !== undefined;\n}\n\n/**\n * Creates a new room.\n *\n * @param roomName - The identifier you defined on `gameServer.define()`\n * @param clientOptions - Options for `onCreate`\n *\n * @returns Promise<RoomListingData> - A promise contaning an object which includes room metadata and configurations.\n */\nexport async function createRoom(roomName: string, clientOptions: ClientOptions): Promise<RoomListingData> {\n const selectedProcessId = await selectProcessIdToCreateRoom(roomName, clientOptions);\n\n let room: RoomListingData;\n if (selectedProcessId === processId) {\n // create the room on this process!\n room = await handleCreateRoom(roomName, clientOptions);\n\n } else {\n // ask other process to create the room!\n try {\n room = await requestFromIPC<RoomListingData>(\n presence,\n getProcessChannel(selectedProcessId),\n undefined,\n [roomName, clientOptions],\n REMOTE_ROOM_SHORT_TIMEOUT,\n );\n\n } catch (e) {\n debugAndPrintError(e);\n\n //\n // clean-up possibly stale process from redis.\n // when a process disconnects ungracefully, it may leave its previous processId under \"roomcount\"\n // if the process is still alive, it will re-add itself shortly after the load-balancer selects it again.\n //\n await stats.excludeProcess(selectedProcessId);\n\n // if other process failed to respond, create the room on this process\n room = await handleCreateRoom(roomName, clientOptions);\n }\n }\n\n if (isDevMode) {\n presence.hset(getRoomRestoreListKey(), room.roomId, JSON.stringify({\n \"clientOptions\": clientOptions,\n \"roomName\": roomName,\n \"processId\": processId\n }));\n }\n\n return room;\n}\n\nexport async function handleCreateRoom(roomName: string, clientOptions: ClientOptions, restoringRoomId?: string): Promise<RoomListingData> {\n const registeredHandler = handlers[roomName];\n\n if (!registeredHandler) {\n throw new ServerError( ErrorCode.MATCHMAKE_NO_HANDLER, `provided room name \"${roomName}\" not defined`);\n }\n\n const room = new registeredHandler.klass();\n\n // set room public attributes\n if (restoringRoomId && isDevMode) {\n room.roomId = restoringRoomId;\n\n } else {\n room.roomId = generateId();\n }\n\n room.roomName = roomName;\n room.presence = presence;\n\n const additionalListingData: any = registeredHandler.getFilterOptions(clientOptions);\n\n // assign public host\n if (publicAddress) {\n additionalListingData.publicAddress = publicAddress;\n }\n\n // create a RoomCache reference.\n room.listing = driver.createInstance({\n name: roomName,\n processId,\n ...additionalListingData\n });\n\n if (room.onCreate) {\n try {\n await room.onCreate(merge({}, clientOptions, registeredHandler.options));\n\n } catch (e) {\n debugAndPrintError(e);\n throw new ServerError(\n e.code || ErrorCode.MATCHMAKE_UNHANDLED,\n e.message,\n );\n }\n }\n\n room['_internalState'] = RoomInternalState.CREATED;\n\n room.listing.roomId = room.roomId;\n room.listing.maxClients = room.maxClients;\n\n // imediatelly ask client to join the room\n debugMatchMaking('spawning \\'%s\\', roomId: %s, processId: %s', roomName, room.roomId, processId);\n\n // increment amount of rooms this process is handling\n stats.local.roomCount++;\n stats.persist();\n\n room._events.on('lock', lockRoom.bind(this, room));\n room._events.on('unlock', unlockRoom.bind(this, room));\n room._events.on('join', onClientJoinRoom.bind(this, room));\n room._events.on('leave', onClientLeaveRoom.bind(this, room));\n room._events.once('dispose', disposeRoom.bind(this, roomName, room));\n room._events.once('disconnect', () => room._events.removeAllListeners());\n\n // room always start unlocked\n await createRoomReferences(room, true);\n await room.listing.save();\n\n registeredHandler.emit('create', room);\n\n return room.listing;\n}\n\nexport function getRoomById(roomId: string) {\n return rooms[roomId];\n}\n\n/**\n * Disconnects every client on every room in the current process.\n */\nexport function disconnectAll(closeCode?: number) {\n const promises: Array<Promise<any>> = [];\n\n for (const roomId in rooms) {\n if (!rooms.hasOwnProperty(roomId)) { continue; }\n promises.push(rooms[roomId].disconnect(closeCode));\n }\n\n return promises;\n}\n\nexport async function gracefullyShutdown(): Promise<any> {\n if (isGracefullyShuttingDown) {\n return Promise.reject('already_shutting_down');\n }\n\n isGracefullyShuttingDown = true;\n\n debugMatchMaking(`${processId} is shutting down!`);\n\n if (isDevMode) {\n await cacheRoomHistory(rooms);\n }\n\n // remove processId from room count key\n stats.excludeProcess(processId);\n\n // unsubscribe from process id channel\n presence.unsubscribe(getProcessChannel());\n\n return Promise.all(disconnectAll(\n (isDevMode)\n ? Protocol.WS_CLOSE_DEVMODE_RESTART\n : undefined\n ));\n}\n\n/**\n * Reserve a seat for a client in a room\n */\nexport async function reserveSeatFor(room: RoomListingData, options: any) {\n const sessionId: string = generateId();\n\n debugMatchMaking(\n 'reserving seat. sessionId: \\'%s\\', roomId: \\'%s\\', processId: \\'%s\\'',\n sessionId, room.roomId, processId,\n );\n\n let successfulSeatReservation: boolean;\n\n try {\n successfulSeatReservation = await remoteRoomCall(room.roomId, '_reserveSeat', [sessionId, options]);\n\n } catch (e) {\n debugMatchMaking(e);\n successfulSeatReservation = false;\n }\n\n if (!successfulSeatReservation) {\n throw new SeatReservationError(`${room.roomId} is already full.`);\n }\n\n const response: SeatReservation = { room, sessionId };\n\n if (isDevMode) {\n response.devMode = isDevMode;\n }\n\n return response;\n}\n\nasync function cleanupStaleRooms(roomName: string) {\n //\n // clean-up possibly stale room ids\n // (ungraceful shutdowns using Redis can result on stale room ids still on memory.)\n //\n const cachedRooms = await driver.find({ name: roomName }, { _id: 1 });\n\n // remove connecting counts\n await presence.del(getHandlerConcurrencyKey(roomName));\n\n await Promise.all(cachedRooms.map(async (room) => {\n try {\n // use hardcoded short timeout for cleaning up stale rooms.\n await remoteRoomCall(room.roomId, 'roomId');\n\n } catch (e) {\n debugMatchMaking(`cleaning up stale room '${roomName}', roomId: ${room.roomId}`);\n room.remove();\n }\n }));\n}\n\nasync function createRoomReferences(room: Room, init: boolean = false): Promise<boolean> {\n rooms[room.roomId] = room;\n\n if (init) {\n await subscribeIPC(\n presence,\n processId,\n getRoomChannel(room.roomId),\n (method, args) => {\n return (!args && typeof (room[method]) !== 'function')\n ? room[method]\n : room[method].apply(room, args);\n },\n );\n }\n\n return true;\n}\n\nasync function awaitRoomAvailable(roomToJoin: string, callback: Function): Promise<RoomListingData> {\n return new Promise(async (resolve, reject) => {\n const concurrencyKey = getHandlerConcurrencyKey(roomToJoin);\n const concurrency = await presence.incr(concurrencyKey) - 1;\n\n //\n // avoid having too long timeout if 10+ clients ask to join at the same time\n //\n // TODO: we need a better solution here. either a lock or queue system should be implemented instead.\n // https://github.com/colyseus/colyseus/issues/466\n //\n const concurrencyTimeout = Math.min(concurrency * 100, 500);\n\n if (concurrency > 0) {\n debugMatchMaking(\n 'receiving %d concurrent requests for joining \\'%s\\' (waiting %d ms)',\n concurrency, roomToJoin, concurrencyTimeout,\n );\n }\n\n setTimeout(async () => {\n try {\n const result = await callback();\n resolve(result);\n\n } catch (e) {\n reject(e);\n\n } finally {\n await presence.decr(concurrencyKey);\n }\n }, concurrencyTimeout);\n });\n}\n\nfunction onClientJoinRoom(room: Room, client: Client) {\n // increment local CCU\n stats.local.ccu++;\n stats.persist();\n\n handlers[room.roomName].emit('join', room, client);\n}\n\nfunction onClientLeaveRoom(room: Room, client: Client, willDispose: boolean) {\n // decrement local CCU\n stats.local.ccu--;\n stats.persist();\n\n handlers[room.roomName].emit('leave', room, client, willDispose);\n}\n\nfunction lockRoom(room: Room): void {\n // emit public event on registered handler\n handlers[room.roomName].emit('lock', room);\n}\n\nasync function unlockRoom(room: Room) {\n if (await createRoomReferences(room)) {\n // emit public event on registered handler\n handlers[room.roomName].emit('unlock', room);\n }\n}\n\nasync function disposeRoom(roomName: string, room: Room) {\n debugMatchMaking('disposing \\'%s\\' (%s) on processId \\'%s\\'', roomName, room.roomId, processId);\n\n // decrease amount of rooms this process is handling\n if (!isGracefullyShuttingDown) {\n stats.local.roomCount--;\n stats.persist();\n\n // remove from devMode restore list\n if (isDevMode) {\n await presence.hdel(getRoomRestoreListKey(), room.roomId);\n }\n }\n\n // emit disposal on registered session handler\n handlers[roomName].emit('dispose', room);\n\n // remove concurrency key\n presence.del(getHandlerConcurrencyKey(roomName));\n\n // unsubscribe from remote connections\n presence.unsubscribe(getRoomChannel(room.roomId));\n\n // remove actual room reference\n delete rooms[room.roomId];\n}\n\n//\n// Presence keys\n//\nfunction getRoomChannel(roomId: string) {\n return `$${roomId}`;\n}\n\nfunction getHandlerConcurrencyKey(name: string) {\n return `c:${name}`;\n}\n\nfunction getProcessChannel(id: string = processId) {\n return `p:${id}`;\n}"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/build/Room.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
/// <reference types="node" />
|
|
4
|
-
import http
|
|
4
|
+
import http from 'http';
|
|
5
5
|
import { Schema } from '@colyseus/schema';
|
|
6
6
|
import Clock from '@gamestdio/timer';
|
|
7
7
|
import { EventEmitter } from 'events';
|
|
@@ -12,6 +12,7 @@ import { RoomListingData } from './matchmaker/driver';
|
|
|
12
12
|
import { Client, ClientArray, ISendOptions } from './Transport';
|
|
13
13
|
export declare const DEFAULT_SEAT_RESERVATION_TIME: number;
|
|
14
14
|
export type SimulationCallback = (deltaTime: number) => void;
|
|
15
|
+
export type RoomConstructor<T extends object = any> = new (presence?: Presence) => Room<T>;
|
|
15
16
|
export interface IBroadcastOptions extends ISendOptions {
|
|
16
17
|
except?: Client | Client[];
|
|
17
18
|
}
|
|
@@ -134,11 +135,7 @@ export declare abstract class Room<State extends object = any, Metadata = any> {
|
|
|
134
135
|
onJoin?(client: Client<ExtractUserData<typeof this['clients']>, ExtractAuthData<typeof this['clients']>>, options?: any, auth?: ExtractAuthData<typeof this['clients']>): void | Promise<any>;
|
|
135
136
|
onLeave?(client: Client<ExtractUserData<typeof this['clients']>, ExtractAuthData<typeof this['clients']>>, consented?: boolean): void | Promise<any>;
|
|
136
137
|
onDispose?(): void | Promise<any>;
|
|
137
|
-
/**
|
|
138
|
-
* @deprecated Please use onAuth as a static method instead, with its new method signature.
|
|
139
|
-
*/
|
|
140
138
|
onAuth(client: Client<ExtractUserData<typeof this['clients']>, ExtractAuthData<typeof this['clients']>>, options: any, request?: http.IncomingMessage): any | Promise<any>;
|
|
141
|
-
static onAuth(token: string, req: IncomingMessage): Promise<unknown>;
|
|
142
139
|
/**
|
|
143
140
|
* devMode: When `devMode` is enabled, `onCacheRoom` method is called during
|
|
144
141
|
* graceful shutdown.
|
package/build/Room.js
CHANGED
|
@@ -113,9 +113,6 @@ class Room {
|
|
|
113
113
|
onAuth(client, options, request) {
|
|
114
114
|
return true;
|
|
115
115
|
}
|
|
116
|
-
static async onAuth(token, req) {
|
|
117
|
-
return true;
|
|
118
|
-
}
|
|
119
116
|
hasReachedMaxClients() {
|
|
120
117
|
return this.clients.length + Object.keys(this.reservedSeats).length >= this.maxClients || this._internalState === 2 /* DISPOSING */;
|
|
121
118
|
}
|
|
@@ -292,7 +289,7 @@ class Room {
|
|
|
292
289
|
const options = this.reservedSeats[sessionId];
|
|
293
290
|
delete this.reservedSeats[sessionId];
|
|
294
291
|
client._afterNextPatchQueue = this._afterNextPatchQueue;
|
|
295
|
-
client.ref["onleave"] =
|
|
292
|
+
client.ref["onleave"] = (_) => client.state = import_Transport.ClientState.LEAVING;
|
|
296
293
|
client.ref.once("close", client.ref["onleave"]);
|
|
297
294
|
const previousReconnectionToken = this._reconnectingSessionId.get(sessionId);
|
|
298
295
|
if (previousReconnectionToken) {
|
|
@@ -300,12 +297,7 @@ class Room {
|
|
|
300
297
|
this._reconnections[previousReconnectionToken]?.[1].resolve(client);
|
|
301
298
|
} else {
|
|
302
299
|
try {
|
|
303
|
-
|
|
304
|
-
client.auth = options["$auth"];
|
|
305
|
-
delete options["$auth"];
|
|
306
|
-
} else if (this.onAuth !== Room.prototype.onAuth) {
|
|
307
|
-
client.auth = await this.onAuth(client, options, req);
|
|
308
|
-
}
|
|
300
|
+
client.auth = await this.onAuth(client, options, req);
|
|
309
301
|
if (client.readyState !== import_ws.default.OPEN) {
|
|
310
302
|
throw new import_ServerError.ServerError(import_Protocol.Protocol.WS_CLOSE_GOING_AWAY, "already disconnected");
|
|
311
303
|
}
|
|
@@ -316,8 +308,16 @@ class Room {
|
|
|
316
308
|
if (this.onJoin) {
|
|
317
309
|
await this.onJoin(client, options, client.auth);
|
|
318
310
|
}
|
|
311
|
+
client.ref.removeListener("close", client.ref["onleave"]);
|
|
312
|
+
if (client.state === import_Transport.ClientState.LEAVING) {
|
|
313
|
+
await this._onLeave(client, import_Protocol.Protocol.WS_CLOSE_GOING_AWAY);
|
|
314
|
+
} else {
|
|
315
|
+
client.ref["onleave"] = this._onLeave.bind(this, client);
|
|
316
|
+
client.ref.once("close", client.ref["onleave"]);
|
|
317
|
+
}
|
|
319
318
|
} catch (e) {
|
|
320
319
|
this.clients.delete(client);
|
|
320
|
+
this._decrementClientCount();
|
|
321
321
|
if (!e.code) {
|
|
322
322
|
e.code = import_Protocol.ErrorCode.APPLICATION_ERROR;
|
|
323
323
|
}
|
|
@@ -326,15 +326,22 @@ class Room {
|
|
|
326
326
|
delete this.reservedSeats[sessionId];
|
|
327
327
|
}
|
|
328
328
|
}
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
this.
|
|
334
|
-
|
|
335
|
-
|
|
329
|
+
if (!previousReconnectionToken) {
|
|
330
|
+
this._events.emit("join", client);
|
|
331
|
+
}
|
|
332
|
+
if (client.state === import_Transport.ClientState.JOINING) {
|
|
333
|
+
client.ref.on("message", this._onMessage.bind(this, client));
|
|
334
|
+
client.raw(import_Protocol.getMessageBytes[import_Protocol.Protocol.JOIN_ROOM](
|
|
335
|
+
client._reconnectionToken,
|
|
336
|
+
this._serializer.id,
|
|
337
|
+
this._serializer.handshake && this._serializer.handshake()
|
|
338
|
+
));
|
|
339
|
+
}
|
|
336
340
|
}
|
|
337
341
|
allowReconnection(previousClient, seconds) {
|
|
342
|
+
if (previousClient._enqueuedMessages !== void 0) {
|
|
343
|
+
return;
|
|
344
|
+
}
|
|
338
345
|
if (seconds === void 0) {
|
|
339
346
|
console.warn('DEPRECATED: allowReconnection() requires a second argument. Using "manual" mode.');
|
|
340
347
|
seconds = "manual";
|
|
@@ -531,12 +538,14 @@ class Room {
|
|
|
531
538
|
}
|
|
532
539
|
async _onLeave(client, code) {
|
|
533
540
|
const success = this.clients.delete(client);
|
|
534
|
-
if (success
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
(
|
|
541
|
+
if (success) {
|
|
542
|
+
client.state = import_Transport.ClientState.LEAVING;
|
|
543
|
+
if (this.onLeave) {
|
|
544
|
+
try {
|
|
545
|
+
await this.onLeave(client, code === import_Protocol.Protocol.WS_CLOSE_CONSENTED);
|
|
546
|
+
} catch (e) {
|
|
547
|
+
(0, import_Debug.debugAndPrintError)(`onLeave error: ${e && e.message || e || "promise rejected"}`);
|
|
548
|
+
}
|
|
540
549
|
}
|
|
541
550
|
}
|
|
542
551
|
if (client.state !== import_Transport.ClientState.RECONNECTED) {
|