@zhin.js/adapter-weixin-ilink 5.0.1 → 5.0.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @zhin.js/adapter-weixin-ilink
 
+## 5.0.2
+
+### 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@6.0.2
+
 ## 5.0.1
 
 ### Patch Changes

package/README.md

@@ -52,7 +52,7 @@ data/weixin-ilink/<bot-name>.json
 
 回复必须携带入站时缓存的 `context_token`（按 `endpointId + peerUserId`）。若用户久未发消息导致 token 缺失，出站会拒绝并打 warn。
 
-出站经 Runtime：`MessageGateway` → `endpoint.send({ target, payload })`。
+出站经 Runtime：`MessageGateway` → `endpoint.send({ conversation, payload })`（`conversation` 为入站归一化出的 `ConversationRef`，kind 恒为 `private`，`id` 即对端 user_id）。
 
 **图文限制**：微信单条消息不支持图文混排。适配器会自动：
 

package/lib/endpoint.d.ts

@@ -1,4 +1,4 @@
-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 { CapabilityId } from '@zhin.js/plugin-runtime';
 import { getUpdates, notifyStart, notifyStop } from './ilink-api.js';
@@ -33,10 +33,7 @@ export declare class WeixinIlinkEndpoint 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 message when the endpoint is open. */
     admit(msg: WeixinMessageWithMedia): void;
     sendTypingToUser(userId: string, status: number): Promise<void>;

package/lib/endpoint.js

@@ -18,7 +18,7 @@ import { sendWeixinMediaFile } from './weixin-send-media.js';
 import { materializeOutboundMedia } from './outbound-media.js';
 import { MessageItemType } from './ilink-types.js';
 import { getExtensionFromMime, sniffMimeFromBuffer } from './mime.js';
-import { formatInboundContent, formatOutboundSegments, inboundMessageId, segmentLocalPath, sleep, } from './protocol.js';
+import { formatInboundContent, formatOutboundSegments, inboundMessageId, segmentLocalPath, sleep, weixinIlinkInboundConversation, } from './protocol.js';
 const logger = getLogger('weixin-ilink');
 const MAX_CONSECUTIVE_FAILURES = 3;
 const BACKOFF_DELAY_MS = 30_000;
@@ -130,10 +130,12 @@ export class WeixinIlinkEndpoint {
             endpoint: this.#options.config.name,
         }));
     }
