From d951031c5cc53b9705ba20d23a528a8109e17332 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Tue, 25 Aug 2020 02:16:39 +0800
Subject: [PATCH 01/31] init mapping

---
 package.json       |  3 ++-
 tsconfig.test.json | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 tsconfig.test.json

diff --git a/package.json b/package.json
index f29f4548df..04007dbaeb 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "bump": "ts-node build/bump",
     "dep": "ts-node build/dep",
     "docs": "cd docs && yarn dev",
-    "test": "mocha --experimental-vm-modules --enable-source-maps",
+    "test": "cross-env TS_NODE_PROJECT=tsconfig.test.json mocha --experimental-vm-modules --enable-source-maps",
     "test:json": "c8 -r json yarn test",
     "test:lcov": "rimraf coverage && c8 -r lcov yarn test",
     "test:text": "c8 -r text yarn test",
@@ -41,6 +41,7 @@
     "cac": "^6.6.1",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
+    "cross-env": "^7.0.2",
     "cross-spawn": "^7.0.3",
     "del": "^5.1.0",
     "eslint": "^7.7.0",
diff --git a/tsconfig.test.json b/tsconfig.test.json
new file mode 100644
index 0000000000..9f761ab605
--- /dev/null
+++ b/tsconfig.test.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "paths": {
+      "koishi-plugin-*": ["packages/plugin-*/src"],
+      "koishi-adapter-*": ["packages/adapter-*/src"],
+      "koishi-*": ["packages/koishi-*/src"],
+    },
+  },
+}
\ No newline at end of file

From b1ea76d2dfc43e4ba5852b52e1eeb03beeb36541 Mon Sep 17 00:00:00 2001
From: jjyyxx <jyx17@mails.tsinghua.edu.cn>
Date: Tue, 25 Aug 2020 10:52:27 +0800
Subject: [PATCH 02/31] test: fix path mapping

---
 .mocharc.js        | 5 ++++-
 package.json       | 1 +
 tsconfig.test.json | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.mocharc.js b/.mocharc.js
index ceb525497a..f8674754a7 100644
--- a/.mocharc.js
+++ b/.mocharc.js
@@ -8,5 +8,8 @@ module.exports = {
     'packages/plugin-eval/tests/*.spec.ts',
     'packages/plugin-teach/tests/*.spec.ts',
   ],
-  require: 'ts-node/register/transpile-only',
+  require: [
+    'ts-node/register/transpile-only',
+    'tsconfig-paths/register',
+  ],
 }
diff --git a/package.json b/package.json
index 04007dbaeb..326c4d3656 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
     "rimraf": "^3.0.2",
     "semver": "^7.3.2",
     "ts-node": "^9.0.0",
+    "tsconfig-paths": "^3.9.0",
     "typescript": "^4.0.2"
   }
 }
