@honor-claw/yoyo 1.5.1 → 1.6.0-beta.1

package/dist/cloud-channel/authorization-refresh-manager.mjs

@@ -0,0 +1,89 @@
+import { useClawLogger as e } from "../utils/logger.mjs";
+import { getConfigManager as t } from "../modules/configs/config-manager.mjs";
+import { cacheAuthorizationToken as n, getPersistedIdentity as r, parseAuthorizationExpireMs as i } from "../modules/configs/identity-persist.mjs";
+import "../modules/configs/index.mjs";
+//#region src/cloud-channel/authorization-refresh-manager.ts
+var a = "[yoyoclaw-auth-refresh]", o = .3, s = .1, c = 1e3, l = 6e4, u = class {
+	timer = null;
+	config;
+	scheduleVersion = 0;
+	destroyed = !1;
+	pausedForExpiredToken = !1;
+	constructor(e) {
+		this.config = e;
+	}
+	async schedule() {
+		if (this.destroyed || this.pausedForExpiredToken) return;
+		let t = ++this.scheduleVersion;
+		this.clearTimer();
+		let n = await this.loadRefreshState();
+		if (this.destroyed || t !== this.scheduleVersion || !n) return;
+		let r = Date.now(), i = n.refreshImmediately ? r : n.receivedAtMs + n.expireMs * o, c = n.receivedAtMs + n.expireMs;
+		if (r < i) {
+			this.scheduleTimer(i - r), e().debug?.(`${a} scheduled refresh, receivedAtMs: ${n.receivedAtMs}, refreshAtMs: ${Math.floor(i)}, expireAtMs: ${Math.floor(c)}`);
+			return;
+		}
+		if (r >= c) {
+			e().warn(`${a} token is expired, skip refresh, receivedAtMs: ${n.receivedAtMs}, expireAtMs: ${Math.floor(c)}`);
+			return;
+		}
+		this.sendUpdateAuthorizationRequest(), this.scheduleTimer(n.expireMs * s);
+	}
+	async handleAuthorizationUpdate(t) {
+		let r = t.bizExtInfo, i = r?.jwtToken;
+		if (typeof i != "string" || !i.trim()) {
+			e().warn(`${a} updateAuthorization missing valid jwtToken`);
+			return;
+		}
+		try {
+			let o = Date.now(), s = (await n(i.trim(), r?.expire, o))?.authorizationCache?.expireMs ?? 0;
+			e().info(`${a} cached new token, expireMs: ${s}, receivedAtMs: ${o}, sourceDeviceId: ${t.sourceDeviceId || "unknown"}, sourceRole: ${t.sourceRole || "unknown"}`), this.pausedForExpiredToken = !1, await this.schedule();
+		} catch (t) {
+			e().error(`${a} failed to cache new token: ${String(t)}`);
+		}
+	}
+	destroy() {
+		this.destroyed = !0, this.scheduleVersion++, this.clearTimer();
+	}
+	pauseForExpiredToken() {
+		this.destroyed || this.pausedForExpiredToken || !this.timer || (this.pausedForExpiredToken = !0, this.scheduleVersion++, this.clearTimer(), e().warn(`${a} paused refresh because cloud reported current token is expired`));
+	}
+	async loadRefreshState() {
+		let o = t().getUserConfig()?.token;
+		if (!o) return e().debug?.(`${a} skip refresh, no current token`), null;
+		let s = (await r())?.authorizationCache, c = i(s?.expireMs), u = s?.receivedAtMs ?? 0;
+		if (!c || !Number.isFinite(u) || u <= 0) {
+			let t = Date.now();
+			return await n(o, l, t), e().warn(`${a} missing cached authorization timing, persisted legacy token timing and refreshing immediately`), {
+				receivedAtMs: t,
+				expireMs: l,
+				refreshImmediately: !0
+			};
+		}
+		return {
+			receivedAtMs: u,
+			expireMs: c
+		};
+	}
+	sendUpdateAuthorizationRequest() {
+		let { deviceInfo: t } = this.config, n = {
+			msgType: "updateAuthorization",
+			sourceRole: "yoyoclaw",
+			sourceDeviceId: t.deviceId,
+			targetRole: "yoyoclawservice",
+			port: t.port
+		};
+		this.config.sendMessage(n) ? e().info(`${a} sent updateAuthorization request`) : e().warn(`${a} failed to send updateAuthorization request`);
+	}
+	scheduleTimer(e) {
+		let t = Math.max(c, Math.floor(e));
+		this.timer = setTimeout(() => {
+			this.schedule();
+		}, t);
+	}
+	clearTimer() {
+		this.timer &&= (clearTimeout(this.timer), null);
+	}
+};
+//#endregion
+export { u as AuthorizationRefreshManager };

