summaryrefslogtreecommitdiff
path: root/src/server/api/stream/channels/games/reversi-game.ts
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/api/stream/channels/games/reversi-game.ts')
-rw-r--r--src/server/api/stream/channels/games/reversi-game.ts168
1 files changed, 79 insertions, 89 deletions
diff --git a/src/server/api/stream/channels/games/reversi-game.ts b/src/server/api/stream/channels/games/reversi-game.ts
index 87df9e194c..158f108c4e 100644
--- a/src/server/api/stream/channels/games/reversi-game.ts
+++ b/src/server/api/stream/channels/games/reversi-game.ts
@@ -1,22 +1,22 @@
import autobind from 'autobind-decorator';
import * as CRC32 from 'crc-32';
-import * as mongo from 'mongodb';
-import ReversiGame, { pack } from '../../../../../models/games/reversi/game';
import { publishReversiGameStream } from '../../../../../services/stream';
import Reversi from '../../../../../games/reversi/core';
import * as maps from '../../../../../games/reversi/maps';
import Channel from '../../channel';
+import { ReversiGame } from '../../../../../models/entities/games/reversi/game';
+import { ReversiGames } from '../../../../../models';
export default class extends Channel {
public readonly chName = 'gamesReversiGame';
public static shouldShare = false;
public static requireCredential = false;
- private gameId: mongo.ObjectID;
+ private gameId: ReversiGame['id'];
@autobind
public async init(params: any) {
- this.gameId = new mongo.ObjectID(params.gameId as string);
+ this.gameId = params.gameId;
// Subscribe game stream
this.subscriber.on(`reversiGameStream:${this.gameId}`, data => {
@@ -29,7 +29,7 @@ export default class extends Channel {
switch (type) {
case 'accept': this.accept(true); break;
case 'cancelAccept': this.accept(false); break;
- case 'updateSettings': this.updateSettings(body.settings); break;
+ case 'updateSettings': this.updateSettings(body.key, body.value); break;
case 'initForm': this.initForm(body); break;
case 'updateForm': this.updateForm(body.id, body.value); break;
case 'message': this.message(body); break;
@@ -39,54 +39,55 @@ export default class extends Channel {
}
@autobind
- private async updateSettings(settings: any) {
- const game = await ReversiGame.findOne({ _id: this.gameId });
+ private async updateSettings(key: string, value: any) {
+ const game = await ReversiGames.findOne(this.gameId);
if (game.isStarted) return;
- if (!game.user1Id.equals(this.user._id) && !game.user2Id.equals(this.user._id)) return;
- if (game.user1Id.equals(this.user._id) && game.user1Accepted) return;
- if (game.user2Id.equals(this.user._id) && game.user2Accepted) return;
+ if ((game.user1Id !== this.user.id) && (game.user2Id !== this.user.id)) return;
+ if ((game.user1Id === this.user.id) && game.user1Accepted) return;
+ if ((game.user2Id === this.user.id) && game.user2Accepted) return;
- await ReversiGame.update({ _id: this.gameId }, {
- $set: {
- settings
- }
+ if (!['map', 'bw', 'isLlotheo', 'canPutEverywhere', 'loopedBoard'].includes(key)) return;
+
+ await ReversiGames.update({ id: this.gameId }, {
+ [key]: value
});
- publishReversiGameStream(this.gameId, 'updateSettings', settings);
+ publishReversiGameStream(this.gameId, 'updateSettings', {
+ key: key,
+ value: value
+ });
}
@autobind
private async initForm(form: any) {
- const game = await ReversiGame.findOne({ _id: this.gameId });
+ const game = await ReversiGames.findOne(this.gameId);
if (game.isStarted) return;
- if (!game.user1Id.equals(this.user._id) && !game.user2Id.equals(this.user._id)) return;
+ if ((game.user1Id !== this.user.id) && (game.user2Id !== this.user.id)) return;
- const set = game.user1Id.equals(this.user._id) ? {
+ const set = game.user1Id === this.user.id ? {
form1: form
} : {
- form2: form
- };
+ form2: form
+ };
- await ReversiGame.update({ _id: this.gameId }, {
- $set: set
- });
+ await ReversiGames.update({ id: this.gameId }, set);
publishReversiGameStream(this.gameId, 'initForm', {
- userId: this.user._id,
+ userId: this.user.id,
form
});
}
@autobind
private async updateForm(id: string, value: any) {
- const game = await ReversiGame.findOne({ _id: this.gameId });
+ const game = await ReversiGames.findOne({ id: this.gameId });
if (game.isStarted) return;
- if (!game.user1Id.equals(this.user._id) && !game.user2Id.equals(this.user._id)) return;
+ if ((game.user1Id !== this.user.id) && (game.user2Id !== this.user.id)) return;
- const form = game.user1Id.equals(this.user._id) ? game.form2 : game.form1;
+ const form = game.user1Id === this.user.id ? game.form2 : game.form1;
const item = form.find((i: any) => i.id == id);
@@ -94,18 +95,16 @@ export default class extends Channel {
item.value = value;
- const set = game.user1Id.equals(this.user._id) ? {
+ const set = game.user1Id === this.user.id ? {
form2: form
} : {
form1: form
};
- await ReversiGame.update({ _id: this.gameId }, {
- $set: set
- });
+ await ReversiGames.update({ id: this.gameId }, set);
publishReversiGameStream(this.gameId, 'updateForm', {
- userId: this.user._id,
+ userId: this.user.id,
id,
value
});
@@ -115,24 +114,22 @@ export default class extends Channel {
private async message(message: any) {
message.id = Math.random();
publishReversiGameStream(this.gameId, 'message', {
- userId: this.user._id,
+ userId: this.user.id,
message
});
}
@autobind
private async accept(accept: boolean) {
- const game = await ReversiGame.findOne({ _id: this.gameId });
+ const game = await ReversiGames.findOne(this.gameId);
if (game.isStarted) return;
let bothAccepted = false;
- if (game.user1Id.equals(this.user._id)) {
- await ReversiGame.update({ _id: this.gameId }, {
- $set: {
- user1Accepted: accept
- }
+ if (game.user1Id === this.user.id) {
+ await ReversiGames.update({ id: this.gameId }, {
+ user1Accepted: accept
});
publishReversiGameStream(this.gameId, 'changeAccepts', {
@@ -141,11 +138,9 @@ export default class extends Channel {
});
if (accept && game.user2Accepted) bothAccepted = true;
- } else if (game.user2Id.equals(this.user._id)) {
- await ReversiGame.update({ _id: this.gameId }, {
- $set: {
- user2Accepted: accept
- }
+ } else if (game.user2Id === this.user.id) {
+ await ReversiGames.update({ id: this.gameId }, {
+ user2Accepted: accept
});
publishReversiGameStream(this.gameId, 'changeAccepts', {
@@ -161,15 +156,15 @@ export default class extends Channel {
if (bothAccepted) {
// 3秒後、まだacceptされていたらゲーム開始
setTimeout(async () => {
- const freshGame = await ReversiGame.findOne({ _id: this.gameId });
+ const freshGame = await ReversiGames.findOne(this.gameId);
if (freshGame == null || freshGame.isStarted || freshGame.isEnded) return;
if (!freshGame.user1Accepted || !freshGame.user2Accepted) return;
let bw: number;
- if (freshGame.settings.bw == 'random') {
+ if (freshGame.bw == 'random') {
bw = Math.random() > 0.5 ? 1 : 2;
} else {
- bw = freshGame.settings.bw as number;
+ bw = parseInt(freshGame.bw, 10);
}
function getRandomMap() {
@@ -178,22 +173,20 @@ export default class extends Channel {
return Object.values(maps)[rnd].data;
}
- const map = freshGame.settings.map != null ? freshGame.settings.map : getRandomMap();
+ const map = freshGame.map != null ? freshGame.map : getRandomMap();
- await ReversiGame.update({ _id: this.gameId }, {
- $set: {
- startedAt: new Date(),
- isStarted: true,
- black: bw,
- 'settings.map': map
- }
+ await ReversiGames.update({ id: this.gameId }, {
+ startedAt: new Date(),
+ isStarted: true,
+ black: bw,
+ map: map
});
//#region 盤面に最初から石がないなどして始まった瞬間に勝敗が決定する場合があるのでその処理
const o = new Reversi(map, {
- isLlotheo: freshGame.settings.isLlotheo,
- canPutEverywhere: freshGame.settings.canPutEverywhere,
- loopedBoard: freshGame.settings.loopedBoard
+ isLlotheo: freshGame.isLlotheo,
+ canPutEverywhere: freshGame.canPutEverywhere,
+ loopedBoard: freshGame.loopedBoard
});
if (o.isEnded) {
@@ -206,23 +199,22 @@ export default class extends Channel {
winner = null;
}
- await ReversiGame.update({
- _id: this.gameId
+ await ReversiGames.update({
+ id: this.gameId
}, {
- $set: {
- isEnded: true,
- winnerId: winner
- }
- });
+ isEnded: true,
+ winnerId: winner
+ });
publishReversiGameStream(this.gameId, 'ended', {
winnerId: winner,
- game: await pack(this.gameId, this.user)
+ game: await ReversiGames.pack(this.gameId, this.user)
});
}
//#endregion
- publishReversiGameStream(this.gameId, 'started', await pack(this.gameId, this.user));
+ publishReversiGameStream(this.gameId, 'started',
+ await ReversiGames.pack(this.gameId, this.user));
}, 3000);
}
}
@@ -230,16 +222,16 @@ export default class extends Channel {
// 石を打つ
@autobind
private async set(pos: number) {
- const game = await ReversiGame.findOne({ _id: this.gameId });
+ const game = await ReversiGames.findOne(this.gameId);
if (!game.isStarted) return;
if (game.isEnded) return;
- if (!game.user1Id.equals(this.user._id) && !game.user2Id.equals(this.user._id)) return;
+ if ((game.user1Id !== this.user.id) && (game.user2Id !== this.user.id)) return;
- const o = new Reversi(game.settings.map, {
- isLlotheo: game.settings.isLlotheo,
- canPutEverywhere: game.settings.canPutEverywhere,
- loopedBoard: game.settings.loopedBoard
+ const o = new Reversi(game.map, {
+ isLlotheo: game.isLlotheo,
+ canPutEverywhere: game.canPutEverywhere,
+ loopedBoard: game.loopedBoard
});
for (const log of game.logs) {
@@ -247,7 +239,7 @@ export default class extends Channel {
}
const myColor =
- (game.user1Id.equals(this.user._id) && game.black == 1) || (game.user2Id.equals(this.user._id) && game.black == 2)
+ ((game.user1Id === this.user.id) && game.black == 1) || ((game.user2Id === this.user.id) && game.black == 2)
? true
: false;
@@ -271,20 +263,18 @@ export default class extends Channel {
pos
};
- const crc32 = CRC32.str(game.logs.map(x => x.pos.toString()).join('') + pos.toString());
+ const crc32 = CRC32.str(game.logs.map(x => x.pos.toString()).join('') + pos.toString()).toString();
- await ReversiGame.update({
- _id: this.gameId
+ game.logs.push(log);
+
+ await ReversiGames.update({
+ id: this.gameId
}, {
- $set: {
- crc32,
- isEnded: o.isEnded,
- winnerId: winner
- },
- $push: {
- logs: log
- }
- });
+ crc32,
+ isEnded: o.isEnded,
+ winnerId: winner,
+ logs: game.logs
+ });
publishReversiGameStream(this.gameId, 'set', Object.assign(log, {
next: o.turn
@@ -293,14 +283,14 @@ export default class extends Channel {
if (o.isEnded) {
publishReversiGameStream(this.gameId, 'ended', {
winnerId: winner,
- game: await pack(this.gameId, this.user)
+ game: await ReversiGames.pack(this.gameId, this.user)
});
}
}
@autobind
private async check(crc32: string) {
- const game = await ReversiGame.findOne({ _id: this.gameId });
+ const game = await ReversiGames.findOne(this.gameId);
if (!game.isStarted) return;
@@ -308,7 +298,7 @@ export default class extends Channel {
if (game.crc32 == null) return;
if (crc32 !== game.crc32) {
- this.send('rescue', await pack(game, this.user));
+ this.send('rescue', await ReversiGames.pack(game, this.user));
}
}
}
generated by cgit v1.2.3-freya (git 2.53.0.84.g453e7b744a) at 2026-03-03 10:27:10 +0000