@jsbot-tellus/core 2.0.3 → 2.1.0

package/src/core/dispatch/router.ts

@@ -1,13 +1,16 @@
 import type {
     EventNext,
+    OneBotMessageEvent,
     SnowLumaEvent,
     SnowLumaEventContextWithQuote,
 } from '@snowluma/sdk'
 import { isMessageEvent, isNoticeEvent, isRequestEvent } from '@snowluma/sdk'
 import type { Logger } from '../logging/logger.js'
 import type { MessageSender } from '../messaging/sender.js'
+import { CommandParamsError } from '../plugin/command-params.js'
 import type { PluginGate } from '../plugin/gating.js'
 import type {
+    CommandGroupRegistrar,
     CommandHandler,
     CommandInfo,
     EventType,
@@ -22,7 +25,11 @@ import type {
 import type { RoleService } from '../security/roles.js'
 import { PermissionRefuser } from '../security/refuse.js'
 import type { Permission } from '../security/permission.js'
-import { CommandRegistry, type CommandRegistration } from './command.js'
+import {
+    CommandRegistry,
+    type CommandGroupRegistration,
+    type CommandRegistration,
+} from './command.js'
 import {
     createEventContext,
     eventTypeOf,
@@ -48,6 +55,8 @@ export interface RouterDeps {
     logger: Logger
 }
 
+type AnyCommandHandler = CommandHandler<OneBotMessageEvent, any[]>
+
 export interface RegisterCommandOptions {
     pluginId: string
     name: string
@@ -55,7 +64,19 @@ export interface RegisterCommandOptions {
     prefixes?: string[] | undefined
     permission?: Permission | undefined
     description?: string | undefined
-    handler: CommandHandler
+    params?: string | undefined
+    handler: AnyCommandHandler
+}
+
+export interface RegisterCommandGroupOptions {
+    pluginId: string
+    name: string
+    aliases?: string[] | undefined
+    prefixes?: string[] | undefined
+    permission?: Permission | undefined
+    description?: string | undefined
+    params?: string | undefined
+    handler?: AnyCommandHandler | undefined
 }
 
 export interface RegisterNoticeOptions extends NoticeOptions {
@@ -153,6 +174,35 @@ export class Router {
                         this.sender,
                         found.match
                     )
+                    let args: unknown[] = []
+
+                    if (found.registration.paramsParser) {
+                        try {
+                            const parsed =
+                                found.registration.paramsParser.parse(
+                                    found.match.rest
+                                )
+
+                            args = parsed.args
+
+                            if (parsed.ignored.length > 0) {
+                                this.logger.debug(
+                                    `ignored extra arguments for ${found.registration.name}`,
+                                    parsed.ignored.join(' ')
+                                )
+                            }
+                        } catch (error) {
+                            if (error instanceof CommandParamsError) {
+                                await commandContext.send(
+                                    `${error.message}\n用法：${found.match.prefix}${found.registration.name} ${error.usage}`,
+                                    { quote: false }
+                                )
+                                return
+                            }
+
+                            throw error
+                        }
+                    }
 
                     await this.safeRun(
                         found.registration.pluginId,
@@ -161,7 +211,8 @@ export class Router {
                             found.registration.handler(
                                 event,
                                 commandContext,
-                                found.match
+                                found.match,
+                                ...args
                             )
                     )
 
@@ -193,12 +244,35 @@ export class Router {
             ...(options.description !== undefined
                 ? { description: options.description }
                 : {}),
+            ...(options.params !== undefined ? { params: options.params } : {}),
             handler: options.handler,
         }
 
         return this.commands.register(registration)
     }
 
+    registerCommandGroup(
+        options: RegisterCommandGroupOptions,
+        setup: (group: CommandGroupRegistrar) => void
+    ): () => void {
+        const registration: CommandGroupRegistration = {
+            pluginId: options.pluginId,
+            name: options.name,
+            aliases: options.aliases ?? [],
+            prefixes: options.prefixes ?? ['/'],
+            permission: options.permission ?? 'User',
+            ...(options.description !== undefined
+                ? { description: options.description }
+                : {}),
+            ...(options.params !== undefined ? { params: options.params } : {}),
+            ...(options.handler !== undefined
+                ? { handler: options.handler }
+                : {}),
+        }
+
+        return this.commands.group(registration, setup)
+    }
+
     registerMessage(pluginId: string, handler: MessageHandler): () => void {
         return this.handlers.registerMessage(pluginId, handler)
     }

package/src/core/index.ts

@@ -17,6 +17,8 @@ export type { PluginKV } from './plugin/kv.js'
 export { definePlugin } from './plugin/types.js'
 export type {
     AnyPluginDefinition,
+    CommandGroupOptions,
+    CommandGroupRegistrar,
     CommandHandler,
     CommandInfo,
     CommandMatch,