@jsbot-tellus/core 2.6.0 → 2.7.0

package/src/core/kernel.ts

@@ -1,4 +1,4 @@
-import type { SnowLumaEvent } from '@snowluma/sdk'
+import { isMessageEvent, type SnowLumaEvent } from '@snowluma/sdk'
 import type { BotClient } from './client.js'
 import type { AppConfig } from './config/schema.js'
 import { createBotApi, type BotApi } from './api.js'
@@ -93,6 +93,13 @@ export class Kernel {
                               .listCommands()
                               .filter((command) =>
                                   gate.isEnabled(command.pluginId, event)
+                              )
+                              .filter(
+                                  (command) =>
+                                      !isMessageEvent(event) ||
+                                      command.messageTypes.includes(
+                                          event.message_type
+                                      )
                               ),
             },
             plugins: {

package/src/core/plugin/context.ts

@@ -12,6 +12,7 @@ import type {
     CommandHandler,
     CommandOptions,
     CoreServices,
+    MessageHandler,
     PluginContext,
     PluginDefinition,
 } from './types.js'
@@ -63,6 +64,9 @@ export function createPluginContext<TConfig>(
                     ...(options.permission !== undefined
                         ? { permission: options.permission }
                         : {}),
+                    ...(options.messageType !== undefined
+                        ? { messageType: options.messageType }
+                        : {}),
                     ...(options.description !== undefined
                         ? { description: options.description }
                         : {}),
@@ -89,6 +93,9 @@ export function createPluginContext<TConfig>(
                         ...(options.permission !== undefined
                             ? { permission: options.permission }
                             : {}),
+                        ...(options.messageType !== undefined
+                            ? { messageType: options.messageType }
+                            : {}),
                         ...(options.description !== undefined
                             ? { description: options.description }
                             : {}),
@@ -111,6 +118,20 @@ export function createPluginContext<TConfig>(
             onMessage(handler) {
                 return deps.router.registerMessage(id, handler)
             },
+            onGroupMessage(handler) {
+                return deps.router.registerMessage(
+                    id,
+                    handler as MessageHandler,
+                    'group'
+                )
+            },
+            onPrivateMessage(handler) {
+                return deps.router.registerMessage(
+                    id,
+                    handler as MessageHandler,
+                    'private'
+                )
+            },
             onNotice(options, handler) {
                 return deps.router.registerNotice({
                     pluginId: id,

package/src/core/plugin/loader.ts

@@ -4,7 +4,7 @@ import { pathToFileURL } from 'node:url'
 import fg from 'fast-glob'
 import type { Logger } from '../logging/logger.js'
 import { collectPluginExports } from './exports.js'
-import { readInstallState, readJsonFile } from './install-dir.js'
+import { readJsonFile } from './install-dir.js'
 import { NpmCliRunner, type NpmRunner } from './npm-runner.js'
 import type { AnyPluginDefinition } from './types.js'
 
@@ -13,7 +13,7 @@ type LoaderLogger = Pick<Logger, 'warn' | 'error'> & {
 }
 
 export interface LocalPluginLoaderOptions {
-    /** Build local plugins that have a build script but no dist. Defaults to true. */
+    /** Rebuild local plugins that have a build script on every load. Defaults to true. */
     autoBuild?: boolean | undefined
     /** Timeout for a single local plugin build. Defaults to 120 seconds. */
     buildTimeoutMs?: number | undefined
@@ -49,19 +49,7 @@ async function readBuildScript(directory: string): Promise<string | undefined> {
         : undefined
 }
 
-async function readManagedDirectories(
-    root: string
-): Promise<Set<string> | null> {
-    try {
-        const state = await readInstallState(root)
-
-        return new Set(
-            Object.values(state.packages).map((record) => record.dir)
-        )
-    } catch {
-        return null
-    }
-}
+type BuildOutcome = 'built' | 'missing-node-modules' | 'failed'
 
 async function buildLocalPlugin(
     directory: string,
@@ -69,22 +57,15 @@ async function buildLocalPlugin(
     logger: LoaderLogger | undefined,
     runner: NpmRunner,
     timeoutMs: number
-): Promise<boolean> {
-    if ((await readBuildScript(directory)) === undefined) {
-        logger?.warn(
-            `skipping local plugin ${name}: dist directory not found and package.json has no build script`
-        )
-        return false
-    }
-
+): Promise<BuildOutcome> {
     if (!(await directoryExists(join(directory, 'node_modules')))) {
         logger?.warn(
-            `skipping local plugin ${name}: dist directory not found and node_modules is missing; run npm install --prefix ${directory}`
+            `cannot build local plugin ${name}: node_modules is missing; run npm install --prefix ${directory}`
         )
-        return false
+        return 'missing-node-modules'
     }
 
-    logger?.info?.(`building local plugin ${name}: dist directory not found`)
+    logger?.info?.(`building local plugin ${name}`)
 
     try {
         await runner.run(['run', 'build'], {
@@ -93,13 +74,12 @@ async function buildLocalPlugin(
         })
     } catch (error) {
         logger?.error(`failed to build local plugin ${name}`, error)
-        logger?.warn(`skipping local plugin ${name}: build failed`)
-        return false
+        return 'failed'
     }
 
     logger?.info?.(`built local plugin ${name}`)
 
-    return true
+    return 'built'
 }
 
 export async function loadPluginsFromDirectory(
@@ -127,7 +107,14 @@ export async function loadPluginsFromDirectory(
         let imported: unknown
 
         try {
-            imported = await import(pathToFileURL(file).href)
+            const info = await stat(file).catch(() => null)
+            const url = pathToFileURL(file)
+
+            if (info !== null) {
+                url.searchParams.set('v', String(info.mtimeMs))
+            }
+
+            imported = await import(url.href)
         } catch (error) {
             logger?.error(`failed to import plugin file: ${file}`, error)
             invalid.push(
@@ -170,22 +157,7 @@ export async function loadLocalPlugins(
     )
     const plugins: AnyPluginDefinition[] = []
 
-    let autoBuild = options.autoBuild !== false
-    let managed = new Set<string>()
-
-    if (autoBuild) {
-        const directories = await readManagedDirectories(absolute)
-
-        if (directories === null) {
-            logger?.warn(
-                'cannot read plugin install state; automatic local plugin build is disabled'
-            )
-            autoBuild = false
-        } else {
-            managed = directories
-        }
-    }
-
+    const autoBuild = options.autoBuild !== false
     const runner = options.runner ?? new NpmCliRunner()
     const timeoutMs = options.buildTimeoutMs ?? DEFAULT_BUILD_TIMEOUT_MS
 
@@ -195,24 +167,11 @@ export async function loadLocalPlugins(
 
         const directory = join(absolute, entry.name)
         const dist = join(directory, 'dist')
+        const hasBuildScript = (await readBuildScript(directory)) !== undefined
         let distInfo = await stat(dist).catch(() => null)
 
-        if (!distInfo?.isDirectory()) {
-            if (!autoBuild) {
-                logger?.warn(
-                    `skipping local plugin ${entry.name}: dist directory not found`
-                )
-                continue
-            }
-
-            if (managed.has(entry.name)) {
-                logger?.warn(
-                    `skipping local plugin ${entry.name}: dist directory not found (installed package is expected to include dist)`
-                )
-                continue
-            }
-
-            const built = await buildLocalPlugin(
+        if (autoBuild && hasBuildScript) {
+            const outcome = await buildLocalPlugin(
                 directory,
                 entry.name,
                 logger,
@@ -220,16 +179,32 @@ export async function loadLocalPlugins(
                 timeoutMs
             )
 
-            if (!built) continue
-
             distInfo = await stat(dist).catch(() => null)
 
             if (!distInfo?.isDirectory()) {
+                const reason =
+                    outcome === 'built'
+                        ? 'build finished but dist directory not found'
+                        : outcome === 'missing-node-modules'
+                          ? 'node_modules is missing and dist directory not found'
+                          : 'build failed and dist directory not found'
+
+                logger?.warn(`skipping local plugin ${entry.name}: ${reason}`)
+                continue
+            }
+
+            if (outcome !== 'built') {
                 logger?.warn(
-                    `skipping local plugin ${entry.name}: build finished but dist directory not found`
+                    `using existing dist for local plugin ${entry.name}: rebuild failed`
                 )
-                continue
             }
+        } else if (!distInfo?.isDirectory()) {
+            logger?.warn(
+                hasBuildScript
+                    ? `skipping local plugin ${entry.name}: dist directory not found and automatic build is disabled`
+                    : `skipping local plugin ${entry.name}: dist directory not found and package.json has no build script`
+            )
+            continue
         }
 
         plugins.push(...(await loadPluginsFromDirectory(dist, logger)))

package/src/core/plugin/types.ts

@@ -1,6 +1,8 @@
 import type {
+    OneBotGroupMessageEvent,
     OneBotMessageEvent,
     OneBotNoticeEvent,
+    OneBotPrivateMessageEvent,
     OneBotRequestEvent,
     OutgoingMessage,
     SnowLumaEvent,
@@ -17,6 +19,10 @@ import type { CommandParamArgs } from './command-params.js'
 
 export type EventType = 'message' | 'notice' | 'request' | 'meta'
 
+export type MessageType = 'group' | 'private'
+
+export type MessageTypeFilter = MessageType | readonly MessageType[]
+
 export interface CommandMatch {
     command: string
     prefix: string
@@ -28,6 +34,7 @@ export interface CommandInfo {
     name: string
     aliases: string[]
     permission: Permission
+    messageTypes: MessageType[]
     description?: string | undefined
     usage?: string | undefined
     pluginId: string
@@ -59,6 +66,16 @@ export type MessageHandler = (
     context: EventContext<OneBotMessageEvent>
 ) => void | Promise<void>
 
+export type GroupMessageHandler = (
+    event: OneBotGroupMessageEvent,
+    context: EventContext<OneBotGroupMessageEvent>
+) => void | Promise<void>
+
+export type PrivateMessageHandler = (
+    event: OneBotPrivateMessageEvent,
+    context: EventContext<OneBotPrivateMessageEvent>
+) => void | Promise<void>
+
 export type NoticeHandler = (
     event: OneBotNoticeEvent,
     context: EventContext<OneBotNoticeEvent>
@@ -80,6 +97,7 @@ export interface CommandOptions<Declaration extends string = string> {
     aliases?: string[] | undefined
     prefixes?: string[] | undefined
     permission?: Permission | undefined
+    messageType?: MessageTypeFilter | undefined
     description?: string | undefined
     params?: Declaration | undefined
 }
@@ -127,6 +145,8 @@ export interface CommandRegistrar extends CommandGroupRegistrar {
 
 export interface EventRegistrar {
     onMessage(handler: MessageHandler): () => void
+    onGroupMessage(handler: GroupMessageHandler): () => void
+    onPrivateMessage(handler: PrivateMessageHandler): () => void
     onNotice(options: NoticeOptions, handler: NoticeHandler): () => void
     onRequest(options: RequestOptions, handler: RequestHandler): () => void
 }