Merge branch 'develop' into mahjong

enhance(dev): Improve mem report (#17119 )
* wip * Update report-backend-memory.yml * Update report-backend-memory.yml * Update measure-memory.mjs * Update report-backend-memory.yml
2026-01-22 18:54:25 +09:00 · 2026-01-22 18:53:53 +09:00 · 2026-01-22 15:01:38 +09:00 · 2026-01-22 14:47:05 +09:00 · 2026-01-22 14:32:57 +09:00 · 2026-01-22 13:14:05 +09:00
210 changed files with 11959 additions and 696 deletions
@@ -15,6 +15,7 @@ on:
      - packages/sw/**
      - packages/misskey-js/**
      - packages/misskey-bubble-game/**
+      - packages/misskey-mahjong/**
      - packages/misskey-reversi/**
      - packages/shared/eslint.config.js
      - .github/workflows/lint.yml
@@ -29,6 +30,7 @@ on:
      - packages/sw/**
      - packages/misskey-js/**
      - packages/misskey-bubble-game/**
+      - packages/misskey-mahjong/**
      - packages/misskey-reversi/**
      - packages/shared/eslint.config.js
      - .github/workflows/lint.yml
@@ -64,6 +66,7 @@ jobs:
        - sw
        - misskey-js
        - misskey-bubble-game
+        - misskey-mahjong
        - misskey-reversi
    env:
      eslint-cache-version: v1
@@ -54,55 +54,110 @@ jobs:
          BASE_MEMORY=$(cat ./artifacts/memory-base.json)
          HEAD_MEMORY=$(cat ./artifacts/memory-head.json)

-          BASE_RSS=$(echo "$BASE_MEMORY" | jq -r '.memory.rss // 0')
-          HEAD_RSS=$(echo "$HEAD_MEMORY" | jq -r '.memory.rss // 0')
+          variation() {
+            calc() {
+              BASE=$(echo "$BASE_MEMORY" | jq -r ".${1}.${2} // 0")
+              HEAD=$(echo "$HEAD_MEMORY" | jq -r ".${1}.${2} // 0")

-          # Calculate difference
-          if [ "$BASE_RSS" -gt 0 ] && [ "$HEAD_RSS" -gt 0 ]; then
-            DIFF=$((HEAD_RSS - BASE_RSS))
-            DIFF_PERCENT=$(echo "scale=2; ($DIFF * 100) / $BASE_RSS" | bc)
+              DIFF=$((HEAD - BASE))
+              if [ "$BASE" -gt 0 ]; then
+                DIFF_PERCENT=$(echo "scale=2; ($DIFF * 100) / $BASE" | bc)
+              else
+                DIFF_PERCENT=0
+              fi

-            # Convert to MB for readability
-            BASE_MB=$(echo "scale=2; $BASE_RSS / 1048576" | bc)
-            HEAD_MB=$(echo "scale=2; $HEAD_RSS / 1048576" | bc)
-            DIFF_MB=$(echo "scale=2; $DIFF / 1048576" | bc)
+              # Convert KB to MB for readability
+              BASE_MB=$(echo "scale=2; $BASE / 1024" | bc)
+              HEAD_MB=$(echo "scale=2; $HEAD / 1024" | bc)
+              DIFF_MB=$(echo "scale=2; $DIFF / 1024" | bc)

-            echo "base_mb=$BASE_MB" >> "$GITHUB_OUTPUT"
-            echo "head_mb=$HEAD_MB" >> "$GITHUB_OUTPUT"
-            echo "diff_mb=$DIFF_MB" >> "$GITHUB_OUTPUT"
-            echo "diff_percent=$DIFF_PERCENT" >> "$GITHUB_OUTPUT"
-            echo "has_data=true" >> "$GITHUB_OUTPUT"
+              JSON=$(jq -c -n \
+                --argjson base "$BASE_MB" \
+                --argjson head "$HEAD_MB" \
+                --argjson diff "$DIFF_MB" \
+                --argjson diff_percent "$DIFF_PERCENT" \
+                '{base: $base, head: $head, diff: $diff, diff_percent: $diff_percent}')

-            # Determine if this is a significant change (more than 5% increase)
-            if [ "$(echo "$DIFF_PERCENT > 5" | bc)" -eq 1 ]; then
-              echo "significant_increase=true" >> "$GITHUB_OUTPUT"
-            else
-              echo "significant_increase=false" >> "$GITHUB_OUTPUT"
-            fi
-          else
-            echo "has_data=false" >> "$GITHUB_OUTPUT"
-          fi
+              echo "$JSON"
+            }
+
+            JSON=$(jq -c -n \
+              --argjson VmRSS "$(calc $1 VmRSS)" \
+              --argjson VmHWM "$(calc $1 VmHWM)" \
+              --argjson VmSize "$(calc $1 VmSize)" \
+              --argjson VmData "$(calc $1 VmData)" \
+              '{VmRSS: $VmRSS, VmHWM: $VmHWM, VmSize: $VmSize, VmData: $VmData}')
+
+            echo "$JSON"
+          }
+
+          JSON=$(jq -c -n \
+            --argjson beforeGc "$(variation beforeGc)" \
+            --argjson afterGc "$(variation afterGc)" \
+            --argjson afterRequest "$(variation afterRequest)" \
+            '{beforeGc: $beforeGc, afterGc: $afterGc, afterRequest: $afterRequest}')
+
+          echo "res=$JSON" >> "$GITHUB_OUTPUT"
      - id: build-comment
        name: Build memory comment
+        env:
+          RES: ${{ steps.compare.outputs.res }}
        run: |
-          HEADER="## Backend Memory Usage Comparison"
+          HEADER="## Backend memory usage comparison"
          FOOTER="[See workflow logs for details](https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID})"

          echo "$HEADER" > ./output.md
          echo >> ./output.md

-          if [ "${{ steps.compare.outputs.has_data }}" == "true" ]; then
-            echo "| Metric | base | head | Diff |" >> ./output.md
-            echo "|--------|------|------|------|" >> ./output.md
-            echo "| RSS | ${{ steps.compare.outputs.base_mb }} MB | ${{ steps.compare.outputs.head_mb }} MB | ${{ steps.compare.outputs.diff_mb }} MB (${{ steps.compare.outputs.diff_percent }}%) |" >> ./output.md
-            echo >> ./output.md
+          table() {
+            echo "| Metric | base (MB) | head (MB) | Diff (MB) | Diff (%) |" >> ./output.md
+            echo "|--------|------:|------:|------:|------:|" >> ./output.md

-            if [ "${{ steps.compare.outputs.significant_increase }}" == "true" ]; then
-              echo "⚠️ **Warning**: Memory usage has increased by more than 5%. Please verify this is not an unintended change." >> ./output.md
-              echo >> ./output.md
-            fi
-          else
-            echo "Could not retrieve memory usage data." >> ./output.md
+            line() {
+              METRIC=$2
+              BASE=$(echo "$RES" | jq -r ".${1}.${2}.base")
+              HEAD=$(echo "$RES" | jq -r ".${1}.${2}.head")
+              DIFF=$(echo "$RES" | jq -r ".${1}.${2}.diff")
+              DIFF_PERCENT=$(echo "$RES" | jq -r ".${1}.${2}.diff_percent")
+
+              if (( $(echo "$DIFF_PERCENT > 0" | bc -l) )); then
+                DIFF="+$DIFF"
+                DIFF_PERCENT="+$DIFF_PERCENT"
+              fi
+
+              # highlight VmRSS
+              if [ "$2" = "VmRSS" ]; then
+                METRIC="**${METRIC}**"
+                BASE="**${BASE}**"
+                HEAD="**${HEAD}**"
+                DIFF="**${DIFF}**"
+                DIFF_PERCENT="**${DIFF_PERCENT}**"
+              fi
+
+              echo "| ${METRIC} | ${BASE} MB | ${HEAD} MB | ${DIFF} MB | ${DIFF_PERCENT}% |" >> ./output.md
+            }
+
+            line $1 VmRSS
+            line $1 VmHWM
+            line $1 VmSize
+            line $1 VmData
+          }
+
+          echo "### Before GC" >> ./output.md
+          table beforeGc
+          echo >> ./output.md
+
+          echo "### After GC" >> ./output.md
+          table afterGc
+          echo >> ./output.md
+
+          echo "### After Request" >> ./output.md
+          table afterRequest
+          echo >> ./output.md
+
+          # Determine if this is a significant change (more than 5% increase)
+          if [ "$(echo "$RES" | jq -r '.afterGc.VmRSS.diff_percent | tonumber > 5')" = "true" ]; then
+            echo "⚠️ **Warning**: Memory usage has increased by more than 5%. Please verify this is not an unintended change." >> ./output.md
            echo >> ./output.md
          fi

@@ -47,7 +47,7 @@ jobs:
    - name: Check pnpm-lock.yaml
      run: git diff --exit-code pnpm-lock.yaml
    - name: Build dependent packages
-      run: pnpm -F misskey-js -F misskey-bubble-game -F misskey-reversi build
+      run: pnpm -F misskey-js -F misskey-bubble-game -F misskey-mahjong -F misskey-reversi build
    - name: Build storybook
      run: pnpm --filter frontend build-storybook
    - name: Publish to Chromatic
@@ -30,6 +30,7 @@ COPY --link ["packages/sw/package.json", "./packages/sw/"]
 COPY --link ["packages/misskey-js/package.json", "./packages/misskey-js/"]
 COPY --link ["packages/misskey-reversi/package.json", "./packages/misskey-reversi/"]
 COPY --link ["packages/misskey-bubble-game/package.json", "./packages/misskey-bubble-game/"]
+COPY --link ["packages/misskey-mahjong/package.json", "./packages/misskey-mahjong/"]

 ARG NODE_ENV=production

@@ -61,6 +62,7 @@ COPY --link ["packages/backend/package.json", "./packages/backend/"]
 COPY --link ["packages/misskey-js/package.json", "./packages/misskey-js/"]
 COPY --link ["packages/misskey-reversi/package.json", "./packages/misskey-reversi/"]
 COPY --link ["packages/misskey-bubble-game/package.json", "./packages/misskey-bubble-game/"]
+COPY --link ["packages/misskey-mahjong/package.json", "./packages/misskey-mahjong/"]

 ARG NODE_ENV=production

@@ -97,10 +99,12 @@ COPY --chown=misskey:misskey --from=target-builder /misskey/packages/backend/nod
 COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-js/node_modules ./packages/misskey-js/node_modules
 COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-reversi/node_modules ./packages/misskey-reversi/node_modules
 COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-bubble-game/node_modules ./packages/misskey-bubble-game/node_modules
+COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-mahjong/node_modules ./packages/misskey-mahjong/node_modules
 COPY --chown=misskey:misskey --from=native-builder /misskey/built ./built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-js/built ./packages/misskey-js/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-reversi/built ./packages/misskey-reversi/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-bubble-game/built ./packages/misskey-bubble-game/built
+COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-mahjong/built ./packages/misskey-mahjong/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/built ./packages/backend/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/src-js ./packages/backend/src-js
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/i18n/built ./packages/i18n/built
@@ -3180,6 +3180,79 @@ _reversi:
  showBoardLabels: "盤面に行・列番号を表示"
  useAvatarAsStone: "石をアイコンにする"

+_mahjong:
+  mahjong: "麻雀"
+  joinRoom: "ルームに参加"
+  createRoom: "ルームを作成"
+  ready: "準備完了"
+  cancelReady: "準備を再開"
+  leave: "退室"
+  addCpu: "CPUを追加"
+  east: "東"
+  south: "南"
+  west: "西"
+  north: "北"
+  dora: "ドラ"
+  redDora: "赤ドラ"
+  fan: "飜"
+  _fanNames:
+    mangan: "満貫"
+    haneman: "跳満"
+    baiman: "倍満"
+    sanbaiman: "三倍満"
+    yakuman: "役満"
+    kazoeyakuman: "数え役満"
+  _yakus:
+    "riichi": "立直"
+    "ippatsu": "一発"
+    "tsumo": "門前清自摸和"
+    "tanyao": "断么"
+    "pinfu": "平和"
+    "iipeko": "一盃口"
+    "field-wind-e": "東"
+    "field-wind-s": "南"
+    "seat-wind-e": "東"
+    "seat-wind-s": "南"
+    "seat-wind-w": "西"
+    "seat-wind-n": "北"
+    "white": "白"
+    "green": "發"
+    "red": "中"
+    "rinshan": "嶺上開花"
+    "chankan": "搶槓"
+    "haitei": "海底摸月"
+    "hotei": "河底撈魚"
+    "sanshoku-dojun": "三色同順"
+    "sanshoku-doko": "三色同刻"
+    "ittsu": "一気通貫"
+    "chanta": "混全帯么九"
+    "chitoitsu": "七対子"
+    "toitoi": "対々"
+    "sananko": "三暗刻"
+    "honroto": "混老頭"
+    "sankantsu": "三槓子"
+    "shosangen": "小三元"
+    "double-riichi": "ダブル立直"
+    "honitsu": "混一色"
+    "junchan": "清全帯么九"
+    "ryampeko": "ニ盃口"
+    "chinitsu": "清一色"
+    "kokushi": "国士無双"
+    "kokushi-13": "国士無双十三面待"
+    "suanko": "四暗刻"
+    "suanko-tanki": "四暗刻単騎待"
+    "daisangen": "大三元"
+    "tsuiso": "字一色"
+    "shosushi": "小四喜"
+    "daisushi": "大四喜"
+    "ryuiso": "緑一色"
+    "chinroto": "清老頭"
+    "sukantsu": "四槓子"
+    "churen": "九蓮宝燈"
+    "churen-9": "九連宝灯九面待"
+    "tenho": "天和"
+    "chiho": "地和"
+
 _offlineScreen:
  title: "オフライン - サーバーに接続できません"
  header: "サーバーに接続できません"
@@ -12,6 +12,7 @@
 		"packages/i18n",
 		"packages/misskey-reversi",
 		"packages/misskey-bubble-game",
+		"packages/misskey-mahjong",
 		"packages/icons-subsetter",
 		"packages/frontend-shared",
 		"packages/frontend-builder",
@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class Mahjong1706234054207 {
+    name = 'Mahjong1706234054207'
+
+    async up(queryRunner) {
+        await queryRunner.query(`CREATE TABLE "mahjong_game" ("id" character varying(32) NOT NULL, "startedAt" TIMESTAMP WITH TIME ZONE, "endedAt" TIMESTAMP WITH TIME ZONE, "user1Id" character varying(32), "user2Id" character varying(32), "user3Id" character varying(32), "user4Id" character varying(32), "isEnded" boolean NOT NULL DEFAULT false, "winnerId" character varying(32), "timeLimitForEachTurn" smallint NOT NULL DEFAULT '90', "logs" jsonb NOT NULL DEFAULT '[]', CONSTRAINT "PK_77db54c0a9785d387e3fbbdd2f0" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`ALTER TABLE "mahjong_game" ADD CONSTRAINT "FK_b98c78761a845b69e6540401264" FOREIGN KEY ("user1Id") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "mahjong_game" ADD CONSTRAINT "FK_f17b0ba519ae28f188a7915ad6f" FOREIGN KEY ("user2Id") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "mahjong_game" ADD CONSTRAINT "FK_64314ffd3cb59475b0d06330058" FOREIGN KEY ("user3Id") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "mahjong_game" ADD CONSTRAINT "FK_58a75f1ea2a810ae3986f72a0e3" FOREIGN KEY ("user4Id") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "mahjong_game" DROP CONSTRAINT "FK_58a75f1ea2a810ae3986f72a0e3"`);
+        await queryRunner.query(`ALTER TABLE "mahjong_game" DROP CONSTRAINT "FK_64314ffd3cb59475b0d06330058"`);
+        await queryRunner.query(`ALTER TABLE "mahjong_game" DROP CONSTRAINT "FK_f17b0ba519ae28f188a7915ad6f"`);
+        await queryRunner.query(`ALTER TABLE "mahjong_game" DROP CONSTRAINT "FK_b98c78761a845b69e6540401264"`);
+        await queryRunner.query(`DROP TABLE "mahjong_game"`);
+    }
+}
@@ -96,7 +96,6 @@
 		"@swc/cli": "0.7.9",
 		"@swc/core": "1.15.7",
 		"@twemoji/parser": "16.0.0",
-		"@types/redis-info": "3.0.3",
 		"accepts": "1.3.8",
 		"ajv": "8.17.1",
 		"archiver": "7.0.1",
@@ -135,6 +134,7 @@
 		"mime-types": "3.0.2",
 		"misskey-js": "workspace:*",
 		"misskey-reversi": "workspace:*",
+		"misskey-mahjong": "workspace:*",
 		"ms": "3.0.0-canary.202508261828",
 		"nanoid": "5.1.6",
 		"nested-property": "4.0.0",
@@ -154,7 +154,6 @@
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
 		"re2": "1.23.0",
-		"redis-info": "3.1.0",
 		"reflect-metadata": "0.2.2",
 		"rename": "1.0.4",
 		"rss-parser": "3.13.0",
@@ -14,24 +14,56 @@ import { fork } from 'node:child_process';
 import { setTimeout } from 'node:timers/promises';
 import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'node:path';
+import * as http from 'node:http';
+import * as fs from 'node:fs/promises';

 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);

+const SAMPLE_COUNT = 3; // Number of samples to measure
 const STARTUP_TIMEOUT = 120000; // 120 seconds timeout for server startup
 const MEMORY_SETTLE_TIME = 10000; // Wait 10 seconds after startup for memory to settle

-async function measureMemory() {
-	const startTime = Date.now();
+const keys = {
+	VmPeak: 0,
+	VmSize: 0,
+	VmHWM: 0,
+	VmRSS: 0,
+	VmData: 0,
+	VmStk: 0,
+	VmExe: 0,
+	VmLib: 0,
+	VmPTE: 0,
+	VmSwap: 0,
+};

+async function getMemoryUsage(pid) {
+	const status = await fs.readFile(`/proc/${pid}/status`, 'utf-8');
+
+	const result = {};
+	for (const key of Object.keys(keys)) {
+		const match = status.match(new RegExp(`${key}:\\s+(\\d+)\\s+kB`));
+		if (match) {
+			result[key] = parseInt(match[1], 10);
+		} else {
+			throw new Error(`Failed to parse ${key} from /proc/${pid}/status`);
+		}
+	}
+
+	return result;
+}
+
+async function measureMemory() {
 	// Start the Misskey backend server using fork to enable IPC
-	const serverProcess = fork(join(__dirname, '../built/boot/entry.js'), [], {
+	const serverProcess = fork(join(__dirname, '../built/boot/entry.js'), ['expose-gc'], {
 		cwd: join(__dirname, '..'),
 		env: {
 			...process.env,
-			NODE_ENV: 'test',
+			NODE_ENV: 'production',
+			MK_DISABLE_CLUSTERING: '1',
 		},
 		stdio: ['pipe', 'pipe', 'pipe', 'ipc'],
+		execArgv: [...process.execArgv, '--expose-gc'],
 	});

 	let serverReady = false;
@@ -57,6 +89,40 @@ async function measureMemory() {
 		process.stderr.write(`[server error] ${err}\n`);
 	});

+	async function triggerGc() {
+		const ok = new Promise((resolve) => {
+			serverProcess.once('message', (message) => {
+				if (message === 'gc ok') resolve();
+			});
+		});
+
+		serverProcess.send('gc');
+
+		await ok;
+
+		await setTimeout(1000);
+	}
+
+	function createRequest() {
+		return new Promise((resolve, reject) => {
+			const req = http.request({
+				host: 'localhost',
+				port: 61812,
+				path: '/api/meta',
+				method: 'POST',
+			}, (res) => {
+				res.on('data', () => { });
+				res.on('end', () => {
+					resolve();
+				});
+			});
+			req.on('error', (err) => {
+				reject(err);
+			});
+			req.end();
+		});
+	}
+
 	// Wait for server to be ready or timeout
 	const startupStartTime = Date.now();
 	while (!serverReady) {
@@ -73,46 +139,23 @@ async function measureMemory() {
 	// Wait for memory to settle
 	await setTimeout(MEMORY_SETTLE_TIME);

-	// Get memory usage from the server process via /proc
 	const pid = serverProcess.pid;
-	let memoryInfo;

-	try {
-		const fs = await import('node:fs/promises');
+	const beforeGc = await getMemoryUsage(pid);

-		// Read /proc/[pid]/status for detailed memory info
-		const status = await fs.readFile(`/proc/${pid}/status`, 'utf-8');
-		const vmRssMatch = status.match(/VmRSS:\s+(\d+)\s+kB/);
-		const vmDataMatch = status.match(/VmData:\s+(\d+)\s+kB/);
-		const vmSizeMatch = status.match(/VmSize:\s+(\d+)\s+kB/);
+	await triggerGc();

-		memoryInfo = {
-			rss: vmRssMatch ? parseInt(vmRssMatch[1], 10) * 1024 : null,
-			heapUsed: vmDataMatch ? parseInt(vmDataMatch[1], 10) * 1024 : null,
-			vmSize: vmSizeMatch ? parseInt(vmSizeMatch[1], 10) * 1024 : null,
-		};
-	} catch (err) {
-		// Fallback: use ps command
-		process.stderr.write(`Warning: Could not read /proc/${pid}/status: ${err}\n`);
+	const afterGc = await getMemoryUsage(pid);

-		const { execSync } = await import('node:child_process');
-		try {
-			const ps = execSync(`ps -o rss= -p ${pid}`, { encoding: 'utf-8' });
-			const rssKb = parseInt(ps.trim(), 10);
-			memoryInfo = {
-				rss: rssKb * 1024,
-				heapUsed: null,
-				vmSize: null,
-			};
-		} catch {
-			memoryInfo = {
-				rss: null,
-				heapUsed: null,
-				vmSize: null,
-				error: 'Could not measure memory',
-			};
-		}
-	}
+	// create some http requests to simulate load
+	const REQUEST_COUNT = 10;
+	await Promise.all(
+		Array.from({ length: REQUEST_COUNT }).map(() => createRequest()),
+	);
+
+	await triggerGc();
+
+	const afterRequest = await getMemoryUsage(pid);

 	// Stop the server
 	serverProcess.kill('SIGTERM');
@@ -135,15 +178,51 @@ async function measureMemory() {

 	const result = {
 		timestamp: new Date().toISOString(),
-		startupTimeMs: startupTime,
-		memory: memoryInfo,
+		beforeGc,
+		afterGc,
+		afterRequest,
+	};
+
+	return result;
+}
+
+async function main() {
+	// 直列の方が時間的に分散されて正確そうだから直列でやる
+	const results = [];
+	for (let i = 0; i < SAMPLE_COUNT; i++) {
+		const res = await measureMemory();
+		results.push(res);
+	}
+
+	// Calculate averages
+	const beforeGc = structuredClone(keys);
+	const afterGc = structuredClone(keys);
+	const afterRequest = structuredClone(keys);
+	for (const res of results) {
+		for (const key of Object.keys(keys)) {
+			beforeGc[key] += res.beforeGc[key];
+			afterGc[key] += res.afterGc[key];
+			afterRequest[key] += res.afterRequest[key];
+		}
+	}
+	for (const key of Object.keys(keys)) {
+		beforeGc[key] = Math.round(beforeGc[key] / SAMPLE_COUNT);
+		afterGc[key] = Math.round(afterGc[key] / SAMPLE_COUNT);
+		afterRequest[key] = Math.round(afterRequest[key] / SAMPLE_COUNT);
+	}
+
+	const result = {
+		timestamp: new Date().toISOString(),
+		beforeGc,
+		afterGc,
+		afterRequest,
 	};

 	// Output as JSON to stdout
 	console.log(JSON.stringify(result, null, 2));
 }

-measureMemory().catch((err) => {
+main().catch((err) => {
 	console.error(JSON.stringify({
 		error: err.message,
 		timestamp: new Date().toISOString(),
@@ -86,6 +86,18 @@ if (!envOption.disableClustering) {
 	ev.mount();
 }

+process.on('message', msg => {
+	if (msg === 'gc') {
+		if (global.gc != null) {
+			logger.info('Manual GC triggered');
+			global.gc();
+			if (process.send != null) process.send('gc ok');
+		} else {
+			logger.warn('Manual GC requested but gc is not available. Start the process with --expose-gc to enable this feature.');
+		}
+	}
+});
+
 readyRef.value = true;

 // ユニットテスト時にMisskeyが子プロセスで起動された時のため
@@ -78,6 +78,7 @@ import { ChannelFollowingService } from './ChannelFollowingService.js';
 import { ChatService } from './ChatService.js';
 import { RegistryApiService } from './RegistryApiService.js';
 import { ReversiService } from './ReversiService.js';
+import { MahjongService } from './MahjongService.js';
 import { PageService } from './PageService.js';

 import { ChartLoggerService } from './chart/ChartLoggerService.js';
@@ -228,6 +229,7 @@ const $ChannelMutingService: Provider = { provide: 'ChannelMutingService', useEx
 const $ChatService: Provider = { provide: 'ChatService', useExisting: ChatService };
 const $RegistryApiService: Provider = { provide: 'RegistryApiService', useExisting: RegistryApiService };
 const $ReversiService: Provider = { provide: 'ReversiService', useExisting: ReversiService };
+const $MahjongService: Provider = { provide: 'MahjongService', useExisting: MahjongService };
 const $PageService: Provider = { provide: 'PageService', useExisting: PageService };

 const $ChartLoggerService: Provider = { provide: 'ChartLoggerService', useExisting: ChartLoggerService };
@@ -381,6 +383,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		ChatService,
 		RegistryApiService,
 		ReversiService,
+		MahjongService,
 		PageService,

 		ChartLoggerService,
@@ -531,6 +534,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$ChatService,
 		$RegistryApiService,
 		$ReversiService,
+		$MahjongService,
 		$PageService,

 		$ChartLoggerService,
@@ -681,6 +685,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		ChatService,
 		RegistryApiService,
 		ReversiService,
+		MahjongService,
 		PageService,

 		FederationChart,
@@ -829,6 +834,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$ChatService,
 		$RegistryApiService,
 		$ReversiService,
+		$MahjongService,
 		$PageService,

 		$FederationChart,
@@ -6,6 +6,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
 import * as Reversi from 'misskey-reversi';
+import * as Mmj from 'misskey-mahjong';
 import type { MiChannel } from '@/models/Channel.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiUserProfile } from '@/models/UserProfile.js';
@@ -201,6 +202,78 @@ export interface ReversiGameEventTypes {
 		userId: MiUser['id'];
 	};
 }
+
+export interface MahjongRoomEventTypes {
+	joined: {
+		index: number;
+		user: Packed<'UserLite'> | null;
+	};
+	changeReadyStates: {
+		user1: boolean;
+		user2: boolean;
+		user3: boolean;
+		user4: boolean;
+	};
+	started: {
+		room: Packed<'MahjongRoomDetailed'>;
+	};
+	nextKyoku: {
+		room: Packed<'MahjongRoomDetailed'>;
+	};
+	tsumo: {
+		house: Mmj.House;
+		tile: number;
+	};
+	dahai: {
+		house: Mmj.House;
+		tile: number;
+		riichi: boolean;
+	};
+	dahaiAndTsumo: {
+		dahaiHouse: Mmj.House;
+		dahaiTile: number;
+		tsumoTile: number;
+		riichi: boolean;
+	};
+	ponned: {
+		caller: Mmj.House;
+		callee: Mmj.House;
+		tiles: readonly [number, number, number];
+	};
+	kanned: {
+		caller: Mmj.House;
+		callee: Mmj.House;
+		tiles: readonly [number, number, number, number];
+		rinsyan: number;
+	};
+	ciied: {
+		caller: Mmj.House;
+		callee: Mmj.House;
+		tiles: readonly [number, number, number];
+	};
+	ronned: {
+		callers: Mmj.House[];
+		callee: Mmj.House;
+		handTiles: Record<Mmj.House, number[]>;
+	};
+	ryuukyoku: object;
+	ankanned: {
+		house: Mmj.House;
+		tiles: readonly [number, number, number, number];
+		rinsyan: number;
+	};
+	kakanned: {
+		house: Mmj.House;
+		tiles: readonly [number, number, number, number];
+		rinsyan: number;
+		from: Mmj.House;
+	};
+	tsumoHora: {
+		house: Mmj.House;
+		handTiles: number[];
+		tsumoTile: number;
+	};
+}
 //#endregion

 // 辞書(interface or type)から{ type, body }ユニオンを定義
@@ -320,6 +393,10 @@ export type GlobalEvents = {
 		name: `reversiGameStream:${MiReversiGame['id']}`;
 		payload: EventTypesToEventPayload<ReversiGameEventTypes>;
 	};
+	mahjongRoom: {
+		name: `mahjongRoomStream:${string}`;
+		payload: EventUnionFromDictionary<SerializedAll<MahjongRoomEventTypes>>;
+	};
 };

 // API event definitions
@@ -429,4 +506,9 @@ export class GlobalEventService {
 	public publishReversiGameStream<K extends keyof ReversiGameEventTypes>(gameId: MiReversiGame['id'], type: K, value?: ReversiGameEventTypes[K]): void {
 		this.publish(`reversiGameStream:${gameId}`, type, typeof value === 'undefined' ? null : value);
 	}
+
+	@bindThis
+	public publishMahjongRoomStream<K extends keyof MahjongRoomEventTypes>(roomId: string, type: K, value?: MahjongRoomEventTypes[K]): void {
+		this.publish(`mahjongRoomStream:${roomId}`, type, typeof value === 'undefined' ? null : value);
+	}
 }
@@ -0,0 +1,734 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import * as Redis from 'ioredis';
+import { ModuleRef } from '@nestjs/core';
+import { IsNull, LessThan, MoreThan } from 'typeorm';
+import * as Mmj from 'misskey-mahjong';
+import type {
+	MiMahjongGame,
+	MahjongGamesRepository,
+} from '@/models/_.js';
+import type { MiUser } from '@/models/User.js';
+import { DI } from '@/di-symbols.js';
+import { bindThis } from '@/decorators.js';
+import { CacheService } from '@/core/CacheService.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { IdService } from '@/core/IdService.js';
+import { NotificationService } from '@/core/NotificationService.js';
+import { Serialized } from '@/types.js';
+import { Packed } from '@/misc/json-schema.js';
+import { ReversiGameEntityService } from './entities/ReversiGameEntityService.js';
+import type { OnApplicationShutdown, OnModuleInit } from '@nestjs/common';
+
+const INVITATION_TIMEOUT_MS = 1000 * 20; // 20sec
+const CALL_AND_RON_ASKING_TIMEOUT_MS = 1000 * 10; // 10sec
+const TURN_TIMEOUT_MS = 1000 * 30; // 30sec
+const NEXT_KYOKU_CONFIRMATION_TIMEOUT_MS = 1000 * 15; // 15sec
+
+type Room = {
+	id: string;
+	user1Id: MiUser['id'];
+	user2Id: MiUser['id'] | null;
+	user3Id: MiUser['id'] | null;
+	user4Id: MiUser['id'] | null;
+	user1: Packed<'UserLite'> | null;
+	user2: Packed<'UserLite'> | null;
+	user3: Packed<'UserLite'> | null;
+	user4: Packed<'UserLite'> | null;
+	user1Ai?: boolean;
+	user2Ai?: boolean;
+	user3Ai?: boolean;
+	user4Ai?: boolean;
+	user1Ready: boolean;
+	user2Ready: boolean;
+	user3Ready: boolean;
+	user4Ready: boolean;
+	user1Offline?: boolean;
+	user2Offline?: boolean;
+	user3Offline?: boolean;
+	user4Offline?: boolean;
+	isStarted?: boolean;
+	timeLimitForEachTurn: number;
+
+	gameState?: Mmj.MasterState;
+};
+
+type CallingAnswers = {
+	pon: null | boolean;
+	cii: null | false | 'x__' | '_x_' | '__x';
+	kan: null | boolean;
+	ron: {
+		e: null | boolean;
+		s: null | boolean;
+		w: null | boolean;
+		n: null | boolean;
+	};
+};
+
+type NextKyokuConfirmation = {
+	user1: boolean;
+	user2: boolean;
+	user3: boolean;
+	user4: boolean;
+};
+
+function getUserIdOfHouse(room: Room, mj: Mmj.MasterGameEngine, house: Mmj.House): MiUser['id'] {
+	return mj.user1House === house ? room.user1Id : mj.user2House === house ? room.user2Id : mj.user3House === house ? room.user3Id : room.user4Id;
+}
+
+function getHouseOfUserId(room: Room, mj: Mmj.MasterGameEngine, userId: MiUser['id']): Mmj.House {
+	return userId === room.user1Id ? mj.user1House : userId === room.user2Id ? mj.user2House : userId === room.user3Id ? mj.user3House : mj.user4House;
+}
+
+@Injectable()
+export class MahjongService implements OnApplicationShutdown, OnModuleInit {
+	private notificationService: NotificationService;
+
+	constructor(
+		private moduleRef: ModuleRef,
+
+		@Inject(DI.redis)
+		private redisClient: Redis.Redis,
+
+		//@Inject(DI.mahjongGamesRepository)
+		//private mahjongGamesRepository: MahjongGamesRepository,
+
+		private cacheService: CacheService,
+		private userEntityService: UserEntityService,
+		private globalEventService: GlobalEventService,
+		private reversiGameEntityService: ReversiGameEntityService,
+		private idService: IdService,
+	) {
+	}
+	async onModuleInit() {
+		this.notificationService = this.moduleRef.get(NotificationService.name);
+	}
+
+	@bindThis
+	private async saveRoom(room: Room) {
+		await this.redisClient.set(`mahjong:room:${room.id}`, JSON.stringify(room), 'EX', 60 * 30);
+	}
+
+	@bindThis
+	public async createRoom(user: MiUser): Promise<Room> {
+		const room: Room = {
+			id: this.idService.gen(),
+			user1Id: user.id,
+			user2Id: null,
+			user3Id: null,
+			user4Id: null,
+			user1: await this.userEntityService.pack(user),
+			user1Ready: false,
+			user2Ready: false,
+			user3Ready: false,
+			user4Ready: false,
+			timeLimitForEachTurn: 30,
+		};
+		await this.saveRoom(room);
+		return room;
+	}
+
+	@bindThis
+	public async getRoom(id: Room['id']): Promise<Room | null> {
+		const room = await this.redisClient.get(`mahjong:room:${id}`);
+		if (!room) return null;
+		const parsed = JSON.parse(room);
+		return {
+			...parsed,
+		};
+	}
+
+	@bindThis
+	public async joinRoom(roomId: Room['id'], user: MiUser): Promise<Room | null> {
+		const room = await this.getRoom(roomId);
+		if (!room) return null;
+		if (room.user1Id === user.id) return room;
+		if (room.user2Id === user.id) return room;
+		if (room.user3Id === user.id) return room;
+		if (room.user4Id === user.id) return room;
+		if (room.user2Id === null) {
+			room.user2Id = user.id;
+			room.user2 = await this.userEntityService.pack(user);
+			await this.saveRoom(room);
+			this.globalEventService.publishMahjongRoomStream(room.id, 'joined', { index: 2, user: room.user2 });
+			return room;
+		}
+		if (room.user3Id === null) {
+			room.user3Id = user.id;
+			room.user3 = await this.userEntityService.pack(user);
+			await this.saveRoom(room);
+			this.globalEventService.publishMahjongRoomStream(room.id, 'joined', { index: 3, user: room.user3 });
+			return room;
+		}
+		if (room.user4Id === null) {
+			room.user4Id = user.id;
+			room.user4 = await this.userEntityService.pack(user);
+			await this.saveRoom(room);
+			this.globalEventService.publishMahjongRoomStream(room.id, 'joined', { index: 4, user: room.user4 });
+			return room;
+		}
+
+		return null;
+	}
+
+	@bindThis
+	public async addAi(roomId: Room['id'], user: MiUser): Promise<Room | null> {
+		const room = await this.getRoom(roomId);
+		if (!room) return null;
+		if (room.user1Id !== user.id) throw new Error('access denied');
+
+		if (room.user2Id == null && !room.user2Ai) {
+			room.user2Ai = true;
+			room.user2Ready = true;
+			await this.saveRoom(room);
+			this.globalEventService.publishMahjongRoomStream(room.id, 'joined', { index: 2, user: null });
+			return room;
+		}
+		if (room.user3Id == null && !room.user3Ai) {
+			room.user3Ai = true;
+			room.user3Ready = true;
+			await this.saveRoom(room);
+			this.globalEventService.publishMahjongRoomStream(room.id, 'joined', { index: 3, user: null });
+			return room;
+		}
+		if (room.user4Id == null && !room.user4Ai) {
+			room.user4Ai = true;
+			room.user4Ready = true;
+			await this.saveRoom(room);
+			this.globalEventService.publishMahjongRoomStream(room.id, 'joined', { index: 4, user: null });
+			return room;
+		}
+
+		return null;
+	}
+
+	@bindThis
+	public async leaveRoom(roomId: Room['id'], user: MiUser): Promise<Room | null> {
+		const room = await this.getRoom(roomId);
+		if (!room) return null;
+		if (room.user1Id === user.id) {
+			room.user1Id = null;
+			room.user1 = null;
+			await this.saveRoom(room);
+			return room;
+		}
+		if (room.user2Id === user.id) {
+			room.user2Id = null;
+			room.user2 = null;
+			await this.saveRoom(room);
+			return room;
+		}
+		if (room.user3Id === user.id) {
+			room.user3Id = null;
+			room.user3 = null;
+			await this.saveRoom(room);
+			return room;
+		}
+		if (room.user4Id === user.id) {
+			room.user4Id = null;
+			room.user4 = null;
+			await this.saveRoom(room);
+			return room;
+		}
+		return null;
+	}
+
+	@bindThis
+	public async changeReadyState(roomId: Room['id'], user: MiUser, ready: boolean): Promise<void> {
+		const room = await this.getRoom(roomId);
+		if (!room) return;
+
+		if (room.user1Id === user.id) {
+			room.user1Ready = ready;
+			await this.saveRoom(room);
+		}
+		if (room.user2Id === user.id) {
+			room.user2Ready = ready;
+			await this.saveRoom(room);
+		}
+		if (room.user3Id === user.id) {
+			room.user3Ready = ready;
+			await this.saveRoom(room);
+		}
+		if (room.user4Id === user.id) {
+			room.user4Ready = ready;
+			await this.saveRoom(room);
+		}
+
+		this.globalEventService.publishMahjongRoomStream(room.id, 'changeReadyStates', {
+			user1: room.user1Ready,
+			user2: room.user2Ready,
+			user3: room.user3Ready,
+			user4: room.user4Ready,
+		});
+
+		if (room.user1Ready && room.user2Ready && room.user3Ready && room.user4Ready) {
+			await this.startGame(room);
+		}
+	}
+
+	@bindThis
+	public async startGame(room: Room) {
+		if (!room.user1Ready || !room.user2Ready || !room.user3Ready || !room.user4Ready) {
+			throw new Error('Not ready');
+		}
+
+		room.gameState = Mmj.MasterGameEngine.createInitialState();
+		room.isStarted = true;
+		await this.saveRoom(room);
+
+		this.globalEventService.publishMahjongRoomStream(room.id, 'started', { room: room });
+
+		this.kyokuStarted(room);
+	}
+
+	@bindThis
+	private kyokuStarted(room: Room) {
+		const mj = new Mmj.MasterGameEngine(room.gameState);
+
+		this.waitForTurn(room, mj.turn, mj);
+	}
+
+	@bindThis
+	private async answer(room: Room, mj: Mmj.MasterGameEngine, answers: CallingAnswers) {
+		const res = mj.commit_resolveCallingInterruption({
+			pon: answers.pon ?? false,
+			cii: answers.cii ?? false,
+			kan: answers.kan ?? false,
+			ron: [...(answers.ron.e ? ['e'] : []), ...(answers.ron.s ? ['s'] : []), ...(answers.ron.w ? ['w'] : []), ...(answers.ron.n ? ['n'] : [])] as Mmj.House[],
+		});
+		room.gameState = mj.getState();
+		await this.saveRoom(room);
+
+		switch (res.type) {
+			case 'tsumo':
+				this.globalEventService.publishMahjongRoomStream(room.id, 'tsumo', { house: res.house, tile: res.tile });
+				this.waitForTurn(room, res.turn, mj);
+				break;
+			case 'ponned':
+				this.globalEventService.publishMahjongRoomStream(room.id, 'ponned', { caller: res.caller, callee: res.callee, tiles: res.tiles });
+				this.waitForTurn(room, res.turn, mj);
+				break;
+			case 'kanned':
+				this.globalEventService.publishMahjongRoomStream(room.id, 'kanned', { caller: res.caller, callee: res.callee, tiles: res.tiles, rinsyan: res.rinsyan });
+				this.waitForTurn(room, res.turn, mj);
+				break;
+			case 'ciied':
+				this.globalEventService.publishMahjongRoomStream(room.id, 'ciied', { caller: res.caller, callee: res.callee, tiles: res.tiles });
+				this.waitForTurn(room, res.turn, mj);
+				break;
+			case 'ronned':
+				this.globalEventService.publishMahjongRoomStream(room.id, 'ronned', {
+					callers: res.callers,
+					callee: res.callee,
+					handTiles: {
+						e: mj.handTiles.e,
+						s: mj.handTiles.s,
+						w: mj.handTiles.w,
+						n: mj.handTiles.n,
+					},
+				});
+				this.endKyoku(room, mj);
+				break;
+			case 'ryuukyoku':
+				this.globalEventService.publishMahjongRoomStream(room.id, 'ryuukyoku', {
+				});
+				this.endKyoku(room, mj);
+				break;
+		}
+	}
+
+	@bindThis
+	private async endKyoku(room: Room, mj: Mmj.MasterGameEngine) {
+		const confirmation: NextKyokuConfirmation = {
+			user1: false,
+			user2: false,
+			user3: false,
+			user4: false,
+		};
+		this.redisClient.set(`mahjong:gameNextKyokuConfirmation:${room.id}`, JSON.stringify(confirmation));
+		const waitingStartedAt = Date.now();
+		const interval = setInterval(async () => {
+			const confirmationRaw = await this.redisClient.get(`mahjong:gameNextKyokuConfirmation:${room.id}`);
+			if (confirmationRaw == null) {
+				clearInterval(interval);
+				return;
+			}
+			const confirmation = JSON.parse(confirmationRaw) as NextKyokuConfirmation;
+			const allConfirmed = confirmation.user1 && confirmation.user2 && confirmation.user3 && confirmation.user4;
+			if (allConfirmed || (Date.now() - waitingStartedAt > NEXT_KYOKU_CONFIRMATION_TIMEOUT_MS)) {
+				await this.redisClient.del(`mahjong:gameNextKyokuConfirmation:${room.id}`);
+				clearInterval(interval);
+				this.nextKyoku(room, mj);
+			}
+		}, 2000);
+	}
+
+	@bindThis
+	private async nextKyoku(room: Room, mj: Mmj.MasterGameEngine) {
+		const res = mj.commit_nextKyoku();
+		room.gameState = mj.getState();
+		await this.saveRoom(room);
+		this.globalEventService.publishMahjongRoomStream(room.id, 'nextKyoku', {
+			room: room,
+		});
+		this.kyokuStarted(room);
+	}
+
+	@bindThis
+	private async dahai(room: Room, mj: Mmj.MasterGameEngine, house: Mmj.House, tile: Mmj.TileId, riichi = false) {
+		const res = mj.commit_dahai(house, tile, riichi);
+		room.gameState = mj.getState();
+		await this.saveRoom(room);
+
+		const aiHouses = [[1, room.user1Ai], [2, room.user2Ai], [3, room.user3Ai], [4, room.user4Ai]].filter(([id, ai]) => ai).map(([id, ai]) => mj.getHouse(id));
+
+		if (res.ryuukyoku) {
+			this.endKyoku(room, mj);
+			this.globalEventService.publishMahjongRoomStream(room.id, 'ryuukyoku', {
+			});
+		} else if (res.asking) {
+			const answers: CallingAnswers = {
+				pon: null,
+				cii: null,
+				kan: null,
+				ron: {
+					e: null,
+					s: null,
+					w: null,
+					n: null,
+				},
+			};
+
+			// リーチ中はポン、チー、カンできない
+			if (res.canPonHouse != null && mj.riichis[res.canPonHouse]) {
+				answers.pon = false;
+			}
+			if (res.canCiiHouse != null && mj.riichis[res.canCiiHouse]) {
+				answers.cii = false;
+			}
+			if (res.canKanHouse != null && mj.riichis[res.canKanHouse]) {
+				answers.kan = false;
+			}
+
+			if (aiHouses.includes(res.canPonHouse)) {
+				// TODO: ちゃんと思考するようにする
+				answers.pon = Math.random() < 0.25;
+			}
+			if (aiHouses.includes(res.canCiiHouse)) {
+				// TODO: ちゃんと思考するようにする
+				//answers.cii = Math.random() < 0.25;
+				answers.cii = false;
+			}
+			if (aiHouses.includes(res.canKanHouse)) {
+				// TODO: ちゃんと思考するようにする
+				answers.kan = Math.random() < 0.25;
+			}
+			for (const h of res.canRonHouses) {
+				if (aiHouses.includes(h)) {
+				// TODO: ちゃんと思考するようにする
+				}
+			}
+
+			this.redisClient.set(`mahjong:gameCallingAsking:${room.id}`, JSON.stringify(answers));
+			const waitingStartedAt = Date.now();
+			const interval = setInterval(async () => {
+				const current = await this.redisClient.get(`mahjong:gameCallingAsking:${room.id}`);
+				if (current == null) throw new Error('arienai (gameCallingAsking)');
+				const currentAnswers = JSON.parse(current) as CallingAnswers;
+				const allAnswered = !(
+					(res.canPonHouse != null && currentAnswers.pon == null) ||
+					(res.canCiiHouse != null && currentAnswers.cii == null) ||
+					(res.canKanHouse != null && currentAnswers.kan == null) ||
+					(res.canRonHouses.includes('e') && currentAnswers.ron.e == null) ||
+					(res.canRonHouses.includes('s') && currentAnswers.ron.s == null) ||
+					(res.canRonHouses.includes('w') && currentAnswers.ron.w == null) ||
+					(res.canRonHouses.includes('n') && currentAnswers.ron.n == null)
+				);
+				if (allAnswered || (Date.now() - waitingStartedAt > CALL_AND_RON_ASKING_TIMEOUT_MS)) {
+					console.log(allAnswered ? 'ask all answerd' : 'ask timeout');
+					await this.redisClient.del(`mahjong:gameCallingAsking:${room.id}`);
+					clearInterval(interval);
+					this.answer(room, mj, currentAnswers);
+					return;
+				}
+			}, 1000);
+
+			this.globalEventService.publishMahjongRoomStream(room.id, 'dahai', { house: house, tile, riichi });
+		} else {
+			this.globalEventService.publishMahjongRoomStream(room.id, 'dahaiAndTsumo', { dahaiHouse: house, dahaiTile: tile, tsumoTile: res.tsumoTile, riichi });
+
+			this.waitForTurn(room, res.next, mj);
+		}
+	}
+
+	@bindThis
+	public async confirmNextKyoku(roomId: Room['id'], user: MiUser) {
+		const room = await this.getRoom(roomId);
+		if (room == null) return;
+		if (room.gameState == null) return;
+
+		// TODO: この辺の処理はアトミックに行いたいけどJSONサポートはRedis Stackが必要
+		const confirmationRaw = await this.redisClient.get(`mahjong:gameNextKyokuConfirmation:${room.id}`);
+		if (confirmationRaw == null) return;
+		const confirmation = JSON.parse(confirmationRaw) as NextKyokuConfirmation;
+		if (user.id === room.user1Id) confirmation.user1 = true;
+		if (user.id === room.user2Id) confirmation.user2 = true;
+		if (user.id === room.user3Id) confirmation.user3 = true;
+		if (user.id === room.user4Id) confirmation.user4 = true;
+		await this.redisClient.set(`mahjong:gameNextKyokuConfirmation:${room.id}`, JSON.stringify(confirmation));
+	}
+
+	@bindThis
+	public async commit_dahai(roomId: MiMahjongGame['id'], user: MiUser, tile: Mmj.TileId, riichi = false) {
+		const room = await this.getRoom(roomId);
+		if (room == null) return;
+		if (room.gameState == null) return;
+
+		const mj = new Mmj.MasterGameEngine(room.gameState);
+		const myHouse = getHouseOfUserId(room, mj, user.id);
+
+		await this.clearTurnWaitingTimer(room.id);
+
+		await this.dahai(room, mj, myHouse, tile, riichi);
+	}
+
+	@bindThis
+	public async commit_ankan(roomId: MiMahjongGame['id'], user: MiUser, tile: Mmj.TileId) {
+		const room = await this.getRoom(roomId);
+		if (room == null) return;
+		if (room.gameState == null) return;
+
+		const mj = new Mmj.MasterGameEngine(room.gameState);
+		const myHouse = getHouseOfUserId(room, mj, user.id);
+
+		await this.clearTurnWaitingTimer(room.id);
+
+		const res = mj.commit_ankan(myHouse, tile);
+		room.gameState = mj.getState();
+		await this.saveRoom(room);
+
+		this.globalEventService.publishMahjongRoomStream(room.id, 'ankanned', { house: myHouse, tiles: res.tiles, rinsyan: res.rinsyan });
+
+		this.waitForTurn(room, myHouse, mj);
+	}
+
+	@bindThis
+	public async commit_kakan(roomId: MiMahjongGame['id'], user: MiUser, tile: Mmj.TileId) {
+		const room = await this.getRoom(roomId);
+		if (room == null) return;
+		if (room.gameState == null) return;
+
+		const mj = new Mmj.MasterGameEngine(room.gameState);
+		const myHouse = getHouseOfUserId(room, mj, user.id);
+
+		await this.clearTurnWaitingTimer(room.id);
+
+		const res = mj.commit_kakan(myHouse, tile);
+		room.gameState = mj.getState();
+		await this.saveRoom(room);
+
+		this.globalEventService.publishMahjongRoomStream(room.id, 'kakanned', { house: myHouse, tiles: res.tiles, rinsyan: res.rinsyan, from: res.from });
+	}
+
+	@bindThis
+	public async commit_tsumoHora(roomId: MiMahjongGame['id'], user: MiUser) {
+		const room = await this.getRoom(roomId);
+		if (room == null) return;
+		if (room.gameState == null) return;
+
+		const mj = new Mmj.MasterGameEngine(room.gameState);
+		const myHouse = getHouseOfUserId(room, mj, user.id);
+
+		await this.clearTurnWaitingTimer(room.id);
+
+		const res = mj.commit_tsumoHora(myHouse);
+		room.gameState = mj.getState();
+		await this.saveRoom(room);
+
+		this.globalEventService.publishMahjongRoomStream(room.id, 'tsumoHora', { house: myHouse, handTiles: res.handTiles, tsumoTile: res.tsumoTile });
+
+		this.endKyoku(room, mj);
+	}
+
+	@bindThis
+	public async commit_ronHora(roomId: MiMahjongGame['id'], user: MiUser) {
+		const room = await this.getRoom(roomId);
+		if (room == null) return;
+		if (room.gameState == null) return;
+
+		const mj = new Mmj.MasterGameEngine(room.gameState);
+		const myHouse = getHouseOfUserId(room, mj, user.id);
+
+		// TODO: 自分に回答する権利がある状態かバリデーション
+
+		// TODO: この辺の処理はアトミックに行いたいけどJSONサポートはRedis Stackが必要
+		const current = await this.redisClient.get(`mahjong:gameCallingAsking:${room.id}`);
+		if (current == null) throw new Error('no asking found');
+		const currentAnswers = JSON.parse(current) as CallingAnswers;
+		currentAnswers.ron[myHouse] = true;
+		await this.redisClient.set(`mahjong:gameCallingAsking:${room.id}`, JSON.stringify(currentAnswers));
+	}
+
+	@bindThis
+	public async commit_pon(roomId: MiMahjongGame['id'], user: MiUser) {
+		const room = await this.getRoom(roomId);
+		if (room == null) return;
+		if (room.gameState == null) return;
+
+		// TODO: 自分に回答する権利がある状態かバリデーション
+
+		// TODO: この辺の処理はアトミックに行いたいけどJSONサポートはRedis Stackが必要
+		const current = await this.redisClient.get(`mahjong:gameCallingAsking:${room.id}`);
+		if (current == null) throw new Error('no asking found');
+		const currentAnswers = JSON.parse(current) as CallingAnswers;
+		currentAnswers.pon = true;
+		await this.redisClient.set(`mahjong:gameCallingAsking:${room.id}`, JSON.stringify(currentAnswers));
+	}
+
+	@bindThis
+	public async commit_kan(roomId: MiMahjongGame['id'], user: MiUser) {
+		const room = await this.getRoom(roomId);
+		if (room == null) return;
+		if (room.gameState == null) return;
+
+		// TODO: 自分に回答する権利がある状態かバリデーション
+
+		// TODO: この辺の処理はアトミックに行いたいけどJSONサポートはRedis Stackが必要
+		const current = await this.redisClient.get(`mahjong:gameCallingAsking:${room.id}`);
+		if (current == null) throw new Error('no asking found');
+		const currentAnswers = JSON.parse(current) as CallingAnswers;
+		currentAnswers.kan = true;
+		await this.redisClient.set(`mahjong:gameCallingAsking:${room.id}`, JSON.stringify(currentAnswers));
+	}
+
+	@bindThis
+	public async commit_cii(roomId: MiMahjongGame['id'], user: MiUser, pattern: 'x__' | '_x_' | '__x') {
+		const room = await this.getRoom(roomId);
+		if (room == null) return;
+		if (room.gameState == null) return;
+
+		// TODO: 自分に回答する権利がある状態かバリデーション
+
+		// TODO: この辺の処理はアトミックに行いたいけどJSONサポートはRedis Stackが必要
+		const current = await this.redisClient.get(`mahjong:gameCallingAsking:${room.id}`);
+		if (current == null) throw new Error('no asking found');
+		const currentAnswers = JSON.parse(current) as CallingAnswers;
+		currentAnswers.cii = pattern;
+		await this.redisClient.set(`mahjong:gameCallingAsking:${room.id}`, JSON.stringify(currentAnswers));
+	}
+
+	@bindThis
+	public async commit_nop(roomId: MiMahjongGame['id'], user: MiUser) {
+		const room = await this.getRoom(roomId);
+		if (room == null) return;
+		if (room.gameState == null) return;
+
+		const mj = new Mmj.MasterGameEngine(room.gameState);
+		const myHouse = getHouseOfUserId(room, mj, user.id);
+
+		// TODO: この辺の処理はアトミックに行いたいけどJSONサポートはRedis Stackが必要
+		const current = await this.redisClient.get(`mahjong:gameCallingAsking:${room.id}`);
+		if (current == null) throw new Error('no asking found');
+		const currentAnswers = JSON.parse(current) as CallingAnswers;
+		if (mj.askings.pon?.caller === myHouse) currentAnswers.pon = false;
+		if (mj.askings.cii?.caller === myHouse) currentAnswers.cii = false;
+		if (mj.askings.kan?.caller === myHouse) currentAnswers.kan = false;
+		if (mj.askings.ron != null && mj.askings.ron.callers.includes(myHouse)) currentAnswers.ron[myHouse] = false;
+		await this.redisClient.set(`mahjong:gameCallingAsking:${room.id}`, JSON.stringify(currentAnswers));
+	}
+
+	/**
+	 * プレイヤーの行動(打牌、加槓、暗槓、ツモ和了)を待つ
+	 * 制限時間が過ぎたらツモ切り
+	 * NOTE: 時間切れチェックが行われたときにタイミングによっては次のwaitingが始まっている場合があることを考慮し、Setに一意のIDを格納する構造としている
+	 * @param room
+	 * @param house
+	 * @param mj
+	 */
+	@bindThis
+	private async waitForTurn(room: Room, house: Mmj.House, mj: Mmj.MasterGameEngine) {
+		const aiHouses = [[1, room.user1Ai], [2, room.user2Ai], [3, room.user3Ai], [4, room.user4Ai]].filter(([id, ai]) => ai).map(([id, ai]) => mj.getHouse(id));
+
+		if (mj.riichis[house]) {
+			// リーチ時はアガリ牌でない限りツモ切り
+			if (!Mmj.isAgarikei(mj.handTileTypes[house])) {
+				setTimeout(() => {
+					this.dahai(room, mj, house, mj.handTiles[house].at(-1));
+				}, 500);
+				return;
+			}
+		}
+
+		if (aiHouses.includes(house)) {
+			setTimeout(() => {
+				this.dahai(room, mj, house, mj.handTiles[house].at(-1));
+			}, 500);
+			return;
+		}
+
+		const id = Math.random().toString(36).slice(2);
+		console.log('waitForTurn', house, id);
+		this.redisClient.sadd(`mahjong:gameTurnWaiting:${room.id}`, id);
+		const waitingStartedAt = Date.now();
+		const interval = setInterval(async () => {
+			const waiting = await this.redisClient.sismember(`mahjong:gameTurnWaiting:${room.id}`, id);
+			if (waiting === 0) {
+				clearInterval(interval);
+				return;
+			}
+			if (Date.now() - waitingStartedAt > TURN_TIMEOUT_MS) {
+				await this.redisClient.srem(`mahjong:gameTurnWaiting:${room.id}`, id);
+				console.log('turn timeout', house, id);
+				clearInterval(interval);
+				const handTiles = mj.handTiles[house];
+				await this.dahai(room, mj, house, handTiles.at(-1));
+				return;
+			}
+		}, 2000);
+	}
+
+	/**
+	 * プレイヤーが行動(打牌、加槓、暗槓、ツモ和了)したら呼ぶ
+	 * @param roomId
+	 */
+	@bindThis
+	private async clearTurnWaitingTimer(roomId: Room['id']) {
+		await this.redisClient.del(`mahjong:gameTurnWaiting:${roomId}`);
+	}
+
+	@bindThis
+	public packState(room: Room, me: MiUser) {
+		const mj = new Mmj.MasterGameEngine(room.gameState);
+		const myIndex = room.user1Id === me.id ? 1 : room.user2Id === me.id ? 2 : room.user3Id === me.id ? 3 : 4;
+		return mj.createPlayerState(myIndex);
+	}
+
+	@bindThis
+	public async packRoom(room: Room, me: MiUser) {
+		if (room.gameState) {
+			return {
+				...room,
+				gameState: this.packState(room, me),
+			};
+		} else {
+			return {
+				...room,
+			};
+		}
+	}
+
+	@bindThis
+	public dispose(): void {
+	}
+
+	@bindThis
+	public onApplicationShutdown(signal?: string | undefined): void {
+		this.dispose();
+	}
+}
@@ -6,7 +6,6 @@
 import { randomUUID } from 'node:crypto';
 import { Inject, Injectable } from '@nestjs/common';
 import { MetricsTime, type JobType } from 'bullmq';
