refactor(media): share error normalization helper · openc...

Recent Commits to openclaw:main

vincentkoc · 2026-06-23 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import {`
`15`	`15`	`} from "../config/model-input.js";`
`16`	`16`	`import type { AgentModelConfig } from "../config/types.agents-shared.js";`
`17`	`17`	`import type { OpenClawConfig } from "../config/types.js";`
`18`		`-import { formatErrorMessage } from "../infra/errors.js";`
	`18`	`+import { formatErrorMessage, toErrorObject } from "../infra/errors.js";`
`19`	`19`	`import { getProviderEnvVars as getDefaultProviderEnvVars } from "../secrets/provider-env-vars.js";`
`20`	`20`
`21`	`21`	`// Shared media-generation runtime helpers for provider fallback, request`
`@@ -582,7 +582,7 @@ export function throwCapabilityGenerationFailure(params: {`
`582`	`582`	`lastError: unknown;`
`583`	`583`	`}): never {`
`584`	`584`	`if (params.attempts.length <= 1 && params.lastError) {`
`585`		`-throw toLintErrorObject(params.lastError, "Non-Error thrown");`
	`585`	`+throw toErrorObject(params.lastError, "Non-Error thrown");`
`586`	`586`	`}`
`587`	`587`	`const summary = formatCapabilityFailureAttempts(params.attempts);`
`588`	`588`	`throw new Error(`
`@@ -663,17 +663,3 @@ export function buildNoCapabilityModelConfiguredMessage(params: {`
`663`	`663`	`: "If you want a specific provider, also configure that provider's auth/API key first.",`
`664`	`664`	`].join(" ");`
`665`	`665`	`}`
`666`		`-`
`667`		`-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {`
`668`		`-if (value instanceof Error) {`
`669`		`-return value;`
`670`		`-}`
`671`		`-if (typeof value === "string") {`
`672`		`-return new Error(value);`
`673`		`-}`
`674`		`-const error = new Error(fallbackMessage, { cause: value });`
`675`		`-if ((typeof value === "object" && value !== null) \|\| typeof value === "function") {`
`676`		`-Object.assign(error, value);`
`677`		`-}`
`678`		`-return error;`
`679`		`-}`

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import {`
`7`	`7`	`readResponseTextSnippet,`
`8`	`8`	`readResponseWithLimit,`
`9`	`9`	`} from "@openclaw/media-core/read-response-with-limit";`
`10`		`-import { formatErrorMessage } from "../infra/errors.js";`
	`10`	`+import { formatErrorMessage, toErrorObject } from "../infra/errors.js";`
`11`	`11`	`import {`
`12`	`12`	`fetchWithSsrFGuard,`
`13`	`13`	`withStrictGuardedFetchMode,`
`@@ -425,7 +425,7 @@ async function readChunkWithIdleTimeout(`
`425`	`425`	`(err: unknown) => {`
`426`	`426`	`clear();`
`427`	`427`	`if (!timedOut) {`
`428`		`-reject(toLintErrorObject(err, "Non-Error rejection"));`
	`428`	`+reject(toErrorObject(err, "Non-Error rejection"));`
`429`	`429`	`}`
`430`	`430`	`},`
`431`	`431`	`);`
`@@ -700,17 +700,3 @@ async function readRemoteMediaBufferOnce(options: FetchMediaOptions): Promise<Fe`
`700`	`700`	`}`
`701`	`701`	`}`
`702`	`702`	`}`
`703`		`-`
`704`		`-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {`
`705`		`-if (value instanceof Error) {`
`706`		`-return value;`
`707`		`-}`
`708`		`-if (typeof value === "string") {`
`709`		`-return new Error(value);`
`710`		`-}`
`711`		`-const error = new Error(fallbackMessage, { cause: value });`
`712`		`-if ((typeof value === "object" && value !== null) \|\| typeof value === "function") {`
`713`		`-Object.assign(error, value);`
`714`		`-}`
`715`		`-return error;`
`716`		`-}`

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`import { execFile, type ExecFileOptions } from "node:child_process";`
`3`	`3`	`import { promisify } from "node:util";`
`4`	`4`	`import { normalizeLowercaseStringOrEmpty } from "@openclaw/normalization-core/string-coerce";`
	`5`	`+import { toErrorObject } from "../infra/errors.js";`
`5`	`6`	`import { resolveSystemBin } from "../infra/resolve-system-bin.js";`
`6`	`7`	`import {`
`7`	`8`	`MEDIA_FFMPEG_MAX_BUFFER_BYTES,`
`@@ -64,7 +65,7 @@ export async function runFfprobe(args: string[], options?: MediaExecOptions): Pr`
`64`	`65`	`let stdinWriteError: Error \| undefined;`
`65`	`66`	`const proc = execFile(requireSystemBin("ffprobe"), args, execOptions, (err, stdout) => {`
`66`	`67`	`if (err) {`
`67`		`-reject(toLintErrorObject(err, "Non-Error rejection"));`
	`68`	`+reject(toErrorObject(err, "Non-Error rejection"));`
`68`	`69`	`return;`
`69`	`70`	`}`
`70`	`71`	`if (stdinWriteError && !isBrokenPipeError(stdinWriteError)) {`
`@@ -118,17 +119,3 @@ export function parseFfprobeCodecAndSampleRate(stdout: string): {`
`118`	`119`	`sampleRateHz: parseFfprobeSampleRateHz(sampleRateRaw),`
`119`	`120`	`};`
`120`	`121`	`}`
`121`		`-`
`122`		`-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {`
`123`		`-if (value instanceof Error) {`
`124`		`-return value;`
`125`		`-}`
`126`		`-if (typeof value === "string") {`
`127`		`-return new Error(value);`
`128`		`-}`
`129`		`-const error = new Error(fallbackMessage, { cause: value });`
`130`		`-if ((typeof value === "object" && value !== null) \|\| typeof value === "function") {`
`131`		`-Object.assign(error, value);`
`132`		`-}`
`133`		`-return error;`
`134`		`-}`

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import {`
`14`	`14`	`} from "@openclaw/media-core/file-name";`
`15`	`15`	`import { detectMime, extensionForMime } from "@openclaw/media-core/mime";`
`16`	`16`	`import { normalizeOptionalString } from "@openclaw/normalization-core/string-coerce";`
	`17`	`+import { toErrorObject } from "../infra/errors.js";`
`17`	`18`	`import { fileStore } from "../infra/file-store.js";`
`18`	`19`	`import { sanitizeUntrustedFileName } from "../infra/fs-safe-advanced.js";`
`19`	`20`	`import { isPathInside } from "../infra/fs-safe.js";`
`@@ -305,7 +306,7 @@ async function downloadToFile(`
`305`	`306`	`})`
`306`	`307`	`.catch(async (err: unknown) => {`
`307`	`308`	`await fs.rm(dest, { force: true }).catch(() => {});`
`308`		`-reject(toLintErrorObject(err, "Non-Error rejection"));`
	`309`	`+reject(toErrorObject(err, "Non-Error rejection"));`
`309`	`310`	`});`
`310`	`311`	`});`
`311`	`312`	`req.on("error", reject);`
`@@ -752,17 +753,3 @@ export async function deleteMediaBuffer(id: string, subdir = "inbound"): Promise`
`752`	`753`	`const relativePath = resolveMediaRelativePath(id, subdir, "deleteMediaBuffer");`
`753`	`754`	`await openMediaStore().remove(relativePath);`
`754`	`755`	`}`
`755`		`-`
`756`		`-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {`
`757`		`-if (value instanceof Error) {`
`758`		`-return value;`
`759`		`-}`
`760`		`-if (typeof value === "string") {`
`761`		`-return new Error(value);`
`762`		`-}`
`763`		`-const error = new Error(fallbackMessage, { cause: value });`
`764`		`-if ((typeof value === "object" && value !== null) \|\| typeof value === "function") {`
`765`		`-Object.assign(error, value);`
`766`		`-}`
`767`		`-return error;`
`768`		`-}`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main