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

fix(cron): fix test failures and regenerate protocol files

Browse Source 
- Add forceReload option to ensureLoaded to avoid stat I/O in normal
  paths while still detecting cross-service writes in the timer path
- Post isolated job summary back to main session (restores the old
  isolation.postToMainPrefix behavior via delivery model)
- Update legacy migration tests to check delivery.channel instead of
  payload.channel (normalization now moves delivery fields to top-level)
- Remove legacy deliver/channel/to/bestEffortDeliver from payload schema
- Update protocol conformance test for delivery modes
- Regenerate GatewayModels.swift (isolation -> delivery)
This commit is contained in:
Tyler Yust
2026-02-03 20:35:47 -08:00
committed by Peter Steinberger
parent 6fb8d8850e
commit f8d2534062
9 changed files with 83 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/cron/cron-protocol-conformance.test.ts
View File

@@ -2,39 +2,29 @@ import fs from "node:fs/promises";
import path from "node:path";
import { describe, expect, it } from "vitest";
import { MACOS_APP_SOURCES_DIR } from "../compat/legacy-names.js";
import { CronPayloadSchema } from "../gateway/protocol/schema.js";
import { CronDeliverySchema } from "../gateway/protocol/schema.js";
type SchemaLike = {
anyOf?: Array<{ properties?: Record<string, unknown> }>;
anyOf?: Array<{ properties?: Record<string, unknown>; const?: unknown }>;
properties?: Record<string, unknown>;
const?: unknown;
};
type ProviderSchema = {
anyOf?: Array<{ const?: unknown }>;
};
function extractCronChannels(schema: SchemaLike): string[] {
const union = schema.anyOf ?? [];
const payloadWithChannel = union.find((entry) =>
Boolean(entry?.properties && "channel" in entry.properties),
);
const channelSchema = payloadWithChannel?.properties
? (payloadWithChannel.properties.channel as ProviderSchema)
: undefined;
const channels = (channelSchema?.anyOf ?? [])
function extractDeliveryModes(schema: SchemaLike): string[] {
const modeSchema = schema.properties?.mode as SchemaLike | undefined;
return (modeSchema?.anyOf ?? [])
.map((entry) => entry?.const)
.filter((value): value is string => typeof value === "string");
return channels;
}
const UI_FILES = ["ui/src/ui/types.ts", "ui/src/ui/ui-types.ts", "ui/src/ui/views/cron.ts"];
const SWIFT_FILE_CANDIDATES = [`${MACOS_APP_SOURCES_DIR}/GatewayConnection.swift`];
const SWIFT_MODEL_CANDIDATES = [`${MACOS_APP_SOURCES_DIR}/CronModels.swift`];
const SWIFT_STATUS_CANDIDATES = [`${MACOS_APP_SOURCES_DIR}/GatewayConnection.swift`];
async function resolveSwiftFiles(cwd: string): Promise<string[]> {
async function resolveSwiftFiles(cwd: string, candidates: string[]): Promise<string[]> {
const matches: string[] = [];
for (const relPath of SWIFT_FILE_CANDIDATES) {
for (const relPath of candidates) {
try {
await fs.access(path.join(cwd, relPath));
matches.push(relPath);
@@ -43,30 +33,32 @@ async function resolveSwiftFiles(cwd: string): Promise<string[]> {
}
}
if (matches.length === 0) {
throw new Error(`Missing Swift cron definition. Tried: ${SWIFT_FILE_CANDIDATES.join(", ")}`);
throw new Error(`Missing Swift cron definition. Tried: ${candidates.join(", ")}`);
}
return matches;
}
describe("cron protocol conformance", () => {
it("ui + swift include all cron providers from gateway schema", async () => {
const channels = extractCronChannels(CronPayloadSchema as SchemaLike);
expect(channels.length).toBeGreaterThan(0);
it("ui + swift include all cron delivery modes from gateway schema", async () => {
const modes = extractDeliveryModes(CronDeliverySchema as SchemaLike);
expect(modes.length).toBeGreaterThan(0);
const cwd = process.cwd();
for (const relPath of UI_FILES) {
const content = await fs.readFile(path.join(cwd, relPath), "utf-8");
for (const channel of channels) {
expect(content.includes(`"${channel}"`), `${relPath} missing ${channel}`).toBe(true);
for (const mode of modes) {
expect(content.includes(`"${mode}"`), `${relPath} missing delivery mode ${mode}`).toBe(
true,
);
}
}
const swiftFiles = await resolveSwiftFiles(cwd);
for (const relPath of swiftFiles) {
const swiftModelFiles = await resolveSwiftFiles(cwd, SWIFT_MODEL_CANDIDATES);
for (const relPath of swiftModelFiles) {
const content = await fs.readFile(path.join(cwd, relPath), "utf-8");
for (const channel of channels) {
const pattern = new RegExp(`\\bcase\\s+${channel}\\b`);
expect(pattern.test(content), `${relPath} missing case ${channel}`).toBe(true);
for (const mode of modes) {
const pattern = new RegExp(`\\bcase\\s+${mode}\\b`);
expect(pattern.test(content), `${relPath} missing case ${mode}`).toBe(true);
}
}
});
@@ -78,7 +70,7 @@ describe("cron protocol conformance", () => {
expect(uiTypes.includes("jobs:")).toBe(true);
expect(uiTypes.includes("jobCount")).toBe(false);
const [swiftRelPath] = await resolveSwiftFiles(cwd);
const [swiftRelPath] = await resolveSwiftFiles(cwd, SWIFT_STATUS_CANDIDATES);
const swiftPath = path.join(cwd, swiftRelPath);
const swift = await fs.readFile(swiftPath, "utf-8");
expect(swift.includes("struct CronSchedulerStatus")).toBe(true);