let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(msteams): download image attachments reliably

Browse Source
This commit is contained in:
Peter Steinberger
2026-01-10 02:25:14 +00:00
parent 003cda73e8
commit d693f02fa7
2 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/msteams/attachments.test.ts
View File

@@ -1,13 +1,5 @@
import { beforeEach, describe, expect, it, vi } from "vitest";
import {
buildMSTeamsAttachmentPlaceholder,
buildMSTeamsGraphMessageUrls,
buildMSTeamsMediaPayload,
downloadMSTeamsGraphMedia,
downloadMSTeamsImageAttachments,
} from "./attachments.js";
const detectMimeMock = vi.fn(async () => "image/png");
const saveMediaBufferMock = vi.fn(async () => ({
path: "/tmp/saved.png",
@@ -23,18 +15,24 @@ vi.mock("../media/store.js", () => ({
}));
describe("msteams attachments", () => {
const load = async () => {
return await import("./attachments.js");
};
beforeEach(() => {
detectMimeMock.mockClear();
saveMediaBufferMock.mockClear();
});
describe("buildMSTeamsAttachmentPlaceholder", () => {
it("returns empty string when no attachments", () => {
it("returns empty string when no attachments", async () => {
const { buildMSTeamsAttachmentPlaceholder } = await load();
expect(buildMSTeamsAttachmentPlaceholder(undefined)).toBe("");
expect(buildMSTeamsAttachmentPlaceholder([])).toBe("");
});
it("returns image placeholder for image attachments", () => {
it("returns image placeholder for image attachments", async () => {
const { buildMSTeamsAttachmentPlaceholder } = await load();
expect(
buildMSTeamsAttachmentPlaceholder([
{ contentType: "image/png", contentUrl: "https://x/img.png" },
@@ -48,7 +46,8 @@ describe("msteams attachments", () => {
).toBe("<media:image> (2 images)");
});
it("treats Teams file.download.info image attachments as images", () => {
it("treats Teams file.download.info image attachments as images", async () => {
const { buildMSTeamsAttachmentPlaceholder } = await load();
expect(
buildMSTeamsAttachmentPlaceholder([
{
@@ -59,7 +58,8 @@ describe("msteams attachments", () => {
).toBe("<media:image>");
});
it("returns document placeholder for non-image attachments", () => {
it("returns document placeholder for non-image attachments", async () => {
const { buildMSTeamsAttachmentPlaceholder } = await load();
expect(
buildMSTeamsAttachmentPlaceholder([
{ contentType: "application/pdf", contentUrl: "https://x/x.pdf" },
@@ -73,7 +73,8 @@ describe("msteams attachments", () => {
).toBe("<media:document> (2 files)");
});
it("counts inline images in text/html attachments", () => {
it("counts inline images in text/html attachments", async () => {
const { buildMSTeamsAttachmentPlaceholder } = await load();
expect(
buildMSTeamsAttachmentPlaceholder([
{
@@ -96,6 +97,7 @@ describe("msteams attachments", () => {
describe("downloadMSTeamsImageAttachments", () => {
it("downloads and stores image contentUrl attachments", async () => {
const { downloadMSTeamsImageAttachments } = await load();
const fetchMock = vi.fn(async () => {
return new Response(Buffer.from("png"), {
status: 200,
@@ -112,13 +114,14 @@ describe("msteams attachments", () => {
fetchFn: fetchMock as unknown as typeof fetch,
});
expect(media).toHaveLength(1);
expect(media[0]?.path).toBe("/tmp/saved.png");
expect(fetchMock).toHaveBeenCalledWith("https://x/img");
expect(saveMediaBufferMock).toHaveBeenCalled();
expect(media).toHaveLength(1);
expect(media[0]?.path).toBe("/tmp/saved.png");
});
it("supports Teams file.download.info downloadUrl attachments", async () => {
const { downloadMSTeamsImageAttachments } = await load();
const fetchMock = vi.fn(async () => {
return new Response(Buffer.from("png"), {
status: 200,
@@ -138,11 +141,12 @@ describe("msteams attachments", () => {
fetchFn: fetchMock as unknown as typeof fetch,
});
expect(media).toHaveLength(1);
expect(fetchMock).toHaveBeenCalledWith("https://x/dl");
expect(media).toHaveLength(1);
});
it("downloads inline image URLs from html attachments", async () => {
const { downloadMSTeamsImageAttachments } = await load();
const fetchMock = vi.fn(async () => {
return new Response(Buffer.from("png"), {
status: 200,
@@ -167,6 +171,7 @@ describe("msteams attachments", () => {
});
it("stores inline data:image base64 payloads", async () => {
const { downloadMSTeamsImageAttachments } = await load();
const base64 = Buffer.from("png").toString("base64");
const media = await downloadMSTeamsImageAttachments({
attachments: [
@@ -184,6 +189,7 @@ describe("msteams attachments", () => {
});
it("retries with auth when the first request is unauthorized", async () => {
const { downloadMSTeamsImageAttachments } = await load();
const fetchMock = vi.fn(async (_url: string, opts?: RequestInit) => {
const hasAuth = Boolean(
opts &&
@@ -210,11 +216,13 @@ describe("msteams attachments", () => {
fetchFn: fetchMock as unknown as typeof fetch,
});
expect(fetchMock).toHaveBeenCalled();
expect(media).toHaveLength(1);
expect(fetchMock).toHaveBeenCalledTimes(2);
});
it("skips urls outside the allowlist", async () => {
const { downloadMSTeamsImageAttachments } = await load();
const fetchMock = vi.fn();
const media = await downloadMSTeamsImageAttachments({
attachments: [
@@ -230,6 +238,7 @@ describe("msteams attachments", () => {
});
it("ignores non-image attachments", async () => {
const { downloadMSTeamsImageAttachments } = await load();
const fetchMock = vi.fn();
const media = await downloadMSTeamsImageAttachments({
attachments: [
@@ -246,7 +255,8 @@ describe("msteams attachments", () => {
});
describe("buildMSTeamsGraphMessageUrls", () => {
it("builds channel message urls", () => {
it("builds channel message urls", async () => {
const { buildMSTeamsGraphMessageUrls } = await load();
const urls = buildMSTeamsGraphMessageUrls({
conversationType: "channel",
conversationId: "19:thread@thread.tacv2",
@@ -256,7 +266,8 @@ describe("msteams attachments", () => {
expect(urls[0]).toContain("/teams/team-id/channels/chan-id/messages/123");
});
it("builds channel reply urls when replyToId is present", () => {
it("builds channel reply urls when replyToId is present", async () => {
const { buildMSTeamsGraphMessageUrls } = await load();
const urls = buildMSTeamsGraphMessageUrls({
conversationType: "channel",
messageId: "reply-id",
@@ -268,7 +279,8 @@ describe("msteams attachments", () => {
);
});
it("builds chat message urls", () => {
it("builds chat message urls", async () => {
const { buildMSTeamsGraphMessageUrls } = await load();
const urls = buildMSTeamsGraphMessageUrls({
conversationType: "groupChat",
conversationId: "19:chat@thread.v2",
@@ -280,6 +292,7 @@ describe("msteams attachments", () => {
describe("downloadMSTeamsGraphMedia", () => {
it("downloads hostedContents images", async () => {
const { downloadMSTeamsGraphMedia } = await load();
const base64 = Buffer.from("png").toString("base64");
const fetchMock = vi.fn(async (url: string) => {
if (url.endsWith("/hostedContents")) {
@@ -317,7 +330,8 @@ describe("msteams attachments", () => {
});
describe("buildMSTeamsMediaPayload", () => {
it("returns single and multi-file fields", () => {
it("returns single and multi-file fields", async () => {
const { buildMSTeamsMediaPayload } = await load();
const payload = buildMSTeamsMediaPayload([
{ path: "/tmp/a.png", contentType: "image/png" },
{ path: "/tmp/b.png", contentType: "image/png" },

33
src/msteams/attachments.ts
View File

@@ -1,4 +1,3 @@
import { fetchRemoteMedia } from "../media/fetch.js";
import { detectMime } from "../media/mime.js";
import { saveMediaBuffer } from "../media/store.js";
@@ -741,28 +740,22 @@ export async function downloadMSTeamsImageAttachments(params: {
for (const candidate of candidates) {
if (!isUrlAllowed(candidate.url, allowHosts)) continue;
try {
const fetchImpl: typeof fetch = (input) => {
const url =
typeof input === "string"
? input
: input instanceof URL
? input.toString()
: input.url;
return fetchWithAuthFallback({
url,
tokenProvider: params.tokenProvider,
fetchFn: params.fetchFn,
});
};
const fetched = await fetchRemoteMedia({
const res = await fetchWithAuthFallback({
url: candidate.url,
fetchImpl,
filePathHint: candidate.fileHint,
tokenProvider: params.tokenProvider,
fetchFn: params.fetchFn,
});
if (!res.ok) continue;
const buffer = Buffer.from(await res.arrayBuffer());
if (buffer.byteLength > params.maxBytes) continue;
const mime = await detectMime({
buffer,
headerMime: res.headers.get("content-type"),
filePath: candidate.fileHint ?? candidate.url,
});
if (fetched.buffer.byteLength > params.maxBytes) continue;
const saved = await saveMediaBuffer(
fetched.buffer,
fetched.contentType ?? candidate.contentTypeHint,
buffer,
mime ?? candidate.contentTypeHint,
"inbound",
params.maxBytes,
);