@nextclaw/channel-extension-weixin 0.1.6 → 0.1.7

package/dist/index.d.ts

@@ -2,6 +2,5 @@ import { WeixinAuthPollResult, WeixinAuthStartResult, WeixinLoginParams, WeixinL
 import { WeixinAuthCapability } from "./services/weixin-auth-capability.service.js";
 import { WeixinAccountConfig, WeixinChannelConfig, WeixinInboundMessage } from "./types/weixin-extension.types.js";
 import { WeixinChannelAdapter } from "./services/weixin-channel-adapter.service.js";
-import { WeixinExtensionRuntime } from "./services/weixin-extension-runtime.service.js";
 import { DEFAULT_WEIXIN_BASE_URL, WEIXIN_CHANNEL_CONFIG_SCHEMA, WEIXIN_CHANNEL_CONFIG_UI_HINTS, WEIXIN_CHANNEL_ID, WEIXIN_EXTENSION_ID } from "./utils/weixin-config.utils.js";
-export { DEFAULT_WEIXIN_BASE_URL, WEIXIN_CHANNEL_CONFIG_SCHEMA, WEIXIN_CHANNEL_CONFIG_UI_HINTS, WEIXIN_CHANNEL_ID, WEIXIN_EXTENSION_ID, type WeixinAccountConfig, WeixinAuthCapability, type WeixinAuthPollResult, type WeixinAuthStartResult, WeixinChannelAdapter, type WeixinChannelConfig, WeixinExtensionRuntime, type WeixinInboundMessage, type WeixinLoginParams, WeixinLoginService };
+export { DEFAULT_WEIXIN_BASE_URL, WEIXIN_CHANNEL_CONFIG_SCHEMA, WEIXIN_CHANNEL_CONFIG_UI_HINTS, WEIXIN_CHANNEL_ID, WEIXIN_EXTENSION_ID, type WeixinAccountConfig, WeixinAuthCapability, type WeixinAuthPollResult, type WeixinAuthStartResult, WeixinChannelAdapter, type WeixinChannelConfig, type WeixinInboundMessage, type WeixinLoginParams, WeixinLoginService };

package/dist/index.js

@@ -2,5 +2,4 @@ import { DEFAULT_WEIXIN_BASE_URL, WEIXIN_CHANNEL_CONFIG_SCHEMA, WEIXIN_CHANNEL_C
 import { WeixinLoginService } from "./services/weixin-login.service.js";
 import { WeixinAuthCapability } from "./services/weixin-auth-capability.service.js";
 import { WeixinChannelAdapter } from "./services/weixin-channel-adapter.service.js";
-import { WeixinExtensionRuntime } from "./services/weixin-extension-runtime.service.js";
-export { DEFAULT_WEIXIN_BASE_URL, WEIXIN_CHANNEL_CONFIG_SCHEMA, WEIXIN_CHANNEL_CONFIG_UI_HINTS, WEIXIN_CHANNEL_ID, WEIXIN_EXTENSION_ID, WeixinAuthCapability, WeixinChannelAdapter, WeixinExtensionRuntime, WeixinLoginService };
+export { DEFAULT_WEIXIN_BASE_URL, WEIXIN_CHANNEL_CONFIG_SCHEMA, WEIXIN_CHANNEL_CONFIG_UI_HINTS, WEIXIN_CHANNEL_ID, WEIXIN_EXTENSION_ID, WeixinAuthCapability, WeixinChannelAdapter, WeixinLoginService };

package/dist/main.js

@@ -1,24 +1,14 @@
 import { WeixinAuthCapability } from "./services/weixin-auth-capability.service.js";
 import { WeixinChannelAdapter } from "./services/weixin-channel-adapter.service.js";
-import { WeixinExtensionRuntime } from "./services/weixin-extension-runtime.service.js";
-import { NextClawExtension } from "@nextclaw/extension-sdk";
+import { toWeixinSubmittedMessage } from "./utils/weixin-submitted-message.utils.js";
+import { startChannelExtension, warnNcpEventError } from "@nextclaw/extension-sdk";
 //#region src/main.ts
-function readRequiredString(value, name) {
-	if (typeof value !== "string" || !value.trim()) throw new Error(`${name} is required`);
-	return value.trim();
-}
-function readOptionalString(value) {
-	return typeof value === "string" && value.trim() ? value.trim() : void 0;
-}
-const extension = new NextClawExtension();
-const weixin = extension.channels.use("weixin");
-const runtime = new WeixinExtensionRuntime(weixin, new WeixinChannelAdapter());
-extension.capabilities.provide("channel.auth", new WeixinAuthCapability({ channel: weixin }));
-extension.capabilities.provideHandler("channel.outbound.sendText", async (payload) => await runtime.sendOutboundText({
-	to: readRequiredString(payload.to, "to"),
-	text: readRequiredString(payload.text, "text"),
-	accountId: readOptionalString(payload.accountId)
-}));
-await runtime.start();
+await startChannelExtension({
+	channelId: "weixin",
+	createAdapter: () => new WeixinChannelAdapter(),
+	mapInbound: toWeixinSubmittedMessage,
+	createAuthCapability: ({ channel }) => new WeixinAuthCapability({ channel }),
+	onNcpEventError: warnNcpEventError("weixin")
+});
 //#endregion
 export {};

package/dist/services/weixin-channel-adapter.service.d.ts

@@ -45,6 +45,7 @@ declare class WeixinChannelAdapter {
   }) => Promise<void>;
   private readonly resolveReplySession;
   private readonly listAvailableAccountIds;
+  private readonly listConfiguredAccountIds;
   private readonly resolveCanonicalRoute;
   private readonly resolveConfiguredCanonicalRoute;
   private readonly resolveRuntimeAccount;

package/dist/services/weixin-channel-adapter.service.js

@@ -4,6 +4,8 @@ import { NcpEventQueue, TERMINAL_NCP_EVENT_TYPES, WeixinReplyChat } from "./weix
 import { resolveWeixinInboundAttachments } from "../utils/weixin-inbound-media.utils.js";
 import { readWeixinEventSessionId, resolveWeixinSessionRoute } from "../utils/weixin-session-route.utils.js";
 import { WeixinTypingController } from "./weixin-typing-controller.service.js";
+import { createHash } from "node:crypto";
+import { appendFileSync } from "node:fs";
 import { NcpReplyConsumer } from "@nextclaw/ncp-toolkit";
 //#region src/services/weixin-channel-adapter.service.ts
 const DEFAULT_WEIXIN_BASE_URL = "https://ilinkai.weixin.qq.com";
@@ -12,6 +14,19 @@ const WEIXIN_MESSAGE_ITEM_TYPE_IMAGE = 2;
 const WEIXIN_MESSAGE_ITEM_TYPE_VOICE = 3;
 const WEIXIN_MESSAGE_ITEM_TYPE_FILE = 4;
 const WEIXIN_MESSAGE_ITEM_TYPE_VIDEO = 5;
+function textHash(text) {
+	return createHash("sha256").update(text).digest("hex").slice(0, 12);
+}
+function writeWeixinDebugProbe(event, payload) {
+	const file = process.env.NEXTCLAW_WEIXIN_DEBUG_LOG?.trim();
+	if (!file) return;
+	appendFileSync(file, `${JSON.stringify({
+		at: (/* @__PURE__ */ new Date()).toISOString(),
+		event,
+		pid: process.pid,
+		...payload
+	})}\n`);
+}
 async function defaultSleep(ms, signal) {
 	await new Promise((resolve) => {
 		const timer = setTimeout(resolve, Math.max(0, ms));
@@ -140,6 +155,15 @@ var WeixinChannelAdapter = class {
 		if (!route) return;
 		const sessionId = readWeixinEventSessionId(event);
 		if (!sessionId) return;
+		writeWeixinDebugProbe("ncp-event", {
+			sessionId,
+			type: event.type,
+			replySessionOpen: this.replySessions.has(sessionId),
+			routeConversationId: route.conversationId,
+			routeAccountId: route.accountId,
+			messageId: "payload" in event && event.payload && typeof event.payload === "object" && "messageId" in event.payload ? event.payload.messageId : void 0,
+			runId: "payload" in event && event.payload && typeof event.payload === "object" && "runId" in event.payload ? event.payload.runId : void 0
+		});
 		const session = this.resolveReplySession(sessionId, this.resolveCanonicalRoute(route));
 		session.queue.push(event);
 		if (TERMINAL_NCP_EVENT_TYPES.has(event.type)) {
@@ -153,6 +177,14 @@ var WeixinChannelAdapter = class {
 	};
 	sendText = async (params) => {
 		const { account, contextToken, conversationId, text } = params;
+		writeWeixinDebugProbe("send-text", {
+			accountId: account.accountId,
+			conversationId,
+			textHash: textHash(text),
+			textLength: text.length,
+			textPreview: text.slice(0, 80),
+			hasContextToken: Boolean(contextToken)
+		});
 		await this.api.sendTextMessage({
 			baseUrl: account.baseUrl,
 			token: account.token,
@@ -193,11 +225,12 @@ var WeixinChannelAdapter = class {
 		return session;
 	};
 	listAvailableAccountIds = () => {
-		return Array.from(new Set([
-			...this.config.defaultAccountId ? [this.config.defaultAccountId] : [],
-			...Object.keys(this.config.accounts ?? {}),
-			...this.store.listAccountIds()
-		]));
+		const configuredAccountIds = this.listConfiguredAccountIds();
+		if (configuredAccountIds.length > 0) return configuredAccountIds;
+		return this.store.listAccountIds();
+	};
+	listConfiguredAccountIds = () => {
+		return Array.from(new Set([...this.config.defaultAccountId ? [this.config.defaultAccountId] : [], ...Object.keys(this.config.accounts ?? {})]));
 	};
 	resolveCanonicalRoute = (route) => {
 		const remembered = this.canonicalRoutes.get(normalizeRouteKey(route.conversationId));
@@ -221,6 +254,8 @@ var WeixinChannelAdapter = class {
 		return null;
 	};
 	resolveRuntimeAccount = (accountId) => {
+		const configuredAccountIds = this.listConfiguredAccountIds();
+		if (configuredAccountIds.length > 0 && !configuredAccountIds.includes(accountId)) return null;
 		const stored = this.store.loadAccount(accountId);
 		if (!stored?.token) return null;
 		const accountConfig = this.config.accounts?.[accountId] ?? {};
@@ -289,6 +324,15 @@ var WeixinChannelAdapter = class {
 		const extractedText = extractText(message);
 		const text = attachments.length > 0 && isSyntheticAttachmentText(extractedText) ? "" : extractedText;
 		if (!text && attachments.length === 0) return;
+		writeWeixinDebugProbe("inbound-message", {
+			accountId: account.accountId,
+			senderId,
+			messageId: message.message_id,
+			textHash: text ? textHash(text) : void 0,
+			textLength: text.length,
+			textPreview: text.slice(0, 80),
+			attachmentCount: attachments.length
+		});
 		const contextToken = message.context_token?.trim();
 		if (contextToken) this.contextTokens.set(`${account.accountId}:${senderId}`, contextToken);
 		this.canonicalRoutes.set(normalizeRouteKey(senderId), {

package/dist/stores/weixin-account.store.js

@@ -2,9 +2,11 @@ import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync
 import { homedir } from "node:os";
 import { join, resolve } from "node:path";
 //#region src/stores/weixin-account.store.ts
+const NEXTCLAW_HOME_ENV_KEY = "NEXTCLAW_HOME";
+const NEXTCLAW_DEFAULT_HOME_DIR = ".nextclaw";
 function resolveNextclawHome() {
-	const override = process.env.NEXTCLAW_HOME?.trim();
-	return resolve(override || join(homedir(), ".nextclaw"));
+	const override = process.env[NEXTCLAW_HOME_ENV_KEY]?.trim();
+	return resolve(override || join(homedir(), NEXTCLAW_DEFAULT_HOME_DIR));
 }
 function resolveWeixinDataDir() {
 	return join(resolveNextclawHome(), "channels", "weixin");

package/dist/types/weixin-extension.types.d.ts

@@ -33,17 +33,5 @@ type WeixinRuntimeAccount = {
   pollTimeoutMs: number;
   allowFrom: string[];
 };
-type WeixinChannelAdapter = {
-  configure: (config: WeixinChannelConfig) => Promise<void>;
-  start: () => Promise<void>;
-  stop: () => Promise<void>;
-  onMessage: (handler: (message: WeixinInboundMessage) => void | Promise<void>) => () => void;
-  sendNcpEvent: (event: NcpEndpointEvent) => Promise<void>;
-  sendOutboundText: (params: {
-    to: string;
-    text: string;
-    accountId?: string | null;
-  }) => Promise<void>;
-};
 //#endregion
-export { WeixinAccountConfig, WeixinChannelAdapter, WeixinChannelConfig, WeixinInboundMessage, WeixinRuntimeAccount };
+export { WeixinAccountConfig, WeixinChannelConfig, WeixinInboundMessage, WeixinRuntimeAccount };

package/dist/utils/weixin-submitted-message.utils.js

@@ -0,0 +1,22 @@
+//#region src/utils/weixin-submitted-message.utils.ts
+function toWeixinSubmittedMessage(message) {
+	return {
+		conversationId: message.conversationId,
+		senderId: message.senderId,
+		content: {
+			type: "text",
+			text: message.text
+		},
+		...message.attachments ? { attachments: message.attachments } : {},
+		metadata: {
+			...message.accountId ? {
+				accountId: message.accountId,
+				account_id: message.accountId
+			} : {},
+			...message.contextToken ? { context_token: message.contextToken } : {},
+			...message.raw === void 0 ? {} : { raw: message.raw }
+		}
+	};
+}
+//#endregion
+export { toWeixinSubmittedMessage };

package/nextclaw.extension.json

@@ -13,9 +13,6 @@
         "id": "weixin",
         "name": "Weixin",
         "description": "Weixin QR login + getupdates long-poll channel",
-        "outbound": {
-          "text": true
-        },
         "auth": {
           "type": "request-response"
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/channel-extension-weixin",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "private": false,
   "description": "NextClaw Weixin channel extension process.",
   "type": "module",
@@ -18,9 +18,9 @@
     "README.md"
   ],
   "dependencies": {
-    "@nextclaw/extension-sdk": "0.1.6",
-    "@nextclaw/ncp": "0.5.12",
-    "@nextclaw/ncp-toolkit": "0.5.17"
+    "@nextclaw/extension-sdk": "0.1.7",
+    "@nextclaw/ncp": "0.5.13",
+    "@nextclaw/ncp-toolkit": "0.5.18"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",

package/dist/services/weixin-extension-runtime.service.d.ts

@@ -1,26 +0,0 @@
-import { WeixinChannelAdapter } from "../types/weixin-extension.types.js";
-import { ExtensionChannel } from "@nextclaw/extension-sdk";
-
-//#region src/services/weixin-extension-runtime.service.d.ts
-declare class WeixinExtensionRuntime {
-  private readonly channel;
-  private readonly adapter;
-  private readonly cleanups;
-  private started;
-  constructor(channel: ExtensionChannel, adapter: WeixinChannelAdapter);
-  readonly start: () => Promise<void>;
-  readonly stop: () => Promise<void>;
-  readonly sendOutboundText: (params: {
-    to: string;
-    text: string;
-    accountId?: string | null;
-  }) => Promise<{
-    accepted: true;
-  }>;
-  private readonly applyConfig;
-  private readonly submitMessage;
-  private readonly sendNcpEvent;
-  private readonly drainCleanups;
-}
-//#endregion
-export { WeixinExtensionRuntime };

package/dist/services/weixin-extension-runtime.service.js

@@ -1,70 +0,0 @@
-//#region src/services/weixin-extension-runtime.service.ts
-var WeixinExtensionRuntime = class {
-	cleanups = [];
-	started = false;
-	constructor(channel, adapter) {
-		this.channel = channel;
-		this.adapter = adapter;
-	}
-	start = async () => {
-		if (this.started) return;
-		this.started = true;
-		this.cleanups.push(this.adapter.onMessage(this.submitMessage));
-		this.cleanups.push(this.channel.onNcpEvent(this.sendNcpEvent));
-		this.cleanups.push(this.channel.config.onChange(async () => {
-			await this.applyConfig();
-		}));
-		await this.applyConfig();
-	};
-	stop = async () => {
-		if (!this.started) return;
-		this.started = false;
-		this.drainCleanups();
-		await this.adapter.stop();
-	};
-	sendOutboundText = async (params) => {
-		await this.adapter.sendOutboundText(params);
-		return { accepted: true };
-	};
-	applyConfig = async () => {
-		const config = await this.channel.config.get();
-		await this.adapter.configure(config);
-		if (config.enabled === false) {
-			await this.adapter.stop();
-			return;
-		}
-		await this.adapter.start();
-	};
-	submitMessage = async (message) => {
-		await this.channel.submitMessage({
-			conversationId: message.conversationId,
-			senderId: message.senderId,
-			content: {
-				type: "text",
-				text: message.text
-			},
-			...message.attachments ? { attachments: message.attachments } : {},
-			metadata: {
-				...message.accountId ? {
-					accountId: message.accountId,
-					account_id: message.accountId
-				} : {},
-				...message.contextToken ? { context_token: message.contextToken } : {},
-				...message.raw === void 0 ? {} : { raw: message.raw }
-			}
-		});
-	};
-	sendNcpEvent = async (event) => {
-		try {
-			await this.adapter.sendNcpEvent(event);
-		} catch (error) {
-			const message = error instanceof Error ? error.message : String(error);
-			console.warn(`[weixin] failed to send NCP event: ${message}`);
-		}
-	};
-	drainCleanups = () => {
-		for (const cleanup of this.cleanups.splice(0).reverse()) cleanup();
-	};
-};
-//#endregion
-export { WeixinExtensionRuntime };