@roomkit/worker 1.3.0 → 1.3.1
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/dist/src/redis/redis.service.d.ts +5 -0
- package/dist/src/redis/redis.service.d.ts.map +1 -1
- package/dist/src/redis/redis.service.js +38 -2
- package/dist/src/redis/redis.service.js.map +1 -1
- package/dist/src/room/message-handler.service.d.ts +9 -0
- package/dist/src/room/message-handler.service.d.ts.map +1 -1
- package/dist/src/room/message-handler.service.js +32 -2
- package/dist/src/room/message-handler.service.js.map +1 -1
- package/package.json +14 -14
|
@@ -60,6 +60,11 @@ export declare class RedisService implements OnModuleInit, OnModuleDestroy {
|
|
|
60
60
|
* 清理过期的Worker节点
|
|
61
61
|
*/
|
|
62
62
|
private cleanupDeadWorkers;
|
|
63
|
+
/**
|
|
64
|
+
* 清理孤立的 gameType 集合成员
|
|
65
|
+
* 检查 gw:workers:<gameType> 中是否有已不存在的 worker
|
|
66
|
+
*/
|
|
67
|
+
private cleanupOrphanedGameTypeEntries;
|
|
63
68
|
/**
|
|
64
69
|
* 移除Worker（从所有列表中）
|
|
65
70
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.service.d.ts","sourceRoot":"","sources":["../../../src/redis/redis.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAE,eAAe,EAAU,MAAM,gBAAgB,CAAC;AACnF,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,qBACa,YAAa,YAAW,YAAY,EAAE,eAAe;IAkBpD,OAAO,CAAC,QAAQ,CAAC,aAAa;IAjB1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiC;IAExD,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAC;IAE3B,OAAO,CAAC,eAAe,CAAqD;IAC5E,OAAO,CAAC,mBAAmB,CAAgB;IAG3C,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,YAAY,CAAC,CAAiB;IAGtC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAQ;IAC3C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;gBAEb,aAAa,EAAE,aAAa;IAanD,YAAY;IA4BZ,eAAe;IAgBrB;;OAEG;IACG,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BxD;;OAEG;YACW,gBAAgB;
|
|
1
|
+
{"version":3,"file":"redis.service.d.ts","sourceRoot":"","sources":["../../../src/redis/redis.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAE,eAAe,EAAU,MAAM,gBAAgB,CAAC;AACnF,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,qBACa,YAAa,YAAW,YAAY,EAAE,eAAe;IAkBpD,OAAO,CAAC,QAAQ,CAAC,aAAa;IAjB1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiC;IAExD,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAC;IAE3B,OAAO,CAAC,eAAe,CAAqD;IAC5E,OAAO,CAAC,mBAAmB,CAAgB;IAG3C,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,YAAY,CAAC,CAAiB;IAGtC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAQ;IAC3C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;gBAEb,aAAa,EAAE,aAAa;IAanD,YAAY;IA4BZ,eAAe;IAgBrB;;OAEG;IACG,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BxD;;OAEG;YACW,gBAAgB;IAoB9B;;OAEG;YACW,mBAAmB;IAMjC;;OAEG;IACG,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAMnF;;OAEG;IACH,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI;IAI7D;;OAEG;IACG,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvE;;OAEG;IACG,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYxE;;OAEG;IACH,OAAO,CAAC,cAAc;IAYtB;;OAEG;YACW,aAAa;IAK3B;;OAEG;IACH,OAAO,CAAC,YAAY;IAYpB;;OAEG;YACW,kBAAkB;IAmChC;;;OAGG;YACW,8BAA8B;IAkC5C;;OAEG;YACW,YAAY;CAsB3B"}
|
|
@@ -112,15 +112,17 @@ let RedisService = RedisService_1 = class RedisService {
|
|
|
112
112
|
async unregisterWorker() {
|
|
113
113
|
const workerId = this.configService.workerId;
|
|
114
114
|
const gameTypes = this.registeredGameTypes;
|
|
115
|
-
//
|
|
115
|
+
// 更新状态为离线，并设置较长的TTL（5分钟）以支持快速重启恢复
|
|
116
116
|
await this.client.hset(core_1.RedisKeys.worker(workerId), 'status', 'offline');
|
|
117
|
+
await this.client.hset(core_1.RedisKeys.worker(workerId), 'offlineAt', Date.now().toString());
|
|
118
|
+
await this.client.expire(core_1.RedisKeys.worker(workerId), 300); // 5分钟TTL
|
|
117
119
|
// 从Worker列表移除
|
|
118
120
|
await this.client.srem(core_1.RedisKeys.workersAll(), workerId);
|
|
119
121
|
// 从各游戏类型的Worker列表移除
|
|
120
122
|
for (const gameType of gameTypes) {
|
|
121
123
|
await this.client.srem(core_1.RedisKeys.workersByType(gameType), workerId);
|
|
122
124
|
}
|
|
123
|
-
this.logger.log(`Worker unregistered: ${workerId}`);
|
|
125
|
+
this.logger.log(`Worker unregistered: ${workerId}, offline TTL: 300s`);
|
|
124
126
|
}
|
|
125
127
|
/**
|
|
126
128
|
* 订阅通道
|
|
@@ -227,6 +229,40 @@ let RedisService = RedisService_1 = class RedisService {
|
|
|
227
229
|
if (cleaned > 0) {
|
|
228
230
|
this.logger.log(`Cleaned up ${cleaned} dead worker(s)`);
|
|
229
231
|
}
|
|
232
|
+
// 一致性检查：清理孤立的 gameType 集合成员
|
|
233
|
+
await this.cleanupOrphanedGameTypeEntries();
|
|
234
|
+
}
|
|
235
|
+
/**
|
|
236
|
+
* 清理孤立的 gameType 集合成员
|
|
237
|
+
* 检查 gw:workers:<gameType> 中是否有已不存在的 worker
|
|
238
|
+
*/
|
|
239
|
+
async cleanupOrphanedGameTypeEntries() {
|
|
240
|
+
const gameTypePattern = 'gw:workers:*';
|
|
241
|
+
const keys = await this.client.keys(gameTypePattern);
|
|
242
|
+
let totalCleaned = 0;
|
|
243
|
+
for (const key of keys) {
|
|
244
|
+
// 获取集合中的所有 worker ID
|
|
245
|
+
const workerIds = await this.client.smembers(key);
|
|
246
|
+
for (const workerId of workerIds) {
|
|
247
|
+
// 检查 worker 是否还存在
|
|
248
|
+
const exists = await this.client.exists(core_1.RedisKeys.worker(workerId));
|
|
249
|
+
if (!exists) {
|
|
250
|
+
// Worker 不存在，从集合中移除
|
|
251
|
+
await this.client.srem(key, workerId);
|
|
252
|
+
totalCleaned++;
|
|
253
|
+
this.logger.debug(`Removed orphaned worker ${workerId} from ${key}`);
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
// 如果集合为空，删除集合
|
|
257
|
+
const count = await this.client.scard(key);
|
|
258
|
+
if (count === 0) {
|
|
259
|
+
await this.client.del(key);
|
|
260
|
+
this.logger.debug(`Deleted empty gameType set: ${key}`);
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
if (totalCleaned > 0) {
|
|
264
|
+
this.logger.log(`Cleaned up ${totalCleaned} orphaned gameType entries`);
|
|
265
|
+
}
|
|
230
266
|
}
|
|
231
267
|
/**
|
|
232
268
|
* 移除Worker（从所有列表中）
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.service.js","sourceRoot":"","sources":["../../../src/redis/redis.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"redis.service.js","sourceRoot":"","sources":["../../../src/redis/redis.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAmF;AACnF,sDAA4B;AAC5B,6DAAyD;AACzD,wCAAyD;AAGlD,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAkBM;IAjBZ,MAAM,GAAG,IAAI,eAAM,CAAC,cAAY,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,CAAQ;IACd,UAAU,CAAQ;IAEnB,eAAe,GAA2C,IAAI,GAAG,EAAE,CAAC;IACpE,mBAAmB,GAAa,EAAE,CAAC;IAE3C,WAAW;IACH,cAAc,CAAkB;IAChC,YAAY,CAAkB;IAEtC,OAAO;IACU,kBAAkB,GAAG,IAAI,CAAC,CAAE,OAAO;IACnC,iBAAiB,GAAG,KAAK,CAAC,CAAE,QAAQ;IACpC,gBAAgB,GAAG,KAAK,CAAC,CAAG,UAAU;IAEvD,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QACvD,MAAM,WAAW,GAAG;YAClB,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,SAAS;YAClC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,SAAS;YAClC,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,aAAa;YAC1C,aAAa,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,EAAE,IAAI,CAAC;YAC5D,oBAAoB,EAAE,CAAC;SACxB,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,IAAI,iBAAK,CAAC,WAAW,CAAC,CAAC;QACrC,IAAI,CAAC,UAAU,GAAG,IAAI,iBAAK,CAAC,WAAW,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC;QAC3E,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC,CAAC;QAE/E,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC,CAAC;QACnF,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC,CAAC;QAEvF,SAAS;QACT,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;YACjD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wCAAwC,OAAO,aAAa,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;YAChG,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAClD,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,OAAO,CAAC,CAAC;YACnB,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,OAAO,EAAE,CAAC,CAAC;YAC5E,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO;QACP,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAEjC,UAAU;QACV,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,UAAU;QACV,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,QAAQ;QACR,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACnC,CAAC;QAED,WAAW;QACX,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAE9B,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACzB,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc,CAAC,SAAmB;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;QAC7C,IAAI,CAAC,mBAAmB,GAAG,SAAS,CAAC;QAErC,aAAa;QACb,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;YACjD,QAAQ;YACR,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;YACpC,MAAM,EAAE,QAAQ,EAAG,kCAAkC;YACrD,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,CAAC;YACd,aAAa,EAAE,IAAI,CAAC,GAAG,EAAE;YACzB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC,CAAC;QAEH,oBAAoB;QACpB,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;QAEzD,cAAc;QACd,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAS,CAAC,UAAU,EAAE,EAAE,QAAQ,CAAC,CAAC;QAEzD,oBAAoB;QACpB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;QACtE,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,sBAAsB,QAAQ,gBAAgB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACxG,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,gBAAgB;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;QAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAE3C,kCAAkC;QAClC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QACxE,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvF,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,SAAS;QAEpE,cAAc;QACd,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAS,CAAC,UAAU,EAAE,EAAE,QAAQ,CAAC,CAAC;QAEzD,oBAAoB;QACpB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;QACtE,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,QAAQ,qBAAqB,CAAC,CAAC;IACzE,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,mBAAmB;QAC/B,gDAAgD;QAChD,wBAAwB;QACxB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,SAAS,CAAC,OAAe,EAAE,OAAkC;QACjE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC3C,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,0BAA0B,OAAO,EAAE,CAAC,CAAC;IACvD,CAAC;IAED;;OAEG;IACH,SAAS,CAAC,OAAe,EAAE,OAAkC;QAC3D,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO,CAAC,OAAe,EAAE,OAAwB;QACrD,MAAM,IAAI,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC7E,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CAAC,SAAiB,EAAE,WAAmB;QACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;QAC7C,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtF,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,aAAa,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1F,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE3F,kBAAkB;QAClB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC5E,MAAM,GAAG,GAAG,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7C,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC;IAC5D,CAAC;IAED;;OAEG;IACK,cAAc;QACpB,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;YAC3C,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAC7B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC;YACvD,CAAC;QACH,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAE5B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,+BAA+B,IAAI,CAAC,kBAAkB,IAAI,CAAC,CAAC;IAC9E,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,aAAa;QACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;QAC7C,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7F,CAAC;IAED;;OAEG;IACK,YAAY;QAClB,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;YACzC,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAClC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAE1B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,6BAA6B,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC;IAC1E,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,kBAAkB;QAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAEvC,aAAa;QACb,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAS,CAAC,UAAU,EAAE,CAAC,CAAC;QAErE,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YAEzE,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;gBAC7C,aAAa;gBACb,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBAClC,OAAO,EAAE,CAAC;gBACV,SAAS;YACX,CAAC;YAED,MAAM,aAAa,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YACzD,IAAI,GAAG,GAAG,aAAa,GAAG,OAAO,EAAE,CAAC;gBAClC,WAAW;gBACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,QAAQ,qBAAqB,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;gBACjH,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBAClC,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC;QAED,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,OAAO,iBAAiB,CAAC,CAAC;QAC1D,CAAC;QAED,4BAA4B;QAC5B,MAAM,IAAI,CAAC,8BAA8B,EAAE,CAAC;IAC9C,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,8BAA8B;QAC1C,MAAM,eAAe,GAAG,cAAc,CAAC;QACvC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAErD,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,qBAAqB;YACrB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YAElD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBACjC,kBAAkB;gBAClB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAEpE,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,oBAAoB;oBACpB,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;oBACtC,YAAY,EAAE,CAAC;oBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,QAAQ,SAAS,GAAG,EAAE,CAAC,CAAC;gBACvE,CAAC;YACH,CAAC;YAED,cAAc;YACd,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3C,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;gBAChB,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,GAAG,EAAE,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;QAED,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,YAAY,4BAA4B,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,YAAY,CAAC,QAAgB;QACzC,aAAa;QACb,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEzE,SAAS;QACT,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAS,CAAC,UAAU,EAAE,EAAE,QAAQ,CAAC,CAAC;QAEzD,YAAY;QACZ,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;YACzB,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBACnD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;oBACjC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,aAAa;YACf,CAAC;QACH,CAAC;QAED,aAAa;QACb,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpD,CAAC;CACF,CAAA;AA7TY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,mBAAU,GAAE;qCAmBiC,8BAAa;GAlB9C,YAAY,CA6TxB"}
|
|
@@ -63,8 +63,17 @@ export declare class MessageHandlerService implements OnModuleInit {
|
|
|
63
63
|
* - 只更新 Redis 中的连接信息（Gateway ID + Connection ID）
|
|
64
64
|
* - 默认不发送状态（客户端已有状态，避免不必要的网络开销）
|
|
65
65
|
* - Worker 内存中的 Room 对象和玩家数据都还在，无需重建
|
|
66
|
+
*
|
|
67
|
+
* **失败响应机制**：
|
|
68
|
+
* - 如果房间不存在或用户不在房间中，返回失败响应
|
|
69
|
+
* - Gateway 收到失败后清理会话中的该房间信息
|
|
70
|
+
* - 允许客户端重新加入房间
|
|
66
71
|
*/
|
|
67
72
|
private handleReconnectRoom;
|
|
73
|
+
/**
|
|
74
|
+
* 发送房间重连响应
|
|
75
|
+
*/
|
|
76
|
+
private sendReconnectRoomResponse;
|
|
68
77
|
private sendToGateway;
|
|
69
78
|
}
|
|
70
79
|
//# sourceMappingURL=message-handler.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-handler.service.d.ts","sourceRoot":"","sources":["../../../src/room/message-handler.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAU,MAAM,gBAAgB,CAAC;AASlE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAGnF,qBACa,qBAAsB,YAAW,YAAY;IAKtD,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,cAAc;IARjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0C;IACjE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;gBAGf,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,kBAAkB,EAC/B,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,qBAAqB;IAKlD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;YAMrB,aAAa;IA+C3B;;OAEG;YACW,iBAAiB;YAYjB,iBAAiB;YAkBjB,mBAAmB;YAmCnB,gBAAgB;IAiD9B;;OAEG;IACH,OAAO,CAAC,gBAAgB;YAUV,cAAc;IAkD5B;;;;;;OAMG;YACW,kBAAkB;IAuChC;;OAEG;YACW,iBAAiB;IA4D/B;;OAEG;YACW,eAAe;IA0D7B;;OAEG;YACW,gBAAgB;IAkD9B;;OAEG;YACW,iBAAiB;YASjB,eAAe;YAkCf,iBAAiB;YA0BjB,sBAAsB;IAWpC
|
|
1
|
+
{"version":3,"file":"message-handler.service.d.ts","sourceRoot":"","sources":["../../../src/room/message-handler.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAU,MAAM,gBAAgB,CAAC;AASlE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAGnF,qBACa,qBAAsB,YAAW,YAAY;IAKtD,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,cAAc;IARjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0C;IACjE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;gBAGf,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,kBAAkB,EAC/B,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,qBAAqB;IAKlD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;YAMrB,aAAa;IA+C3B;;OAEG;YACW,iBAAiB;YAYjB,iBAAiB;YAkBjB,mBAAmB;YAmCnB,gBAAgB;IAiD9B;;OAEG;IACH,OAAO,CAAC,gBAAgB;YAUV,cAAc;IAkD5B;;;;;;OAMG;YACW,kBAAkB;IAuChC;;OAEG;YACW,iBAAiB;IA4D/B;;OAEG;YACW,eAAe;IA0D7B;;OAEG;YACW,gBAAgB;IAkD9B;;OAEG;YACW,iBAAiB;YASjB,eAAe;YAkCf,iBAAiB;YA0BjB,sBAAsB;IAWpC;;;;;;;;;;;;;;OAcG;YACW,mBAAmB;IAyEjC;;OAEG;YACW,yBAAyB;YAwBzB,aAAa;CAQ5B"}
|
|
@@ -471,22 +471,33 @@ let MessageHandlerService = MessageHandlerService_1 = class MessageHandlerServic
|
|
|
471
471
|
* - 只更新 Redis 中的连接信息（Gateway ID + Connection ID）
|
|
472
472
|
* - 默认不发送状态（客户端已有状态，避免不必要的网络开销）
|
|
473
473
|
* - Worker 内存中的 Room 对象和玩家数据都还在，无需重建
|
|
474
|
+
*
|
|
475
|
+
* **失败响应机制**：
|
|
476
|
+
* - 如果房间不存在或用户不在房间中，返回失败响应
|
|
477
|
+
* - Gateway 收到失败后清理会话中的该房间信息
|
|
478
|
+
* - 允许客户端重新加入房间
|
|
474
479
|
*/
|
|
475
480
|
async handleReconnectRoom(msg) {
|
|
476
|
-
const { userId, roomId, gatewayId, connectionId, payload } = msg;
|
|
481
|
+
const { userId, roomId, gatewayId, connectionId, payload, requestId } = msg;
|
|
477
482
|
if (!userId || !roomId) {
|
|
478
483
|
this.logger.warn('Invalid reconnect-room message: missing userId or roomId');
|
|
484
|
+
// 发送失败响应
|
|
485
|
+
await this.sendReconnectRoomResponse(gatewayId, connectionId ?? '', roomId ?? '', userId ?? '', false, 'INVALID_REQUEST', requestId);
|
|
479
486
|
return;
|
|
480
487
|
}
|
|
481
488
|
const room = this.roomManager.getRoom(roomId);
|
|
482
489
|
if (!room) {
|
|
483
|
-
this.logger.warn(`Room ${roomId} not found for reconnect`);
|
|
490
|
+
this.logger.warn(`Room ${roomId} not found for reconnect (user: ${userId})`);
|
|
491
|
+
// 发送失败响应：房间已不存在
|
|
492
|
+
await this.sendReconnectRoomResponse(gatewayId, connectionId, roomId, userId, false, 'ROOM_NOT_FOUND', requestId);
|
|
484
493
|
return;
|
|
485
494
|
}
|
|
486
495
|
// 检查用户是否在房间中
|
|
487
496
|
const player = room.getPlayer(userId);
|
|
488
497
|
if (!player) {
|
|
489
498
|
this.logger.warn(`User ${userId} not in room ${roomId}`);
|
|
499
|
+
// 发送失败响应：用户不在房间中
|
|
500
|
+
await this.sendReconnectRoomResponse(gatewayId, connectionId, roomId, userId, false, 'USER_NOT_IN_ROOM', requestId);
|
|
490
501
|
return;
|
|
491
502
|
}
|
|
492
503
|
// 更新 Redis 中的房间成员连接信息
|
|
@@ -497,6 +508,8 @@ let MessageHandlerService = MessageHandlerService_1 = class MessageHandlerServic
|
|
|
497
508
|
});
|
|
498
509
|
await this.redis.client.hset(core_1.RedisKeys.roomMembers(roomId), userId, memberData);
|
|
499
510
|
this.logger.log(`Updated connection info for user ${userId} in room ${roomId}: ${gatewayId}/${connectionId}`);
|
|
511
|
+
// 发送成功响应
|
|
512
|
+
await this.sendReconnectRoomResponse(gatewayId, connectionId, roomId, userId, true, undefined, requestId);
|
|
500
513
|
// 根据 payload 决定是否发送状态（默认不发送）
|
|
501
514
|
// 预留扩展性：未来如果需要其他重连场景可以设置 sendState: true
|
|
502
515
|
const sendState = payload?.sendState === true;
|
|
@@ -523,6 +536,23 @@ let MessageHandlerService = MessageHandlerService_1 = class MessageHandlerServic
|
|
|
523
536
|
}
|
|
524
537
|
}
|
|
525
538
|
}
|
|
539
|
+
/**
|
|
540
|
+
* 发送房间重连响应
|
|
541
|
+
*/
|
|
542
|
+
async sendReconnectRoomResponse(gatewayId, connectionId, roomId, userId, success, error, requestId) {
|
|
543
|
+
const response = {
|
|
544
|
+
type: 'reconnect-room-response',
|
|
545
|
+
requestId,
|
|
546
|
+
workerId: this.workerId,
|
|
547
|
+
connectionId,
|
|
548
|
+
userId,
|
|
549
|
+
roomId,
|
|
550
|
+
success,
|
|
551
|
+
error,
|
|
552
|
+
timestamp: Date.now(),
|
|
553
|
+
};
|
|
554
|
+
await this.sendToGateway(gatewayId, response);
|
|
555
|
+
}
|
|
526
556
|
async sendToGateway(gatewayId, message) {
|
|
527
557
|
const channel = core_1.RedisChannels.rpcGateway(gatewayId);
|
|
528
558
|
this.logger.log(`[sendToGateway] Sending to ${gatewayId}, channel: ${channel}, msgType: ${message.msgType}, requestId: ${message.requestId}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-handler.service.js","sourceRoot":"","sources":["../../../src/room/message-handler.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"message-handler.service.js","sourceRoot":"","sources":["../../../src/room/message-handler.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@roomkit/worker",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.1",
|
|
4
4
|
"description": "Game logic worker for managing rooms and state in multiplayer games",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"worker",
|
|
@@ -20,7 +20,18 @@
|
|
|
20
20
|
"default": "./dist/src/index.js"
|
|
21
21
|
}
|
|
22
22
|
},
|
|
23
|
+
"scripts": {
|
|
24
|
+
"build": "nest build",
|
|
25
|
+
"dev": "nest start --watch",
|
|
26
|
+
"start": "nest start",
|
|
27
|
+
"start:prod": "node dist/main",
|
|
28
|
+
"lint": "eslint \"{src,test}/**/*.ts\"",
|
|
29
|
+
"test": "jest",
|
|
30
|
+
"clean": "rimraf dist"
|
|
31
|
+
},
|
|
23
32
|
"dependencies": {
|
|
33
|
+
"@roomkit/core": "workspace:*",
|
|
34
|
+
"@roomkit/state": "workspace:*",
|
|
24
35
|
"@nestjs/common": "^10.3.0",
|
|
25
36
|
"@nestjs/core": "^10.3.0",
|
|
26
37
|
"@nestjs/platform-express": "^11.1.9",
|
|
@@ -28,9 +39,7 @@
|
|
|
28
39
|
"prom-client": "^15.1.3",
|
|
29
40
|
"reflect-metadata": "^0.1.14",
|
|
30
41
|
"rxjs": "^7.8.1",
|
|
31
|
-
"uuid": "^9.0.1"
|
|
32
|
-
"@roomkit/core": "1.3.0",
|
|
33
|
-
"@roomkit/state": "1.2.1"
|
|
42
|
+
"uuid": "^9.0.1"
|
|
34
43
|
},
|
|
35
44
|
"devDependencies": {
|
|
36
45
|
"@nestjs/cli": "^10.3.0",
|
|
@@ -65,14 +74,5 @@
|
|
|
65
74
|
],
|
|
66
75
|
"publishConfig": {
|
|
67
76
|
"access": "public"
|
|
68
|
-
},
|
|
69
|
-
"scripts": {
|
|
70
|
-
"build": "nest build",
|
|
71
|
-
"dev": "nest start --watch",
|
|
72
|
-
"start": "nest start",
|
|
73
|
-
"start:prod": "node dist/main",
|
|
74
|
-
"lint": "eslint \"{src,test}/**/*.ts\"",
|
|
75
|
-
"test": "jest",
|
|
76
|
-
"clean": "rimraf dist"
|
|
77
77
|
}
|
|
78
|
-
}
|
|
78
|
+
}
|