From 762fa6a8d85691e2d5d94a46b23d7641feefd402 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 11 Jan 2024 12:34:03 +0900 Subject: enhance(drop-and-fusion): make game engine headless for server-side running --- .../frontend/src/scripts/drop-and-fusion-engine.ts | 359 ++++++--------------- 1 file changed, 92 insertions(+), 267 deletions(-) (limited to 'packages/frontend/src/scripts') diff --git a/packages/frontend/src/scripts/drop-and-fusion-engine.ts b/packages/frontend/src/scripts/drop-and-fusion-engine.ts index d64c6015a5..c6eabc8af3 100644 --- a/packages/frontend/src/scripts/drop-and-fusion-engine.ts +++ b/packages/frontend/src/scripts/drop-and-fusion-engine.ts @@ -6,7 +6,6 @@ import { EventEmitter } from 'eventemitter3'; import * as Matter from 'matter-js'; import seedrandom from 'seedrandom'; -import * as sound from '@/scripts/sound.js'; export type Mono = { id: string; @@ -39,41 +38,41 @@ export class DropAndFusionGame extends EventEmitter<{ changeCombo: (newCombo: number) => void; changeStock: (newStock: { id: string; mono: Mono }[]) => void; changeHolding: (newHolding: { id: string; mono: Mono } | null) => void; - dropped: () => void; + dropped: (x: number) => void; fusioned: (x: number, y: number, scoreDelta: number) => void; monoAdded: (mono: Mono) => void; gameOver: () => void; + sfx(type: string, params: { volume: number; pan: number; pitch: number; }): void; }> { private PHYSICS_QUALITY_FACTOR = 16; // 低いほどパフォーマンスが高いがガタガタして安定しなくなる、逆に高すぎても何故か不安定になる private COMBO_INTERVAL = 60; // frame + public readonly GAME_WIDTH = 450; + public readonly GAME_HEIGHT = 600; public readonly DROP_INTERVAL = 500; public readonly PLAYAREA_MARGIN = 25; private STOCK_MAX = 4; private TICK_DELTA = 1000 / 60; // 60fps - private loaded = false; - private frame = 0; - private engine: Matter.Engine; - private render: Matter.Render; - private tickRaf: ReturnType | null = null; + public frame = 0; + public engine: Matter.Engine; private tickCallbackQueue: { frame: number; callback: () => void; }[] = []; private overflowCollider: Matter.Body; private isGameOver = false; - private gameWidth: number; - private gameHeight: number; private monoDefinitions: Mono[] = []; - private monoTextures: Record = {}; - private monoTextureUrls: Record = {}; private rng: () => number; private logs: Log[] = []; private replaying = false; - private sfxVolume = 1; - /** * フィールドに出ていて、かつ合体の対象となるアイテム */ private activeBodyIds: Matter.Body['id'][] = []; + /** + * fusion予約アイテムのペア + * TODO: これらのモノは光らせるなどの演出をすると視覚的に楽しそう + */ + private fusionReservedPairs: { bodyA: Matter.Body; bodyB: Matter.Body }[] = []; + private latestDroppedBodyId: Matter.Body['id'] | null = null; private latestDroppedAt = 0; @@ -99,30 +98,16 @@ export class DropAndFusionGame extends EventEmitter<{ this.emit('changeScore', value); } - private comboIntervalId: number | null = null; - public replayPlaybackRate = 1; - constructor(opts: { - canvas: HTMLCanvasElement; - width: number; - height: number; - monoDefinitions: Mono[]; - seed: string; - sfxVolume?: number; - }) { + constructor(env: { monoDefinitions: Mono[]; seed: string; replaying?: boolean }) { super(); - this.tick = this.tick.bind(this); + this.replaying = !!env.replaying; + this.monoDefinitions = env.monoDefinitions; + this.rng = seedrandom(env.seed); - this.gameWidth = opts.width; - this.gameHeight = opts.height; - this.monoDefinitions = opts.monoDefinitions; - this.rng = seedrandom(opts.seed); - - if (opts.sfxVolume) { - this.sfxVolume = opts.sfxVolume; - } + this.tick = this.tick.bind(this); this.engine = Matter.Engine.create({ constraintIterations: 2 * this.PHYSICS_QUALITY_FACTOR, @@ -138,22 +123,6 @@ export class DropAndFusionGame extends EventEmitter<{ enableSleeping: false, }); - this.render = Matter.Render.create({ - engine: this.engine, - canvas: opts.canvas, - options: { - width: this.gameWidth, - height: this.gameHeight, - background: 'transparent', // transparent to hide - wireframeBackground: 'transparent', // transparent to hide - wireframes: false, - showSleeping: false, - pixelRatio: Math.max(2, window.devicePixelRatio), - }, - }); - - Matter.Render.run(this.render); - this.engine.world.bodies = []; //#region walls @@ -170,13 +139,13 @@ export class DropAndFusionGame extends EventEmitter<{ const thickness = 100; Matter.Composite.add(this.engine.world, [ - Matter.Bodies.rectangle(this.gameWidth / 2, this.gameHeight + (thickness / 2) - this.PLAYAREA_MARGIN, this.gameWidth, thickness, WALL_OPTIONS), - Matter.Bodies.rectangle(this.gameWidth + (thickness / 2) - this.PLAYAREA_MARGIN, this.gameHeight / 2, thickness, this.gameHeight, WALL_OPTIONS), - Matter.Bodies.rectangle(-((thickness / 2) - this.PLAYAREA_MARGIN), this.gameHeight / 2, thickness, this.gameHeight, WALL_OPTIONS), + Matter.Bodies.rectangle(this.GAME_WIDTH / 2, this.GAME_HEIGHT + (thickness / 2) - this.PLAYAREA_MARGIN, this.GAME_WIDTH, thickness, WALL_OPTIONS), + Matter.Bodies.rectangle(this.GAME_WIDTH + (thickness / 2) - this.PLAYAREA_MARGIN, this.GAME_HEIGHT / 2, thickness, this.GAME_HEIGHT, WALL_OPTIONS), + Matter.Bodies.rectangle(-((thickness / 2) - this.PLAYAREA_MARGIN), this.GAME_HEIGHT / 2, thickness, this.GAME_HEIGHT, WALL_OPTIONS), ]); //#endregion - this.overflowCollider = Matter.Bodies.rectangle(this.gameWidth / 2, 0, this.gameWidth, 200, { + this.overflowCollider = Matter.Bodies.rectangle(this.GAME_WIDTH / 2, 0, this.GAME_WIDTH, 200, { isStatic: true, isSensor: true, render: { @@ -185,12 +154,6 @@ export class DropAndFusionGame extends EventEmitter<{ }, }); Matter.Composite.add(this.engine.world, this.overflowCollider); - - // fit the render viewport to the scene - Matter.Render.lookAt(this.render, { - min: { x: 0, y: 0 }, - max: { x: this.gameWidth, y: this.gameHeight }, - }); } private createBody(mono: Mono, x: number, y: number) { @@ -256,29 +219,69 @@ export class DropAndFusionGame extends EventEmitter<{ const additionalScore = Math.round(currentMono.score * comboBonus); this.score += additionalScore; - // TODO: 効果音再生はコンポーネント側の責務なので移動するべき？ - const panV = newX - this.PLAYAREA_MARGIN; - const panW = this.gameWidth - this.PLAYAREA_MARGIN - this.PLAYAREA_MARGIN; - const pan = ((panV / panW) - 0.5) * 2; - sound.playUrl('/client-assets/drop-and-fusion/bubble2.mp3', { - volume: this.sfxVolume, - pan, - playbackRate: nextMono.sfxPitch * this.replayPlaybackRate, - }); - this.emit('monoAdded', nextMono); this.emit('fusioned', newX, newY, additionalScore); + + const panV = newX - this.PLAYAREA_MARGIN; + const panW = this.GAME_WIDTH - this.PLAYAREA_MARGIN - this.PLAYAREA_MARGIN; + const pan = ((panV / panW) - 0.5) * 2; + this.emit('sfx', 'fusion', { volume: 1, pan, pitch: nextMono.sfxPitch }); } else { - //const VELOCITY = 30; - //for (let i = 0; i < 10; i++) { - // const body = createBody(FRUITS.find(x => x.level === (1 + Math.floor(this.rng() * 3)))!, x + ((this.rng() * VELOCITY) - (VELOCITY / 2)), y + ((this.rng() * VELOCITY) - (VELOCITY / 2))); - // Matter.Composite.add(world, body); - // bodies.push(body); - //} - //sound.playUrl({ - // type: 'syuilo/bubble2', - // volume: this.sfxVolume, - //}); + // nop + } + } + + private onCollision(event: Matter.IEventCollision) { + const minCollisionEnergyForSound = 2.5; + const maxCollisionEnergyForSound = 9; + const soundPitchMax = 4; + const soundPitchMin = 0.5; + + for (const pairs of event.pairs) { + const { bodyA, bodyB } = pairs; + + if (bodyA.id === this.overflowCollider.id || bodyB.id === this.overflowCollider.id) { + if (bodyA.id === this.latestDroppedBodyId || bodyB.id === this.latestDroppedBodyId) { + continue; + } + this.gameOver(); + break; + } + + const shouldFusion = (bodyA.label === bodyB.label) && + !this.fusionReservedPairs.some(x => + x.bodyA.id === bodyA.id || + x.bodyA.id === bodyB.id || + x.bodyB.id === bodyA.id || + x.bodyB.id === bodyB.id); + + if (shouldFusion) { + if (this.activeBodyIds.includes(bodyA.id) && this.activeBodyIds.includes(bodyB.id)) { + this.fusion(bodyA, bodyB); + } else { + this.fusionReservedPairs.push({ bodyA, bodyB }); + this.tickCallbackQueue.push({ + frame: this.frame + 6, + callback: () => { + this.fusionReservedPairs = this.fusionReservedPairs.filter(x => x.bodyA.id !== bodyA.id && x.bodyB.id !== bodyB.id); + this.fusion(bodyA, bodyB); + }, + }); + } + } else { + const energy = pairs.collision.depth; + if (energy > minCollisionEnergyForSound) { + const volume = (Math.min(maxCollisionEnergyForSound, energy - minCollisionEnergyForSound) / maxCollisionEnergyForSound) / 4; + const panV = + pairs.bodyA.label === '_wall_' ? bodyB.position.x - this.PLAYAREA_MARGIN : + pairs.bodyB.label === '_wall_' ? bodyA.position.x - this.PLAYAREA_MARGIN : + ((bodyA.position.x + bodyB.position.x) / 2) - this.PLAYAREA_MARGIN; + const panW = this.GAME_WIDTH - this.PLAYAREA_MARGIN - this.PLAYAREA_MARGIN; + const pan = ((panV / panW) - 0.5) * 2; + const pitch = soundPitchMin + ((soundPitchMax - soundPitchMin) * (1 - (Math.min(10, energy) / 10))); + this.emit('sfx', 'collision', { volume, pan, pitch }); + } + } } } @@ -293,50 +296,10 @@ export class DropAndFusionGame extends EventEmitter<{ private gameOver() { this.isGameOver = true; - if (this.tickRaf) window.cancelAnimationFrame(this.tickRaf); - this.tickRaf = null; this.emit('gameOver'); - - // TODO: 効果音再生はコンポーネント側の責務なので移動するべき？ - sound.playUrl('/client-assets/drop-and-fusion/gameover.mp3', { - volume: this.sfxVolume, - }); - } - - /** テクスチャをすべてキャッシュする */ - private async loadMonoTextures() { - async function loadSingleMonoTexture(mono: Mono, game: DropAndFusionGame) { - // Matter-js内にキャッシュがある場合はスキップ - if (game.render.textures[mono.img]) return; - - let src = mono.img; - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - if (game.monoTextureUrls[mono.img]) { - src = game.monoTextureUrls[mono.img]; - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - } else if (game.monoTextures[mono.img]) { - src = URL.createObjectURL(game.monoTextures[mono.img]); - game.monoTextureUrls[mono.img] = src; - } else { - const res = await fetch(mono.img); - const blob = await res.blob(); - game.monoTextures[mono.img] = blob; - src = URL.createObjectURL(blob); - game.monoTextureUrls[mono.img] = src; - } - - const image = new Image(); - image.src = src; - game.render.textures[mono.img] = image; - } - - return Promise.all(this.monoDefinitions.map(x => loadSingleMonoTexture(x, this))); } - public start(logs?: Log[]) { - if (!this.loaded) throw new Error('game is not loaded yet'); - if (logs) this.replaying = true; - + public start() { for (let i = 0; i < this.STOCK_MAX; i++) { this.stock.push({ id: this.rng().toString(), @@ -345,118 +308,20 @@ export class DropAndFusionGame extends EventEmitter<{ } this.emit('changeStock', this.stock); - // TODO: fusion予約状態のアイテムは光らせるなどの演出をすると楽しそう - let fusionReservedPairs: { bodyA: Matter.Body; bodyB: Matter.Body }[] = []; - - const minCollisionEnergyForSound = 2.5; - const maxCollisionEnergyForSound = 9; - const soundPitchMax = 4; - const soundPitchMin = 0.5; - - Matter.Events.on(this.engine, 'collisionStart', (event) => { - for (const pairs of event.pairs) { - const { bodyA, bodyB } = pairs; - if (bodyA.id === this.overflowCollider.id || bodyB.id === this.overflowCollider.id) { - if (bodyA.id === this.latestDroppedBodyId || bodyB.id === this.latestDroppedBodyId) { - continue; - } - this.gameOver(); - break; - } - const shouldFusion = (bodyA.label === bodyB.label) && !fusionReservedPairs.some(x => x.bodyA.id === bodyA.id || x.bodyA.id === bodyB.id || x.bodyB.id === bodyA.id || x.bodyB.id === bodyB.id); - if (shouldFusion) { - if (this.activeBodyIds.includes(bodyA.id) && this.activeBodyIds.includes(bodyB.id)) { - this.fusion(bodyA, bodyB); - } else { - fusionReservedPairs.push({ bodyA, bodyB }); - this.tickCallbackQueue.push({ - frame: this.frame + 6, - callback: () => { - fusionReservedPairs = fusionReservedPairs.filter(x => x.bodyA.id !== bodyA.id && x.bodyB.id !== bodyB.id); - this.fusion(bodyA, bodyB); - }, - }); - } - } else { - const energy = pairs.collision.depth; - if (energy > minCollisionEnergyForSound) { - // TODO: 効果音再生はコンポーネント側の責務なので移動するべき？ - const vol = ((Math.min(maxCollisionEnergyForSound, energy - minCollisionEnergyForSound) / maxCollisionEnergyForSound) / 4) * this.sfxVolume; - const panV = - pairs.bodyA.label === '_wall_' ? bodyB.position.x - this.PLAYAREA_MARGIN : - pairs.bodyB.label === '_wall_' ? bodyA.position.x - this.PLAYAREA_MARGIN : - ((bodyA.position.x + bodyB.position.x) / 2) - this.PLAYAREA_MARGIN; - const panW = this.gameWidth - this.PLAYAREA_MARGIN - this.PLAYAREA_MARGIN; - const pan = ((panV / panW) - 0.5) * 2; - const pitch = soundPitchMin + ((soundPitchMax - soundPitchMin) * (1 - (Math.min(10, energy) / 10))); - sound.playUrl('/client-assets/drop-and-fusion/poi1.mp3', { - volume: vol, - pan, - playbackRate: pitch * this.replayPlaybackRate, - }); - } - } - } - }); - - if (logs) { - const playTick = () => { - for (let i = 0; i < this.replayPlaybackRate; i++) { - this.frame++; - if (this.latestFusionedAt < this.frame - this.COMBO_INTERVAL) { - this.combo = 0; - } - const log = logs.find(x => x.frame === this.frame - 1); - if (log) { - switch (log.operation) { - case 'drop': { - this.drop(log.x); - break; - } - case 'hold': { - this.hold(); - break; - } - case 'surrender': { - this.surrender(); - break; - } - default: - break; - } - } - this.tickCallbackQueue = this.tickCallbackQueue.filter(x => { - if (x.frame === this.frame) { - x.callback(); - return false; - } else { - return true; - } - }); - - Matter.Engine.update(this.engine, this.TICK_DELTA); - } - - if (!this.isGameOver) { - this.tickRaf = window.requestAnimationFrame(playTick); - } - }; - - playTick(); - } else { - this.tick(); - } + Matter.Events.on(this.engine, 'collisionStart', this.onCollision.bind(this)); } public getLogs() { return this.logs; } - private tick() { + public tick() { this.frame++; + if (this.latestFusionedAt < this.frame - this.COMBO_INTERVAL) { this.combo = 0; } + this.tickCallbackQueue = this.tickCallbackQueue.filter(x => { if (x.frame === this.frame) { x.callback(); @@ -465,35 +330,12 @@ export class DropAndFusionGame extends EventEmitter<{ return true; } }); - Matter.Engine.update(this.engine, this.TICK_DELTA); - if (!this.isGameOver) { - this.tickRaf = window.requestAnimationFrame(this.tick); - } - } - - public async load() { - await this.loadMonoTextures(); - this.loaded = true; - } - public setSfxVolume(volume: number) { - this.sfxVolume = volume; - } + Matter.Engine.update(this.engine, this.TICK_DELTA); - public getTextureImageUrl(mono: Mono) { - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - if (this.monoTextureUrls[mono.img]) { - return this.monoTextureUrls[mono.img]; + const hasNextTick = !this.isGameOver; - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - } else if (this.monoTextures[mono.img]) { - // Gameクラス内にキャッシュがある場合はそれを使う - const out = URL.createObjectURL(this.monoTextures[mono.img]); - this.monoTextureUrls[mono.img] = out; - return out; - } else { - return mono.img; - } + return hasNextTick; } public getActiveMonos() { @@ -502,6 +344,7 @@ export class DropAndFusionGame extends EventEmitter<{ public drop(_x: number) { if (this.isGameOver) return; + // TODO: フレームで計算するようにすればリプレイかどうかのチェックは不要になる if (!this.replaying && (Date.now() - this.latestDroppedAt < this.DROP_INTERVAL)) return; const head = this.stock.shift()!; @@ -512,7 +355,7 @@ export class DropAndFusionGame extends EventEmitter<{ this.emit('changeStock', this.stock); const inputX = Math.round(_x); - const x = Math.min(this.gameWidth - this.PLAYAREA_MARGIN - (head.mono.size / 2), Math.max(this.PLAYAREA_MARGIN + (head.mono.size / 2), inputX)); + const x = Math.min(this.GAME_WIDTH - this.PLAYAREA_MARGIN - (head.mono.size / 2), Math.max(this.PLAYAREA_MARGIN + (head.mono.size / 2), inputX)); const body = this.createBody(head.mono, x, 50 + head.mono.size / 2); this.logs.push({ frame: this.frame, @@ -523,18 +366,8 @@ export class DropAndFusionGame extends EventEmitter<{ this.activeBodyIds.push(body.id); this.latestDroppedBodyId = body.id; this.latestDroppedAt = Date.now(); - this.emit('dropped'); + this.emit('dropped', x); this.emit('monoAdded', head.mono); - - // TODO: 効果音再生はコンポーネント側の責務なので移動するべき？ - const panV = x - this.PLAYAREA_MARGIN; - const panW = this.gameWidth - this.PLAYAREA_MARGIN - this.PLAYAREA_MARGIN; - const pan = ((panV / panW) - 0.5) * 2; - sound.playUrl('/client-assets/drop-and-fusion/poi2.mp3', { - volume: this.sfxVolume, - pan, - playbackRate: this.replayPlaybackRate, - }); } public hold() { @@ -561,17 +394,9 @@ export class DropAndFusionGame extends EventEmitter<{ this.emit('changeHolding', this.holding); this.emit('changeStock', this.stock); } - - sound.playUrl('/client-assets/drop-and-fusion/hold.mp3', { - volume: 0.5 * this.sfxVolume, - }); } public dispose() { - if (this.comboIntervalId) window.clearInterval(this.comboIntervalId); - if (this.tickRaf) window.cancelAnimationFrame(this.tickRaf); - this.tickRaf = null; - Matter.Render.stop(this.render); Matter.World.clear(this.engine.world, false); Matter.Engine.clear(this.engine); } -- cgit v1.2.3-freya From cf54c2ba4750c307d840016828f837a61f886726 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 11 Jan 2024 18:13:39 +0900 Subject: feat: ranking system of bubble game Resolve #12961 --- locales/index.d.ts | 1 + locales/ja-JP.yml | 1 + .../migration/1704959805077-bubble-game-record.js | 24 ++++++ packages/backend/src/di-symbols.ts | 1 + packages/backend/src/models/BubbleGameRecord.ts | 57 ++++++++++++++ packages/backend/src/models/RepositoryModule.ts | 10 ++- packages/backend/src/models/_.ts | 3 + packages/backend/src/postgres.ts | 2 + packages/backend/src/server/api/EndpointsModule.ts | 8 ++ packages/backend/src/server/api/endpoints.ts | 4 + .../server/api/endpoints/bubble-game/ranking.ts | 75 +++++++++++++++++++ .../server/api/endpoints/bubble-game/register.ts | 86 ++++++++++++++++++++++ .../frontend/src/pages/drop-and-fusion.game.vue | 25 ++++++- packages/frontend/src/pages/drop-and-fusion.vue | 32 +++++++- .../frontend/src/scripts/drop-and-fusion-engine.ts | 71 +++++++++++++++++- packages/frontend/src/scripts/sound.ts | 1 - 16 files changed, 391 insertions(+), 10 deletions(-) create mode 100644 packages/backend/migration/1704959805077-bubble-game-record.js create mode 100644 packages/backend/src/models/BubbleGameRecord.ts create mode 100644 packages/backend/src/server/api/endpoints/bubble-game/ranking.ts create mode 100644 packages/backend/src/server/api/endpoints/bubble-game/register.ts (limited to 'packages/frontend/src/scripts') diff --git a/locales/index.d.ts b/locales/index.d.ts index 852cbdd27d..317a474dba 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -1199,6 +1199,7 @@ export interface Locale { "showReplay": string; "replay": string; "replaying": string; + "ranking": string; "_bubbleGame": { "howToPlay": string; "_howToPlay": { diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index f85dc0fcf8..d3c2b4d312 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1196,6 +1196,7 @@ soundWillBePlayed: "サウンドが再生されます" showReplay: "リプレイを見る" replay: "リプレイ" replaying: "リプレイ中" +ranking: "ランキング" _bubbleGame: howToPlay: "遊び方" diff --git a/packages/backend/migration/1704959805077-bubble-game-record.js b/packages/backend/migration/1704959805077-bubble-game-record.js new file mode 100644 index 0000000000..cc45b09c82 --- /dev/null +++ b/packages/backend/migration/1704959805077-bubble-game-record.js @@ -0,0 +1,24 @@ +/* + * SPDX-FileCopyrightText: syuilo and other misskey contributors + * SPDX-License-Identifier: AGPL-3.0-only + */ + +export class BubbleGameRecord1704959805077 { + name = 'BubbleGameRecord1704959805077' + + async up(queryRunner) { + await queryRunner.query(`CREATE TABLE "bubble_game_record" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "seededAt" TIMESTAMP WITH TIME ZONE NOT NULL, "seed" character varying(1024) NOT NULL, "gameVersion" integer NOT NULL, "gameMode" character varying(128) NOT NULL, "score" integer NOT NULL, "logs" jsonb NOT NULL DEFAULT '[]', "isVerified" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_a75395fe404b392e2893b50d7ea" PRIMARY KEY ("id"))`); + await queryRunner.query(`CREATE INDEX "IDX_75276757070d21fdfaf4c05290" ON "bubble_game_record" ("userId") `); + await queryRunner.query(`CREATE INDEX "IDX_4ae7053179014915d1432d3f40" ON "bubble_game_record" ("seededAt") `); + await queryRunner.query(`CREATE INDEX "IDX_26d4ee490b5a487142d35466ee" ON "bubble_game_record" ("score") `); + await queryRunner.query(`ALTER TABLE "bubble_game_record" ADD CONSTRAINT "FK_75276757070d21fdfaf4c052909" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); + } + + async down(queryRunner) { + await queryRunner.query(`ALTER TABLE "bubble_game_record" DROP CONSTRAINT "FK_75276757070d21fdfaf4c052909"`); + await queryRunner.query(`DROP INDEX "public"."IDX_26d4ee490b5a487142d35466ee"`); + await queryRunner.query(`DROP INDEX "public"."IDX_4ae7053179014915d1432d3f40"`); + await queryRunner.query(`DROP INDEX "public"."IDX_75276757070d21fdfaf4c05290"`); + await queryRunner.query(`DROP TABLE "bubble_game_record"`); + } +} diff --git a/packages/backend/src/di-symbols.ts b/packages/backend/src/di-symbols.ts index 8411cb8229..e29fee3f96 100644 --- a/packages/backend/src/di-symbols.ts +++ b/packages/backend/src/di-symbols.ts @@ -78,5 +78,6 @@ export const DI = { flashsRepository: Symbol('flashsRepository'), flashLikesRepository: Symbol('flashLikesRepository'), userMemosRepository: Symbol('userMemosRepository'), + bubbleGameRecordsRepository: Symbol('bubbleGameRecordsRepository'), //#endregion }; diff --git a/packages/backend/src/models/BubbleGameRecord.ts b/packages/backend/src/models/BubbleGameRecord.ts new file mode 100644 index 0000000000..4b483ed4d3 --- /dev/null +++ b/packages/backend/src/models/BubbleGameRecord.ts @@ -0,0 +1,57 @@ +/* + * SPDX-FileCopyrightText: syuilo and other misskey contributors + * SPDX-License-Identifier: AGPL-3.0-only + */ + +import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; +import { id } from './util/id.js'; +import { MiUser } from './User.js'; + +@Entity('bubble_game_record') +export class MiBubbleGameRecord { + @PrimaryColumn(id()) + public id: string; + + @Index() + @Column({ + ...id(), + }) + public userId: MiUser['id']; + + @ManyToOne(type => MiUser, { + onDelete: 'CASCADE', + }) + @JoinColumn() + public user: MiUser | null; + + @Index() + @Column('timestamp with time zone') + public seededAt: Date; + + @Column('varchar', { + length: 1024, + }) + public seed: string; + + @Column('integer') + public gameVersion: number; + + @Column('varchar', { + length: 128, + }) + public gameMode: string; + + @Index() + @Column('integer') + public score: number; + + @Column('jsonb', { + default: [], + }) + public logs: any[]; + + @Column('boolean', { + default: false, + }) + public isVerified: boolean; +} diff --git a/packages/backend/src/models/RepositoryModule.ts b/packages/backend/src/models/RepositoryModule.ts index 866fdfe6d4..0399536c3e 100644 --- a/packages/backend/src/models/RepositoryModule.ts +++ b/packages/backend/src/models/RepositoryModule.ts @@ -5,7 +5,7 @@ import { Module } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; -import { MiAbuseUserReport, MiAccessToken, MiAd, MiAnnouncement, MiAnnouncementRead, MiAntenna, MiApp, MiAuthSession, MiAvatarDecoration, MiBlocking, MiChannel, MiChannelFavorite, MiChannelFollowing, MiClip, MiClipFavorite, MiClipNote, MiDriveFile, MiDriveFolder, MiEmoji, MiFlash, MiFlashLike, MiFollowRequest, MiFollowing, MiGalleryLike, MiGalleryPost, MiHashtag, MiInstance, MiMeta, MiModerationLog, MiMuting, MiNote, MiNoteFavorite, MiNoteReaction, MiNoteThreadMuting, MiNoteUnread, MiPage, MiPageLike, MiPasswordResetRequest, MiPoll, MiPollVote, MiPromoNote, MiPromoRead, MiRegistrationTicket, MiRegistryItem, MiRelay, MiRenoteMuting, MiRetentionAggregation, MiRole, MiRoleAssignment, MiSignin, MiSwSubscription, MiUsedUsername, MiUser, MiUserIp, MiUserKeypair, MiUserList, MiUserListFavorite, MiUserListMembership, MiUserMemo, MiUserNotePining, MiUserPending, MiUserProfile, MiUserPublickey, MiUserSecurityKey, MiWebhook } from './_.js'; +import { MiAbuseUserReport, MiAccessToken, MiAd, MiAnnouncement, MiAnnouncementRead, MiAntenna, MiApp, MiAuthSession, MiAvatarDecoration, MiBlocking, MiChannel, MiChannelFavorite, MiChannelFollowing, MiClip, MiClipFavorite, MiClipNote, MiDriveFile, MiDriveFolder, MiEmoji, MiFlash, MiFlashLike, MiFollowRequest, MiFollowing, MiGalleryLike, MiGalleryPost, MiHashtag, MiInstance, MiMeta, MiModerationLog, MiMuting, MiNote, MiNoteFavorite, MiNoteReaction, MiNoteThreadMuting, MiNoteUnread, MiPage, MiPageLike, MiPasswordResetRequest, MiPoll, MiPollVote, MiPromoNote, MiPromoRead, MiRegistrationTicket, MiRegistryItem, MiRelay, MiRenoteMuting, MiRetentionAggregation, MiRole, MiRoleAssignment, MiSignin, MiSwSubscription, MiUsedUsername, MiUser, MiUserIp, MiUserKeypair, MiUserList, MiUserListFavorite, MiUserListMembership, MiUserMemo, MiUserNotePining, MiUserPending, MiUserProfile, MiUserPublickey, MiUserSecurityKey, MiWebhook, MiBubbleGameRecord } from './_.js'; import type { DataSource } from 'typeorm'; import type { Provider } from '@nestjs/common'; @@ -399,6 +399,12 @@ const $userMemosRepository: Provider = { inject: [DI.db], }; +export const $bubbleGameRecordsRepository: Provider = { + provide: DI.bubbleGameRecordsRepository, + useFactory: (db: DataSource) => db.getRepository(MiBubbleGameRecord), + inject: [DI.db], +}; + @Module({ imports: [ ], @@ -468,6 +474,7 @@ const $userMemosRepository: Provider = { $flashsRepository, $flashLikesRepository, $userMemosRepository, + $bubbleGameRecordsRepository, ], exports: [ $usersRepository, @@ -535,6 +542,7 @@ const $userMemosRepository: Provider = { $flashsRepository, $flashLikesRepository, $userMemosRepository, + $bubbleGameRecordsRepository, ], }) export class RepositoryModule {} diff --git a/packages/backend/src/models/_.ts b/packages/backend/src/models/_.ts index d7c327f164..a1c4b0743e 100644 --- a/packages/backend/src/models/_.ts +++ b/packages/backend/src/models/_.ts @@ -68,6 +68,7 @@ import { MiRoleAssignment } from '@/models/RoleAssignment.js'; import { MiFlash } from '@/models/Flash.js'; import { MiFlashLike } from '@/models/FlashLike.js'; import { MiUserListFavorite } from '@/models/UserListFavorite.js'; +import { MiBubbleGameRecord } from '@/models/BubbleGameRecord.js'; import type { Repository } from 'typeorm'; export { @@ -136,6 +137,7 @@ export { MiFlash, MiFlashLike, MiUserMemo, + MiBubbleGameRecord, }; export type AbuseUserReportsRepository = Repository; @@ -203,3 +205,4 @@ export type RoleAssignmentsRepository = Repository; export type FlashsRepository = Repository; export type FlashLikesRepository = Repository; export type UserMemoRepository = Repository; +export type BubbleGameRecordsRepository = Repository; diff --git a/packages/backend/src/postgres.ts b/packages/backend/src/postgres.ts index cd611839a4..0430e9ca19 100644 --- a/packages/backend/src/postgres.ts +++ b/packages/backend/src/postgres.ts @@ -76,6 +76,7 @@ import { MiRoleAssignment } from '@/models/RoleAssignment.js'; import { MiFlash } from '@/models/Flash.js'; import { MiFlashLike } from '@/models/FlashLike.js'; import { MiUserMemo } from '@/models/UserMemo.js'; +import { MiBubbleGameRecord } from '@/models/BubbleGameRecord.js'; import { Config } from '@/config.js'; import MisskeyLogger from '@/logger.js'; @@ -190,6 +191,7 @@ export const entities = [ MiFlash, MiFlashLike, MiUserMemo, + MiBubbleGameRecord, ...charts, ]; diff --git a/packages/backend/src/server/api/EndpointsModule.ts b/packages/backend/src/server/api/EndpointsModule.ts index a3a9805444..781332d349 100644 --- a/packages/backend/src/server/api/EndpointsModule.ts +++ b/packages/backend/src/server/api/EndpointsModule.ts @@ -364,6 +364,8 @@ import * as ep___users_updateMemo from './endpoints/users/update-memo.js'; import * as ep___fetchRss from './endpoints/fetch-rss.js'; import * as ep___fetchExternalResources from './endpoints/fetch-external-resources.js'; import * as ep___retention from './endpoints/retention.js'; +import * as ep___bubbleGame_register from './endpoints/bubble-game/register.js'; +import * as ep___bubbleGame_ranking from './endpoints/bubble-game/ranking.js'; import { GetterService } from './GetterService.js'; import { ApiLoggerService } from './ApiLoggerService.js'; import type { Provider } from '@nestjs/common'; @@ -726,6 +728,8 @@ const $users_updateMemo: Provider = { provide: 'ep:users/update-memo', useClass: const $fetchRss: Provider = { provide: 'ep:fetch-rss', useClass: ep___fetchRss.default }; const $fetchExternalResources: Provider = { provide: 'ep:fetch-external-resources', useClass: ep___fetchExternalResources.default }; const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention.default }; +const $bubbleGame_register: Provider = { provide: 'ep:bubble-game/register', useClass: ep___bubbleGame_register.default }; +const $bubbleGame_ranking: Provider = { provide: 'ep:bubble-game/ranking', useClass: ep___bubbleGame_ranking.default }; @Module({ imports: [ @@ -1092,6 +1096,8 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention $fetchRss, $fetchExternalResources, $retention, + $bubbleGame_register, + $bubbleGame_ranking, ], exports: [ $admin_meta, @@ -1449,6 +1455,8 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention $fetchRss, $fetchExternalResources, $retention, + $bubbleGame_register, + $bubbleGame_ranking, ], }) export class EndpointsModule {} diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts index bd8aa4af72..f17db41a5d 100644 --- a/packages/backend/src/server/api/endpoints.ts +++ b/packages/backend/src/server/api/endpoints.ts @@ -365,6 +365,8 @@ import * as ep___users_updateMemo from './endpoints/users/update-memo.js'; import * as ep___fetchRss from './endpoints/fetch-rss.js'; import * as ep___fetchExternalResources from './endpoints/fetch-external-resources.js'; import * as ep___retention from './endpoints/retention.js'; +import * as ep___bubbleGame_register from './endpoints/bubble-game/register.js'; +import * as ep___bubbleGame_ranking from './endpoints/bubble-game/ranking.js'; const eps = [ ['admin/meta', ep___admin_meta], @@ -725,6 +727,8 @@ const eps = [ ['fetch-rss', ep___fetchRss], ['fetch-external-resources', ep___fetchExternalResources], ['retention', ep___retention], + ['bubble-game/register', ep___bubbleGame_register], + ['bubble-game/ranking', ep___bubbleGame_ranking], ]; interface IEndpointMetaBase { diff --git a/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts b/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts new file mode 100644 index 0000000000..0cba129a09 --- /dev/null +++ b/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts @@ -0,0 +1,75 @@ +/* + * SPDX-FileCopyrightText: syuilo and other misskey contributors + * SPDX-License-Identifier: AGPL-3.0-only + */ + +import { Inject, Injectable } from '@nestjs/common'; +import { MoreThan } from 'typeorm'; +import { Endpoint } from '@/server/api/endpoint-base.js'; +import type { BubbleGameRecordsRepository } from '@/models/_.js'; +import { DI } from '@/di-symbols.js'; +import { UserEntityService } from '@/core/entities/UserEntityService.js'; + +export const meta = { + tags: [], + + allowGet: true, + cacheSec: 60, + + errors: { + }, + + res: { + type: 'array', + optional: false, nullable: false, + items: { + type: 'object', + optional: false, nullable: false, + properties: { + id: { type: 'string', format: 'misskey:id' }, + score: { type: 'integer' }, + user: { ref: 'UserLite' }, + }, + }, + }, +} as const; + +export const paramDef = { + type: 'object', + properties: { + gameMode: { type: 'string' }, + }, + required: ['gameMode'], +} as const; + +@Injectable() +export default class extends Endpoint { // eslint-disable-line import/no-default-export + constructor( + @Inject(DI.bubbleGameRecordsRepository) + private bubbleGameRecordsRepository: BubbleGameRecordsRepository, + + private userEntityService: UserEntityService, + ) { + super(meta, paramDef, async (ps) => { + const records = await this.bubbleGameRecordsRepository.find({ + where: { + gameMode: ps.gameMode, + seededAt: MoreThan(new Date(Date.now() - 1000 * 60 * 60 * 24 * 7)), + }, + order: { + score: 'DESC', + }, + take: 10, + relations: ['user'], + }); + + const users = await this.userEntityService.packMany(records.map(r => r.user!), null, { detail: false }); + + return records.map(r => ({ + id: r.id, + score: r.score, + user: users.find(u => u.id === r.user!.id), + })); + }); + } +} diff --git a/packages/backend/src/server/api/endpoints/bubble-game/register.ts b/packages/backend/src/server/api/endpoints/bubble-game/register.ts new file mode 100644 index 0000000000..af0f69e4ad --- /dev/null +++ b/packages/backend/src/server/api/endpoints/bubble-game/register.ts @@ -0,0 +1,86 @@ +/* + * SPDX-FileCopyrightText: syuilo and other misskey contributors + * SPDX-License-Identifier: AGPL-3.0-only + */ + +import { Inject, Injectable } from '@nestjs/common'; +import ms from 'ms'; +import { Endpoint } from '@/server/api/endpoint-base.js'; +import { IdService } from '@/core/IdService.js'; +import type { BubbleGameRecordsRepository } from '@/models/_.js'; +import { DI } from '@/di-symbols.js'; +import { ApiError } from '../../error.js'; + +export const meta = { + tags: [], + + requireCredential: true, + + kind: 'write:account', + + limit: { + duration: ms('1hour'), + max: 120, + minInterval: ms('30sec'), + }, + + errors: { + invalidSeed: { + message: 'Provided seed is invalid.', + code: 'INVALID_SEED', + id: 'eb627bc7-574b-4a52-a860-3c3eae772b88', + }, + }, + + res: { + }, +} as const; + +export const paramDef = { + type: 'object', + properties: { + score: { type: 'integer', minimum: 0 }, + seed: { type: 'string', minLength: 1, maxLength: 1024 }, + logs: { type: 'array' }, + gameMode: { type: 'string' }, + gameVersion: { type: 'integer' }, + }, + required: ['score', 'seed', 'logs', 'gameMode', 'gameVersion'], +} as const; + +@Injectable() +export default class extends Endpoint { // eslint-disable-line import/no-default-export + constructor( + @Inject(DI.bubbleGameRecordsRepository) + private bubbleGameRecordsRepository: BubbleGameRecordsRepository, + + private idService: IdService, + ) { + super(meta, paramDef, async (ps, me) => { + const seedDate = new Date(parseInt(ps.seed, 10)); + const now = new Date(); + + // シードが未来なのは通常のプレイではありえないので弾く + if (seedDate.getTime() > now.getTime()) { + throw new ApiError(meta.errors.invalidSeed); + } + + // シードが古すぎる(1時間以上前)のも弾く + if (seedDate.getTime() < now.getTime() - 1000 * 60 * 60) { + throw new ApiError(meta.errors.invalidSeed); + } + + await this.bubbleGameRecordsRepository.insert({ + id: this.idService.gen(now.getTime()), + seed: ps.seed, + seededAt: seedDate, + userId: me.id, + score: ps.score, + logs: ps.logs, + gameMode: ps.gameMode, + gameVersion: ps.gameVersion, + isVerified: false, + }); + }); + } +} diff --git a/packages/frontend/src/pages/drop-and-fusion.game.vue b/packages/frontend/src/pages/drop-and-fusion.game.vue index 3fefb49fae..c222fdeb40 100644 --- a/packages/frontend/src/pages/drop-and-fusion.game.vue +++ b/packages/frontend/src/pages/drop-and-fusion.game.vue @@ -679,9 +679,11 @@ function endReplay() { function exportLog() { if (!logs) return; const data = JSON.stringify({ - seed: seed, - date: new Date().toISOString(), - logs: logs, + v: game.GAME_VERSION, + m: props.gameMode, + s: seed, + d: new Date().toISOString(), + l: DropAndFusionGame.serializeLogs(logs), }); copyToClipboard(data); os.success(); @@ -723,8 +725,15 @@ function getGameImageDriveFile() { const [frame, logo] = images; ctx.fillStyle = '#fff'; ctx.fillRect(0, 0, game.GAME_WIDTH, game.GAME_HEIGHT); + ctx.drawImage(frame, 0, 0, game.GAME_WIDTH, game.GAME_HEIGHT); ctx.drawImage(canvasEl.value!, 0, 0, game.GAME_WIDTH, game.GAME_HEIGHT); + + ctx.fillStyle = '#000'; + ctx.font = '16px bold sans-serif'; + ctx.textBaseline = 'top'; + ctx.fillText(`SCORE: ${score.value.toLocaleString()}`, 10, 10); + ctx.globalAlpha = 0.7; ctx.drawImage(logo, game.GAME_WIDTH * 0.55, 6, game.GAME_WIDTH * 0.45, game.GAME_WIDTH * 0.45 * (logo.height / logo.width)); ctx.globalAlpha = 1; @@ -765,7 +774,7 @@ async function share() { os.post({ initialText: `#BubbleGame MODE: ${props.gameMode} -SCORE: ${score.value} (MAX CHAIN: ${maxCombo.value})`, +SCORE: ${score.value.toLocaleString()} (MAX CHAIN: ${maxCombo.value})`, initialFiles: [file], instant: true, }); @@ -859,6 +868,14 @@ function attachGameEvents() { dropReady.value = false; isGameOver.value = true; + misskeyApi('bubble-game/register', { + seed, + score: score.value, + gameMode: props.gameMode, + gameVersion: game.GAME_VERSION, + logs: DropAndFusionGame.serializeLogs(logs), + }); + if (score.value > (highScore.value ?? 0)) { highScore.value = score.value; diff --git a/packages/frontend/src/pages/drop-and-fusion.vue b/packages/frontend/src/pages/drop-and-fusion.vue index 7bd0eef000..0938ca6a87 100644 --- a/packages/frontend/src/pages/drop-and-fusion.vue +++ b/packages/frontend/src/pages/drop-and-fusion.vue @@ -39,6 +39,21 @@ SPDX-License-Identifier: AGPL-3.0-only +
+
+
+
{{ i18n.ts.ranking }} ({{ gameMode }})
+
+
+ + + {{ r.score.toLocaleString() }} pt +
+
+
{{ i18n.ts.loading }}
+
+
+
{{ i18n.ts._bubbleGame.howToPlay }}
@@ -70,17 +85,23 @@ SPDX-License-Identifier: AGPL-3.0-only