Merge branch 'main' into feature/poe-provider
This commit is contained in:
commit
547ba23bda
5 files changed
+57
-4
No files matched your search
@@ -12,6 +12,31 @@ export const CANVAS_WS_PATH = "/__clawdbot/ws";
|
||||
let cachedA2uiRootReal: string | null | undefined;
|
||||
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> {
|
||||
const here = path.dirname(fileURLToPath(import.meta.url));
|
||||
const candidates = [
|
||||
@@ -26,6 +51,12 @@ async function resolveA2uiRoot(): Promise<string | null> {
|
||||
if (process.execPath) {
|
||||
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) {
|
||||
try {
|
||||
|
||||
@@ -3,14 +3,22 @@ import { createServer } from "node:http";
|
||||
import type { AddressInfo } from "node:net";
|
||||
import os from "node:os";
|
||||
import path from "node:path";
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import { WebSocket } from "ws";
|
||||
import { rawDataToString } from "../infra/ws.js";
|
||||
import { defaultRuntime } from "../runtime.js";
|
||||
import { CANVAS_HOST_PATH, CANVAS_WS_PATH, injectCanvasLiveReload } from "./a2ui.js";
|
||||
import {
|
||||
CANVAS_HOST_PATH,
|
||||
CANVAS_WS_PATH,
|
||||
injectCanvasLiveReload,
|
||||
resetA2uiCache,
|
||||
} from "./a2ui.js";
|
||||
import { createCanvasHostHandler, startCanvasHost } from "./server.js";
|
||||
|
||||
describe("canvas host", () => {
|
||||
beforeEach(() => {
|
||||
resetA2uiCache();
|
||||
});
|
||||
it("injects live reload script", () => {
|
||||
const out = injectCanvasLiveReload("<html><body>Hello</body></html>");
|
||||
expect(out).toContain(CANVAS_WS_PATH);
|
||||
|
||||
Reference in new issue
Block a user