@zhin.js/adapter-line 4.0.3 → 4.0.6

package/CHANGELOG.md

@@ -1,5 +1,86 @@
 # @zhin.js/adapter-line
 
+## 4.0.6
+
+### Patch Changes
+
+- Updated dependencies [2d0a622]
+  - @zhin.js/command@1.0.10
+  - @zhin.js/adapter@1.1.7
+  - @zhin.js/core@1.5.5
+  - @zhin.js/agent@1.1.6
+  - zhin.js@6.0.5
+
+## 4.0.5
+
+### Patch Changes
+
+- Updated dependencies [6f9c366]
+- Updated dependencies [373a56b]
+- Updated dependencies [0de46a8]
+- Updated dependencies [c106ecc]
+- Updated dependencies [ca92e03]
+- Updated dependencies [b0f37ae]
+- Updated dependencies [ba08a2f]
+- Updated dependencies [b08f7fe]
+- Updated dependencies [daffd4c]
+- Updated dependencies [36c7400]
+- Updated dependencies [a9fa72e]
+- Updated dependencies [c8de3ef]
+- Updated dependencies [60f0fc8]
+- Updated dependencies [574c990]
+- Updated dependencies [d096f16]
+- Updated dependencies [3f29623]
+- Updated dependencies [2916852]
+- Updated dependencies [d047869]
+- Updated dependencies [162fa34]
+- Updated dependencies [e62561e]
+- Updated dependencies [3eeeb46]
+- Updated dependencies [85d0f82]
+- Updated dependencies [61bfc1c]
+- Updated dependencies [04bad47]
+- Updated dependencies [e40b048]
+- Updated dependencies [5a5b1bb]
+- Updated dependencies [f1708c3]
+- Updated dependencies [d254a81]
+- Updated dependencies [7123c47]
+- Updated dependencies [05befc1]
+- Updated dependencies [0663b6a]
+- Updated dependencies [f28f9b3]
+- Updated dependencies [9f340f7]
+- Updated dependencies [e53444f]
+- Updated dependencies [5eedd26]
+- Updated dependencies [92b0dd7]
+- Updated dependencies [f919b6f]
+- Updated dependencies [098e411]
+- Updated dependencies [e1b7c01]
+- Updated dependencies [9b94f87]
+- Updated dependencies [a7df753]
+  - @zhin.js/agent@1.1.5
+  - @zhin.js/host-http@1.0.8
+  - @zhin.js/im-contract@1.0.3
+  - @zhin.js/adapter@1.1.7
+  - @zhin.js/plugin-runtime@1.1.5
+  - @zhin.js/command@1.0.9
+  - @zhin.js/core@1.5.4
+  - zhin.js@6.0.4
+
+## 4.0.4
+
+### Patch Changes
+
+- f8c7a54: fix: im
+- Updated dependencies [f8c7a54]
+  - @zhin.js/logger@1.0.76
+  - @zhin.js/host-http@1.0.7
+  - @zhin.js/adapter@1.1.6
+  - @zhin.js/agent@1.1.4
+  - @zhin.js/command@1.0.8
+  - @zhin.js/core@1.5.3
+  - @zhin.js/im-contract@1.0.2
+  - @zhin.js/plugin-runtime@1.1.4
+  - zhin.js@6.0.3
+
 ## 4.0.3
 
 ### Patch Changes

package/adapters/line.js

