github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-10 01:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(agent): dedupe harness and command workflows

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-16 14:52:09 +00:00
parent 04892ee230
commit f717a13039
204 changed files with 7366 additions and 11540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/commands/onboard-non-interactive.gateway.e2e.test.ts
View File

@@ -1,9 +1,8 @@
import fs from "node:fs/promises";
import { createServer } from "node:net";
import os from "node:os";
import path from "node:path";
import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";
import { getDeterministicFreePortBlock } from "../test-utils/ports.js";
import { getFreePortBlockWithPermissionFallback } from "../test-utils/ports.js";
const gatewayClientCalls: Array<{
url?: string;
@@ -41,49 +40,17 @@ vi.mock("../gateway/client.js", () => ({
}));
async function getFreePort(): Promise<number> {
try {
return await new Promise((resolve, reject) => {
const srv = createServer();
srv.on("error", (err) => {
srv.close();
reject(err);
});
srv.listen(0, "127.0.0.1", () => {
const addr = srv.address();
if (!addr || typeof addr === "string") {
srv.close();
reject(new Error("failed to acquire free port"));
return;
}
const port = addr.port;
srv.close((err) => {
if (err) {
reject(err);
} else {
resolve(port);
}
});
});
});
} catch (err) {
const code = (err as NodeJS.ErrnoException | undefined)?.code;
if (code === "EPERM" || code === "EACCES") {
return 30_000 + (process.pid % 10_000);
}
throw err;
}
return await getFreePortBlockWithPermissionFallback({
offsets: [0],
fallbackBase: 30_000,
});
}
async function getFreeGatewayPort(): Promise<number> {
try {
return await getDeterministicFreePortBlock({ offsets: [0, 1, 2, 4] });
} catch (err) {
const code = (err as NodeJS.ErrnoException | undefined)?.code;
if (code === "EPERM" || code === "EACCES") {
return 40_000 + (process.pid % 10_000);
}
throw err;
}
return await getFreePortBlockWithPermissionFallback({
offsets: [0, 1, 2, 4],
fallbackBase: 40_000,
});
}
const runtime = {
@@ -96,6 +63,19 @@ const runtime = {
},
};
async function expectGatewayTokenAuth(params: {
authConfig: unknown;
token: string;
env: NodeJS.ProcessEnv;
}) {
const { authorizeGatewayConnect, resolveGatewayAuth } = await import("../gateway/auth.js");
const auth = resolveGatewayAuth({ authConfig: params.authConfig, env: params.env });
const resNoToken = await authorizeGatewayConnect({ auth, connectAuth: { token: undefined } });
expect(resNoToken.ok).toBe(false);
const resToken = await authorizeGatewayConnect({ auth, connectAuth: { token: params.token } });
expect(resToken.ok).toBe(true);
}
describe("onboard (non-interactive): gateway and remote auth", () => {
const prev = {
home: process.env.HOME,
@@ -183,12 +163,11 @@ describe("onboard (non-interactive): gateway and remote auth", () => {
expect(cfg?.gateway?.auth?.mode).toBe("token");
expect(cfg?.gateway?.auth?.token).toBe(token);
const { authorizeGatewayConnect, resolveGatewayAuth } = await import("../gateway/auth.js");
const auth = resolveGatewayAuth({ authConfig: cfg.gateway?.auth, env: process.env });
const resNoToken = await authorizeGatewayConnect({ auth, connectAuth: { token: undefined } });
expect(resNoToken.ok).toBe(false);
const resToken = await authorizeGatewayConnect({ auth, connectAuth: { token } });
expect(resToken.ok).toBe(true);
await expectGatewayTokenAuth({
authConfig: cfg.gateway?.auth,
token,
env: process.env,
});
await fs.rm(stateDir, { recursive: true, force: true });
}, 60_000);
@@ -274,12 +253,11 @@ describe("onboard (non-interactive): gateway and remote auth", () => {
const token = cfg.gateway?.auth?.token ?? "";
expect(token.length).toBeGreaterThan(8);
const { authorizeGatewayConnect, resolveGatewayAuth } = await import("../gateway/auth.js");
const auth = resolveGatewayAuth({ authConfig: cfg.gateway?.auth, env: process.env });
const resNoToken = await authorizeGatewayConnect({ auth, connectAuth: { token: undefined } });
expect(resNoToken.ok).toBe(false);
const resToken = await authorizeGatewayConnect({ auth, connectAuth: { token } });
expect(resToken.ok).toBe(true);
await expectGatewayTokenAuth({
authConfig: cfg.gateway?.auth,
token,
env: process.env,
});
await fs.rm(stateDir, { recursive: true, force: true });
}, 60_000);