@vibe-lark/larkpal 0.1.91-issue68.0 → 0.1.91-issue69.0

package/dist/main.mjs

@@ -7009,6 +7009,175 @@ function clearChatInfoCache(accountId) {
 	}
 }
 //#endregion
+//#region src/core/lark-ws-event-normalizer.ts
+const REDACTED_HEADER_PATTERN = /authorization|token|secret|signature|encrypt|cookie|credential/i;
+function normalizeLarkWsEventFrame(frame) {
+	const rewrittenTypeFrame = readHeader(frame.headers, ["type"]) === "card" ? {
+		...frame,
+		headers: (frame.headers ?? []).map((header) => header.key === "type" ? {
+			...header,
+			value: "event"
+		} : header)
+	} : frame;
+	if (rewrittenTypeFrame.payload && rewrittenTypeFrame.payload.byteLength > 0) return rewrittenTypeFrame;
+	const eventType = readHeader(rewrittenTypeFrame.headers, [
+		"event_type",
+		"event-type",
+		"eventType",
+		"x-lark-event-type",
+		"x-lark-event_type"
+	]);
+	if (eventType !== "application.bot.menu_v6") return rewrittenTypeFrame;
+	const eventKey = readHeader(rewrittenTypeFrame.headers, [
+		"event_key",
+		"event-key",
+		"eventKey",
+		"menu_event_key",
+		"menu-event-key",
+		"menuEventKey"
+	]);
+	if (!eventKey) return rewrittenTypeFrame;
+	const payload = buildBotMenuPayload(rewrittenTypeFrame.headers, eventType, eventKey);
+	return {
+		...rewrittenTypeFrame,
+		headers: ensureDispatchHeaders(rewrittenTypeFrame.headers),
+		payload: new TextEncoder().encode(JSON.stringify(payload))
+	};
+}
+function getLarkWsFrameDiagnostics(frame) {
+	const diagnostics = {
+		msgType: readHeader(frame.headers, ["type"]),
+		eventType: readHeader(frame.headers, [
+			"event_type",
+			"event-type",
+			"eventType",
+			"x-lark-event-type",
+			"x-lark-event_type"
+		]),
+		eventKey: readHeader(frame.headers, [
+			"event_key",
+			"event-key",
+			"eventKey",
+			"menu_event_key",
+			"menu-event-key"
+		]),
+		headersCount: frame.headers?.length ?? 0,
+		hasData: frame.data != null,
+		hasPayload: !!frame.payload && frame.payload.byteLength > 0,
+		dataPreview: previewUnknown(frame.data),
+		payloadPreview: previewPayload(frame.payload)
+	};
+	if (!diagnostics.eventType || !diagnostics.hasPayload) diagnostics.headers = sanitizeHeaders(frame.headers);
+	return diagnostics;
+}
+function buildBotMenuPayload(headers, eventType, eventKey) {
+	const tenantKey = readHeader(headers, [
+		"tenant_key",
+		"tenant-key",
+		"tenantKey",
+		"x-tenant-key"
+	]);
+	const operatorOpenId = readHeader(headers, [
+		"operator_open_id",
+		"operator-open-id",
+		"operatorOpenId",
+		"open_id",
+		"open-id"
+	]);
+	const operatorUserId = readHeader(headers, [
+		"operator_user_id",
+		"operator-user-id",
+		"operatorUserId",
+		"user_id",
+		"user-id"
+	]);
+	const operatorUnionId = readHeader(headers, [
+		"operator_union_id",
+		"operator-union-id",
+		"operatorUnionId",
+		"union_id"
+	]);
+	const openChatId = readHeader(headers, [
+		"open_chat_id",
+		"open-chat-id",
+		"openChatId",
+		"chat_id",
+		"chat-id"
+	]);
+	return omitUndefined({
+		schema: "2.0",
+		header: omitUndefined({
+			event_type: eventType,
+			tenant_key: tenantKey
+		}),
+		event: omitUndefined({
+			event_key: eventKey,
+			operator: operatorOpenId || operatorUserId || operatorUnionId ? { operator_id: omitUndefined({
+				open_id: operatorOpenId,
+				user_id: operatorUserId,
+				union_id: operatorUnionId
+			}) } : void 0,
+			open_chat_id: openChatId
+		})
+	});
+}
+function readHeader(headers, names) {
+	const wanted = new Set(names.map(normalizeHeaderName));
+	for (const header of headers ?? []) {
+		const key = header.key;
+		const value = header.value;
+		if (!key || typeof value !== "string" || !value.trim()) continue;
+		if (wanted.has(normalizeHeaderName(key))) return value;
+	}
+}
+function normalizeHeaderName(name) {
+	return name.toLowerCase().replace(/[^a-z0-9]/g, "");
+}
+function sanitizeHeaders(headers) {
+	return (headers ?? []).filter((header) => typeof header.key === "string").map((header) => ({
+		key: header.key,
+		value: REDACTED_HEADER_PATTERN.test(header.key) ? "[redacted]" : previewString(header.value)
+	}));
+}
+function ensureDispatchHeaders(headers) {
+	const nextHeaders = [...headers ?? []];
+	const ensureHeader = (key, value) => {
+		if (!readHeader(nextHeaders, [key])) nextHeaders.push({
+			key,
+			value
+		});
+	};
+	ensureHeader("message_id", `synthetic-${Date.now()}`);
+	ensureHeader("sum", "1");
+	ensureHeader("seq", "0");
+	ensureHeader("trace_id", "synthetic-bot-menu");
+	return nextHeaders;
+}
+function previewPayload(payload) {
+	if (!payload || payload.byteLength === 0) return void 0;
+	try {
+		return previewString(new TextDecoder().decode(payload));
+	} catch {
+		return `[binary:${payload.byteLength}]`;
+	}
+}
+function previewUnknown(value) {
+	if (value == null) return void 0;
+	if (typeof value === "string") return previewString(value);
+	try {
+		return previewString(JSON.stringify(value));
+	} catch {
+		return String(value).slice(0, 200);
+	}
+}
+function previewString(value) {
+	if (typeof value !== "string") return void 0;
+	return value.slice(0, 200);
+}
+function omitUndefined(value) {
+	return Object.fromEntries(Object.entries(value).filter(([, entryValue]) => entryValue !== void 0));
+}
+//#endregion
 //#region src/core/lark-client.ts
 /**
 * Copyright (c) 2026 ByteDance Ltd. and/or its affiliates
@@ -7331,24 +7500,13 @@ var LarkClient = class LarkClient {
 		const wsClientAny = this._wsClient;
 		const origHandleEventData = wsClientAny.handleEventData.bind(wsClientAny);
 		wsClientAny.handleEventData = (data) => {
-			const msgType = data.headers?.find?.((h) => h.key === "type")?.value;
-			const eventType = data.headers?.find?.((h) => h.key === "event_type")?.value;
+			const normalizedData = normalizeLarkWsEventFrame(data);
+			const diagnostics = getLarkWsFrameDiagnostics(normalizedData);
 			log$24.info("WS 收到原始事件", {
 				accountId: this.accountId,
-				msgType,
-				eventType,
-				headersCount: data.headers?.length,
-				hasData: !!data.data,
-				dataPreview: typeof data.data === "string" ? data.data.slice(0, 200) : JSON.stringify(data.data)?.slice(0, 200)
-			});
-			if (msgType === "card") return origHandleEventData({
-				...data,
-				headers: data.headers.map((h) => h.key === "type" ? {
-					...h,
-					value: "event"
-				} : h)
+				...diagnostics
 			});
-			return origHandleEventData(data);
+			return origHandleEventData(normalizedData);
 		};
 		await this.waitForAbort(dispatcher, abortSignal);
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-lark/larkpal",
-  "version": "0.1.91-issue68.0",
+  "version": "0.1.91-issue69.0",
   "description": "LarkPal - Lark/Feishu bot service",
   "type": "module",
   "main": "./dist/main.mjs",