@seayoo-web/request 3.4.5 → 3.5.1

package/types/inc/type.d.ts

@@ -47,7 +47,13 @@ export interface IBaseRequestOptions {
 export interface IRetryRequestOptions {
     /** 错误时重试的次数，不能超过 10 次，默认不重试 */
     maxRetry?: number;
-    /** 重试策略：默认 network，可选 status 或者指定特殊的 status 或自定义检查 */
+    /**
+     * 重试策略：默认 `default`
+     *
+     * `default` 在 `network` 基础之上，当状态码为 Tencent EO 专属错误码 552 / 522 时重试；
+     *
+     * `network` 仅仅网络错误时重试，但忽略 aborted / timeout 状态；
+     */
     retryResolve?: IRetryResolve;
     /**
      * 两次重试的间隔，如果设置时间，则单位 ms，或者设置函数返回等待的时间（单位ms），默认 100，最小 100，函数参数 retryIndex 从 1 开始
@@ -140,12 +146,18 @@ export type IRequestGlobalConfig = {
     /** 全局日志打印函数 */
     logHandler?: null | ((log: IRequestLog) => void);
 } & Pick<IBaseRequestOptions, "credentials" | "timeout"> & IRetryRequestOptions & IOtherRequestOptions;
+/**
+ * 自定义重试检测方法
+ */
+export type IRetryResolveFunc = (response: IRequestBaseResponse, count: number) => boolean;
 /**
  * 失败重试策略：
- * network 仅仅网络错误时重试；
- * status  当网络错误或者 http状态码错误时(<200 || >=400)重试；
+ *
+ * `default` 在 `network` 基础之上，当状态码为 Tencent EO 专属错误码 521 / 522 时重试；
+ *
+ * `network` 仅仅网络错误时重试，但忽略 aborted / timeout 状态；
  */
-export type IRetryResolve = "network" | "status" | number[] | ((response: IRequestBaseResponse, count: number) => boolean);
+export type IRetryResolve = "default" | "network" | number[] | IRetryResolveFunc;
 /** 响应内容转化器 */
 export type IResponseBodyConverter = "camelize" | "snakify" | ((body: unknown) => unknown);
 /** 响应内容解析规则配置 */

package/types/inc/utils.d.ts

@@ -1,4 +1,7 @@
+import { IRetryResolve, IRetryResolveFunc } from "./type";
+/** 简版 Object.fromEntries 以处理某些低版本浏览器和 webview 的问题 */
+export declare function fromEntries(kv: [string, string | undefined][]): Record<string, string>;
 /**
- * 简版 Object.fromEntries 以处理某些低版本浏览器和 webview 的问题
+ * 根据配置返回重试策略函数
  */
-export declare function fromEntries(kv: [string, string | undefined][]): Record<string, string>;
+export declare function getRetryCheckFn(retryResolve: IRetryResolve): IRetryResolveFunc;

package/dist/request.fetch-6HUu6_l5.js

@@ -1,49 +0,0 @@
-import { h as w, r as y, c as E, u as T, f as R, a as c } from "./retry-BjOxSyvC.js";
-const x = async function(a, s, n) {
-  return w(await y(g, a, s, n), a, s, n);
-}, g = async function(a, s, n) {
-  const t = await E(a, s, n), i = new URL(t.url), u = t.params;
-  u instanceof Object && Object.keys(u).forEach((e) => i.searchParams.set(e, u[e]));
-  const r = T() ? new AbortController() : null;
-  function d() {
-    r && !r.signal.aborted && r.abort();
-  }
-  t.abort && t.abort.addEventListener("abort", d);
-  let l = !1;
-  const b = t.timeout > 0 ? setTimeout(function() {
-    l = !0, d();
-  }, t.timeout) : null, f = t.method === "HEAD";
-  return await fetch(i, {
-    method: t.method,
-    headers: Object.keys(t.headers).length > 0 ? new Headers(t.headers) : void 0,
-    body: t.body,
-    credentials: t.credentials,
-    signal: r?.signal,
-    redirect: "follow"
-  }).then(async (e) => {
-    const o = {
-      url: i.toString(),
-      method: t.method,
-      status: e.status,
-      statusText: e.statusText,
-      headers: R([...e.headers.entries()])
-    }, h = f || e.status === 204 ? "" : await e.text().catch((m) => m);
-    return h instanceof Error ? { ...o, body: "", statusText: c.Unknown, rawError: h } : { ...o, body: h };
-  }).catch((e) => {
-    const o = r?.signal.aborted;
-    return {
-      url: i.toString(),
-      method: t.method,
-      status: o && !l ? 0 : -1,
-      // 设置为 0 可以防止自动重试的默认策略
-      statusText: l ? c.Timeout : o ? c.Aborted : c.NetworkError,
-      body: "",
-      rawError: e
-    };
-  }).finally(() => {
-    b !== null && clearTimeout(b), t.abort && t.abort.removeEventListener("abort", d);
-  });
-};
-export {
-  x as f
-};