@zhin.js/adapter-dingtalk 6.0.2 → 6.0.3

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @zhin.js/adapter-dingtalk
 
+## 6.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
+
 ## 6.0.2
 
 ### Patch Changes

package/README.md

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

package/lib/endpoint.d.ts

@@ -1,7 +1,7 @@
 /**
  * DingTalkEndpoint — lifecycle, outbound, admit, OpenAPI helpers for agent tools.
  */
-import type { EndpointInstance } from '@zhin.js/adapter';
+import type { EndpointInstance, 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';
@@ -38,10 +38,7 @@ export declare class DingTalkEndpoint 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: DingTalkEvent | DingTalkMessage): void;
     getUserInfo(userId: string): Promise<unknown>;

package/lib/endpoint.js

@@ -1,7 +1,7 @@
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import { registerDingtalkAgentEndpoint } from './dingtalk-agent-deps.js';
 import { normalizeDingtalkSenderForPermit } from './platform-permit.js';
-import { formatInboundContent, formatOutboundBody, generateMessageId, isDingtalkBotMentioned, resolveChatType, resolveSender, resolveTarget, } from './protocol.js';
+import { dingtalkInboundConversation, formatInboundContent, formatOutboundBody, generateMessageId, isDingtalkBotMentioned, resolveChatType, resolveSender, } from './protocol.js';
 import { registerDingTalkWebhookRoutes } from './webhook.js';
 const logger = getLogger('dingtalk');
 /**
@@ -66,9 +66,9 @@ export class DingTalkEndpoint {
         this.#started = false;
         logger.debug(formatCompact({ op: 'disconnect', endpoint: this.#options.config.name }));
     }
-    async send({ target, payload }) {
+    async send({ conversation, payload }) {
         const content = formatOutboundBody(payload);
-        const sessionWebhook = this.#sessionWebhooks.get(target);
+        const sessionWebhook = this.#sessionWebhooks.get(conversation.id);
         if (sessionWebhook) {
             const response = await this.#fetch(sessionWebhook, {
                 method: 'POST',
@@ -83,7 +83,7 @@ export class DingTalkEndpoint {
                 op: 'send',
                 endpoint: this.#options.config.name,
                 via: 'sessionWebhook',
-                to: target,
+                to: conversation.id,
             }));
             return data.msgId || `${Date.now()}`;
         }
@@ -100,7 +100,7 @@ export class DingTalkEndpoint {
         if (data.errcode !== 0) {
             throw new Error(`Failed to send message: ${data.errmsg}`);
         }
-        logger.debug(formatCompact({ op: 'send', endpoint: this.#options.config.name, to: target }));
+        logger.debug(formatCompact({ op: 'send', endpoint: this.#options.config.name, to: conversation.id }));
         return data.msgId || `${Date.now()}`;
     }
     /** Test / internal: admit a parsed event when open (non-webhook path). */
