nyrn
/
openclaw
mirror of https://github.com/openclaw/openclaw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: reduce telegram media harness imports

This commit is contained in:
Peter Steinberger 2026-04-03 18:32:07 +01:00
parent fb9be1fcb6
commit 14c863dc4a
No known key found for this signature in database
11 changed files with 94 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/telegram/src/bot-handlers.agent.runtime.ts Normal file
View File

@ -0,0 +1,5 @@
export {
resolveAgentDir,
resolveDefaultAgentId,
resolveDefaultModelForAgent,
} from "openclaw/plugin-sdk/agent-runtime";

7
extensions/telegram/src/bot-handlers.runtime.ts
View File

@ -1,6 +1,4 @@
import type { Message, ReactionTypeEmoji } from "@grammyjs/types";
import { resolveAgentDir, resolveDefaultAgentId } from "openclaw/plugin-sdk/agent-runtime";
import { resolveDefaultModelForAgent } from "openclaw/plugin-sdk/agent-runtime";
import { resolveChannelConfigWrites } from "openclaw/plugin-sdk/channel-config-helpers";
import { shouldDebounceTextInbound } from "openclaw/plugin-sdk/channel-inbound";
import {
@ -44,6 +42,11 @@ import {
type NormalizedAllowFrom,
} from "./bot-access.js";
import { defaultTelegramBotDeps } from "./bot-deps.js";
import {
resolveAgentDir,
resolveDefaultAgentId,
resolveDefaultModelForAgent,
} from "./bot-handlers.agent.runtime.js";
import {
hasInboundMedia,
hasReplyTargetMedia,

7
extensions/telegram/src/bot-message-dispatch.agent.runtime.ts Normal file
View File

@ -0,0 +1,7 @@
export {
findModelInCatalog,
loadModelCatalog,
modelSupportsVision,
resolveAgentDir,
resolveDefaultModelForAgent,
} from "openclaw/plugin-sdk/agent-runtime";

2
extensions/telegram/src/bot-message-dispatch.runtime.ts
View File

@ -4,7 +4,7 @@ export {
resolveSessionStoreEntry,
resolveStorePath,
} from "openclaw/plugin-sdk/config-runtime";
export { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-runtime";
export { getAgentScopedMediaLocalRoots } from "./telegram-media.runtime.js";
export {
generateTopicLabel,
resolveAutoTopicLabelConfig,

14
extensions/telegram/src/bot-message-dispatch.ts
View File

@ -1,11 +1,4 @@
import type { Bot } from "grammy";
import { resolveAgentDir } from "openclaw/plugin-sdk/agent-runtime";
import {
findModelInCatalog,
loadModelCatalog,
modelSupportsVision,
} from "openclaw/plugin-sdk/agent-runtime";
import { resolveDefaultModelForAgent } from "openclaw/plugin-sdk/agent-runtime";
import {
logAckFailure,
logTypingFailure,
@ -25,6 +18,13 @@ import { danger, logVerbose } from "openclaw/plugin-sdk/runtime-env";
import type { RuntimeEnv } from "openclaw/plugin-sdk/runtime-env";
import { defaultTelegramBotDeps, type TelegramBotDeps } from "./bot-deps.js";
import type { TelegramMessageContext } from "./bot-message-context.js";
import {
findModelInCatalog,
loadModelCatalog,
modelSupportsVision,
resolveAgentDir,
resolveDefaultModelForAgent,
} from "./bot-message-dispatch.agent.runtime.js";
import {
loadSessionStore,
resolveMarkdownTableMode,

1
extensions/telegram/src/bot.agent.runtime.ts Normal file
View File

@ -0,0 +1 @@
export { resolveDefaultAgentId } from "openclaw/plugin-sdk/agent-runtime";

114
extensions/telegram/src/bot.media.e2e-harness.ts
View File

@ -127,6 +127,7 @@ const mediaHarnessReplySpy = vi.hoisted(() =>
return undefined;
}),
);
export { mediaHarnessReplySpy };
const mediaHarnessDispatchReplyWithBufferedBlockDispatcher = vi.hoisted(() =>
vi.fn<DispatchReplyWithBufferedBlockDispatcherFn>(async (params: DispatchReplyHarnessParams) => {
@ -179,45 +180,29 @@ vi.doMock("./bot.runtime.js", () => ({
...telegramBotRuntimeForTest,
}));
vi.mock("undici", async (importOriginal) => {
const actual = await importOriginal<typeof import("undici")>();
return {
...actual,
fetch: (...args: Parameters<typeof undiciFetchSpy>) => undiciFetchSpy(...args),
};
});
vi.mock("undici", () => ({
Agent: vi.fn(function MockAgent(this: { options?: unknown }, options?: unknown) {
this.options = options;
}),
EnvHttpProxyAgent: vi.fn(function MockEnvHttpProxyAgent(
this: { options?: unknown },
options?: unknown,
) {
this.options = options;
}),
ProxyAgent: vi.fn(function MockProxyAgent(this: { options?: unknown }, options?: unknown) {
this.options = options;
}),
fetch: (...args: Parameters<typeof undiciFetchSpy>) => undiciFetchSpy(...args),
setGlobalDispatcher: vi.fn(),
}));
export async function mockMediaRuntimeModuleForTest(
importOriginal: () => Promise<typeof import("openclaw/plugin-sdk/media-runtime")>,
) {
const actual = await importOriginal();
const mockModule = Object.create(null) as Record<string, unknown>;
Object.defineProperties(mockModule, Object.getOwnPropertyDescriptors(actual));
Object.defineProperty(mockModule, "fetchRemoteMedia", {
configurable: true,
enumerable: true,
writable: true,
value: (...args: Parameters<typeof fetchRemoteMediaSpy>) => fetchRemoteMediaSpy(...args),
});
Object.defineProperty(mockModule, "saveMediaBuffer", {
configurable: true,
enumerable: true,
writable: true,
value: (...args: Parameters<typeof saveMediaBufferSpy>) => saveMediaBufferSpy(...args),
});
return mockModule;
}
vi.mock("openclaw/plugin-sdk/media-runtime", mockMediaRuntimeModuleForTest);
vi.doMock("openclaw/plugin-sdk/config-runtime", async (importOriginal) => {
const actual = await importOriginal<typeof import("openclaw/plugin-sdk/config-runtime")>();
return {
...actual,
loadConfig: telegramBotDepsForTest.loadConfig,
updateLastRoute: vi.fn(async () => undefined),
};
});
vi.mock("./telegram-media.runtime.js", () => ({
fetchRemoteMedia: (...args: Parameters<typeof fetchRemoteMediaSpy>) =>
fetchRemoteMediaSpy(...args),
getAgentScopedMediaLocalRoots: vi.fn(() => []),
saveMediaBuffer: (...args: Parameters<typeof saveMediaBufferSpy>) => saveMediaBufferSpy(...args),
}));
vi.doMock("./bot-message-context.session.runtime.js", async (importOriginal) => {
const actual = await importOriginal<typeof import("./bot-message-context.session.runtime.js")>();
@ -228,37 +213,26 @@ vi.doMock("./bot-message-context.session.runtime.js", async (importOriginal) =>
};
});
vi.doMock("openclaw/plugin-sdk/agent-runtime", async (importOriginal) => {
const actual = await importOriginal<typeof import("openclaw/plugin-sdk/agent-runtime")>();
return {
...actual,
findModelInCatalog: vi.fn(() => undefined),
loadModelCatalog: vi.fn(async () => []),
modelSupportsVision: vi.fn(() => false),
resolveDefaultModelForAgent: vi.fn(() => ({
provider: "openai",
model: "gpt-test",
})),
};
});
vi.mock("./bot.agent.runtime.js", () => ({
resolveDefaultAgentId: vi.fn(() => "default"),
}));
vi.doMock("openclaw/plugin-sdk/conversation-runtime", async (importOriginal) => {
const actual = await importOriginal<typeof import("openclaw/plugin-sdk/conversation-runtime")>();
return {
...actual,
readChannelAllowFromStore: telegramBotDepsForTest.readChannelAllowFromStore,
upsertChannelPairingRequest: vi.fn(async () => ({
code: "PAIRCODE",
created: true,
})),
};
});
vi.mock("./bot-handlers.agent.runtime.js", () => ({
resolveAgentDir: vi.fn(() => "/tmp/agent"),
resolveDefaultAgentId: vi.fn(() => "default"),
resolveDefaultModelForAgent: vi.fn(() => ({
provider: "openai",
model: "gpt-test",
})),
}));
vi.doMock("openclaw/plugin-sdk/reply-runtime", async (importOriginal) => {
const actual = await importOriginal<typeof import("openclaw/plugin-sdk/reply-runtime")>();
return {
...actual,
getReplyFromConfig: mediaHarnessReplySpy,
__replySpy: mediaHarnessReplySpy,
};
});
vi.mock("./bot-message-dispatch.agent.runtime.js", () => ({
findModelInCatalog: vi.fn(() => undefined),
loadModelCatalog: vi.fn(async () => []),
modelSupportsVision: vi.fn(() => false),
resolveAgentDir: vi.fn(() => "/tmp/agent"),
resolveDefaultModelForAgent: vi.fn(() => ({
provider: "openai",
model: "gpt-test",
})),
}));

31
extensions/telegram/src/bot.media.test-utils.ts
View File

@ -1,5 +1,5 @@
import * as ssrf from "openclaw/plugin-sdk/ssrf-runtime";
import { afterEach, beforeEach, expect, vi, type Mock } from "vitest";
import { afterEach, beforeAll, beforeEach, expect, vi, type Mock } from "vitest";
import * as harness from "./bot.media.e2e-harness.js";
type StickerSpy = Mock<(...args: unknown[]) => unknown>;
@ -132,13 +132,17 @@ async function loadTelegramBotHarness() {
...opts,
telegramDeps: harness.telegramBotDepsForTest,
});
const replyModule = await import("openclaw/plugin-sdk/reply-runtime");
replySpyRef = (replyModule as unknown as { __replySpy: ReturnType<typeof vi.fn> }).__replySpy;
replySpyRef = harness.mediaHarnessReplySpy;
}
beforeEach(async () => {
vi.resetModules();
beforeAll(async () => {
await loadTelegramBotHarness();
});
beforeEach(() => {
onSpyRef.mockClear();
replySpyRef.mockClear();
sendChatActionSpyRef.mockClear();
vi.useRealTimers();
lookupMock.mockResolvedValue([{ address: "93.184.216.34", family: 4 }]);
resolvePinnedHostnameSpy = vi
@ -152,12 +156,11 @@ afterEach(() => {
resolvePinnedHostnameSpy = null;
});
vi.mock("./sticker-cache.js", async (importOriginal) => {
const actual = await importOriginal<typeof import("./sticker-cache.js")>();
return {
...actual,
cacheSticker: (...args: unknown[]) => cacheStickerSpy(...args),
getCachedSticker: (...args: unknown[]) => getCachedStickerSpy(...args),
describeStickerImage: (...args: unknown[]) => describeStickerImageSpy(...args),
};
});
vi.mock("./sticker-cache.js", () => ({
cacheSticker: (...args: unknown[]) => cacheStickerSpy(...args),
getCachedSticker: (...args: unknown[]) => getCachedStickerSpy(...args),
describeStickerImage: (...args: unknown[]) => describeStickerImageSpy(...args),
getAllCachedStickers: vi.fn(() => []),
getCacheStats: vi.fn(() => ({ count: 0 })),
searchStickers: vi.fn(() => []),
}));

2
extensions/telegram/src/bot.ts
View File

@ -1,4 +1,3 @@
import { resolveDefaultAgentId } from "openclaw/plugin-sdk/agent-runtime";
import {
isNativeCommandsExplicitlyDisabled,
resolveNativeCommandsEnabled,
@ -32,6 +31,7 @@ import {
resolveTelegramUpdateId,
type TelegramUpdateKeyContext,
} from "./bot-updates.js";
import { resolveDefaultAgentId } from "./bot.agent.runtime.js";
import { apiThrottler, Bot, sequentialize, type ApiClientOptions } from "./bot.runtime.js";
import { buildTelegramGroupPeerId, resolveTelegramStreamMode } from "./bot/helpers.js";
import { resolveTelegramTransport, type TelegramTransport } from "./fetch.js";

2
extensions/telegram/src/bot/delivery.resolve-media.runtime.ts
View File

@ -1,7 +1,7 @@
import { fetchRemoteMedia, saveMediaBuffer } from "openclaw/plugin-sdk/media-runtime";
import { logVerbose, retryAsync, warn } from "openclaw/plugin-sdk/runtime-env";
import { formatErrorMessage } from "openclaw/plugin-sdk/ssrf-runtime";
import { resolveTelegramApiBase, shouldRetryTelegramTransportFallback } from "../fetch.js";
import { fetchRemoteMedia, saveMediaBuffer } from "../telegram-media.runtime.js";
export {
fetchRemoteMedia,

5
extensions/telegram/src/telegram-media.runtime.ts Normal file
View File

@ -0,0 +1,5 @@
export {
fetchRemoteMedia,
getAgentScopedMediaLocalRoots,
saveMediaBuffer,
} from "openclaw/plugin-sdk/media-runtime";