refactor(msteams): share response release wrapper · openc...

Recent Commits to openclaw:main

vincentkoc · 2026-06-22 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import {`
`14`	`14`	`normalizeLowercaseStringOrEmpty,`
`15`	`15`	`normalizeOptionalString,`
`16`	`16`	`} from "openclaw/plugin-sdk/string-coerce-runtime";`
	`17`	`+import { responseWithRelease } from "../response-with-release.js";`
`17`	`18`	`import type { MSTeamsAttachmentLike } from "./types.js";`
`18`	`19`
`19`	`20`	`type InlineImageCandidate =`
`@@ -576,52 +577,6 @@ export async function resolveAndValidateIP(`
`576`	`577`
`577`	`578`	`/** Maximum number of redirects to follow in safeFetch. */`
`578`	`579`	`const MAX_SAFE_REDIRECTS = 5;`
`579`		`-const NULL_BODY_STATUSES = new Set([101, 204, 205, 304]);`
`580`		`-`
`581`		`-function responseWithRelease(response: Response, release: () => Promise<void>): Response {`
`582`		`-let released = false;`
`583`		`-const releaseOnce = async () => {`
`584`		`-if (released) {`
`585`		`-return;`
`586`		`-}`
`587`		`-released = true;`
`588`		`-await release();`
`589`		`-};`
`590`		`-`
`591`		`-if (!response.body \|\| NULL_BODY_STATUSES.has(response.status)) {`
`592`		`-void releaseOnce();`
`593`		`-return response;`
`594`		`-}`
`595`		`-`
`596`		`-const reader = response.body.getReader();`
`597`		`-const body = new ReadableStream<Uint8Array>({`
`598`		`-async pull(controller) {`
`599`		`-try {`
`600`		`-const next = await reader.read();`
`601`		`-if (next.done) {`
`602`		`-controller.close();`
`603`		`-await releaseOnce();`
`604`		`-return;`
`605`		`-}`
`606`		`-controller.enqueue(next.value);`
`607`		`-} catch (err) {`
`608`		`-await releaseOnce();`
`609`		`-throw err;`
`610`		`-}`
`611`		`-},`
`612`		`-async cancel(reason) {`
`613`		`-void reader.cancel(reason).catch(() => {});`
`614`		`-await releaseOnce();`
`615`		`-},`
`616`		`-});`
`617`		`-`
`618`		`-return new Response(body, {`
`619`		`-status: response.status,`
`620`		`-statusText: response.statusText,`
`621`		`-headers: response.headers,`
`622`		`-});`
`623`		`-}`
`624`		`-`
`625`	`580`	`/**`
`626`	`581`	`* Fetch a URL with redirect: "manual", validating each redirect target`
`627`	`582`	`* against the hostname allowlist and optional DNS-resolved IP (anti-SSRF).`

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,13 @@ import { fetchWithSsrFGuard, type MSTeamsConfig } from "../runtime-api.js";`
`4`	`4`	`import { GRAPH_ROOT } from "./attachments/shared.js";`
`5`	`5`	`import { resolveMSTeamsSdkCloudOptions } from "./cloud.js";`
`6`	`6`	`import { createMSTeamsHttpError } from "./http-error.js";`
	`7`	`+import { responseWithRelease } from "./response-with-release.js";`
`7`	`8`	`import { createMSTeamsTokenProvider, loadMSTeamsSdkWithAuth } from "./sdk.js";`
`8`	`9`	`import { readAccessToken } from "./token-response.js";`
`9`	`10`	`import { resolveDelegatedAccessToken, resolveMSTeamsCredentials } from "./token.js";`
`10`	`11`	`import { buildUserAgent } from "./user-agent.js";`
`11`	`12`
`12`	`13`	`const GRAPH_BETA = "https://graph.microsoft.com/beta";`
`13`		`-const NULL_BODY_STATUSES = new Set([101, 204, 205, 304]);`
`14`	`14`
`15`	`15`	`export type GraphUser = {`
`16`	`16`	`id?: string;`
`@@ -31,50 +31,6 @@ type GraphChannel = {`
`31`	`31`
`32`	`32`	`export type GraphResponse<T> = { value?: T[] };`
`33`	`33`
`34`		`-function responseWithRelease(response: Response, release: () => Promise<void>): Response {`
`35`		`-let released = false;`
`36`		`-const releaseOnce = async () => {`
`37`		`-if (released) {`
`38`		`-return;`
`39`		`-}`
`40`		`-released = true;`
`41`		`-await release();`
`42`		`-};`
`43`		`-`
`44`		`-if (!response.body \|\| NULL_BODY_STATUSES.has(response.status)) {`
`45`		`-void releaseOnce();`
`46`		`-return response;`
`47`		`-}`
`48`		`-`
`49`		`-const reader = response.body.getReader();`
`50`		`-const body = new ReadableStream<Uint8Array>({`
`51`		`-async pull(controller) {`
`52`		`-try {`
`53`		`-const next = await reader.read();`
`54`		`-if (next.done) {`
`55`		`-controller.close();`
`56`		`-await releaseOnce();`
`57`		`-return;`
`58`		`-}`
`59`		`-controller.enqueue(next.value);`
`60`		`-} catch (error) {`
`61`		`-await releaseOnce();`
`62`		`-throw error;`
`63`		`-}`
`64`		`-},`
`65`		`-async cancel(reason) {`
`66`		`-void reader.cancel(reason).catch(() => undefined);`
`67`		`-await releaseOnce();`
`68`		`-},`
`69`		`-});`
`70`		`-`
`71`		`-return new Response(body, {`
`72`		`-status: response.status,`
`73`		`-statusText: response.statusText,`
`74`		`-headers: response.headers,`
`75`		`-});`
`76`		`-}`
`77`		`-`
`78`	`34`	`export function normalizeQuery(value?: string \| null): string {`
`79`	`35`	`return value?.trim() ?? "";`
`80`	`36`	`}`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,45 @@`
	`1`	`+const NULL_BODY_STATUSES = new Set([101, 204, 205, 304]);`
	`2`	`+`
	`3`	`+export function responseWithRelease(response: Response, release: () => Promise<void>): Response {`
	`4`	`+let released = false;`
	`5`	`+const releaseOnce = async () => {`
	`6`	`+if (released) {`
	`7`	`+return;`
	`8`	`+}`
	`9`	`+released = true;`
	`10`	`+await release();`
	`11`	`+};`
	`12`	`+`
	`13`	`+if (!response.body \|\| NULL_BODY_STATUSES.has(response.status)) {`
	`14`	`+void releaseOnce();`
	`15`	`+return response;`
	`16`	`+}`
	`17`	`+`
	`18`	`+const reader = response.body.getReader();`
	`19`	`+const body = new ReadableStream<Uint8Array>({`
	`20`	`+async pull(controller) {`
	`21`	`+try {`
	`22`	`+const next = await reader.read();`
	`23`	`+if (next.done) {`
	`24`	`+controller.close();`
	`25`	`+await releaseOnce();`
	`26`	`+return;`
	`27`	`+}`
	`28`	`+controller.enqueue(next.value);`
	`29`	`+} catch (error) {`
	`30`	`+await releaseOnce();`
	`31`	`+throw error;`
	`32`	`+}`
	`33`	`+},`
	`34`	`+async cancel(reason) {`
	`35`	`+void reader.cancel(reason).catch(() => undefined);`
	`36`	`+await releaseOnce();`
	`37`	`+},`
	`38`	`+});`
	`39`	`+`
	`40`	`+return new Response(body, {`
	`41`	`+status: response.status,`
	`42`	`+statusText: response.statusText,`
	`43`	`+headers: response.headers,`
	`44`	`+});`
	`45`	`+}`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main