From 0a180d069c784582f174b01df7b61b5363e9a6c8 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 22 Jan 2024 16:34:07 +0900 Subject: [PATCH] :v: --- package.json | 32 ----------------- src/modules/reversi/index.ts | 4 +-- test/__mocks__/account.ts | 7 ---- test/__mocks__/misskey.ts | 67 ------------------------------------ test/__mocks__/ws.ts | 17 --------- test/__modules__/test.ts | 26 -------------- test/core.ts | 20 ----------- test/tsconfig.json | 15 -------- tsconfig.json | 3 +- 9 files changed, 3 insertions(+), 188 deletions(-) delete mode 100644 test/__mocks__/account.ts delete mode 100644 test/__mocks__/misskey.ts delete mode 100644 test/__mocks__/ws.ts delete mode 100644 test/__modules__/test.ts delete mode 100644 test/core.ts delete mode 100644 test/tsconfig.json diff --git a/package.json b/package.json index 67f8fb5..bb6eba9 100644 --- a/package.json +++ b/package.json @@ -38,38 +38,6 @@ "ws": "8.16.0" }, "devDependencies": { - "@koa/router": "9.4.0", - "@types/jest": "26.0.23", - "@types/koa": "2.13.1", - "@types/koa__router": "8.0.4", - "@types/websocket": "1.0.10", - "jest": "26.6.3", - "koa": "2.13.1", - "koa-json-body": "5.3.0", - "ts-jest": "26.5.6", - "websocket": "1.0.34" - }, - "_moduleAliases": { - "@": "built" - }, - "jest": { - "testRegex": "/test/.*", - "moduleFileExtensions": [ - "ts", - "js" - ], - "transform": { - "^.+\\.ts$": "ts-jest" - }, - "globals": { - "ts-jest": { - "tsConfig": "test/tsconfig.json" - } - }, - "moduleNameMapper": { - "^@/(.+)": "/src/$1", - "^#/(.+)": "/test/$1" - } }, "nodemonConfig": { "ignore": ["memory.json"] diff --git a/src/modules/reversi/index.ts b/src/modules/reversi/index.ts index c5f962b..5ade998 100644 --- a/src/modules/reversi/index.ts +++ b/src/modules/reversi/index.ts @@ -89,10 +89,10 @@ export default class extends Module { @bindThis private onReversiGameStart(game: any) { - let strength = 4; + let strength = 5; const friend = this.ai.lookupFriend(game.user1Id !== this.ai.account.id ? game.user1Id : game.user2Id)!; if (friend != null) { - strength = friend.doc.reversiStrength ?? 4; + strength = friend.doc.reversiStrength ?? 5; friend.updateReversiStrength(null); } diff --git a/test/__mocks__/account.ts b/test/__mocks__/account.ts deleted file mode 100644 index 3d53135..0000000 --- a/test/__mocks__/account.ts +++ /dev/null @@ -1,7 +0,0 @@ -export const account = { - id: '0', - name: '藍', - username: 'ai', - host: null, - isBot: true, -}; diff --git a/test/__mocks__/misskey.ts b/test/__mocks__/misskey.ts deleted file mode 100644 index de1212f..0000000 --- a/test/__mocks__/misskey.ts +++ /dev/null @@ -1,67 +0,0 @@ -import * as http from 'http'; -import * as Koa from 'koa'; -import * as websocket from 'websocket'; - -export class Misskey { - private server: http.Server; - private streaming: websocket.connection; - - constructor() { - const app = new Koa(); - - this.server = http.createServer(app.callback()); - - const ws = new websocket.server({ - httpServer: this.server - }); - - ws.on('request', async (request) => { - const q = request.resourceURL.query as ParsedUrlQuery; - - this.streaming = request.accept(); - }); - - this.server.listen(3000); - } - - public waitForStreamingMessage(handler) { - return new Promise((resolve, reject) => { - const onMessage = (data: websocket.IMessage) => { - if (data.utf8Data == null) return; - const message = JSON.parse(data.utf8Data); - const result = handler(message); - if (result) { - this.streaming.off('message', onMessage); - resolve(); - } - }; - this.streaming.on('message', onMessage); - }); - } - - public async waitForMainChannelConnected() { - await this.waitForStreamingMessage(message => { - const { type, body } = message; - if (type === 'connect') { - const { channel, id, params, pong } = body; - - if (channel !== 'main') return; - - if (pong) { - this.sendStreamingMessage('connected', { - id: id - }); - } - - return true; - } - }); - } - - public sendStreamingMessage(type: string, payload: any) { - this.streaming.send(JSON.stringify({ - type: type, - body: payload - })); - } -} diff --git a/test/__mocks__/ws.ts b/test/__mocks__/ws.ts deleted file mode 100644 index 5b31e2c..0000000 --- a/test/__mocks__/ws.ts +++ /dev/null @@ -1,17 +0,0 @@ -import * as websocket from 'websocket'; - -export class StreamingApi { - private ws: WS; - - constructor() { - this.ws = new WS('ws://localhost/streaming'); - } - - public async waitForMainChannelConnected() { - await expect(this.ws).toReceiveMessage("hello"); - } - - public send(message) { - this.ws.send(JSON.stringify(message)); - } -} diff --git a/test/__modules__/test.ts b/test/__modules__/test.ts deleted file mode 100644 index 98be556..0000000 --- a/test/__modules__/test.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { bindThis } from '@/decorators.js'; -import Module from '@/module.js'; -import Message from '@/message'; - -export default class extends Module { - public readonly name = 'test'; - - @bindThis - public install() { - return { - mentionHook: this.mentionHook - }; - } - - @bindThis - private async mentionHook(msg: Message) { - if (msg.text && msg.text.includes('ping')) { - msg.reply('PONG!', { - immediate: true - }); - return true; - } else { - return false; - } - } -} diff --git a/test/core.ts b/test/core.ts deleted file mode 100644 index 721c4f3..0000000 --- a/test/core.ts +++ /dev/null @@ -1,20 +0,0 @@ -import 藍 from '@/ai'; -import { account } from '#/__mocks__/account'; -import TestModule from '#/__modules__/test'; -import { StreamingApi } from '#/__mocks__/ws'; - -process.env.NODE_ENV = 'test'; - -let ai: 藍; - -beforeEach(() => { - ai = new 藍(account, [ - new TestModule(), - ]); -}); - -test('mention hook', async () => { - const streaming = new StreamingApi(); - - -}); diff --git a/test/tsconfig.json b/test/tsconfig.json deleted file mode 100644 index 87add8f..0000000 --- a/test/tsconfig.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "rootDir": "../", - "paths": { - "@/*": ["../src/*"], - "#/*": ["./*"] - }, - }, - "compileOnSave": false, - "include": [ - "**/*.ts" - ] -} diff --git a/tsconfig.json b/tsconfig.json index 0231285..c8e20d4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -40,7 +40,6 @@ "src/**/*" ], "exclude": [ - "node_modules", - "test/**/*" + "node_modules" ], }