refactor(media): share error normalization helper

vincentkoc · vincentkoc · commit af7797b0adfa · 2026-06-23T00:38:07.000+08:00
diff --git a/src/media-generation/runtime-shared.ts b/src/media-generation/runtime-shared.ts
@@ -15,7 +15,7 @@ import {
 } from "../config/model-input.js";
 import type { AgentModelConfig } from "../config/types.agents-shared.js";
 import type { OpenClawConfig } from "../config/types.js";
-import { formatErrorMessage } from "../infra/errors.js";
+import { formatErrorMessage, toErrorObject } from "../infra/errors.js";
 import { getProviderEnvVars as getDefaultProviderEnvVars } from "../secrets/provider-env-vars.js";
 
 // Shared media-generation runtime helpers for provider fallback, request
@@ -582,7 +582,7 @@ export function throwCapabilityGenerationFailure(params: {
   lastError: unknown;
 }): never {
   if (params.attempts.length <= 1 && params.lastError) {
-    throw toLintErrorObject(params.lastError, "Non-Error thrown");
+    throw toErrorObject(params.lastError, "Non-Error thrown");
   }
   const summary = formatCapabilityFailureAttempts(params.attempts);
   throw new Error(
@@ -663,17 +663,3 @@ export function buildNoCapabilityModelConfiguredMessage(params: {
       : "If you want a specific provider, also configure that provider's auth/API key first.",
   ].join(" ");
 }
-
-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {
-  if (value instanceof Error) {
-    return value;
-  }
-  if (typeof value === "string") {
-    return new Error(value);
-  }
-  const error = new Error(fallbackMessage, { cause: value });
-  if ((typeof value === "object" && value !== null) || typeof value === "function") {
-    Object.assign(error, value);
-  }
-  return error;
-}
diff --git a/src/media/fetch.ts b/src/media/fetch.ts
@@ -7,7 +7,7 @@ import {
   readResponseTextSnippet,
   readResponseWithLimit,
 } from "@openclaw/media-core/read-response-with-limit";
-import { formatErrorMessage } from "../infra/errors.js";
+import { formatErrorMessage, toErrorObject } from "../infra/errors.js";
 import {
   fetchWithSsrFGuard,
   withStrictGuardedFetchMode,
@@ -425,7 +425,7 @@ async function readChunkWithIdleTimeout(
       (err: unknown) => {
         clear();
         if (!timedOut) {
-          reject(toLintErrorObject(err, "Non-Error rejection"));
+          reject(toErrorObject(err, "Non-Error rejection"));
         }
       },
     );
@@ -700,17 +700,3 @@ async function readRemoteMediaBufferOnce(options: FetchMediaOptions): Promise<Fe
     }
   }
 }
-
-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {
-  if (value instanceof Error) {
-    return value;
-  }
-  if (typeof value === "string") {
-    return new Error(value);
-  }
-  const error = new Error(fallbackMessage, { cause: value });
-  if ((typeof value === "object" && value !== null) || typeof value === "function") {
-    Object.assign(error, value);
-  }
-  return error;
-}
diff --git a/src/media/ffmpeg-exec.ts b/src/media/ffmpeg-exec.ts
@@ -2,6 +2,7 @@
 import { execFile, type ExecFileOptions } from "node:child_process";
 import { promisify } from "node:util";
 import { normalizeLowercaseStringOrEmpty } from "@openclaw/normalization-core/string-coerce";
+import { toErrorObject } from "../infra/errors.js";
 import { resolveSystemBin } from "../infra/resolve-system-bin.js";
 import {
   MEDIA_FFMPEG_MAX_BUFFER_BYTES,
@@ -64,7 +65,7 @@ export async function runFfprobe(args: string[], options?: MediaExecOptions): Pr
     let stdinWriteError: Error | undefined;
     const proc = execFile(requireSystemBin("ffprobe"), args, execOptions, (err, stdout) => {
       if (err) {
-        reject(toLintErrorObject(err, "Non-Error rejection"));
+        reject(toErrorObject(err, "Non-Error rejection"));
         return;
       }
       if (stdinWriteError && !isBrokenPipeError(stdinWriteError)) {
@@ -118,17 +119,3 @@ export function parseFfprobeCodecAndSampleRate(stdout: string): {
     sampleRateHz: parseFfprobeSampleRateHz(sampleRateRaw),
   };
 }
-
-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {
-  if (value instanceof Error) {
-    return value;
-  }
-  if (typeof value === "string") {
-    return new Error(value);
-  }
-  const error = new Error(fallbackMessage, { cause: value });
-  if ((typeof value === "object" && value !== null) || typeof value === "function") {
-    Object.assign(error, value);
-  }
-  return error;
-}
diff --git a/src/media/store.ts b/src/media/store.ts
@@ -14,6 +14,7 @@ import {
 } from "@openclaw/media-core/file-name";
 import { detectMime, extensionForMime } from "@openclaw/media-core/mime";
 import { normalizeOptionalString } from "@openclaw/normalization-core/string-coerce";
+import { toErrorObject } from "../infra/errors.js";
 import { fileStore } from "../infra/file-store.js";
 import { sanitizeUntrustedFileName } from "../infra/fs-safe-advanced.js";
 import { isPathInside } from "../infra/fs-safe.js";
@@ -305,7 +306,7 @@ async function downloadToFile(
             })
             .catch(async (err: unknown) => {
               await fs.rm(dest, { force: true }).catch(() => {});
-              reject(toLintErrorObject(err, "Non-Error rejection"));
+              reject(toErrorObject(err, "Non-Error rejection"));
             });
         });
         req.on("error", reject);
@@ -752,17 +753,3 @@ export async function deleteMediaBuffer(id: string, subdir = "inbound"): Promise
   const relativePath = resolveMediaRelativePath(id, subdir, "deleteMediaBuffer");
   await openMediaStore().remove(relativePath);
 }
-
-function toLintErrorObject(value: unknown, fallbackMessage: string): Error {
-  if (value instanceof Error) {
-    return value;
-  }
-  if (typeof value === "string") {
-    return new Error(value);
-  }
-  const error = new Error(fallbackMessage, { cause: value });
-  if ((typeof value === "object" && value !== null) || typeof value === "function") {
-    Object.assign(error, value);
-  }
-  return error;
-}
