@zhin.js/adapter-lark 1.1.18 → 1.1.19

package/src/index.ts

@@ -20,7 +20,7 @@ export {
   type ResolvedLarkConfig,
 } from './protocol.js';
 
-export { larkClient, type LarkClientEventMap } from './client.js';
+export { type LarkClientEventMap } from './client.js';
 
 export {
   checkLarkPlatformPermit,
@@ -30,9 +30,7 @@ export {
 } from './platform-permit.js';
 
 export {
-  LarkClient,
   LarkEndpoint,
-  type LarkClientApi,
   type LarkEndpointOptions,
   type LarkFetch,
 } from './endpoint.js';
@@ -56,3 +54,6 @@ export {
   type LarkLongConnectionFactory,
   type LarkLongConnectionOptions,
 } from './long-connection.js';
+
+export { LarkClient, type LarkClientApi } from './client.js';
+export { LarkAdapter } from './adapter.js';

package/src/long-connection.ts

@@ -10,7 +10,7 @@ export interface LarkLongConnection {
 }
 export interface LarkLongConnectionOptions {
   readonly config: ResolvedLarkConfig;
-  readonly receive: (message: LarkMessage) => void;
+  readonly receive: (message: LarkMessage, nativeEvent?: unknown) => void;
   readonly cardAction?: (event: LarkCardAction) => void;
   readonly disconnected: () => void;
 }
@@ -50,7 +50,7 @@ export const createLarkLongConnection: LarkLongConnectionFactory = ({ config, re
   const dispatcher = new lark.EventDispatcher({}).register({
     'card.action.trigger': (event: LarkCardAction) => { if (!cancelled) cardAction?.(event as LarkCardAction); return {}; },
     'im.message.receive_v1': (event) => {
-      if (!cancelled) receive({ ...event.message, sender: event.sender });
+      if (!cancelled) receive({ ...event.message, sender: event.sender }, event);
       // No downstream send is awaited: SDK ACK remains within its 3-second window.
     },
   });

package/src/media-upload.ts

@@ -22,10 +22,15 @@ const MIME_EXT: Record<string, string> = {
 };
 
 /** 从 canonical MediaRef 解析二进制：base64 解码 / 本地读盘 / URL 下载。 */
+export interface MediaResolveOptions {
+  readonly download?: (url: string, signal?: AbortSignal) => Promise<Buffer>;
+  readonly signal?: AbortSignal;
+}
 export async function resolveMediaBinary(
   media: MediaRef,
-  download: (url: string) => Promise<Buffer> = defaultDownload,
+  { download = defaultDownload, signal }: MediaResolveOptions = {},
 ): Promise<MediaBinary> {
+  signal?.throwIfAborted();
   const mimeType = media.mime_type ?? 'image/png';
   const ext = MIME_EXT[mimeType] ?? 'png';
   if (media.kind === 'base64') {
@@ -36,13 +41,13 @@ export async function resolveMediaBinary(
   }
   if (media.kind === 'path') {
     const path = media.value.startsWith('file://') ? media.value.slice('file://'.length) : media.value;
-    return { data: await readFile(path), mimeType, fileName: basename(path) };
+    return { data: await readFile(path, { signal }), mimeType, fileName: basename(path) };
   }
-  return { data: await download(media.value), mimeType, fileName: `image.${ext}` };
+  return { data: await download(media.value, signal), mimeType, fileName: `image.${ext}` };
 }
 
-async function defaultDownload(url: string): Promise<Buffer> {
-  const response = await fetch(url, { signal: AbortSignal.timeout(30_000) });
+async function defaultDownload(url: string, signal?: AbortSignal): Promise<Buffer> {
+  const response = await fetch(url, { signal: signal ? AbortSignal.any([signal, AbortSignal.timeout(30_000)]) : AbortSignal.timeout(30_000) });
   if (!response.ok) throw new Error(`download failed: HTTP ${response.status}`);
   return Buffer.from(await response.arrayBuffer());
 }

package/src/protocol.ts

@@ -186,10 +186,10 @@ export function larkInboundConversation(endpointKey: string, msg: LarkMessage):
   };
 }
 
-export function resolveSender(msg: LarkMessage): string {
+export function resolveSender(msg: LarkMessage): string | undefined {
   return msg.sender?.sender_id?.open_id
     || msg.sender?.sender_id?.user_id
-    || 'unknown';
+    || undefined;
 }
 
 export function generateMessageId(msg: LarkMessage): string {

package/src/sdk-http.ts

@@ -0,0 +1,65 @@
+import type { HttpInstance, HttpRequestOptions } from '@larksuiteoapi/node-sdk';
+import { Readable, PassThrough } from 'node:stream';
+import { EndpointDeliveryError } from '@zhin.js/im-contract';
+import type { LarkFetch } from './client.js';
+
+/** The installed SDK's documented HttpInstance seam, using the same account-owned transport. */
+export function createLarkSdkHttpInstance(fetch: LarkFetch): HttpInstance {
+  const request = async <T = unknown, R = T, D = unknown>(input: HttpRequestOptions<D>): Promise<R> => {
+    if (!input.url) throw new TypeError('Lark SDK request URL is required');
+    const url = new URL(input.url);
+    if (input.params) {
+      const serializer = typeof input.paramsSerializer === 'function' ? input.paramsSerializer
+        : input.paramsSerializer?.serialize;
+      if (serializer) {
+        const query = serializer(input.params); if (query) url.search = url.search ? `${url.search}&${query}` : query;
+      } else for (const [key, value] of Object.entries(input.params)) {
+        if (value === undefined || value === null) continue;
+        for (const item of Array.isArray(value) ? value : [value]) url.searchParams.append(key, String(item));
+      }
+    }
+    const headers = Object.fromEntries(Object.entries(input.headers ?? {}).filter(([, value]) => value !== undefined).map(([key, value]) => [key, String(value)]));
+    let body: string | FormData | Uint8Array | ArrayBuffer | AsyncIterable<Uint8Array> | undefined;
+    let streaming = false;
+    if (input.data !== undefined) {
+      const native = input.data as { getHeaders?: () => Record<string, string>; pipe?: (target: PassThrough) => unknown; destroy?: () => void; [Symbol.asyncIterator]?: unknown };
+      if (typeof input.data === 'string' || input.data instanceof FormData || input.data instanceof ArrayBuffer || ArrayBuffer.isView(input.data)) body = input.data as string | FormData | Uint8Array | ArrayBuffer;
+      else if (native && (typeof native.pipe === 'function' || typeof native[Symbol.asyncIterator] === 'function')) {
+        if (native.getHeaders) Object.assign(headers, native.getHeaders());
+        if (typeof native.pipe === 'function') {
+          const stream = new PassThrough();
+          stream.once('close', () => native.destroy?.()); native.pipe(stream); body = stream;
+        } else body = input.data as AsyncIterable<Uint8Array>;
+        streaming = true;
+      }
+      else { body = JSON.stringify(input.data); if (!Object.keys(headers).some(key => key.toLowerCase() === 'content-type')) headers['Content-Type'] = 'application/json'; }
+    }
+    const response = await fetch(url.toString(), { method: input.method, headers, body, ...(streaming ? { duplex: 'half' as const } : {}),
+      ...(input.timeout ? { signal: AbortSignal.timeout(input.timeout) } : {}) });
+    if (!response.ok) throw new EndpointDeliveryError('http_error', `Lark HTTP ${response.status}`, response.status >= 400 && response.status < 500 && response.status !== 408 ? 'rejected' : 'unknown');
+    const native = response as Partial<Response>;
+    let data: unknown;
+    if (input.responseType === 'stream') {
+      if (!native.body) throw new Error('Lark transport returned no response stream');
+      data = Readable.fromWeb(native.body as Parameters<typeof Readable.fromWeb>[0]);
+    } else if (input.responseType === 'arraybuffer') {
+      if (!native.arrayBuffer) throw new Error('Lark transport returned no binary reader');
+      data = Buffer.from(await native.arrayBuffer());
+    } else if (input.responseType === 'blob') {
+      if (!native.blob) throw new Error('Lark transport returned no blob reader');
+      data = await native.blob();
+    } else if (input.responseType === 'text' || input.responseType === 'document') data = await response.text();
+    else data = await response.json();
+    return (input.$return_headers ? { data, headers: Object.fromEntries(native.headers?.entries() ?? []) } : data) as R;
+  };
+  return {
+    request,
+    get: (url, options) => request({ ...options, url, method: 'GET' }),
+    delete: (url, options) => request({ ...options, url, method: 'DELETE' }),
+    head: (url, options) => request({ ...options, url, method: 'HEAD' }),
+    options: (url, options) => request({ ...options, url, method: 'OPTIONS' }),
+    post: (url, data, options) => request({ ...options, url, data, method: 'POST' }),
+    put: (url, data, options) => request({ ...options, url, data, method: 'PUT' }),
+    patch: (url, data, options) => request({ ...options, url, data, method: 'PATCH' }),
+  };
+}

package/src/webhook.ts

@@ -21,7 +21,7 @@ export interface LarkWebhookHandler {
   readonly config: ResolvedLarkConfig;
   readonly isOpen: boolean;
   admitPlatform(name: string, event: unknown): void;
-  admit(msg: LarkMessage): void;
+  admit(msg: LarkMessage, nativeEvent?: unknown): void;
   admitCardAction?(event: LarkCardAction): void;
 }
 
@@ -103,7 +103,7 @@ export async function handleLarkWebhookRequest(
         ...event.event.message,
         sender: event.event.message.sender ?? event.event.sender,
       };
-      handler.admit(message);
+      handler.admit(message, event);
     }
 
     response.writeHead(200, { 'Content-Type': 'application/json' });

package/lib/lark-runtime-state.d.ts

@@ -1 +0,0 @@
-export declare const larkRuntimeStateToken: import("zhin.js").Token<import("@zhin.js/adapter").EndpointRuntimeState>;

package/lib/lark-runtime-state.js

@@ -1,6 +0,0 @@
-/**
- * Lark 插件实例的运行时状态：adapter create() 注册的 endpoint 列表。
- * 由 plugin.ts setup() provide，adapter create 与 `lark endpoint` 命令共享（同一 owner generation）。
- */
-import { defineEndpointRuntimeStateToken } from 'zhin.js/adapter';
-export const larkRuntimeStateToken = defineEndpointRuntimeStateToken('lark');

package/src/lark-runtime-state.ts

@@ -1,7 +0,0 @@
-/**
- * Lark 插件实例的运行时状态：adapter create() 注册的 endpoint 列表。
- * 由 plugin.ts setup() provide，adapter create 与 `lark endpoint` 命令共享（同一 owner generation）。
- */
-import { defineEndpointRuntimeStateToken } from 'zhin.js/adapter';
-
-export const larkRuntimeStateToken = defineEndpointRuntimeStateToken('lark');