-import { parse as parseRedisInfo } from 'redis-info';
 import type { IActivity } from '@/core/activitypub/type.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
 import type { MiWebhook, WebhookEventTypes } from '@/models/Webhook.js';
@@ -86,6 +85,19 @@ const REPEATABLE_SYSTEM_JOB_DEF = [{
 	pattern: '0 4 * * *',
 }];

+function parseRedisInfo(infoText: string): Record<string, string> {
+	const fields = infoText
+		.split('\n')
+		.filter(line => line.length > 0 && !line.startsWith('#'))
+		.map(line => line.trim().split(':'));
+
+	const result: Record<string, string> = {};
+	for (const [key, value] of fields) {
+		result[key] = value;
+	}
+	return result;
+}
+
@Injectable()
 export class QueueService {
 	constructor(
@@ -890,7 +902,7 @@ export class QueueService {
 			},
 			db: {
 				version: db.redis_version,
-				mode: db.redis_mode,
+				mode: db.redis_mode as 'cluster' | 'standalone' | 'sentinel',
 				runId: db.run_id,
 				processId: db.process_id,
 				port: parseInt(db.tcp_port),
@@ -14,6 +14,10 @@ import { bindThis } from '@/decorators.js';
 import { IdService } from '@/core/IdService.js';
 import { UserEntityService } from './UserEntityService.js';

+function assertBw(bw: string): bw is Packed<'ReversiGameDetailed'>['bw'] {
+	return ['random', '1', '2'].includes(bw);
+}
+
@Injectable()
 export class ReversiGameEntityService {
 	constructor(
@@ -58,7 +62,7 @@ export class ReversiGameEntityService {
 			surrenderedUserId: game.surrenderedUserId,
 			timeoutUserId: game.timeoutUserId,
 			black: game.black,
-			bw: game.bw,
+			bw: assertBw(game.bw) ? game.bw : 'random',
 			isLlotheo: game.isLlotheo,
 			canPutEverywhere: game.canPutEverywhere,
 			loopedBoard: game.loopedBoard,
@@ -116,7 +120,7 @@ export class ReversiGameEntityService {
 			surrenderedUserId: game.surrenderedUserId,
 			timeoutUserId: game.timeoutUserId,
 			black: game.black,
-			bw: game.bw,
+			bw: assertBw(game.bw) ? game.bw : 'random',
 			isLlotheo: game.isLlotheo,
 			canPutEverywhere: game.canPutEverywhere,
 			loopedBoard: game.loopedBoard,
@@ -90,6 +90,7 @@ export const DI = {
 	chatRoomInvitationsRepository: Symbol('chatRoomInvitationsRepository'),
 	bubbleGameRecordsRepository: Symbol('bubbleGameRecordsRepository'),
 	reversiGamesRepository: Symbol('reversiGamesRepository'),
+	mahjongGamesRepository: Symbol('mahjongGamesRepository'),
 	noteDraftsRepository: Symbol('noteDraftsRepository'),
 	//#endregion
 };
@@ -64,6 +64,7 @@ import {
 	packedMetaDetailedOnlySchema,
 	packedMetaDetailedSchema,
 	packedMetaLiteSchema,
+	packedMetaClientOptionsSchema,
 } from '@/models/json-schema/meta.js';
 import { packedUserWebhookSchema } from '@/models/json-schema/user-webhook.js';
 import { packedSystemWebhookSchema } from '@/models/json-schema/system-webhook.js';
@@ -72,6 +73,7 @@ import { packedChatMessageSchema, packedChatMessageLiteSchema, packedChatMessage
 import { packedChatRoomSchema } from '@/models/json-schema/chat-room.js';
 import { packedChatRoomInvitationSchema } from '@/models/json-schema/chat-room-invitation.js';
 import { packedChatRoomMembershipSchema } from '@/models/json-schema/chat-room-membership.js';
+import { packedMahjongRoomDetailedSchema } from '@/models/json-schema/mahjong-room.js';
 import { packedAchievementNameSchema, packedAchievementSchema } from '@/models/json-schema/achievement.js';
 import { packedNoteDraftSchema } from '@/models/json-schema/note-draft.js';

@@ -135,6 +137,7 @@ export const refs = {
 	MetaLite: packedMetaLiteSchema,
 	MetaDetailedOnly: packedMetaDetailedOnlySchema,
 	MetaDetailed: packedMetaDetailedSchema,
+	MetaClientOptions: packedMetaClientOptionsSchema,
 	UserWebhook: packedUserWebhookSchema,
 	SystemWebhook: packedSystemWebhookSchema,
 	AbuseReportNotificationRecipient: packedAbuseReportNotificationRecipientSchema,
@@ -145,6 +148,7 @@ export const refs = {
 	ChatRoom: packedChatRoomSchema,
 	ChatRoomInvitation: packedChatRoomInvitationSchema,
 	ChatRoomMembership: packedChatRoomMembershipSchema,
+	MahjongRoomDetailed: packedMahjongRoomDetailedSchema,
 };

 export type Packed<x extends keyof typeof refs> = SchemaType<typeof refs[x]>;
@@ -0,0 +1,94 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * 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('mahjong_game')
+export class MiMahjongGame {
+	@PrimaryColumn(id())
+	public id: string;
+
+	@Column('timestamp with time zone', {
+		nullable: true,
+	})
+	public startedAt: Date | null;
+
+	@Column('timestamp with time zone', {
+		nullable: true,
+	})
+	public endedAt: Date | null;
+
+	@Column({
+		...id(),
+		nullable: true,
+	})
+	public user1Id: MiUser['id'] | null;
+
+	@ManyToOne(type => MiUser, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public user1: MiUser | null;
+
+	@Column({
+		...id(),
+		nullable: true,
+	})
+	public user2Id: MiUser['id'] | null;
+
+	@ManyToOne(type => MiUser, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public user2: MiUser | null;
+
+	@Column({
+		...id(),
+		nullable: true,
+	})
+	public user3Id: MiUser['id'] | null;
+
+	@ManyToOne(type => MiUser, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public user3: MiUser | null;
+
+	@Column({
+		...id(),
+		nullable: true,
+	})
+	public user4Id: MiUser['id'] | null;
+
+	@ManyToOne(type => MiUser, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public user4: MiUser | null;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public isEnded: boolean;
+
+	@Column({
+		...id(),
+		nullable: true,
+	})
+	public winnerId: MiUser['id'] | null;
+
+	// in sec
+	@Column('smallint', {
+		default: 90,
+	})
+	public timeLimitForEachTurn: number;
+
+	@Column('jsonb', {
+		default: [],
+	})
+	public logs: number[][];
+}
@@ -725,7 +725,11 @@ export class MiMeta {
 	@Column('jsonb', {
 		default: { },
 	})
-	public clientOptions: Record<string, any>;
+	public clientOptions: {
+		entrancePageStyle: 'classic' | 'simple';
+		showTimelineForVisitor: boolean;
+		showActivitiesForVisitor: boolean;
+	};
 }

 export type SoftwareSuspension = {
@@ -84,6 +84,7 @@ import {
 	MiChatRoomMembership,
 	MiChatRoomInvitation,
 	MiChatApproval,
+	MiMahjongGame,
 } from './_.js';
 import type { Provider } from '@nestjs/common';
 import type { DataSource } from 'typeorm';
@@ -544,6 +545,12 @@ const $reversiGamesRepository: Provider = {
 	inject: [DI.db],
 };

+const $mahjongGamesRepository: Provider = {
+	provide: DI.mahjongGamesRepository,
+	useFactory: (db: DataSource) => db.getRepository(MiMahjongGame),
+	inject: [DI.db],
+};
+
@Module({
 	imports: [],
 	providers: [
@@ -623,6 +630,7 @@ const $reversiGamesRepository: Provider = {
 		$chatApprovalsRepository,
 		$bubbleGameRecordsRepository,
 		$reversiGamesRepository,
+		$mahjongGamesRepository,
 	],
 	exports: [
 		$usersRepository,
@@ -701,6 +709,7 @@ const $reversiGamesRepository: Provider = {
 		$chatApprovalsRepository,
 		$bubbleGameRecordsRepository,
 		$reversiGamesRepository,
+		$mahjongGamesRepository,
 	],
 })
 export class RepositoryModule {
@@ -43,6 +43,7 @@ import { MiGalleryLike } from '@/models/GalleryLike.js';
 import { MiGalleryPost } from '@/models/GalleryPost.js';
 import { MiHashtag } from '@/models/Hashtag.js';
 import { MiInstance } from '@/models/Instance.js';
+import { MiMahjongGame } from '@/models/MahjongGame.js';
 import { MiMeta } from '@/models/Meta.js';
 import { MiModerationLog } from '@/models/ModerationLog.js';
 import { MiMuting } from '@/models/Muting.js';
@@ -173,6 +174,7 @@ export {
 	MiChatApproval,
 	MiBubbleGameRecord,
 	MiReversiGame,
+	MiMahjongGame,
 };

 export type AbuseUserReportsRepository = Repository<MiAbuseUserReport> & MiRepository<MiAbuseUserReport>;
@@ -253,3 +255,4 @@ export type ChatRoomInvitationsRepository = Repository<MiChatRoomInvitation> & M
 export type ChatApprovalsRepository = Repository<MiChatApproval> & MiRepository<MiChatApproval>;
 export type BubbleGameRecordsRepository = Repository<MiBubbleGameRecord> & MiRepository<MiBubbleGameRecord>;
 export type ReversiGamesRepository = Repository<MiReversiGame> & MiRepository<MiReversiGame>;
+export type MahjongGamesRepository = Repository<MiMahjongGame> & MiRepository<MiMahjongGame>;
@@ -0,0 +1,114 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export const packedMahjongRoomDetailedSchema = {
+	type: 'object',
+	properties: {
+		id: {
+			type: 'string',
+			optional: false, nullable: false,
+			format: 'id',
+		},
+		createdAt: {
+			type: 'string',
+			optional: false, nullable: false,
+			format: 'date-time',
+		},
+		startedAt: {
+			type: 'string',
+			optional: false, nullable: true,
+			format: 'date-time',
+		},
+		endedAt: {
+			type: 'string',
+			optional: false, nullable: true,
+			format: 'date-time',
+		},
+		isStarted: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		isEnded: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		user1Id: {
+			type: 'string',
+			optional: false, nullable: false,
+			format: 'id',
+		},
+		user2Id: {
+			type: 'string',
+			optional: false, nullable: true,
+			format: 'id',
+		},
+		user3Id: {
+			type: 'string',
+			optional: false, nullable: true,
+			format: 'id',
+		},
+		user4Id: {
+			type: 'string',
+			optional: false, nullable: true,
+			format: 'id',
+		},
+		user1: {
+			type: 'object',
+			optional: false, nullable: true,
+			ref: 'User',
+		},
+		user2: {
+			type: 'object',
+			optional: false, nullable: true,
+			ref: 'User',
+		},
+		user3: {
+			type: 'object',
+			optional: false, nullable: true,
+			ref: 'User',
+		},
+		user4: {
+			type: 'object',
+			optional: false, nullable: true,
+			ref: 'User',
+		},
+		user1Ai: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		user2Ai: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		user3Ai: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		user4Ai: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		user1Ready: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		user2Ready: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		user3Ready: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		user4Ready: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		timeLimitForEachTurn: {
+			type: 'number',
+			optional: false, nullable: false,
+		},
+	},
+} as const;
@@ -72,8 +72,7 @@ export const packedMetaLiteSchema = {
 			optional: false, nullable: true,
 		},
 		clientOptions: {
-			type: 'object',
-			optional: false, nullable: false,
+			ref: 'MetaClientOptions',
 		},
 		disableRegistration: {
 			type: 'boolean',
@@ -397,3 +396,23 @@ export const packedMetaDetailedSchema = {
 		},
 	],
 } as const;
+
+export const packedMetaClientOptionsSchema = {
+	type: 'object',
+	optional: false, nullable: false,
+	properties: {
+		entrancePageStyle: {
+			type: 'string',
+			enum: ['classic', 'simple'],
+			optional: false, nullable: false,
+		},
+		showTimelineForVisitor: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		showActivitiesForVisitor: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+	},
+} as const;
@@ -81,6 +81,7 @@ export const packedReversiGameLiteSchema = {
 		bw: {
 			type: 'string',
 			optional: false, nullable: false,
+			enum: ['random', '1', '2'],
 		},
 		noIrregularRules: {
 			type: 'boolean',
@@ -199,6 +200,7 @@ export const packedReversiGameDetailedSchema = {
 		bw: {
 			type: 'string',
 			optional: false, nullable: false,
+			enum: ['random', '1', '2'],
 		},
 		noIrregularRules: {
 			type: 'boolean',
@@ -85,6 +85,7 @@ import { MiChatRoomMembership } from '@/models/ChatRoomMembership.js';
 import { MiChatRoomInvitation } from '@/models/ChatRoomInvitation.js';
 import { MiBubbleGameRecord } from '@/models/BubbleGameRecord.js';
 import { MiReversiGame } from '@/models/ReversiGame.js';
+import { MiMahjongGame } from '@/models/MahjongGame.js';
 import { MiChatApproval } from '@/models/ChatApproval.js';
 import { MiSystemAccount } from '@/models/SystemAccount.js';

@@ -254,6 +255,7 @@ export const entities = [
 	MiChatApproval,
 	MiBubbleGameRecord,
 	MiReversiGame,
+	MiMahjongGame,
 	...charts,
 ];

@@ -6,6 +6,7 @@
 import { Module } from '@nestjs/common';
 import { EndpointsModule } from '@/server/api/EndpointsModule.js';
 import { CoreModule } from '@/core/CoreModule.js';
+import MainStreamConnection from '@/server/api/stream/Connection.js';
 import { ApiCallService } from './api/ApiCallService.js';
 import { FileServerService } from './FileServerService.js';
 import { HealthServerService } from './HealthServerService.js';
@@ -30,7 +31,6 @@ import { UrlPreviewService } from './web/UrlPreviewService.js';
 import { ClientLoggerService } from './web/ClientLoggerService.js';
 import { OAuth2ProviderService } from './oauth/OAuth2ProviderService.js';

-import MainStreamConnection from '@/server/api/stream/Connection.js';
 import { MainChannel } from './api/stream/channels/main.js';
 import { AdminChannel } from './api/stream/channels/admin.js';
 import { AntennaChannel } from './api/stream/channels/antenna.js';
@@ -49,6 +49,7 @@ import { ChatUserChannel } from './api/stream/channels/chat-user.js';
 import { ChatRoomChannel } from './api/stream/channels/chat-room.js';
 import { ReversiChannel } from './api/stream/channels/reversi.js';
 import { ReversiGameChannel } from './api/stream/channels/reversi-game.js';
+import { MahjongRoomChannel } from './api/stream/channels/mahjong-room.js';
 import { SigninWithPasskeyApiService } from './api/SigninWithPasskeyApiService.js';

@Module({
@@ -92,6 +93,7 @@ import { SigninWithPasskeyApiService } from './api/SigninWithPasskeyApiService.j
 		ChatRoomChannel,
 		ReversiChannel,
 		ReversiGameChannel,
+		MahjongRoomChannel,
 		HomeTimelineChannel,
 		HybridTimelineChannel,
 		LocalTimelineChannel,
@@ -301,6 +301,12 @@ export * as 'invite/create' from './endpoints/invite/create.js';
 export * as 'invite/delete' from './endpoints/invite/delete.js';
 export * as 'invite/limit' from './endpoints/invite/limit.js';
 export * as 'invite/list' from './endpoints/invite/list.js';
+export * as 'mahjong/cancel-match' from './endpoints/mahjong/cancel-match.js';
+export * as 'mahjong/create-room' from './endpoints/mahjong/create-room.js';
+export * as 'mahjong/games' from './endpoints/mahjong/games.js';
+export * as 'mahjong/join-room' from './endpoints/mahjong/join-room.js';
+export * as 'mahjong/show-room' from './endpoints/mahjong/show-room.js';
+export * as 'mahjong/verify' from './endpoints/mahjong/verify.js';
 export * as 'meta' from './endpoints/meta.js';
 export * as 'miauth/gen-token' from './endpoints/miauth/gen-token.js';
 export * as 'mute/create' from './endpoints/mute/create.js';
@@ -428,8 +428,7 @@ export const meta = {
 				optional: false, nullable: true,
 			},
 			clientOptions: {
-				type: 'object',
-				optional: false, nullable: false,
+				ref: 'MetaClientOptions',
 			},
 			description: {
 				type: 'string',
@@ -3,7 +3,8 @@
 * SPDX-License-Identifier: AGPL-3.0-only
 */

-import { Injectable } from '@nestjs/common';
+import { Injectable, Inject } from '@nestjs/common';
+import { DI } from '@/di-symbols.js';
 import type { MiMeta } from '@/models/Meta.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
@@ -67,7 +68,14 @@ export const paramDef = {
 		description: { type: 'string', nullable: true },
 		defaultLightTheme: { type: 'string', nullable: true },
 		defaultDarkTheme: { type: 'string', nullable: true },
-		clientOptions: { type: 'object', nullable: false },
+		clientOptions: {
+			type: 'object', nullable: false,
+			properties: {
+				entrancePageStyle: { type: 'string', nullable: false, enum: ['classic', 'simple'] },
+				showTimelineForVisitor: { type: 'boolean', nullable: false },
+				showActivitiesForVisitor: { type: 'boolean', nullable: false },
+			},
+		},
 		cacheRemoteFiles: { type: 'boolean' },
 		cacheRemoteSensitiveFiles: { type: 'boolean' },
 		emailRequiredForSignup: { type: 'boolean' },
@@ -217,6 +225,9 @@ export const paramDef = {
@Injectable()
 export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
 	constructor(
+		@Inject(DI.meta)
+		private serverSettings: MiMeta,
+
 		private metaService: MetaService,
 		private moderationLogService: ModerationLogService,
 	) {
@@ -329,7 +340,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}

 			if (ps.clientOptions !== undefined) {
-				set.clientOptions = ps.clientOptions;
+				set.clientOptions = {
+					...serverSettings.clientOptions,
+					...ps.clientOptions,
+				};
 			}

 			if (ps.cacheRemoteFiles !== undefined) {
@@ -0,0 +1,41 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ReversiService } from '@/core/ReversiService.js';
+
+export const meta = {
+	requireCredential: true,
+
+	kind: 'write:account',
+
+	errors: {
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		userId: { type: 'string', format: 'misskey:id', nullable: true },
+	},
+	required: [],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private reversiService: ReversiService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			if (ps.userId) {
+				await this.reversiService.matchSpecificUserCancel(me, ps.userId);
+				return;
+			} else {
+				await this.reversiService.matchAnyUserCancel(me);
+			}
+		});
+	}
+}
@@ -0,0 +1,44 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { MahjongService } from '@/core/MahjongService.js';
+import { ApiError } from '../../error.js';
+
+export const meta = {
+	requireCredential: true,
+
+	kind: 'write:account',
+
+	errors: {
+
+	},
+
+	res: {
+		type: 'object',
+		optional: false, nullable: false,
+		ref: 'MahjongRoomDetailed',
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+	},
+	required: [],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private mahjongService: MahjongService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			const room = await this.mahjongService.createRoom(me);
+			return await this.mahjongService.packRoom(room, me);
+		});
+	}
+}
@@ -0,0 +1,64 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { Brackets } from 'typeorm';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ReversiGameEntityService } from '@/core/entities/ReversiGameEntityService.js';
+import { DI } from '@/di-symbols.js';
+import type { ReversiGamesRepository } from '@/models/_.js';
+import { QueryService } from '@/core/QueryService.js';
+
+export const meta = {
+	requireCredential: false,
+
+	res: {
+		type: 'array',
+		optional: false, nullable: false,
+		items: { ref: 'ReversiGameLite' },
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
+		sinceId: { type: 'string', format: 'misskey:id' },
+		untilId: { type: 'string', format: 'misskey:id' },
+		my: { type: 'boolean', default: false },
+	},
+	required: [],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		@Inject(DI.reversiGamesRepository)
+		private reversiGamesRepository: ReversiGamesRepository,
+
+		private reversiGameEntityService: ReversiGameEntityService,
+		private queryService: QueryService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			const query = this.queryService.makePaginationQuery(this.reversiGamesRepository.createQueryBuilder('game'), ps.sinceId, ps.untilId)
+				.innerJoinAndSelect('game.user1', 'user1')
+				.innerJoinAndSelect('game.user2', 'user2');
+
+			if (ps.my && me) {
+				query.andWhere(new Brackets(qb => {
+					qb
+						.where('game.user1Id = :userId', { userId: me.id })
+						.orWhere('game.user2Id = :userId', { userId: me.id });
+				}));
+			} else {
+				query.andWhere('game.isStarted = TRUE');
+			}
+
+			const games = await query.take(ps.limit).getMany();
+
+			return await this.reversiGameEntityService.packLiteMany(games);
+		});
+	}
+}
@@ -0,0 +1,56 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { MahjongService } from '@/core/MahjongService.js';
+import { ApiError } from '../../error.js';
+
+export const meta = {
+	requireCredential: true,
+
+	kind: 'write:account',
+
+	errors: {
+		noSuchRoom: {
+			message: 'No such room.',
+			code: 'NO_SUCH_ROOM',
+			id: '370e42b0-2a67-4306-9328-51c5f568f110',
+		},
+	},
+
+	res: {
+		type: 'object',
+		optional: false, nullable: false,
+		ref: 'MahjongRoomDetailed',
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		roomId: { type: 'string', format: 'misskey:id' },
+	},
+	required: ['roomId'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private mahjongService: MahjongService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			const room = await this.mahjongService.getRoom(ps.roomId);
+
+			if (room == null) {
+				throw new ApiError(meta.errors.noSuchRoom);
+			}
+
+			await this.mahjongService.joinRoom(room.id, me);
+
+			return await this.mahjongService.packRoom(room, me);
+		});
+	}
+}
@@ -0,0 +1,54 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { MahjongService } from '@/core/MahjongService.js';
+import { ApiError } from '../../error.js';
+
+export const meta = {
+	requireCredential: true,
+
+	kind: 'read:account',
+
+	errors: {
+		noSuchRoom: {
+			message: 'No such room.',
+			code: 'NO_SUCH_ROOM',
+			id: 'd77df68f-06f3-492b-9078-e6f72f4acf23',
+		},
+	},
+
+	res: {
+		type: 'object',
+		optional: false, nullable: false,
+		ref: 'MahjongRoomDetailed',
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		roomId: { type: 'string', format: 'misskey:id' },
+	},
+	required: ['roomId'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private mahjongService: MahjongService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			const room = await this.mahjongService.getRoom(ps.roomId);
+
+			if (room == null) {
+				throw new ApiError(meta.errors.noSuchRoom);
+			}
+
+			return await this.mahjongService.packRoom(room, me);
+		});
+	}
+}
@@ -0,0 +1,64 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ReversiService } from '@/core/ReversiService.js';
+import { ReversiGameEntityService } from '@/core/entities/ReversiGameEntityService.js';
+import { ApiError } from '../../error.js';
+
+export const meta = {
+	errors: {
+		noSuchGame: {
+			message: 'No such game.',
+			code: 'NO_SUCH_GAME',
+			id: '8fb05624-b525-43dd-90f7-511852bdfeee',
+		},
+	},
+
+	res: {
+		type: 'object',
+		optional: false, nullable: false,
+		properties: {
+			desynced: { type: 'boolean' },
+			game: {
+				type: 'object',
+				optional: true, nullable: true,
+				ref: 'ReversiGameDetailed',
+			},
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		gameId: { type: 'string', format: 'misskey:id' },
+		crc32: { type: 'string' },
+	},
+	required: ['gameId', 'crc32'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private reversiService: ReversiService,
+		private reversiGameEntityService: ReversiGameEntityService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			const game = await this.reversiService.checkCrc(ps.gameId, ps.crc32);
+			if (game) {
+				return {
+					desynced: true,
+					game: await this.reversiGameEntityService.packDetail(game),
+				};
+			} else {
+				return {
+					desynced: false,
+				};
+			}
+		});
+	}
+}
@@ -4,6 +4,7 @@
 */

 import { Injectable } from '@nestjs/common';
+import { bindThis } from '@/decorators.js';
 import { HybridTimelineChannel } from './channels/hybrid-timeline.js';
 import { LocalTimelineChannel } from './channels/local-timeline.js';
 import { HomeTimelineChannel } from './channels/home-timeline.js';
@@ -22,8 +23,8 @@ import { ChatUserChannel } from './channels/chat-user.js';
 import { ChatRoomChannel } from './channels/chat-room.js';
 import { ReversiChannel } from './channels/reversi.js';
 import { ReversiGameChannel } from './channels/reversi-game.js';
+import { MahjongRoomChannel } from './channels/mahjong-room.js';
 import type { ChannelConstructor } from './channel.js';
-import { bindThis } from '@/decorators.js';

@Injectable()
 export class ChannelsService {
@@ -52,6 +53,7 @@ export class ChannelsService {
 			case 'chatRoom': return ChatRoomChannel;
 			case 'reversi': return ReversiChannel;
 			case 'reversiGame': return ReversiGameChannel;
+			case 'mahjongRoom': return MahjongRoomChannel;

 			default:
 				throw new Error(`no such channel: ${name}`);
@@ -0,0 +1,185 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable, Scope } from '@nestjs/common';
+import { REQUEST } from '@nestjs/core';
+import { bindThis } from '@/decorators.js';
+import { MahjongService } from '@/core/MahjongService.js';
+import { GlobalEvents } from '@/core/GlobalEventService.js';
+import Channel, { type ChannelRequest } from '../channel.js';
+
+@Injectable({ scope: Scope.TRANSIENT })
+export class MahjongRoomChannel extends Channel {
+	public readonly chName = 'mahjongRoom';
+	public static shouldShare = false;
+	public static requireCredential = true as const;
+	public static kind = 'read:account';
+	private roomId: string | null = null;
+
+	constructor(
+		@Inject(REQUEST)
+		request: ChannelRequest,
+
+		private mahjongService: MahjongService,
+	) {
+		super(request);
+	}
+
+	@bindThis
+	public async init(params: any) {
+		this.roomId = params.roomId as string;
+
+		this.subscriber.on(`mahjongRoomStream:${this.roomId}`, this.onMahjongRoomStreamMessage);
+	}
+
+	@bindThis
+	private async onMahjongRoomStreamMessage(message: GlobalEvents['mahjongRoom']['payload']) {
+		if (message.type === 'started') {
+			const packed = await this.mahjongService.packRoom(message.body.room, this.user!);
+			this.send('started', {
+				room: packed,
+			});
+		} else if (message.type === 'nextKyoku') {
+			const packed = this.mahjongService.packState(message.body.room, this.user!);
+			this.send('nextKyoku', {
+				state: packed,
+			});
+		} else {
+			this.send(message.type, message.body);
+		}
+	}
+
+	@bindThis
+	public onMessage(type: string, body: any) {
+		switch (type) {
+			case 'ready': this.ready(body); break;
+			case 'updateSettings': this.updateSettings(body.key, body.value); break;
+			case 'addAi': this.addAi(); break;
+			case 'leave': this.leaveRoom(); break;
+			case 'confirmNextKyoku': this.confirmNextKyoku(); break;
+			case 'dahai': this.dahai(body.tile, body.riichi); break;
+			case 'tsumoHora': this.tsumoHora(); break;
+			case 'ronHora': this.ronHora(); break;
+			case 'pon': this.pon(); break;
+			case 'cii': this.cii(body.pattern); break;
+			case 'kan': this.kan(); break;
+			case 'ankan': this.ankan(body.tile); break;
+			case 'kakan': this.kakan(body.tile); break;
+			case 'nop': this.nop(); break;
+			case 'claimTimeIsUp': this.claimTimeIsUp(); break;
+		}
+	}
+
+	@bindThis
+	private async updateSettings(key: string, value: any) {
+		if (this.user == null) return;
+
+		this.mahjongService.updateSettings(this.roomId!, this.user, key, value);
+	}
+
+	@bindThis
+	private async ready(ready: boolean) {
+		if (this.user == null) return;
+
+		this.mahjongService.changeReadyState(this.roomId!, this.user, ready);
+	}
+
+	@bindThis
+	private async confirmNextKyoku() {
+		if (this.user == null) return;
+
+		this.mahjongService.confirmNextKyoku(this.roomId!, this.user);
+	}
+
+	@bindThis
+	private async addAi() {
+		if (this.user == null) return;
+
+		this.mahjongService.addAi(this.roomId!, this.user);
+	}
+
+	@bindThis
+	private async leaveRoom() {
+		if (this.user == null) return;
+
+		this.mahjongService.leaveRoom(this.roomId!, this.user);
+	}
+
+	@bindThis
+	private async dahai(tile: number, riichi = false) {
+		if (this.user == null) return;
+
+		this.mahjongService.commit_dahai(this.roomId!, this.user, tile, riichi);
+	}
+
+	@bindThis
+	private async tsumoHora() {
+		if (this.user == null) return;
+
+		this.mahjongService.commit_tsumoHora(this.roomId!, this.user);
+	}
+
+	@bindThis
+	private async ronHora() {
+		if (this.user == null) return;
+
+		this.mahjongService.commit_ronHora(this.roomId!, this.user);
+	}
+
+	@bindThis
+	private async pon() {
+		if (this.user == null) return;
+
+		this.mahjongService.commit_pon(this.roomId!, this.user);
+	}
+
+	@bindThis
+	private async cii(pattern: string) {
+		if (this.user == null) return;
+
+		this.mahjongService.commit_cii(this.roomId!, this.user, pattern);
+	}
+
+	@bindThis
+	private async kan() {
+		if (this.user == null) return;
+
+		this.mahjongService.commit_kan(this.roomId!, this.user);
+	}
+
+	@bindThis
+	private async ankan(tile: number) {
+		if (this.user == null) return;
+
+		this.mahjongService.commit_ankan(this.roomId!, this.user, tile);
+	}
+
+	@bindThis
+	private async kakan(tile: number) {
+		if (this.user == null) return;
+
+		this.mahjongService.commit_kakan(this.roomId!, this.user, tile);
+	}
+
+	@bindThis
+	private async nop() {
+		if (this.user == null) return;
+
+		this.mahjongService.commit_nop(this.roomId!, this.user);
+	}
+
+	@bindThis
+	private async claimTimeIsUp() {
+		if (this.user == null) return;
+
+		this.mahjongService.checkTimeout(this.roomId!);
+	}
+
+	@bindThis
+	public dispose() {
+		// Unsubscribe events
+		this.subscriber.off(`mahjongRoomStream:${this.roomId}`, this.onMahjongRoomStreamMessage);
+	}
+}
@@ -78,6 +78,15 @@ services:
        source: ../../misskey-reversi/package.json
        target: /misskey/packages/misskey-reversi/package.json
        read_only: true
+      - type: bind
+        source: ../../misskey-mahjong/built
+        target: /misskey/packages/misskey-mahjong/built
+        read_only: true
+      - type: bind
+        source: ../../misskey-mahjong/package.json
+        target: /misskey/packages/misskey-mahjong/package.json
+        read_only: true
+
      - type: bind
        source: ../../../healthcheck.sh
        target: /misskey/healthcheck.sh
@@ -144,7 +144,15 @@ export default [
 			'vue/return-in-computed-property': 'warn',
 			'vue/no-setup-props-reactivity-loss': 'warn',
 			'vue/max-attributes-per-line': 'off',
-			'vue/html-self-closing': 'off',
+			'vue/html-self-closing': ['error', {
+				html: {
+					void: 'any',
+					normal: 'never',
+					component: 'any',
+				},
+				svg: 'any',
+				math: 'any',
+			}],
 			'vue/singleline-html-element-content-newline': 'off',
 			'vue/v-on-event-hyphenation': ['error', 'never', {
 				autofix: true,
@@ -9,16 +9,16 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div v-if="user.isCat" :class="[$style.ears]">
 		<div :class="$style.earLeft">
 			<div v-if="false" :class="$style.layer">
-				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"/>
-				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"/>
-				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"/>
+				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"></div>
+				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"></div>
+				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"></div>
 			</div>
 		</div>
 		<div :class="$style.earRight">
 			<div v-if="false" :class="$style.layer">
-				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"/>
-				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"/>
-				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"/>
+				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"></div>
+				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"></div>
+				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"></div>
 			</div>
 		</div>
 	</div>
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only

 <template>
 <div ref="root" :class="['chromatic-ignore', $style.root, { [$style.cover]: cover }]" :title="title ?? ''">
-	<canvas v-show="hide" key="canvas" ref="canvas" :class="$style.canvas" :width="canvasWidth" :height="canvasHeight" :title="title ?? undefined" tabindex="-1"/>
+	<canvas v-show="hide" key="canvas" ref="canvas" :class="$style.canvas" :width="canvasWidth" :height="canvasHeight" :title="title ?? undefined" tabindex="-1"></canvas>
 	<img v-show="!hide" key="img" ref="img" :height="imgHeight ?? undefined" :width="imgWidth ?? undefined" :class="$style.img" :src="src ?? undefined" :title="title ?? undefined" :alt="alt ?? undefined" loading="eager" decoding="async" tabindex="-1"/>
 </div>
 </template>
@@ -147,7 +147,15 @@ export default [
 			'vue/return-in-computed-property': 'warn',
 			'vue/no-setup-props-reactivity-loss': 'warn',
 			'vue/max-attributes-per-line': 'off',
-			'vue/html-self-closing': 'off',
+			'vue/html-self-closing': ['error', {
+				html: {
+					void: 'any',
+					normal: 'never',
+					component: 'any',
+				},
+				svg: 'any',
+				math: 'any',
+			}],
 			'vue/singleline-html-element-content-newline': 'off',
 			'vue/v-on-event-hyphenation': ['error', 'never', {
 				autofix: true,
@@ -58,6 +58,7 @@
 		"mediabunny": "1.27.2",
 		"mfm-js": "0.25.0",
 		"misskey-bubble-game": "workspace:*",
+		"misskey-mahjong": "workspace:*",
 		"misskey-js": "workspace:*",
 		"misskey-reversi": "workspace:*",
 		"photoswipe": "5.4.4",
@@ -23,13 +23,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 			<div :class="$style.body">
 				<div :class="$style.header">
-					<span :class="$style.title">{{ (i18n.ts._achievements._types as any)['_' + achievement.name].title }}</span>
+					<span :class="$style.title">{{ i18n.ts._achievements._types[`_${achievement.name}`].title }}</span>
 					<span :class="$style.time">
 						<time v-tooltip="new Date(achievement.unlockedAt).toLocaleString()">{{ new Date(achievement.unlockedAt).getFullYear() }}/{{ new Date(achievement.unlockedAt).getMonth() + 1 }}/{{ new Date(achievement.unlockedAt).getDate() }}</time>
 					</span>
 				</div>
-				<div :class="$style.description">{{ withDescription ? (i18n.ts._achievements._types as any)['_' + achievement.name].description : '???' }}</div>
-				<div v-if="(i18n.ts._achievements._types as any)['_' + achievement.name].flavor && withDescription" :class="$style.flavor">{{ (i18n.ts._achievements._types as any)['_' + achievement.name].flavor }}</div>
+				<div :class="$style.description">{{ withDescription ? i18n.ts._achievements._types[`_${achievement.name}`].description : '???' }}</div>
+				<div v-if="'flavor' in i18n.ts._achievements._types[`_${achievement.name}`] && withDescription" :class="$style.flavor">{{ (i18n.ts._achievements._types[`_${achievement.name}`] as { flavor: string; }).flavor }}</div>
 			</div>
 		</div>
 		<template v-if="withLocked">
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
syuilo	03971bf986	Merge branch 'develop' into mahjong	2026-01-22 18:54:25 +09:00
syuilo	a168e7b648	enhance(dev): Improve mem report (#17119 ) * wip * Update report-backend-memory.yml * Update report-backend-memory.yml * Update measure-memory.mjs * Update report-backend-memory.yml	2026-01-22 18:53:53 +09:00
syuilo	1adcb03b93	Update report-backend-memory.yml	2026-01-22 15:01:38 +09:00
syuilo	b6e737dc76	Update report-backend-memory.yml	2026-01-22 14:47:05 +09:00
syuiloandCopilot	2fa6ecc7ef	enhance(dev): improve mem report (#17118 ) * wip * wip * Update report-backend-memory.yml * Update report-backend-memory.yml * Update .github/workflows/report-backend-memory.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2026-01-22 14:32:57 +09:00
syuilo	f744b5711f	enhance(dev): improve mem report (#17117 ) * wip * Update report-backend-memory.yml	2026-01-22 13:14:05 +09:00
syuilo	2b3d72bb73	Update measure-memory.mjs (#17116 )	2026-01-22 12:16:38 +09:00
syuilo	3205eb6925	lint	2026-01-22 12:14:51 +09:00
syuilo	08969aaf60	Update mahjong-room.ts	2026-01-22 11:47:25 +09:00
syuilo	069e48972a	Merge branch 'develop' into mahjong	2026-01-22 11:47:13 +09:00
syuilo	d4fcc694a6	enhance(backend): remove redis-info dep	2026-01-22 10:28:03 +09:00
かっこかり	389861f1da	refactor(frontend): fix invalid self-closing tags (#17103 ) * fix(frontend): fix invalid self-closing tags * apply eslint rules * fix * fix	2026-01-16 22:42:08 +09:00
syuilo	ec683f04d1	enhance(dev): メモリ使用量比較のActionsでGCしてから取得する Resolve #16961	2026-01-14 16:12:44 +09:00
かっこかり	bd81a6c8ad	refactor(frontend): anyを除去2 (#17092 ) * wip * fix types * fix	2026-01-14 14:45:45 +09:00
syuilo	d8318c02a1	refactor(frontend): MkRadioをMkRadiosに統合	2026-01-14 14:21:51 +09:00
かっこかりandsyuilo	b941c896aa	refactor(frontend): MkRadiosの指定をpropsから行うように (#16597 ) * refactor(frontend): MkRadiosの指定をpropsから行うように * spdx * fix lint * fix: mkradiosを動的slotsに対応させる * fix: remove comment [ci skip] * fix lint * fix lint * migrate * rename * fix * fix * fix types * remove unused imports * fix * wip --------- Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>	2026-01-14 14:02:50 +09:00
syuilo	bd0ea57661	Merge branch 'develop' into mahjong	2025-04-19 21:02:30 +09:00
zyoshoka	836886cd40	ci: lint mahjong pkg	2025-04-18 23:52:18 +09:00
zyoshoka	8a4192eaa5	chore: setup linting for tests	2025-04-18 23:49:23 +09:00
zyoshoka	ebaf78cddd	fix(misskey-js): `mahjong/cancel-match` returns 204	2025-04-18 23:28:22 +09:00
zyoshoka	431223fbd7	fix(misskey-js): update types	2025-04-18 23:26:53 +09:00
zyoshoka	b881a17c2f	fix(backend): correct invalid JSON schema	2025-04-18 23:24:38 +09:00
zyoshoka	b71e299c8f	fix(backend): handle leave message	2025-04-18 23:21:03 +09:00
zyoshoka	dc55fba800	fix(misskey-js): add mahjong streaming types	2025-04-18 23:16:37 +09:00
zyoshoka	ccb6007d32	ci(storybook): build majong package	2025-04-18 23:07:03 +09:00
zyoshoka	5ec6993876	fix(backend): correct `MahjongRoomEventTypes` type	2025-04-18 23:06:59 +09:00
zyoshoka	2b5ecf883f	chore(backend): missing SPDX	2025-04-18 22:25:17 +09:00
zyoshoka	3aebda7161	fix(misskey-js): update type definitions	2025-04-18 22:24:45 +09:00
zyoshoka	0a5b433557	test(backend): mount `misskey-mahjong` dir for federation test	2025-04-18 22:23:46 +09:00
zyoshoka	dd8bd23d64	fix: チー可能条件が間違っているのを修正	2025-04-18 19:59:06 +09:00
zyoshoka	977218bda5	fix: lint	2025-04-18 19:47:31 +09:00
zyoshoka	131605070a	chore: migrate to flat config	2025-04-18 19:45:57 +09:00
zyoshoka	ac4596974d	Merge branch 'develop' into mahjong	2025-04-18 19:35:44 +09:00
Take-John	7d9a6a3f9d	麻雀が動作できるように (#15815 )	2025-04-13 18:29:56 +09:00
syuilo	7f9c84ebe8	Update apiClientJSDoc.ts	2025-04-10 11:39:40 +09:00
syuilo	569dd8afb1	Merge branch 'develop' into mahjong	2025-04-10 11:39:35 +09:00
Take-John	bf818a6656	feature(mahjong): 搶槓/ドラ以外の麻雀の役を実装 (#14346 ) * ビルドによる自動的なソース更新 * 麻雀関連のキーバリューペアを追加 * 役の定義をまとめてエクスポート * タイポ修正 * Revert "麻雀関連のキーバリューペアを追加" This reverts commit `c349cdf70c`. * misskey-jsのビルドによる自動更新 * 型エラーに対処 * riichiがtrueの場合に門前であるかを確認 * EnvForCalcYakuのhouseプロパティを廃止 * 風牌の役の共通部分をクラスで定義 * タイポ修正 * 役牌をクラスで共通化 * 一盃口と二盃口のテストを通す * 一盃口・二盃口判定関数の調整 * 一気通貫の判定にチーによる順子も考慮する * 混全帯幺九の実装 * 純全帯幺九の実装 * 七対子の実装とテストの修正 * tsumoTileまたはronTileを必須に * 待ちを確認して平和の判定を可能に * 三暗刻と四暗刻、四暗刻単騎の実装 * 四暗刻であるために通常の役を判定できない牌姿のテストを修正 * 混老頭と清老頭を実装 * 三槓子と四槓子を実装 * 平和の実装とテストを修正 * 小三元のテストを修正 * 国士無双に対子の確認を追加 * 国士無双十三面待ちを実装し、テストを修正 * 一部の役の七対子形を認め、テストを追加 * 手牌の数を確認 * 役の定義をカプセル化して型エラーの対処 * ツモ・ロンの判定を修正 * calcYakusの引数のhandTilesを修正 * calcYakusに渡す風をseatWindに修正 * 嶺上開花の実装 * 海底摸月の実装 * FourMentsuOneJyantouWithWait型の作成 * 河底撈魚の実装 * ダブル立直の実装 * 天和・地和の実装 * エンジンのテストを作成 * エンジンによる地和のテストを追加 * 嶺上開花のテスト * ライセンスの記述を追加 * ダブル立直一発ツモのテスト * ダブル立直海底ツモのテスト * ダブル立直河底のテスト * 役満も処理できるように * 点数のテスト * 打牌時にrinshanFlags[house]をfalseに * 七対子形の字一色を認める * typo	2024-08-15 12:29:31 +09:00
syuilo	f32b11ba12	Merge branch 'develop' into mahjong	2024-07-28 15:18:08 +09:00
Take-John	6c9f6e8057	fix(mahjong): 麻雀をプレイできない問題を修正 (#14268 ) * ビルドによる自動的なソース更新 * 麻雀関連のキーバリューペアを追加 * 役の定義をまとめてエクスポート * タイポ修正 * Revert "麻雀関連のキーバリューペアを追加" This reverts commit `c349cdf70c`. * misskey-jsのビルドによる自動更新	2024-07-25 17:09:07 +09:00
syuilo	6b16b85203	Merge branch 'develop' into mahjong	2024-07-08 13:08:57 +09:00
syuilo	4597d5db91	wip	2024-07-02 10:10:18 +09:00
syuilo	9c79f5d135	Merge branch 'develop' into mahjong	2024-07-02 10:10:01 +09:00
im_tan	0e27fa59d4	test: [Mi麻雀] 一部を除く各種役のテスト (#13397 ) * fix typo * add letter-tiles tests * add ippatsu test * add tanyao and pinfu test * fix ippatsu test * add wind tests * add iipeko and chitoitsu test * add sanshoku-doujunn sanshoku-doo ittsu junchan tests * add toitoi sananko test * add ryanpeko test * add honroto sankantsu honitsu chintisu tests * add shosangen test	2024-02-19 16:51:56 +09:00
syuilo	4ae591a2c7	Merge branch 'develop' into mahjong	2024-02-14 21:03:58 +09:00
im_tan	af9ebf7034	test: [Mi麻雀] 役満（天和、地和を除く）のテスト (#13263 ) * add daisangen test * add suanko test * add suanko-tanki test * add tsuiso test * fix typo * add test-shosushi * add test-daisushi * add ryuiso-test * add chinroto-test * add sukantsu-test * add kokushi-13-test	2024-02-12 18:38:55 +09:00
syuilo	b04a0c99a4	wip	2024-02-12 11:50:46 +09:00
syuilo	10a2c16a6d	Merge branch 'develop' into mahjong	2024-02-12 11:50:03 +09:00
im_tan	622fc44645	add kokushi test (#13262 )	2024-02-12 09:06:00 +09:00
syuilo	3f810a856c	wip	2024-02-11 14:23:37 +09:00
syuilo	c47203b888	wip	2024-02-11 12:45:50 +09:00
syuilo	c99d55e0cb	Merge branch 'develop' into mahjong	2024-02-09 19:34:18 +09:00
syuilo	bb042b46ac	wip	2024-02-09 15:42:33 +09:00
syuilo	084e9449dc	Merge branch 'develop' into mahjong	2024-02-09 10:20:01 +09:00
syuilo	2af3710757	Merge branch 'develop' into mahjong	2024-02-08 16:59:43 +09:00
syuilo	894f65f754	wip	2024-02-07 20:52:11 +09:00
syuilo	166aeb631e	wip	2024-02-06 18:21:58 +09:00
syuilo	2d6f9b083f	wip	2024-02-06 15:41:57 +09:00
syuilo	7a9434414d	Merge branch 'develop' into mahjong	2024-02-05 21:08:21 +09:00
syuilo	b302796e70	wip	2024-02-05 21:07:44 +09:00
syuilo	76cdb48a3e	Merge branch 'develop' into mahjong	2024-02-05 15:02:55 +09:00
syuilo	b32022c20c	wip	2024-02-05 15:02:43 +09:00
syuilo	b785793e41	Merge branch 'develop' into mahjong	2024-02-05 11:04:04 +09:00
syuilo	bfb6e2f461	wip	2024-02-05 10:58:56 +09:00
syuilo	38e3d248fb	wip	2024-02-04 17:11:42 +09:00
syuilo	be3b2558d1	wip	2024-02-04 13:26:40 +09:00
syuilo	d57f20dc84	wip	2024-02-03 22:14:44 +09:00
syuilo	00bf57d243	wip	2024-02-03 18:02:00 +09:00
syuilo	586a458c7a	wip	2024-02-03 17:00:45 +09:00
syuilo	2dd886e285	wip	2024-02-03 13:52:13 +09:00
syuilo	7cdaa10d46	wip	2024-02-02 20:56:39 +09:00
syuilo	9ea29fe84c	Merge branch 'develop' into mahjong	2024-02-02 20:41:13 +09:00
syuilo	054a48c184	Update logo.png	2024-02-01 21:01:53 +09:00
syuilo	c964c49c58	wip	2024-02-01 20:34:05 +09:00
syuilo	10a112489d	Merge branch 'develop' into mahjong	2024-02-01 16:42:32 +09:00
syuilo	859cf75ad3	wip	2024-01-31 18:49:42 +09:00
syuilo	3c97164cf2	wip	2024-01-31 18:31:02 +09:00
syuilo	8121f8f40f	wip	2024-01-31 10:54:38 +09:00
syuilo	072928b147	Merge branch 'develop' into mahjong	2024-01-31 10:54:34 +09:00
syuilo	5af8b5d547	wip	2024-01-30 20:13:38 +09:00
syuilo	5e3a805671	Update index.d.ts	2024-01-30 19:56:16 +09:00
syuilo	ef14a56a5c	Merge branch 'develop' into mahjong	2024-01-30 19:56:08 +09:00
syuilo	2f0924c85b	wip	2024-01-30 17:11:16 +09:00
syuilo	4183fec4ab	wip	2024-01-30 11:34:57 +09:00
syuilo	ce65e9dd69	refactor	2024-01-30 11:30:58 +09:00
syuilo	d7337e5f81	wip	2024-01-30 11:27:08 +09:00
syuilo	547b74c9b2	wip	2024-01-29 20:35:25 +09:00
syuilo	d427d24ca4	wip	2024-01-29 17:15:09 +09:00
syuilo	668bf9a226	wip	2024-01-29 14:14:00 +09:00
syuilo	11404e545e	Update index.ts	2024-01-29 12:30:09 +09:00
syuilo	5f48109230	wip	2024-01-29 11:47:01 +09:00
syuilo	dad8430040	wip	2024-01-29 10:46:23 +09:00
syuilo	0111b8736a	Merge branch 'develop' into mahjong	2024-01-29 07:50:16 +09:00
syuilo	1ea098f4b4	wip	2024-01-28 20:34:45 +09:00
syuilo	366fade8d3	wip	2024-01-28 20:20:18 +09:00
syuilo	db7bd0e94e	wip	2024-01-28 17:31:32 +09:00
syuilo	606c88aa6b	Merge branch 'develop' into mahjong	2024-01-28 15:19:24 +09:00
syuilo	55629f2b39	wip	2024-01-28 13:49:56 +09:00
syuilo	ab404d491d	wip	2024-01-27 17:50:41 +09:00
syuilo	0f2991cbaf	Merge branch 'develop' into mahjong	2024-01-27 12:03:08 +09:00
syuilo	34ed9cb187	Merge branch 'develop' into mahjong	2024-01-27 12:02:55 +09:00
syuilo	67e6184a75	wip	2024-01-26 14:25:00 +09:00
syuilo	2133d0552c	Merge branch 'develop' into mahjong	2024-01-25 10:42:24 +09:00
syuilo	314c31db34	wip	2024-01-17 20:14:35 +09:00