diff --git a/tsconfig.test.json b/tsconfig.test.json
index 9f761ab605..58b195fcd6 100644
--- a/tsconfig.test.json
+++ b/tsconfig.test.json
@@ -1,6 +1,7 @@
 {
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
+    "baseUrl": ".",
     "paths": {
       "koishi-plugin-*": ["packages/plugin-*/src"],
       "koishi-adapter-*": ["packages/adapter-*/src"],

From 5565ff9d4ae9c5bdebb0589cf2dd22df67878fbd Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Tue, 25 Aug 2020 12:21:30 +0800
Subject: [PATCH 03/31] teach: adjust regexp validator

---
 packages/plugin-teach/src/database/mysql.ts | 47 +++------------------
 packages/plugin-teach/src/internal.ts       | 25 +++--------
 packages/plugin-teach/tests/basic.spec.ts   |  4 +-
 3 files changed, 14 insertions(+), 62 deletions(-)

diff --git a/packages/plugin-teach/src/database/mysql.ts b/packages/plugin-teach/src/database/mysql.ts
index d19f2b888b..c0b3e86b44 100644
--- a/packages/plugin-teach/src/database/mysql.ts
+++ b/packages/plugin-teach/src/database/mysql.ts
@@ -2,7 +2,6 @@ import { Context, extendDatabase, Message } from 'koishi-core'
 import { clone, defineProperty, Observed, pick } from 'koishi-utils'
 import { Dialogue, DialogueTest } from '../utils'
 import { escape } from 'mysql'
-import { RegExpError } from '../internal'
 import { format } from 'util'
 import MysqlDatabase from 'koishi-plugin-mysql/dist/database'
 
@@ -12,30 +11,6 @@ declare module 'koishi-core/dist/context' {
   }
 }
 
-declare module 'koishi-core/dist/plugins/message' {
-  namespace Message {
-    export namespace Teach {
-      let WhitespaceCharset: string
-      let NonspaceCharset: string
-      let UnsupportedCharset: string
-      let UnsupportedWordBoundary: string
-      let UnsupportedNongreedy: string
-      let UnsupportedLookaround: string
-      let UnsupportedNoncapturing: string
-      let UnsupportedNamedGroup: string
-    }
-  }
-}
-
-Message.Teach.WhitespaceCharset = '问题中的空白字符会被自动删除，你无需使用 \\s。'
-Message.Teach.NonspaceCharset = '问题中的空白字符会被自动删除，请使用 . 代替 \\S。'
-Message.Teach.UnsupportedCharset = '目前不支持在正则表达式中使用 \\%s，请使用 [%s] 代替。'
-Message.Teach.UnsupportedWordBoundary = '目前不支持在正则表达式中使用单词边界。'
-Message.Teach.UnsupportedNongreedy = '目前不支持在正则表达式中使用非捕获组。'
-Message.Teach.UnsupportedLookaround = '目前不支持在正则表达式中使用断言。'
-Message.Teach.UnsupportedNoncapturing = '目前不支持在正则表达式中使用非捕获组。'
-Message.Teach.UnsupportedNamedGroup = '目前不支持在正则表达式中使用具名组。'
-
 extendDatabase<typeof MysqlDatabase>('koishi-plugin-mysql', {
   async getDialoguesById(ids, fields) {
     if (!ids.length) return []
@@ -124,32 +99,22 @@ extendDatabase<typeof MysqlDatabase>('koishi-plugin-mysql', ({ listFields }) =>
 export default function apply(ctx: Context, config: Dialogue.Config) {
   config.validateRegExp = {
     onEscapeCharacterSet(start, end, kind, negate) {
-      // eslint-disable-next-line curly
-      if (kind === 'space') throw negate
-        ? new RegExpError(Message.Teach.WhitespaceCharset)
-        : new RegExpError(Message.Teach.NonspaceCharset)
-      let chars = kind === 'digit' ? '0-9' : '_0-9a-z'
-      let source = kind === 'digit' ? 'd' : 'w'
-      if (negate) {
-        chars = '^' + chars
-        source = source.toUpperCase()
-      }
-      throw new RegExpError(format(Message.Teach.UnsupportedCharset, source, chars))
+      throw new SyntaxError('unsupported escape character set')
     },
     onQuantifier(start, end, min, max, greedy) {
-      if (!greedy) throw new RegExpError(Message.Teach.UnsupportedNongreedy)
+      if (!greedy) throw new SyntaxError('unsupported non-greedy quantifier')
     },
     onWordBoundaryAssertion() {
-      throw new RegExpError(Message.Teach.UnsupportedWordBoundary)
+      throw new SyntaxError('unsupported word boundary assertion')
     },
     onLookaroundAssertionEnter() {
-      throw new RegExpError(Message.Teach.UnsupportedLookaround)
+      throw new SyntaxError('unsupported lookaround assertion')
     },
     onGroupEnter() {
-      throw new RegExpError(Message.Teach.UnsupportedNoncapturing)
+      throw new SyntaxError('unsupported non-capturing group')
     },
     onCapturingGroupEnter(start, name) {
-      if (name) throw new RegExpError(Message.Teach.UnsupportedNamedGroup)
+      if (name) throw new SyntaxError('unsupported named capturing group')
     },
   }
 
diff --git a/packages/plugin-teach/src/internal.ts b/packages/plugin-teach/src/internal.ts
index 54ae1a0f6a..f7d5df9682 100644
--- a/packages/plugin-teach/src/internal.ts
+++ b/packages/plugin-teach/src/internal.ts
@@ -2,9 +2,9 @@ import { Context, Message } from 'koishi-core'
 import { Dialogue } from './utils'
 import { update } from './update'
 import { RegExpValidator } from 'regexpp'
-import { defineProperty, Logger } from 'koishi-utils'
+import { defineProperty } from 'koishi-utils'
 import { formatQuestionAnswers } from './search'
-import { format, types } from 'util'
+import { format } from 'util'
 import leven from 'leven'
 
 declare module 'koishi-core/dist/plugins/message' {
@@ -30,14 +30,7 @@ Message.Teach.IllegalRegExp = '问题含有错误的或不支持的正则表达
 Message.Teach.MayModifyAnswer = '推测你想修改的是回答而不是问题。发送空行或句号以修改回答，使用 -i 选项以忽略本提示。'
 Message.Teach.MaybeRegExp = '推测你想%s的问题是正则表达式。发送空行或句号以添加 -x 选项，使用 -i 选项以忽略本提示。'
 
-export class RegExpError extends Error {
-  name = 'RegExpError'
-}
-
-const validator = new RegExpValidator()
-
 export default function apply(ctx: Context, config: Dialogue.Config) {
-  const logger = new Logger('teach')
   defineProperty(ctx.app, 'teachHistory', {})
 
   ctx.command('teach')
@@ -86,6 +79,8 @@ export default function apply(ctx: Context, config: Dialogue.Config) {
     return question.startsWith('^') || question.endsWith('$')
   }
 
+  const validator = new RegExpValidator(config.validateRegExp)
+
   ctx.on('dialogue/before-modify', async (argv) => {
     const { options, session, target, dialogues } = argv
     const { question, answer, ignoreHint, regexp } = options
@@ -121,17 +116,7 @@ export default function apply(ctx: Context, config: Dialogue.Config) {
       try {
         questions.map(q => validator.validatePattern(q))
       } catch (error) {
-        if (!types.isNativeError(error)) {
-          logger.warn(question, error)
-          return Message.Teach.IllegalRegExp
-        } else if (error.name === 'RegExpError') {
-          return error.message
-        } else {
-          if (!error.message.startsWith('SyntaxError')) {
-            logger.warn(question, error.stack)
-          }
-          return Message.Teach.IllegalRegExp
-        }
+        return Message.Teach.IllegalRegExp
       }
     }
   })
diff --git a/packages/plugin-teach/tests/basic.spec.ts b/packages/plugin-teach/tests/basic.spec.ts
index aad7bf8ae3..2653eba92e 100644
--- a/packages/plugin-teach/tests/basic.spec.ts
+++ b/packages/plugin-teach/tests/basic.spec.ts
@@ -43,7 +43,9 @@ describe('koishi-plugin-teach', () => {
     await session1.shouldHaveReply('# foo bar', '问答已存在，编号为 1，如要修改请尝试使用 #1 指令。')
     await session1.shouldHaveReply('# foo bar -P 1', '修改了已存在的问答，编号为 1。')
     await session1.shouldHaveReply('#1 -P 1', '问答 1 没有发生改动。')
-    await session1.shouldHaveReply('#1 ~ baz', '问答 1 已成功修改。')
+    await session1.shouldHaveReply('#1 baz', '推测你想修改的是回答而不是问题。发送空行或句号以修改回答，使用 -i 选项以忽略本提示。')
+    await session1.shouldHaveReply('#1 baz', '推测你想修改的是回答而不是问题。发送空行或句号以修改回答，使用 -i 选项以忽略本提示。')
+    await session1.shouldHaveReply('.', '问答 1 已成功修改。')
     await session1.shouldHaveReply('foo', 'baz')
   })
 

From f630501d14f70eed0169dc746a60e6342da2d651 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Tue, 25 Aug 2020 15:01:36 +0800
Subject: [PATCH 04/31] teach: fix history support

---
 packages/plugin-teach/src/plugins/context.ts  |  21 +-
 .../plugin-teach/src/plugins/successor.ts     |   1 +
 packages/plugin-teach/src/plugins/time.ts     |  11 +-
 packages/plugin-teach/src/plugins/writer.ts   |   8 +-
 packages/plugin-teach/src/update.ts           |   4 +-
 packages/plugin-teach/src/utils.ts            |   2 -
 packages/plugin-teach/tests/basic.spec.ts     | 218 +++++++++++++-----
 7 files changed, 189 insertions(+), 76 deletions(-)

diff --git a/packages/plugin-teach/src/plugins/context.ts b/packages/plugin-teach/src/plugins/context.ts
index 2c139eee1a..71fbc0fc90 100644
--- a/packages/plugin-teach/src/plugins/context.ts
+++ b/packages/plugin-teach/src/plugins/context.ts
@@ -18,12 +18,17 @@ declare module '../utils' {
       groups?: string[]
       partial?: boolean
       reversed?: boolean
-      noContextOptions?: boolean
+    }
+
+    interface Config {
+      useContext?: boolean
     }
   }
 }
 
 export default function apply(ctx: Context, config: Dialogue.Config) {
+  if (config.useContext === false) return
+
   ctx.command('teach')
     .option('disable', '-d  在当前环境下禁用问答')
     .option('disableGlobal', '-D  在所有环境下禁用问答', { authority: 3 })
@@ -46,12 +51,12 @@ export default function apply(ctx: Context, config: Dialogue.Config) {
     } else if (options.disableGlobal && options.enableGlobal) {
       return '选项 -D, -E 不能同时使用。'
     } else if (options.disableGlobal && options.disable) {
-      return '选项 -d, -D 不能同时使用。'
+      return '选项 -D, -d 不能同时使用。'
     } else if (options.enable && options.enableGlobal) {
-      return '选项 -e, -E 不能同时使用。'
+      return '选项 -E, -e 不能同时使用。'
     }
 
-    argv.noContextOptions = false
+    let noContextOptions = false
     if (options.disable) {
       argv.reversed = true
       argv.partial = !options.enableGlobal
@@ -65,7 +70,7 @@ export default function apply(ctx: Context, config: Dialogue.Config) {
       argv.partial = false
       argv.groups = []
     } else {
-      argv.noContextOptions = !options.enable
+      noContextOptions = !options.enable
       if (options.target ? options.enable : !options.global) {
         argv.reversed = false
         argv.partial = true
@@ -74,13 +79,13 @@ export default function apply(ctx: Context, config: Dialogue.Config) {
     }
 
     if ('groups' in options) {
-      if (argv.noContextOptions) {
-        return '参数 -g, --groups 必须与 -d/-D/-e/-E 之一同时使用。'
+      if (noContextOptions) {
+        return '选项 -g, --groups 必须与 -d/-D/-e/-E 之一同时使用。'
       } else {
         argv.groups = options.groups ? options.groups.split(',') : []
       }
     } else if (session.messageType !== 'group' && argv.partial) {
-      return '非群聊上下文中请使用 -E/-D 进行操作或指定 -g, --groups 参数。'
+      return '非群聊上下文中请使用 -E/-D 进行操作或指定 -g, --groups 选项。'
     }
   })
 
diff --git a/packages/plugin-teach/src/plugins/successor.ts b/packages/plugin-teach/src/plugins/successor.ts
index e2f3afb35f..672b799e4b 100644
--- a/packages/plugin-teach/src/plugins/successor.ts
+++ b/packages/plugin-teach/src/plugins/successor.ts
@@ -39,6 +39,7 @@ declare module '../utils' {
 
 export default function apply(ctx: Context, config: Dialogue.Config) {
   const { successorTimeout = 20000 } = config
+  if (!successorTimeout) return
 
   ctx.command('teach')
     .option('setPred', '< <ids>  设置前置问题', { type: 'string', validate: RE_DIALOGUES })
diff --git a/packages/plugin-teach/src/plugins/time.ts b/packages/plugin-teach/src/plugins/time.ts
index 8bac76ca67..e114e22674 100644
--- a/packages/plugin-teach/src/plugins/time.ts
+++ b/packages/plugin-teach/src/plugins/time.ts
@@ -1,4 +1,5 @@
 import { Context } from 'koishi-core'
+import { Dialogue } from '../utils'
 
 declare module '../utils' {
   interface DialogueTest {
@@ -10,6 +11,12 @@ declare module '../utils' {
     startTime: number
     endTime: number
   }
+
+  namespace Dialogue {
+    interface Config {
+      useTime?: boolean
+    }
+  }
 }
 
 export function isHours(value: string) {
@@ -19,7 +26,9 @@ export function isHours(value: string) {
   return !(hours >= 0 && hours < 24 && minutes >= 0 && minutes < 60)
 }
 
-export default function apply(ctx: Context) {
+export default function apply(ctx: Context, config: Dialogue.Config) {
+  if (config.useTime === false) return
+
   ctx.command('teach')
     .option('startTime', '-t <time>  起始时间', { type: 'string', validate: isHours })
     .option('endTime', '-T <time>  结束时间', { type: 'string', validate: isHours })
diff --git a/packages/plugin-teach/src/plugins/writer.ts b/packages/plugin-teach/src/plugins/writer.ts
index 6e473ca223..f1bb782181 100644
--- a/packages/plugin-teach/src/plugins/writer.ts
+++ b/packages/plugin-teach/src/plugins/writer.ts
@@ -19,10 +19,16 @@ declare module '../utils' {
       /** 用于保存用户权限的键值对，键的范围包括目标问答列表的全体作者以及 -w 参数 */
       authMap?: Record<number, number>
     }
+
+    interface Config {
+      useWriter?: boolean
+    }
   }
 }
 
-export default function apply(ctx: Context) {
+export default function apply(ctx: Context, config: Dialogue.Config) {
+  if (config.useWriter === false) return
+
   ctx.command('teach')
     .option('frozen', '-f  锁定这个问答', { authority: 4 })
     .option('frozen', '-F, --no-frozen  解锁这个问答', { authority: 4, value: false })
diff --git a/packages/plugin-teach/src/update.ts b/packages/plugin-teach/src/update.ts
index 2722f3a6ca..abc0f8c63a 100644
--- a/packages/plugin-teach/src/update.ts
+++ b/packages/plugin-teach/src/update.ts
@@ -49,7 +49,7 @@ export default function apply(ctx: Context) {
     const { includeLast, excludeLast } = options
     if (!options.review && !options.revert) return
     const now = Date.now(), includeTime = Time.parseTime(includeLast), excludeTime = Time.parseTime(excludeLast)
-    const dialogues = Object.values(Dialogue.history).filter((dialogue) => {
+    const dialogues = Object.values(argv.app.teachHistory).filter((dialogue) => {
       if (dialogue._operator !== session.userId) return
       const offset = now - dialogue._timestamp
       if (includeTime && offset >= includeTime) return
@@ -128,7 +128,7 @@ export async function update(argv: Dialogue.Argv) {
   argv.updated = []
   argv.skipped = []
   const dialogues = argv.dialogues = revert || review
-    ? Object.values(pick(Dialogue.history, target)).filter(Boolean)
+    ? Object.values(pick(argv.app.teachHistory, target)).filter(Boolean)
     : await app.database.getDialoguesById(target)
   argv.dialogueMap = Object.fromEntries(dialogues.map(d => [d.id, { ...d }]))
 
diff --git a/packages/plugin-teach/src/utils.ts b/packages/plugin-teach/src/utils.ts
index 2f6ce8c349..b4d5a29699 100644
--- a/packages/plugin-teach/src/utils.ts
+++ b/packages/plugin-teach/src/utils.ts
@@ -66,8 +66,6 @@ export namespace Dialogue {
   export type ModifyType = '添加' | '修改' | '删除'
   export type Field = keyof Dialogue
 
-  export const history: Record<number, Dialogue> = []
-
   export interface Config {
     prefix?: string
     historyAge?: number
diff --git a/packages/plugin-teach/tests/basic.spec.ts b/packages/plugin-teach/tests/basic.spec.ts
index 2653eba92e..1e332eb5b6 100644
--- a/packages/plugin-teach/tests/basic.spec.ts
+++ b/packages/plugin-teach/tests/basic.spec.ts
@@ -3,78 +3,172 @@ import * as teach from 'koishi-plugin-teach'
 import * as utils from './utils'
 import { expect } from 'chai'
 
-const app = new App({ prefix: '.' })
-const session1 = app.createSession('group', 123, 456)
-const session2 = app.createSession('group', 321, 456)
+describe('Plugin Teach', () => {
+  describe('basic support', () => {
+    const app = new App({ prefix: '.' })
+    const session1 = app.createSession('group', 123, 456)
+    const session2 = app.createSession('group', 321, 456)
 
-app.plugin(teach, {
-  historyAge: 0,
-  mergeThreshold: 1,
-})
+    app.plugin(teach, {
+      historyAge: 0,
+      mergeThreshold: 1,
+    })
 
-app.plugin(utils)
+    app.plugin(utils)
 
-before(async () => {
-  await app.start()
-  await app.database.getUser(123, 3)
-  await app.database.getUser(321, 2)
-  await app.database.getGroup(456, app.selfId)
-})
+    before(async () => {
+      await app.start()
+      await app.database.getUser(123, 3)
+      await app.database.getUser(321, 2)
+      await app.database.getGroup(456, app.selfId)
+    })
 
-after(async () => {
-  await app.stop()
-})
+    it('create', async () => {
+      await session1.shouldHaveNoReply('foo')
+      await session1.shouldHaveReply('# foo', '缺少问题或回答，请检查指令语法。')
+      await session1.shouldHaveReply('# foo bar', '问答已添加，编号为 1。')
+      await session1.shouldHaveReply('# foo bar baz', '存在多余的参数，请检查指令语法或将含有空格或换行的问答置于一对引号内。')
+      await session1.shouldHaveReply('foo', 'bar')
+    })
 
-describe('koishi-plugin-teach', () => {
-  it('create', async () => {
-    await session1.shouldHaveNoReply('foo')
-    await session1.shouldHaveReply('# foo', '缺少问题或回答，请检查指令语法。')
-    await session1.shouldHaveReply('# foo bar', '问答已添加，编号为 1。')
-    await session1.shouldHaveReply('# foo bar baz', '存在多余的参数，请检查指令语法或将含有空格或换行的问答置于一对引号内。')
-    await session1.shouldHaveReply('foo', 'bar')
-  })
+    it('validate', async () => {
+      await session1.shouldHaveReply('# [CQ:image] bar', '问题必须是纯文本。')
+      await session1.shouldHaveReply('# foo[foo bar -x', '问题含有错误的或不支持的正则表达式语法。')
+    })
 
-  it('validate', async () => {
-    await session1.shouldHaveReply('# [CQ:image] bar', '问题必须是纯文本。')
-    await session1.shouldHaveReply('# foo[foo bar -x', '问题含有错误的或不支持的正则表达式语法。')
-  })
+    it('modify', async () => {
+      await session1.shouldHaveReply('# foo bar', '问答已存在，编号为 1，如要修改请尝试使用 #1 指令。')
+      await session1.shouldHaveReply('# foo bar -P 1', '修改了已存在的问答，编号为 1。')
+      await session1.shouldHaveReply('#1 -P 1', '问答 1 没有发生改动。')
+      await session1.shouldHaveReply('#1 baz', '推测你想修改的是回答而不是问题。发送空行或句号以修改回答，使用 -i 选项以忽略本提示。')
+      await session1.shouldHaveReply('#1 baz', '推测你想修改的是回答而不是问题。发送空行或句号以修改回答，使用 -i 选项以忽略本提示。')
+      await session1.shouldHaveReply('.', '问答 1 已成功修改。')
+      await session1.shouldHaveReply('foo', 'baz')
+    })
 
-  it('modify', async () => {
-    await session1.shouldHaveReply('# foo bar', '问答已存在，编号为 1，如要修改请尝试使用 #1 指令。')
-    await session1.shouldHaveReply('# foo bar -P 1', '修改了已存在的问答，编号为 1。')
-    await session1.shouldHaveReply('#1 -P 1', '问答 1 没有发生改动。')
-    await session1.shouldHaveReply('#1 baz', '推测你想修改的是回答而不是问题。发送空行或句号以修改回答，使用 -i 选项以忽略本提示。')
-    await session1.shouldHaveReply('#1 baz', '推测你想修改的是回答而不是问题。发送空行或句号以修改回答，使用 -i 选项以忽略本提示。')
-    await session1.shouldHaveReply('.', '问答 1 已成功修改。')
-    await session1.shouldHaveReply('foo', 'baz')
-  })
+    it('search 1', async () => {
+      await session1.shouldHaveReply('## foo', '问题“foo”的回答如下：\n1. [P=1] baz')
+      await session1.shouldHaveReply('## baz', '没有搜索到问题“baz”，请尝试使用正则表达式匹配。')
+      await session1.shouldHaveReply('## baz -x', '没有搜索到含有正则表达式“baz”的问题。')
+      await session1.shouldHaveReply('## ~ baz', '回答“baz”的问题如下：\n1. [P=1] foo')
+      await session1.shouldHaveReply('## ~ foo', '没有搜索到回答“foo”，请尝试使用正则表达式匹配。')
+      await session1.shouldHaveReply('## ~ foo -x', '没有搜索到含有正则表达式“foo”的回答。')
+      await session1.shouldHaveReply('## foo baz', '“foo”“baz”匹配的回答如下：\n1')
+      await session1.shouldHaveReply('## foo bar', '没有搜索到问答“foo”“bar”，请尝试使用正则表达式匹配。')
+      await session1.shouldHaveReply('## foo bar -x', '没有搜索到含有正则表达式“foo”“bar”的问答。')
+    })
 
-  it('search 1', async () => {
-    await session1.shouldHaveReply('## foo', '问题“foo”的回答如下：\n1. [P=1] baz')
-    await session1.shouldHaveReply('## baz', '没有搜索到问题“baz”，请尝试使用正则表达式匹配。')
-    await session1.shouldHaveReply('## baz -x', '没有搜索到含有正则表达式“baz”的问题。')
-    await session1.shouldHaveReply('## ~ baz', '回答“baz”的问题如下：\n1. [P=1] foo')
-    await session1.shouldHaveReply('## ~ foo', '没有搜索到回答“foo”，请尝试使用正则表达式匹配。')
-    await session1.shouldHaveReply('## ~ foo -x', '没有搜索到含有正则表达式“foo”的回答。')
-    await session1.shouldHaveReply('## foo baz', '“foo”“baz”匹配的回答如下：\n1')
-    await session1.shouldHaveReply('## foo bar', '没有搜索到问答“foo”“bar”，请尝试使用正则表达式匹配。')
-    await session1.shouldHaveReply('## foo bar -x', '没有搜索到含有正则表达式“foo”“bar”的问答。')
-  })
+    it('search 2', async () => {
+      await session1.shouldHaveReply('# foo bar', '问答已添加，编号为 2。')
+      await session1.shouldHaveReply('# goo bar', '问答已添加，编号为 3。')
+      await session1.shouldHaveReply('##', '共收录了 2 个问题和 3 个回答。')
+      await session1.shouldHaveReply('## fo -x', '问题正则表达式“fo”的搜索结果如下：\n1. [P=1] 问题：foo，回答：baz\n2. 问题：foo，回答：bar')
+      await session1.shouldHaveReply('## ~ ar -x', '回答正则表达式“ar”的搜索结果如下：\n2. 问题：foo，回答：bar\n3. 问题：goo，回答：bar')
+      await session1.shouldHaveReply('## fo ar -x', '问答正则表达式“fo”“ar”的搜索结果如下：\n2. 问题：foo，回答：bar')
+      await session1.shouldHaveReply('### oo', '问题正则表达式“oo”的搜索结果如下：\nfoo (共 2 个回答)\ngoo (#3)')
+      await session1.shouldHaveReply('### ~ ba', '回答正则表达式“ba”的搜索结果如下：\nbaz (#1)\nbar (共 2 个问题)')
+    })
 
-  it('search 2', async () => {
-    await session1.shouldHaveReply('# foo bar', '问答已添加，编号为 2。')
-    await session1.shouldHaveReply('# goo bar', '问答已添加，编号为 3。')
-    await session1.shouldHaveReply('##', '共收录了 2 个问题和 3 个回答。')
-    await session1.shouldHaveReply('## fo -x', '问题正则表达式“fo”的搜索结果如下：\n1. [P=1] 问题：foo，回答：baz\n2. 问题：foo，回答：bar')
-    await session1.shouldHaveReply('## ~ ar -x', '回答正则表达式“ar”的搜索结果如下：\n2. 问题：foo，回答：bar\n3. 问题：goo，回答：bar')
-    await session1.shouldHaveReply('## fo ar -x', '问答正则表达式“fo”“ar”的搜索结果如下：\n2. 问题：foo，回答：bar')
-    await session1.shouldHaveReply('### oo', '问题正则表达式“oo”的搜索结果如下：\nfoo (共 2 个回答)\ngoo (#3)')
-    await session1.shouldHaveReply('### ~ ba', '回答正则表达式“ba”的搜索结果如下：\nbaz (#1)\nbar (共 2 个问题)')
+    it('miscellaneous', async () => {
+      await session1.shouldHaveNoReply('.foo')
+      await session1.shouldHaveReply('#')
+      await session2.shouldHaveReply('#')
+    })
   })
 
-  it('miscellaneous', async () => {
-    await session1.shouldHaveNoReply('.foo')
-    await session1.shouldHaveReply('#')
-    await session2.shouldHaveReply('#')
+  function createEnvironment(config: teach.Config) {
+    const app = new App()
+    const user = app.createSession('user', 123)
+    const group1 = app.createSession('group', 123, 456)
+    const group2 = app.createSession('group', 123, 789)
+
+    app.plugin(teach, {
+      historyAge: 0,
+      useContext: false,
+      useTime: false,
+      useWriter: false,
+      successorTimeout: 0,
+      ...config,
+    })
+
+    app.plugin(utils)
+
+    before(async () => {
+      await app.start()
+      await app.database.getUser(123, 3)
+      await app.database.getGroup(456, app.selfId)
+      await app.database.getGroup(789, app.selfId)
+    })
+
+    return { app, user, group1, group2 }
+  }
+
+  describe('context', () => {
+    const { user, group1, group2 } = createEnvironment({ useContext: true })
+    const DETAIL_HEAD = '编号为 1 的问答信息：\n问题：foo\n回答：bar\n'
+    const SEARCH_HEAD = '问题“foo”的回答如下：\n'
+
+    it('validate options 1', async () => {
+      await user.shouldHaveReply('# foo bar', '非群聊上下文中请使用 -E/-D 进行操作或指定 -g, --groups 选项。')
+      await user.shouldHaveReply('# foo bar -g 456', '选项 -g, --groups 必须与 -d/-D/-e/-E 之一同时使用。')
+      await user.shouldHaveReply('# foo bar -eg 456', '问答已添加，编号为 1。')
+      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：本群')
+      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [e] bar')
+    })
+
+    it('validate options 2', async () => {
+      await group1.shouldHaveReply('#1 -de', '选项 -d, -e 不能同时使用。')
+      await group1.shouldHaveReply('#1 -DE', '选项 -D, -E 不能同时使用。')
+      await group1.shouldHaveReply('#1 -Dd', '选项 -D, -d 不能同时使用。')
+      await group1.shouldHaveReply('#1 -Ee', '选项 -E, -e 不能同时使用。')
+    })
+
+    it('limited group enabled (with current group)', async () => {
+      await group2.shouldHaveReply('# foo bar', '修改了已存在的问答，编号为 1。')
+      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：本群等 2 个群')
+      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [e] bar')
+    })
+
+    it('limited group enabled (without current group)', async () => {
+      await group1.shouldHaveReply('#1 -d', '问答 1 已成功修改。')
+      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：1 个群')
+      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [D] bar')
+    })
+
+    it('limited group enabled (with no groups)', async () => {
+      await group1.shouldHaveReply('#1 -D', '问答 1 已成功修改。')
+      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：全局禁止')
+      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [D] bar')
+    })
+
+    it('unlimited group enabled (with all groups)', async () => {
+      await group1.shouldHaveReply('#1 -E', '问答 1 已成功修改。')
+      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：全局')
+      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [E] bar')
+    })
+
+    it('unlimited group enabled (with current group)', async () => {
+      await group1.shouldHaveReply('#1 -dg 789', '问答 1 已成功修改。')
+      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：除 1 个群外的所有群')
+      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [E] bar')
+    })
+
+    it('unlimited group enabled (without current group)', async () => {
+      await group1.shouldHaveReply('#1 -d', '问答 1 已成功修改。')
+      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：除本群等 2 个群外的所有群')
+      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [d] bar')
+    })
+
+    it('limited group enabled (with current group only)', async () => {
+      await group1.shouldHaveReply('#1 -De', '问答 1 已成功修改。')
+      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：本群')
+      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [e] bar')
+    })
+
+    it('unlimited group enabled (without current group only)', async () => {
+      await group1.shouldHaveReply('#1 -Ed', '问答 1 已成功修改。')
+      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：除本群')
+      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [d] bar')
+    })
   })
 })

From e278cbd019000cfad969584fd52cea98f062293c Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Tue, 25 Aug 2020 16:05:53 +0800
Subject: [PATCH 05/31] teach: fix modification overriding writer

---
 packages/plugin-teach/src/plugins/writer.ts |   4 +-
 packages/plugin-teach/tests/basic.spec.ts   | 136 +++++++++++++-------
 2 files changed, 94 insertions(+), 46 deletions(-)

diff --git a/packages/plugin-teach/src/plugins/writer.ts b/packages/plugin-teach/src/plugins/writer.ts
index f1bb782181..6c4ccf3f9c 100644
--- a/packages/plugin-teach/src/plugins/writer.ts
+++ b/packages/plugin-teach/src/plugins/writer.ts
@@ -127,10 +127,10 @@ export default function apply(ctx: Context, config: Dialogue.Config) {
     }
   })
 
-  ctx.on('dialogue/modify', ({ options, session }, data) => {
+  ctx.on('dialogue/modify', ({ options, session, target }, data) => {
     if (options.writer !== undefined) {
       data.writer = options.writer
-    } else if (options.create) {
+    } else if (!target) {
       data.writer = session.userId
     }
   })
diff --git a/packages/plugin-teach/tests/basic.spec.ts b/packages/plugin-teach/tests/basic.spec.ts
index 1e332eb5b6..d01e29d766 100644
--- a/packages/plugin-teach/tests/basic.spec.ts
+++ b/packages/plugin-teach/tests/basic.spec.ts
@@ -2,6 +2,7 @@ import { App } from 'koishi-test-utils'
 import * as teach from 'koishi-plugin-teach'
 import * as utils from './utils'
 import { expect } from 'chai'
+import { fn } from 'jest-mock'
 
 describe('Plugin Teach', () => {
   describe('basic support', () => {
@@ -77,10 +78,18 @@ describe('Plugin Teach', () => {
   })
 
   function createEnvironment(config: teach.Config) {
-    const app = new App()
-    const user = app.createSession('user', 123)
-    const group1 = app.createSession('group', 123, 456)
-    const group2 = app.createSession('group', 123, 789)
+    const app = new App({ userCacheAge: Number.EPSILON })
+    const u2id = 200, u3id = 300, u4id = 400
+    const g1id = 100, g2id = 200
+    const u2 = app.createSession('user', u2id)
+    const u3 = app.createSession('user', u3id)
+    const u4 = app.createSession('user', u4id)
+    const u2g1 = app.createSession('group', u2id, g1id)
+    const u2g2 = app.createSession('group', u2id, g2id)
+    const u3g1 = app.createSession('group', u3id, g1id)
+    const u3g2 = app.createSession('group', u3id, g2id)
+    const u4g1 = app.createSession('group', u4id, g1id)
+    const u4g2 = app.createSession('group', u4id, g2id)
 
     app.plugin(teach, {
       historyAge: 0,
@@ -95,80 +104,119 @@ describe('Plugin Teach', () => {
 
     before(async () => {
       await app.start()
-      await app.database.getUser(123, 3)
-      await app.database.getGroup(456, app.selfId)
-      await app.database.getGroup(789, app.selfId)
+      await app.database.getUser(u2id, 2)
+      await app.database.getUser(u3id, 3)
+      await app.database.getUser(u4id, 4)
+      await app.database.getGroup(g1id, app.selfId)
+      await app.database.getGroup(g2id, app.selfId)
     })
 
-    return { app, user, group1, group2 }
+    return { app, u2, u3, u4, u2g1, u2g2, u3g1, u3g2, u4g1, u4g2 }
   }
 
+  const DETAIL_HEAD = '编号为 1 的问答信息：\n问题：foo\n回答：bar\n'
+  const SEARCH_HEAD = '问题“foo”的回答如下：\n'
+
   describe('context', () => {
-    const { user, group1, group2 } = createEnvironment({ useContext: true })
-    const DETAIL_HEAD = '编号为 1 的问答信息：\n问题：foo\n回答：bar\n'
-    const SEARCH_HEAD = '问题“foo”的回答如下：\n'
+    const { u3, u3g1, u3g2 } = createEnvironment({ useContext: true })
 
     it('validate options 1', async () => {
-      await user.shouldHaveReply('# foo bar', '非群聊上下文中请使用 -E/-D 进行操作或指定 -g, --groups 选项。')
-      await user.shouldHaveReply('# foo bar -g 456', '选项 -g, --groups 必须与 -d/-D/-e/-E 之一同时使用。')
-      await user.shouldHaveReply('# foo bar -eg 456', '问答已添加，编号为 1。')
-      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：本群')
-      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [e] bar')
+      await u3.shouldHaveReply('# foo bar', '非群聊上下文中请使用 -E/-D 进行操作或指定 -g, --groups 选项。')
+      await u3.shouldHaveReply('# foo bar -g 100', '选项 -g, --groups 必须与 -d/-D/-e/-E 之一同时使用。')
+      await u3.shouldHaveReply('# foo bar -eg 100', '问答已添加，编号为 1。')
+      await u3g1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：本群')
+      await u3g1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [e] bar')
     })
 
     it('validate options 2', async () => {
-      await group1.shouldHaveReply('#1 -de', '选项 -d, -e 不能同时使用。')
-      await group1.shouldHaveReply('#1 -DE', '选项 -D, -E 不能同时使用。')
-      await group1.shouldHaveReply('#1 -Dd', '选项 -D, -d 不能同时使用。')
-      await group1.shouldHaveReply('#1 -Ee', '选项 -E, -e 不能同时使用。')
+      await u3g1.shouldHaveReply('#1 -de', '选项 -d, -e 不能同时使用。')
+      await u3g1.shouldHaveReply('#1 -DE', '选项 -D, -E 不能同时使用。')
+      await u3g1.shouldHaveReply('#1 -Dd', '选项 -D, -d 不能同时使用。')
+      await u3g1.shouldHaveReply('#1 -Ee', '选项 -E, -e 不能同时使用。')
     })
 
     it('limited group enabled (with current group)', async () => {
-      await group2.shouldHaveReply('# foo bar', '修改了已存在的问答，编号为 1。')
-      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：本群等 2 个群')
-      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [e] bar')
+      await u3g2.shouldHaveReply('# foo bar', '修改了已存在的问答，编号为 1。')
+      await u3g1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：本群等 2 个群')
+      await u3g1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [e] bar')
     })
 
     it('limited group enabled (without current group)', async () => {
-      await group1.shouldHaveReply('#1 -d', '问答 1 已成功修改。')
-      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：1 个群')
-      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [D] bar')
+      await u3g1.shouldHaveReply('#1 -d', '问答 1 已成功修改。')
+      await u3g1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：1 个群')
+      await u3g1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [D] bar')
     })
 
     it('limited group enabled (with no groups)', async () => {
-      await group1.shouldHaveReply('#1 -D', '问答 1 已成功修改。')
-      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：全局禁止')
-      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [D] bar')
+      await u3g1.shouldHaveReply('#1 -D', '问答 1 已成功修改。')
+      await u3g1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：全局禁止')
+      await u3g1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [D] bar')
     })
 
     it('unlimited group enabled (with all groups)', async () => {
-      await group1.shouldHaveReply('#1 -E', '问答 1 已成功修改。')
-      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：全局')
-      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [E] bar')
+      await u3g1.shouldHaveReply('#1 -E', '问答 1 已成功修改。')
+      await u3g1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：全局')
+      await u3g1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [E] bar')
     })
 
     it('unlimited group enabled (with current group)', async () => {
-      await group1.shouldHaveReply('#1 -dg 789', '问答 1 已成功修改。')
-      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：除 1 个群外的所有群')
-      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [E] bar')
+      await u3g1.shouldHaveReply('#1 -dg 200', '问答 1 已成功修改。')
+      await u3g1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：除 1 个群外的所有群')
+      await u3g1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [E] bar')
     })
 
     it('unlimited group enabled (without current group)', async () => {
-      await group1.shouldHaveReply('#1 -d', '问答 1 已成功修改。')
-      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：除本群等 2 个群外的所有群')
-      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [d] bar')
+      await u3g1.shouldHaveReply('#1 -d', '问答 1 已成功修改。')
+      await u3g1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：除本群等 2 个群外的所有群')
+      await u3g1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [d] bar')
     })
 
     it('limited group enabled (with current group only)', async () => {
-      await group1.shouldHaveReply('#1 -De', '问答 1 已成功修改。')
-      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：本群')
-      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [e] bar')
+      await u3g1.shouldHaveReply('#1 -De', '问答 1 已成功修改。')
+      await u3g1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：本群')
+      await u3g1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [e] bar')
     })
 
     it('unlimited group enabled (without current group only)', async () => {
-      await group1.shouldHaveReply('#1 -Ed', '问答 1 已成功修改。')
-      await group1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：除本群')
-      await group1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [d] bar')
+      await u3g1.shouldHaveReply('#1 -Ed', '问答 1 已成功修改。')
+      await u3g1.shouldHaveReply('#1', DETAIL_HEAD + '生效环境：除本群')
+      await u3g1.shouldHaveReply('## foo -G', SEARCH_HEAD + '1. [d] bar')
+    })
+  })
+
+  describe('writer', () => {
+    const { app, u2, u3g1, u4g2 } = createEnvironment({ useWriter: true })
+
+    it('teach with writer', async () => {
+      // 当自身未设置 name 时使用 session.sender
+      u3g1.meta.sender.nickname = 'nick3'
+      await u3g1.shouldHaveReply('# foo bar', '问答已添加，编号为 1。')
+      await u3g1.shouldHaveReply('#1', DETAIL_HEAD + '来源：nick3 (300)')
+
+      // 重复添加问答时不应该覆盖旧的作者
+      await app.database.setUser(300, { name: 'user3' })
+      await u4g2.shouldHaveReply('# foo bar', '问答已存在，编号为 1，如要修改请尝试使用 #1 指令。')
+      await u4g2.shouldHaveReply('#1', DETAIL_HEAD + '来源：user3 (300)')
+    })
+
+    it('modify writer', async () => {
+      await u2.shouldHaveReply('#1 -W', '问答 1 因权限过低无法修改。')
+      await u4g2.shouldHaveReply('#1 -w foo', '参数 -w, --writer 错误，请检查指令语法。')
+      await u4g2.shouldHaveReply('#1 -w [CQ:at,qq=200]', '问答 1 已成功修改。')
+
+      // 实在找不到名字就只显示 QQ 号
+      await u4g2.shouldHaveReply('#1', DETAIL_HEAD + '来源：200')
+      const getMemberMap = app.bots[0].getMemberMap = fn()
+      getMemberMap.mockReturnValue(Promise.resolve({ 200: 'mock2' }))
+      await u4g2.shouldHaveReply('#1', DETAIL_HEAD + '来源：mock2 (200)')
+    })
+
+    it('anonymous', async () => {
+      u2.meta.sender.nickname = 'nick2'
+      await u2.shouldHaveReply('#1', DETAIL_HEAD + '来源：nick2 (200)')
+      await u2.shouldHaveReply('#1 -W', '问答 1 已成功修改。')
+      await u2.shouldHaveReply('#1', DETAIL_HEAD.slice(0, -1))
+      await u2.shouldHaveReply('#1 -p 0', '问答 1 因权限过低无法修改。')
     })
   })
 })

From 5f9349f9ed2572584d3ef90d9c3fd6a34427a671 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Tue, 25 Aug 2020 16:43:55 +0800
Subject: [PATCH 06/31] teach: fix auth 3 not able to set new writer as self

---
 packages/plugin-teach/src/plugins/writer.ts |  9 ++++---
 packages/plugin-teach/tests/basic.spec.ts   | 28 +++++++++++++++++++--
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/packages/plugin-teach/src/plugins/writer.ts b/packages/plugin-teach/src/plugins/writer.ts
index 6c4ccf3f9c..0b51d0cdb3 100644
--- a/packages/plugin-teach/src/plugins/writer.ts
+++ b/packages/plugin-teach/src/plugins/writer.ts
@@ -99,11 +99,12 @@ export default function apply(ctx: Context, config: Dialogue.Config) {
   // 当使用 -w 时需要原作者权限高于目标用户
   // 锁定的问答需要 4 级权限才能修改
   ctx.on('dialogue/permit', ({ session, target, options, authMap }, { writer, flag }) => {
-    const { substitute, writer: newWriter } = options, { authority } = session.$user
+    const { substitute, writer: newWriter } = options
+    const { id, authority } = session.$user
     return (
-      (newWriter && authority <= authMap[newWriter]) ||
+      (newWriter && authority <= authMap[newWriter] && newWriter !== id) ||
       ((flag & Dialogue.Flag.frozen) && authority < 4) ||
-      (writer !== session.$user.id && (
+      (writer !== id && (
         (target && authority < 3) || (
           (substitute || (flag & Dialogue.Flag.substitute)) &&
           (authority <= (authMap[writer] || 2))
@@ -114,7 +115,7 @@ export default function apply(ctx: Context, config: Dialogue.Config) {
 
   ctx.on('dialogue/detail-short', ({ flag }, output) => {
     if (flag & Dialogue.Flag.frozen) output.push('锁定')
-    if (flag & Dialogue.Flag.substitute) output.push('教学者执行')
+    if (flag & Dialogue.Flag.substitute) output.push('代行')
   })
 
   ctx.on('dialogue/before-search', ({ options }, test) => {
diff --git a/packages/plugin-teach/tests/basic.spec.ts b/packages/plugin-teach/tests/basic.spec.ts
index d01e29d766..0acd833fbf 100644
--- a/packages/plugin-teach/tests/basic.spec.ts
+++ b/packages/plugin-teach/tests/basic.spec.ts
@@ -185,9 +185,11 @@ describe('Plugin Teach', () => {
   })
 
   describe('writer', () => {
-    const { app, u2, u3g1, u4g2 } = createEnvironment({ useWriter: true })
+    const { app, u2, u2g1, u3g1, u4g2 } = createEnvironment({ useWriter: true })
 
-    it('teach with writer', async () => {
+    app.command('test').action(({ session }) => '' + session.userId)
+
+    it('create writer', async () => {
       // 当自身未设置 name 时使用 session.sender
       u3g1.meta.sender.nickname = 'nick3'
       await u3g1.shouldHaveReply('# foo bar', '问答已添加，编号为 1。')
@@ -202,6 +204,7 @@ describe('Plugin Teach', () => {
     it('modify writer', async () => {
       await u2.shouldHaveReply('#1 -W', '问答 1 因权限过低无法修改。')
       await u4g2.shouldHaveReply('#1 -w foo', '参数 -w, --writer 错误，请检查指令语法。')
+      await u4g2.shouldHaveReply('#1 -w [CQ:at,qq=500]', '指定的目标用户不存在。')
       await u4g2.shouldHaveReply('#1 -w [CQ:at,qq=200]', '问答 1 已成功修改。')
 
       // 实在找不到名字就只显示 QQ 号
@@ -218,5 +221,26 @@ describe('Plugin Teach', () => {
       await u2.shouldHaveReply('#1', DETAIL_HEAD.slice(0, -1))
       await u2.shouldHaveReply('#1 -p 0', '问答 1 因权限过低无法修改。')
     })
+
+    it('frozen', async () => {
+      await u3g1.shouldHaveReply('# foo baz -f', '权限不足。')
+      await u4g2.shouldHaveReply('# foo bar -f', '修改了已存在的问答，编号为 1。')
+      await u3g1.shouldHaveReply('# foo bar -p 0', '问答 1 因权限过低无法修改。')
+      await u3g1.shouldHaveReply('#1', DETAIL_HEAD + '此问答已锁定。')
+      await u3g1.shouldHaveReply('## foo', SEARCH_HEAD + '1. [锁定] bar')
+      await u4g2.shouldHaveReply('#1 -F', '问答 1 已成功修改。')
+    })
+
+    it('substitute', async () => {
+      u2g1.meta.sender.nickname = 'nick2'
+      const DETAIL_HEAD = '编号为 1 的问答信息：\n问题：foo\n回答：%s:%{test}\n'
+      await u3g1.shouldHaveReply('#1 ~ %s:%{test}', '问答 1 已成功修改。')
+      await u2g1.shouldHaveReply('foo', 'nick2:200')
+      await u3g1.shouldHaveReply('#1 -s', '问答 1 已成功修改。')
+      await u3g1.shouldHaveReply('## foo', SEARCH_HEAD + '1. [代行] %s:%{test}')
+      await u3g1.shouldHaveReply('#1 -w [CQ:at,qq=300]', '问答 1 已成功修改。')
+      await u3g1.shouldHaveReply('#1', DETAIL_HEAD + '来源：user3 (300)\n回答中的指令由教学者代行。')
+      await u2g1.shouldHaveReply('foo', 'nick2:300')
+    })
   })
 })

From afc647abbdcdaac12fd32cb3897835928e98f515 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Tue, 25 Aug 2020 17:46:03 +0800
Subject: [PATCH 07/31] teach: fix redirect breaks throttle & preventLoop

---
 .../plugin-teach/src/plugins/preventLoop.ts   |  1 +
 packages/plugin-teach/src/plugins/throttle.ts |  6 ++-
 packages/plugin-teach/src/receiver.ts         | 18 +++++---
 packages/plugin-teach/tests/basic.spec.ts     | 45 +++++++++++++++++--
 4 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/packages/plugin-teach/src/plugins/preventLoop.ts b/packages/plugin-teach/src/plugins/preventLoop.ts
index 948dac50f1..e2bd410736 100644
--- a/packages/plugin-teach/src/plugins/preventLoop.ts
+++ b/packages/plugin-teach/src/plugins/preventLoop.ts
@@ -35,6 +35,7 @@ export default function apply(ctx: Context, config: Dialogue.Config) {
   })
 
   ctx.on('dialogue/receive', (state) => {
+    if (state.session._redirected) return
     const timestamp = Date.now()
     for (const { participants, length, debounce } of preventLoopConfig) {
       if (state.initiators.length < length) break
diff --git a/packages/plugin-teach/src/plugins/throttle.ts b/packages/plugin-teach/src/plugins/throttle.ts
index a07b83fb37..2514c35c11 100644
--- a/packages/plugin-teach/src/plugins/throttle.ts
+++ b/packages/plugin-teach/src/plugins/throttle.ts
@@ -35,13 +35,15 @@ export default function apply(ctx: Context, config: Dialogue.Config) {
     state.counters = { ...counters }
   })
 
-  ctx.on('dialogue/receive', ({ counters }) => {
+  ctx.on('dialogue/receive', ({ counters, session }) => {
+    if (session._redirected) return
     for (const interval in counters) {
       if (counters[interval] <= 0) return true
     }
   })
 
-  ctx.on('dialogue/before-send', ({ counters }) => {
+  ctx.on('dialogue/before-send', ({ counters, session }) => {
+    if (session._redirected) return
     for (const { interval } of throttleConfig) {
       counters[interval]--
       setTimeout(() => counters[interval]++, interval)
diff --git a/packages/plugin-teach/src/receiver.ts b/packages/plugin-teach/src/receiver.ts
index 6a58702086..c58b37260d 100644
--- a/packages/plugin-teach/src/receiver.ts
+++ b/packages/plugin-teach/src/receiver.ts
@@ -2,6 +2,12 @@ import { Context, User, Session, NextFunction, Command } from 'koishi-core'
 import { CQCode, simplify, noop, escapeRegExp } from 'koishi-utils'
 import { Dialogue, DialogueTest } from './utils'
 
+declare module 'koishi-core/dist/app' {
+  interface App {
+    _dialogueStates: Record<number, SessionState>
+  }
+}
+
 declare module 'koishi-core/dist/context' {
   interface EventMap {
     'dialogue/state'(state: SessionState): void
@@ -59,8 +65,6 @@ export interface SessionState {
   isSearch?: boolean
 }
 
-const states: Record<number, SessionState> = {}
-
 export function escapeAnswer(message: string) {
   return message.replace(/%/g, '@@__PLACEHOLDER__@@')
 }
@@ -70,11 +74,11 @@ export function unescapeAnswer(message: string) {
 }
 
 Context.prototype.getSessionState = function (session) {
-  const { groupId, anonymous, userId } = session
-  if (!states[groupId]) {
-    this.emit('dialogue/state', states[groupId] = { groupId } as SessionState)
+  const { groupId, anonymous, userId, $app } = session
+  if (!$app._dialogueStates[groupId]) {
+    this.emit('dialogue/state', $app._dialogueStates[groupId] = { groupId } as SessionState)
   }
-  const state = Object.create(states[groupId])
+  const state = Object.create($app._dialogueStates[groupId])
   state.session = session
   state.userId = anonymous ? -anonymous.id : userId
   return state
@@ -249,6 +253,8 @@ export default function (ctx: Context, config: Dialogue.Config) {
   const nicknames = Array.isArray(nickname) ? nickname : nickname ? [nickname] : []
   const nicknameRE = new RegExp(`^((${nicknames.map(escapeRegExp).join('|')})[,，]?\\s*)+`)
 
+  ctx.app._dialogueStates = {}
+
   config._stripQuestion = (source) => {
     source = prepareSource(source)
     const original = source
diff --git a/packages/plugin-teach/tests/basic.spec.ts b/packages/plugin-teach/tests/basic.spec.ts
index 0acd833fbf..828dc1c1bc 100644
--- a/packages/plugin-teach/tests/basic.spec.ts
+++ b/packages/plugin-teach/tests/basic.spec.ts
@@ -102,16 +102,18 @@ describe('Plugin Teach', () => {
 
     app.plugin(utils)
 
-    before(async () => {
+    async function start() {
       await app.start()
       await app.database.getUser(u2id, 2)
       await app.database.getUser(u3id, 3)
       await app.database.getUser(u4id, 4)
       await app.database.getGroup(g1id, app.selfId)
       await app.database.getGroup(g2id, app.selfId)
-    })
+    }
+
+    before(start)
 
-    return { app, u2, u3, u4, u2g1, u2g2, u3g1, u3g2, u4g1, u4g2 }
+    return { app, u2, u3, u4, u2g1, u2g2, u3g1, u3g2, u4g1, u4g2, start }
   }
 
   const DETAIL_HEAD = '编号为 1 的问答信息：\n问题：foo\n回答：bar\n'
@@ -237,10 +239,45 @@ describe('Plugin Teach', () => {
       await u3g1.shouldHaveReply('#1 ~ %s:%{test}', '问答 1 已成功修改。')
       await u2g1.shouldHaveReply('foo', 'nick2:200')
       await u3g1.shouldHaveReply('#1 -s', '问答 1 已成功修改。')
-      await u3g1.shouldHaveReply('## foo', SEARCH_HEAD + '1. [代行] %s:%{test}')
       await u3g1.shouldHaveReply('#1 -w [CQ:at,qq=300]', '问答 1 已成功修改。')
       await u3g1.shouldHaveReply('#1', DETAIL_HEAD + '来源：user3 (300)\n回答中的指令由教学者代行。')
+      await u3g1.shouldHaveReply('## foo', SEARCH_HEAD + '1. [代行] %s:%{test}')
       await u2g1.shouldHaveReply('foo', 'nick2:300')
     })
   })
+
+  describe('restriction', () => {
+    // make coverage happy
+    new App().plugin(teach, { throttle: [] })
+    new App().plugin(teach, { preventLoop: [] })
+    new App().plugin(teach, { preventLoop: 10 })
+
+    it('throttle', async () => {
+      const { u2g1, u3g1, u4g1, u4g2, start } = createEnvironment({ throttle: { interval: 1000, responses: 2 } })
+
+      await start()
+      await u3g1.shouldHaveReply('# baz bar', '问答已添加，编号为 1。')
+      await u3g1.shouldHaveReply('# foo => baz', '问答已添加，编号为 2。')
+      await u2g1.shouldHaveReply('foo', 'bar')
+      await u3g1.shouldHaveReply('foo', 'bar')
+      await u4g1.shouldHaveNoReply('foo')
+      await u4g2.shouldHaveReply('foo', 'bar')
+    })
+
+    it('preventLoop', async () => {
+      const { u2g1, u3g1, u4g1, start } = createEnvironment({ preventLoop: { length: 5, participants: 2 } })
+
+      await start()
+      await u3g1.shouldHaveReply('# baz bar', '问答已添加，编号为 1。')
+      await u3g1.shouldHaveReply('# foo => baz', '问答已添加，编号为 2。')
+      await u2g1.shouldHaveReply('foo', 'bar')
+      await u2g1.shouldHaveReply('foo', 'bar')
+      await u3g1.shouldHaveReply('foo', 'bar')
+      await u3g1.shouldHaveReply('foo', 'bar')
+      await u2g1.shouldHaveReply('foo', 'bar')
+      await u2g1.shouldHaveNoReply('foo')
+      await u3g1.shouldHaveNoReply('foo')
+      await u4g1.shouldHaveReply('foo', 'bar')
+    })
+  })
 })

From 41d8b2a989231a2c31dd1b1160dbed86c598f423 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Tue, 25 Aug 2020 21:39:45 +0800
Subject: [PATCH 08/31] test: eval internal tests

---
 packages/plugin-eval/tests/index.spec.ts | 77 ++++++++++++++++++++++--
 packages/plugin-eval/tests/worker.js     | 30 +++++++++
 2 files changed, 101 insertions(+), 6 deletions(-)
 create mode 100644 packages/plugin-eval/tests/worker.js

diff --git a/packages/plugin-eval/tests/index.spec.ts b/packages/plugin-eval/tests/index.spec.ts
index 5c55a77020..3440bde4fe 100644
--- a/packages/plugin-eval/tests/index.spec.ts
+++ b/packages/plugin-eval/tests/index.spec.ts
@@ -1,9 +1,14 @@
 import { App } from 'koishi-test-utils'
 import { inspect } from 'util'
-import * as _eval from '../dist'
+import { resolve } from 'path'
+import * as _eval from 'koishi-plugin-eval'
 
 const app = new App()
-app.plugin(_eval)
+app.plugin(_eval, {
+  setupFiles: {
+    'test-worker': resolve(__dirname, 'worker.js'),
+  },
+})
 
 const ses = app.createSession('user', 123)
 
@@ -30,8 +35,8 @@ describe('koishi-plugin-eval', () => {
   })
 
   it('exec', async () => {
-    await ses.shouldHaveReply('> exec()').which.matches(/TypeError: The "message" argument must be of type string/)
-    await ses.shouldHaveReply('> exec("help")').which.matches(/当前可用的指令有：/)
+    await ses.shouldHaveReply('> exec()').which.matches(/^TypeError: The "message" argument must be of type string/)
+    await ses.shouldHaveReply('> exec("help")').which.matches(/^当前可用的指令有：/)
   })
 
   it('global', async () => {
@@ -44,10 +49,49 @@ describe('koishi-plugin-eval', () => {
     await ses.shouldHaveReply('> Buffer.alloc.toString()', 'function alloc() { [native code] }')
   })
 
+  it('contextify', async () => {
+    await ses.shouldHaveReply('> test.null === null', 'true')
+    await ses.shouldHaveReply('> test.undefined === undefined', 'true')
+    await ses.shouldHaveReply('> test.string.constructor === String', 'true')
+    await ses.shouldHaveReply('> test.number.constructor === Number', 'true')
+    await ses.shouldHaveReply('> test.boolean.constructor === Boolean', 'true')
+    await ses.shouldHaveReply('> test.stringO instanceof String', 'true')
+    await ses.shouldHaveReply('> test.numberO instanceof Number', 'true')
+    await ses.shouldHaveReply('> test.booleanO instanceof Boolean', 'true')
+    await ses.shouldHaveReply('> test.date instanceof Date', 'true')
+    await ses.shouldHaveReply('> test.regexp instanceof RegExp', 'true')
+    await ses.shouldHaveReply('> test.buffer instanceof Buffer', 'true')
+    await ses.shouldHaveReply('> test.error instanceof Error', 'true')
+    await ses.shouldHaveReply('> test.rangeError instanceof RangeError', 'true')
+    await ses.shouldHaveReply('> test.syntaxError instanceof SyntaxError', 'true')
+    await ses.shouldHaveReply('> test.referenceError instanceof ReferenceError', 'true')
+    await ses.shouldHaveReply('> test.typeError instanceof TypeError', 'true')
+    await ses.shouldHaveReply('> test.evalError instanceof EvalError', 'true')
+    await ses.shouldHaveReply('> test.uriError instanceof URIError', 'true')
+  })
+
+  it('function', async () => {
+    await ses.shouldHaveReply('> test.function instanceof Function', 'true')
+    await ses.shouldHaveReply('> test.function() instanceof Function', 'true')
+    await ses.shouldHaveReply('> test.function()() instanceof Object', 'true')
+  })
+
+  it('symbol', async () => {
+    await ses.shouldHaveReply('> Symbol.for("test") === test.symbol2', 'true')
+    await ses.shouldHaveReply('> test.symbol1.constructor.constructor === Function', 'true')
+    await ses.shouldHaveReply('> test.symbol2.constructor.constructor === Function', 'true')
+    await ses.shouldHaveReply('> test.symbol3.constructor.constructor === Function', 'true')
+    await ses.shouldHaveReply('> Symbol("test").constructor.constructor === Function', 'true')
+    await ses.shouldHaveReply('> Symbol("foobar").constructor.constructor === Function', 'true')
+    await ses.shouldHaveReply('> Symbol.keyFor(test.symbol2)', 'test')
+  })
+
   it('host inspect', async () => {
     await ses.shouldHaveReply('> [1, 2]', inspect([1, 2]))
     await ses.shouldHaveReply('> new Set([1, 2])', inspect(new Set([1, 2])))
     await ses.shouldHaveReply('> new Map([[1, 2]])', inspect(new Map([[1, 2]])))
+    await ses.shouldHaveReply('> new WeakSet([[1]])', inspect(new WeakSet([[1]])))
+    await ses.shouldHaveReply('> new WeakMap([[[1], 2]])', inspect(new WeakMap([[[1], 2]])))
     await ses.shouldHaveReply('> new RegExp()', inspect(new RegExp(undefined)))
     await ses.shouldHaveReply('> Proxy', inspect(Proxy))
   })
@@ -62,10 +106,28 @@ describe('koishi-plugin-eval', () => {
     await ses.shouldHaveReply(`>
       const ForeignFunction = global.constructor.constructor;
       const process1 = ForeignFunction("return process")();
-    `).which.matches(/ReferenceError: process is not defined/)
+    `).which.matches(/^ReferenceError: process is not defined/)
   })
 
-  it('buffer attack', async () => {
+  it('deprecated api attack', async () => {
+    await ses.shouldHaveReply(`> Buffer.prototype.__defineGetter__ === {}.__defineGetter__`, 'true')
+    await ses.shouldHaveReply(`> Buffer.prototype.__defineSetter__ === {}.__defineSetter__`, 'true')
+    await ses.shouldHaveReply(`> Buffer.prototype.__lookupGetter__ === {}.__lookupGetter__`, 'true')
+    await ses.shouldHaveReply(`> Buffer.prototype.__lookupSetter__ === {}.__lookupSetter__`, 'true')
+
+    await ses
+      .shouldHaveReply(`> Buffer.prototype.__defineGetter__("toString", () => {})`)
+      .which.matches(/'defineProperty' on proxy: trap returned falsish for property 'toString'/)
+
+    await ses.shouldHaveReply(`>
+      global.__defineGetter__("foo", () => 123);
+      global.foo;
+    `, '123')
+
+    await ses.shouldHaveReply(`> Buffer.from.__lookupGetter__("__proto__") === Object.prototype.__lookupGetter__.call(Buffer.from, "__proto__")`, 'true')
+  })
+
+  it('buffer operations', async () => {
     await ses.shouldHaveReply(`>
       Buffer.allocUnsafe(100).constructor.constructor === Function &&
       Buffer.allocUnsafeSlow(100).constructor.constructor === Function;
@@ -75,5 +137,8 @@ describe('koishi-plugin-eval', () => {
       Buffer.allocUnsafe(100).toString('hex') +
       Buffer.allocUnsafeSlow(100).toString('hex');
     `, '00'.repeat(200))
+
+    await ses.shouldHaveReply('> test.buffer.inspect()', `<Buffer ${'01 '.repeat(50)}... 950 more bytes>`)
+    await ses.shouldHaveReply('> Buffer.from(Array(51).fill(1)).inspect()', `<Buffer ${'01 '.repeat(50)}... 1 more byte>`)
   })
 })
diff --git a/packages/plugin-eval/tests/worker.js b/packages/plugin-eval/tests/worker.js
new file mode 100644
index 0000000000..78361fa3f3
--- /dev/null
+++ b/packages/plugin-eval/tests/worker.js
@@ -0,0 +1,30 @@
+/* eslint-disable no-new-wrappers */
+
+const { internal } = require('koishi-plugin-eval/dist/worker')
+
+internal.setGlobal('test', {
+  null: null,
+  undefined: undefined,
+  string: 'text',
+  number: 1,
+  boolean: true,
+  stringO: new String('text'),
+  numberO: new Number(1),
+  booleanO: new Boolean(true),
+  date: new Date(),
+  regexp: /xxx/,
+  buffer: Buffer.from(Array(1000).fill(1)),
+  symbol1: Symbol('test'),
+  symbol2: Symbol.for('test'),
+  symbol3: Symbol.iterator,
+  error: new Error('test'),
+  rangeError: new RangeError('test'),
+  syntaxError: new SyntaxError('test'),
+  referenceError: new ReferenceError('test'),
+  typeError: new TypeError('test'),
+  evalError: new EvalError('test'),
+  uriError: new URIError('test'),
+  function() {
+    return () => ({})
+  },
+})

From 6ffce2ac15a387b35ad39620973e77fe36842834 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Wed, 26 Aug 2020 00:32:42 +0800
Subject: [PATCH 09/31] eval-addons: load modules by relative path

---
 packages/plugin-eval-addons/src/worker.ts | 77 ++++++++++++++++++-----
 1 file changed, 61 insertions(+), 16 deletions(-)

diff --git a/packages/plugin-eval-addons/src/worker.ts b/packages/plugin-eval-addons/src/worker.ts
index c3f5289d03..2bcb67c3f7 100644
--- a/packages/plugin-eval-addons/src/worker.ts
+++ b/packages/plugin-eval-addons/src/worker.ts
@@ -1,6 +1,6 @@
 import { config, context, internal, WorkerAPI, contextFactory, response } from 'koishi-plugin-eval/dist/worker'
 import { promises, readFileSync } from 'fs'
-import { resolve } from 'path'
+import { resolve, posix, dirname } from 'path'
 import { Logger } from 'koishi-utils'
 import { Config } from '.'
 import ts from 'typescript'
@@ -44,42 +44,87 @@ WorkerAPI.prototype.addon = async function (sid, user, argv) {
   }
 }
 
-const koishi = new SyntheticModule(['registerCommand'], function () {
+// TODO pending @types/node
+interface Module {
+  status: string
+  identifier: string
+  namespace: any
+  link(linker: (specifier: string, referenceModule: Module) => Promise<Module>): Promise<void>
+  evaluate(): Promise<void>
+}
+
+const builtinIdentifier = 'koishi/addons.ts'
+const builtin = new SyntheticModule(['registerCommand'], function () {
   this.setExport('registerCommand', function registerCommand(name: string, callback: AddonAction) {
     commandMap[name] = callback
   })
-}, { context })
+}, { context, identifier: builtinIdentifier })
 
 const root = resolve(process.cwd(), config.moduleRoot)
-const modules: Record<string, any> = { koishi }
+const modules: Record<string, Module> = { [builtinIdentifier]: builtin }
 config.addonNames.unshift(...Object.keys(modules))
 
-function linker(specifier: string, reference: any) {
-  if (specifier in modules) {
-    return modules[specifier]
+const suffixes = ['', '.ts', '/index.ts']
+const relativeRE = /^\.\.?[\\/]/
+
+function locateModule(specifier: string) {
+  for (const suffix of suffixes) {
+    const target = specifier + suffix
+    if (target in modules) return modules[target]
+  }
+}
+
+async function linker(specifier: string, { identifier }: Module) {
+  // resolve path based on reference module
+  if (relativeRE.test(specifier)) {
+    specifier = `${dirname(identifier)}/${specifier}`
+  }
+  specifier = posix.normalize(specifier)
+
+  // load from cache
+  const module = locateModule(specifier)
+  if (module) return module
+
+  // create new module
+  const [dir] = specifier.split('/', 1)
+  if (config.addonNames.includes(dir)) {
+    return await createModule(specifier)
   }
-  throw new Error(`Unable to resolve dependency "${specifier}"`)
+
+  throw new Error(`Unable to resolve dependency "${specifier}" in "${identifier}"`)
 }
 
 const json = JSON.parse(readFileSync(resolve(root, 'tsconfig.json'), 'utf8'))
 const { options: compilerOptions } = ts.parseJsonConfigFileContent(json, ts.sys, root)
 
+async function loadSource(path: string) {
+  for (const postfix of suffixes) {
+    try {
+      const target = path + postfix
+      return [await promises.readFile(resolve(root, target), 'utf8'), target]
+    } catch {}
+  }
+  throw new Error(`cannot load source file "${path}"`)
+}
+
 async function createModule(path: string) {
-  if (!modules[path]) {
-    const content = await promises.readFile(resolve(root, path, 'index.ts'), 'utf8')
-    const { outputText } = ts.transpileModule(content, {
+  let module = locateModule(path)
+  if (!module) {
+    const [source, identifier] = await loadSource(path)
+    const { outputText } = ts.transpileModule(source, {
       compilerOptions,
     })
-    modules[path] = new SourceTextModule(outputText, { context, identifier: path })
+    module = modules[identifier] = new SourceTextModule(outputText, { context, identifier })
   }
-  const module = modules[path]
+
+  logger.debug('creating module %c', module.identifier)
   await module.link(linker)
   await module.evaluate()
+  return module
 }
 
-export default Promise.all(config.addonNames.map(path => createModule(path).then(() => {
-  logger.debug('load module %c', path)
-  internal.setGlobal(path, modules[path].namespace)
+export default Promise.all(config.addonNames.map(path => createModule(path).then((module) => {
+  internal.setGlobal(path, module.namespace)
 }, (error) => {
   logger.warn(`cannot load module %c\n` + error.stack, path)
   delete modules[path]

From 5c56bc2ed3a8a46376d34afc8afb1553ac9a9195 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Wed, 26 Aug 2020 01:00:11 +0800
Subject: [PATCH 10/31] test: hacks for worker code

---
 packages/plugin-eval/src/index.ts                   | 9 ++++++++-
 packages/plugin-eval/src/vm.ts                      | 2 +-
 packages/plugin-eval/tests/index.spec.ts            | 9 ++++++++-
 packages/plugin-eval/tests/{worker.js => worker.ts} | 2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)
 rename packages/plugin-eval/tests/{worker.js => worker.ts} (91%)

diff --git a/packages/plugin-eval/src/index.ts b/packages/plugin-eval/src/index.ts
index e8de3389b0..35835ce400 100644
--- a/packages/plugin-eval/src/index.ts
+++ b/packages/plugin-eval/src/index.ts
@@ -79,6 +79,11 @@ export class MainAPI {
   }
 }
 
+process.env.WORKER_ENTRY = resolve(__dirname, 'worker.js')
+process.env.WORKER_CODE = `\
+const { workerData } = require('worker_threads');
+require(workerData.entry);`
+
 export function apply(ctx: Context, config: Config = {}) {
   const { prefix } = config = { ...defaultConfig, ...config }
   const { app } = ctx
@@ -92,8 +97,10 @@ export function apply(ctx: Context, config: Config = {}) {
   async function createWorker() {
     await app.parallel('worker/start')
 
-    const worker = app.evalWorker = new Worker(resolve(__dirname, 'worker.js'), {
+    const worker = app.evalWorker = new Worker(process.env.WORKER_CODE, {
+      eval: true,
       workerData: {
+        entry: process.env.WORKER_ENTRY,
         logLevels: Logger.levels,
         ...omit(config, ['maxLogs', 'resourceLimits', 'timeout', 'prohibitedCommands']),
       },
diff --git a/packages/plugin-eval/src/vm.ts b/packages/plugin-eval/src/vm.ts
index 405aa5a950..2527c562c4 100644
--- a/packages/plugin-eval/src/vm.ts
+++ b/packages/plugin-eval/src/vm.ts
@@ -24,7 +24,7 @@ export class VM {
       codeGeneration: { strings, wasm },
     })
 
-    const filename = resolve(__dirname, 'internal.js')
+    const filename = resolve(__dirname, '../dist/internal.js')
     const data = readFileSync(filename, 'utf8')
     const script = new Script(data, {
       filename,
diff --git a/packages/plugin-eval/tests/index.spec.ts b/packages/plugin-eval/tests/index.spec.ts
index 3440bde4fe..39bf8203a3 100644
--- a/packages/plugin-eval/tests/index.spec.ts
+++ b/packages/plugin-eval/tests/index.spec.ts
@@ -3,10 +3,17 @@ import { inspect } from 'util'
 import { resolve } from 'path'
 import * as _eval from 'koishi-plugin-eval'
 
+process.env.WORKER_ENTRY = resolve(__dirname, '../src/worker.ts')
+process.env.WORKER_CODE = [
+  'require("ts-node/register/transpile-only");',
+  'require("tsconfig-paths/register");',
+  process.env.WORKER_CODE,
+].join('\n')
+
 const app = new App()
 app.plugin(_eval, {
   setupFiles: {
-    'test-worker': resolve(__dirname, 'worker.js'),
+    'test-worker': resolve(__dirname, 'worker.ts'),
   },
 })
 
diff --git a/packages/plugin-eval/tests/worker.js b/packages/plugin-eval/tests/worker.ts
similarity index 91%
rename from packages/plugin-eval/tests/worker.js
rename to packages/plugin-eval/tests/worker.ts
index 78361fa3f3..6534e6309e 100644
--- a/packages/plugin-eval/tests/worker.js
+++ b/packages/plugin-eval/tests/worker.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-new-wrappers */
 
-const { internal } = require('koishi-plugin-eval/dist/worker')
+import { internal } from 'koishi-plugin-eval/dist/worker'
 
 internal.setGlobal('test', {
   null: null,

From 8bf16d6f59d9cf4179ee0cbc4016b6db3d1e7179 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Wed, 26 Aug 2020 01:06:08 +0800
Subject: [PATCH 11/31] test: more hacks into tsconfig

---
 packages/plugin-eval/src/index.ts        | 9 +++++----
 packages/plugin-eval/tests/index.spec.ts | 8 +++++---
 tsconfig.test.json                       | 1 +
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/plugin-eval/src/index.ts b/packages/plugin-eval/src/index.ts
index 35835ce400..974d681509 100644
--- a/packages/plugin-eval/src/index.ts
+++ b/packages/plugin-eval/src/index.ts
@@ -79,8 +79,9 @@ export class MainAPI {
   }
 }
 
-process.env.WORKER_ENTRY = resolve(__dirname, 'worker.js')
-process.env.WORKER_CODE = `\
+process.env.KOISHI_WORKER_ENTRY = resolve(__dirname, 'worker.js')
+
+process.env.KOISHI_WORKER_LOADER = `\
 const { workerData } = require('worker_threads');
 require(workerData.entry);`
 
@@ -97,10 +98,10 @@ export function apply(ctx: Context, config: Config = {}) {
   async function createWorker() {
     await app.parallel('worker/start')
 
-    const worker = app.evalWorker = new Worker(process.env.WORKER_CODE, {
+    const worker = app.evalWorker = new Worker(process.env.KOISHI_WORKER_LOADER, {
       eval: true,
       workerData: {
-        entry: process.env.WORKER_ENTRY,
+        entry: process.env.KOISHI_WORKER_ENTRY,
         logLevels: Logger.levels,
         ...omit(config, ['maxLogs', 'resourceLimits', 'timeout', 'prohibitedCommands']),
       },
diff --git a/packages/plugin-eval/tests/index.spec.ts b/packages/plugin-eval/tests/index.spec.ts
index 39bf8203a3..6cb4087e89 100644
--- a/packages/plugin-eval/tests/index.spec.ts
+++ b/packages/plugin-eval/tests/index.spec.ts
@@ -3,14 +3,16 @@ import { inspect } from 'util'
 import { resolve } from 'path'
 import * as _eval from 'koishi-plugin-eval'
 
-process.env.WORKER_ENTRY = resolve(__dirname, '../src/worker.ts')
-process.env.WORKER_CODE = [
+process.env.KOISHI_WORKER_ENTRY = resolve(__dirname, '../src/worker.ts')
+
+process.env.KOISHI_WORKER_LOADER = [
   'require("ts-node/register/transpile-only");',
   'require("tsconfig-paths/register");',
-  process.env.WORKER_CODE,
+  process.env.KOISHI_WORKER_LOADER,
 ].join('\n')
 
 const app = new App()
+
 app.plugin(_eval, {
   setupFiles: {
     'test-worker': resolve(__dirname, 'worker.ts'),
diff --git a/tsconfig.test.json b/tsconfig.test.json
index 58b195fcd6..9f38809f19 100644
--- a/tsconfig.test.json
+++ b/tsconfig.test.json
@@ -4,6 +4,7 @@
     "baseUrl": ".",
     "paths": {
       "koishi-plugin-*": ["packages/plugin-*/src"],
+      "koishi-plugin-eval/dist/worker": ["packages/plugin-eval/src/worker"],
       "koishi-adapter-*": ["packages/adapter-*/src"],
       "koishi-*": ["packages/koishi-*/src"],
     },

From 66fdf1bb940a3289837c49d3c3fca341b209b884 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Wed, 26 Aug 2020 01:42:40 +0800
Subject: [PATCH 12/31] eval/addons: load user on demand

---
 packages/plugin-eval-addons/src/index.ts  | 31 ++++++++++++++---------
 packages/plugin-eval-addons/src/worker.ts | 16 +++++++-----
 packages/plugin-eval/src/index.ts         |  3 +--
 packages/plugin-eval/src/worker.ts        |  8 +++---
 4 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/packages/plugin-eval-addons/src/index.ts b/packages/plugin-eval-addons/src/index.ts
index 302000c26f..e6b98eb5ab 100644
--- a/packages/plugin-eval-addons/src/index.ts
+++ b/packages/plugin-eval-addons/src/index.ts
@@ -1,4 +1,4 @@
-import { Context, CommandAction, CommandConfig, OptionConfig, User } from 'koishi-core'
+import { Context, CommandConfig, OptionConfig, User } from 'koishi-core'
 import { resolve } from 'path'
 import {} from 'koishi-plugin-eval'
 import { assertProperty, Logger, noop } from 'koishi-utils'
@@ -14,24 +14,26 @@ export interface Config {
   exclude?: RegExp
 }
 
-interface Option extends OptionConfig {
+interface OptionManifest extends OptionConfig {
   name: string
   desc: string
 }
 
-interface Command extends CommandConfig {
+type Permission<T> = T[] | {
+  read?: T[]
+  write?: T[]
+}
+
+interface CommandManifest extends CommandConfig {
   name: string
   desc: string
-  options?: Option[]
+  options?: OptionManifest[]
+  userFields?: Permission<User.Field>
 }
 
 interface Manifest {
   version: number
-  commands?: Command[]
-}
-
-const addonAction: CommandAction = ({ session, command: { name }, options, rest }, ...args) => {
-  return session.$app.evalRemote.addon(session.$uuid, session.$user, { name, args, options, rest })
+  commands?: CommandManifest[]
 }
 
 export function apply(ctx: Context, config: Config) {
@@ -76,15 +78,20 @@ export function apply(ctx: Context, config: Config) {
       if (!content) return
       const { commands = [] } = safeLoad(content) as Manifest
       commands.forEach((config) => {
-        const { name: rawName, desc, options = [] } = config
+        const { name: rawName, desc, options = [], userFields = [] } = config
         const [name] = rawName.split(' ', 1)
         if (!response.commands.includes(name)) {
           return logger.warn('unregistered command manifest: %c', name)
         }
+        const { read = [] } = Array.isArray(userFields) ? { read: userFields } : userFields
         const cmd = addon
           .subcommand(rawName, desc, config)
-          .userFields(User.fields)
-          .action(addonAction)
+          .userFields(read)
+          .action(async ({ session, command: { name }, options }, ...args) => {
+            const { $app, $user, $uuid } = session
+            const result = await $app.evalRemote.addon($uuid, $user, { name, args, options })
+            return result
+          })
         options.forEach((config) => {
           const { name, desc } = config
           cmd.option(name, desc, config)
diff --git a/packages/plugin-eval-addons/src/worker.ts b/packages/plugin-eval-addons/src/worker.ts
index 2bcb67c3f7..88bf4afbe0 100644
--- a/packages/plugin-eval-addons/src/worker.ts
+++ b/packages/plugin-eval-addons/src/worker.ts
@@ -1,6 +1,7 @@
-import { config, context, internal, WorkerAPI, contextFactory, response } from 'koishi-plugin-eval/dist/worker'
+import { config, context, internal, WorkerAPI, createContext, response } from 'koishi-plugin-eval/dist/worker'
 import { promises, readFileSync } from 'fs'
 import { resolve, posix, dirname } from 'path'
+import { User } from 'koishi-core'
 import { Logger } from 'koishi-utils'
 import { Config } from '.'
 import ts from 'typescript'
@@ -17,7 +18,7 @@ declare module 'koishi-plugin-eval/dist/worker' {
   }
 
   interface WorkerAPI {
-    addon(sid: string, user: {}, argv: WorkerArgv): string | void | Promise<string | void>
+    addon(sid: string, user: Partial<User>, argv: AddonArgv): Promise<string | void>
   }
 
   interface Response {
@@ -25,20 +26,23 @@ declare module 'koishi-plugin-eval/dist/worker' {
   }
 }
 
-interface WorkerArgv {
+interface AddonArgv {
   name: string
   args: string[]
   options: Record<string, any>
-  rest: string
 }
 
-type AddonAction = (argv: WorkerArgv) => string | void | Promise<string | void>
+interface AddonContext extends AddonArgv {
+  user: Partial<User>
+}
+
+type AddonAction = (ctx: AddonContext) => string | void | Promise<string | void>
 const commandMap: Record<string, AddonAction> = {}
 
 WorkerAPI.prototype.addon = async function (sid, user, argv) {
   const callback = commandMap[argv.name]
   try {
-    return await callback({ ...argv, ...contextFactory(sid, user) })
+    return await callback({ user, ...argv, ...createContext(sid) })
   } catch (error) {
     logger.warn(error)
   }
diff --git a/packages/plugin-eval/src/index.ts b/packages/plugin-eval/src/index.ts
index 974d681509..27e9f98583 100644
--- a/packages/plugin-eval/src/index.ts
+++ b/packages/plugin-eval/src/index.ts
@@ -148,7 +148,7 @@ export function apply(ctx: Context, config: Config = {}) {
 
   const evaluate = ctx.command('evaluate [expr...]', '执行 JavaScript 脚本')
     .alias('eval')
-    .userFields(User.fields)
+    .userFields(['authority'])
     .option('slient', '-s  不输出最后的结果')
     .option('restart', '-r  重启子线程', { authority: 3 })
     .before((session) => {
@@ -191,7 +191,6 @@ export function apply(ctx: Context, config: Config = {}) {
         app.evalWorker.on('error', listener)
         app.evalRemote.eval({
           sid: session.$uuid,
-          user: session.$user,
           silent: options.slient,
           source: expr,
         }).then(_resolve, (error) => {
diff --git a/packages/plugin-eval/src/worker.ts b/packages/plugin-eval/src/worker.ts
index d596c14110..b5dd756bb7 100644
--- a/packages/plugin-eval/src/worker.ts
+++ b/packages/plugin-eval/src/worker.ts
@@ -29,7 +29,6 @@ export const config: WorkerData = {
 
 interface EvalOptions {
   sid: string
-  user: {}
   silent: boolean
   source: string
 }
@@ -72,9 +71,8 @@ function formatError(error: Error) {
 
 const main = wrap<MainAPI>(parentPort)
 
-export function contextFactory(sid: string, user: {}) {
+export function createContext(sid: string) {
   return {
-    user,
     async send(...param: [string, ...any[]]) {
       return await main.send(sid, formatResult(...param))
     },
@@ -97,10 +95,10 @@ export class WorkerAPI {
   }
 
   async eval(options: EvalOptions) {
-    const { sid, source, user, silent } = options
+    const { sid, source, silent } = options
 
     const key = 'koishi-eval-session:' + sid
-    internal.setGlobal(Symbol.for(key), contextFactory(sid, user), false, true)
+    internal.setGlobal(Symbol.for(key), createContext(sid), false, true)
 
     let result: any
     try {

From 94673a6d3d2039e48f49d96041d3ee1cef333e60 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Wed, 26 Aug 2020 01:55:36 +0800
Subject: [PATCH 13/31] eval-addons: boost manifest load

---
 packages/plugin-eval-addons/src/index.ts | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/plugin-eval-addons/src/index.ts b/packages/plugin-eval-addons/src/index.ts
index e6b98eb5ab..c791db7601 100644
--- a/packages/plugin-eval-addons/src/index.ts
+++ b/packages/plugin-eval-addons/src/index.ts
@@ -3,7 +3,7 @@ import { resolve } from 'path'
 import {} from 'koishi-plugin-eval'
 import { assertProperty, Logger, noop } from 'koishi-utils'
 import { safeLoad } from 'js-yaml'
-import { promises } from 'fs'
+import { promises as fs } from 'fs'
 import Git, { CheckRepoActions } from 'simple-git'
 
 const logger = new Logger('addon')
@@ -62,21 +62,29 @@ export function apply(ctx: Context, config: Config) {
     if (!isRepo) throw new Error(`moduleRoot "${moduleRoot}" is not git repository`)
   })
 
+  let manifests: Record<string, Promise<Manifest>>
   const { exclude = /^(\..+|node_modules)$/ } = evalConfig
+
   ctx.on('worker/start', async () => {
-    const dirents = await promises.readdir(root, { withFileTypes: true })
-    evalConfig.addonNames = dirents
+    const dirents = await fs.readdir(root, { withFileTypes: true })
+    const paths = evalConfig.addonNames = dirents
       .filter(dir => dir.isDirectory() && !exclude.test(dir.name))
       .map(dir => dir.name)
     // cmd.dispose() may affect addon.children, so here we make a slice
     addon.children.slice().forEach(cmd => cmd.dispose())
+    manifests = Object.fromEntries(paths.map(path => [path, loadManifest(path).catch<null>(noop)]))
   })
 
+  async function loadManifest(path: string) {
+    const content = await fs.readFile(resolve(root, path, 'manifest.yml'), 'utf8')
+    return safeLoad(content) as Manifest
+  }
+
   ctx.on('worker/ready', (response) => {
     evalConfig.addonNames.map(async (path) => {
-      const content = await promises.readFile(resolve(root, path, 'manifest.yml'), 'utf8').catch<string>(noop)
-      if (!content) return
-      const { commands = [] } = safeLoad(content) as Manifest
+      const manifest = await manifests[path]
+      if (!manifest) return
+      const { commands = [] } = manifest
       commands.forEach((config) => {
         const { name: rawName, desc, options = [], userFields = [] } = config
         const [name] = rawName.split(' ', 1)

From 1bf9d0ad519e75bc5448e3303fc9a7a990f3cb86 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Wed, 26 Aug 2020 02:03:56 +0800
Subject: [PATCH 14/31] teach/eval: command.config.noInterp/noEval

---
 packages/plugin-eval/src/index.ts     | 16 ++++++++++------
 packages/plugin-teach/src/internal.ts |  9 +++++++--
 packages/plugin-teach/src/utils.ts    |  1 -
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/plugin-eval/src/index.ts b/packages/plugin-eval/src/index.ts
index 27e9f98583..4771609f6e 100644
--- a/packages/plugin-eval/src/index.ts
+++ b/packages/plugin-eval/src/index.ts
@@ -1,4 +1,4 @@
-import { App, Context, User, Session } from 'koishi-core'
+import { App, Context, Session } from 'koishi-core'
 import { CQCode, Logger, defineProperty, omit, Random } from 'koishi-utils'
 import { Worker, ResourceLimits } from 'worker_threads'
 import { WorkerAPI, WorkerConfig, WorkerData, Response } from './worker'
@@ -14,6 +14,12 @@ declare module 'koishi-core/dist/app' {
   }
 }
 
+declare module 'koishi-core/dist/command' {
+  interface CommandConfig {
+    noEval?: boolean
+  }
+}
+
 declare module 'koishi-core/dist/context' {
   interface EventMap {
     'worker/start' (): void | Promise<void>
@@ -34,7 +40,6 @@ interface MainConfig {
   prefix?: string
   timeout?: number
   maxLogs?: number
-  prohibitedCommands?: string[]
   resourceLimits?: ResourceLimits
 }
 
@@ -47,7 +52,6 @@ const defaultConfig: Config = {
   timeout: 1000,
   setupFiles: {},
   maxLogs: Infinity,
-  prohibitedCommands: ['evaluate', 'echo', 'broadcast', 'teach', 'contextify'],
 }
 
 const logger = new Logger('eval')
@@ -103,7 +107,7 @@ export function apply(ctx: Context, config: Config = {}) {
       workerData: {
         entry: process.env.KOISHI_WORKER_ENTRY,
         logLevels: Logger.levels,
-        ...omit(config, ['maxLogs', 'resourceLimits', 'timeout', 'prohibitedCommands']),
+        ...omit(config, ['maxLogs', 'resourceLimits', 'timeout']),
       },
       resourceLimits: config.resourceLimits,
     })
@@ -141,12 +145,12 @@ export function apply(ctx: Context, config: Config = {}) {
   })
 
   ctx.on('before-command', ({ command, session }) => {
-    if (config.prohibitedCommands.includes(command.name) && session._isEval) {
+    if (command.config.noEval && session._isEval) {
       return `不能在 evaluate 指令中调用 ${command.name} 指令。`
     }
   })
 
-  const evaluate = ctx.command('evaluate [expr...]', '执行 JavaScript 脚本')
+  const evaluate = ctx.command('evaluate [expr...]', '执行 JavaScript 脚本', { noEval: true })
     .alias('eval')
     .userFields(['authority'])
     .option('slient', '-s  不输出最后的结果')
diff --git a/packages/plugin-teach/src/internal.ts b/packages/plugin-teach/src/internal.ts
index f7d5df9682..31fd67b6b6 100644
--- a/packages/plugin-teach/src/internal.ts
+++ b/packages/plugin-teach/src/internal.ts
@@ -7,6 +7,12 @@ import { formatQuestionAnswers } from './search'
 import { format } from 'util'
 import leven from 'leven'
 
+declare module 'koishi-core/dist/command' {
+  interface CommandConfig {
+    noInterp?: boolean
+  }
+}
+
 declare module 'koishi-core/dist/plugins/message' {
   namespace Message {
     export namespace Teach {
@@ -169,9 +175,8 @@ export default function apply(ctx: Context, config: Dialogue.Config) {
     })
   })
 
-  const { prohibitedCommands = [] } = config
   ctx.on('before-command', ({ command, session }) => {
-    if (prohibitedCommands.includes(command.name) && session._redirected) {
+    if (command.config.noInterp && session._redirected) {
       return format(Message.Teach.ProhibitedCommand, command.name)
     }
   })
diff --git a/packages/plugin-teach/src/utils.ts b/packages/plugin-teach/src/utils.ts
index b4d5a29699..35d4129682 100644
--- a/packages/plugin-teach/src/utils.ts
+++ b/packages/plugin-teach/src/utils.ts
@@ -70,7 +70,6 @@ export namespace Dialogue {
     prefix?: string
     historyAge?: number
     validateRegExp?: RegExpValidator.Options
-    prohibitedCommands?: string[]
   }
 
   export enum Flag {

From 7f082451f746a312f3820c3ded51414d3c9c886a Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Wed, 26 Aug 2020 02:36:29 +0800
Subject: [PATCH 15/31] chore: bump versions

---
 packages/koishi/package.json             | 3 ++-
 packages/plugin-eval-addons/package.json | 4 ++--
 packages/plugin-eval/package.json        | 2 +-
 packages/plugin-teach/package.json       | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/koishi/package.json b/packages/koishi/package.json
index a69f726f0e..22ceb1cc3c 100644
--- a/packages/koishi/package.json
+++ b/packages/koishi/package.json
@@ -44,9 +44,10 @@
     "koishi-adapter-cqhttp": "^1.0.0",
     "koishi-plugin-common": "^3.0.0-beta.15",
     "koishi-plugin-mysql": "^2.0.0",
+    "koishi-plugin-mongo": "^1.0.0",
     "koishi-plugin-schedule": "^2.0.0",
     "koishi-plugin-status": "^2.0.0-beta.13",
-    "koishi-plugin-teach": "^1.0.0",
+    "koishi-plugin-teach": "^1.0.1",
     "koishi-utils": "^3.1.0",
     "prompts": "^2.3.2"
   }
diff --git a/packages/plugin-eval-addons/package.json b/packages/plugin-eval-addons/package.json
index 8773eebc69..294a02f688 100644
--- a/packages/plugin-eval-addons/package.json
+++ b/packages/plugin-eval-addons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-eval-addons",
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-beta.7",
   "description": "Execute JavaScript in Koishi",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -37,7 +37,7 @@
   ],
   "peerDependencies": {
     "koishi-core": "^2.0.0",
-    "koishi-plugin-eval": "^2.0.0-beta.15"
+    "koishi-plugin-eval": "^2.0.0-beta.16"
   },
   "dependencies": {
     "js-yaml": "^3.14.0",
diff --git a/packages/plugin-eval/package.json b/packages/plugin-eval/package.json
index 7d47165187..b2d779d5c8 100644
--- a/packages/plugin-eval/package.json
+++ b/packages/plugin-eval/package.json
@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-eval",
-  "version": "2.0.0-beta.15",
+  "version": "2.0.0-beta.16",
   "description": "Execute JavaScript in Koishi",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
diff --git a/packages/plugin-teach/package.json b/packages/plugin-teach/package.json
index a2f91064a3..a406573485 100644
--- a/packages/plugin-teach/package.json
+++ b/packages/plugin-teach/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-teach",
   "description": "Teach plugin for Koishi",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "engines": {

From 6047061fea3b619993d42254f4c6bbb3ab670f59 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Wed, 26 Aug 2020 03:24:40 +0800
Subject: [PATCH 16/31] cqhttp: support go-cqhttp version

---
 packages/adapter-cqhttp/src/api.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/adapter-cqhttp/src/api.ts b/packages/adapter-cqhttp/src/api.ts
index d56d1c748a..cc62e7ed5d 100644
--- a/packages/adapter-cqhttp/src/api.ts
+++ b/packages/adapter-cqhttp/src/api.ts
@@ -360,6 +360,7 @@ export interface ImageInfo {
 }
 
 export interface VersionInfo {
+  version?: string
   goCqhttp?: boolean
   runtimeVersion?: string
   runtimeOs?: string
@@ -395,9 +396,9 @@ interface CQNode {
 defineAsync('set_group_name', 'group_id', 'name')
 
 export function toVersion(data: VersionInfo) {
-  const { coolqEdition, pluginVersion, goCqhttp } = data
+  const { coolqEdition, pluginVersion, goCqhttp, version } = data
   if (goCqhttp) {
-    return `Go-CQHTTP`
+    return `Go-CQHTTP/${version.slice(1)}`
   } else {
     return `CoolQ/${capitalize(coolqEdition)} CQHTTP/${pluginVersion}`
   }

From 398abe532d0a703836e66e01a752011c298a303d Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Wed, 26 Aug 2020 03:29:08 +0800
Subject: [PATCH 17/31] utils: enum logger levels

---
 packages/koishi-core/tests/hook.spec.ts |  2 +-
 packages/koishi-utils/src/logger.ts     | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/koishi-core/tests/hook.spec.ts b/packages/koishi-core/tests/hook.spec.ts
index fae3561e46..351b132c2a 100644
--- a/packages/koishi-core/tests/hook.spec.ts
+++ b/packages/koishi-core/tests/hook.spec.ts
@@ -6,7 +6,7 @@ import { expect } from 'chai'
 
 const app = new App()
 
-Logger.baseLevel = 1
+Logger.baseLevel = Logger.ERROR
 const appLogger = new Logger('app')
 const appWarn = spyOn(appLogger, 'warn')
 const midLogger = new Logger('middleware')
diff --git a/packages/koishi-utils/src/logger.ts b/packages/koishi-utils/src/logger.ts
index 36fc5e272a..2b270eb811 100644
--- a/packages/koishi-utils/src/logger.ts
+++ b/packages/koishi-utils/src/logger.ts
@@ -15,6 +15,12 @@ const instances: Record<string, Logger> = {}
 type LogFunction = (format: any, ...param: any[]) => void
 
 export class Logger {
+  static readonly SUCCESS = 1
+  static readonly ERROR = 1
+  static readonly INFO = 2
+  static readonly WARN = 2
+  static readonly DEBUG = 3
+
   static baseLevel = 2
   static showDiff = false
   static levels: Record<string, number> = {}
@@ -54,11 +60,11 @@ export class Logger {
     instances[name] = this
     this.code = colors[Math.abs(hash) % colors.length]
     this.displayName = name ? this.color(name + ' ', ';1') : ''
-    this.createMethod('success', '[S] ', 1)
-    this.createMethod('error', '[E] ', 1)
-    this.createMethod('info', '[I] ', 2)
-    this.createMethod('warn', '[W] ', 2)
-    this.createMethod('debug', '[D] ', 3)
+    this.createMethod('success', '[S] ', Logger.SUCCESS)
+    this.createMethod('error', '[E] ', Logger.ERROR)
+    this.createMethod('info', '[I] ', Logger.INFO)
+    this.createMethod('warn', '[W] ', Logger.WARN)
+    this.createMethod('debug', '[D] ', Logger.DEBUG)
   }
 
   private color(value: any, decoration = '') {

From 53c16abb219ee1135ca4d3373327340c343004a9 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Wed, 26 Aug 2020 10:49:41 +0800
Subject: [PATCH 18/31] eval-addons: utils module

---
 package.json                              |  2 +
 packages/plugin-eval-addons/package.json  |  4 ++
 packages/plugin-eval-addons/src/worker.ts | 46 +++++++++++++++--------
 packages/plugin-eval/src/worker.ts        |  9 ++++-
 4 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 326c4d3656..b5665fcdf4 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,7 @@
   "private": true,
   "workspaces": [
     "atri",
+    "addons",
     "shiki",
     "shiki/core",
     "shiki/cosmos",
@@ -11,6 +12,7 @@
   ],
   "scripts": {
     "atri": "yarn workspace atri",
+    "addons": "yarn workspace addons",
     "build": "tsc -b && yarn workspace koishi-plugin-eval wrap",
     "build:ci": "tsc -b --listEmittedFiles && yarn workspace koishi-plugin-eval wrap",
     "bump": "ts-node build/bump",
diff --git a/packages/plugin-eval-addons/package.json b/packages/plugin-eval-addons/package.json
index 294a02f688..49e35f0767 100644
--- a/packages/plugin-eval-addons/package.json
+++ b/packages/plugin-eval-addons/package.json
@@ -41,8 +41,12 @@
   },
   "dependencies": {
     "js-yaml": "^3.14.0",
+    "json5": "^2.1.3",
     "koishi-utils": "^3.1.0",
     "simple-git": "^2.20.1",
     "typescript": "^4.0.2"
+  },
+  "devDependencies": {
+    "@types/json5": "^0.0.30"
   }
 }
diff --git a/packages/plugin-eval-addons/src/worker.ts b/packages/plugin-eval-addons/src/worker.ts
index 88bf4afbe0..5e2d6e0ea1 100644
--- a/packages/plugin-eval-addons/src/worker.ts
+++ b/packages/plugin-eval-addons/src/worker.ts
@@ -1,9 +1,10 @@
-import { config, context, internal, WorkerAPI, createContext, response } from 'koishi-plugin-eval/dist/worker'
+import { config, context, internal, WorkerAPI, createContext, response, mapDirectory } from 'koishi-plugin-eval/dist/worker'
 import { promises, readFileSync } from 'fs'
 import { resolve, posix, dirname } from 'path'
 import { User } from 'koishi-core'
-import { Logger } from 'koishi-utils'
+import { Logger, Time, CQCode, Random } from 'koishi-utils'
 import { Config } from '.'
+import json5 from 'json5'
 import ts from 'typescript'
 
 const logger = new Logger('addon')
@@ -57,16 +58,28 @@ interface Module {
   evaluate(): Promise<void>
 }
 
-const builtinIdentifier = 'koishi/addons.ts'
-const builtin = new SyntheticModule(['registerCommand'], function () {
-  this.setExport('registerCommand', function registerCommand(name: string, callback: AddonAction) {
+const root = resolve(process.cwd(), config.moduleRoot)
+const modules: Record<string, Module> = {}
+
+export function createSynthetic(identifier: string, exports: {}) {
+  const module = new SyntheticModule(Object.keys(exports), function () {
+    for (const key in exports) {
+      this.setExport(key, exports[key])
+    }
+  }, { context, identifier })
+  modules[identifier] = module
+  config.addonNames.unshift(identifier)
+}
+
+createSynthetic('koishi/addons.ts', {
+  registerCommand(name: string, callback: AddonAction) {
     commandMap[name] = callback
-  })
-}, { context, identifier: builtinIdentifier })
+  },
+})
 
-const root = resolve(process.cwd(), config.moduleRoot)
-const modules: Record<string, Module> = { [builtinIdentifier]: builtin }
-config.addonNames.unshift(...Object.keys(modules))
+createSynthetic('koishi/utils.ts', {
+  Time, CQCode, Random,
+})
 
 const suffixes = ['', '.ts', '/index.ts']
 const relativeRE = /^\.\.?[\\/]/
@@ -98,7 +111,7 @@ async function linker(specifier: string, { identifier }: Module) {
   throw new Error(`Unable to resolve dependency "${specifier}" in "${identifier}"`)
 }
 
-const json = JSON.parse(readFileSync(resolve(root, 'tsconfig.json'), 'utf8'))
+const json = json5.parse(readFileSync(resolve(root, 'tsconfig.json'), 'utf8'))
 const { options: compilerOptions } = ts.parseJsonConfigFileContent(json, ts.sys, root)
 
 async function loadSource(path: string) {
@@ -124,14 +137,17 @@ async function createModule(path: string) {
   logger.debug('creating module %c', module.identifier)
   await module.link(linker)
   await module.evaluate()
+
+  if (module instanceof SourceTextModule) {
+    internal.setGlobal(path, module.namespace)
+  }
   return module
 }
 
-export default Promise.all(config.addonNames.map(path => createModule(path).then((module) => {
-  internal.setGlobal(path, module.namespace)
-}, (error) => {
+export default Promise.all(config.addonNames.map(path => createModule(path).catch((error) => {
   logger.warn(`cannot load module %c\n` + error.stack, path)
-  delete modules[path]
 }))).then(() => {
   response.commands = Object.keys(commandMap)
+  mapDirectory('koishi/utils/', require.resolve('koishi-utils'))
+  internal.setGlobal('utils', modules['koishi/utils.ts'].namespace)
 })
diff --git a/packages/plugin-eval/src/worker.ts b/packages/plugin-eval/src/worker.ts
index b5dd756bb7..e4a730e58b 100644
--- a/packages/plugin-eval/src/worker.ts
+++ b/packages/plugin-eval/src/worker.ts
@@ -2,6 +2,7 @@ import { Logger, escapeRegExp } from 'koishi-utils'
 import { parentPort, workerData } from 'worker_threads'
 import { InspectOptions, formatWithOptions } from 'util'
 import { findSourceMap } from 'module'
+import { dirname, sep } from 'path'
 
 /* eslint-disable import/first */
 
@@ -119,9 +120,13 @@ export class WorkerAPI {
   }
 }
 
+export function mapDirectory(identifier: string, filename: string) {
+  const path = dirname(findSourceMap(filename).payload.sources[0].slice(7)) + sep
+  pathMapper[identifier] = new RegExp(`(at | \\()${escapeRegExp(path)}`, 'g')
+}
+
 Promise.all(Object.values(config.setupFiles).map(file => require(file).default)).then(() => {
-  const path = findSourceMap(__filename).payload.sources[0].slice(7, -9)
-  pathMapper['koishi/'] = new RegExp(`(at | \\()${escapeRegExp(path)}`, 'g')
+  mapDirectory('koishi/', __filename)
   Object.entries(config.setupFiles).forEach(([name, path]) => {
     const sourceMap = findSourceMap(path)
     if (sourceMap) path = sourceMap.payload.sources[0].slice(7)

From 72f6b7ba2783c4f79cd3b75ed59e346383b5deb2 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Wed, 26 Aug 2020 12:15:39 +0800
Subject: [PATCH 19/31] eval-addons: enhance worker api

---
 packages/plugin-eval-addons/src/worker.ts | 26 ++++++++++++++---------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/packages/plugin-eval-addons/src/worker.ts b/packages/plugin-eval-addons/src/worker.ts
index 5e2d6e0ea1..11e43480fb 100644
--- a/packages/plugin-eval-addons/src/worker.ts
+++ b/packages/plugin-eval-addons/src/worker.ts
@@ -59,25 +59,25 @@ interface Module {
 }
 
 const root = resolve(process.cwd(), config.moduleRoot)
-const modules: Record<string, Module> = {}
+export const modules: Record<string, Module> = {}
 
-export function createSynthetic(identifier: string, exports: {}) {
-  const module = new SyntheticModule(Object.keys(exports), function () {
-    for (const key in exports) {
-      this.setExport(key, exports[key])
+export function synthetize(identifier: string, namespace: {}) {
+  const module = new SyntheticModule(Object.keys(namespace), function () {
+    for (const key in namespace) {
+      this.setExport(key, namespace[key])
     }
   }, { context, identifier })
   modules[identifier] = module
   config.addonNames.unshift(identifier)
 }
 
-createSynthetic('koishi/addons.ts', {
+synthetize('koishi/addons.ts', {
   registerCommand(name: string, callback: AddonAction) {
     commandMap[name] = callback
   },
 })
 
-createSynthetic('koishi/utils.ts', {
+synthetize('koishi/utils.ts', {
   Time, CQCode, Random,
 })
 
@@ -144,9 +144,15 @@ async function createModule(path: string) {
   return module
 }
 
-export default Promise.all(config.addonNames.map(path => createModule(path).catch((error) => {
-  logger.warn(`cannot load module %c\n` + error.stack, path)
-}))).then(() => {
+export async function evaluate(path: string) {
+  try {
+    await createModule(path)
+  } catch (error) {
+    logger.warn(`cannot load module %c\n` + error.stack, path)
+  }
+}
+
+export default Promise.all(config.addonNames.map(evaluate)).then(() => {
   response.commands = Object.keys(commandMap)
   mapDirectory('koishi/utils/', require.resolve('koishi-utils'))
   internal.setGlobal('utils', modules['koishi/utils.ts'].namespace)

From 0f68ab6c992371f7ba27f29963316aaa20fbb439 Mon Sep 17 00:00:00 2001
From: undefined <masnn0@outlook.com>
Date: Wed, 26 Aug 2020 20:14:46 +0800
Subject: [PATCH 20/31] mongo: fix $date in database.setUser (#92)

---
 packages/plugin-mongo/src/index.ts | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/plugin-mongo/src/index.ts b/packages/plugin-mongo/src/index.ts
index cc1111a219..e3aa4e5c10 100644
--- a/packages/plugin-mongo/src/index.ts
+++ b/packages/plugin-mongo/src/index.ts
@@ -106,21 +106,23 @@ extendDatabase(MongoDatabase, {
   },
 
   async setUser(userId, data) {
-    const $set = { ...data }
-    if ($set.timers) {
-      for (const key in $set.timers) {
-        if (key === '$date') $set['timers._date'] = $set.timers.$date
-        else $set[`timers.${key.replace(/\./gmi, '_')}`] = $set.timers[key]
+    const $set: any = { ...data }
+    delete $set.timers
+    delete $set.usage
+    if (data.timers) {
+      $set.timers = {}
+      for (const key in data.timers) {
+        if (key === '$date') $set.timer._date = data.timers.$date
+        else $set.timer[key.replace(/\./gmi, '_')] = data.timers[key]
       }
     }
-    if ($set.usage) {
-      for (const key in $set.usage) {
-        if (key === '$date') $set['usage._date'] = $set.usage.$date
-        else $set[`usage.${key.replace(/\./gmi, '_')}`] = $set.usage[key]
+    if (data.usage) {
+      $set.usage = {}
+      for (const key in data.usage) {
+        if (key === '$date') $set.usage._date = data.usage.$date
+        else $set.usage[key.replace(/\./gmi, '_')] = data.usage[key]
       }
     }
-    delete $set.timers
-    delete $set.usage
     await this.user.updateOne({ _id: userId }, { $set }, { upsert: true })
   },
 

From fbca5dce3dcb50f7617b3bd7e3d2f2d4fbef8d33 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 27 Aug 2020 00:51:17 +0800
Subject: [PATCH 21/31] eval: check source map

---
 package.json                       | 1 +
 packages/plugin-eval/src/worker.ts | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b5665fcdf4..63979713b7 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "shiki/core",
     "shiki/cosmos",
     "shiki/games",
+    "shiki/others",
     "packages/*"
   ],
   "scripts": {
diff --git a/packages/plugin-eval/src/worker.ts b/packages/plugin-eval/src/worker.ts
index e4a730e58b..74343c39b4 100644
--- a/packages/plugin-eval/src/worker.ts
+++ b/packages/plugin-eval/src/worker.ts
@@ -121,7 +121,9 @@ export class WorkerAPI {
 }
 
 export function mapDirectory(identifier: string, filename: string) {
-  const path = dirname(findSourceMap(filename).payload.sources[0].slice(7)) + sep
+  const sourceMap = findSourceMap(filename)
+  if (!sourceMap) return logger.warn('cannot find source map for %c', filename)
+  const path = dirname(sourceMap.payload.sources[0].slice(7)) + sep
   pathMapper[identifier] = new RegExp(`(at | \\()${escapeRegExp(path)}`, 'g')
 }
 

From 3bfc6945fccb7baf88889a57c02656b618a6845e Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 27 Aug 2020 00:53:53 +0800
Subject: [PATCH 22/31] eval: use evalConfig.dataKeys to narrow down worker
 payload size

---
 packages/plugin-eval-addons/src/index.ts  | 18 ++++++++++++------
 packages/plugin-eval-addons/src/worker.ts | 12 ++++++------
 packages/plugin-eval/src/index.ts         | 18 ++++++++++--------
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/packages/plugin-eval-addons/src/index.ts b/packages/plugin-eval-addons/src/index.ts
index c791db7601..fcda4509b1 100644
--- a/packages/plugin-eval-addons/src/index.ts
+++ b/packages/plugin-eval-addons/src/index.ts
@@ -1,19 +1,24 @@
 import { Context, CommandConfig, OptionConfig, User } from 'koishi-core'
-import { resolve } from 'path'
-import {} from 'koishi-plugin-eval'
 import { assertProperty, Logger, noop } from 'koishi-utils'
+import { resolve } from 'path'
 import { safeLoad } from 'js-yaml'
 import { promises as fs } from 'fs'
+import {} from 'koishi-plugin-eval'
 import Git, { CheckRepoActions } from 'simple-git'
 
 const logger = new Logger('addon')
 
+type AddonConfig = Config
+
 export interface Config {
   gitRemote?: string
-  moduleRoot?: string
   exclude?: RegExp
 }
 
+declare module 'koishi-plugin-eval' {
+  interface MainConfig extends AddonConfig {}
+}
+
 interface OptionManifest extends OptionConfig {
   name: string
   desc: string
@@ -39,10 +44,11 @@ interface Manifest {
 export function apply(ctx: Context, config: Config) {
   const { evalConfig } = ctx.app
   Object.assign(evalConfig, config)
-  const moduleRoot = assertProperty(evalConfig, 'moduleRoot')
+  const root = resolve(process.cwd(), assertProperty(evalConfig, 'moduleRoot'))
+  evalConfig.moduleRoot = root
+  evalConfig.dataKeys.push('addonNames', 'moduleRoot')
   evalConfig.setupFiles['koishi/addons.ts'] = resolve(__dirname, 'worker.js')
 
-  const root = resolve(process.cwd(), moduleRoot)
   const git = Git(root)
 
   const addon = ctx.command('addon', '扩展功能')
@@ -59,7 +65,7 @@ export function apply(ctx: Context, config: Config) {
 
   ctx.on('before-connect', async () => {
     const isRepo = await git.checkIsRepo(CheckRepoActions.IS_REPO_ROOT)
-    if (!isRepo) throw new Error(`moduleRoot "${moduleRoot}" is not git repository`)
+    if (!isRepo) throw new Error(`moduleRoot "${root}" is not git repository`)
   })
 
   let manifests: Record<string, Promise<Manifest>>
diff --git a/packages/plugin-eval-addons/src/worker.ts b/packages/plugin-eval-addons/src/worker.ts
index 11e43480fb..56e268c67c 100644
--- a/packages/plugin-eval-addons/src/worker.ts
+++ b/packages/plugin-eval-addons/src/worker.ts
@@ -3,7 +3,6 @@ import { promises, readFileSync } from 'fs'
 import { resolve, posix, dirname } from 'path'
 import { User } from 'koishi-core'
 import { Logger, Time, CQCode, Random } from 'koishi-utils'
-import { Config } from '.'
 import json5 from 'json5'
 import ts from 'typescript'
 
@@ -12,7 +11,9 @@ const logger = new Logger('addon')
 const { SourceTextModule, SyntheticModule } = require('vm')
 
 declare module 'koishi-plugin-eval/dist/worker' {
-  interface WorkerConfig extends Config {}
+  interface WorkerConfig {
+    moduleRoot?: string
+  }
 
   interface WorkerData {
     addonNames: string[]
@@ -58,7 +59,6 @@ interface Module {
   evaluate(): Promise<void>
 }
 
-const root = resolve(process.cwd(), config.moduleRoot)
 export const modules: Record<string, Module> = {}
 
 export function synthetize(identifier: string, namespace: {}) {
@@ -111,14 +111,14 @@ async function linker(specifier: string, { identifier }: Module) {
   throw new Error(`Unable to resolve dependency "${specifier}" in "${identifier}"`)
 }
 
-const json = json5.parse(readFileSync(resolve(root, 'tsconfig.json'), 'utf8'))
-const { options: compilerOptions } = ts.parseJsonConfigFileContent(json, ts.sys, root)
+const json = json5.parse(readFileSync(resolve(config.moduleRoot, 'tsconfig.json'), 'utf8'))
+const { options: compilerOptions } = ts.parseJsonConfigFileContent(json, ts.sys, config.moduleRoot)
 
 async function loadSource(path: string) {
   for (const postfix of suffixes) {
     try {
       const target = path + postfix
-      return [await promises.readFile(resolve(root, target), 'utf8'), target]
+      return [await promises.readFile(resolve(config.moduleRoot, target), 'utf8'), target]
     } catch {}
   }
   throw new Error(`cannot load source file "${path}"`)
diff --git a/packages/plugin-eval/src/index.ts b/packages/plugin-eval/src/index.ts
index 4771609f6e..7068e2b506 100644
--- a/packages/plugin-eval/src/index.ts
+++ b/packages/plugin-eval/src/index.ts
@@ -1,5 +1,5 @@
 import { App, Context, Session } from 'koishi-core'
-import { CQCode, Logger, defineProperty, omit, Random } from 'koishi-utils'
+import { CQCode, Logger, defineProperty, Random, pick } from 'koishi-utils'
 import { Worker, ResourceLimits } from 'worker_threads'
 import { WorkerAPI, WorkerConfig, WorkerData, Response } from './worker'
 import { wrap, expose, Remote } from './transfer'
@@ -22,9 +22,9 @@ declare module 'koishi-core/dist/command' {
 
 declare module 'koishi-core/dist/context' {
   interface EventMap {
-    'worker/start' (): void | Promise<void>
-    'worker/ready' (response: Response): void
-    'worker/exit' (): void
+    'worker/start'(): void | Promise<void>
+    'worker/ready'(response: Response): void
+    'worker/exit'(): void
   }
 }
 
@@ -36,22 +36,24 @@ declare module 'koishi-core/dist/session' {
   }
 }
 
-interface MainConfig {
+export interface MainConfig {
   prefix?: string
   timeout?: number
   maxLogs?: number
   resourceLimits?: ResourceLimits
+  dataKeys?: (keyof WorkerData)[]
 }
 
-interface EvalConfig extends MainConfig, WorkerData {}
+export interface EvalConfig extends MainConfig, WorkerData {}
 
 export interface Config extends MainConfig, WorkerConfig {}
 
-const defaultConfig: Config = {
+const defaultConfig: EvalConfig = {
   prefix: '>',
   timeout: 1000,
   setupFiles: {},
   maxLogs: Infinity,
+  dataKeys: ['inspect', 'setupFiles'],
 }
 
 const logger = new Logger('eval')
@@ -107,7 +109,7 @@ export function apply(ctx: Context, config: Config = {}) {
       workerData: {
         entry: process.env.KOISHI_WORKER_ENTRY,
         logLevels: Logger.levels,
-        ...omit(config, ['maxLogs', 'resourceLimits', 'timeout']),
+        ...pick(config, config.dataKeys),
       },
       resourceLimits: config.resourceLimits,
     })

From 8cd0ff892952af894b8aa731858787d66c42d21f Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 27 Aug 2020 00:55:04 +0800
Subject: [PATCH 23/31] eval-addons: relative modules should not be exposed to
 global

---
 packages/plugin-eval-addons/src/worker.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/plugin-eval-addons/src/worker.ts b/packages/plugin-eval-addons/src/worker.ts
index 56e268c67c..004934e0d1 100644
--- a/packages/plugin-eval-addons/src/worker.ts
+++ b/packages/plugin-eval-addons/src/worker.ts
@@ -134,11 +134,12 @@ async function createModule(path: string) {
     module = modules[identifier] = new SourceTextModule(outputText, { context, identifier })
   }
 
-  logger.debug('creating module %c', module.identifier)
+  const type = module instanceof SyntheticModule ? 'synthetic' : 'source text'
+  logger.debug('creating %s module %c', type, module.identifier)
   await module.link(linker)
   await module.evaluate()
 
-  if (module instanceof SourceTextModule) {
+  if (!path.includes('/')) {
     internal.setGlobal(path, module.namespace)
   }
   return module

From 9193e94fc95c43626ed3b6c68f9cfbaaf278210d Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 27 Aug 2020 01:47:47 +0800
Subject: [PATCH 24/31] eval-addons: support field traps

---
 packages/plugin-eval-addons/src/index.ts | 32 +++++++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/packages/plugin-eval-addons/src/index.ts b/packages/plugin-eval-addons/src/index.ts
index fcda4509b1..098ace1f8c 100644
--- a/packages/plugin-eval-addons/src/index.ts
+++ b/packages/plugin-eval-addons/src/index.ts
@@ -19,6 +19,17 @@ declare module 'koishi-plugin-eval' {
   interface MainConfig extends AddonConfig {}
 }
 
+const proxyFields: Record<string, FieldTrap<any, any>> = {}
+
+export function defineFieldTrap<T, K extends User.Field = never>(key: string, trap: FieldTrap<T, K>) {
+  proxyFields[key] = trap
+}
+
+export interface FieldTrap<T = any, K extends User.Field = never> {
+  fields: Iterable<K>
+  get(data: Pick<User, K>): T
+}
+
 interface OptionManifest extends OptionConfig {
   name: string
   desc: string
@@ -93,23 +104,36 @@ export function apply(ctx: Context, config: Config) {
       const { commands = [] } = manifest
       commands.forEach((config) => {
         const { name: rawName, desc, options = [], userFields = [] } = config
+        const { read = [] } = Array.isArray(userFields) ? { read: userFields } : userFields
+
         const [name] = rawName.split(' ', 1)
         if (!response.commands.includes(name)) {
           return logger.warn('unregistered command manifest: %c', name)
         }
-        const { read = [] } = Array.isArray(userFields) ? { read: userFields } : userFields
+
         const cmd = addon
           .subcommand(rawName, desc, config)
-          .userFields(read)
-          .action(async ({ session, command: { name }, options }, ...args) => {
+          .action(async ({ session, command, options }, ...args) => {
             const { $app, $user, $uuid } = session
-            const result = await $app.evalRemote.addon($uuid, $user, { name, args, options })
+            const { name } = command
+            const user: Partial<User> = {}
+            for (const key of read) {
+              const trap = proxyFields[key]
+              Reflect.set(user, key, trap ? trap.get($user) : $user[key])
+            }
+            const result = await $app.evalRemote.addon($uuid, user, { name, args, options })
             return result
           })
+
         options.forEach((config) => {
           const { name, desc } = config
           cmd.option(name, desc, config)
         })
+
+        for (const key of read) {
+          const trap = proxyFields[key]
+          cmd.userFields(trap ? trap.fields : [key])
+        }
       })
     })
   })

From e61eeb6e1a63b650c370ebd25c324f350de95329 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 27 Aug 2020 02:35:11 +0800
Subject: [PATCH 25/31] eval: user traps in eval

---
 packages/plugin-eval-addons/src/index.ts  | 33 +++++------------------
 packages/plugin-eval-addons/src/worker.ts |  6 ++---
 packages/plugin-eval/src/index.ts         | 17 +++++++++---
 packages/plugin-eval/src/trap.ts          | 30 +++++++++++++++++++++
 packages/plugin-eval/src/worker.ts        | 31 ++++++++++-----------
 5 files changed, 69 insertions(+), 48 deletions(-)
 create mode 100644 packages/plugin-eval/src/trap.ts

diff --git a/packages/plugin-eval-addons/src/index.ts b/packages/plugin-eval-addons/src/index.ts
index 098ace1f8c..f201bc840a 100644
--- a/packages/plugin-eval-addons/src/index.ts
+++ b/packages/plugin-eval-addons/src/index.ts
@@ -3,7 +3,7 @@ import { assertProperty, Logger, noop } from 'koishi-utils'
 import { resolve } from 'path'
 import { safeLoad } from 'js-yaml'
 import { promises as fs } from 'fs'
-import {} from 'koishi-plugin-eval'
+import { UserTrap } from 'koishi-plugin-eval'
 import Git, { CheckRepoActions } from 'simple-git'
 
 const logger = new Logger('addon')
@@ -19,25 +19,14 @@ declare module 'koishi-plugin-eval' {
   interface MainConfig extends AddonConfig {}
 }
 
-const proxyFields: Record<string, FieldTrap<any, any>> = {}
-
-export function defineFieldTrap<T, K extends User.Field = never>(key: string, trap: FieldTrap<T, K>) {
-  proxyFields[key] = trap
-}
-
-export interface FieldTrap<T = any, K extends User.Field = never> {
-  fields: Iterable<K>
-  get(data: Pick<User, K>): T
-}
-
 interface OptionManifest extends OptionConfig {
   name: string
   desc: string
 }
 
 type Permission<T> = T[] | {
-  read?: T[]
-  write?: T[]
+  readable?: T[]
+  writable?: T[]
 }
 
 interface CommandManifest extends CommandConfig {
@@ -104,7 +93,7 @@ export function apply(ctx: Context, config: Config) {
       const { commands = [] } = manifest
       commands.forEach((config) => {
         const { name: rawName, desc, options = [], userFields = [] } = config
-        const { read = [] } = Array.isArray(userFields) ? { read: userFields } : userFields
+        const { readable = [] } = Array.isArray(userFields) ? { readable: userFields } : userFields
 
         const [name] = rawName.split(' ', 1)
         if (!response.commands.includes(name)) {
@@ -116,24 +105,16 @@ export function apply(ctx: Context, config: Config) {
           .action(async ({ session, command, options }, ...args) => {
             const { $app, $user, $uuid } = session
             const { name } = command
-            const user: Partial<User> = {}
-            for (const key of read) {
-              const trap = proxyFields[key]
-              Reflect.set(user, key, trap ? trap.get($user) : $user[key])
-            }
-            const result = await $app.evalRemote.addon($uuid, user, { name, args, options })
+            const user = UserTrap.get($user, readable)
+            const result = await $app.evalRemote.callAddon($uuid, user, { name, args, options })
             return result
           })
 
+        UserTrap.prepare(cmd, readable)
         options.forEach((config) => {
           const { name, desc } = config
           cmd.option(name, desc, config)
         })
-
-        for (const key of read) {
-          const trap = proxyFields[key]
-          cmd.userFields(trap ? trap.fields : [key])
-        }
       })
     })
   })
diff --git a/packages/plugin-eval-addons/src/worker.ts b/packages/plugin-eval-addons/src/worker.ts
index 004934e0d1..c8abb1862e 100644
--- a/packages/plugin-eval-addons/src/worker.ts
+++ b/packages/plugin-eval-addons/src/worker.ts
@@ -20,7 +20,7 @@ declare module 'koishi-plugin-eval/dist/worker' {
   }
 
   interface WorkerAPI {
-    addon(sid: string, user: Partial<User>, argv: AddonArgv): Promise<string | void>
+    callAddon(sid: string, user: Partial<User>, argv: AddonArgv): Promise<string | void>
   }
 
   interface Response {
@@ -41,10 +41,10 @@ interface AddonContext extends AddonArgv {
 type AddonAction = (ctx: AddonContext) => string | void | Promise<string | void>
 const commandMap: Record<string, AddonAction> = {}
 
-WorkerAPI.prototype.addon = async function (sid, user, argv) {
+WorkerAPI.prototype.callAddon = async function (sid, user, argv) {
   const callback = commandMap[argv.name]
   try {
-    return await callback({ user, ...argv, ...createContext(sid) })
+    return await callback({ ...argv, ...createContext(sid, user) })
   } catch (error) {
     logger.warn(error)
   }
diff --git a/packages/plugin-eval/src/index.ts b/packages/plugin-eval/src/index.ts
index 7068e2b506..871c9b5787 100644
--- a/packages/plugin-eval/src/index.ts
+++ b/packages/plugin-eval/src/index.ts
@@ -1,9 +1,12 @@
-import { App, Context, Session } from 'koishi-core'
+import { App, Context, Session, User } from 'koishi-core'
 import { CQCode, Logger, defineProperty, Random, pick } from 'koishi-utils'
 import { Worker, ResourceLimits } from 'worker_threads'
 import { WorkerAPI, WorkerConfig, WorkerData, Response } from './worker'
 import { wrap, expose, Remote } from './transfer'
 import { resolve } from 'path'
+import { UserTrap } from './trap'
+
+export * from './trap'
 
 declare module 'koishi-core/dist/app' {
   interface App {
@@ -40,6 +43,7 @@ export interface MainConfig {
   prefix?: string
   timeout?: number
   maxLogs?: number
+  userFields?: User.Field[]
   resourceLimits?: ResourceLimits
   dataKeys?: (keyof WorkerData)[]
 }
@@ -53,6 +57,7 @@ const defaultConfig: EvalConfig = {
   timeout: 1000,
   setupFiles: {},
   maxLogs: Infinity,
+  userFields: ['id', 'authority'],
   dataKeys: ['inspect', 'setupFiles'],
 }
 
@@ -152,9 +157,10 @@ export function apply(ctx: Context, config: Config = {}) {
     }
   })
 
-  const evaluate = ctx.command('evaluate [expr...]', '执行 JavaScript 脚本', { noEval: true })
+  const cmd = ctx.command('evaluate [expr...]', '执行 JavaScript 脚本', { noEval: true })
     .alias('eval')
     .userFields(['authority'])
+    .userFields(config.userFields)
     .option('slient', '-s  不输出最后的结果')
     .option('restart', '-r  重启子线程', { authority: 3 })
     .before((session) => {
@@ -197,6 +203,7 @@ export function apply(ctx: Context, config: Config = {}) {
         app.evalWorker.on('error', listener)
         app.evalRemote.eval({
           sid: session.$uuid,
+          user: UserTrap.get(session.$user, config.userFields),
           silent: options.slient,
           source: expr,
         }).then(_resolve, (error) => {
@@ -206,9 +213,11 @@ export function apply(ctx: Context, config: Config = {}) {
       })
     })
 
+  UserTrap.prepare(cmd, config.userFields)
+
   if (prefix) {
-    evaluate.shortcut(prefix, { oneArg: true, fuzzy: true })
-    evaluate.shortcut(prefix + prefix, { oneArg: true, fuzzy: true, options: { slient: true } })
+    cmd.shortcut(prefix, { oneArg: true, fuzzy: true })
+    cmd.shortcut(prefix + prefix, { oneArg: true, fuzzy: true, options: { slient: true } })
   }
 }
 
diff --git a/packages/plugin-eval/src/trap.ts b/packages/plugin-eval/src/trap.ts
new file mode 100644
index 0000000000..54fabc0d38
--- /dev/null
+++ b/packages/plugin-eval/src/trap.ts
@@ -0,0 +1,30 @@
+import { Command, User } from 'koishi-core'
+
+export interface UserTrap<T = any, K extends User.Field = never> {
+  fields: Iterable<K>
+  get(data: Pick<User, K>): T
+}
+
+export namespace UserTrap {
+  const traps: Record<string, UserTrap<any, any>> = {}
+
+  export function define<T, K extends User.Field = never>(key: string, trap: UserTrap<T, K>) {
+    traps[key] = trap
+  }
+
+  export function prepare(cmd: Command, fields: string[]) {
+    for (const field of fields) {
+      const trap = traps[field]
+      cmd.userFields(trap ? trap.fields : [field])
+    }
+  }
+
+  export function get($user: {}, fields: string[]) {
+    const result: Partial<User> = {}
+    for (const field of fields) {
+      const trap = traps[field]
+      Reflect.set(result, field, trap ? trap.get($user) : $user[field])
+    }
+    return result
+  }
+}
diff --git a/packages/plugin-eval/src/worker.ts b/packages/plugin-eval/src/worker.ts
index 74343c39b4..851c729722 100644
--- a/packages/plugin-eval/src/worker.ts
+++ b/packages/plugin-eval/src/worker.ts
@@ -12,6 +12,7 @@ const logger = new Logger('eval')
 import { expose, wrap } from './transfer'
 import { VM } from './vm'
 import { MainAPI } from '.'
+import { User } from 'koishi-core'
 
 export interface WorkerConfig {
   setupFiles?: Record<string, string>
@@ -30,6 +31,7 @@ export const config: WorkerData = {
 
 interface EvalOptions {
   sid: string
+  user: Partial<User>
   silent: boolean
   source: string
 }
@@ -72,19 +74,18 @@ function formatError(error: Error) {
 
 const main = wrap<MainAPI>(parentPort)
 
-export function createContext(sid: string) {
-  return {
-    async send(...param: [string, ...any[]]) {
-      return await main.send(sid, formatResult(...param))
-    },
-    async exec(message: string) {
-      if (typeof message !== 'string') {
-        throw new TypeError('The "message" argument must be of type string')
-      }
-      return await main.execute(sid, message)
-    },
-  }
-}
+export const createContext = (sid: string, user: Partial<User>) => ({
+  user,
+  async send(...param: [string, ...any[]]) {
+    return await main.send(sid, formatResult(...param))
+  },
+  async exec(message: string) {
+    if (typeof message !== 'string') {
+      throw new TypeError('The "message" argument must be of type string')
+    }
+    return await main.execute(sid, message)
+  },
+})
 
 export interface Response {}
 
@@ -96,10 +97,10 @@ export class WorkerAPI {
   }
 
   async eval(options: EvalOptions) {
-    const { sid, source, silent } = options
+    const { sid, user, source, silent } = options
 
     const key = 'koishi-eval-session:' + sid
-    internal.setGlobal(Symbol.for(key), createContext(sid), false, true)
+    internal.setGlobal(Symbol.for(key), createContext(sid, user), false, true)
 
     let result: any
     try {

From 498843630a6ac4192e9b44264609ffa256d22de0 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 27 Aug 2020 03:23:18 +0800
Subject: [PATCH 26/31] eval: fix eval without database

---
 packages/plugin-eval/src/index.ts        | 10 ++--------
 packages/plugin-eval/src/trap.ts         |  1 +
 packages/plugin-eval/tests/index.spec.ts |  9 ++++-----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/packages/plugin-eval/src/index.ts b/packages/plugin-eval/src/index.ts
index 871c9b5787..d3b3ef884a 100644
--- a/packages/plugin-eval/src/index.ts
+++ b/packages/plugin-eval/src/index.ts
@@ -90,11 +90,7 @@ export class MainAPI {
   }
 }
 
-process.env.KOISHI_WORKER_ENTRY = resolve(__dirname, 'worker.js')
-
-process.env.KOISHI_WORKER_LOADER = `\
-const { workerData } = require('worker_threads');
-require(workerData.entry);`
+export const workerScript = `require(${JSON.stringify(resolve(__dirname, 'worker.js'))});`
 
 export function apply(ctx: Context, config: Config = {}) {
   const { prefix } = config = { ...defaultConfig, ...config }
@@ -109,10 +105,9 @@ export function apply(ctx: Context, config: Config = {}) {
   async function createWorker() {
     await app.parallel('worker/start')
 
-    const worker = app.evalWorker = new Worker(process.env.KOISHI_WORKER_LOADER, {
+    const worker = app.evalWorker = new Worker(workerScript, {
       eval: true,
       workerData: {
-        entry: process.env.KOISHI_WORKER_ENTRY,
         logLevels: Logger.levels,
         ...pick(config, config.dataKeys),
       },
@@ -160,7 +155,6 @@ export function apply(ctx: Context, config: Config = {}) {
   const cmd = ctx.command('evaluate [expr...]', '执行 JavaScript 脚本', { noEval: true })
     .alias('eval')
     .userFields(['authority'])
-    .userFields(config.userFields)
     .option('slient', '-s  不输出最后的结果')
     .option('restart', '-r  重启子线程', { authority: 3 })
     .before((session) => {
diff --git a/packages/plugin-eval/src/trap.ts b/packages/plugin-eval/src/trap.ts
index 54fabc0d38..7d8560a41f 100644
--- a/packages/plugin-eval/src/trap.ts
+++ b/packages/plugin-eval/src/trap.ts
@@ -20,6 +20,7 @@ export namespace UserTrap {
   }
 
   export function get($user: {}, fields: string[]) {
+    if (!$user) return
     const result: Partial<User> = {}
     for (const field of fields) {
       const trap = traps[field]
diff --git a/packages/plugin-eval/tests/index.spec.ts b/packages/plugin-eval/tests/index.spec.ts
index 6cb4087e89..71ba193881 100644
--- a/packages/plugin-eval/tests/index.spec.ts
+++ b/packages/plugin-eval/tests/index.spec.ts
@@ -1,15 +1,14 @@
+import { defineProperty } from 'koishi-utils'
 import { App } from 'koishi-test-utils'
 import { inspect } from 'util'
 import { resolve } from 'path'
 import * as _eval from 'koishi-plugin-eval'
 
-process.env.KOISHI_WORKER_ENTRY = resolve(__dirname, '../src/worker.ts')
-
-process.env.KOISHI_WORKER_LOADER = [
+defineProperty(_eval, 'workerScript', [
   'require("ts-node/register/transpile-only");',
   'require("tsconfig-paths/register");',
-  process.env.KOISHI_WORKER_LOADER,
-].join('\n')
+  `require(${JSON.stringify(resolve(__dirname, '../src/worker.ts'))})`,
+].join('\n'))
 
 const app = new App()
 

From e1401584a59e7d01f2637f24381c49d4609e1c6d Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 27 Aug 2020 03:47:07 +0800
Subject: [PATCH 27/31] eval-addons: support debug mode

---
 packages/plugin-eval-addons/src/index.ts  |  1 +
 packages/plugin-eval-addons/src/worker.ts | 14 +++++++-------
 packages/plugin-eval/src/internal.ts      |  3 ++-
 packages/plugin-eval/src/vm.ts            |  4 ++--
 packages/plugin-eval/src/worker.ts        | 14 ++++++++++----
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/packages/plugin-eval-addons/src/index.ts b/packages/plugin-eval-addons/src/index.ts
index f201bc840a..dd887e8819 100644
--- a/packages/plugin-eval-addons/src/index.ts
+++ b/packages/plugin-eval-addons/src/index.ts
@@ -102,6 +102,7 @@ export function apply(ctx: Context, config: Config) {
 
         const cmd = addon
           .subcommand(rawName, desc, config)
+          .option('debug', '启用调试模式', { type: 'boolean' })
           .action(async ({ session, command, options }, ...args) => {
             const { $app, $user, $uuid } = session
             const { name } = command
diff --git a/packages/plugin-eval-addons/src/worker.ts b/packages/plugin-eval-addons/src/worker.ts
index c8abb1862e..fdcc660a06 100644
--- a/packages/plugin-eval-addons/src/worker.ts
+++ b/packages/plugin-eval-addons/src/worker.ts
@@ -1,4 +1,4 @@
-import { config, context, internal, WorkerAPI, createContext, response, mapDirectory } from 'koishi-plugin-eval/dist/worker'
+import { config, context, internal, WorkerAPI, Context, response, mapDirectory, formatError } from 'koishi-plugin-eval/dist/worker'
 import { promises, readFileSync } from 'fs'
 import { resolve, posix, dirname } from 'path'
 import { User } from 'koishi-core'
@@ -34,9 +34,7 @@ interface AddonArgv {
   options: Record<string, any>
 }
 
-interface AddonContext extends AddonArgv {
-  user: Partial<User>
-}
+interface AddonContext extends AddonArgv, Context {}
 
 type AddonAction = (ctx: AddonContext) => string | void | Promise<string | void>
 const commandMap: Record<string, AddonAction> = {}
@@ -44,9 +42,11 @@ const commandMap: Record<string, AddonAction> = {}
 WorkerAPI.prototype.callAddon = async function (sid, user, argv) {
   const callback = commandMap[argv.name]
   try {
-    return await callback({ ...argv, ...createContext(sid, user) })
+    return await callback({ ...argv, ...Context(sid, user) })
   } catch (error) {
-    logger.warn(error)
+    if (!argv.options.debug) return logger.warn(error)
+    return formatError(error)
+      .replace('WorkerAPI.worker_1.WorkerAPI.callAddon', 'WorkerAPI.callAddon')
   }
 }
 
@@ -64,7 +64,7 @@ export const modules: Record<string, Module> = {}
 export function synthetize(identifier: string, namespace: {}) {
   const module = new SyntheticModule(Object.keys(namespace), function () {
     for (const key in namespace) {
-      this.setExport(key, namespace[key])
+      this.setExport(key, internal.contextify(namespace[key]))
     }
   }, { context, identifier })
   modules[identifier] = module
diff --git a/packages/plugin-eval/src/internal.ts b/packages/plugin-eval/src/internal.ts
index 371313f690..308d40c31a 100644
--- a/packages/plugin-eval/src/internal.ts
+++ b/packages/plugin-eval/src/internal.ts
@@ -687,7 +687,8 @@ connect(host.Buffer.prototype['inspect'], function inspect() {
   return `<${this.constructor.name} ${str}>`
 })
 
-export const value: <T>(value: T) => T = Decontextify.value.bind(Decontextify)
+export const contextify: <T>(value: T) => T = Contextify.value.bind(Contextify)
+export const decontextify: <T>(value: T) => T = Decontextify.value.bind(Decontextify)
 export const sandbox = Decontextify.value(GLOBAL)
 
 delete global.console
diff --git a/packages/plugin-eval/src/vm.ts b/packages/plugin-eval/src/vm.ts
index 2527c562c4..e733b3e50f 100644
--- a/packages/plugin-eval/src/vm.ts
+++ b/packages/plugin-eval/src/vm.ts
@@ -39,9 +39,9 @@ export class VM {
     const script = new Script(code, options)
 
     try {
-      return this.internal.value(script.runInContext(this.context, { displayErrors: false }))
+      return this.internal.decontextify(script.runInContext(this.context, { displayErrors: false }))
     } catch (e) {
-      throw this.internal.value(e)
+      throw this.internal.decontextify(e)
     }
   }
 }
diff --git a/packages/plugin-eval/src/worker.ts b/packages/plugin-eval/src/worker.ts
index 851c729722..026642eefe 100644
--- a/packages/plugin-eval/src/worker.ts
+++ b/packages/plugin-eval/src/worker.ts
@@ -47,7 +47,7 @@ function formatResult(...param: [string, ...any[]]) {
   return formatWithOptions(config.inspect, ...param)
 }
 
-function formatError(error: Error) {
+export function formatError(error: Error) {
   if (!(error instanceof Error)) return `Uncaught: ${error}`
 
   if (error.name === 'SyntaxError') {
@@ -61,7 +61,7 @@ function formatError(error: Error) {
   }
 
   return error.stack
-    .replace(/\s*.+Script[\s\S]*/, '')
+    .replace(/\s*.+(Script|MessagePort)[\s\S]*/, '')
     .split('\n')
     .map((line) => {
       for (const name in pathMapper) {
@@ -74,7 +74,13 @@ function formatError(error: Error) {
 
 const main = wrap<MainAPI>(parentPort)
 
-export const createContext = (sid: string, user: Partial<User>) => ({
+export interface Context {
+  user: Partial<User>
+  send(...param: any[]): Promise<void>
+  exec(message: string): Promise<void>
+}
+
+export const Context = (sid: string, user: Partial<User>): Context => ({
   user,
   async send(...param: [string, ...any[]]) {
     return await main.send(sid, formatResult(...param))
@@ -100,7 +106,7 @@ export class WorkerAPI {
     const { sid, user, source, silent } = options
 
     const key = 'koishi-eval-session:' + sid
-    internal.setGlobal(Symbol.for(key), createContext(sid, user), false, true)
+    internal.setGlobal(Symbol.for(key), Context(sid, user), false, true)
 
     let result: any
     try {

From a1e75c082d97fbc36d21d96077d425143767994f Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 27 Aug 2020 16:46:25 +0800
Subject: [PATCH 28/31] eval: support user setter

---
 packages/plugin-eval-addons/src/index.ts  |  21 ++--
 packages/plugin-eval-addons/src/worker.ts |   9 +-
 packages/plugin-eval/src/index.ts         | 119 +++++++++-------------
 packages/plugin-eval/src/internal.ts      |  12 +--
 packages/plugin-eval/src/main.ts          |  89 ++++++++++++++++
 packages/plugin-eval/src/trap.ts          |  31 ------
 packages/plugin-eval/src/worker.ts        |  25 +++--
 7 files changed, 171 insertions(+), 135 deletions(-)
 create mode 100644 packages/plugin-eval/src/main.ts
 delete mode 100644 packages/plugin-eval/src/trap.ts

diff --git a/packages/plugin-eval-addons/src/index.ts b/packages/plugin-eval-addons/src/index.ts
index dd887e8819..a5d726b312 100644
--- a/packages/plugin-eval-addons/src/index.ts
+++ b/packages/plugin-eval-addons/src/index.ts
@@ -93,8 +93,6 @@ export function apply(ctx: Context, config: Config) {
       const { commands = [] } = manifest
       commands.forEach((config) => {
         const { name: rawName, desc, options = [], userFields = [] } = config
-        const { readable = [] } = Array.isArray(userFields) ? { readable: userFields } : userFields
-
         const [name] = rawName.split(' ', 1)
         if (!response.commands.includes(name)) {
           return logger.warn('unregistered command manifest: %c', name)
@@ -102,16 +100,15 @@ export function apply(ctx: Context, config: Config) {
 
         const cmd = addon
           .subcommand(rawName, desc, config)
-          .option('debug', '启用调试模式', { type: 'boolean' })
-          .action(async ({ session, command, options }, ...args) => {
-            const { $app, $user, $uuid } = session
-            const { name } = command
-            const user = UserTrap.get($user, readable)
-            const result = await $app.evalRemote.callAddon($uuid, user, { name, args, options })
-            return result
-          })
-
-        UserTrap.prepare(cmd, readable)
+          .option('debug', '启用调试模式', { type: 'boolean', hidden: true })
+
+        UserTrap.attach(cmd, userFields, async ({ session, command, options, user, writable }, ...args) => {
+          const { $app, $uuid } = session
+          const { name } = command
+          const result = await $app.evalRemote.callAddon($uuid, user, writable, { name, args, options })
+          return result
+        })
+
         options.forEach((config) => {
           const { name, desc } = config
           cmd.option(name, desc, config)
diff --git a/packages/plugin-eval-addons/src/worker.ts b/packages/plugin-eval-addons/src/worker.ts
index fdcc660a06..de7b1ad401 100644
--- a/packages/plugin-eval-addons/src/worker.ts
+++ b/packages/plugin-eval-addons/src/worker.ts
@@ -20,7 +20,7 @@ declare module 'koishi-plugin-eval/dist/worker' {
   }
 
   interface WorkerAPI {
-    callAddon(sid: string, user: Partial<User>, argv: AddonArgv): Promise<string | void>
+    callAddon(sid: string, user: Partial<User>, writable: User.Field[], argv: AddonArgv): Promise<string | void>
   }
 
   interface Response {
@@ -39,10 +39,13 @@ interface AddonContext extends AddonArgv, Context {}
 type AddonAction = (ctx: AddonContext) => string | void | Promise<string | void>
 const commandMap: Record<string, AddonAction> = {}
 
-WorkerAPI.prototype.callAddon = async function (sid, user, argv) {
+WorkerAPI.prototype.callAddon = async function (sid, user, writable, argv) {
   const callback = commandMap[argv.name]
   try {
-    return await callback({ ...argv, ...Context(sid, user) })
+    const context = { ...argv, ...Context(sid, user, writable) }
+    const result = await callback(context)
+    await context.user._update()
+    return result
   } catch (error) {
     if (!argv.options.debug) return logger.warn(error)
     return formatError(error)
diff --git a/packages/plugin-eval/src/index.ts b/packages/plugin-eval/src/index.ts
index d3b3ef884a..c985d4d381 100644
--- a/packages/plugin-eval/src/index.ts
+++ b/packages/plugin-eval/src/index.ts
@@ -1,12 +1,12 @@
-import { App, Context, Session, User } from 'koishi-core'
-import { CQCode, Logger, defineProperty, Random, pick } from 'koishi-utils'
+import { Context, Session, User } from 'koishi-core'
 import { Worker, ResourceLimits } from 'worker_threads'
+import { CQCode, Logger, defineProperty, Random, pick } from 'koishi-utils'
 import { WorkerAPI, WorkerConfig, WorkerData, Response } from './worker'
 import { wrap, expose, Remote } from './transfer'
+import { MainAPI, Access, UserTrap } from './main'
 import { resolve } from 'path'
-import { UserTrap } from './trap'
 
-export * from './trap'
+export * from './main'
 
 declare module 'koishi-core/dist/app' {
   interface App {
@@ -35,7 +35,7 @@ declare module 'koishi-core/dist/session' {
   interface Session {
     $uuid: string
     _isEval: boolean
-    _logCount: number
+    _sendCount: number
   }
 }
 
@@ -43,7 +43,7 @@ export interface MainConfig {
   prefix?: string
   timeout?: number
   maxLogs?: number
-  userFields?: User.Field[]
+  userFields?: Access<User.Field>
   resourceLimits?: ResourceLimits
   dataKeys?: (keyof WorkerData)[]
 }
@@ -63,33 +63,6 @@ const defaultConfig: EvalConfig = {
 
 const logger = new Logger('eval')
 
-export class MainAPI {
-  constructor(public app: App) {}
-
-  private getSession(uuid: string) {
-    const session = this.app._sessions[uuid]
-    if (!session) throw new Error(`session ${uuid} not found`)
-    return session
-  }
-
-  async execute(uuid: string, message: string) {
-    const session = this.getSession(uuid)
-    const send = session.$send
-    const sendQueued = session.$sendQueued
-    await session.$execute(message)
-    session.$sendQueued = sendQueued
-    session.$send = send
-  }
-
-  async send(uuid: string, message: string) {
-    const session = this.getSession(uuid)
-    if (!session._logCount) session._logCount = 0
-    if (this.app.evalConfig.maxLogs > session._logCount++) {
-      return await session.$sendQueued(message)
-    }
-  }
-}
-
 export const workerScript = `require(${JSON.stringify(resolve(__dirname, 'worker.js'))});`
 
 export function apply(ctx: Context, config: Config = {}) {
@@ -160,54 +133,54 @@ export function apply(ctx: Context, config: Config = {}) {
     .before((session) => {
       if (!session['_redirected'] && session.$user?.authority < 2) return '权限不足。'
     })
-    .action(async ({ session, options }, expr) => {
-      if (options.restart) {
-        await session.$app.evalWorker.terminate()
-        return '子线程已重启。'
-      }
 
-      if (!expr) return '请输入要执行的脚本。'
-      expr = CQCode.unescape(expr)
+  UserTrap.attach(cmd, config.userFields, async ({ session, options, user, writable }, expr) => {
+    if (options.restart) {
+      await session.$app.evalWorker.terminate()
+      return '子线程已重启。'
+    }
 
-      return await new Promise((resolve) => {
-        logger.debug(expr)
-        defineProperty(session, '_isEval', true)
+    if (!expr) return '请输入要执行的脚本。'
+    expr = CQCode.unescape(expr)
 
-        const _resolve = (result?: string) => {
-          clearTimeout(timer)
-          app.evalWorker.off('error', listener)
-          session._isEval = false
-          resolve(result)
-        }
+    return await new Promise((resolve) => {
+      logger.debug(expr)
+      defineProperty(session, '_isEval', true)
 
-        const timer = setTimeout(async () => {
-          await app.evalWorker.terminate()
-          _resolve(!session._logCount && '执行超时。')
-        }, config.timeout)
-
-        const listener = (error: Error) => {
-          let message = ERROR_CODES[error['code']]
-          if (!message) {
-            logger.warn(error)
-            message = '执行过程中遇到错误。'
-          }
-          _resolve(message)
-        }
+      const _resolve = (result?: string) => {
+        clearTimeout(timer)
+        app.evalWorker.off('error', listener)
+        session._isEval = false
+        resolve(result)
+      }
+
+      const timer = setTimeout(async () => {
+        await app.evalWorker.terminate()
+        _resolve(!session._sendCount && '执行超时。')
+      }, config.timeout)
 
-        app.evalWorker.on('error', listener)
-        app.evalRemote.eval({
-          sid: session.$uuid,
-          user: UserTrap.get(session.$user, config.userFields),
-          silent: options.slient,
-          source: expr,
-        }).then(_resolve, (error) => {
+      const listener = (error: Error) => {
+        let message = ERROR_CODES[error['code']]
+        if (!message) {
           logger.warn(error)
-          _resolve()
-        })
+          message = '执行过程中遇到错误。'
+        }
+        _resolve(message)
+      }
+
+      app.evalWorker.on('error', listener)
+      app.evalRemote.eval({
+        user,
+        writable,
+        sid: session.$uuid,
+        silent: options.slient,
+        source: expr,
+      }).then(_resolve, (error) => {
+        logger.warn(error)
+        _resolve()
       })
     })
-
-  UserTrap.prepare(cmd, config.userFields)
+  })
 
   if (prefix) {
     cmd.shortcut(prefix, { oneArg: true, fuzzy: true })
diff --git a/packages/plugin-eval/src/internal.ts b/packages/plugin-eval/src/internal.ts
index 308d40c31a..231247575e 100644
--- a/packages/plugin-eval/src/internal.ts
+++ b/packages/plugin-eval/src/internal.ts
@@ -314,7 +314,7 @@ Helper.function = function (this: Helper, fnc, traps, deepTraps, mock) {
         if (mock && host.Object.prototype.hasOwnProperty.call(mock, key)) return mock[key]
         if (key === 'constructor') return this.local.Function
         if (key === '__proto__') return this.local.Function.prototype
-        if (key === 'toString' && deepTraps === frozenTraps) return () => `function ${fnc.name}() { [native code] }`
+        if (key === 'toString' && this === Contextify) return () => `function ${fnc.name}() { [native code] }`
       } catch (e) {
         // Never pass the handled expcetion through! This block can't throw an exception under normal conditions.
         return null
@@ -622,23 +622,17 @@ const frozenTraps: Trap = createObject({
 })
 
 function readonly(value: any, mock: any = {}) {
-  for (const key in mock) {
-    const value = mock[key]
-    if (typeof value === 'function') {
-      value.toString = () => `function ${value.name}() { [native code] }`
-    }
-  }
   return Contextify.value(value, null, frozenTraps, mock)
 }
 
-export function setGlobal(name: keyof any, value: any, writable = false, configurable = false) {
+export function setGlobal(name: keyof any, value: any, writable = false) {
   const prop = Contextify.value(name)
   try {
     Object.defineProperty(GLOBAL, prop, {
       value: writable ? Contextify.value(value) : readonly(value),
       enumerable: true,
+      configurable: writable,
       writable,
-      configurable,
     })
   } catch (e) {
     throw Decontextify.value(e)
diff --git a/packages/plugin-eval/src/main.ts b/packages/plugin-eval/src/main.ts
new file mode 100644
index 0000000000..dde0a36a51
--- /dev/null
+++ b/packages/plugin-eval/src/main.ts
@@ -0,0 +1,89 @@
+import { App, Command, CommandAction, ParsedArgv, User } from 'koishi-core'
+
+interface TrappedArgv<O> extends ParsedArgv<never, never, O> {
+  user: Partial<User>
+  writable: User.Field[]
+}
+
+type TrappedAction<O> = (argv: TrappedArgv<O>, ...args: string[]) => ReturnType<CommandAction>
+
+export interface UserTrap<T = any, K extends User.Field = never> {
+  fields: Iterable<K>
+  get(data: Pick<User, K>): T
+  set(data: Pick<User, K>, value: T): void
+}
+
+export namespace UserTrap {
+  const traps: Record<string, UserTrap<any, any>> = {}
+
+  export function define<T, K extends User.Field = never>(key: string, trap: UserTrap<T, K>) {
+    traps[key] = trap
+  }
+
+  export function attach<O>(command: Command<never, never, O>, fields: Access<User.Field>, action: TrappedAction<O>) {
+    const { readable = [], writable = [] } = Array.isArray(fields) ? { readable: fields } : fields
+    for (const field of readable) {
+      const trap = traps[field]
+      command.userFields(trap ? trap.fields : [field])
+      command.action((argv, ...args) => {
+        const user = get(argv.session.$user, readable)
+        return action({ ...argv, user, writable }, ...args)
+      })
+    }
+  }
+
+  export function get($user: User.Observed<never>, fields: string[]) {
+    if (!$user) return {}
+    const result: Partial<User> = {}
+    for (const field of fields) {
+      const trap = traps[field]
+      Reflect.set(result, field, trap ? trap.get($user) : $user[field])
+    }
+    return result
+  }
+
+  export function set($user: User.Observed<never>, data: Partial<User>) {
+    for (const field in data) {
+      const trap = traps[field]
+      trap ? trap.set($user, data[field]) : $user[field] = data[field]
+    }
+    return $user._update()
+  }
+}
+
+export type Access<T> = T[] | {
+  readable?: T[]
+  writable?: T[]
+}
+
+export class MainAPI {
+  constructor(public app: App) {}
+
+  private getSession(uuid: string) {
+    const session = this.app._sessions[uuid]
+    if (!session) throw new Error(`session ${uuid} not found`)
+    return session
+  }
+
+  async execute(uuid: string, message: string) {
+    const session = this.getSession(uuid)
+    const send = session.$send
+    const sendQueued = session.$sendQueued
+    await session.$execute(message)
+    session.$sendQueued = sendQueued
+    session.$send = send
+  }
+
+  async send(uuid: string, message: string) {
+    const session = this.getSession(uuid)
+    if (!session._sendCount) session._sendCount = 0
+    if (this.app.evalConfig.maxLogs > session._sendCount++) {
+      return await session.$sendQueued(message)
+    }
+  }
+
+  async updateUser(uuid: string, data: Partial<User>) {
+    const session = this.getSession(uuid)
+    return UserTrap.set(session.$user, data)
+  }
+}
diff --git a/packages/plugin-eval/src/trap.ts b/packages/plugin-eval/src/trap.ts
deleted file mode 100644
index 7d8560a41f..0000000000
--- a/packages/plugin-eval/src/trap.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Command, User } from 'koishi-core'
-
-export interface UserTrap<T = any, K extends User.Field = never> {
-  fields: Iterable<K>
-  get(data: Pick<User, K>): T
-}
-
-export namespace UserTrap {
-  const traps: Record<string, UserTrap<any, any>> = {}
-
-  export function define<T, K extends User.Field = never>(key: string, trap: UserTrap<T, K>) {
-    traps[key] = trap
-  }
-
-  export function prepare(cmd: Command, fields: string[]) {
-    for (const field of fields) {
-      const trap = traps[field]
-      cmd.userFields(trap ? trap.fields : [field])
-    }
-  }
-
-  export function get($user: {}, fields: string[]) {
-    if (!$user) return
-    const result: Partial<User> = {}
-    for (const field of fields) {
-      const trap = traps[field]
-      Reflect.set(result, field, trap ? trap.get($user) : $user[field])
-    }
-    return result
-  }
-}
diff --git a/packages/plugin-eval/src/worker.ts b/packages/plugin-eval/src/worker.ts
index 026642eefe..92b2a35be9 100644
--- a/packages/plugin-eval/src/worker.ts
+++ b/packages/plugin-eval/src/worker.ts
@@ -1,4 +1,4 @@
-import { Logger, escapeRegExp } from 'koishi-utils'
+import { Logger, escapeRegExp, observe, contain } from 'koishi-utils'
 import { parentPort, workerData } from 'worker_threads'
 import { InspectOptions, formatWithOptions } from 'util'
 import { findSourceMap } from 'module'
@@ -34,6 +34,7 @@ interface EvalOptions {
   user: Partial<User>
   silent: boolean
   source: string
+  writable: User.Field[]
 }
 
 const vm = new VM()
@@ -75,16 +76,24 @@ export function formatError(error: Error) {
 const main = wrap<MainAPI>(parentPort)
 
 export interface Context {
-  user: Partial<User>
+  user: User.Observed<any>
   send(...param: any[]): Promise<void>
   exec(message: string): Promise<void>
 }
 
-export const Context = (sid: string, user: Partial<User>): Context => ({
-  user,
+export const Context = (sid: string, user: Partial<User>, writable: User.Field[]): Context => ({
+  user: observe(user, async (diff) => {
+    const diffKeys = Object.keys(diff)
+    if (!contain(writable, diffKeys)) {
+      throw new TypeError(`cannot set user field: ${diffKeys.join(', ')}`)
+    }
+    await main.updateUser(sid, diff)
+  }),
+
   async send(...param: [string, ...any[]]) {
     return await main.send(sid, formatResult(...param))
   },
+
   async exec(message: string) {
     if (typeof message !== 'string') {
       throw new TypeError('The "message" argument must be of type string')
@@ -103,10 +112,11 @@ export class WorkerAPI {
   }
 
   async eval(options: EvalOptions) {
-    const { sid, user, source, silent } = options
+    const { sid, user, source, silent, writable } = options
 
-    const key = 'koishi-eval-session:' + sid
-    internal.setGlobal(Symbol.for(key), Context(sid, user), false, true)
+    const key = 'koishi-eval-context:' + sid
+    const ctx = Context(sid, user, writable)
+    internal.setGlobal(Symbol.for(key), ctx, true)
 
     let result: any
     try {
@@ -118,6 +128,7 @@ export class WorkerAPI {
         filename: 'stdin',
         lineOffset: -4,
       })
+      await ctx.user._update()
     } catch (error) {
       return formatError(error)
     }

From 289be29c03623b2adc5040463f5469861457bd0b Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 27 Aug 2020 16:52:31 +0800
Subject: [PATCH 29/31] core: narrow typings

---
 packages/koishi-core/src/database.ts | 6 +++---
 packages/koishi-core/src/session.ts  | 2 +-
 packages/koishi-utils/src/observe.ts | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/koishi-core/src/database.ts b/packages/koishi-core/src/database.ts
index 3a6c67c8dd..c72e163380 100644
--- a/packages/koishi-core/src/database.ts
+++ b/packages/koishi-core/src/database.ts
@@ -23,7 +23,7 @@ export namespace User {
 
   export type Field = keyof User
   export const fields: Field[] = []
-  export type Observed<K extends Field = Field> = utils.Observed<Pick<User, K>>
+  export type Observed<K extends Field = Field> = utils.Observed<Pick<User, K>, Promise<void>>
   type Getter = (id: number, authority: number) => Partial<User>
   const getters: Getter[] = []
 
@@ -94,13 +94,13 @@ export interface Database {
   getUser<K extends User.Field>(userId: number, defaultAuthority?: number, fields?: readonly K[]): Promise<Pick<User, K | 'id'>>
   getUsers<K extends User.Field>(fields?: readonly K[]): Promise<Pick<User, K>[]>
   getUsers<K extends User.Field>(ids: readonly number[], fields?: readonly K[]): Promise<Pick<User, K>[]>
-  setUser(userId: number, data: Partial<User>): Promise<any>
+  setUser(userId: number, data: Partial<User>): Promise<void>
 
   getGroup<K extends Group.Field>(groupId: number, fields?: readonly K[]): Promise<Pick<Group, K | 'id'>>
   getGroup<K extends Group.Field>(groupId: number, selfId?: number, fields?: readonly K[]): Promise<Pick<Group, K | 'id'>>
   getAllGroups<K extends Group.Field>(assignees?: readonly number[]): Promise<Pick<Group, K>[]>
   getAllGroups<K extends Group.Field>(fields?: readonly K[], assignees?: readonly number[]): Promise<Pick<Group, K>[]>
-  setGroup(groupId: number, data: Partial<Group>): Promise<any>
+  setGroup(groupId: number, data: Partial<Group>): Promise<void>
 }
 
 type DatabaseExtensionMethods<I> = {
diff --git a/packages/koishi-core/src/session.ts b/packages/koishi-core/src/session.ts
index 669ff78d11..b496d9f860 100644
--- a/packages/koishi-core/src/session.ts
+++ b/packages/koishi-core/src/session.ts
@@ -200,7 +200,7 @@ export class Session<U extends User.Field = never, G extends Group.Field = never
 
     // 确保匿名消息不会写回数据库
     if (this.anonymous) {
-      const user = observe(User.create(userId, defaultAuthority))
+      const user = observe(User.create(userId, defaultAuthority), () => Promise.resolve())
       return this.$user = user
     }
 
diff --git a/packages/koishi-utils/src/observe.ts b/packages/koishi-utils/src/observe.ts
index a2fc74592c..14b2e5e88c 100644
--- a/packages/koishi-utils/src/observe.ts
+++ b/packages/koishi-utils/src/observe.ts
@@ -134,7 +134,7 @@ export function observe<T extends object, R>(target: T, ...args: [(string | numb
 
   const observer = observeObject(target, label, null) as Observed<T>
 
-  defineProperty(observer, '_update', function (this: Observed<T>) {
+  defineProperty(observer, '_update', function _update(this: Observed<T>) {
     const diff = { ...this._diff }
     const fields = Object.keys(diff)
     if (fields.length) {
@@ -146,7 +146,7 @@ export function observe<T extends object, R>(target: T, ...args: [(string | numb
     }
   })
 
-  defineProperty(observer, '_merge', function (this: Observed<T>, value: Partial<T>) {
+  defineProperty(observer, '_merge', function _merge(this: Observed<T>, value: Partial<T>) {
     for (const key in value) {
       if (key in this._diff) {
         throw new Error(`unresolved diff key "${key}"`)

From 170fea6e480c7e153721b8a238fd84e6126355ae Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 27 Aug 2020 21:17:19 +0800
Subject: [PATCH 30/31] core: adjust field collector api, fix #94

---
 packages/koishi-core/src/command.ts          | 36 +++++++++---------
 packages/koishi-core/src/plugins/help.ts     | 17 ++++-----
 packages/koishi-core/src/plugins/validate.ts |  8 ++--
 packages/koishi-core/tests/command.spec.ts   | 34 +++++++++++++++--
 packages/koishi-core/tests/parser.spec.ts    | 39 +++++---------------
 5 files changed, 71 insertions(+), 63 deletions(-)

diff --git a/packages/koishi-core/src/command.ts b/packages/koishi-core/src/command.ts
index 5c2cbda296..e36f933683 100644
--- a/packages/koishi-core/src/command.ts
+++ b/packages/koishi-core/src/command.ts
@@ -102,7 +102,10 @@ type Extend<O extends {}, K extends string, T> = {
   [P in K | keyof O]: (P extends keyof O ? O[P] : unknown) & (P extends K ? T : unknown)
 }
 
-type ArgvInferred<T> = Iterable<T> | ((argv: ParsedArgv, fields: Set<T>) => Iterable<T>)
+export type FieldCollector<T extends TableType, K = keyof Tables[T], O extends {} = {}> =
+  | Iterable<K>
+  | ((argv: ParsedArgv<never, never, O>, fields: Set<keyof Tables[T]>) => void)
+
 export type CommandAction<U extends User.Field = never, G extends Group.Field = never, O = {}> =
   (this: Command<U, G>, config: ParsedArgv<U, G, O>, ...args: string[]) => void | string | Promise<void | string>
 
@@ -117,36 +120,37 @@ export class Command<U extends User.Field = never, G extends Group.Field = never
 
   private _optionNameMap: Record<string, CommandOption> = {}
   private _optionSymbolMap: Record<string, CommandOption> = {}
-  private _userFields: ArgvInferred<User.Field>[] = []
-  private _groupFields: ArgvInferred<Group.Field>[] = []
+  private _userFields: FieldCollector<'user'>[] = []
+  private _groupFields: FieldCollector<'group'>[] = []
 
   _action?: CommandAction<U, G>
 
   static defaultConfig: CommandConfig = {}
   static defaultOptionConfig: OptionConfig = {}
 
-  private static _userFields: ArgvInferred<User.Field>[] = []
-  private static _groupFields: ArgvInferred<Group.Field>[] = []
+  private static _userFields: FieldCollector<'user'>[] = []
+  private static _groupFields: FieldCollector<'group'>[] = []
 
-  static userFields(fields: ArgvInferred<User.Field>) {
+  static userFields(fields: FieldCollector<'user'>) {
     this._userFields.push(fields)
     return this
   }
 
-  static groupFields(fields: ArgvInferred<Group.Field>) {
+  static groupFields(fields: FieldCollector<'group'>) {
     this._groupFields.push(fields)
     return this
   }
 
   static collect<T extends TableType>(argv: ParsedArgv, key: T, fields = new Set<keyof Tables[T]>()) {
     if (!argv) return
-    const values: ArgvInferred<keyof Tables[T]>[] = [
+    const values: FieldCollector<T>[] = [
       ...this[`_${key}Fields`],
       ...argv.command[`_${key}Fields`],
     ]
-    for (let value of values) {
+    for (const value of values) {
       if (typeof value === 'function') {
-        value = value(argv, fields)
+        value(argv, fields)
+        continue
       }
       for (const field of value) {
         fields.add(field)
@@ -183,18 +187,14 @@ export class Command<U extends User.Field = never, G extends Group.Field = never
     return `Command <${this.name}>`
   }
 
-  userFields<T extends User.Field = never>(fields: Iterable<T>): Command<U | T, G, O>
-  userFields<T extends User.Field = never>(fields: (argv: ParsedArgv<never, never, O>, fields: Set<User.Field>) => Iterable<T>): Command<U | T, G, O>
-  userFields(fields: ArgvInferred<User.Field>) {
+  userFields<T extends User.Field = never>(fields: FieldCollector<'user', T, O>): Command<U | T, G, O> {
     this._userFields.push(fields)
-    return this
+    return this as any
   }
 
-  groupFields<T extends Group.Field = never>(fields: Iterable<T>): Command<U, G | T, O>
-  groupFields<T extends Group.Field = never>(fields: (argv: ParsedArgv<never, never, O>, fields: Set<Group.Field>) => Iterable<T>): Command<U, G | T, O>
-  groupFields(fields: ArgvInferred<Group.Field>) {
+  groupFields<T extends Group.Field = never>(fields: FieldCollector<'group', T, O>): Command<U, G | T, O> {
     this._groupFields.push(fields)
-    return this
+    return this as any
   }
 
   alias(...names: string[]) {
diff --git a/packages/koishi-core/src/plugins/help.ts b/packages/koishi-core/src/plugins/help.ts
index 080c6e4a15..091eb2f6a8 100644
--- a/packages/koishi-core/src/plugins/help.ts
+++ b/packages/koishi-core/src/plugins/help.ts
@@ -1,6 +1,6 @@
 import { getUsage, getUsageName, ValidationField } from './validate'
 import { User, Group, TableType, Tables } from '../database'
-import { Command, ParsedArgv } from '../command'
+import { Command, FieldCollector, ParsedArgv } from '../command'
 import { Session } from '../session'
 import { App } from '../app'
 import { Message } from './message'
@@ -59,17 +59,15 @@ export default function apply(app: App) {
     return ''
   })
 
-  function createCollector<T extends TableType>(key: T) {
-    return function* (argv: ParsedArgv, fields: Set<keyof Tables[T]>) {
-      const { args: [name] } = argv
-      const command = app._commandMap[name] || app._shortcutMap[name]
-      if (!command) return
-      yield* Command.collect({ ...argv, args: [], options: { help: true } }, key, fields)
-    }
+  const createCollector = <T extends TableType>(key: T): FieldCollector<T> => (argv, fields) => {
+    const { args: [name] } = argv
+    const command = app._commandMap[name] || app._shortcutMap[name]
+    if (!command) return
+    Command.collect({ ...argv, command, args: [], options: { help: true } }, key, fields)
   }
 
   app.command('help [command]', '显示帮助信息', { authority: 0 })
-    .userFields(['authority'])
+    .userFields<ValidationField>(['authority'])
     .userFields(createCollector('user'))
     .groupFields(createCollector('group'))
     .shortcut('帮助', { fuzzy: true })
@@ -98,6 +96,7 @@ export default function apply(app: App) {
           },
         })
       }
+
       return showHelp(command, session, options)
     })
 }
diff --git a/packages/koishi-core/src/plugins/validate.ts b/packages/koishi-core/src/plugins/validate.ts
index 57275137ea..007ba3f524 100644
--- a/packages/koishi-core/src/plugins/validate.ts
+++ b/packages/koishi-core/src/plugins/validate.ts
@@ -59,7 +59,7 @@ Object.assign(Command.defaultOptionConfig, {
   authority: 0,
 })
 
-Command.userFields(function* ({ command, options = {} }, fields) {
+Command.userFields(({ command, options = {} }, fields) => {
   const { maxUsage, minInterval, authority } = command.config
   let shouldFetchAuthority = !fields.has('authority') && authority > 0
   let shouldFetchUsage = !!(maxUsage || minInterval)
@@ -69,10 +69,10 @@ Command.userFields(function* ({ command, options = {} }, fields) {
       if (notUsage) shouldFetchUsage = false
     }
   }
-  if (shouldFetchAuthority) yield 'authority'
+  if (shouldFetchAuthority) fields.add('authority')
   if (shouldFetchUsage) {
-    if (maxUsage) yield 'usage'
-    if (minInterval) yield 'timers'
+    if (maxUsage) fields.add('usage')
+    if (minInterval) fields.add('timers')
   }
 })
 
diff --git a/packages/koishi-core/tests/command.spec.ts b/packages/koishi-core/tests/command.spec.ts
index 2221ec5dae..1fec565cf4 100644
--- a/packages/koishi-core/tests/command.spec.ts
+++ b/packages/koishi-core/tests/command.spec.ts
@@ -1,12 +1,11 @@
 import { App } from 'koishi-test-utils'
+import { inspect } from 'util'
 import { expect } from 'chai'
 import '@shigma/chai-extended'
 
-let app: App
-
 describe('Command API', () => {
   describe('Register Commands', () => {
-    before(() => app = new App())
+    const app = new App()
 
     it('constructor checks', () => {
       expect(() => app.command('')).to.throw()
@@ -26,6 +25,10 @@ describe('Command API', () => {
       expect(app._commandMap.c.context).to.equal(ctx2)
     })
 
+    it('custom inspect', () => {
+      expect(inspect(app.command('a'))).to.equal('Command <a>')
+    })
+
     it('modify commands', () => {
       const d1 = app.command('d', 'foo', { authority: 1 })
       expect(app._commandMap.d.config.description).to.equal('foo')
@@ -63,6 +66,7 @@ describe('Command API', () => {
   })
 
   describe('Register Subcommands', () => {
+    let app: App
     beforeEach(() => app = new App())
 
     it('command.subcommand', () => {
@@ -123,4 +127,28 @@ describe('Command API', () => {
       expect(() => app.command('a/d')).not.to.throw()
     })
   })
+
+  describe('Dispose Commands', () => {
+    const app = new App()
+    const foo = app.command('foo')
+    const bar = foo.subcommand('bar')
+    const test = bar.subcommand('test')
+    bar.alias('baz').shortcut('1')
+    test.alias('it').shortcut('2')
+
+    it('before dispose', () => {
+      // don't forget help
+      expect(app._commands).to.have.length(4)
+      expect(app._shortcuts).to.have.length(3)
+      expect(foo.children).to.have.length(1)
+    })
+
+    it('after dispose', () => {
+      bar.dispose()
+      // don't forget help
+      expect(app._commands).to.have.length(2)
+      expect(app._shortcuts).to.have.length(1)
+      expect(foo.children).to.have.length(0)
+    })
+  })
 })
diff --git a/packages/koishi-core/tests/parser.spec.ts b/packages/koishi-core/tests/parser.spec.ts
index 000d151c4c..fc952ee757 100644
--- a/packages/koishi-core/tests/parser.spec.ts
+++ b/packages/koishi-core/tests/parser.spec.ts
@@ -1,6 +1,5 @@
 import { Command } from 'koishi-core'
 import { App } from 'koishi-test-utils'
-import { inspect } from 'util'
 import { expect } from 'chai'
 import '@shigma/chai-extended'
 
@@ -10,28 +9,23 @@ let cmd: Command
 
 describe('Parser API', () => {
   describe('Basic Support', () => {
-    it('register', () => {
-      // there is a built-in help command
-      expect(app._commands).to.have.length(1)
-
-      cmd = app.command('cmd1 <foo> [...bar]')
-      expect(app._commands).to.have.length(2)
-    })
-
-    it('inspect', () => {
-      expect(inspect(cmd)).to.equal('Command <cmd1>')
-    })
-
     it('parse arguments', () => {
+      cmd = app.command('cmd1 <foo> [...bar]')
       expect(cmd.parse('')).to.have.shape({ args: [] })
       expect(cmd.parse('a')).to.have.shape({ args: ['a'] })
       expect(cmd.parse('a b')).to.have.shape({ args: ['a', 'b'] })
       expect(cmd.parse('a b c')).to.have.shape({ args: ['a', 'b', 'c'] })
     })
 
-    it('dispose', () => {
-      cmd.dispose()
-      expect(app._commands).to.have.length(1)
+    it('stringify arguments', () => {
+      cmd = app.command('cmd4')
+      cmd.option('alpha', '-a <val>')
+      cmd.option('beta', '-b')
+      expect(cmd.stringify(['foo', 'bar'], {})).to.equal('cmd4 foo bar')
+      expect(cmd.stringify([], { alpha: 2 })).to.equal('cmd4 --alpha 2')
+      expect(cmd.stringify([], { alpha: ' ' })).to.equal('cmd4 --alpha " "')
+      expect(cmd.stringify([], { beta: true })).to.equal('cmd4 --beta')
+      expect(cmd.stringify([], { beta: false })).to.equal('cmd4 --no-beta')
     })
   })
 
@@ -140,17 +134,4 @@ describe('Parser API', () => {
       expect(cmd.parse('-- "foo;bar";baz', ';')).to.have.shape({ options: { rest: 'foo;bar' }, rest: ';baz' })
     })
   })
-
-  describe('Stringify Argv', () => {
-    it('basic support', () => {
-      cmd = app.command('cmd4')
-      cmd.option('alpha', '-a <val>')
-      cmd.option('beta', '-b')
-      expect(cmd.stringify(['foo', 'bar'], {})).to.equal('cmd4 foo bar')
-      expect(cmd.stringify([], { alpha: 2 })).to.equal('cmd4 --alpha 2')
-      expect(cmd.stringify([], { alpha: ' ' })).to.equal('cmd4 --alpha " "')
-      expect(cmd.stringify([], { beta: true })).to.equal('cmd4 --beta')
-      expect(cmd.stringify([], { beta: false })).to.equal('cmd4 --no-beta')
-    })
-  })
 })

From fa727eb2260997cd915e6699a4326db71a1025b7 Mon Sep 17 00:00:00 2001
From: Shigma <1700011071@pku.edu.cn>
Date: Thu, 27 Aug 2020 21:35:47 +0800
Subject: [PATCH 31/31] chore: bump versions

---
 packages/adapter-cqhttp/package.json      |  6 +++---
 packages/koishi-core/package.json         |  4 ++--
 packages/koishi-test-utils/package.json   |  4 ++--
 packages/koishi-utils/package.json        |  2 +-
 packages/koishi/package.json              | 10 +++++-----
 packages/plugin-chess/package.json        |  4 ++--
 packages/plugin-common/package.json       |  4 ++--
 packages/plugin-eval-addons/package.json  |  8 ++++----
 packages/plugin-eval/package.json         |  6 +++---
 packages/plugin-github/package.json       |  4 ++--
 packages/plugin-image-search/package.json |  4 ++--
 packages/plugin-mongo/package.json        |  4 ++--
 packages/plugin-monitor/package.json      |  4 ++--
 packages/plugin-mysql/package.json        |  4 ++--
 packages/plugin-puppeteer/package.json    |  4 ++--
 packages/plugin-recorder/package.json     |  4 ++--
 packages/plugin-rss/package.json          |  4 ++--
 packages/plugin-schedule/package.json     |  6 +++---
 packages/plugin-status/package.json       |  6 +++---
 packages/plugin-teach/package.json        |  6 +++---
 packages/plugin-tools/package.json        |  4 ++--
 21 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/packages/adapter-cqhttp/package.json b/packages/adapter-cqhttp/package.json
index 0fcef6cea8..5e9bee43b3 100644
--- a/packages/adapter-cqhttp/package.json
+++ b/packages/adapter-cqhttp/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi-adapter-cqhttp",
   "description": "CQHTTP adapter for Koishi",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -31,7 +31,7 @@
     "koishi"
   ],
   "peerDependencies": {
-    "koishi-core": "^2.0.0"
+    "koishi-core": "^2.0.1"
   },
   "devDependencies": {
     "@types/ms": "^0.7.31",
@@ -43,6 +43,6 @@
     "axios": "^0.20.0",
     "ms": "^2.1.2",
     "ws": "^7.3.1",
-    "koishi-utils": "^3.1.0"
+    "koishi-utils": "^3.1.1"
   }
 }
diff --git a/packages/koishi-core/package.json b/packages/koishi-core/package.json
index db2a5926ba..aecb8a3857 100644
--- a/packages/koishi-core/package.json
+++ b/packages/koishi-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi-core",
   "description": "Core features for Koishi",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "engines": {
@@ -44,7 +44,7 @@
     "koa": "^2.13.0",
     "koa-bodyparser": "^4.3.0",
     "koa-router": "^9.4.0",
-    "koishi-utils": "^3.1.0",
+    "koishi-utils": "^3.1.1",
     "leven": "^3.1.0",
     "lru-cache": "^6.0.0"
   }
diff --git a/packages/koishi-test-utils/package.json b/packages/koishi-test-utils/package.json
index ec94f6fcc1..32026528c5 100644
--- a/packages/koishi-test-utils/package.json
+++ b/packages/koishi-test-utils/package.json
@@ -38,7 +38,7 @@
   "dependencies": {
     "@shigma/chai-extended": "^0.1.4",
     "chai": "^4.2.0",
-    "koishi-core": "^2.0.0-rc.2",
-    "koishi-utils": "^3.1.0"
+    "koishi-core": "^2.0.1",
+    "koishi-utils": "^3.1.1"
   }
 }
diff --git a/packages/koishi-utils/package.json b/packages/koishi-utils/package.json
index 694ee7b6ee..d35d499235 100644
--- a/packages/koishi-utils/package.json
+++ b/packages/koishi-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi-utils",
   "description": "Utilities for Koishi",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
diff --git a/packages/koishi/package.json b/packages/koishi/package.json
index 22ceb1cc3c..0f78675635 100644
--- a/packages/koishi/package.json
+++ b/packages/koishi/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi",
   "description": "A QQ bot framework based on CQHTTP",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "engines": {
@@ -40,15 +40,15 @@
   "dependencies": {
     "cac": "^6.6.1",
     "kleur": "^4.1.1",
-    "koishi-core": "^2.0.0",
-    "koishi-adapter-cqhttp": "^1.0.0",
+    "koishi-core": "^2.0.1",
+    "koishi-adapter-cqhttp": "^1.0.1",
     "koishi-plugin-common": "^3.0.0-beta.15",
     "koishi-plugin-mysql": "^2.0.0",
-    "koishi-plugin-mongo": "^1.0.0",
+    "koishi-plugin-mongo": "^1.0.1",
     "koishi-plugin-schedule": "^2.0.0",
     "koishi-plugin-status": "^2.0.0-beta.13",
     "koishi-plugin-teach": "^1.0.1",
-    "koishi-utils": "^3.1.0",
+    "koishi-utils": "^3.1.1",
     "prompts": "^2.3.2"
   }
 }
diff --git a/packages/plugin-chess/package.json b/packages/plugin-chess/package.json
index 8be642a83b..c01afd05ed 100644
--- a/packages/plugin-chess/package.json
+++ b/packages/plugin-chess/package.json
@@ -33,10 +33,10 @@
     "game"
   ],
   "peerDependencies": {
-    "koishi-core": "^2.0.0",
+    "koishi-core": "^2.0.1",
     "koishi-plugin-puppeteer": "^1.0.0"
   },
   "dependencies": {
-    "koishi-utils": "^3.1.0"
+    "koishi-utils": "^3.1.1"
   }
 }
diff --git a/packages/plugin-common/package.json b/packages/plugin-common/package.json
index 404054b2f5..4a782180b2 100644
--- a/packages/plugin-common/package.json
+++ b/packages/plugin-common/package.json
@@ -31,12 +31,12 @@
     "plugin"
   ],
   "peerDependencies": {
-    "koishi-core": "^2.0.0"
+    "koishi-core": "^2.0.1"
   },
   "devDependencies": {
     "koishi-test-utils": "^4.0.0-beta.9"
   },
   "dependencies": {
-    "koishi-utils": "^3.1.0"
+    "koishi-utils": "^3.1.1"
   }
 }
diff --git a/packages/plugin-eval-addons/package.json b/packages/plugin-eval-addons/package.json
index 49e35f0767..71d279aceb 100644
--- a/packages/plugin-eval-addons/package.json
+++ b/packages/plugin-eval-addons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-eval-addons",
-  "version": "1.0.0-beta.7",
+  "version": "1.0.0-beta.8",
   "description": "Execute JavaScript in Koishi",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -36,13 +36,13 @@
     "code"
   ],
   "peerDependencies": {
-    "koishi-core": "^2.0.0",
-    "koishi-plugin-eval": "^2.0.0-beta.16"
+    "koishi-core": "^2.0.1",
+    "koishi-plugin-eval": "^2.0.0-beta.17"
   },
   "dependencies": {
     "js-yaml": "^3.14.0",
     "json5": "^2.1.3",
-    "koishi-utils": "^3.1.0",
+    "koishi-utils": "^3.1.1",
     "simple-git": "^2.20.1",
     "typescript": "^4.0.2"
   },
diff --git a/packages/plugin-eval/package.json b/packages/plugin-eval/package.json
index b2d779d5c8..11b32c7a95 100644
--- a/packages/plugin-eval/package.json
+++ b/packages/plugin-eval/package.json
@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-eval",
-  "version": "2.0.0-beta.16",
+  "version": "2.0.0-beta.17",
   "description": "Execute JavaScript in Koishi",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -37,12 +37,12 @@
     "code"
   ],
   "peerDependencies": {
-    "koishi-core": "^2.0.0"
+    "koishi-core": "^2.0.1"
   },
   "devDependencies": {
     "koishi-test-utils": "^4.0.0-beta.9"
   },
   "dependencies": {
-    "koishi-utils": "^3.1.0"
+    "koishi-utils": "^3.1.1"
   }
 }
diff --git a/packages/plugin-github/package.json b/packages/plugin-github/package.json
index 9ce2828dbb..b8797a97b6 100644
--- a/packages/plugin-github/package.json
+++ b/packages/plugin-github/package.json
@@ -36,12 +36,12 @@
     "koishi-test-utils": "^4.0.0-beta.9"
   },
   "peerDependencies": {
-    "koishi-core": "^2.0.0"
+    "koishi-core": "^2.0.1"
   },
   "dependencies": {
     "@octokit/rest": "^18.0.3",
     "@octokit/webhooks": "^7.11.0",
     "axios": "^0.20.0",
-    "koishi-utils": "^3.1.0"
+    "koishi-utils": "^3.1.1"
   }
 }
diff --git a/packages/plugin-image-search/package.json b/packages/plugin-image-search/package.json
index 7356b48478..45ab8cc20b 100644
--- a/packages/plugin-image-search/package.json
+++ b/packages/plugin-image-search/package.json
@@ -37,12 +37,12 @@
     "pixiv"
   ],
   "peerDependencies": {
-    "koishi-core": "^2.0.0"
+    "koishi-core": "^2.0.1"
   },
   "dependencies": {
     "axios": "^0.20.0",
     "cheerio": "^1.0.0-rc.3",
-    "koishi-utils": "^3.1.0",
+    "koishi-utils": "^3.1.1",
     "nhentai-api": "^3.0.2"
   }
 }
diff --git a/packages/plugin-mongo/package.json b/packages/plugin-mongo/package.json
index fc9a856f75..055e172908 100644
--- a/packages/plugin-mongo/package.json
+++ b/packages/plugin-mongo/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-mongo",
   "description": "MongoDB support for Koishi",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -39,7 +39,7 @@
     "@types/mongodb": "^3.5.26"
   },
   "peerDependencies": {
-    "koishi-core": "^2.0.0"
+    "koishi-core": "^2.0.1"
   },
   "dependencies": {
     "mongodb": "^3.6.0"
diff --git a/packages/plugin-monitor/package.json b/packages/plugin-monitor/package.json
index b0c7cd2123..3fcc86d7bc 100644
--- a/packages/plugin-monitor/package.json
+++ b/packages/plugin-monitor/package.json
@@ -21,9 +21,9 @@
   },
   "homepage": "https://github.com/koishijs/koishi#readme",
   "peerDependencies": {
-    "koishi-core": "^2.0.0"
+    "koishi-core": "^2.0.1"
   },
   "dependencies": {
-    "koishi-utils": "^3.1.0"
+    "koishi-utils": "^3.1.1"
   }
 }
diff --git a/packages/plugin-mysql/package.json b/packages/plugin-mysql/package.json
index fb39e87046..0ed7a7e646 100644
--- a/packages/plugin-mysql/package.json
+++ b/packages/plugin-mysql/package.json
@@ -36,10 +36,10 @@
     "@types/mysql": "^2.15.15"
   },
   "peerDependencies": {
-    "koishi-core": "^2.0.0"
+    "koishi-core": "^2.0.1"
   },
   "dependencies": {
-    "koishi-utils": "^3.1.0",
+    "koishi-utils": "^3.1.1",
     "mysql": "^2.18.1"
   }
 }
diff --git a/packages/plugin-puppeteer/package.json b/packages/plugin-puppeteer/package.json
index 29b3a3b7e3..0359bf14a8 100644
--- a/packages/plugin-puppeteer/package.json
+++ b/packages/plugin-puppeteer/package.json
@@ -39,12 +39,12 @@
     "koishi-test-utils": "^4.0.0-beta.9"
   },
   "peerDependencies": {
-    "koishi-core": "^2.0.0"
+    "koishi-core": "^2.0.1"
   },
   "dependencies": {
     "chrome-finder": "^1.0.7",
     "pngjs": "^5.0.0",
     "puppeteer-core": "^5.2.1",
-    "koishi-utils": "^3.1.0"
+    "koishi-utils": "^3.1.1"
   }
 }
diff --git a/packages/plugin-recorder/package.json b/packages/plugin-recorder/package.json
index 0882aba867..5a659c5140 100644
--- a/packages/plugin-recorder/package.json
+++ b/packages/plugin-recorder/package.json
@@ -34,13 +34,13 @@
     "recorder"
   ],
   "peerDependencies": {
-    "koishi-core": "^2.0.0"
+    "koishi-core": "^2.0.1"
   },
   "devDependencies": {
     "del": "^5.1.0",
     "koishi-test-utils": "^4.0.0-beta.9"
   },
   "dependencies": {
-    "koishi-utils": "^3.1.0"
+    "koishi-utils": "^3.1.1"
   }
 }
diff --git a/packages/plugin-rss/package.json b/packages/plugin-rss/package.json
index 970e76f320..65bb74bda5 100644
--- a/packages/plugin-rss/package.json
+++ b/packages/plugin-rss/package.json
@@ -36,13 +36,13 @@
     "rss"
   ],
   "peerDependencies": {
-    "koishi-core": "^2.0.0"
+    "koishi-core": "^2.0.1"
   },
   "devDependencies": {
     "koishi-test-utils": "^4.0.0-beta.9"
   },
   "dependencies": {
     "rss-feed-emitter": "^3.2.2",
-    "koishi-utils": "^3.1.0"
+    "koishi-utils": "^3.1.1"
   }
 }
diff --git a/packages/plugin-schedule/package.json b/packages/plugin-schedule/package.json
index 6216ae7e8a..3fd904f29c 100644
--- a/packages/plugin-schedule/package.json
+++ b/packages/plugin-schedule/package.json
@@ -34,14 +34,14 @@
     "task"
   ],
   "devDependencies": {
-    "koishi-plugin-mongo": "^1.0.0",
+    "koishi-plugin-mongo": "^1.0.1",
     "koishi-plugin-mysql": "^2.0.0",
     "koishi-test-utils": "^4.0.0-beta.9"
   },
   "peerDependencies": {
-    "koishi-core": "^2.0.0"
+    "koishi-core": "^2.0.1"
   },
   "dependencies": {
-    "koishi-utils": "^3.1.0"
+    "koishi-utils": "^3.1.1"
   }
 }
diff --git a/packages/plugin-status/package.json b/packages/plugin-status/package.json
index 3eba5fdbe7..2288ee868a 100644
--- a/packages/plugin-status/package.json
+++ b/packages/plugin-status/package.json
@@ -32,16 +32,16 @@
     "status"
   ],
   "peerDependencies": {
-    "koishi-core": "^2.0.0"
+    "koishi-core": "^2.0.1"
   },
   "devDependencies": {
     "@types/cross-spawn": "^6.0.2",
-    "koishi-plugin-mongo": "^1.0.0",
+    "koishi-plugin-mongo": "^1.0.1",
     "koishi-plugin-mysql": "^2.0.0",
     "koishi-test-utils": "^4.0.0-beta.9"
   },
   "dependencies": {
     "cross-spawn": "^7.0.3",
-    "koishi-utils": "^3.1.0"
+    "koishi-utils": "^3.1.1"
   }
 }
diff --git a/packages/plugin-teach/package.json b/packages/plugin-teach/package.json
index a406573485..323430c635 100644
--- a/packages/plugin-teach/package.json
+++ b/packages/plugin-teach/package.json
@@ -38,15 +38,15 @@
     "conversation"
   ],
   "peerDependencies": {
-    "koishi-core": "^2.0.0"
+    "koishi-core": "^2.0.1"
   },
   "devDependencies": {
-    "koishi-plugin-mongo": "^1.0.0",
+    "koishi-plugin-mongo": "^1.0.1",
     "koishi-plugin-mysql": "^2.0.0",
     "koishi-test-utils": "^4.0.0-beta.9"
   },
   "dependencies": {
-    "koishi-utils": "^3.1.0",
+    "koishi-utils": "^3.1.1",
     "leven": "^3.1.0",
     "regexpp": "^3.1.0"
   }
diff --git a/packages/plugin-tools/package.json b/packages/plugin-tools/package.json
index 880694ebdf..c910cbc835 100644
--- a/packages/plugin-tools/package.json
+++ b/packages/plugin-tools/package.json
@@ -25,13 +25,13 @@
     "@types/qrcode": "^1.3.5"
   },
   "peerDependencies": {
-    "koishi-core": "^2.0.0"
+    "koishi-core": "^2.0.1"
   },
   "dependencies": {
     "axios": "^0.20.0",
     "cheerio": "^1.0.0-rc.3",
     "qrcode": "^1.4.4",
     "xml-js": "^1.6.11",
-    "koishi-utils": "^3.1.0"
+    "koishi-utils": "^3.1.1"
   }
 }