package/dist/cloud-channel/channel.mjs

@@ -1,25 +1,31 @@
 import { useClawLogger as e } from "../utils/logger.mjs";
 import { AdminClientManager as t } from "./admin-client-manager.mjs";
-import { ClawCloudSocketClient as n } from "./client.mjs";
-import { MessageHandler as r } from "./message-handler.mjs";
-import { SessionManager as i } from "./session-manager.mjs";
+import { AuthorizationRefreshManager as n } from "./authorization-refresh-manager.mjs";
+import { ClawCloudSocketClient as r } from "./client.mjs";
+import { MessageHandler as i } from "./message-handler.mjs";
+import { SessionManager as a } from "./session-manager.mjs";
 //#region src/cloud-channel/channel.ts
-var a = class {
+var o = class {
 	cloudClient;
 	sessionManager;
 	adminClientManager;
+	authorizationRefreshManager;
 	messageHandler;
 	config;
 	constructor(e) {
-		this.config = e, this.sessionManager = new i(), this.adminClientManager = new t({ onStatusEvent: this.handleStatusEvent }), this.messageHandler = new r({
+		this.config = e, this.sessionManager = new a(), this.adminClientManager = new t({ onStatusEvent: this.handleStatusEvent }), this.authorizationRefreshManager = new n({
+			deviceInfo: e.deviceInfo,
+			sendMessage: (e) => this.cloudClient.send(e)
+		}), this.messageHandler = new i({
 			sessionManager: this.sessionManager,
 			adminClientManager: this.adminClientManager,
 			config: {
 				deviceInfo: e.deviceInfo,
 				onStatusEvent: this.handleStatusEvent,
-				onReply: (e) => this.cloudClient.send(e)
+				onReply: (e) => this.cloudClient.send(e),
+				onAuthorizationUpdate: (e) => this.authorizationRefreshManager.handleAuthorizationUpdate(e)
 			}
-		}), this.cloudClient = new n({
+		}), this.cloudClient = new r({
 			deviceInfo: e.deviceInfo,
 			userInfo: e.userInfo,
 			onMessage: this.messageHandler.handleCloudMessage,
@@ -28,6 +34,7 @@ var a = class {
 			onRemoteDeviceOffline: this.handleRemoteDeviceOffline,
 			onDeviceNotRegistered: this.handleDeviceNotRegistered,
 			onUnauthorized: this.handleUnauthorized,
+			onCloudTokenExpired: this.handleCloudTokenExpired,
 			onStatusEvent: this.handleStatusEvent
 		}), this.adminClientManager.init();
 	}
@@ -35,10 +42,10 @@ var a = class {
 		e().info("[yoyoclaw-channel] starting connection"), this.adminClientManager.ensureConnected(), this.cloudClient.connect();
 	}
 	destroy() {
-		e().info("[yoyoclaw-channel] closing connection"), this.sessionManager.closeAllNodeGatewayClients(), this.adminClientManager.destroy(), this.cloudClient.close();
+		e().info("[yoyoclaw-channel] closing connection"), this.authorizationRefreshManager.destroy(), this.sessionManager.closeAllNodeGatewayClients(), this.adminClientManager.destroy(), this.cloudClient.close();
 	}
 	handleCloudOpen = () => {
-		e().info("[yoyoclaw-channel] cloud connection established"), this.config.onOpen?.();
+		e().info("[yoyoclaw-channel] cloud connection established"), this.authorizationRefreshManager.schedule(), this.config.onOpen?.();
 	};
 	handleStatusEvent = (e) => {
 		this.config.onStatusEvent?.(e);
@@ -55,6 +62,9 @@ var a = class {
 	handleUnauthorized = () => {
 		e().info("[yoyoclaw-channel] unauthorized connection, notifying connection layer"), this.config.onUnauthorized?.();
 	};
+	handleCloudTokenExpired = () => {
+		this.authorizationRefreshManager.pauseForExpiredToken();
+	};
 };
 //#endregion
-export { a as ClawChannel };
+export { o as ClawChannel };

package/dist/cloud-channel/client.mjs

@@ -1,10 +1,11 @@
 import { useClawLogger as e } from "../utils/logger.mjs";
 import { StatusEventType as t } from "../services/connection/status-tracker/events.mjs";
 import { rawDataToString as n } from "../utils/ws.mjs";
-import { buildCloudSocketConnectParams as r } from "./utils.mjs";
-import i from "ws";
+import { YOYO_CLAW_SERVICE_CODES as r } from "./types.mjs";
+import { buildCloudSocketConnectParams as i } from "./utils.mjs";
+import a from "ws";
 //#region src/cloud-channel/client.ts
-var a = 3e4, o = 4e3, s = 1e3, c = 2, l = 999, u = class {
+var o = 3e4, s = 4e3, c = 1e3, l = 2, u = 999, d = class {
 	ws = null;
 	options;
 	retryCount = 0;
@@ -17,14 +18,14 @@ var a = 3e4, o = 4e3, s = 1e3, c = 2, l = 999, u = class {
 		this.options = e;
 	}
 	connect(e = !1) {
-		if (this.ws?.readyState === i.OPEN) return;
+		if (this.ws?.readyState === a.OPEN) return;
 		this.clearRetryTimer();
-		let { deviceInfo: n, userInfo: a } = this.options, { url: o, traceId: s, wsOptions: c } = r(n, a);
+		let { deviceInfo: n, userInfo: r } = this.options, { url: o, traceId: s, wsOptions: c } = i(n, r);
 		this.currentTraceId = s, this.options.onStatusEvent?.({
 			type: t.CLOUD_SOCKET_CONNECTING,
 			timestamp: Date.now(),
 			data: { url: o }
-		}), this.ws = new i(o, c), this.ws.on("open", this.handleOpen.bind(this, o, e)), this.ws.on("message", this.onMessage), this.ws.on("pong", this.handlePong), this.ws.on("close", this.handleClose), this.ws.on("error", this.handleError);
+		}), this.ws = new a(o, c), this.ws.on("open", this.handleOpen.bind(this, o, e)), this.ws.on("message", this.onMessage), this.ws.on("pong", this.handlePong), this.ws.on("close", this.handleClose), this.ws.on("error", this.handleError);
 	}
 	handleOpen = (n, r) => {
 		let i = r ? "reconnected" : "connected";
@@ -63,7 +64,7 @@ var a = 3e4, o = 4e3, s = 1e3, c = 2, l = 999, u = class {
 		});
 	};
 	send(t) {
-		if (!this.ws || this.ws.readyState !== i.OPEN) return e().error("[claw-cloud-socket] cannot send message: connection not open"), !1;
+		if (!this.ws || this.ws.readyState !== a.OPEN) return e().error("[claw-cloud-socket] cannot send message: connection not open"), !1;
 		try {
 			let e = JSON.stringify(t);
 			return this.ws.send(e), !0;
@@ -80,22 +81,25 @@ var a = 3e4, o = 4e3, s = 1e3, c = 2, l = 999, u = class {
 	}
 	onMessage = async (t) => {
 		try {
-			let r = n(t), i = JSON.parse(r);
-			if (e().debug?.(`[yoyoclaw-channel] received cloud message from session ${i.wsOutputEvent?.sourceDeviceId}, deviceId ${i.wsOutputEvent?.sourceDeviceInfo?.deviceId || "nil"}, ${r.slice(0, 3e3)}`), i.code === "YOYO_CLAW_100000") {
-				if (i.wsOutputEvent) {
-					i.sessionInfo && (i.wsOutputEvent.sessionInfo = i.sessionInfo), this.options.onMessage?.(i.wsOutputEvent);
+			let i = n(t), a = JSON.parse(i), o = a.wsOutputEvent;
+			if (e().debug?.(`[claw-cloud-socket] received cloud socket message, code: ${a.code}, msgType: ${o?.msgType || "none"}, sourceRole: ${o?.sourceRole || "cloud"}, sourceSession: ${o?.sourceDeviceId || "none"}, sourceDevice: ${o?.sourceDeviceInfo?.deviceId || "none"}, ${i.slice(0, 3e3)}`), a.code === r.SUCCESS) {
+				if (a.wsOutputEvent) {
+					a.sessionInfo && (a.wsOutputEvent.sessionInfo = a.sessionInfo), this.options.onMessage?.(a.wsOutputEvent);
 					return;
 				}
-			} else if (i.code === "YOYO_CLAW_100002") {
-				if (i.extData?.offlineSocketId) {
-					e().info(`[claw-cloud-socket] remote device offline, session: ${i.extData.offlineSocketId}`), this.options.onRemoteDeviceOffline?.(i.extData.offlineSocketId);
+			} else if (a.code === r.TARGET_DEVICE_OFFLINE) {
+				if (a.extData?.offlineSocketId) {
+					e().info(`[claw-cloud-socket] remote device offline, session: ${a.extData.offlineSocketId}`), this.options.onRemoteDeviceOffline?.(a.extData.offlineSocketId);
 					return;
 				}
-			} else if (i.code === "YOYO_CLAW_100001") {
+			} else if (a.code === r.DEVICE_NOT_REGISTERED) {
 				this.pauseRetry(), e().info("[claw-cloud-socket] device not registered, closing connection"), this.options.onDeviceNotRegistered?.();
 				return;
+			} else if (a.code === r.TOKEN_EXPIRED) {
+				e().warn(`[claw-cloud-socket] token expired when sending message to cloud, waiting for lazy refresh: ${a.cnMessage}, code: ${a.code}`), this.options.onCloudTokenExpired?.();
+				return;
 			}
-			e().warn(`[claw-cloud-socket] unexpected message: ${i.cnMessage}, code: ${i.code}`);
+			e().warn(`[claw-cloud-socket] unexpected message: ${a.cnMessage}, code: ${a.code}`);
 		} catch (t) {
 			e().error(`[claw-cloud-socket] failed to parse message: ${t instanceof Error ? t.message : String(t)}`);
 		}
@@ -107,7 +111,7 @@ var a = 3e4, o = 4e3, s = 1e3, c = 2, l = 999, u = class {
 		}
 		this.clearRetryTimer();
 		let n = this.calculateRetryDelay();
-		this.retryCount = Math.min(this.retryCount + 1, l), e().info(`[claw-cloud-socket] scheduling reconnect attempt ${this.retryCount} in ${n}ms`), this.options.onStatusEvent?.({
+		this.retryCount = Math.min(this.retryCount + 1, u), e().info(`[claw-cloud-socket] scheduling reconnect attempt ${this.retryCount} in ${n}ms`), this.options.onStatusEvent?.({
 			type: t.CLOUD_SOCKET_RETRY,
 			timestamp: Date.now(),
 			data: {
@@ -122,12 +126,12 @@ var a = 3e4, o = 4e3, s = 1e3, c = 2, l = 999, u = class {
 		this.retryTimer &&= (clearTimeout(this.retryTimer), null);
 	}
 	calculateRetryDelay() {
-		let e = s * c ** +Math.min(this.retryCount, 2);
-		return Math.min(e, o);
+		let e = c * l ** +Math.min(this.retryCount, 2);
+		return Math.min(e, s);
 	}
 	startPingTimer() {
 		this.pingTimer = setInterval(() => {
-			if (!this.ws || this.ws.readyState !== i.OPEN) {
+			if (!this.ws || this.ws.readyState !== a.OPEN) {
 				this.stopPingTimer();
 				return;
 			}
@@ -144,7 +148,7 @@ var a = 3e4, o = 4e3, s = 1e3, c = 2, l = 999, u = class {
 			} catch {
 				e().error("[claw-cloud-socket] failed to send pingMessage");
 			}
-		}, a);
+		}, o);
 	}
 	stopPingTimer() {
 		this.pingTimer &&= (clearInterval(this.pingTimer), null);
@@ -153,8 +157,8 @@ var a = 3e4, o = 4e3, s = 1e3, c = 2, l = 999, u = class {
 		this.isRetryPaused || (this.isRetryPaused = !0, this.clearRetryTimer(), e().info("[claw-cloud-socket] retry paused"));
 	}
 	resumeRetry() {
-		this.isRetryPaused && (this.isRetryPaused = !1, e().info("[claw-cloud-socket] retry resumed"), (!this.ws || this.ws.readyState !== i.OPEN) && (this.retryCount = 0, this.connect(!0)));
+		this.isRetryPaused && (this.isRetryPaused = !1, e().info("[claw-cloud-socket] retry resumed"), (!this.ws || this.ws.readyState !== a.OPEN) && (this.retryCount = 0, this.connect(!0)));
 	}
 };
 //#endregion
-export { u as ClawCloudSocketClient };
+export { d as ClawCloudSocketClient };

package/dist/cloud-channel/message-handler.mjs

@@ -37,6 +37,9 @@ var r = { style: "SOUL.md" }, i = "[yoyoclaw-channel]", a = class {
 			case "fetchContexts":
 				this.handleContextRequest(e);
 				break;
+			case "updateAuthorization":
+				this.config.onAuthorizationUpdate?.(e);
+				break;
 		}
 	};
 	handlePairMessage(n) {
@@ -275,7 +278,7 @@ var r = { style: "SOUL.md" }, i = "[yoyoclaw-channel]", a = class {
 			ok: !1,
 			error: "Admin gateway client not ready"
 		};
-		let { content: n } = t || {};
+		let n = typeof t?.content == "string" ? t.content : "";
 		if (!n) return {
 			ok: !1,
 			error: "Missing content in context payload"
@@ -294,7 +297,7 @@ var r = { style: "SOUL.md" }, i = "[yoyoclaw-channel]", a = class {
 			ok: !1,
 			error: "Admin gateway client not ready"
 		};
-		let { provider: r, id: i } = n;
+		let r = typeof n?.provider == "string" ? n.provider : "", i = typeof n?.id == "string" ? n.id : "";
 		if (!r || !i) return {
 			ok: !1,
 			error: "Missing provider or id in context payload"

package/dist/cloud-channel/types.mjs

@@ -0,0 +1,13 @@
+import "../services/connection/status-tracker/events.mjs";
+//#region src/cloud-channel/types.ts
+var e = {
+	SUCCESS: "YOYO_CLAW_100000",
+	DEVICE_NOT_REGISTERED: "YOYO_CLAW_100001",
+	TARGET_DEVICE_OFFLINE: "YOYO_CLAW_100002",
+	NOT_PAIRED: "YOYO_CLAW_100003",
+	INVALID_PARAMS: "YOYO_CLAW_100004",
+	INTERNAL_ERROR: "YOYO_CLAW_100005",
+	TOKEN_EXPIRED: "YOYO_CLAW_100012"
+};
+//#endregion
+export { e as YOYO_CLAW_SERVICE_CODES };

package/dist/commands/env/impl.mjs

@@ -6,7 +6,7 @@ var n = {
 	manual: "manual config"
 };
 function r(r, i) {
-	return i.command("env").description("Manage runtime environment (dev/test/production)").option("--set <env>", "Set environment: dev, test or production").option("--gray <tag>", "Set gray header").option("--reset", "Reset env source to environment variable").action(async (r) => {
+	i.command("env").description("Manage runtime environment (dev/test/production)").option("--set <env>", "Set environment: dev, test or production").option("--gray <tag>", "Set gray header").option("--reset", "Reset env source to environment variable").action(async (r) => {
 		let { set: i, gray: a, reset: o } = r, s = e();
 		try {
 			let e = t();

package/dist/commands/login/impl.mjs

@@ -1,14 +1,13 @@
 import { performLogin as e } from "../../modules/login/impl.mjs";
 //#region src/commands/login/impl.ts
 function t(t, n) {
-	let r = n.command("login").description("login to yoyoclaw and register devices");
-	return r = r.option("-u, --uid <userId>", "user ID for direct login").option("--token <token>", "token for direct login").action(async (n) => {
+	n.command("login").description("login to yoyoclaw and register devices").option("-u, --uid <userId>", "user ID for direct login").option("--token <token>", "token for direct login").action(async (n) => {
 		let { uid: r, token: i } = n;
 		t.logger.debug?.("honor login CLI command called"), await e({
 			userId: r,
 			token: i
 		});
-	}), r;
+	});
 }
 //#endregion
 export { t as registerLoginCommand };

package/dist/commands/logout/impl.mjs

@@ -1,7 +1,7 @@
 import { performLogout as e } from "../../honor-auth/cloud.mjs";
 //#region src/commands/logout/impl.ts
 function t(t, n) {
-	return n.command("logout").description("Logout and clear user configuration").action(async () => {
+	n.command("logout").description("Logout and clear user configuration").action(async () => {
 		t.logger.info("logout CLI command called");
 		try {
 			await e(), console.log("✅ Logout successful, gateway will automatically restart to handle new configuration");

package/dist/commands/status/index.mjs

@@ -5,7 +5,7 @@ import { StatusStorage as r } from "../../services/connection/status-tracker/sto
 import "../../services/connection/status-tracker/index.mjs";
 //#region src/commands/status/index.ts
 function i(i, o) {
-	return o.command("status").description("Show YOYOClaw connection status").action(async () => {
+	o.command("status").description("Show YOYOClaw connection status").action(async () => {
 		if (i.logger.debug?.("YOYOClaw status CLI command called"), !await n()) {
 			console.log("❌ You need to login first. Please run: openclaw honor login");
 			return;

package/dist/honor-auth/browser.mjs

@@ -38,7 +38,10 @@ async function c(c, l) {
 			authConfig: u
 		});
 		if (!e?.jwtToken) throw Error("failed to get jwt token");
-		return await o({ jwtToken: e.jwtToken }, u.saveToFile !== !1), { token: e.jwtToken };
+		return await o({
+			jwtToken: e.jwtToken,
+			expire: e.expire
+		}, u.saveToFile !== !1), { token: e.jwtToken };
 	} catch (t) {
 		throw e(t, "get token failed");
 	}

package/dist/honor-auth/token-manager.mjs

@@ -3,62 +3,66 @@ import { wrapError as t } from "../utils/error.mjs";
 import { useClawLogger as n } from "../utils/logger.mjs";
 import { getConfigManager as r } from "../modules/configs/config-manager.mjs";
 import { createClawCloudClient as i } from "../apis/claw-cloud.mjs";
+import { cacheAuthorizationToken as a, clearCachedAuthorizationToken as o, getPersistedIdentity as s } from "../modules/configs/identity-persist.mjs";
 import "../modules/configs/index.mjs";
-import { getDeviceInfo as a } from "../modules/device/device-info.mjs";
+import { getDeviceInfo as c } from "../modules/device/device-info.mjs";
 import "../modules/device/index.mjs";
 //#region src/honor-auth/token-manager.ts
-async function o(e, o = !0) {
+async function l(e, a = !0) {
 	try {
-		let t = r(), s = e.jwtToken;
-		if (!s && e.userId) {
-			let t = e.deviceInfo || await a();
-			s = (await i().exchangeToken(t, { userId: e.userId })).jwtToken;
+		let t = r(), o = e.jwtToken, s = e.expire;
+		if (!o && e.userId) {
+			let t = e.deviceInfo || await c(), n = await i().exchangeToken(t, { userId: e.userId });
+			o = n.jwtToken, s = n.expire;
 		}
-		if (!s) throw Error("no token available");
-		if (!o) return n().info("💾 token got, but not to save"), { token: s };
-		let c = Math.floor(Date.now() / 1e3) + 720 * 60 * 60;
-		return await t.updateUserConfig({
-			token: s,
-			userId: void 0,
-			expired: c
-		}), { token: s };
+		if (!o) throw Error("no token available");
+		return a ? (await t.updateUserConfig({
+			token: o,
+			userId: void 0
+		}), await p(o, s), { token: o }) : (n().info("💾 token got, but not to save"), { token: o });
 	} catch (e) {
 		throw t(e, "保存Token失败");
 	}
 }
-async function s(e) {
-	let t = await a(), n = await i().exchangeToken(t, { userId: e });
-	if (n.jwtToken) {
-		let e = Math.floor(Date.now() / 1e3) + 720 * 60 * 60;
-		return await r().updateUserConfig({
-			token: n.jwtToken,
-			userId: void 0,
-			userName: void 0,
-			expired: e
-		}), { token: n.jwtToken };
-	}
-	return await r().clearUserConfig(), null;
+async function u(e) {
+	let t = await c(), n = await i().exchangeToken(t, { userId: e });
+	return n.jwtToken ? (await r().updateUserConfig({
+		token: n.jwtToken,
+		userId: void 0,
+		userName: void 0
+	}), await p(n.jwtToken, n.expire), { token: n.jwtToken }) : (await r().clearUserConfig(), null);
 }
-async function c() {
-	let i = n();
+async function d(i = {}) {
+	let a = n();
 	try {
-		let t = r(), n = t.getUserConfig(), a = e();
-		if (i.debug?.(`[yoyoclaw-auth] env userId: ${a ? "present" : "absent"}, config userId: ${n?.userId ? "present" : "absent"}, config token: ${n?.token ? "present" : "absent"}`), n?.userId) return await s(a || n.userId);
-		if (n?.token) {
-			if (!n.expired || n.expired >= Math.floor(Date.now() / 1e3)) return { token: n.token };
-			i.debug?.("[yoyoclaw-auth] cached token expired");
+		let t = r(), n = t.getUserConfig(), c = e();
+		if (a.debug?.(`[yoyoclaw-auth] env userId: ${c ? "present" : "absent"}, config userId: ${n?.userId ? "present" : "absent"}, config token: ${n?.token ? "present" : "absent"}`), i.migrateCachedAuthorization) {
+			let e = (await s())?.authorizationCache?.jwtToken;
+			if (e) return a.info("[yoyoclaw-auth] migrating cached token to plugin config"), await t.updateUserConfig({
+				...n ?? {},
+				token: e,
+				userId: void 0,
+				expired: void 0
+			}), await o(), n = t.getUserConfig(), { token: e };
 		}
-		return a ? (i.debug?.("[yoyoclaw-auth] token expired, using env userId to exchange token"), await s(a)) : (n?.token && (i.debug?.("[yoyoclaw-auth] clearing expired token"), await t.clearUserConfig()), null);
+		return n?.userId ? await u(c || n.userId) : n?.token ? { token: n.token } : c ? (a.debug?.("[yoyoclaw-auth] no token, using env userId to exchange token"), await u(c)) : null;
 	} catch (e) {
 		throw t(e, "加载Token失败");
 	}
 }
-async function l() {
+async function f() {
 	try {
 		await r().clearUserConfig(), n().info("[yoyoclaw-auth] token cleared");
 	} catch (e) {
 		throw t(e, "清除Token失败");
 	}
 }
+async function p(e, t) {
+	try {
+		await a(e, t);
+	} catch (e) {
+		n().warn(`[yoyoclaw-auth] failed to cache token metadata: ${String(e)}`);
+	}
+}
 //#endregion
-export { l as clearToken, c as loadToken, o as saveToken };
+export { f as clearToken, d as loadToken, l as saveToken };

package/dist/modules/configs/identity-persist.mjs

@@ -1,51 +1,73 @@
-import { useClawLogger as e } from "../../utils/logger.mjs";
-import { safeReadFile as t, safeWriteFile as n } from "../../utils/fs-safe.mjs";
-import { resolveEffectiveHomeDir as r } from "../../utils/home-dir.mjs";
-import i from "node:path";
+import { wrapError as e } from "../../utils/error.mjs";
+import { useClawLogger as t } from "../../utils/logger.mjs";
+import { safeReadFile as n, safeWriteFile as r } from "../../utils/fs-safe.mjs";
+import { resolveEffectiveHomeDir as i } from "../../utils/home-dir.mjs";
+import a from "node:path";
 //#region src/modules/configs/identity-persist.ts
-var a = /* @__PURE__ */ function(e) {
+var o = /* @__PURE__ */ function(e) {
 	return e[e.LEGACY = 1] = "LEGACY", e[e.NEW = 2] = "NEW", e;
-}({}), o = ".openclaw", s = "yoyo", c = "identity.json";
-function l() {
-	return i.join(o, s, c);
+}({}), s = ".openclaw", c = "yoyo", l = "identity.json", u = 6e4;
+function d() {
+	return a.join(s, c, l);
 }
-async function u(n) {
-	let r = l();
+async function f(t) {
+	let r = d();
 	try {
-		let e = (await t({
-			rootDir: n,
+		let e = (await n({
+			rootDir: t,
 			relativePath: r,
 			maxBytes: 10 * 1024
 		})).buffer.toString("utf8"), i = JSON.parse(e);
-		return typeof i != "object" || !i ? p() : {
-			...p(),
+		return typeof i != "object" || !i ? v() : {
+			...v(),
 			...i
 		};
 	} catch (t) {
-		return e().warn(`[yoyo-identity] failed to read identity: ${t.message}`), null;
+		return e(t, "[yoyo-identity] failed to read identity"), null;
 	}
 }
-async function d() {
-	let t = r();
-	return t ? await u(t) || null : (e().warn("[yoyo-identity] failed to find home dir"), null);
+async function p() {
+	let e = i();
+	return e ? await f(e) || null : (t().warn("[yoyo-identity] failed to find home dir"), null);
 }
-async function f(t) {
-	let i = r();
-	if (!i) return e().warn("[yoyo-identity] failed to find home dir"), null;
-	let o = await u(i), s = {
-		...o,
-		version: o?.version || a.NEW
+async function m(e) {
+	let n = i();
+	if (!n) return t().warn("[yoyo-identity] failed to find home dir"), null;
+	let a = await f(n), s = {
+		...a,
+		version: a?.version || o.NEW
 	};
-	return t.legacyDeviceId && (s.legacyDeviceId = t.legacyDeviceId), t.deviceId && (s.deviceId = t.deviceId, s.publicKeyPem = t.publicKeyPem, s.privateKeyPem = t.privateKeyPem, s.createdAtMs = t.createdAtMs), t.version && (s.version = t.version), "gatewayAuthMd5" in t && (s.gatewayAuthMd5 = t.gatewayAuthMd5), "pluginVersionCode" in t && (s.pluginVersionCode = t.pluginVersionCode), await n({
-		rootDir: i,
-		relativePath: l(),
+	return e.legacyDeviceId && (s.legacyDeviceId = e.legacyDeviceId), e.deviceId && (s.deviceId = e.deviceId, s.publicKeyPem = e.publicKeyPem, s.privateKeyPem = e.privateKeyPem, s.createdAtMs = e.createdAtMs), e.version && (s.version = e.version), "gatewayAuthMd5" in e && (s.gatewayAuthMd5 = e.gatewayAuthMd5), "pluginVersionCode" in e && (s.pluginVersionCode = e.pluginVersionCode), "authorizationCache" in e && (s.authorizationCache = e.authorizationCache), await r({
+		rootDir: n,
+		relativePath: d(),
 		data: JSON.stringify(s, null, 2),
 		encoding: "utf8",
 		mkdir: !0
 	}), s;
 }
-function p() {
-	return { version: a.NEW };
+function h(e) {
+	let t = typeof e == "number" ? e : typeof e == "string" && e.trim() ? Number(e) : 0;
+	return !Number.isFinite(t) || t < u ? 0 : Math.floor(t);
+}
+async function g(e, t, n = Date.now()) {
+	let r = await m({ authorizationCache: {
+		jwtToken: e,
+		receivedAtMs: n,
+		expireMs: h(t)
+	} });
+	if (!r) throw Error("failed to write authorization cache");
+	return r;
+}
+async function _() {
+	let e = await p(), t = e?.authorizationCache;
+	return t?.jwtToken ? m({ authorizationCache: {
+		jwtToken: void 0,
+		receivedAtMs: t.receivedAtMs,
+		expireMs: h(t.expireMs)
+	} }) : e;
+}
+function v() {
+	return { version: o.NEW };
 }
 //#endregion
-export { a as IdentityVersion, d as getPersistedIdentity, f as updatePersistedIdentity };
+export { o as IdentityVersion, g as cacheAuthorizationToken, _ as clearCachedAuthorizationToken, p as getPersistedIdentity, h as parseAuthorizationExpireMs, m as updatePersistedIdentity };

package/dist/services/connection/impl.mjs

@@ -50,7 +50,7 @@ async function _() {
 }
 async function v() {
 	try {
-		let t = await o();
+		let t = await o({ migrateCachedAuthorization: !0 });
 		if (t?.token) {
 			e().info("[yoyoclaw-conn] token found, creating channel"), await y(await i(), t);
 			return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@honor-claw/yoyo",
-  "version": "1.5.1",
+  "version": "1.6.0-beta.1",
   "description": "OpenClaw Honor Yoyo connection plugin",
   "keywords": [
     "ai",
@@ -49,7 +49,6 @@
     "@types/node": "^25.0.10",
     "@types/ws": "^8.5.13",
     "@vitest/coverage-v8": "^2.1.8",
-    "commander": "^14.0.3",
     "typescript": "^6.0.2",
     "vite": "^8.0.10",
     "vitest": "^2.1.8"