refactor: dedupe channel runtime error formatting

This commit is contained in:
Peter Steinberger
2026-04-07 01:21:19 +01:00
parent 77a161c811
commit 9e2a1e12fd
18 changed files with 38 additions and 34 deletions

View File

@@ -1,5 +1,6 @@
import crypto from "node:crypto";
import path from "node:path";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import { resolveBlueBubblesServerAccount } from "./account-resolve.js";
import { assertMultipartActionOk, postMultipartFormData } from "./multipart.js";
import {
@@ -130,7 +131,7 @@ export async function downloadBlueBubblesAttachment(
cause: error,
});
}
const text = error instanceof Error ? error.message : String(error);
const text = formatErrorMessage(error);
throw new Error(`BlueBubbles attachment download failed: ${text}`, { cause: error });
}
}

View File

@@ -1,5 +1,6 @@
import type { IncomingMessage, ServerResponse } from "node:http";
import { safeEqualSecret } from "openclaw/plugin-sdk/browser-security-runtime";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import { isPrivateNetworkOptInEnabled } from "openclaw/plugin-sdk/ssrf-runtime";
import { createBlueBubblesDebounceRegistry } from "./monitor-debounce.js";
import {
@@ -92,7 +93,7 @@ function parseBlueBubblesWebhookPayload(
try {
return { ok: true, value: JSON.parse(payload) as unknown };
} catch (error) {
return { ok: false, error: error instanceof Error ? error.message : String(error) };
return { ok: false, error: formatErrorMessage(error) };
}
}
}

View File

@@ -1,3 +1,4 @@
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import type { BaseProbeResult } from "./runtime-api.js";
import { normalizeSecretInputString } from "./secret-input.js";
import { buildBlueBubblesApiUrl, blueBubblesFetchWithTimeout } from "./types.js";
@@ -172,7 +173,7 @@ export async function probeBlueBubbles(params: {
return {
ok: false,
status: null,
error: err instanceof Error ? err.message : String(err),
error: formatErrorMessage(err),
};
}
}

View File

