@zhin.js/adapter-line 4.0.2 → 4.0.3

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @zhin.js/adapter-line
 
+## 4.0.3
+
+### Patch Changes
+
+- Updated dependencies [afc0e66]
+- Updated dependencies [2e41ad5]
+- Updated dependencies [9f57124]
+  - @zhin.js/core@1.5.2
+  - @zhin.js/adapter@1.1.5
+  - @zhin.js/im-contract@1.0.1
+  - @zhin.js/plugin-runtime@1.1.3
+  - @zhin.js/command@1.0.7
+  - @zhin.js/host-http@1.0.6
+  - @zhin.js/agent@1.1.3
+  - zhin.js@6.0.2
+
 ## 4.0.2
 
 ### Patch Changes

package/README.md

@@ -24,8 +24,8 @@ pnpm add @zhin.js/adapter-line
 - `@zhin.js/plugin-runtime` — `plugin.ts`（`definePlugin`）
 - 配置经插件 `schema.json` 落到 `plugins.<instanceKey>`
 
-入站：`gateway.receive({ adapter, target: channelId, content: text, sender, metadata })`  
-出站：`send({ target, payload })` → Reply API（缓存 replyToken）或 Push API
+入站：`gateway.receive({ conversation, message: { conversation, id }, content: text, sender, metadata })`  
+出站：`send({ conversation, payload })` → Reply API（缓存 replyToken）或 Push API
 
 ## 前置条件
 

package/lib/endpoint.d.ts

@@ -1,7 +1,7 @@
 /**
  * LineEndpoint — lifecycle, outbound, admit, OpenAPI helpers for agent tools.
  */
