@aka_openclaw_plugin/mychat 0.1.12 → 0.1.14

package/api.js

@@ -1,5 +1,5 @@
 import { a as tryGetMychatRuntime, i as setMychatRuntime, n as init_runtime, t as getMychatRuntime } from "./runtime-PfFuZ2Rm.js";
-import { t as mychatPlugin } from "./channel-BdJp6UKB.js";
+import { t as mychatPlugin } from "./channel-Cjn7oWbb.js";
 //#region api.ts
 init_runtime();
 //#endregion

package/{channel-BdJp6UKB.js → channel-Cjn7oWbb.js}

@@ -119,12 +119,11 @@ function getMychatLogger() {
 //#endregion
 //#region src/client/http-client.ts
 function createMychatHttpClient(params) {
-	const { baseUrl, token } = params;
+	const { baseUrl, token, logger } = params;
 	const base = baseUrl.replace(/\/+$/, "");
 	const prefix = mychatLogPrefix("http");
 	async function request(method, path, body) {
 		const url = `${base}${path}`;
-		const logger = getMychatLogger();
 		try {
 			const headers = { authorization: `Bearer ${token}` };
 			if (body !== void 0) headers["content-type"] = "application/json";
@@ -178,7 +177,6 @@ function createMychatHttpClient(params) {
 		},
 		async uploadFile(params) {
 			const url = `${base}/api/bot/uploads`;
-			const logger = getMychatLogger();
 			try {
 				const formData = new FormData();
 				let blob;
@@ -212,7 +210,6 @@ function createMychatHttpClient(params) {
 		},
 		async healthCheck() {
 			const url = `${base}/health`;
-			const logger = getMychatLogger();
 			const start = Date.now();
 			try {
 				const response = await fetch(url);
@@ -3777,7 +3774,7 @@ const DEFAULT_INITIAL_DELAY_MS = 1e3;
 const DEFAULT_MAX_DELAY_MS = 3e4;
 const DEFAULT_BACKOFF_MULTIPLIER = 2;
 function createMychatWsClient(params) {
-	const { wsUrl, token, botSelfId, reconnect } = params;
+	const { wsUrl, token, botSelfId, logger, reconnect } = params;
 	const initialDelay = reconnect?.initialDelayMs ?? DEFAULT_INITIAL_DELAY_MS;
 	const maxDelay = reconnect?.maxDelayMs ?? DEFAULT_MAX_DELAY_MS;
 	const backoffMultiplier = reconnect?.backoffMultiplier ?? DEFAULT_BACKOFF_MULTIPLIER;
@@ -3796,7 +3793,7 @@ function createMychatWsClient(params) {
 	}
 	function scheduleReconnect() {
 		if (reconnectTimer) return;
-		getMychatLogger()?.info(`${prefix} will reconnect in ${currentDelay}ms`);
+		logger?.info(`${prefix} will reconnect in ${currentDelay}ms`);
 		reconnectTimer = setTimeout(() => {
 			reconnectTimer = null;
 			currentDelay = Math.min(currentDelay * backoffMultiplier, maxDelay);
@@ -3805,7 +3802,6 @@ function createMychatWsClient(params) {
 	}
 	function connect() {
 		if (ws) return;
-		const logger = getMychatLogger();
 		try {
 			const url = buildUrl();
 			logger?.info(`${prefix} connecting to ${url}`);
@@ -3898,11 +3894,12 @@ function createMychatTypingListener(params) {
 }
 //#endregion
 //#region src/monitor/provider.startup.ts
-function createMychatProviderClients(account, botSelfId) {
+function createMychatProviderClients(account, botSelfId, logger) {
 	return { wsClient: createMychatWsClient({
 		wsUrl: account.wsUrl,
 		token: account.token,
 		botSelfId,
+		logger,
 		reconnect: account.reconnect
 	}) };
 }
@@ -3934,8 +3931,7 @@ function registerMychatMonitorListeners(params) {
 //#region src/monitor/provider.lifecycle.ts
 const DEFAULT_READY_TIMEOUT_MS = 15e3;
 function createMychatProviderLifecycle(params) {
-	const { httpClient, wsClient, readyTimeoutMs = DEFAULT_READY_TIMEOUT_MS } = params;
-	const logger = getMychatLogger();
+	const { httpClient, wsClient, readyTimeoutMs = DEFAULT_READY_TIMEOUT_MS, logger } = params;
 	const prefix = mychatLogPrefix("lifecycle");
 	return {
 		async waitForReady() {
@@ -4122,35 +4118,34 @@ function createMychatMessageHandler(params) {
 //#endregion
 //#region src/monitor/provider.ts
 async function monitorMychatProvider(ctx) {
-	const { account, setStatus } = ctx;
-	const logger = getMychatLogger();
+	const { account, setStatus, log: logger } = ctx;
 	const prefix = mychatLogPrefix("provider");
-	if (logger) logger.info(`${prefix} starting accountId=${account.accountId}`);
+	logger?.info(`${prefix} starting accountId=${account.accountId}`);
 	setStatus({
 		connected: false,
 		mode: "websocket"
 	});
 	const httpClient = createMychatHttpClient({
 		baseUrl: account.baseUrl,
-		token: account.token
+		token: account.token,
+		logger
 	});
-	if (logger) logger.info(`${prefix} fetching bot identity baseUrl=${account.baseUrl}`);
+	logger?.info(`${prefix} fetching bot identity baseUrl=${account.baseUrl}`);
 	const botSelf = await httpClient.getSelf();
 	if (!botSelf) {
 		const error = `MyChat provider failed to get bot identity (baseUrl=${account.baseUrl}, token=${account.token ? account.token.slice(0, 8) + "..." : "empty"})`;
-		if (logger) logger.error(`${prefix} ${error}`);
+		logger?.error(`${prefix} ${error}`);
 		setStatus({
 			connected: false,
 			lastError: error
 		});
 		throw new Error(error);
 	}
-	if (logger) logger.info(`${prefix} got bot identity botId=${botSelf.botId} name=${botSelf.name ?? "unknown"}`);
+	logger?.info(`${prefix} got bot identity botId=${botSelf.botId} name=${botSelf.name ?? "unknown"}`);
 	const health = await httpClient.healthCheck();
-	if (!health.ok) {
-		if (logger) logger.warn(`${prefix} health check failed latencyMs=${health.latencyMs} baseUrl=${account.baseUrl}`);
-	} else if (logger) logger.info(`${prefix} health check ok latencyMs=${health.latencyMs}`);
-	const { wsClient } = createMychatProviderClients(account, botSelf.botId);
+	if (!health.ok) logger?.warn(`${prefix} health check failed latencyMs=${health.latencyMs} baseUrl=${account.baseUrl}`);
+	else logger?.info(`${prefix} health check ok latencyMs=${health.latencyMs}`);
+	const { wsClient } = createMychatProviderClients(account, botSelf.botId, logger);
 	const rt = ctx.runtime;
 	rt.mychat = {
 		accountId: account.accountId,
@@ -4171,15 +4166,16 @@ async function monitorMychatProvider(ctx) {
 		}),
 		wsClient
 	});
-	if (logger) logger.info(`${prefix} starting connection lifecycle`);
+	logger?.info(`${prefix} starting connection lifecycle`);
 	const lifecycle = createMychatProviderLifecycle({
 		httpClient,
-		wsClient
+		wsClient,
+		logger
 	});
 	const readyBotSelf = await lifecycle.waitForReady();
 	if (!readyBotSelf) {
 		const error = "MyChat provider failed to connect";
-		if (logger) logger.error(`${prefix} ${error}`);
+		logger?.error(`${prefix} ${error}`);
 		setStatus({
 			connected: false,
 			lastError: error
@@ -4194,14 +4190,14 @@ async function monitorMychatProvider(ctx) {
 		mode: "websocket",
 		lastError: null
 	});
-	if (logger) logger.info(`${prefix} bot connected botId=${readyBotSelf.botId}`);
+	logger?.info(`${prefix} bot connected botId=${readyBotSelf.botId}`);
 	ctx.abortSignal?.addEventListener("abort", () => {
-		if (logger) logger.info(`${prefix} abort signal received, shutting down`);
+		logger?.info(`${prefix} abort signal received, shutting down`);
 		lifecycle.shutdown();
 		setStatus({ connected: false });
 	});
 	return { unsubscribe() {
-		if (logger) logger.info(`${prefix} unsubscribe called, shutting down`);
+		logger?.info(`${prefix} unsubscribe called, shutting down`);
 		lifecycle.shutdown();
 		setStatus({ connected: false });
 	} };
@@ -4339,14 +4335,21 @@ function createMychatPluginBase() {
 				accountId: ctx.accountId,
 				setStatus: ctx.setStatus
 			});
-			return { unsubscribe: (await monitorMychatProvider({
+			const result = await monitorMychatProvider({
 				cfg: ctx.cfg,
 				runtime: ctx.runtime,
 				account: ctx.account,
 				setStatus,
 				abortSignal: ctx.abortSignal,
 				log: ctx.log
-			})).unsubscribe };
+			});
+			await new Promise((resolve) => {
+				const originalUnsubscribe = result.unsubscribe;
+				result.unsubscribe = () => {
+					originalUnsubscribe();
+					resolve();
+				};
+			});
 		} }
 	};
 }

package/channel-plugin-api.js

@@ -1,2 +1,2 @@
-import { t as mychatPlugin } from "./channel-BdJp6UKB.js";
+import { t as mychatPlugin } from "./channel-Cjn7oWbb.js";
 export { mychatPlugin };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aka_openclaw_plugin/mychat",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "OpenClaw MyChat channel plugin",
   "repository": {
     "type": "git",

package/setup-entry.js

@@ -1,2 +1,2 @@
-import { t as mychatPlugin } from "./channel-BdJp6UKB.js";
+import { t as mychatPlugin } from "./channel-Cjn7oWbb.js";
 export { mychatPlugin };