Compare commits

..

1 commit

Author SHA1 Message Date
Take-John 57c041d64b
Merge 94d671af00 into 830c9c2ecd 2024-03-24 21:41:39 +09:00
2 changed files with 17 additions and 80 deletions

View file

@ -41,31 +41,20 @@ export type Meta = {
/**
*
*/
export default interface extends Ai {
connection: Stream;
lastSleepedAt: number;
friends: loki.Collection<FriendDoc>;
moduleData: loki.Collection<any>;
}
/**
*
*/
export class Ai {
export default class {
public readonly version = pkg._v;
public account: User;
public connection?: Stream;
public connection: Stream;
public modules: Module[] = [];
private mentionHooks: MentionHook[] = [];
private contextHooks: { [moduleName: string]: ContextHook } = {};
private timeoutCallbacks: { [moduleName: string]: TimeoutCallback } = {};
public db: loki;
public lastSleepedAt?: number;
public lastSleepedAt: number;
private meta?: loki.Collection<Meta>;
private meta: loki.Collection<Meta>;
private contexts?: loki.Collection<{
private contexts: loki.Collection<{
noteId?: string;
userId?: string;
module: string;
@ -73,7 +62,7 @@ export class Ai {
data?: any;
}>;
private timers?: loki.Collection<{
private timers: loki.Collection<{
id: string;
module: string;
insertedAt: number;
@ -81,10 +70,8 @@ export class Ai {
data?: any;
}>;
public friends?: loki.Collection<FriendDoc>;
public moduleData?: loki.Collection<any>;
private ready: boolean = false;
public friends: loki.Collection<FriendDoc>;
public moduleData: loki.Collection<any>;
/**
*
@ -151,9 +138,6 @@ export class Ai {
// Init stream
this.connection = new Stream();
// この時点から藍インスタンスに
this.setReady();
//#region Main stream
const mainStream = this.connection.useSharedConnection('main');
@ -221,40 +205,12 @@ export class Ai {
this.log(chalk.green.bold('Ai am now running!'));
}
/**
*
*/
private setReady(): asserts this is {
// 呼び出すタイミングが正しいか検証
if (
this.connection == null ||
this.lastSleepedAt == null ||
this.meta == null ||
this.contexts == null ||
this.timers == null ||
this.friends == null ||
this.moduleData == null
) {
throw new TypeError('Cannot set ready');
}
this.ready = true;
}
public requireReady(): asserts this is {
if (!this.ready) {
throw new TypeError('Ai am not ready!');
}
}
/**
*
* ()
*/
@bindThis
private async onReceiveMessage(msg: Message): Promise<void> {
this.requireReady();
this.log(chalk.gray(`<<< An message received: ${chalk.underline(msg.id)}`));
// Ignore message if the user is a bot
@ -266,7 +222,7 @@ export class Ai {
const isNoContext = msg.replyId == null;
// Look up the context
const context = isNoContext ? null : this.contexts!.findOne({
const context = isNoContext ? null : this.contexts.findOne({
noteId: msg.replyId
});
@ -322,8 +278,6 @@ export class Ai {
@bindThis
private onNotification(notification: any) {
this.requireReady();
switch (notification.type) {
// リアクションされたら親愛度を少し上げる
// TODO: リアクション取り消しをよしなにハンドリングする
@ -340,14 +294,12 @@ export class Ai {
@bindThis
private crawleTimer() {
this.requireReady();
const timers = this.timers!.find();
const timers = this.timers.find();
for (const timer of timers) {
// タイマーが時間切れかどうか
if (Date.now() - (timer.insertedAt + timer.delay) >= 0) {
this.log(`Timer expired: ${timer.module} ${timer.id}`);
this.timers!.remove(timer);
this.timers.remove(timer);
this.timeoutCallbacks[timer.module](timer.data);
}
}
@ -378,8 +330,6 @@ export class Ai {
@bindThis
public lookupFriend(userId: User['id']): Friend | null {
this.requireReady();
const doc = this.friends.findOne({
userId: userId
});
@ -449,8 +399,7 @@ export class Ai {
*/
@bindThis
public subscribeReply(module: Module, key: string | null, id: string, data?: any) {
this.requireReady();
this.contexts!.insertOne({
this.contexts.insertOne({
noteId: id,
module: module.name,
key: key,
@ -465,8 +414,7 @@ export class Ai {
*/
@bindThis
public unsubscribeReply(module: Module, key: string | null) {
this.requireReady();
this.contexts!.findAndRemove({
this.contexts.findAndRemove({
key: key,
module: module.name
});
@ -481,10 +429,8 @@ export class Ai {
*/
@bindThis
public setTimeoutWithPersistence(module: Module, delay: number, data?: any) {
this.requireReady();
const id = uuid();
this.timers!.insertOne({
this.timers.insertOne({
id: id,
module: module.name,
insertedAt: Date.now(),
@ -497,10 +443,6 @@ export class Ai {
@bindThis
public getMeta() {
if (this.meta == null) {
throw new TypeError('meta has not been set');
}
const rec = this.meta.findOne();
if (rec) {
@ -523,11 +465,6 @@ export class Ai {
rec[k] = v;
}
this.meta!.update(rec);
this.meta.update(rec);
}
}
// FIXME:
// JS にコンパイルされたコードでインターフェイスであるはずの藍がインポートされてしまうので、
// 同名のクラスを定義することで実行時エラーが出ないようにしている
export default class {}

View file

@ -5,7 +5,7 @@ import chalk from 'chalk';
import got from 'got';
import promiseRetry from 'promise-retry';
import { Ai } from './ai.js';
import from './ai.js';
import config from './config.js';
import _log from './utils/log.js';
import pkg from '../package.json' assert { type: 'json' };
@ -72,7 +72,7 @@ promiseRetry(retry => {
log('Starting AiOS...');
// 藍起動
new Ai(account, [
new (account, [
new CoreModule(),
new EmojiModule(),
new EmojiReactModule(),