@honor-claw/yoyo 1.6.1-beta.1 → 1.6.1-beta.2

package/dist/apis/http-client.mjs

@@ -3,6 +3,8 @@ import { getProxyUrl as t, shouldUseProxy as n } from "../utils/proxy.mjs";
 import { ProxyAgent as r, request as i } from "undici";
 //#region src/apis/http-client.ts
 var a = class extends Error {
+	status;
+	data;
 	constructor(e, t, n) {
 		super(n), this.status = e, this.data = t, this.name = "HttpError";
 	}

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

@@ -9,6 +9,7 @@ var r = { style: "SOUL.md" }, i = "[yoyoclaw-channel]", a = class {
 	config;
 	pendingFirstMessages = /* @__PURE__ */ new Map();
 	initializedDeviceIds = /* @__PURE__ */ new Set();
+	pendingNodeConnects = /* @__PURE__ */ new Map();
 	contextUpdateHandlers = {
 		style: this.updateStyleContext.bind(this),
 		"model.primary": this.updatePrimaryModel.bind(this),
@@ -116,7 +117,43 @@ var r = { style: "SOUL.md" }, i = "[yoyoclaw-channel]", a = class {
 		}
 	}
 	forwardToNodeGateway(t, n, r, a) {
-		e().info(`${i} forwarding user message to node gateway from ${n}, session: ${t}`), r.send(a);
+		e().info(`${i} forwarding user message to node gateway from ${n}, session: ${t}`);
+		let o = this.readNodeConnectRequest(a);
+		o && this.pendingNodeConnects.set(o.requestId, o.nodeId);
+		try {
+			r.send(a);
+		} catch (e) {
+			throw o && this.pendingNodeConnects.delete(o.requestId), e;
+		}
+	}
+	readNodeConnectRequest(e) {
+		let t;
+		try {
+			t = JSON.parse(e);
+		} catch {
+			return;
+		}
+		if (t.type !== "req" || t.method !== "connect" || typeof t.id != "string" || !t.params || typeof t.params != "object") return;
+		let n = t.params;
+		if (n.role !== "node" || !n.device || typeof n.device != "object") return;
+		let r = n.device;
+		if (!(typeof r.id != "string" || !r.id.trim())) return {
+			requestId: t.id,
+			nodeId: r.id
+		};
+	}
+	handleNodeConnectResponse(e) {
+		let t = e;
+		if (t.type !== "res" || typeof t.id != "string") return;
+		let n = this.pendingNodeConnects.get(t.id);
+		n && (this.pendingNodeConnects.delete(t.id), !(t.ok !== !0 || !t.payload || typeof t.payload != "object") && t.payload.type === "hello-ok" && this.armNodePairingAutoApproval(n));
+	}
+	async armNodePairingAutoApproval(t) {
+		if (!await this.adminClientManager.waitForReady()) {
+			e().warn(`${i} admin client not available for node pairing auto approval, nodeId: ${t}`);
+			return;
+		}
+		await this.adminClientManager.getClient()?.approvePendingNodePairing(t);
 	}
 	processMessageBuffer(e, t, n, r) {
 		let i = this.pendingFirstMessages.get(t);
@@ -156,7 +193,7 @@ var r = { style: "SOUL.md" }, i = "[yoyoclaw-channel]", a = class {
 				e().warn(`${i} gateway message is not valid JSON`);
 				return;
 			}
-			if (!a.ok && a.error?.code === "NOT_PAIRED") {
+			if (this.handleNodeConnectResponse(a), !a.ok && a.error?.code === "NOT_PAIRED") {
 				let r = a.error?.details?.requestId;
 				if (!r) {
 					e().warn(`${i} NOT_PAIRED without requestId, ignoring...`);

package/dist/gateway-client/admin-client.mjs

@@ -1,7 +1,8 @@
-import { GATEWAY_CLIENT_IDS as e, GATEWAY_CLIENT_MODES as t } from "./types/client.mjs";
-import { ProtocolGatewayClient as n } from "./protocol-client.mjs";
+import { useClawLogger as e } from "../utils/logger.mjs";
+import { GATEWAY_CLIENT_IDS as t, GATEWAY_CLIENT_MODES as n } from "./types/client.mjs";
+import { ProtocolGatewayClient as r } from "./protocol-client.mjs";
 //#region src/gateway-client/admin-client.ts
-var r = {
+var i = {
 	role: "operator",
 	scopes: [
 		"operator.admin",
@@ -11,12 +12,12 @@ var r = {
 		"operator.approvals",
 		"operator.pairing"
 	],
-	clientId: e.CLI,
+	clientId: t.CLI,
 	displayName: "YOYO-Control",
-	clientMode: t.BACKEND
-}, i = class extends n {
+	clientMode: n.BACKEND
+}, a = "[yoyoclaw-adminGatewayClient]", o = class extends r {
 	constructor(e = {}) {
-		super(e, r);
+		super(e, i);
 	}
 	async setAgentFile(e, t, n = "main") {
 		return this.sendRequest("agents.files.set", {
@@ -49,6 +50,16 @@ var r = {
 	async devicePairApprove(e) {
 		return this.sendRequest("device.pair.approve", { requestId: e });
 	}
+	async approvePendingNodePairing(t) {
+		let n = t.trim();
+		if (!n) return !1;
+		try {
+			let t = (await this.sendRequest("node.pair.list", {})).pending?.find((e) => e.nodeId === n);
+			return t ? (e().info(`${a} auto approving node pairing, nodeId: ${n}, requestId: ${t.requestId}`), await this.sendRequest("node.pair.approve", { requestId: t.requestId }), !0) : !1;
+		} catch (t) {
+			return e().error(`${a} node pairing auto approve failed, nodeId: ${n}, error: ${String(t)}`), !1;
+		}
+	}
 };
 //#endregion
-export { i as default };
+export { o as default };

package/dist/gateway-client/protocol-client.mjs

@@ -85,8 +85,8 @@ var l = {
 			platform: process.platform,
 			deviceFamily: f
 		}) : void 0, a = {
-			minProtocol: 3,
-			maxProtocol: 3,
+			minProtocol: 4,
+			maxProtocol: 4,
 			client: {
 				id: this.config.clientId,
 				displayName: this.config.displayName,

package/dist/modules/configs/config-manager.mjs

@@ -10,14 +10,23 @@ import { STATE_FLAG as c, hasPersistedStateFlag as l, markPersistedStateFlag as
 var d = "yoyo", f = /* @__PURE__ */ "alarm.create,alarm.delete,alarm.disable,alarm.enable,alarm.query,alarm.update,app.close,app.open,call.phone,call.search,capture-screenshot,contact.search,file-upload,hotspot,local-search,message.search,message.send,mobile-data,no-disturb,quiet-mode,ringing-mode,schedule.create,schedule.delete,schedule.search,schedule.update,screen-record,vibration-mode,volume.operate,wlan,bluetooth,location-service,nfc,usb-shared-network,eyecomfort,status-bar-show,brightness,autoscreen-onnotice,dark-mode,device-operation,camera,app.uninstall,audio-record,battery,gui.create,gui.pause,gui.terminate,mcp.tool.call,task_result_query".split(","), p = class {
 	loadConfig() {
 		try {
-			return t().config.loadConfig();
+			let e = t().config, n = e.current;
+			return typeof n == "function" ? structuredClone(n()) : structuredClone(e.loadConfig());
 		} catch (e) {
 			throw i(e, "Failed to load config");
 		}
 	}
 	async saveConfig(e) {
 		try {
-			await t().config.writeConfigFile(e);
+			let n = t().config, r = n.replaceConfigFile;
+			if (typeof r == "function") {
+				await r({
+					nextConfig: e,
+					afterWrite: { mode: "auto" }
+				});
+				return;
+			}
+			await n.writeConfigFile(e);
 		} catch (e) {
 			throw i(e, "Failed to save config");
 		}

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

@@ -4,70 +4,68 @@ 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 o = /* @__PURE__ */ function(e) {
-	return e[e.LEGACY = 1] = "LEGACY", e[e.NEW = 2] = "NEW", e;
-}({}), s = ".openclaw", c = "yoyo", l = "identity.json", u = 6e4;
-function d() {
-	return a.join(s, c, l);
+var o = ".openclaw", s = "yoyo", c = "identity.json", l = 6e4;
+function u() {
+	return a.join(o, s, c);
 }
-async function f(t) {
-	let r = d();
+async function d(t) {
+	let r = u();
 	try {
 		let e = (await n({
 			rootDir: t,
 			relativePath: r,
 			maxBytes: 10 * 1024
 		})).buffer.toString("utf8"), i = JSON.parse(e);
-		return typeof i != "object" || !i ? v() : {
-			...v(),
+		return typeof i != "object" || !i ? _() : {
+			..._(),
 			...i
 		};
 	} catch (t) {
 		return e(t, "[yoyo-identity] failed to read identity"), null;
 	}
 }
-async function p() {
+async function f() {
 	let e = i();
-	return e ? await f(e) || null : (t().warn("[yoyo-identity] failed to find home dir"), null);
+	return e ? await d(e) || null : (t().warn("[yoyo-identity] failed to find home dir"), null);
 }
-async function m(e) {
+async function p(e) {
 	let n = i();
 	if (!n) return t().warn("[yoyo-identity] failed to find home dir"), null;
-	let a = await f(n), s = {
+	let a = await d(n), o = {
 		...a,
-		version: a?.version || o.NEW
+		version: a?.version || 2
 	};
-	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({
+	return e.legacyDeviceId && (o.legacyDeviceId = e.legacyDeviceId), e.deviceId && (o.deviceId = e.deviceId, o.publicKeyPem = e.publicKeyPem, o.privateKeyPem = e.privateKeyPem, o.createdAtMs = e.createdAtMs), e.version && (o.version = e.version), "gatewayAuthMd5" in e && (o.gatewayAuthMd5 = e.gatewayAuthMd5), "pluginVersionCode" in e && (o.pluginVersionCode = e.pluginVersionCode), "authorizationCache" in e && (o.authorizationCache = e.authorizationCache), await r({
 		rootDir: n,
-		relativePath: d(),
-		data: JSON.stringify(s, null, 2),
+		relativePath: u(),
+		data: JSON.stringify(o, null, 2),
 		encoding: "utf8",
 		mkdir: !0
-	}), s;
+	}), o;
 }
-function h(e) {
+function m(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);
+	return !Number.isFinite(t) || t < l ? 0 : Math.floor(t);
 }
-async function g(e, t, n = Date.now()) {
-	let r = await m({ authorizationCache: {
+async function h(e, t, n = Date.now()) {
+	let r = await p({ authorizationCache: {
 		jwtToken: e,
 		receivedAtMs: n,
-		expireMs: h(t)
+		expireMs: m(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: {
+async function g() {
+	let e = await f(), t = e?.authorizationCache;
+	return t?.jwtToken ? p({ authorizationCache: {
 		jwtToken: void 0,
 		receivedAtMs: t.receivedAtMs,
-		expireMs: h(t.expireMs)
+		expireMs: m(t.expireMs)
 	} }) : e;
 }
-function v() {
-	return { version: o.NEW };
+function _() {
+	return { version: 2 };
 }
 //#endregion
-export { o as IdentityVersion, g as cacheAuthorizationToken, _ as clearCachedAuthorizationToken, p as getPersistedIdentity, h as parseAuthorizationExpireMs, m as updatePersistedIdentity };
+export { h as cacheAuthorizationToken, g as clearCachedAuthorizationToken, f as getPersistedIdentity, m as parseAuthorizationExpireMs, p as updatePersistedIdentity };

package/dist/modules/device/providers/windows.mjs

@@ -1,5 +1,5 @@
 import e from "os";
-import * as t from "winreg";
+import t from "winreg";
 //#region src/modules/device/providers/windows.ts
 function n(e, n, r) {
 	return new Promise((i) => {

package/openclaw.plugin.json

@@ -1,6 +1,10 @@
 {
   "id": "yoyo",
   "skills": ["./skills"],
+  "enabledByDefault": true,
+  "activation": {
+    "onStartup": true
+  },
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@honor-claw/yoyo",
-  "version": "1.6.1-beta.1",
+  "version": "1.6.1-beta.2",
   "description": "OpenClaw Honor Yoyo connection plugin",
   "keywords": [
     "ai",
@@ -26,6 +26,10 @@
   "scripts": {
     "build": "vite build",
     "ci:check": "npx tsc --noEmit && npm run test:coverage",
+    "format": "oxfmt",
+    "format:fix": "oxfmt --write",
+    "lint": "oxlint src/",
+    "lint:fix": "oxlint --fix src/",
     "publish:alpha": "npm run build && node scripts/publish.js --alpha",
     "publish:beta": "npm run build && node scripts/publish.js",
     "publish:latest": "npm run build && node scripts/publish.js --release",
@@ -49,6 +53,8 @@
     "@types/node": "^25.0.10",
     "@types/ws": "^8.5.13",
     "@vitest/coverage-v8": "^2.1.8",
+    "oxfmt": "^0.55.0",
+    "oxlint": "^1.70.0",
     "typescript": "^6.0.2",
     "vite": "^8.0.10",
     "vitest": "^2.1.8"