romtuck/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: sync a2ui.ts with upstream main

Browse Source 
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Gareth Jones 2026-01-29 22:02:57 -08:00
parent 375efe0876
commit 0c7c9a446f
1 changed files with 29 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/canvas-host/a2ui.ts
View File

@ -5,38 +5,15 @@ import { fileURLToPath } from "node:url";
import { detectMime } from "../media/mime.js"; import { detectMime } from "../media/mime.js";
export const A2UI_PATH = "/__clawdbot__/a2ui"; export const A2UI_PATH = "/__openclaw__/a2ui";
export const CANVAS_HOST_PATH = "/__clawdbot__/canvas";
export const CANVAS_WS_PATH = "/__clawdbot/ws"; export const CANVAS_HOST_PATH = "/__openclaw__/canvas";
export const CANVAS_WS_PATH = "/__openclaw__/ws";
let cachedA2uiRootReal: string | null | undefined; let cachedA2uiRootReal: string | null | undefined;
let resolvingA2uiRoot: Promise<string | null> | null = null; let resolvingA2uiRoot: Promise<string | null> | null = null;
/** Reset the A2UI root cache (for testing). */
export function resetA2uiCache(): void {
cachedA2uiRootReal = undefined;
resolvingA2uiRoot = null;
}
async function findRepoRoot(startDir: string): Promise<string | null> {
let dir = startDir;
for (let i = 0; i < 10; i++) {
try {
const pkgPath = path.join(dir, "package.json");
await fs.stat(pkgPath);
// Verify it's the clawdbot package
const pkg = JSON.parse(await fs.readFile(pkgPath, "utf8"));
if (pkg.name === "clawdbot") return dir;
} catch {
// not found, go up
}
const parent = path.dirname(dir);
if (parent === dir) break;
dir = parent;
}
return null;
}
async function resolveA2uiRoot(): Promise<string | null> { async function resolveA2uiRoot(): Promise<string | null> {
const here = path.dirname(fileURLToPath(import.meta.url)); const here = path.dirname(fileURLToPath(import.meta.url));
const candidates = [ const candidates = [
@ -51,12 +28,6 @@ async function resolveA2uiRoot(): Promise<string | null> {
if (process.execPath) { if (process.execPath) {
candidates.unshift(path.resolve(path.dirname(process.execPath), "a2ui")); candidates.unshift(path.resolve(path.dirname(process.execPath), "a2ui"));
} }
// Find repo root by walking up from `here` (handles vitest/vite transforms).
const repoRoot = await findRepoRoot(here);
if (repoRoot) {
candidates.push(path.resolve(repoRoot, "src/canvas-host/a2ui"));
candidates.push(path.resolve(repoRoot, "dist/canvas-host/a2ui"));
}
for (const dir of candidates) { for (const dir of candidates) {
try { try {
@ -127,22 +98,24 @@ export function injectCanvasLiveReload(html: string): string {
(() => { (() => {
// Cross-platform action bridge helper. // Cross-platform action bridge helper.
// Works on: // Works on:
// - iOS: window.webkit.messageHandlers.clawdbotCanvasA2UIAction.postMessage(...) // - iOS: window.webkit.messageHandlers.openclawCanvasA2UIAction.postMessage(...)
// - Android: window.clawdbotCanvasA2UIAction.postMessage(...) // - Android: window.openclawCanvasA2UIAction.postMessage(...)
const actionHandlerName = "clawdbotCanvasA2UIAction"; const handlerNames = ["openclawCanvasA2UIAction"];
function postToNode(payload) { function postToNode(payload) {
try { try {
const raw = typeof payload === "string" ? payload : JSON.stringify(payload); const raw = typeof payload === "string" ? payload : JSON.stringify(payload);
const iosHandler = globalThis.webkit?.messageHandlers?.[actionHandlerName]; for (const name of handlerNames) {
if (iosHandler && typeof iosHandler.postMessage === "function") { const iosHandler = globalThis.webkit?.messageHandlers?.[name];
iosHandler.postMessage(raw); if (iosHandler && typeof iosHandler.postMessage === "function") {
return true; iosHandler.postMessage(raw);
} return true;
const androidHandler = globalThis[actionHandlerName]; }
if (androidHandler && typeof androidHandler.postMessage === "function") { const androidHandler = globalThis[name];
// Important: call as a method on the interface object (binding matters on Android WebView). if (androidHandler && typeof androidHandler.postMessage === "function") {
androidHandler.postMessage(raw); // Important: call as a method on the interface object (binding matters on Android WebView).
return true; androidHandler.postMessage(raw);
return true;
}
} }
} catch {} } catch {}
return false; return false;
@ -154,11 +127,11 @@ export function injectCanvasLiveReload(html: string): string {
const action = { ...userAction, id }; const action = { ...userAction, id };
return postToNode({ userAction: action }); return postToNode({ userAction: action });
} }
globalThis.Clawdbot = globalThis.Clawdbot ?? {}; globalThis.OpenClaw = globalThis.OpenClaw ?? {};
globalThis.Clawdbot.postMessage = postToNode; globalThis.OpenClaw.postMessage = postToNode;
globalThis.Clawdbot.sendUserAction = sendUserAction; globalThis.OpenClaw.sendUserAction = sendUserAction;
globalThis.clawdbotPostMessage = postToNode; globalThis.openclawPostMessage = postToNode;
globalThis.clawdbotSendUserAction = sendUserAction; globalThis.openclawSendUserAction = sendUserAction;
try { try {
const proto = location.protocol === "https:" ? "wss" : "ws"; const proto = location.protocol === "https:" ? "wss" : "ws";
@ -186,9 +159,9 @@ export async function handleA2uiHttpRequest(
if (!urlRaw) return false; if (!urlRaw) return false;
const url = new URL(urlRaw, "http://localhost"); const url = new URL(urlRaw, "http://localhost");
if (url.pathname !== A2UI_PATH && !url.pathname.startsWith(`${A2UI_PATH}/`)) { const basePath =
return false; url.pathname === A2UI_PATH || url.pathname.startsWith(`${A2UI_PATH}/`) ? A2UI_PATH : undefined;
} if (!basePath) return false;
if (req.method !== "GET" && req.method !== "HEAD") { if (req.method !== "GET" && req.method !== "HEAD") {
res.statusCode = 405; res.statusCode = 405;
@ -205,7 +178,7 @@ export async function handleA2uiHttpRequest(
return true; return true;
} }
const rel = url.pathname.slice(A2UI_PATH.length); const rel = url.pathname.slice(basePath.length);
const filePath = await resolveA2uiFilePath(a2uiRootReal, rel || "/"); const filePath = await resolveA2uiFilePath(a2uiRootReal, rel || "/");
if (!filePath) { if (!filePath) {
res.statusCode = 404; res.statusCode = 404;