-    async send({ target, payload }) {
+    async send({ conversation, payload }) {
         if (!this.#creds?.botToken) {
             throw new Error('weixin-ilink bot not authenticated');
         }
+        // 个人微信仅 private 会话，对端 user_id 即 conversation.id
+        const target = conversation.id;
         const contextToken = getContextToken(this.#options.config.name, target);
         if (!contextToken) {
             logger.warn(formatCompact({
@@ -215,12 +217,12 @@ export class WeixinIlinkEndpoint {
         if (msg.context_token && userId) {
             setContextToken(this.#options.config.name, userId, msg.context_token);
         }
+        const conversation = weixinIlinkInboundConversation(String(this.#options.id), userId);
         void this.#options.gateway.receive({
-            adapter: this.#options.id,
-            target: userId,
+            conversation,
+            message: { conversation, id: inboundMessageId(msg) },
             content: formatInboundContent(msg),
             sender: userId,
-            id: inboundMessageId(msg),
             metadata: Object.freeze({
                 endpoint: this.#options.config.name,
                 messageType: msg.message_type,

package/lib/protocol.d.ts

@@ -2,6 +2,7 @@
  * Weixin iLink protocol helpers (no legacy Adapter/Endpoint / segment-mapper).
  * Canonicalization is owned by gateway/core before endpoint.send.
  */
+import type { ConversationRef } from '@zhin.js/im-contract';
 import type { WeixinMessage } from './ilink-types.js';
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface WeixinIlinkAdapterConfig {
@@ -43,6 +44,11 @@ export declare function resolveWeixinIlinkConfig(config?: WeixinIlinkAdapterConf
 /** Build inbound text for MessageGateway.receive (gateway owns reply routing). */
 export declare function formatInboundContent(msg: WeixinMessageWithMedia): string;
 export declare function inboundMessageId(msg: WeixinMessage): string;
+/**
+ * 入站归一化 → ConversationRef：个人微信无群/频道概念，全部会话都是
+ * 与 `from_user_id` 的 private 会话（无 parent）。
+ */
+export declare function weixinIlinkInboundConversation(endpointId: string, userId: string): ConversationRef;
 /**
  * Wire-encode an already-rendered outbound payload into Weixin wire segments.
  * Segment canonicalization is intentionally not done here.

package/lib/protocol.js

@@ -55,6 +55,17 @@ export function formatInboundContent(msg) {
 export function inboundMessageId(msg) {
     return String(msg.message_id ?? msg.client_id ?? msg.seq ?? Date.now());
 }
+/**
+ * 入站归一化 → ConversationRef：个人微信无群/频道概念，全部会话都是
+ * 与 `from_user_id` 的 private 会话（无 parent）。
+ */
+export function weixinIlinkInboundConversation(endpointId, userId) {
+    return {
+        endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+        kind: 'private',
+        id: userId,
+    };
+}
 /**
  * Wire-encode an already-rendered outbound payload into Weixin wire segments.
  * Segment canonicalization is intentionally not done here.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-weixin-ilink",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "type": "module",
   "description": "Zhin.js Weixin iLink (ClawBot) adapter for Plugin Runtime (long-poll)",
   "main": "./lib/index.js",
@@ -48,17 +48,18 @@
     }
   },
   "dependencies": {
-    "@zhin.js/adapter": "1.1.4",
-    "@zhin.js/command": "1.0.6",
-    "@zhin.js/core": "1.5.1",
+    "@zhin.js/adapter": "1.1.5",
+    "@zhin.js/command": "1.0.7",
+    "@zhin.js/core": "1.5.2",
+    "@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": {
-    "@zhin.js/adapter": "1.1.4",
-    "@zhin.js/core": "1.5.1",
-    "@zhin.js/plugin-runtime": "1.1.2",
-    "zhin.js": "6.0.1"
+    "@zhin.js/adapter": "1.1.5",
+    "@zhin.js/core": "1.5.2",
+    "@zhin.js/plugin-runtime": "1.1.3",
+    "zhin.js": "6.0.2"
   },
   "peerDependenciesMeta": {
     "zhin.js": {

package/src/endpoint.ts

@@ -4,7 +4,12 @@
 import crypto from 'node:crypto';
 import fs from 'node:fs';
 import path from 'node:path';
-import type { EndpointFriend, EndpointInstance, EndpointManagement } from '@zhin.js/adapter';
+import type {
+  EndpointFriend,
+  EndpointInstance,
+  EndpointManagement,
+  EndpointSendRequest,
+} from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
@@ -44,6 +49,7 @@ import {
   inboundMessageId,
   segmentLocalPath,
   sleep,
+  weixinIlinkInboundConversation,
   type ResolvedWeixinIlinkConfig,
   type WeixinMessageWithMedia,
   type WeixinWireSegment,
@@ -197,10 +203,12 @@ export class WeixinIlinkEndpoint implements EndpointInstance {
     }));
   }
 
-  async send({ target, payload }: { readonly target: string; readonly payload: unknown }): Promise<string> {
+  async send({ conversation, payload }: EndpointSendRequest): Promise<string> {
     if (!this.#creds?.botToken) {
       throw new Error('weixin-ilink bot not authenticated');
     }
+    // 个人微信仅 private 会话，对端 user_id 即 conversation.id
+    const target = conversation.id;
     const contextToken = getContextToken(this.#options.config.name, target);
     if (!contextToken) {
       logger.warn(formatCompact({
@@ -288,12 +296,12 @@ export class WeixinIlinkEndpoint implements EndpointInstance {
     if (msg.context_token && userId) {
       setContextToken(this.#options.config.name, userId, msg.context_token);
     }
+    const conversation = weixinIlinkInboundConversation(String(this.#options.id), userId);
     void this.#options.gateway.receive({
-      adapter: this.#options.id,
-      target: userId,
+      conversation,
+      message: { conversation, id: inboundMessageId(msg) },
       content: formatInboundContent(msg),
       sender: userId,
-      id: inboundMessageId(msg),
       metadata: Object.freeze({
         endpoint: this.#options.config.name,
         messageType: msg.message_type,

package/src/protocol.ts

@@ -5,6 +5,7 @@
 
 import { pickCredential } from '@zhin.js/adapter';
 import { isMediaRef } from '@zhin.js/core';
+import type { ConversationRef } from '@zhin.js/im-contract';
 import { bodyFromItemList, isMediaItem } from './weixin-inbound.js';
 import { DEFAULT_API_BASE_URL, DEFAULT_CDN_BASE_URL } from './ilink-meta.js';
 import type { WeixinMessage } from './ilink-types.js';
@@ -107,6 +108,18 @@ export function inboundMessageId(msg: WeixinMessage): string {
   return String(msg.message_id ?? msg.client_id ?? msg.seq ?? Date.now());
 }
 
+/**
+ * 入站归一化 → ConversationRef：个人微信无群/频道概念，全部会话都是
+ * 与 `from_user_id` 的 private 会话（无 parent）。
+ */
+export function weixinIlinkInboundConversation(endpointId: string, userId: string): ConversationRef {
+  return {
+    endpoint: { id: endpointId, adapter: endpointId.split('\0')[0] ?? endpointId },
+    kind: 'private',
+    id: userId,
+  };
+}
+
 /**
  * Wire-encode an already-rendered outbound payload into Weixin wire segments.
  * Segment canonicalization is intentionally not done here.