ewilliams28/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-24 19:35:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor(errors): consolidate message formatting (#117818)

Browse Source
This commit is contained in:
Peter Steinberger
2026-08-01 22:05:49 -07:00
committed by GitHub
parent 4b26a15a1f
commit e98fdeefdf
86 changed files with 320 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/official-external-plugin-catalog.ts
+7 -10
View File
@@ -4,6 +4,7 @@ import { normalizeOptionalString } from "@openclaw/normalization-core/string-coe
import { uniqueStrings } from "@openclaw/normalization-core/string-normalization";
import { MANIFEST_KEY } from "../compat/legacy-names.js";
import { normalizeClawHubSha256Integrity } from "../infra/clawhub.js";
import { formatErrorMessage } from "../infra/errors.js";
import { readResponseWithLimit } from "../infra/http-body.js";
import { isRecord } from "../utils.js";
import type {
@@ -694,10 +695,6 @@ function resolveOfficialExternalPluginCatalogEntryKey(
return undefined;
}
function formatHostedCatalogError(error: unknown): string {
return error instanceof Error ? error.message : String(error);
}
function bundledFallbackResult(
error: unknown,
metadata?: HostedOfficialExternalPluginCatalogLoadResult["metadata"],
@@ -705,7 +702,7 @@ function bundledFallbackResult(
return {
source: "bundled-fallback",
entries: listOfficialExternalPluginCatalogEntries(),
error: formatHostedCatalogError(error),
error: formatErrorMessage(error),
...(metadata ? { metadata } : {}),
};
}
@@ -714,7 +711,7 @@ function emptyBundledFallbackResult(error: unknown): HostedOfficialExternalPlugi
return {
source: "bundled-fallback",
entries: [],
error: formatHostedCatalogError(error),
error: formatErrorMessage(error),
};
}
@@ -912,8 +909,8 @@ async function loadHostedCatalogSnapshotResult(params: {
snapshot: params.snapshot,
...(parsed.trust ? { trust: parsed.trust } : {}),
error: parsed.expired
? `${formatHostedCatalogError(params.error)}; ${parsed.feed.expiresAt ? `hosted catalog signed feed expired at ${parsed.feed.expiresAt}` : "hosted catalog signed feed has no expiresAt"}`
: formatHostedCatalogError(params.error),
? `${formatErrorMessage(params.error)}; ${parsed.feed.expiresAt ? `hosted catalog signed feed expired at ${parsed.feed.expiresAt}` : "hosted catalog signed feed has no expiresAt"}`
: formatErrorMessage(params.error),
};
}
@@ -999,11 +996,11 @@ async function snapshotOrBundledFallbackResult(params: {
} catch (snapshotErr) {
if (params.verification?.mode === "signed") {
return emptyBundledFallbackResult(
`${formatHostedCatalogError(params.error)}; snapshot fallback failed: ${formatHostedCatalogError(snapshotErr)}`,
`${formatErrorMessage(params.error)}; snapshot fallback failed: ${formatErrorMessage(snapshotErr)}`,
);
}
return bundledFallbackResult(
`${formatHostedCatalogError(params.error)}; snapshot fallback failed: ${formatHostedCatalogError(snapshotErr)}`,
`${formatErrorMessage(params.error)}; snapshot fallback failed: ${formatErrorMessage(snapshotErr)}`,
params.metadata,
);
}
src/plugins/sdk-alias.ts
+2 -5
View File
@@ -4,6 +4,7 @@ import os from "node:os";
import path from "node:path";
import { fileURLToPath } from "node:url";
import { normalizeLowercaseStringOrEmpty } from "@openclaw/normalization-core/string-coerce";
import { formatErrorMessage } from "../infra/errors.js";
import { resolveRequiredHomeDir } from "../infra/home-dir.js";
import { tryReadJsonSync } from "../infra/json-files.js";
import { resolveOpenClawPackageRootSync } from "../infra/openclaw-root.js";
@@ -354,10 +355,6 @@ function listArgvRuntimeFallbackStartDirs(argv1: string | undefined): string[] {
return dedupeResolvedPaths(starts);
}
function formatResolutionError(error: unknown): string {
return error instanceof Error ? error.message : String(error);
}
function resolveDevSourceRootParam(params: { devSourceRoot?: string | null }): string | null {
return params.devSourceRoot !== undefined
? params.devSourceRoot
@@ -1564,7 +1561,7 @@ export function resolvePluginRuntimeModulePathWithDiagnostics(
packageRoot,
candidates: dedupeResolvedPaths(candidates),
resolvedPath: null,
error: formatResolutionError(error),
error: formatErrorMessage(error),
};
}
return {