@@ -3,6 +3,7 @@ import type {
DiscordGuildChannelConfig,
DiscordGuildEntry,
} from "openclaw/plugin-sdk/config-runtime";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import { isRecord } from "openclaw/plugin-sdk/text-runtime";
import { inspectDiscordAccount } from "./account-inspect.js";
import { fetchChannelPermissionsDiscord } from "./send.js";
@@ -124,7 +125,7 @@ export async function auditDiscordChannelPermissions(params: {
channels.push({
channelId,
ok: false,
error: err instanceof Error ? err.message : String(err),
error: formatErrorMessage(err),
matchKey: channelId,
matchSource: "id",
});

View File

@@ -16,6 +16,7 @@ import {
createChannelDirectoryAdapter,
createRuntimeDirectoryLiveAdapter,
} from "openclaw/plugin-sdk/directory-runtime";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
import { resolveOutboundSendDep } from "openclaw/plugin-sdk/outbound-runtime";
import { sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
@@ -676,7 +677,7 @@ export const discordPlugin: ChannelPlugin<ResolvedDiscordAccount, DiscordProbe>
],
};
} catch (err) {
const message = err instanceof Error ? err.message : String(err);
const message = formatErrorMessage(err);
details.permissions = { channelId: parsedTarget.id, error: message };
return {
details,

View File

@@ -1,6 +1,7 @@
import type { RequestClient } from "@buape/carbon";
import { Routes } from "discord-api-types/v10";
import { createFinalizableDraftLifecycle } from "openclaw/plugin-sdk/channel-lifecycle";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
/** Discord messages cap at 2000 characters. */
const DISCORD_STREAM_MAX_CHARS = 2000;
@@ -98,9 +99,7 @@ export function createDiscordDraftStream(params: {
return true;
} catch (err) {
streamState.stopped = true;
params.warn?.(
`discord stream preview failed: ${err instanceof Error ? err.message : String(err)}`,
);
params.warn?.(`discord stream preview failed: ${formatErrorMessage(err)}`);
return false;
}
};

View File

@@ -2,6 +2,7 @@ import * as carbonGateway from "@buape/carbon/gateway";
import type { APIGatewayBotInfo } from "discord-api-types/v10";
import * as httpsProxyAgent from "https-proxy-agent";
import type { DiscordAccountConfig } from "openclaw/plugin-sdk/config-runtime";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import { danger } from "openclaw/plugin-sdk/runtime-env";
import type { RuntimeEnv } from "openclaw/plugin-sdk/runtime-env";
import * as undici from "undici";
@@ -117,7 +118,7 @@ async function fetchDiscordGatewayInfo(params: {
});
} catch (error) {
throw createGatewayMetadataError({
detail: error instanceof Error ? error.message : String(error),
detail: formatErrorMessage(error),
transient: true,
cause: error,
});
@@ -128,7 +129,7 @@ async function fetchDiscordGatewayInfo(params: {
body = await response.text();
} catch (error) {
throw createGatewayMetadataError({
detail: error instanceof Error ? error.message : String(error),
detail: formatErrorMessage(error),
transient: true,
cause: error,
});

View File

@@ -1,4 +1,5 @@
import type { BaseProbeResult } from "openclaw/plugin-sdk/channel-contract";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import { resolveFetch } from "openclaw/plugin-sdk/fetch-runtime";
import { fetchWithTimeout } from "openclaw/plugin-sdk/text-runtime";
import { normalizeDiscordToken } from "./token.js";
@@ -167,7 +168,7 @@ export async function probeDiscord(
return {
...result,
status: err instanceof Response ? err.status : result.status,
error: err instanceof Error ? err.message : String(err),
error: formatErrorMessage(err),
elapsedMs: Date.now() - started,
};
}

View File

@@ -14,6 +14,7 @@ import crypto from "node:crypto";
import fs from "node:fs/promises";
import path from "node:path";
import { RateLimitError, type RequestClient } from "@buape/carbon";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import {
parseFfprobeCodecAndSampleRate,
runFfmpeg,
@@ -72,7 +73,7 @@ export async function getAudioDuration(filePath: string): Promise<number> {
}
return Math.round(duration * 100) / 100; // Round to 2 decimal places
} catch (err) {
const errMessage = err instanceof Error ? err.message : String(err);
const errMessage = formatErrorMessage(err);
throw new Error(`Failed to get audio duration: ${errMessage}`, { cause: err });
}
}

View File

@@ -1,4 +1,5 @@
import { createDraftStreamLoop } from "openclaw/plugin-sdk/channel-lifecycle";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import { deleteSlackMessage, editSlackMessage } from "./actions.js";
import { SLACK_TEXT_LIMIT } from "./limits.js";
import { sendMessageSlack } from "./send.js";
@@ -80,9 +81,7 @@ export function createSlackDraftStream(params: {
params.onMessageSent?.();
} catch (err) {
stopped = true;
params.warn?.(
`slack stream preview failed: ${err instanceof Error ? err.message : String(err)}`,
);
params.warn?.(`slack stream preview failed: ${formatErrorMessage(err)}`);
}
};
const loop = createDraftStreamLoop({
@@ -113,9 +112,7 @@ export function createSlackDraftStream(params: {
accountId: params.accountId,
});
} catch (err) {
params.warn?.(
`slack stream preview cleanup failed: ${err instanceof Error ? err.message : String(err)}`,
);
params.warn?.(`slack stream preview cleanup failed: ${formatErrorMessage(err)}`);
}
};

View File

@@ -1,4 +1,5 @@
import type { WebClient } from "@slack/web-api";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import { isRecord } from "openclaw/plugin-sdk/text-runtime";
import { createSlackWebClient } from "./client.js";
@@ -84,7 +85,7 @@ async function callSlack(
} catch (err) {
return {
ok: false,
error: err instanceof Error ? err.message : String(err),
error: formatErrorMessage(err),
};
}
}

View File

@@ -1,3 +1,4 @@
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import { isRecord } from "openclaw/plugin-sdk/text-runtime";
import { fetchWithTimeout } from "openclaw/plugin-sdk/text-runtime";
import type {
@@ -60,7 +61,7 @@ export async function auditTelegramGroupMembershipImpl(
chatId,
ok: false,
status: null,
error: err instanceof Error ? err.message : String(err),
error: formatErrorMessage(err),
matchKey: chatId,
matchSource: "id",
});

View File

@@ -740,7 +740,7 @@ export async function deliverReplies(params: {
accountId: params.accountId,
content: contentForSentHook,
success: false,
error: error instanceof Error ? error.message : String(error),
error: formatErrorMessage(error),
isGroup: params.mirrorIsGroup,
groupId: params.mirrorGroupId,
});

View File

@@ -16,6 +16,7 @@ import {
} from "openclaw/plugin-sdk/channel-status";
import type { OpenClawConfig } from "openclaw/plugin-sdk/config-runtime";
import { createChannelDirectoryAdapter } from "openclaw/plugin-sdk/directory-runtime";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import {
resolveOutboundSendDep,
type OutboundSendDeps,
@@ -542,7 +543,7 @@ async function resolveTelegramTargets(params: {
return {
input,
resolved: false as const,
note: error instanceof Error ? error.message : String(error),
note: formatErrorMessage(error),
};
}
}),

View File

@@ -1,5 +1,6 @@
import type { Bot } from "grammy";
import { createFinalizableDraftLifecycle } from "openclaw/plugin-sdk/channel-lifecycle";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import { buildTelegramThreadParams, type TelegramThreadSpec } from "./bot/helpers.js";
import { isSafeToRetrySendError, isTelegramClientRejection } from "./network-errors.js";
import { normalizeTelegramReplyToMessageId } from "./outbound-params.js";
@@ -362,9 +363,7 @@ export function createTelegramDraftStream(params: {
return sent;
} catch (err) {
streamState.stopped = true;
params.warn?.(
`telegram stream preview failed: ${err instanceof Error ? err.message : String(err)}`,
);
params.warn?.(`telegram stream preview failed: ${formatErrorMessage(err)}`);
return false;
}
};
@@ -451,9 +450,7 @@ export function createTelegramDraftStream(params: {
return streamMessageId;
}
} catch (err) {
params.warn?.(
`telegram stream preview materialize failed: ${err instanceof Error ? err.message : String(err)}`,
);
params.warn?.(`telegram stream preview materialize failed: ${formatErrorMessage(err)}`);
}
return undefined;
};

View File

@@ -1,5 +1,6 @@
import * as dns from "node:dns";
import type { TelegramNetworkConfig } from "openclaw/plugin-sdk/config-runtime";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import {
createPinnedLookup,
hasEnvHttpProxyConfigured,
@@ -270,7 +271,7 @@ function createTelegramDispatcher(policy: PinnedDispatcherPolicy): {
effectivePolicy: policy,
};
} catch (err) {
const reason = err instanceof Error ? err.message : String(err);
const reason = formatErrorMessage(err);
throw new Error(`explicit proxy dispatcher init failed: ${reason}`, { cause: err });
}
}
@@ -293,9 +294,7 @@ function createTelegramDispatcher(policy: PinnedDispatcherPolicy): {
};
} catch (err) {
log.warn(
`env proxy dispatcher init failed; falling back to direct dispatcher: ${
err instanceof Error ? err.message : String(err)
}`,
`env proxy dispatcher init failed; falling back to direct dispatcher: ${formatErrorMessage(err)}`,
);
const directPolicy: PinnedDispatcherPolicy = {
mode: "direct",

View File

@@ -1,5 +1,6 @@
import type { BaseProbeResult } from "openclaw/plugin-sdk/channel-contract";
import type { TelegramNetworkConfig } from "openclaw/plugin-sdk/config-runtime";
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
import { fetchWithTimeout } from "openclaw/plugin-sdk/text-runtime";
import { resolveTelegramApiBase, resolveTelegramFetch } from "./fetch.js";
import { makeProxyFetch } from "./proxy.js";
@@ -217,7 +218,7 @@ export async function probeTelegram(
return {
...result,
status: err instanceof Response ? err.status : result.status,
error: err instanceof Error ? err.message : String(err),
error: formatErrorMessage(err),
elapsedMs: Date.now() - started,
};
}

View File

@@ -1080,7 +1080,7 @@ export async function reactMessageTelegram(
try {
await requestWithDiag(() => api.setMessageReaction(chatId, messageId, reactions), "reaction");
} catch (err: unknown) {
const msg = err instanceof Error ? err.message : String(err);
const msg = formatErrorMessage(err);
if (/REACTION_INVALID/i.test(msg)) {
return { ok: false as const, warning: `Reaction unavailable: ${trimmedEmoji}` };
}