koishi-plugin-mai-bridge 0.1.0 → 0.1.1

package/out/bridge/convert.js

@@ -193,6 +193,7 @@ async function sessionToMaimMessage(session, route, apiKey, options = {}) {
             additional_config: {
                 koishi_route_id: route.routeId,
                 koishi_self_id: session.selfId,
+                platform_io_account_id: session.selfId,
                 koishi_platform: session.platform,
                 koishi_channel_id: session.channelId || '',
                 koishi_guild_id: session.guildId,

package/out/bridge/docker.d.ts

@@ -20,6 +20,9 @@ export declare class MaibotDockerManager {
     private buildEnv;
     private volumeMap;
     private ensureVolumeDirs;
+    private resolveDockerVolumes;
+    private resolveDockerHostPath;
+    private resolveDockerNetwork;
     private containerExists;
     private removeContainer;
     private docker;

package/out/bridge/docker.js

@@ -106,12 +106,14 @@ class MaibotDockerManager {
             throw new Error(`blocked: ${agreements.reason}`);
         }
         this.ensureVolumeDirs();
-        const args = this.createRunArgs(agreements.env);
+        const dockerNetwork = await this.resolveDockerNetwork();
+        const dockerVolumes = await this.resolveDockerVolumes();
+        const args = this.createRunArgs(agreements.env, dockerNetwork, dockerVolumes);
         this.pushLog(`creating Docker container: ${this.config.dockerContainerName}`);
         const result = await this.docker(args);
         (0, spawn_1.assertSuccessful)(result, 'docker create');
     }
-    createRunArgs(agreementEnv) {
+    createRunArgs(agreementEnv, dockerNetwork = this.config.dockerNetwork, dockerVolumes = this.volumeMap()) {
         const args = [
             'create',
             '--name',
@@ -119,8 +121,8 @@ class MaibotDockerManager {
             '--restart',
             'unless-stopped',
         ];
-        if (this.config.dockerNetwork) {
-            args.push('--network', this.config.dockerNetwork);
+        if (dockerNetwork) {
+            args.push('--network', dockerNetwork);
         }
         if (this.config.dockerPublishedWebuiPort > 0) {
             args.push('-p', `${this.config.dockerPublishedWebuiPort}:${this.config.webuiPort}`);
@@ -129,7 +131,7 @@ class MaibotDockerManager {
         for (const [key, value] of Object.entries(env)) {
             args.push('-e', `${key}=${value}`);
         }
-        for (const [source, target] of this.volumeMap()) {
+        for (const [source, target] of dockerVolumes) {
             args.push('-v', `${source}:${target}`);
         }
         args.push(this.config.dockerImageName);
@@ -167,8 +169,74 @@ class MaibotDockerManager {
             (0, fs_1.mkdirSync)(source, { recursive: true });
         }
     }
+    async resolveDockerVolumes() {
+        const volumes = [];
+        for (const [source, target] of this.volumeMap()) {
+            volumes.push([await this.resolveDockerHostPath(source), target]);
+        }
+        return volumes;
+    }
+    async resolveDockerHostPath(containerPath) {
+        const hostname = process.env.HOSTNAME;
+        if (!hostname)
+            return containerPath;
+        const result = await this.run(this.config.dockerCommand, [
+            'container',
+            'inspect',
+            hostname,
+            '--format',
+            '{{json .Mounts}}',
+        ], false);
+        if (result.code !== 0)
+            return containerPath;
+        try {
+            const mounts = JSON.parse(result.stdout);
+            const normalizedPath = (0, path_1.resolve)(containerPath);
+            const candidates = mounts
+                .filter((mount) => mount.Source && mount.Destination)
+                .map((mount) => ({
+                source: mount.Source,
+                destination: (0, path_1.resolve)(mount.Destination),
+            }))
+                .sort((a, b) => b.destination.length - a.destination.length);
+            for (const mount of candidates) {
+                const rest = (0, path_1.relative)(mount.destination, normalizedPath);
+                if (rest === '' || (rest && !rest.startsWith('..') && !(0, path_1.isAbsolute)(rest))) {
+                    return (0, path_1.join)(mount.source, rest);
+                }
+            }
+        }
+        catch (error) {
+            this.logger.debug(error);
+        }
+        return containerPath;
+    }
+    async resolveDockerNetwork() {
+        if (this.config.dockerNetwork)
+            return this.config.dockerNetwork;
+        const hostname = process.env.HOSTNAME;
+        if (!hostname)
+            return '';
+        const result = await this.run(this.config.dockerCommand, [
+            'container',
+            'inspect',
+            hostname,
+            '--format',
+            '{{range $name, $_ := .NetworkSettings.Networks}}{{println $name}}{{end}}',
+        ], false);
+        if (result.code !== 0)
+            return '';
+        const network = result.stdout
+            .split(/\r?\n/)
+            .map((line) => line.trim())
+            .find((line) => line && !['bridge', 'host', 'none'].includes(line));
+        if (!network)
+            return '';
+        this.pushLog(`using Docker network from Koishi container: ${network}`);
+        return network;
+    }
     async containerExists() {
-        const result = await this.run(this.config.dockerCommand, ['inspect', this.config.dockerContainerName], false);
+        const result = await this.run(this.config.dockerCommand, ['container', 'inspect', this.config.dockerContainerName], false);
         return result.code === 0;
     }
     async removeContainer(force = false) {

package/out/config.js

@@ -19,7 +19,7 @@ exports.Config = koishi_1.Schema.intersect([
         pythonCommand: koishi_1.Schema.string().default('python3').description('用于启动 mai.ko 的 Python 命令。'),
         entryScript: koishi_1.Schema.string().default('bot.py').description('相对于 mai.ko 根目录的启动脚本。'),
         autoStart: koishi_1.Schema.boolean().default(true).description('Koishi ready 后自动启动 mai.ko。'),
-        acceptMaibotAgreements: koishi_1.Schema.boolean().default(false).description('是否由插件注入 EULA/Privacy 确认哈希。默认关闭。'),
+        acceptMaibotAgreements: koishi_1.Schema.boolean().default(false).description('确认同意 MaiBot 的 EULA/Privacy。'),
     }).description('mai.ko 进程'),
     koishi_1.Schema.object({
         apiHost: koishi_1.Schema.string().default('maimai-ko').description('Koishi 连接 maim_message 新版 API Server 的地址。Docker 模式默认使用容器名。'),

package/out/console.js

@@ -5,7 +5,7 @@ const path_1 = require("path");
 function registerConsole(ctx, config) {
     if (!config.enableConsole)
         return;
-    ctx.inject(['console'], (ctx) => {
+    ctx.inject(['console', 'maimai'], (ctx) => {
         const options = { authority: config.commandAuthority };
         ctx.console.addListener('mai-ko/status', () => ctx.maimai.getStatus(), options);
         ctx.console.addListener('mai-ko/start', () => ctx.maimai.launch(), options);

package/out/service.js

@@ -503,7 +503,10 @@ class MaibotService extends koishi_1.Service {
         if (host === '::')
             host = '::1';
         const normalizedHost = host.includes(':') && !host.startsWith('[') ? `[${host}]` : host;
-        return `http://${normalizedHost}:${this.pluginConfig.webuiPort}`;
+        const port = this.pluginConfig.processMode === 'docker' && this.pluginConfig.dockerPublishedWebuiPort > 0
+            ? this.pluginConfig.dockerPublishedWebuiPort
+            : this.pluginConfig.webuiPort;
+        return `http://${normalizedHost}:${port}`;
     }
     async handleMaimMessage(message) {
         this.bridge.maimReceived += 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-mai-bridge",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "将 maibot 作为 docker 托管的消息回复后端运行，使用 mai.ko 桥接消息收发。",
   "author": "Jelly10086 <wow40469600@gmail.com>",
   "contributors": [

package/patches/maimai-koishi.patch

@@ -551,3 +551,48 @@ index 23af394..41860ae 100644
      @staticmethod
      def _first_non_empty_string(*values: Any) -> str:
          """返回第一个非空字符串表示。"""
+diff --git a/src/services/send_service.py b/src/services/send_service.py
+index 6e8aea1..f63933a 100644
+--- a/src/services/send_service.py
++++ b/src/services/send_service.py
+@@ -288,6 +288,31 @@ def _inherit_platform_io_route_metadata(target_stream: BotChatSession) -> Dict[s
+     return inherited_metadata
+ 
+ 
++def _get_target_stream_bot_account(target_stream: BotChatSession) -> str:
++    """获取目标会话对应的机器人账号。"""
++
++    bot_account = get_bot_account(target_stream.platform)
++    if bot_account:
++        return bot_account
++
++    context_message = target_stream.context.message if target_stream.context else None
++    if context_message is None:
++        return ""
++
++    additional_config = context_message.message_info.additional_config
++    if not isinstance(additional_config, dict):
++        return ""
++
++    for key in (*RouteKeyFactory.ACCOUNT_ID_KEYS, "koishi_self_id"):
++        value = additional_config.get(key)
++        if value is None:
++            continue
++        normalized_value = str(value).strip()
++        if normalized_value:
++            return normalized_value
++    return ""
++
++
+ def _build_binary_component_from_base64(component_type: str, raw_data: str) -> StandardMessageComponents:
+     """根据 Base64 数据构造二进制消息组件。
+ 
+@@ -538,7 +563,7 @@ def _build_outbound_session_message(
+         logger.error(f"[SendService] 未找到聊天流: {stream_id}")
+         return None
+ 
+-    bot_user_id = get_bot_account(target_stream.platform)
++    bot_user_id = _get_target_stream_bot_account(target_stream)
+     if not bot_user_id:
+         logger.error(f"[SendService] 平台 {target_stream.platform} 未配置机器人账号，无法发送消息")
+         return None

package/src/bridge/convert.ts

@@ -216,6 +216,7 @@ export async function sessionToMaimMessage(
       additional_config: {
         koishi_route_id: route.routeId,
         koishi_self_id: session.selfId,
+        platform_io_account_id: session.selfId,
         koishi_platform: session.platform,
         koishi_channel_id: session.channelId || '',
         koishi_guild_id: session.guildId,

package/src/bridge/docker.ts

@@ -1,5 +1,5 @@
 import { existsSync, mkdirSync } from 'fs'
-import { join } from 'path'
+import { isAbsolute, join, relative, resolve } from 'path'
 import { Logger } from 'koishi'
 import type { Config } from '../config'
 import type { DockerState, RuntimeStatus } from '../types'
@@ -8,6 +8,13 @@ import { assertSuccessful, runCommand, type CommandResult } from '../utils/spawn
 import { redactSecret } from '../utils/command'
 import { prepareAgreementEnv } from './agreements'
 
+interface DockerMount {
+  Source?: string
+  Destination?: string
+}
+
+type DockerVolume = readonly [string, string]
+
 export class MaibotDockerManager {
   private logger = new Logger('mai.ko/docker')
   private state: DockerState = 'idle'
@@ -110,13 +117,19 @@ export class MaibotDockerManager {
     }
 
     this.ensureVolumeDirs()
-    const args = this.createRunArgs(agreements.env)
+    const dockerNetwork = await this.resolveDockerNetwork()
+    const dockerVolumes = await this.resolveDockerVolumes()
+    const args = this.createRunArgs(agreements.env, dockerNetwork, dockerVolumes)
     this.pushLog(`creating Docker container: ${this.config.dockerContainerName}`)
     const result = await this.docker(args)
     assertSuccessful(result, 'docker create')
   }
 
-  private createRunArgs(agreementEnv: Record<string, string>) {
+  private createRunArgs(
+    agreementEnv: Record<string, string>,
+    dockerNetwork = this.config.dockerNetwork,
+    dockerVolumes: readonly DockerVolume[] = this.volumeMap(),
+  ) {
     const args = [
       'create',
       '--name',
@@ -125,8 +138,8 @@ export class MaibotDockerManager {
       'unless-stopped',
     ]
 
-    if (this.config.dockerNetwork) {
-      args.push('--network', this.config.dockerNetwork)
+    if (dockerNetwork) {
+      args.push('--network', dockerNetwork)
     }
 
     if (this.config.dockerPublishedWebuiPort > 0) {
@@ -138,7 +151,7 @@ export class MaibotDockerManager {
       args.push('-e', `${key}=${value}`)
     }
 
-    for (const [source, target] of this.volumeMap()) {
+    for (const [source, target] of dockerVolumes) {
       args.push('-v', `${source}:${target}`)
     }
 
@@ -181,8 +194,76 @@ export class MaibotDockerManager {
     }
   }
 
+  private async resolveDockerVolumes() {
+    const volumes: DockerVolume[] = []
+    for (const [source, target] of this.volumeMap()) {
+      volumes.push([await this.resolveDockerHostPath(source), target])
+    }
+    return volumes
+  }
+
+  private async resolveDockerHostPath(containerPath: string) {
+    const hostname = process.env.HOSTNAME
+    if (!hostname) return containerPath
+
+    const result = await this.run(this.config.dockerCommand, [
+      'container',
+      'inspect',
+      hostname,
+      '--format',
+      '{{json .Mounts}}',
+    ], false)
+    if (result.code !== 0) return containerPath
+
+    try {
+      const mounts = JSON.parse(result.stdout) as DockerMount[]
+      const normalizedPath = resolve(containerPath)
+      const candidates = mounts
+        .filter((mount) => mount.Source && mount.Destination)
+        .map((mount) => ({
+          source: mount.Source!,
+          destination: resolve(mount.Destination!),
+        }))
+        .sort((a, b) => b.destination.length - a.destination.length)
+
+      for (const mount of candidates) {
+        const rest = relative(mount.destination, normalizedPath)
+        if (rest === '' || (rest && !rest.startsWith('..') && !isAbsolute(rest))) {
+          return join(mount.source, rest)
+        }
+      }
+    } catch (error) {
+      this.logger.debug(error)
+    }
+
+    return containerPath
+  }
+
+  private async resolveDockerNetwork() {
+    if (this.config.dockerNetwork) return this.config.dockerNetwork
+    const hostname = process.env.HOSTNAME
+    if (!hostname) return ''
+
+    const result = await this.run(this.config.dockerCommand, [
+      'container',
+      'inspect',
+      hostname,
+      '--format',
+      '{{range $name, $_ := .NetworkSettings.Networks}}{{println $name}}{{end}}',
+    ], false)
+    if (result.code !== 0) return ''
+
+    const network = result.stdout
+      .split(/\r?\n/)
+      .map((line) => line.trim())
+      .find((line) => line && !['bridge', 'host', 'none'].includes(line))
+    if (!network) return ''
+    this.pushLog(`using Docker network from Koishi container: ${network}`)
+    return network
+  }
+
   private async containerExists() {
-    const result = await this.run(this.config.dockerCommand, ['inspect', this.config.dockerContainerName], false)
+    const result = await this.run(this.config.dockerCommand, ['container', 'inspect', this.config.dockerContainerName], false)
     return result.code === 0
   }
 

package/src/config.ts

@@ -68,7 +68,7 @@ export const Config: Schema<Config> = Schema.intersect([
     pythonCommand: Schema.string().default('python3').description('用于启动 mai.ko 的 Python 命令。'),
     entryScript: Schema.string().default('bot.py').description('相对于 mai.ko 根目录的启动脚本。'),
     autoStart: Schema.boolean().default(true).description('Koishi ready 后自动启动 mai.ko。'),
-    acceptMaibotAgreements: Schema.boolean().default(false).description('是否由插件注入 EULA/Privacy 确认哈希。默认关闭。'),
+    acceptMaibotAgreements: Schema.boolean().default(false).description('确认同意 MaiBot 的 EULA/Privacy。'),
   }).description('mai.ko 进程'),
   Schema.object({
     apiHost: Schema.string().default('maimai-ko').description('Koishi 连接 maim_message 新版 API Server 的地址。Docker 模式默认使用容器名。'),

package/src/console.ts

@@ -20,7 +20,7 @@ declare module '@koishijs/plugin-console' {
 
 export function registerConsole(ctx: Context, config: Config) {
   if (!config.enableConsole) return
-  ctx.inject(['console'], (ctx) => {
+  ctx.inject(['console', 'maimai'], (ctx) => {
     const options = { authority: config.commandAuthority }
     ctx.console.addListener('mai-ko/status', () => ctx.maimai.getStatus(), options)
     ctx.console.addListener('mai-ko/start', () => ctx.maimai.launch(), options)

package/src/service.ts

@@ -511,7 +511,10 @@ export class MaibotService extends Service {
     if (host === '0.0.0.0') host = '127.0.0.1'
     if (host === '::') host = '::1'
     const normalizedHost = host.includes(':') && !host.startsWith('[') ? `[${host}]` : host
-    return `http://${normalizedHost}:${this.pluginConfig.webuiPort}`
+    const port = this.pluginConfig.processMode === 'docker' && this.pluginConfig.dockerPublishedWebuiPort > 0
+      ? this.pluginConfig.dockerPublishedWebuiPort
+      : this.pluginConfig.webuiPort
+    return `http://${normalizedHost}:${port}`
   }
 
   private async handleMaimMessage(message: MaimApiMessage) {