Compare commits

...

3 commits

Author SHA1 Message Date
takejohn 2f40fd4aa0 configの型チェック 2024-03-30 00:57:58 +09:00
takejohn fb0a9b0f62 Sessionのメンバ型エラーに対処 2024-03-29 19:36:36 +09:00
takejohn c485a5b1ed InstalledModule抽象クラス作成 2024-03-29 00:43:17 +09:00
11 changed files with 333 additions and 100 deletions

View file

@ -9,7 +9,7 @@ import chalk from 'chalk';
import { v4 as uuid } from 'uuid';
import config from '@/config.js';
import Module from '@/module.js';
import Module, { InstalledModule } from '@/module.js';
import Message from '@/message.js';
import Friend, { FriendDoc } from '@/friend.js';
import type { User } from '@/misskey/user.js';
@ -38,6 +38,11 @@ export type Meta = {
lastWakingAt: number;
};
export type ModuleDataDoc<Data = any> = {
module: string;
data: Data;
}
/**
*
*/
@ -46,7 +51,7 @@ export default interface 藍 extends Ai {
lastSleepedAt: number;
friends: loki.Collection<FriendDoc>;
moduleData: loki.Collection<any>;
moduleData: loki.Collection<ModuleDataDoc>;
}
/**
@ -60,6 +65,7 @@ export class Ai {
private mentionHooks: MentionHook[] = [];
private contextHooks: { [moduleName: string]: ContextHook } = {};
private timeoutCallbacks: { [moduleName: string]: TimeoutCallback } = {};
public installedModules: { [moduleName: string]: InstalledModule } = {};
public db: loki;
public lastSleepedAt?: number;
@ -204,7 +210,7 @@ export class Ai {
this.modules.forEach(m => {
this.log(`Installing ${chalk.cyan.italic(m.name)}\tmodule...`);
m.init(this);
const res = m.install();
const res = m.install(this);
if (res != null) {
if (res.mentionHook) this.mentionHooks.push(res.mentionHook);
if (res.contextHook) this.contextHooks[m.name] = res.contextHook;

View file

@ -18,15 +18,72 @@ type Config = {
};
import uncheckedConfig from '../config.json' assert { type: 'json' };
import log from '@/utils/log.js';
class Type<T> {
public static readonly string = new Type<string>('string');
public static readonly boolean = new Type<boolean>('boolean');
public readonly name: string;
private constructor(name: string) {
this.name = name;
}
check(value: unknown): value is T {
return typeof value == this.name;
}
}
function checkProperty<K extends keyof Config>(config: Object, key: K, type: Type<Config[K]>): config is { [J in K]: Config[K] } {
const result = key in config && type.check(config[key as string]);
if (!result) {
log(`config.json: Property ${key}: ${type.name} required`);
}
return result;
}
function checkOptionalProperty<K extends keyof Config>(config: Object, key: K, type: Type<Config[K]>): config is { [J in K]?: Config[K] } {
if (!(key in config)) {
return true;
}
const result = type.check(config[key as string]);
if (!result) {
log(`config.json: The type of property ${key} must be ${type.name}`);
}
return result;
}
function setProperty<K extends keyof Config>(config: Object, key: K, value: Config[K]): asserts config is { [L in K]: Config[K] } {
(config as { [L in K]?: Config[K] })[key] = value;
}
function validate(config: unknown): Config {
// TODO: as を使わずにしっかりと検証を行う
return config as Config;
if (!(config instanceof Object)) {
log('config.json: Root object required');
} else if (
checkProperty(config, 'host', Type.string) &&
checkOptionalProperty(config, 'serverName', Type.string) &&
checkProperty(config, 'i', Type.string) &&
checkOptionalProperty(config, 'master', Type.string) &&
checkProperty(config, 'keywordEnabled', Type.boolean) &&
checkProperty(config, 'reversiEnabled', Type.boolean) &&
checkProperty(config, 'notingEnabled', Type.boolean) &&
checkProperty(config, 'chartEnabled', Type.boolean) &&
checkProperty(config, 'serverMonitoring', Type.boolean) &&
checkOptionalProperty(config, 'checkEmojisEnabled', Type.boolean) &&
checkOptionalProperty(config, 'checkEmojisAtOnce', Type.boolean) &&
checkOptionalProperty(config, 'mecab', Type.string) &&
checkOptionalProperty(config, 'mecabDic', Type.string) &&
checkOptionalProperty(config, 'memoryDir', Type.string)
) {
setProperty(config, 'wsUrl', config.host.replace('http', 'ws'));
setProperty(config, 'apiUrl', config.host + '/api');
return config;
}
throw new TypeError('config.json has an invalid type');
}
const config = validate(uncheckedConfig);
config.wsUrl = config.host.replace('http', 'ws');
config.apiUrl = config.host + '/api';
export default config;

View file

@ -1,29 +1,26 @@
import { bindThis } from '@/decorators.js';
import , { InstallerResult } from '@/ai.js';
import , { HandlerResult, InstallerResult, ModuleDataDoc } from '@/ai.js';
import Message from '@/message.js';
export default abstract class Module {
public abstract readonly name: string;
private maybeAi?: ;
private doc: any;
/**
* @deprecated
*/
public installed?: InstalledModule;
public init(ai: ) {
this.maybeAi = ai;
this.doc = this.ai.moduleData.findOne({
module: this.name
});
if (this.doc == null) {
this.doc = this.ai.moduleData.insertOne({
module: this.name,
data: {}
});
}
}
public abstract install(): InstallerResult;
public abstract install(ai: ): InstallerResult;
/**
* @deprecated {@link Module#install} 使
*/
protected get ai(): {
if (this.maybeAi == null) {
throw new TypeError('This module has not been initialized');
@ -31,6 +28,9 @@ export default abstract class Module {
return this.maybeAi;
}
/**
* @deprecated {@link InstalledModule#log} 使
*/
@bindThis
protected log(msg: string) {
this.ai.log(`[${this.name}]: ${msg}`);
@ -41,6 +41,7 @@ export default abstract class Module {
* @param key
* @param id ID稿ID
* @param data
* @deprecated {@link InstalledModule#subscribeReply} 使
*/
@bindThis
protected subscribeReply(key: string | null, id: string, data?: any) {
@ -50,6 +51,7 @@ export default abstract class Module {
/**
*
* @param key
* @deprecated {@link InstalledModule#unsubscribeReply} 使
*/
@bindThis
protected unsubscribeReply(key: string | null) {
@ -61,20 +63,132 @@ export default abstract class Module {
*
* @param delay
* @param data
* @deprecated {@link InstalledModule#setTimeoutWithPersistence} 使
*/
@bindThis
public setTimeoutWithPersistence(delay: number, data?: any) {
this.ai.setTimeoutWithPersistence(this, delay, data);
}
/**
* @deprecated {@link InstalledModule#getData} 使
*/
@bindThis
protected getData() {
const doc = this.ai.moduleData.findOne({
module: this.name
});
return doc?.data;
}
/**
* @deprecated {@link InstalledModule#setData} 使
*/
@bindThis
protected setData(data: any) {
const doc = this.ai.moduleData.findOne({
module: this.name
});
if (doc == null) {
return;
}
doc.data = data;
this.ai.moduleData.update(doc);
if (this.installed != null) {
this.installed.updateDoc();
}
}
}
export abstract class InstalledModule<M extends Module = Module, Data = any> implements InstallerResult {
protected readonly module: M;
protected readonly ai: ;
private doc: ModuleDataDoc<Data>;
constructor(module: M, ai: , initialData: any = {}) {
this.module = module;
this.ai = ai;
const doc = this.ai.moduleData.findOne({
module: module.name
});
if (doc == null) {
this.doc = this.ai.moduleData.insertOne({
module: module.name,
data: initialData
}) as ModuleDataDoc<Data>;
} else {
this.doc = doc;
}
ai.installedModules[module.name] = this;
}
@bindThis
protected log(msg: string) {
this.ai.log(`[${this.module.name}]: ${msg}`);
}
/**
*
* @param key
* @param id ID稿ID
* @param data
*/
@bindThis
protected subscribeReply(key: string | null, id: string, data?: any) {
this.ai.subscribeReply(this.module, key, id, data);
}
/**
*
* @param key
*/
@bindThis
protected unsubscribeReply(key: string | null) {
this.ai.unsubscribeReply(this.module, key);
}
/**
*
*
* @param delay
* @param data
*/
@bindThis
public setTimeoutWithPersistence(delay: number, data?: any) {
this.ai.setTimeoutWithPersistence(this.module, delay, data);
}
@bindThis
protected getData(): Data {
return this.doc.data;
}
@bindThis
protected setData(data: any) {
protected setData(data: Data) {
this.doc.data = data;
this.ai.moduleData.update(this.doc);
}
/**
* @deprecated
*/
public updateDoc() {
const doc = this.ai.moduleData.findOne({
module: this.module.name
});
if (doc != null) {
this.doc = doc;
}
}
mentionHook?(msg: Message): Promise<boolean | HandlerResult>;
contextHook?(key: any, msg: Message, data?: any): Promise<void | boolean | HandlerResult>;
timeoutCallback?(data?: any): void;
}

View file

@ -1,31 +1,35 @@
import { bindThis } from '@/decorators.js';
import loki from 'lokijs';
import Module from '@/module.js';
import Module, { InstalledModule } from '@/module.js';
import serifs from '@/serifs.js';
import config from '@/config.js';
import Message from '@/message.js';
import from '@/ai.js';
export default class extends Module {
public readonly name = 'checkCustomEmojis';
@bindThis
public install(ai: ) {
if (!config.checkEmojisEnabled) return {};
return new Installed(this, ai);
}
}
class Installed extends InstalledModule {
private lastEmoji: loki.Collection<{
id: string;
updatedAt: number;
}>;
@bindThis
public install() {
if (!config.checkEmojisEnabled) return {};
constructor(module: Module, ai: ) {
super(module, ai);
this.lastEmoji = this.ai.getCollection('lastEmoji', {
indices: ['id']
});
this.timeCheck();
setInterval(this.timeCheck, 1000 * 60 * 3);
return {
mentionHook: this.mentionHook
};
}
@bindThis
@ -141,7 +145,7 @@ export default class extends Module {
}
@bindThis
private async mentionHook(msg: Message) {
public async mentionHook(msg: Message) {
if (!msg.includes(['カスタムえもじチェック','カスタムえもじを調べて','カスタムえもじを確認'])) {
return false;
} else {

View file

@ -3,19 +3,16 @@ import { parse } from 'twemoji-parser';
import type { Note } from '@/misskey/note.js';
import Module from '@/module.js';
import Stream from '@/stream.js';
import includes from '@/utils/includes.js';
import { sleep } from '@/utils/sleep.js';
export default class extends Module {
public readonly name = 'emoji-react';
private htl: ReturnType<Stream['useSharedConnection']>;
@bindThis
public install() {
this.htl = this.ai.connection.useSharedConnection('homeTimeline');
this.htl.on('note', this.onNote);
const htl = this.ai.connection.useSharedConnection('homeTimeline');
htl.on('note', this.onNote);
return {};
}

View file

@ -1,35 +1,42 @@
import { bindThis } from '@/decorators.js';
import loki from 'lokijs';
import Module from '@/module.js';
import Module, { InstalledModule } from '@/module.js';
import Message from '@/message.js';
import serifs from '@/serifs.js';
import , { InstallerResult } from '@/ai.js';
type Guesses = loki.Collection<{
userId: string;
secret: number;
tries: number[];
isEnded: boolean;
startedAt: number;
endedAt: number | null;
}>
export default class extends Module {
public readonly name = 'guessingGame';
private guesses: loki.Collection<{
userId: string;
secret: number;
tries: number[];
isEnded: boolean;
startedAt: number;
endedAt: number | null;
}>;
@bindThis
public install() {
this.guesses = this.ai.getCollection('guessingGame', {
public install(ai: ) {
const guesses = ai.getCollection('guessingGame', {
indices: ['userId']
});
return {
mentionHook: this.mentionHook,
contextHook: this.contextHook
};
return new Installed(this, ai, guesses);
}
}
class Installed extends InstalledModule implements InstallerResult {
private guesses: Guesses;
constructor(module: Module, ai: , guesses: Guesses) {
super(module, ai);
this.guesses = guesses;
}
@bindThis
private async mentionHook(msg: Message) {
public async mentionHook(msg: Message) {
if (!msg.includes(['数当て', '数あて'])) return false;
const exist = this.guesses.findOne({
@ -56,7 +63,7 @@ export default class extends Module {
}
@bindThis
private async contextHook(key: any, msg: Message) {
public async contextHook(key: any, msg: Message) {
if (msg.text == null) return;
const exist = this.guesses.findOne({
@ -114,14 +121,14 @@ export default class extends Module {
if (end) {
exist.isEnded = true;
exist.endedAt = Date.now();
this.unsubscribeReply(key);
this.ai.unsubscribeReply(this.module, key);
}
this.guesses.update(exist);
msg.reply(text).then(reply => {
if (!end) {
this.subscribeReply(msg.userId, reply.id);
this.ai.subscribeReply(this.module, msg.userId, reply.id);
}
});
}

View file

@ -1,10 +1,11 @@
import { bindThis } from '@/decorators.js';
import loki from 'lokijs';
import Module from '@/module.js';
import Module, { InstalledModule } from '@/module.js';
import Message from '@/message.js';
import serifs from '@/serifs.js';
import type { User } from '@/misskey/user.js';
import { acct } from '@/utils/acct.js';
import , { InstallerResult } from '@/ai.js';
type Game = {
votes: {
@ -25,23 +26,28 @@ const limitMinutes = 10;
export default class extends Module {
public readonly name = 'kazutori';
@bindThis
public install(ai: ) {
return new Installed(this, ai);
}
}
class Installed extends InstalledModule {
private games: loki.Collection<Game>;
@bindThis
public install() {
constructor(module: Module, ai: ) {
super(module, ai);
this.games = this.ai.getCollection('kazutori');
this.crawleGameEnd();
setInterval(this.crawleGameEnd, 1000);
return {
mentionHook: this.mentionHook,
contextHook: this.contextHook
};
return this;
}
@bindThis
private async mentionHook(msg: Message) {
public async mentionHook(msg: Message) {
if (!msg.includes(['数取り'])) return false;
const games = this.games.find({});
@ -83,7 +89,7 @@ export default class extends Module {
}
@bindThis
private async contextHook(key: any, msg: Message) {
public async contextHook(key: any, msg: Message) {
if (msg.text == null) return {
reaction: 'hmm'
};

View file

@ -1,9 +1,10 @@
import { bindThis } from '@/decorators.js';
import loki from 'lokijs';
import Module from '@/module.js';
import Module, { InstalledModule } from '@/module.js';
import config from '@/config.js';
import serifs from '@/serifs.js';
import { mecab } from './mecab.js';
import from '@/ai.js';
type LocalTimeline = {
userId: string;
@ -21,22 +22,28 @@ function kanaToHira(str: string) {
export default class extends Module {
public readonly name = 'keyword';
@bindThis
public install(ai: ) {
if (config.keywordEnabled) {
new Installed(this, ai);
}
return {};
}
}
class Installed extends InstalledModule {
private learnedKeywords: loki.Collection<{
keyword: string;
learnedAt: number;
}>;
@bindThis
public install() {
if (!config.keywordEnabled) return {};
constructor(module: Module, ai: ) {
super(module, ai);
this.learnedKeywords = this.ai.getCollection('_keyword_learnedKeywords', {
indices: ['userId']
});
setInterval(this.learn, 1000 * 60 * 60);
return {};
}
@bindThis

View file

@ -1,16 +1,24 @@
import { bindThis } from '@/decorators.js';
import loki from 'lokijs';
import Module from '@/module.js';
import Module, { InstalledModule } from '@/module.js';
import Message from '@/message.js';
import serifs, { getSerif } from '@/serifs.js';
import { acct } from '@/utils/acct.js';
import config from '@/config.js';
import from '@/ai.js';
const NOTIFY_INTERVAL = 1000 * 60 * 60 * 12;
export default class extends Module {
public readonly name = 'reminder';
@bindThis
public install(ai: ) {
return new Installed(this, ai);
}
}
class Installed extends InstalledModule {
private reminds: loki.Collection<{
userId: string;
id: string;
@ -20,21 +28,15 @@ export default class extends Module {
createdAt: number;
}>;
@bindThis
public install() {
constructor(module: Module, ai: ) {
super(module, ai);
this.reminds = this.ai.getCollection('reminds', {
indices: ['userId', 'id']
});
return {
mentionHook: this.mentionHook,
contextHook: this.contextHook,
timeoutCallback: this.timeoutCallback,
};
}
@bindThis
private async mentionHook(msg: Message) {
public async mentionHook(msg: Message) {
let text = msg.extractedText.toLowerCase();
if (!text.startsWith('remind') && !text.startsWith('todo')) return false;
@ -99,7 +101,7 @@ export default class extends Module {
}
@bindThis
private async contextHook(key: any, msg: Message, data: any) {
public async contextHook(key: any, msg: Message, data: any) {
if (msg.text == null) return;
const remind = this.reminds.findOne({
@ -129,7 +131,7 @@ export default class extends Module {
}
@bindThis
private async timeoutCallback(data) {
public async timeoutCallback(data) {
const remind = this.reminds.findOne({
id: data.id
});
@ -147,7 +149,7 @@ export default class extends Module {
renoteId: remind.thing == null && remind.quoteId ? remind.quoteId : remind.id,
text: acct(friend.doc.user) + ' ' + serifs.reminder.notify(friend.name)
});
} catch (err) {
} catch (err: any) {
// renote対象が消されていたらリマインダー解除
if (err.statusCode === 400) {
this.unsubscribeReply(remind.thing == null && remind.quoteId ? remind.quoteId : remind.id);

View file

@ -11,6 +11,7 @@ import * as Reversi from './engine.js';
import config from '@/config.js';
import serifs from '@/serifs.js';
import type { User } from '@/misskey/user.js';
import { Note } from '@/misskey/note.js';
function getUserName(user) {
return user.name || user.username;
@ -24,11 +25,35 @@ const titles = [
];
class Session {
private account: User;
private maybeAccount?: User;
private game: any;
private form: any;
private engine: Reversi.Game;
private botColor: Reversi.Color;
private maybeEngine?: Reversi.Game;
private maybeBotColor?: Reversi.Color;
private get account(): User {
const maybeAccount = this.maybeAccount;
if (maybeAccount == null) {
throw new Error('Have not received "_init_" message');
}
return maybeAccount;
}
private get engine(): Reversi.Game {
const maybeEngine = this.maybeEngine;
if (maybeEngine == null) {
throw new Error('Have not received "started" message');
}
return maybeEngine;
}
private get botColor(): Reversi.Color {
const maybeBotColor = this.maybeBotColor;
if (maybeBotColor == null) {
throw new Error('Have not received "started" message');
}
return maybeBotColor;
}
private appliedOps: string[] = [];
@ -100,7 +125,7 @@ class Session {
private onInit = (msg: any) => {
this.game = msg.game;
this.form = msg.form;
this.account = msg.account;
this.maybeAccount = msg.account;
}
/**
@ -121,7 +146,7 @@ class Session {
});
// リバーシエンジン初期化
this.engine = new Reversi.Game(this.game.map, {
this.maybeEngine = new Reversi.Game(this.game.map, {
isLlotheo: this.game.isLlotheo,
canPutEverywhere: this.game.canPutEverywhere,
loopedBoard: this.game.loopedBoard
@ -198,7 +223,7 @@ class Session {
//#endregion
this.botColor = this.game.user1Id == this.account.id && this.game.black == 1 || this.game.user2Id == this.account.id && this.game.black == 2;
this.maybeBotColor = this.game.user1Id == this.account.id && this.game.black == 1 || this.game.user2Id == this.account.id && this.game.black == 2;
if (this.botColor) {
this.think();
@ -454,7 +479,7 @@ class Session {
try {
const res = await got.post(`${config.host}/api/notes/create`, {
json: body
}).json();
}).json<{ createdNote: Note }>();
return res.createdNote;
} catch (e) {

View file

@ -1,24 +1,34 @@
import { bindThis } from '@/decorators.js';
import Module from '@/module.js';
import Module, { InstalledModule } from '@/module.js';
import serifs from '@/serifs.js';
import config from '@/config.js';
import from '@/ai.js';
export default class extends Module {
public readonly name = 'server';
@bindThis
public install(ai: ) {
if (config.serverMonitoring) {
new Installed(this, ai);
}
return {};
}
}
class Installed extends InstalledModule {
private connection?: any;
private recentStat: any;
private warned = false;
private lastWarnedAt: number;
private lastWarnedAt?: number;
/**
* 11
*/
private statsLogs: any[] = [];
@bindThis
public install() {
if (!config.serverMonitoring) return {};
constructor(module: Module, ai: ) {
super(module, ai);
this.connection = this.ai.connection.useSharedConnection('serverStats');
this.connection.on('stats', this.onStats);
@ -31,8 +41,6 @@ export default class extends Module {
setInterval(() => {
this.check();
}, 3000);
return {};
}
@bindThis