ewilliams28/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-12 21:53:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor(plugins): reuse canonical error coercion (#119451)

Browse Source
This commit is contained in:
Peter Steinberger
2026-08-04 21:05:45 -07:00
committed by GitHub
parent 9214e6381d
commit 60a8ec821c
7 changed files with 20 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/acpx/src/runtime-turn.ts
+2 -15
View File
@@ -2,6 +2,7 @@
* ACPX turn adapters. Modern runtimes can expose startTurn directly; legacy
* runtimes that only stream runTurn events are adapted to the newer contract.
*/
import { toErrorObject } from "openclaw/plugin-sdk/error-runtime";
import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
import type {
AcpRuntime,
@@ -67,7 +68,7 @@ class LegacyRunTurnEventQueue {
return item;
}
if (this.error) {
throw toLintErrorObject(this.error, "Non-Error thrown");
throw toErrorObject(this.error, "Non-Error thrown");
}
if (this.closed) {
return null;
@@ -183,17 +184,3 @@ export function lazyStartRuntimeTurn(
},
};
}
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;
}
extensions/copilot/src/event-bridge.ts
+2 -15
View File
@@ -4,6 +4,7 @@ import type {
AgentHarnessAttemptResult,
AgentMessage,
} from "openclaw/plugin-sdk/agent-harness-runtime";
import { toErrorObject } from "openclaw/plugin-sdk/error-runtime";
import {
buildAssistantMessage,
hasOwnKeys,
@@ -254,7 +255,7 @@ export function attachEventBridge(
});
deltaChain = deltaQueue.then(() => {
if (firstDeltaError !== undefined) {
throw toLintErrorObject(firstDeltaError, "Non-Error thrown");
throw toErrorObject(firstDeltaError, "Non-Error thrown");
}
});
void deltaChain.catch(() => undefined);
@@ -986,17 +987,3 @@ function registerListener<K extends SessionEventType>(
session.off?.(eventType, handler as (...args: unknown[]) => void);
});
}
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;
}
extensions/discord/src/monitor.gateway.ts
+2 -15
View File
@@ -1,4 +1,5 @@
// Discord plugin module implements monitor.gateway behavior.
import { toErrorObject } from "openclaw/plugin-sdk/error-runtime";
import type { DiscordGatewayHandle } from "./monitor/gateway-handle.js";
import { DiscordGatewayLifecycleError } from "./monitor/gateway-supervisor.js";
import type {
@@ -49,7 +50,7 @@ export async function waitForDiscordGatewayStop(
gateway?.disconnect?.();
} finally {
cleanup();
reject(toLintErrorObject(err, "Non-Error rejection"));
reject(toErrorObject(err, "Non-Error rejection"));
}
};
const onAbort = () => {
@@ -74,17 +75,3 @@ export async function waitForDiscordGatewayStop(
params.registerForceStop?.(onForceStop);
});
}
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;
}
extensions/line/src/bot-handlers.ts
+2 -15
View File
@@ -14,6 +14,7 @@ import {
resolvePairingIdLabel,
upsertChannelPairingRequest,
} from "openclaw/plugin-sdk/conversation-runtime";
import { toErrorObject } from "openclaw/plugin-sdk/error-runtime";
import {
DEFAULT_GROUP_HISTORY_LIMIT,
createChannelHistoryWindow,
@@ -529,7 +530,7 @@ export async function handleLineWebhookEvents(
}
}
if (firstError) {
throw toLintErrorObject(firstError, "Non-Error thrown");
throw toErrorObject(firstError, "Non-Error thrown");
}
}
@@ -560,17 +561,3 @@ async function handleLineWebhookEvent(
logVerbose(`line: unhandled event type: ${(event as WebhookEvent).type}`);
}
}
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;
}
extensions/memory-core/src/memory/manager.ts
+8 -17
View File
@@ -2,7 +2,11 @@
import type { DatabaseSync } from "node:sqlite";
import type { FSWatcher } from "chokidar";
import { resolveAgentConfig } from "openclaw/plugin-sdk/agent-runtime";
import { formatErrorMessage, readErrorName } from "openclaw/plugin-sdk/error-runtime";
import {
formatErrorMessage,
readErrorName,
toErrorObject,
} from "openclaw/plugin-sdk/error-runtime";
import { listRegisteredMemoryEmbeddingProviderAdapters } from "openclaw/plugin-sdk/memory-core-host-embedding-registry";
import { classifyMemoryMultimodalPath } from "openclaw/plugin-sdk/memory-core-host-engine-embeddings";
import {
@@ -972,7 +976,7 @@ export class MemoryIndexManager extends MemoryManagerEmbeddingOps implements Mem
}
}
if (closeFailed) {
throw toLintErrorObject(firstError, "Embedding provider retirement failed");
throw toErrorObject(firstError, "Embedding provider retirement failed");
}
});
this.providerRetirementPromise = retirement;
@@ -2331,7 +2335,7 @@ export class MemoryIndexManager extends MemoryManagerEmbeddingOps implements Mem
private async retryFailedClose(): Promise<void> {
const retirementErrors = await this.drainPendingProviderRetirements();
if (this.providersPendingRetirement.size > 0) {
throw toLintErrorObject(retirementErrors.at(-1), "Embedding provider retirement failed");
throw toErrorObject(retirementErrors.at(-1), "Embedding provider retirement failed");
}
if (INDEX_CACHE.get(this.cacheKey) === this) {
INDEX_CACHE.delete(this.cacheKey);
@@ -2446,7 +2450,7 @@ export class MemoryIndexManager extends MemoryManagerEmbeddingOps implements Mem
(this.providersPendingRetirement.size > 0 ? retirementErrors.at(-1) : undefined) ??
closeErrors.values().next().value;
if (closeError) {
throw toLintErrorObject(closeError, "Non-Error thrown");
throw toErrorObject(closeError, "Non-Error thrown");
}
if (INDEX_CACHE.get(this.cacheKey) === this) {
INDEX_CACHE.delete(this.cacheKey);
@@ -2461,17 +2465,4 @@ function hasTargetedSessionSyncParams(params: MemorySyncParams | undefined): boo
);
}
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;
}
/* oxlint-disable max-lines -- TODO: split this grandfathered oversized file. */
extensions/qa-channel/src/bus-client.ts
+2 -15
View File
@@ -1,6 +1,7 @@
// Qa Channel plugin module implements bus client behavior.
import http from "node:http";
import https from "node:https";
import { toErrorObject } from "openclaw/plugin-sdk/error-runtime";
import { resolvePositiveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
import { readProviderJsonResponse } from "openclaw/plugin-sdk/provider-http";
import {
@@ -124,7 +125,7 @@ async function postJson<T>(
resolve(parsed as T);
},
(error: unknown) => {
reject(toLintErrorObject(error, "Non-Error rejection"));
reject(toErrorObject(error, "Non-Error rejection"));
},
);
response.on("error", reject);
@@ -286,17 +287,3 @@ export async function getQaBusState(baseUrl: string): Promise<QaBusStateSnapshot
await release();
}
}
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;
}
extensions/whatsapp/src/session.ts
+2 -18
View File
@@ -10,6 +10,7 @@ import type {
} from "baileys";
import { formatCliCommand } from "openclaw/plugin-sdk/cli-runtime";
import { VERSION } from "openclaw/plugin-sdk/cli-runtime";
import { toErrorObject } from "openclaw/plugin-sdk/error-runtime";
import {
createHttp1EnvHttpProxyAgent,
createHttp1ProxyAgent,
@@ -550,10 +551,7 @@ export async function waitForWaConnection(
cleanup();
const disconnectError = update.lastDisconnect?.error ?? update.lastDisconnect;
reject(
toLintErrorObject(
disconnectError ?? new Error("Connection closed"),
"Non-Error rejection",
),
toErrorObject(disconnectError ?? new Error("Connection closed"), "Non-Error rejection"),
);
}
};
@@ -575,20 +573,6 @@ export function newConnectionId() {
return randomUUID();
}
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;
}
function createConnectionTimeoutError(timeoutMs: number): Error {
const error = new Error(`WhatsApp connection timed out after ${timeoutMs}ms`);
Object.assign(error, {