refactor: dedupe extension error formatting

This commit is contained in:
Peter Steinberger
2026-04-07 01:37:10 +01:00
parent 09b31f9123
commit 474db91bed
8 changed files with 18 additions and 12 deletions

View File

@@ -1,4 +1,5 @@
import fs from "node:fs/promises";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import type {
AcpRuntime,
OpenClawPluginService,
@@ -145,9 +146,7 @@ export function createAcpxRuntimeService(
if (currentRevision !== lifecycleRevision) {
return;
}
ctx.logger.warn(
`embedded acpx runtime setup failed: ${err instanceof Error ? err.message : String(err)}`,
);
ctx.logger.warn(`embedded acpx runtime setup failed: ${formatErrorMessage(err)}`);
}
})();
},

View File

@@ -6,6 +6,7 @@ import {
type ListInferenceProfilesCommandOutput,
} from "@aws-sdk/client-bedrock";
import { createSubsystemLogger } from "openclaw/plugin-sdk/core";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import { resolveAwsSdkEnvVarName } from "openclaw/plugin-sdk/provider-auth-runtime";
import type {
BedrockDiscoveryConfig,
@@ -214,7 +215,7 @@ async function fetchInferenceProfileSummaries(
return profiles;
} catch (error) {
log.debug?.("Skipping inference profile discovery", {
error: error instanceof Error ? error.message : String(error),
error: formatErrorMessage(error),
});
return [];
}
@@ -406,7 +407,7 @@ export async function discoverBedrockModels(params: {
if (!hasLoggedBedrockError) {
hasLoggedBedrockError = true;
log.warn("Failed to discover Bedrock models", {
error: error instanceof Error ? error.message : String(error),
error: formatErrorMessage(error),
});
}
return [];

View File

@@ -1,5 +1,6 @@
import { type ChildProcessWithoutNullStreams, spawn } from "node:child_process";
import { createInterface, type Interface } from "node:readline";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import type { RuntimeEnv } from "openclaw/plugin-sdk/runtime-env";
import { resolveUserPath } from "openclaw/plugin-sdk/text-runtime";
import { DEFAULT_IMESSAGE_PROBE_TIMEOUT_MS } from "./constants.js";
@@ -188,7 +189,7 @@ export class IMessageRpcClient {
try {
parsed = JSON.parse(line) as IMessageRpcResponse<unknown>;
} catch (err) {
const detail = err instanceof Error ? err.message : String(err);
const detail = formatErrorMessage(err);
this.runtime?.error?.(`imsg rpc: failed to parse ${line}: ${detail}`);
return;
}

View File

@@ -1,3 +1,4 @@
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import type { OpenClawConfig } from "openclaw/plugin-sdk/provider-auth";
import { upsertAuthProfileWithLock } from "openclaw/plugin-sdk/provider-auth";
import { applyAgentDefaultModelPrimary } from "openclaw/plugin-sdk/provider-onboard";
@@ -195,7 +196,7 @@ async function pullOllamaModelCore(params: {
await release();
}
} catch (err) {
const reason = err instanceof Error ? err.message : String(err);
const reason = formatErrorMessage(err);
return { ok: false, message: `Failed to download ${modelName}: ${reason}` };
}
}

View File

@@ -9,6 +9,7 @@ import type {
Usage,
} from "@mariozechner/pi-ai";
import { createAssistantMessageEventStream, streamSimple } from "@mariozechner/pi-ai";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import type {
OpenClawConfig,
ProviderRuntimeModel,
@@ -739,7 +740,7 @@ export function createOllamaStreamFn(
reason: "error",
error: buildStreamErrorAssistantMessage({
model,
errorMessage: err instanceof Error ? err.message : String(err),
errorMessage: formatErrorMessage(err),
}),
});
} finally {

View File

@@ -1,4 +1,5 @@
import { generateSecureUuid } from "openclaw/plugin-sdk/core";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import { resolveFetch } from "openclaw/plugin-sdk/fetch-runtime";
import { fetchWithTimeout } from "openclaw/plugin-sdk/text-runtime";
@@ -126,7 +127,7 @@ export async function signalCheck(
return {
ok: false,
status: null,
error: err instanceof Error ? err.message : String(err),
error: formatErrorMessage(err),
};
}
}

View File

@@ -1,4 +1,5 @@
import type { BaseProbeResult } from "openclaw/plugin-sdk/channel-contract";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import { signalCheck, signalRpcRequest } from "./client.js";
export type SignalProbe = BaseProbeResult & {
@@ -45,7 +46,7 @@ export async function probeSignal(baseUrl: string, timeoutMs: number): Promise<S
});
result.version = parseSignalVersion(version);
} catch (err) {
result.error = err instanceof Error ? err.message : String(err);
result.error = formatErrorMessage(err);
}
return {
...result,

View File

@@ -1,4 +1,5 @@
import { resolveActiveTalkProviderConfig } from "openclaw/plugin-sdk/config-runtime";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import type { SpeechVoiceOption } from "openclaw/plugin-sdk/speech";
import { definePluginEntry, type OpenClawPluginApi } from "./api.js";
@@ -169,7 +170,7 @@ export default definePluginEntry({
text: formatVoiceList(voices, Number.isFinite(limit) ? limit : 12, providerId),
};
} catch (error) {
const message = error instanceof Error ? error.message : String(error);
const message = formatErrorMessage(error);
return { text: `${providerLabel} voice list failed: ${message}` };
}
}
@@ -194,7 +195,7 @@ export default definePluginEntry({
baseUrl,
});
} catch (error) {
const message = error instanceof Error ? error.message : String(error);
const message = formatErrorMessage(error);
return { text: `${providerLabel} voice lookup failed: ${message}` };
}
const chosen = findVoice(voices, query);