mirror of
https://github.com/morluto/rea.git
synced 2026-11-19 13:12:26 +00:00
fix: report provider admission failures as typed codes (#8066)
* fix: report provider admission failures as typed codes * fix(evm): keep limiter path on admission diagnostics * fix: assert WABT and CBOR admission codes * fix: keep admission details on returned failures * fix(evm): detect repeated CBOR keys in the decoder --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com>
This commit is contained in:
1 parent
3b647132c6
commit
317bf3fe23
63 files changed
+1021
-432
No files matched your search
@@ -1,4 +1,6 @@
|
||||
import { EvmAdmissionError } from "./EvmAdmissionError.js";
|
||||
import { snapshotEnvironment } from "../process/snapshotEnvironment.js";
|
||||
import type { JsonValue } from "../domain/jsonValue.js";
|
||||
import { safeParseUtf8Json } from "../domain/safeJson.js";
|
||||
import { createHash, randomUUID } from "node:crypto";
|
||||
import { access, readFile, stat, writeFile } from "node:fs/promises";
|
||||
@@ -110,7 +112,7 @@ export interface EvmLimiterProbeOptions {
|
||||
|
||||
type EvmLimiterSelection = {
|
||||
readonly path: string;
|
||||
readonly diagnostics: Readonly<Record<string, string>>;
|
||||
readonly diagnostics: Readonly<Record<string, JsonValue>>;
|
||||
};
|
||||
type EvmLimiterUnavailable = EvmLimiterSelection & {
|
||||
readonly reason: string;
|
||||
@@ -142,20 +144,29 @@ const selectEvmLimiter = async (
|
||||
const diagnostics = { limiter_path: path, platform, arch };
|
||||
try {
|
||||
if (!isAbsolute(path))
|
||||
throw new Error(
|
||||
"REA_EVM_PRLIMIT_COMMAND must be an absolute executable path.",
|
||||
);
|
||||
throw new EvmAdmissionError("prlimit_not_absolute", {
|
||||
setting: "REA_EVM_PRLIMIT_COMMAND",
|
||||
});
|
||||
const fs = probes?.fs ?? { access, stat };
|
||||
await fs.access(path, constants.X_OK);
|
||||
throwIfAborted();
|
||||
if (!(await fs.stat(path)).isFile())
|
||||
throw new Error(
|
||||
"Configured prlimit must be a regular executable file, not a directory.",
|
||||
);
|
||||
throw new EvmAdmissionError("prlimit_not_file");
|
||||
throwIfAborted();
|
||||
return ok({ path, diagnostics });
|
||||
} catch (cause: unknown) {
|
||||
throwIfAborted();
|
||||
if (cause instanceof EvmAdmissionError)
|
||||
return err({
|
||||
path,
|
||||
diagnostics: {
|
||||
...diagnostics,
|
||||
code: cause.code,
|
||||
...cause.detail,
|
||||
},
|
||||
reason: cause.code,
|
||||
cause,
|
||||
});
|
||||
const reason = `Offline EVM interface inspection requires caller-supplied util-linux prlimit: ${path}; ${cause instanceof Error ? cause.message : String(cause)}`;
|
||||
return err({ path, diagnostics, reason, cause });
|
||||
}
|
||||
@@ -452,10 +463,13 @@ export class EvmoleInterfaceProvider implements EvmInterfacePort {
|
||||
stopped.status === "incomplete" ||
|
||||
stopped.status === "not-owned"
|
||||
)
|
||||
throw new Error(
|
||||
throw new EvmAdmissionError(
|
||||
stopped.status === "incomplete"
|
||||
? stopped.reason
|
||||
: "Owned EVM worker cleanup did not confirm ownership.",
|
||||
? "cleanup_incomplete"
|
||||
: "cleanup_unconfirmed",
|
||||
stopped.status === "incomplete"
|
||||
? { reason: stopped.reason }
|
||||
: undefined,
|
||||
{ cause: stopped },
|
||||
);
|
||||
},
|
||||
@@ -511,6 +525,7 @@ export class EvmoleInterfaceProvider implements EvmInterfacePort {
|
||||
selectedLimiter.error.reason,
|
||||
{
|
||||
cause: selectedLimiter.error.cause,
|
||||
diagnostics: selectedLimiter.error.diagnostics,
|
||||
userMessage: selectedLimiter.error.reason,
|
||||
},
|
||||
);
|
||||
@@ -813,9 +828,7 @@ export class EvmoleInterfaceProvider implements EvmInterfacePort {
|
||||
marker = completed;
|
||||
}
|
||||
if (!marker.bytes.equals(Buffer.from("F")))
|
||||
throw new Error(
|
||||
"Private worker failure marker does not match the observed exit status.",
|
||||
);
|
||||
throw new EvmAdmissionError("marker_mismatch");
|
||||
fileFailure = { verified: true, failure: null };
|
||||
} catch (markerFailure: unknown) {
|
||||
fileFailure = {
|
||||
|
||||
Reference in new issue
Block a user