-import type { EndpointInstance, EndpointManagement } from '@zhin.js/adapter';
+import type { EndpointInstance, EndpointManagement, EndpointSendRequest } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import type { HttpHost } from '@zhin.js/host-http';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
@@ -39,10 +39,7 @@ export declare class LineEndpoint implements EndpointInstance {
     open(): void;
     close(): void;
     stop(): Promise<void>;
-    send({ target, payload }: {
-        readonly target: string;
-        readonly payload: unknown;
-    }): Promise<string>;
+    send({ conversation, payload }: EndpointSendRequest): Promise<string>;
     /** Test / internal: admit a parsed event when open (non-webhook path). */
     admit(event: LineEvent): void;
     /**

package/lib/endpoint.js

@@ -1,6 +1,6 @@
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import { registerLineAgentEndpoint } from './line-agent-deps.js';
-import { formatInboundContent, formatOutboundMessages, generateMessageId, isMessageEvent, isValidLineRecipientId, resolveChannel, } from './protocol.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。 */
@@ -68,11 +68,13 @@ export class LineEndpoint {
         this.#started = false;
         logger.debug(formatCompact({ op: 'disconnect', endpoint: this.#options.config.name }));
     }
-    async send({ target, payload }) {
+    async send({ conversation, payload }) {
         const messages = formatOutboundMessages(payload);
         if (messages.length === 0) {
             throw new Error('No valid LINE messages to send');
         }
+        // LINE recipient id 前缀（U/G/R）自带场景信息，原生 id 即投递地址。
+        const target = conversation.id;
         const cached = this.#replyTokenCache.get(target);
         if (cached) {
             this.#replyTokenCache.delete(target);
@@ -101,16 +103,15 @@ export class LineEndpoint {
     admit(event) {
         if (!this.#open)
             return;
-        const { channelId } = resolveChannel(event.source);
+        const conversation = lineInboundConversation(String(this.#options.id), event.source);
         if ('replyToken' in event && typeof event.replyToken === 'string') {
-            this.#replyTokenCache.set(channelId, { token: event.replyToken, timestamp: Date.now() });
+            this.#replyTokenCache.set(conversation.id, { token: event.replyToken, timestamp: Date.now() });
         }
         void this.#options.gateway.receive({
-            adapter: this.#options.id,
-            target: channelId,
+            conversation,
+            message: { conversation, id: generateMessageId(event) },
             content: formatInboundContent(event),
-            sender: event.source.userId || channelId,
-            id: generateMessageId(event),
+            sender: event.source.userId || conversation.id,
             metadata: Object.freeze({
                 eventType: event.type,
                 sourceType: event.source.type,
@@ -121,7 +122,7 @@ export class LineEndpoint {
         }).catch((err) => {
             logger.warn(formatCompact({
                 op: 'line_gateway_receive_failed',
-                target: channelId,
+                target: `${conversation.kind}:${conversation.id}`,
                 error: err instanceof Error ? err.message : String(err),
             }));
         });

package/lib/protocol.d.ts

@@ -3,6 +3,7 @@
  * Canonicalization is owned by gateway/core before endpoint.send.
  */
 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;
@@ -136,6 +137,11 @@ export declare function normalizeWebhookPath(path: string): string;
 export declare function isMessageEvent(event: LineEvent): event is LineMessageEvent;
 export declare function isPostbackEvent(event: LineEvent): event is LinePostbackEvent;
 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 generateMessageId(event: LineEvent): string;
 /** Build inbound text for MessageGateway.receive. */
 export declare function formatInboundContent(event: LineEvent): string;

package/lib/protocol.js

@@ -54,6 +54,18 @@ export function resolveChannel(source) {
             return { channelType: 'private', channelId: '' };
     }
 }
+/**
+ * 入站归一化 → ConversationRef：LINE user → private、group → group、room → channel。
+ * LINE 没有 guild/频道容器概念，无 parent；recipient id 前缀（U/G/R）自带场景信息。
+ */
+export function lineInboundConversation(endpointId, source) {
+    const channel = resolveChannel(source);
+    return {
+        endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+        kind: channel.channelType,
+        id: channel.channelId,
+    };
+}
 export function generateMessageId(event) {
     if (isMessageEvent(event) && event.message?.id)
         return event.message.id;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-line",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "Zhin.js LINE Messaging API adapter for Plugin Runtime (HTTP webhook)",
   "type": "module",
   "main": "./lib/index.js",
@@ -32,21 +32,22 @@
     "directory": "plugins/adapters/line"
   },
   "dependencies": {
-    "@zhin.js/adapter": "1.1.4",
-    "@zhin.js/command": "1.0.6",
-    "@zhin.js/core": "1.5.1",
-    "@zhin.js/host-http": "1.0.5",
+    "@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.2"
+    "@zhin.js/plugin-runtime": "1.1.3"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "1.1.4",
-    "@zhin.js/agent": "1.1.2",
-    "@zhin.js/core": "1.5.1",
-    "@zhin.js/host-http": "1.0.5",
-    "@zhin.js/plugin-runtime": "1.1.2",
-    "zhin.js": "6.0.1"
+    "@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"
   },
   "peerDependenciesMeta": {
     "zhin.js": {
@@ -64,7 +65,7 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.2"
+    "@zhin.js/agent": "1.1.3"
   },
   "files": [
     "adapters",

package/src/endpoint.ts

@@ -1,7 +1,7 @@
 /**
  * LineEndpoint — lifecycle, outbound, admit, OpenAPI helpers for agent tools.
  */
-import type { EndpointInstance, EndpointManagement } from '@zhin.js/adapter';
+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';
@@ -13,7 +13,7 @@ import {
   generateMessageId,
   isMessageEvent,
   isValidLineRecipientId,
-  resolveChannel,
+  lineInboundConversation,
   type LineApiResponse,
   type LineEvent,
   type ResolvedLineConfig,
@@ -117,11 +117,13 @@ export class LineEndpoint implements EndpointInstance {
     logger.debug(formatCompact({ op: 'disconnect', endpoint: this.#options.config.name }));
   }
 
-  async send({ target, payload }: { readonly target: string; readonly payload: unknown }): Promise<string> {
+  async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
     const messages = formatOutboundMessages(payload);
     if (messages.length === 0) {
       throw new Error('No valid LINE messages to send');
     }
+    // LINE recipient id 前缀（U/G/R）自带场景信息，原生 id 即投递地址。
+    const target = conversation.id;
 
     const cached = this.#replyTokenCache.get(target);
     if (cached) {
@@ -152,16 +154,15 @@ export class LineEndpoint implements EndpointInstance {
   /** Test / internal: admit a parsed event when open (non-webhook path). */
   admit(event: LineEvent): void {
     if (!this.#open) return;
-    const { channelId } = resolveChannel(event.source);
+    const conversation = lineInboundConversation(String(this.#options.id), event.source);
     if ('replyToken' in event && typeof event.replyToken === 'string') {
-      this.#replyTokenCache.set(channelId, { token: event.replyToken, timestamp: Date.now() });
+      this.#replyTokenCache.set(conversation.id, { token: event.replyToken, timestamp: Date.now() });
     }
     void this.#options.gateway.receive({
-      adapter: this.#options.id,
-      target: channelId,
+      conversation,
+      message: { conversation, id: generateMessageId(event) },
       content: formatInboundContent(event),
-      sender: event.source.userId || channelId,
-      id: generateMessageId(event),
+      sender: event.source.userId || conversation.id,
       metadata: Object.freeze({
         eventType: event.type,
         sourceType: event.source.type,
@@ -172,7 +173,7 @@ export class LineEndpoint implements EndpointInstance {
     }).catch((err) => {
       logger.warn(formatCompact({
         op: 'line_gateway_receive_failed',
-        target: channelId,
+        target: `${conversation.kind}:${conversation.id}`,
         error: err instanceof Error ? err.message : String(err),
       }));
     });

package/src/protocol.ts

@@ -6,6 +6,7 @@
 import { createHmac, timingSafeEqual } from 'node:crypto';
 import type { IncomingMessage } from 'node:http';
 import { isMediaRef } from '@zhin.js/core';
+import type { ConversationRef } from '@zhin.js/im-contract';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 
 const logger = getLogger('line');
@@ -217,6 +218,19 @@ 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 {
+  const channel = resolveChannel(source);
+  return {
+    endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+    kind: channel.channelType,
+    id: channel.channelId,
+  };
+}
+
 export function generateMessageId(event: LineEvent): string {
   if (isMessageEvent(event) && event.message?.id) return event.message.id;
   return `${event.type}-${event.timestamp}`;