@jsbot-tellus/core 2.0.3 → 2.1.0

package/src/plugins/admin/index.ts

@@ -1,6 +1,8 @@
 import { z } from 'zod'
 import { definePlugin } from '../../core/index.js'
 
+const INSTALLER_DISABLED = '插件安装功能未启用（installer.enabled=false）。'
+
 const PLUGIN_USAGE = `用法：
 /plugin install <npm包[@版本|tag]>
 /plugin list
@@ -26,292 +28,359 @@ export const adminPlugin = definePlugin({
     },
 
     setup(ctx) {
-        ctx.commands.register(
+        ctx.commands.group(
             {
                 name: 'utter',
                 permission: 'Admin',
                 description: '向当前会话发送文本',
-            },
-            async (_event, context, match) => {
-                if (!match.rest) {
-                    await context.send('用法：/utter <文本>')
-                    return
-                }
-
-                await context.send(match.rest, {
-                    quote: false,
-                    autoEscape: true,
-                })
-            }
-        )
+                handler: async (_event, context, match) => {
+                    if (!match.rest) {
+                        await context.send('用法：/utter <文本>')
+                        return
+                    }
 
-        ctx.commands.register(
-            {
-                name: 'utter.raw',
-                permission: 'SuperAdmin',
-                description: '发送原始 CQ 消息',
+                    await context.send(match.rest, {
+                        quote: false,
+                        autoEscape: true,
+                    })
+                },
             },
-            async (_event, context, match) => {
-                if (!match.rest) {
-                    await context.send('用法：/utter.raw <CQ 消息>')
-                    return
-                }
-
-                await context.send(match.rest, {
-                    quote: false,
-                    autoEscape: false,
-                })
+            (utter) => {
+                utter.register(
+                    {
+                        name: 'raw',
+                        permission: 'SuperAdmin',
+                        description: '发送原始 CQ 消息',
+                    },
+                    async (_event, context, match) => {
+                        if (!match.rest) {
+                            await context.send('用法：/utter raw <CQ 消息>')
+                            return
+                        }
+
+                        await context.send(match.rest, {
+                            quote: false,
+                            autoEscape: false,
+                        })
+                    }
+                )
             }
         )
 
-        ctx.commands.register(
+        ctx.commands.group(
             {
                 name: 'plugin',
                 permission: 'SuperAdmin',
                 description: '管理已安装的插件包',
-            },
-            async (_event, context, match) => {
-                const sub = (match.args[0] ?? '').toLowerCase()
-                const argument = match.rest
-                    .slice(match.args[0]?.length ?? 0)
-                    .trim()
-                const installer = ctx.core.installer
-                const sessionId = context.sessionId
-
-                if (sub.length === 0 || sub === 'help') {
+                handler: async (_event, context) => {
                     await context.send(PLUGIN_USAGE, { quote: false })
-                    return
-                }
-
-                if (sub === 'list') {
-                    try {
-                        const packages = await installer.list()
-
-                        if (packages.length === 0) {
-                            await context.send('没有已安装的插件包。', {
-                                quote: false,
-                            })
-                            return
-                        }
-
-                        const lines = packages.map((item) => {
-                            const status = item.loaded ? '已加载' : '重启后生效'
-                            return `- ${item.packageName}@${item.version} → ${formatIds(item.pluginIds)}（${status}）`
-                        })
-
-                        await context.send(
-                            [
-                                `已安装 ${packages.length} 个插件包：`,
-                                ...lines,
-                            ].join('\n'),
-                            { quote: false }
-                        )
-                    } catch (error) {
-                        await context.send(
-                            `❌ 读取插件包失败：${errorMessage(error)}`,
-                            { quote: false }
-                        )
-                    }
-                    return
-                }
-
-                if (sub !== 'install' && sub !== 'remove' && sub !== 'update') {
-                    await context.send(PLUGIN_USAGE, { quote: false })
-                    return
-                }
-
-                if (!installer.enabled) {
-                    await context.send(
-                        '插件安装功能未启用（installer.enabled=false）。',
-                        { quote: false }
-                    )
-                    return
-                }
-
-                if (sub === 'install') {
-                    if (argument.length === 0) {
-                        await context.send(
-                            '用法：/plugin install <npm包[@版本|tag]>',
-                            { quote: false }
-                        )
-                        return
-                    }
-
-                    await context.send(`正在安装 ${argument} ...`, {
-                        quote: false,
-                    })
+                },
+            },
+            (plugin) => {
+                plugin.register(
+                    {
+                        name: 'list',
+                        description: '列出已安装的插件包',
+                    },
+                    async (_event, context) => {
+                        const installer = ctx.core.installer
 
-                    ctx.tasks.enqueue('plugin-installer', async (signal) => {
                         try {
-                            const result = await installer.install(
-                                argument,
-                                signal
-                            )
-                            const lines = [
-                                `✅ 已安装 ${result.packageName}@${result.version}（插件 id: ${formatIds(result.pluginIds)}）。`,
-                            ]
+                            const packages = await installer.list()
 
-                            for (const warning of result.warnings) {
-                                lines.push(`⚠️ ${warning}`)
+                            if (packages.length === 0) {
+                                await context.send('没有已安装的插件包。', {
+                                    quote: false,
+                                })
+                                return
                             }
 
-                            lines.push(
-                                result.warnings.length === 0
-                                    ? '正在重启。'
-                                    : '请处理以上问题后手动重启。'
-                            )
-
-                            await ctx.api.send(sessionId, lines.join('\n'), {
-                                quote: false,
+                            const lines = packages.map((item) => {
+                                const status = item.loaded
+                                    ? '已加载'
+                                    : '重启后生效'
+                                return `- ${item.packageName}@${item.version} → ${formatIds(item.pluginIds)}（${status}）`
                             })
 
-                            if (result.warnings.length === 0) {
-                                ctx.core.restart()
-                            }
+                            await context.send(
+                                [
+                                    `已安装 ${packages.length} 个插件包：`,
+                                    ...lines,
+                                ].join('\n'),
+                                { quote: false }
+                            )
                         } catch (error) {
-                            await ctx.api.send(
-                                sessionId,
-                                `❌ 安装失败：${errorMessage(error)}`,
+                            await context.send(
+                                `❌ 读取插件包失败：${errorMessage(error)}`,
                                 { quote: false }
                             )
                         }
-                    })
-                    return
-                }
-
-                if (sub === 'remove') {
-                    if (argument.length === 0) {
-                        await context.send(
-                            '用法：/plugin remove <包名|插件id> [--force]',
-                            { quote: false }
-                        )
-                        return
                     }
+                )
 
-                    const force = /(?:^|\s)--force(?:\s|$)/.test(argument)
-                    const target = argument
-                        .replace(/(?:^|\s)--force(?:\s|$)/, ' ')
-                        .trim()
-
-                    if (target.length === 0) {
-                        await context.send(
-                            '用法：/plugin remove <包名|插件id> [--force]',
-                            { quote: false }
-                        )
-                        return
-                    }
+                plugin.register(
+                    {
+                        name: 'install',
+                        description: '安装 npm 插件包',
+                    },
+                    async (_event, context, match) => {
+                        const installer = ctx.core.installer
+                        const sessionId = context.sessionId
+
+                        if (!installer.enabled) {
+                            await context.send(INSTALLER_DISABLED, {
+                                quote: false,
+                            })
+                            return
+                        }
 
-                    await context.send(`正在卸载 ${target} ...`, {
-                        quote: false,
-                    })
+                        const argument = match.rest.trim()
 
-                    ctx.tasks.enqueue('plugin-installer', async (signal) => {
-                        try {
-                            const result = await installer.remove(
-                                target,
-                                signal,
-                                { force }
+                        if (argument.length === 0) {
+                            await context.send(
+                                '用法：/plugin install <npm包[@版本|tag]>',
+                                { quote: false }
                             )
-                            const lines = [`✅ 已卸载 ${result.packageName}。`]
-
-                            if (result.pluginIds.length > 0) {
-                                lines.push(
-                                    `插件 id: ${formatIds(result.pluginIds)}`
-                                )
-                            }
+                            return
+                        }
 
-                            for (const warning of result.warnings) {
-                                lines.push(`⚠️ ${warning}`)
-                            }
+                        await context.send(`正在安装 ${argument} ...`, {
+                            quote: false,
+                        })
 
-                            if (result.warnings.length === 0) {
-                                lines.push('正在重启。')
-                            } else {
-                                lines.push('请处理以上问题后手动重启。')
+                        ctx.tasks.enqueue(
+                            'plugin-installer',
+                            async (signal) => {
+                                try {
+                                    const result = await installer.install(
+                                        argument,
+                                        signal
+                                    )
+                                    const lines = [
+                                        `✅ 已安装 ${result.packageName}@${result.version}（插件 id: ${formatIds(result.pluginIds)}）。`,
+                                    ]
+
+                                    for (const warning of result.warnings) {
+                                        lines.push(`⚠️ ${warning}`)
+                                    }
+
+                                    lines.push(
+                                        result.warnings.length === 0
+                                            ? '正在重启。'
+                                            : '请处理以上问题后手动重启。'
+                                    )
+
+                                    await ctx.api.send(
+                                        sessionId,
+                                        lines.join('\n'),
+                                        {
+                                            quote: false,
+                                        }
+                                    )
+
+                                    if (result.warnings.length === 0) {
+                                        ctx.core.restart()
+                                    }
+                                } catch (error) {
+                                    await ctx.api.send(
+                                        sessionId,
+                                        `❌ 安装失败：${errorMessage(error)}`,
+                                        { quote: false }
+                                    )
+                                }
                             }
+                        )
+                    }
+                )
 
-                            await ctx.api.send(sessionId, lines.join('\n'), {
+                plugin.register(
+                    {
+                        name: 'remove',
+                        description: '卸载插件包',
+                    },
+                    async (_event, context, match) => {
+                        const installer = ctx.core.installer
+                        const sessionId = context.sessionId
+
+                        if (!installer.enabled) {
+                            await context.send(INSTALLER_DISABLED, {
                                 quote: false,
                             })
-
-                            if (result.warnings.length === 0) {
-                                ctx.core.restart()
-                            }
-                        } catch (error) {
-                            await ctx.api.send(
-                                sessionId,
-                                `❌ 卸载失败：${errorMessage(error)}`,
-                                { quote: false }
-                            )
+                            return
                         }
-                    })
-                    return
-                }
-
-                await context.send(
-                    argument.length > 0
-                        ? `正在更新 ${argument} ...`
-                        : '正在更新全部插件包 ...',
-                    { quote: false }
-                )
-
-                ctx.tasks.enqueue('plugin-installer', async (signal) => {
-                    try {
-                        const result = await installer.update(
-                            argument.length > 0 ? argument : undefined,
-                            signal
-                        )
-                        const lines: string[] = []
-                        const warnings = result.updated.flatMap(
-                            (item) => item.warnings
-                        )
 
-                        for (const item of result.updated) {
-                            lines.push(
-                                `✅ ${item.packageName}@${item.version}（插件 id: ${formatIds(item.pluginIds)}）`
-                            )
-                        }
+                        const argument = match.rest.trim()
 
-                        for (const item of result.failed) {
-                            lines.push(
-                                `❌ ${item.packageName}：${item.message}`
+                        if (argument.length === 0) {
+                            await context.send(
+                                '用法：/plugin remove <包名|插件id> [--force]',
+                                { quote: false }
                             )
+                            return
                         }
 
-                        for (const warning of warnings) {
-                            lines.push(`⚠️ ${warning}`)
-                        }
-
-                        if (lines.length === 0) {
-                            lines.push('没有可更新的插件包。')
-                        }
+                        const force = /(?:^|\s)--force(?:\s|$)/.test(argument)
+                        const target = argument
+                            .replace(/(?:^|\s)--force(?:\s|$)/, ' ')
+                            .trim()
 
-                        if (result.updated.length > 0) {
-                            lines.push(
-                                warnings.length === 0
-                                    ? '正在重启。'
-                                    : '请处理以上问题后手动重启。'
+                        if (target.length === 0) {
+                            await context.send(
+                                '用法：/plugin remove <包名|插件id> [--force]',
+                                { quote: false }
                             )
+                            return
                         }
 
-                        await ctx.api.send(sessionId, lines.join('\n'), {
+                        await context.send(`正在卸载 ${target} ...`, {
                             quote: false,
                         })
 
-                        if (
-                            result.updated.length > 0 &&
-                            warnings.length === 0
-                        ) {
-                            ctx.core.restart()
+                        ctx.tasks.enqueue(
+                            'plugin-installer',
+                            async (signal) => {
+                                try {
+                                    const result = await installer.remove(
+                                        target,
+                                        signal,
+                                        { force }
+                                    )
+                                    const lines = [
+                                        `✅ 已卸载 ${result.packageName}。`,
+                                    ]
+
+                                    if (result.pluginIds.length > 0) {
+                                        lines.push(
+                                            `插件 id: ${formatIds(result.pluginIds)}`
+                                        )
+                                    }
+
+                                    for (const warning of result.warnings) {
+                                        lines.push(`⚠️ ${warning}`)
+                                    }
+
+                                    if (result.warnings.length === 0) {
+                                        lines.push('正在重启。')
+                                    } else {
+                                        lines.push('请处理以上问题后手动重启。')
+                                    }
+
+                                    await ctx.api.send(
+                                        sessionId,
+                                        lines.join('\n'),
+                                        {
+                                            quote: false,
+                                        }
+                                    )
+
+                                    if (result.warnings.length === 0) {
+                                        ctx.core.restart()
+                                    }
+                                } catch (error) {
+                                    await ctx.api.send(
+                                        sessionId,
+                                        `❌ 卸载失败：${errorMessage(error)}`,
+                                        { quote: false }
+                                    )
+                                }
+                            }
+                        )
+                    }
+                )
+
+                plugin.register(
+                    {
+                        name: 'update',
+                        description: '更新插件包',
+                    },
+                    async (_event, context, match) => {
+                        const installer = ctx.core.installer
+                        const sessionId = context.sessionId
+
+                        if (!installer.enabled) {
+                            await context.send(INSTALLER_DISABLED, {
+                                quote: false,
+                            })
+                            return
                         }
-                    } catch (error) {
-                        await ctx.api.send(
-                            sessionId,
-                            `❌ 更新失败：${errorMessage(error)}`,
+
+                        const argument = match.rest.trim()
+
+                        await context.send(
+                            argument.length > 0
+                                ? `正在更新 ${argument} ...`
+                                : '正在更新全部插件包 ...',
                             { quote: false }
                         )
+
+                        ctx.tasks.enqueue(
+                            'plugin-installer',
+                            async (signal) => {
+                                try {
+                                    const result = await installer.update(
+                                        argument.length > 0
+                                            ? argument
+                                            : undefined,
+                                        signal
+                                    )
+                                    const lines: string[] = []
+                                    const warnings = result.updated.flatMap(
+                                        (item) => item.warnings
+                                    )
+
+                                    for (const item of result.updated) {
+                                        lines.push(
+                                            `✅ ${item.packageName}@${item.version}（插件 id: ${formatIds(item.pluginIds)}）`
+                                        )
+                                    }
+
+                                    for (const item of result.failed) {
+                                        lines.push(
+                                            `❌ ${item.packageName}：${item.message}`
+                                        )
+                                    }
+
+                                    for (const warning of warnings) {
+                                        lines.push(`⚠️ ${warning}`)
+                                    }
+
+                                    if (lines.length === 0) {
+                                        lines.push('没有可更新的插件包。')
+                                    }
+
+                                    if (result.updated.length > 0) {
+                                        lines.push(
+                                            warnings.length === 0
+                                                ? '正在重启。'
+                                                : '请处理以上问题后手动重启。'
+                                        )
+                                    }
+
+                                    await ctx.api.send(
+                                        sessionId,
+                                        lines.join('\n'),
+                                        {
+                                            quote: false,
+                                        }
+                                    )
+
+                                    if (
+                                        result.updated.length > 0 &&
+                                        warnings.length === 0
+                                    ) {
+                                        ctx.core.restart()
+                                    }
+                                } catch (error) {
+                                    await ctx.api.send(
+                                        sessionId,
+                                        `❌ 更新失败：${errorMessage(error)}`,
+                                        { quote: false }
+                                    )
+                                }
+                            }
+                        )
                     }
-                })
+                )
             }
         )
     },

package/src/plugins/core/index.ts

@@ -43,6 +43,10 @@ export const corePlugin = definePlugin({
                         ctx.core.roles.can(role, command.permission)
                     )
                     .map((command) => {
+                        const usage =
+                            command.usage !== undefined
+                                ? ` ${command.usage}`
+                                : ''
                         const aliases =
                             command.aliases.length > 0
                                 ? ` (${command.aliases
@@ -53,7 +57,7 @@ export const corePlugin = definePlugin({
                             ? ` - ${command.description}`
                             : ''
 
-                        return `/${command.name}${aliases}${description}`
+                        return `/${command.name}${usage}${aliases}${description}`
                     })
 
                 await context.send(`可用命令：\n${commands.join('\n')}`)

package/dist/core/plugin/installed.d.ts

@@ -1,9 +0,0 @@
-import type { Logger } from '../logging/logger.js';
-import type { AnyPluginDefinition } from './types.js';
-export interface LoadedInstalledPlugins {
-    plugins: AnyPluginDefinition[];
-    byPackage: Map<string, string[]>;
-}
-export declare function packageEntry(directory: string, manifest: Record<string, unknown>): string;
-export declare function loadInstalledPlugins(directory: string, logger: Logger): Promise<LoadedInstalledPlugins>;
-//# sourceMappingURL=installed.d.ts.map

package/dist/core/plugin/installed.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"installed.d.ts","sourceRoot":"","sources":["../../../src/core/plugin/installed.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAUlD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAErD,MAAM,WAAW,sBAAsB;IACnC,OAAO,EAAE,mBAAmB,EAAE,CAAA;IAC9B,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;CACnC;AA4CD,wBAAgB,YAAY,CACxB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC,MAAM,CAiCR;AAED,wBAAsB,oBAAoB,CACtC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,sBAAsB,CAAC,CA8DjC"}