@@ -19,8 +19,8 @@ export default defineAdapter({
     create(context) {
         const config = resolveLineConfig(context.config);
         // 注册到插件运行时状态（line.endpoint list 的"运行中"数据源）
-        context.use(lineRuntimeStateToken).endpoints.set(config.name, {
-            name: config.name,
+        context.use(lineRuntimeStateToken).endpoints.set(config.id, {
+            id: config.id,
             mode: 'webhook',
         });
         return new LineEndpoint({

package/adapters/line.ts

@@ -24,8 +24,8 @@ export default defineAdapter<LineAdapterConfig>({
   create(context) {
     const config = resolveLineConfig(context.config);
     // 注册到插件运行时状态（line.endpoint list 的"运行中"数据源）
-    context.use(lineRuntimeStateToken).endpoints.set(config.name, {
-      name: config.name,
+    context.use(lineRuntimeStateToken).endpoints.set(config.id, {
+      id: config.id,
       mode: 'webhook',
     });
     return new LineEndpoint({

package/lib/endpoint.js

@@ -1,13 +1,13 @@
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { registerLineAgentEndpoint } from './line-agent-deps.js';
 import { formatInboundContent, formatOutboundMessages, generateMessageId, isMessageEvent, isValidLineRecipientId, lineInboundConversation, } from './protocol.js';
 import { registerLineWebhookRoutes } from './webhook.js';
-const logger = getLogger('line');
 /** LINE replyToken 有效期短，过期后 reply 必 400；缓存带时间戳，超时弃用改走 push。 */
 const REPLY_TOKEN_TTL_MS = 60_000;
 /** 出站 HTTP 调用统一 30s 超时。 */
 const OUTBOUND_TIMEOUT_MS = 30_000;
 export class LineEndpoint {
+    #logger;
     #options;
     #fetch;
     #routeReleases = [];
@@ -17,6 +17,7 @@ export class LineEndpoint {
     #unregisterAgent;
     management = createLineEndpointManagement(this);
     constructor(options) {
+        this.#logger = getAdapterLogger('line', options.config.id);
         this.#options = options;
         this.#fetch = options.fetch ?? globalThis.fetch;
     }
@@ -38,17 +39,17 @@ export class LineEndpoint {
             return;
         this.#started = true;
         try {
-            this.#unregisterAgent = registerLineAgentEndpoint(this.#options.config.name, this);
+            this.#unregisterAgent = registerLineAgentEndpoint(this.#options.config.id, this);
             this.#routeReleases.push(...registerLineWebhookRoutes(this.#options.http, this));
-            logger.debug(formatCompact({
-                endpoint: this.#options.config.name,
+            this.#logger.debug(formatCompact({
+                endpoint: this.#options.config.id,
                 op: 'webhook',
                 path: this.#options.config.webhookPath,
             }));
         }
         catch (error) {
             await this.stop();
-            logger.error('Failed to connect LINE endpoint:', error);
+            this.#logger.error('Failed to connect LINE endpoint:', error);
             throw error;
         }
     }
@@ -66,7 +67,7 @@ export class LineEndpoint {
         this.#unregisterAgent?.();
         this.#unregisterAgent = undefined;
         this.#started = false;
-        logger.debug(formatCompact({ op: 'disconnect', endpoint: this.#options.config.name }));
+        this.#logger.debug(formatCompact({ op: 'disconnect' }));
     }
     async send({ conversation, payload }) {
         const messages = formatOutboundMessages(payload);
@@ -86,9 +87,9 @@ export class LineEndpoint {
                     // replyToken 过期/失效时 LINE 返回 400，回退 push 保证消息不丢
                     if (error.status !== 400)
                         throw error;
-                    logger.warn(formatCompact({
+                    this.#logger.warn(formatCompact({
                         op: 'line_reply_fallback_push',
-                        endpoint: this.#options.config.name,
+                        endpoint: this.#options.config.id,
                         target,
                     }));
                 }
@@ -111,16 +112,16 @@ export class LineEndpoint {
             conversation,
             message: { conversation, id: generateMessageId(event) },
             content: formatInboundContent(event),
-            sender: event.source.userId || conversation.id,
+            sender: { id: event.source.userId || conversation.id },
+            endpointId: this.#options.config.id,
             metadata: Object.freeze({
                 eventType: event.type,
                 sourceType: event.source.type,
-                endpoint: this.#options.config.name,
                 timestamp: event.timestamp,
                 ...(isMessageEvent(event) ? { messageType: event.message.type } : {}),
             }),
         }).catch((err) => {
-            logger.warn(formatCompact({
+            this.#logger.warn(formatCompact({
                 op: 'line_gateway_receive_failed',
                 target: `${conversation.kind}:${conversation.id}`,
                 error: err instanceof Error ? err.message : String(err),

package/lib/line-agent-deps.d.ts

@@ -14,7 +14,7 @@ export interface LineAgentDeps {
         apiBaseUrl: string;
     };
 }
-export declare function registerLineAgentEndpoint(endpointId: string, endpoint: LineAgentEndpoint): () => void;
+export declare function registerLineAgentEndpoint(endpointKey: string, endpoint: LineAgentEndpoint): () => void;
 /** Optional override used by tests / transitional callers. Pass `null` to clear. */
 export declare function setLineAgentDeps(deps: LineAgentDeps | null): void;
 export declare function getLineAgentDeps(): LineAgentDeps;

package/lib/line-agent-deps.js

@@ -4,11 +4,11 @@
  */
 const endpoints = new Map();
 let override = null;
-export function registerLineAgentEndpoint(endpointId, endpoint) {
-    endpoints.set(endpointId, endpoint);
+export function registerLineAgentEndpoint(endpointKey, endpoint) {
+    endpoints.set(endpointKey, endpoint);
     return () => {
-        if (endpoints.get(endpointId) === endpoint) {
-            endpoints.delete(endpointId);
+        if (endpoints.get(endpointKey) === endpoint) {
+            endpoints.delete(endpointKey);
         }
     };
 }

package/lib/protocol.d.ts

@@ -6,7 +6,7 @@ import type { IncomingMessage } from 'node:http';
 import type { ConversationRef } from '@zhin.js/im-contract';
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface LineAdapterConfig {
-    readonly name?: string;
+    readonly id?: string;
     readonly channelSecret?: string;
     readonly channelAccessToken?: string;
     readonly webhookPath?: string;
@@ -18,7 +18,7 @@ export interface LineAdapterConfig {
 }
 export interface ResolvedLineConfig {
     readonly context: 'line';
-    readonly name: string;
+    readonly id: string;
     readonly channelSecret: string;
     readonly channelAccessToken: string;
     readonly webhookPath: string;
@@ -141,7 +141,7 @@ export declare function resolveChannel(source: LineSource): LineChannel;
  * 入站归一化 → ConversationRef：LINE user → private、group → group、room → channel。
  * LINE 没有 guild/频道容器概念，无 parent；recipient id 前缀（U/G/R）自带场景信息。
  */
-export declare function lineInboundConversation(endpointId: string, source: LineSource): ConversationRef;
+export declare function lineInboundConversation(endpointKey: string, source: LineSource): ConversationRef;
 export declare function generateMessageId(event: LineEvent): string;
 /** Build inbound text for MessageGateway.receive. */
 export declare function formatInboundContent(event: LineEvent): string;

package/lib/protocol.js

@@ -17,15 +17,15 @@ export function resolveLineConfig(config = {}) {
     if (!channelSecret || !channelAccessToken) {
         throw new TypeError('LINE adapter requires channelSecret + channelAccessToken (plugins.<key> or endpoints with context: line)');
     }
-    const name = (typeof config.name === 'string' && config.name)
-        || (typeof entry?.name === 'string' && entry.name)
+    const id = (typeof config.id === 'string' && config.id)
+        || (typeof entry?.id === 'string' && entry.id)
         || process.env.LINE_BOT_NAME
         || 'line-bot';
     const webhookPath = normalizeWebhookPath(config.webhookPath ?? entry?.webhookPath ?? '/line/webhook');
     const apiBaseUrl = (config.apiBaseUrl ?? entry?.apiBaseUrl ?? 'https://api.line.me').replace(/\/$/, '');
     return {
         context: 'line',
-        name,
+        id,
         channelSecret,
         channelAccessToken,
         webhookPath,
@@ -58,10 +58,10 @@ export function resolveChannel(source) {
  * 入站归一化 → ConversationRef：LINE user → private、group → group、room → channel。
  * LINE 没有 guild/频道容器概念，无 parent；recipient id 前缀（U/G/R）自带场景信息。
  */
-export function lineInboundConversation(endpointId, source) {
+export function lineInboundConversation(endpointKey, source) {
     const channel = resolveChannel(source);
     return {
-        endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+        endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
         kind: channel.channelType,
         id: channel.channelId,
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-line",
-  "version": "4.0.3",
+  "version": "4.0.6",
   "description": "Zhin.js LINE Messaging API adapter for Plugin Runtime (HTTP webhook)",
   "type": "module",
   "main": "./lib/index.js",
@@ -32,22 +32,22 @@
     "directory": "plugins/adapters/line"
   },
   "dependencies": {
-    "@zhin.js/adapter": "1.1.5",
-    "@zhin.js/command": "1.0.7",
-    "@zhin.js/core": "1.5.2",
-    "@zhin.js/host-http": "1.0.6",
-    "@zhin.js/im-contract": "1.0.1",
-    "@zhin.js/logger": "1.0.75",
-    "@zhin.js/plugin-runtime": "1.1.3"
+    "@zhin.js/adapter": "1.1.7",
+    "@zhin.js/command": "1.0.10",
+    "@zhin.js/core": "1.5.5",
+    "@zhin.js/host-http": "1.0.8",
+    "@zhin.js/im-contract": "1.0.3",
+    "@zhin.js/logger": "1.0.76",
+    "@zhin.js/plugin-runtime": "1.1.5"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "1.1.5",
-    "@zhin.js/agent": "1.1.3",
-    "@zhin.js/core": "1.5.2",
-    "@zhin.js/host-http": "1.0.6",
-    "@zhin.js/plugin-runtime": "1.1.3",
-    "zhin.js": "6.0.2"
+    "@zhin.js/adapter": "1.1.7",
+    "@zhin.js/agent": "1.1.6",
+    "@zhin.js/core": "1.5.5",
+    "@zhin.js/host-http": "1.0.8",
+    "@zhin.js/plugin-runtime": "1.1.5",
+    "zhin.js": "6.0.5"
   },
   "peerDependenciesMeta": {
     "zhin.js": {
@@ -65,7 +65,7 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.3"
+    "@zhin.js/agent": "1.1.6"
   },
   "files": [
     "adapters",

package/schema.json

@@ -11,16 +11,48 @@
       "type": "string",
       "default": "https://api.line.me"
     },
+    "master": {
+      "type": [
+        "string",
+        "number"
+      ],
+      "description": "框架 master（LINE user id；AI/工具权限、endpoint 管理）。endpoints[i].master 可逐项覆盖"
+    },
+    "trusted": {
+      "type": "array",
+      "items": {
+        "type": [
+          "string",
+          "number"
+        ],
+        "description": "Trusted LINE user id"
+      },
+      "description": "框架 trusted 用户列表（弱于 master）。endpoints[i].trusted 可逐项追加"
+    },
     "endpoints": {
       "type": "array",
-      "description": "多账号：一个插件实例挂多个 endpoint。每项与顶层字段同构（name 必填，其余覆盖顶层）",
+      "description": "多账号：一个插件实例挂多个 endpoint。每项与顶层字段同构（id 必填，其余覆盖顶层）",
       "items": {
         "type": "object",
         "additionalProperties": true,
         "properties": {
-          "name": {
-            "type": "string",
-            "description": "LINE bot name"
+          "master": {
+            "type": [
+              "string",
+              "number"
+            ],
+            "description": "本 endpoint 的框架 master（LINE user id）；覆盖顶层 master"
+          },
+          "trusted": {
+            "type": "array",
+            "items": {
+              "type": [
+                "string",
+                "number"
+              ],
+              "description": "Trusted LINE user id"
+            },
+            "description": "本 endpoint 的 trusted 列表"
           },
           "channelSecret": {
             "type": "string",
@@ -29,10 +61,14 @@
           "channelAccessToken": {
             "type": "string",
             "description": "LINE channel access token"
+          },
+          "id": {
+            "type": "string",
+            "description": "LINE bot name"
           }
         },
         "required": [
-          "name",
+          "id",
           "channelSecret",
           "channelAccessToken"
         ]

package/src/endpoint.ts

@@ -4,7 +4,7 @@
 import type { EndpointInstance, EndpointManagement, EndpointSendRequest } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import type { HttpHost, HttpRouteRegistration } from '@zhin.js/host-http';
-import { formatCompact, getLogger } from '@zhin.js/logger';
+import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
 import { registerLineAgentEndpoint } from './line-agent-deps.js';
 import {
@@ -20,8 +20,6 @@ import {
 } from './protocol.js';
 import { registerLineWebhookRoutes } from './webhook.js';
 
-const logger = getLogger('line');
-
 /** LINE replyToken 有效期短，过期后 reply 必 400；缓存带时间戳，超时弃用改走 push。 */
 const REPLY_TOKEN_TTL_MS = 60_000;
 /** 出站 HTTP 调用统一 30s 超时。 */
@@ -51,6 +49,8 @@ export interface LineEndpointOptions {
 }
 
 export class LineEndpoint implements EndpointInstance {
+  readonly #logger!: ReturnType<typeof getAdapterLogger>;
+
   readonly #options: LineEndpointOptions;
   readonly #fetch: LineFetch;
   #routeReleases: HttpRouteRegistration[] = [];
@@ -61,6 +61,7 @@ export class LineEndpoint implements EndpointInstance {
   readonly management: EndpointManagement = createLineEndpointManagement(this);
 
   constructor(options: LineEndpointOptions) {
+    this.#logger = getAdapterLogger('line', options.config.id);
     this.#options = options;
     this.#fetch = options.fetch ?? globalThis.fetch;
   }
@@ -85,16 +86,16 @@ export class LineEndpoint implements EndpointInstance {
     if (this.#started) return;
     this.#started = true;
     try {
-      this.#unregisterAgent = registerLineAgentEndpoint(this.#options.config.name, this);
+      this.#unregisterAgent = registerLineAgentEndpoint(this.#options.config.id, this);
       this.#routeReleases.push(...registerLineWebhookRoutes(this.#options.http, this));
-      logger.debug(formatCompact({
-        endpoint: this.#options.config.name,
+      this.#logger.debug(formatCompact({
+        endpoint: this.#options.config.id,
         op: 'webhook',
         path: this.#options.config.webhookPath,
       }));
     } catch (error) {
       await this.stop();
-      logger.error('Failed to connect LINE endpoint:', error);
+      this.#logger.error('Failed to connect LINE endpoint:', error);
       throw error;
     }
   }
@@ -114,7 +115,7 @@ export class LineEndpoint implements EndpointInstance {
     this.#unregisterAgent?.();
     this.#unregisterAgent = undefined;
     this.#started = false;
-    logger.debug(formatCompact({ op: 'disconnect', endpoint: this.#options.config.name }));
+    this.#logger.debug(formatCompact({ op: 'disconnect' }));
   }
 
   async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
@@ -134,9 +135,9 @@ export class LineEndpoint implements EndpointInstance {
         } catch (error) {
           // replyToken 过期/失效时 LINE 返回 400，回退 push 保证消息不丢
           if ((error as { status?: number }).status !== 400) throw error;
-          logger.warn(formatCompact({
+          this.#logger.warn(formatCompact({
             op: 'line_reply_fallback_push',
-            endpoint: this.#options.config.name,
+            endpoint: this.#options.config.id,
             target,
           }));
         }
@@ -162,16 +163,16 @@ export class LineEndpoint implements EndpointInstance {
       conversation,
       message: { conversation, id: generateMessageId(event) },
       content: formatInboundContent(event),
-      sender: event.source.userId || conversation.id,
+      sender: { id: event.source.userId || conversation.id },
+      endpointId: this.#options.config.id,
       metadata: Object.freeze({
         eventType: event.type,
         sourceType: event.source.type,
-        endpoint: this.#options.config.name,
         timestamp: event.timestamp,
         ...(isMessageEvent(event) ? { messageType: event.message.type } : {}),
       }),
     }).catch((err) => {
-      logger.warn(formatCompact({
+      this.#logger.warn(formatCompact({
         op: 'line_gateway_receive_failed',
         target: `${conversation.kind}:${conversation.id}`,
         error: err instanceof Error ? err.message : String(err),

package/src/line-agent-deps.ts

@@ -15,13 +15,13 @@ const endpoints = new Map<string, LineAgentEndpoint>();
 let override: LineAgentDeps | null = null;
 
 export function registerLineAgentEndpoint(
-  endpointId: string,
+  endpointKey: string,
   endpoint: LineAgentEndpoint,
 ): () => void {
-  endpoints.set(endpointId, endpoint);
+  endpoints.set(endpointKey, endpoint);
   return () => {
-    if (endpoints.get(endpointId) === endpoint) {
-      endpoints.delete(endpointId);
+    if (endpoints.get(endpointKey) === endpoint) {
+      endpoints.delete(endpointKey);
     }
   };
 }

package/src/protocol.ts

@@ -13,7 +13,7 @@ const logger = getLogger('line');
 
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface LineAdapterConfig {
-  readonly name?: string;
+  readonly id?: string;
   readonly channelSecret?: string;
   readonly channelAccessToken?: string;
   readonly webhookPath?: string;
@@ -26,7 +26,7 @@ export interface LineAdapterConfig {
 
 export interface ResolvedLineConfig {
   readonly context: 'line';
-  readonly name: string;
+  readonly id: string;
   readonly channelSecret: string;
   readonly channelAccessToken: string;
   readonly webhookPath: string;
@@ -174,8 +174,8 @@ export function resolveLineConfig(config: LineAdapterConfig = {}): ResolvedLineC
       'LINE adapter requires channelSecret + channelAccessToken (plugins.<key> or endpoints with context: line)',
     );
   }
-  const name = (typeof config.name === 'string' && config.name)
-    || (typeof entry?.name === 'string' && entry.name)
+  const id = (typeof config.id === 'string' && config.id)
+    || (typeof entry?.id === 'string' && entry.id)
     || process.env.LINE_BOT_NAME
     || 'line-bot';
   const webhookPath = normalizeWebhookPath(
@@ -184,7 +184,7 @@ export function resolveLineConfig(config: LineAdapterConfig = {}): ResolvedLineC
   const apiBaseUrl = (config.apiBaseUrl ?? entry?.apiBaseUrl ?? 'https://api.line.me').replace(/\/$/, '');
   return {
     context: 'line',
-    name,
+    id,
     channelSecret,
     channelAccessToken,
     webhookPath,
@@ -222,10 +222,10 @@ export function resolveChannel(source: LineSource): LineChannel {
  * 入站归一化 → ConversationRef：LINE user → private、group → group、room → channel。
  * LINE 没有 guild/频道容器概念，无 parent；recipient id 前缀（U/G/R）自带场景信息。
  */
-export function lineInboundConversation(endpointId: string, source: LineSource): ConversationRef {
+export function lineInboundConversation(endpointKey: string, source: LineSource): ConversationRef {
   const channel = resolveChannel(source);
   return {
-    endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+    endpoint: { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey },
     kind: channel.channelType,
     id: channel.channelId,
   };