amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enhance(reversi): improve matching system

Browse Source
This commit is contained in:
syuilo 2024-01-24 15:18:50 +09:00
parent 7beb4ed131
commit d27b3525cd
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/backend/src/core/ReversiService.ts
View File

@ -24,7 +24,7 @@ import { Serialized } from '@/types.js';
import { ReversiGameEntityService } from './entities/ReversiGameEntityService.js'; import { ReversiGameEntityService } from './entities/ReversiGameEntityService.js';
import type { OnApplicationShutdown, OnModuleInit } from '@nestjs/common'; import type { OnApplicationShutdown, OnModuleInit } from '@nestjs/common';
const MATCHING_TIMEOUT_MS = 1000 * 20; // 20sec const INVITATION_TIMEOUT_MS = 1000 * 20; // 20sec
@Injectable() @Injectable()
export class ReversiService implements OnApplicationShutdown, OnModuleInit { export class ReversiService implements OnApplicationShutdown, OnModuleInit {
@ -112,7 +112,7 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
//#region 相手から既に招待されてないか確認 //#region 相手から既に招待されてないか確認
const invitations = await this.redisClient.zrange( const invitations = await this.redisClient.zrange(
`reversi:matchSpecific:${me.id}`, `reversi:matchSpecific:${me.id}`,
Date.now() - MATCHING_TIMEOUT_MS, Date.now() - INVITATION_TIMEOUT_MS,
'+inf', '+inf',
'BYSCORE'); 'BYSCORE');
@ -157,7 +157,7 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
//#region まず自分宛ての招待を探す //#region まず自分宛ての招待を探す
const invitations = await this.redisClient.zrange( const invitations = await this.redisClient.zrange(
`reversi:matchSpecific:${me.id}`, `reversi:matchSpecific:${me.id}`,
Date.now() - MATCHING_TIMEOUT_MS, Date.now() - INVITATION_TIMEOUT_MS,
'+inf', '+inf',
'BYSCORE'); 'BYSCORE');
@ -173,15 +173,14 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
const matchings = await this.redisClient.zrange( const matchings = await this.redisClient.zrange(
'reversi:matchAny', 'reversi:matchAny',
Date.now() - MATCHING_TIMEOUT_MS, 0,
'+inf', 2, // 自分自身のIDが入っている場合もあるので2つ取得
'BYSCORE'); 'REV');
const userIds = matchings.filter(id => id !== me.id); const userIds = matchings.filter(id => id !== me.id);
if (userIds.length > 0) { if (userIds.length > 0) {
// pick random const matchedUserId = userIds[0];
const matchedUserId = userIds[Math.floor(Math.random() * userIds.length)];
await this.redisClient.zrem('reversi:matchAny', me.id, matchedUserId); await this.redisClient.zrem('reversi:matchAny', me.id, matchedUserId);
@ -191,7 +190,7 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
} else { } else {
const redisPipeline = this.redisClient.pipeline(); const redisPipeline = this.redisClient.pipeline();
redisPipeline.zadd('reversi:matchAny', Date.now(), me.id); redisPipeline.zadd('reversi:matchAny', Date.now(), me.id);
redisPipeline.expire('reversi:matchAny', 120, 'NX'); redisPipeline.expire('reversi:matchAny', 15, 'NX');
await redisPipeline.exec(); await redisPipeline.exec();
return null; return null;
} }
@ -380,7 +379,7 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
public async getInvitations(user: MiUser): Promise<MiUser['id'][]> { public async getInvitations(user: MiUser): Promise<MiUser['id'][]> {
const invitations = await this.redisClient.zrange( const invitations = await this.redisClient.zrange(
`reversi:matchSpecific:${user.id}`, `reversi:matchSpecific:${user.id}`,
Date.now() - MATCHING_TIMEOUT_MS, Date.now() - INVITATION_TIMEOUT_MS,
'+inf', '+inf',
'BYSCORE'); 'BYSCORE');
return invitations; return invitations;

2
packages/frontend/src/pages/reversi/index.vue
View File

@ -230,6 +230,8 @@ onMounted(() => {
misskeyApi('reversi/invitations').then(_invitations => { misskeyApi('reversi/invitations').then(_invitations => {
invitations.value = _invitations; invitations.value = _invitations;
}); });
window.addEventListener('beforeunload', cancelMatching);
}); });
onDeactivated(() => { onDeactivated(() => {