@@ -110,15 +110,14 @@ export class DingTalkEndpoint {
         if (event.sessionWebhook && event.conversationId) {
             this.#sessionWebhooks.set(event.conversationId, event.sessionWebhook);
         }
-        const target = resolveTarget(event);
+        const conversation = dingtalkInboundConversation(String(this.#options.id), event);
         const chatType = resolveChatType(event.conversationType);
         const permit = normalizeDingtalkSenderForPermit({ isAdmin: event.isAdmin === true });
         void this.#options.gateway.receive({
-            adapter: this.#options.id,
-            target,
+            conversation,
+            message: { conversation, id: generateMessageId(event) },
             content: formatInboundContent(event),
             sender: resolveSender(event),
-            id: generateMessageId(event),
             metadata: Object.freeze({
                 msgtype: event.msgtype,
                 chatType,
@@ -132,7 +131,7 @@ export class DingTalkEndpoint {
         }).catch((err) => {
             logger.warn(formatCompact({
                 op: 'dingtalk_gateway_receive_failed',
-                target,
+                conversationId: conversation.id,
                 error: err instanceof Error ? err.message : String(err),
             }));
         });

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-export { formatInboundContent, formatOutboundBody, generateMessageId, headerValue, normalizeWebhookPath, readTextBody, resolveChatType, resolveDingTalkConfig, resolveSender, resolveTarget, verifySignature, type AccessToken, type DingTalkAdapterConfig, type DingTalkApiResponse, type DingTalkEvent, type DingTalkMessage, type DingTalkSendBody, type DingTalkWireSegment, type ResolvedDingTalkConfig, } from './protocol.js';
+export { dingtalkInboundConversation, formatInboundContent, formatOutboundBody, generateMessageId, headerValue, normalizeWebhookPath, readTextBody, resolveChatType, resolveDingTalkConfig, resolveSender, verifySignature, type AccessToken, type DingTalkAdapterConfig, type DingTalkApiResponse, type DingTalkEvent, type DingTalkMessage, type DingTalkSendBody, type DingTalkWireSegment, type ResolvedDingTalkConfig, } from './protocol.js';
 export { DingTalkEndpoint, type DingTalkEndpointOptions, type DingTalkFetch, } from './endpoint.js';
 export { registerDingTalkWebhookRoutes, handleDingTalkWebhookRequest, type DingTalkWebhookHandler, } from './webhook.js';
 export { getDingtalkAgentDeps, registerDingtalkAgentEndpoint, setDingtalkAgentDeps, type DingtalkAgentDeps, type DingtalkAgentEndpoint, } from './dingtalk-agent-deps.js';

package/lib/index.js

@@ -1,4 +1,4 @@
-export { formatInboundContent, formatOutboundBody, generateMessageId, headerValue, normalizeWebhookPath, readTextBody, resolveChatType, resolveDingTalkConfig, resolveSender, resolveTarget, verifySignature, } from './protocol.js';
+export { dingtalkInboundConversation, formatInboundContent, formatOutboundBody, generateMessageId, headerValue, normalizeWebhookPath, readTextBody, resolveChatType, resolveDingTalkConfig, resolveSender, verifySignature, } from './protocol.js';
 export { DingTalkEndpoint, } from './endpoint.js';
 export { registerDingTalkWebhookRoutes, handleDingTalkWebhookRequest, } from './webhook.js';
 export { getDingtalkAgentDeps, registerDingtalkAgentEndpoint, setDingtalkAgentDeps, } from './dingtalk-agent-deps.js';

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 DingTalkAdapterConfig {
     readonly name?: string;
@@ -104,7 +105,12 @@ export interface DingTalkSendBody {
 export declare function resolveDingTalkConfig(config?: DingTalkAdapterConfig): ResolvedDingTalkConfig;
 export declare function normalizeWebhookPath(path: string): string;
 export declare function resolveChatType(conversationType?: string): 'group' | 'private';
-export declare function resolveTarget(msg: DingTalkMessage): string;
+/**
+ * 入站归一化 → ConversationRef：`conversationType: '2'` 为群会话（kind 'group'），
+ * 其余为单聊（kind 'private'）；会话原生 id 取 conversationId，缺省回退 senderId。
+ * 钉钉无 guild/频道容器概念，不产生 parent。
+ */
+export declare function dingtalkInboundConversation(endpointId: string, msg: DingTalkMessage): ConversationRef;
 export declare function resolveSender(msg: DingTalkMessage): string;
 export declare function generateMessageId(msg: DingTalkMessage): string;
 /** Build inbound text for MessageGateway.receive. */

package/lib/protocol.js

@@ -53,8 +53,17 @@ export function normalizeWebhookPath(path) {
 export function resolveChatType(conversationType) {
     return conversationType === '2' ? 'group' : 'private';
 }
-export function resolveTarget(msg) {
-    return msg.conversationId || msg.senderId || 'unknown';
+/**
+ * 入站归一化 → ConversationRef：`conversationType: '2'` 为群会话（kind 'group'），
+ * 其余为单聊（kind 'private'）；会话原生 id 取 conversationId，缺省回退 senderId。
+ * 钉钉无 guild/频道容器概念，不产生 parent。
+ */
+export function dingtalkInboundConversation(endpointId, msg) {
+    return {
+        endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+        kind: resolveChatType(msg.conversationType),
+        id: msg.conversationId || msg.senderId || 'unknown',
+    };
 }
 export function resolveSender(msg) {
     return msg.senderId || msg.senderStaffId || 'unknown';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-dingtalk",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "Zhin.js DingTalk (钉钉) adapter for Plugin Runtime (HTTP webhook)",
   "type": "module",
   "main": "./lib/index.js",
@@ -33,21 +33,22 @@
     "directory": "plugins/adapters/dingtalk"
   },
   "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": {
@@ -65,8 +66,8 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.2",
-    "zhin.js": "6.0.1"
+    "@zhin.js/agent": "1.1.3",
+    "zhin.js": "6.0.2"
   },
   "files": [
     "adapters",

package/src/endpoint.ts

@@ -1,7 +1,7 @@
 /**
  * DingTalkEndpoint — lifecycle, outbound, admit, OpenAPI helpers for agent tools.
  */
-import type { EndpointInstance } from '@zhin.js/adapter';
+import type { EndpointInstance, 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';
@@ -9,13 +9,13 @@ import type { CapabilityId } from '@zhin.js/plugin-runtime';
 import { registerDingtalkAgentEndpoint } from './dingtalk-agent-deps.js';
 import { normalizeDingtalkSenderForPermit } from './platform-permit.js';
 import {
+  dingtalkInboundConversation,
   formatInboundContent,
   formatOutboundBody,
   generateMessageId,
   isDingtalkBotMentioned,
   resolveChatType,
   resolveSender,
-  resolveTarget,
   type AccessToken,
   type DingTalkApiResponse,
   type DingTalkEvent,
@@ -116,9 +116,9 @@ export class DingTalkEndpoint 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 content = formatOutboundBody(payload);
-    const sessionWebhook = this.#sessionWebhooks.get(target);
+    const sessionWebhook = this.#sessionWebhooks.get(conversation.id);
     if (sessionWebhook) {
       const response = await this.#fetch(sessionWebhook, {
         method: 'POST',
@@ -133,7 +133,7 @@ export class DingTalkEndpoint implements EndpointInstance {
         op: 'send',
         endpoint: this.#options.config.name,
         via: 'sessionWebhook',
-        to: target,
+        to: conversation.id,
       }));
       return (data.msgId as string) || `${Date.now()}`;
     }
@@ -151,7 +151,7 @@ export class DingTalkEndpoint implements EndpointInstance {
     if (data.errcode !== 0) {
       throw new Error(`Failed to send message: ${data.errmsg}`);
     }
-    logger.debug(formatCompact({ op: 'send', endpoint: this.#options.config.name, to: target }));
+    logger.debug(formatCompact({ op: 'send', endpoint: this.#options.config.name, to: conversation.id }));
     return (data.msgId as string) || `${Date.now()}`;
   }
 
@@ -161,15 +161,14 @@ export class DingTalkEndpoint implements EndpointInstance {
     if (event.sessionWebhook && event.conversationId) {
       this.#sessionWebhooks.set(event.conversationId, event.sessionWebhook);
     }
-    const target = resolveTarget(event);
+    const conversation = dingtalkInboundConversation(String(this.#options.id), event);
     const chatType = resolveChatType(event.conversationType);
     const permit = normalizeDingtalkSenderForPermit({ isAdmin: event.isAdmin === true });
     void this.#options.gateway.receive({
-      adapter: this.#options.id,
-      target,
+      conversation,
+      message: { conversation, id: generateMessageId(event) },
       content: formatInboundContent(event),
       sender: resolveSender(event),
-      id: generateMessageId(event),
       metadata: Object.freeze({
         msgtype: event.msgtype,
         chatType,
@@ -183,7 +182,7 @@ export class DingTalkEndpoint implements EndpointInstance {
     }).catch((err) => {
       logger.warn(formatCompact({
         op: 'dingtalk_gateway_receive_failed',
-        target,
+        conversationId: conversation.id,
         error: err instanceof Error ? err.message : String(err),
       }));
     });

package/src/index.ts

@@ -1,4 +1,5 @@
 export {
+  dingtalkInboundConversation,
   formatInboundContent,
   formatOutboundBody,
   generateMessageId,
@@ -8,7 +9,6 @@ export {
   resolveChatType,
   resolveDingTalkConfig,
   resolveSender,
-  resolveTarget,
   verifySignature,
   type AccessToken,
   type DingTalkAdapterConfig,

package/src/protocol.ts

@@ -7,6 +7,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('dingtalk');
@@ -154,8 +155,17 @@ export function resolveChatType(conversationType?: string): 'group' | 'private'
   return conversationType === '2' ? 'group' : 'private';
 }
 
-export function resolveTarget(msg: DingTalkMessage): string {
-  return msg.conversationId || msg.senderId || 'unknown';
+/**
+ * 入站归一化 → ConversationRef：`conversationType: '2'` 为群会话（kind 'group'），
+ * 其余为单聊（kind 'private'）；会话原生 id 取 conversationId，缺省回退 senderId。
+ * 钉钉无 guild/频道容器概念，不产生 parent。
+ */
+export function dingtalkInboundConversation(endpointId: string, msg: DingTalkMessage): ConversationRef {
+  return {
+    endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+    kind: resolveChatType(msg.conversationType),
+    id: msg.conversationId || msg.senderId || 'unknown',
+  };
 }
 
 export function resolveSender(msg: DingTalkMessage): string {