keq 2.5.4 → 2.6.0

package/.node-version

@@ -0,0 +1 @@
+v20.13.1

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.6.0](https://github.com/keq-request/keq/compare/v2.5.5...v2.6.0) (2024-05-28)
+
+
+### Features
+
+* use .on(eventName, listener) add event listener ([500ef14](https://github.com/keq-request/keq/commit/500ef140b513d614c3454d0e9023dd501e5d1ef6))
+
+
+### Bug Fixes
+
+* esm import syntax ([c312146](https://github.com/keq-request/keq/commit/c312146ffeb456bcfb1e0e6e2f2a3c8c773e6003))
+* the body is undeifned when send plain/text request ([ed24ba6](https://github.com/keq-request/keq/commit/ed24ba6f5ef3a565fb3eb6be496be09ed0fa40f9))
+
+## [2.5.5](https://github.com/keq-request/keq/compare/v2.5.4...v2.5.5) (2024-05-26)
+
+
+### Bug Fixes
+
+* avoid conflicts between flowController and timeout middleware ([a075602](https://github.com/keq-request/keq/commit/a075602ed868812955001df7ed15f2351f899f33))
+* retry timeout and flowControll not triggered ([846c884](https://github.com/keq-request/keq/commit/846c8845334f61fdca7a6cd3b718e135d23bfb18))
+
 ## [2.5.4](https://github.com/keq-request/keq/compare/v2.5.3...v2.5.4) (2024-05-23)
 
 

package/dist/esm/src/constant.d.ts

@@ -1,2 +1,3 @@
 export declare const OUTPUT_PROPERTY: unique symbol;
 export declare const NEXT_INVOKED_PROPERTY: unique symbol;
+export declare const ABORT_PROPERTY: unique symbol;

package/dist/esm/src/constant.js

@@ -1,2 +1,3 @@
 export const OUTPUT_PROPERTY = Symbol('outputProperty');
 export const NEXT_INVOKED_PROPERTY = Symbol('nextInvokedProperty');
+export const ABORT_PROPERTY = Symbol('abortProperty');

package/dist/esm/src/core.d.ts

@@ -2,12 +2,14 @@ import { URL } from 'whatwg-url';
 import type { KeqContextOptions, KeqRequestContext } from './types/keq-context.js';
 import type { KeqMiddleware } from './types/keq-middleware.js';
 import type { KeqRequestInit } from './types/keq-request-init.js';
+import { KeqEvents, KeqListeners } from './types/keq-events.js';
 /**
  * @description Keq 核心 API，发送请求必要的原子化的API
  */
 export declare class Core<T> {
     private requestPromise?;
-    protected requestContext: KeqRequestContext;
+    protected requestContext: Omit<KeqRequestContext, 'abort'>;
+    protected __listeners__: KeqListeners;
     protected __global__: Record<string, any>;
     protected __prepend_middlewares__: KeqMiddleware[];
     protected __append_middlewares__: KeqMiddleware[];
@@ -15,6 +17,7 @@ export declare class Core<T> {
     constructor(url: (URL | globalThis.URL), init: KeqRequestInit, global?: Record<string, any>);
     prependMiddlewares(...middlewares: KeqMiddleware[]): this;
     appendMiddlewares(...middlewares: KeqMiddleware[]): this;
+    on<K extends keyof KeqEvents>(event: K, listener: (data: KeqEvents[K]) => void): this;
     private run;
     end(): Promise<T>;
     /**

package/dist/esm/src/core.js

@@ -1,15 +1,17 @@
 import { URL } from 'whatwg-url';
 import { Exception } from "./exception/exception.js";
 import { clone } from "./util/clone.js";
-import { NEXT_INVOKED_PROPERTY, OUTPUT_PROPERTY } from './constant.js';
+import { ABORT_PROPERTY, NEXT_INVOKED_PROPERTY, OUTPUT_PROPERTY } from './constant.js';
 import { composeMiddleware } from './util/compose-middleware.js';
 import { shadowClone } from './util/shadow-clone.js';
+import mitt from 'mitt';
 /**
  * @description Keq 核心 API，发送请求必要的原子化的API
  */
 export class Core {
     requestPromise;
     requestContext;
+    __listeners__ = {};
     __global__;
     __prepend_middlewares__ = [];
     __append_middlewares__ = [];
@@ -36,6 +38,11 @@ export class Core {
         this.__append_middlewares__.unshift(...middlewares);
         return this;
     }
+    on(event, listener) {
+        this.__listeners__[event] = this.__listeners__[event] || [];
+        this.__listeners__[event].push(listener);
+        return this;
+    }
     async run() {
         const headers = new Headers();
         for (const [key, value] of this.requestContext.headers.entries()) {
@@ -55,15 +62,22 @@ export class Core {
             redirect: this.requestContext.redirect,
             referrer: this.requestContext.referrer,
             referrerPolicy: this.requestContext.referrerPolicy,
-            signal: this.requestContext.signal,
         };
         const options = shadowClone(this.__options__);
+        const emitter = mitt();
+        for (const eventName in this.__listeners__) {
+            const listeners = this.__listeners__[eventName];
+            for (const listener of listeners) {
+                emitter.on(eventName, listener);
+            }
+        }
         const ctx = {
             [NEXT_INVOKED_PROPERTY]: {
                 finished: false,
                 entryNextTimes: 0,
                 outNextTimes: 0,
             },
+            emitter,
             request: requestContext,
             options,
             global: this.__global__,
@@ -73,6 +87,13 @@ export class Core {
             set output(value) {
                 this[OUTPUT_PROPERTY] = value;
             },
+            [ABORT_PROPERTY]: undefined,
+            abort(reason) {
+                const abortController = this[ABORT_PROPERTY];
+                if (abortController) {
+                    abortController.abort(reason);
+                }
+            },
         };
         const middleware = composeMiddleware([...this.__prepend_middlewares__, ...this.__append_middlewares__]);
         // eslint-disable-next-line @typescript-eslint/no-empty-function

package/dist/esm/src/create-request.js

@@ -21,12 +21,12 @@ export function createRequest(options) {
         }
     }
     const appendMiddlewares = options?.initMiddlewares ? [...options.initMiddlewares] : [
+        retryMiddleware(),
         serialFlowControlMiddleware(),
         abortFlowControlMiddleware(),
         timeoutMiddleware(),
         proxyResponseMiddleware(),
         fetchArgumentsMiddleware(),
-        retryMiddleware(),
         fetchMiddleware(),
     ];
     const prependMiddlewares = [];

package/dist/esm/src/index.d.ts

@@ -3,16 +3,18 @@ export { Keq } from './keq.js';
 export { request } from './request.js';
 export { composeMiddleware } from './util/compose-middleware.js';
 export { composeRoute } from './util/compose-route.js';
-export { KeqContext, KeqContextOptions } from './types/keq-context.js';
-export { KeqMiddleware } from './types/keq-middleware.js';
-export { KeqNext } from './types/keq-next.js';
-export { KeqOptions } from './types/keq-options.js';
-export { KeqRequestBody } from './types/keq-request-body.js';
-export { KeqRequestInit } from './types/keq-request-init.js';
-export { KeqRequest } from './types/keq-request.js';
-export { KeqRetryDelay } from './types/keq-retry-delay.js';
-export { KeqRetryOn } from './types/keq-retry-on.js';
-export { KeqRoute } from './types/keq-route.js';
+export type { KeqContext, KeqContextOptions } from './types/keq-context.js';
+export type { KeqMiddleware } from './types/keq-middleware.js';
+export type { KeqNext } from './types/keq-next.js';
+export type { KeqOptions } from './types/keq-options.js';
+export type { KeqRequestBody } from './types/keq-request-body.js';
+export type { KeqRequestInit } from './types/keq-request-init.js';
+export type { KeqRequest } from './types/keq-request.js';
+export type { KeqRetryDelay } from './types/keq-retry-delay.js';
+export type { KeqRetryOn } from './types/keq-retry-on.js';
+export type { KeqRoute } from './types/keq-route.js';
+export type { KeqGlobal } from './types/keq-global.js';
+export type { KeqEvents } from './types/keq-events.js';
 export { keqHostRoute } from './router/keq-host-route.js';
 export { keqLocationRoute } from './router/keq-location-route.js';
 export { keqMethodRoute } from './router/keq-method-route.js';

package/dist/esm/src/is/is-url-search-params.js

@@ -3,10 +3,10 @@ import { isObject } from './is-object.js';
 export function isUrlSearchParams(obj) {
     if (obj instanceof URLSearchParams)
         return true;
-    if (isObject(obj) &&
+    return (isObject(obj) &&
         isFunction(obj.append) &&
         isFunction(obj.delete) &&
-        isFunction(obj.entrie) &&
+        isFunction(obj.entries) &&
         isFunction(obj.forEac) &&
         isFunction(obj.get) &&
         isFunction(obj.getAll) &&
@@ -15,8 +15,5 @@ export function isUrlSearchParams(obj) {
         isFunction(obj.set) &&
         isFunction(obj.values) &&
         isFunction(obj.sort) &&
-        isFunction(obj.toStri)) {
-        return true;
-    }
-    return false;
+        isFunction(obj.toString));
 }

package/dist/esm/src/keq.js

@@ -168,12 +168,10 @@ export class Keq extends Core {
      * @param retryDelay Initial value used to calculate the retry in milliseconds (This is still randomized following the randomization factor)
      * @param retryCallback Will be called after request failed
      */
-    retry(retryTimes, retryDelay, retryOn) {
+    retry(retryTimes, retryDelay = 0, retryOn = (attempt, error) => !!error) {
         this.option('retryTimes', retryTimes);
         this.option('retryDelay', retryDelay);
-        if (retryOn !== undefined) {
-            this.option('retryOn', retryOn);
-        }
+        this.option('retryOn', retryOn);
         return this;
     }
     redirect(mod) {

package/dist/esm/src/middlewares/abort-flow-control-middleware.js

@@ -4,23 +4,21 @@ export function abortFlowControlMiddleware() {
             await next();
             return;
         }
-        if (ctx.request.signal) {
-            console.warn('[keq] request signal had be set manual, abort follow control will not take effect');
-            await next();
-            return;
-        }
         const { signal } = ctx.options.flowControl;
         const key = typeof signal === 'string' ? signal : signal(ctx);
         if (!ctx.global.abortFlowControl)
             ctx.global.abortFlowControl = {};
-        if (ctx.global.abortFlowControl[key]) {
-            const abortController = ctx.global.abortFlowControl[key];
-            abortController.abort(new DOMException('The previous request was not completed, so keq flowControl abort this request.', 'AbortError'));
+        const abort = ctx.global.abortFlowControl[key];
+        if (abort) {
+            const reason = new DOMException('The previous request was not completed, so keq flowControl abort this request.', 'AbortError');
+            abort(reason);
+        }
+        ctx.global.abortFlowControl[key] = ctx.abort.bind(ctx);
+        try {
+            await next();
+        }
+        finally {
+            ctx.global.abortFlowControl[key] = undefined;
         }
-        const abortController = new AbortController();
-        ctx.global.abortFlowControl[key] = abortController;
-        ctx.request.signal = abortController.signal;
-        await next();
-        ctx.global.abortFlowControl[key] = undefined;
     };
 }

package/dist/esm/src/middlewares/fetch-arguments-middleware.js

@@ -1,6 +1,7 @@
 import { URL } from 'whatwg-url';
 import { Exception } from "../exception/exception.js";
 import { compilePathnameTemplate } from "../util/compile-pathname-template.js";
+import { ABORT_PROPERTY } from "../constant.js";
 function compileUrl(obj, routeParams) {
     const url = new URL(typeof obj === 'string' ? obj : obj.href);
     try {
@@ -62,6 +63,9 @@ function compileBody(ctx) {
         request.headers.delete('content-type');
         return form;
     }
+    if (body instanceof Buffer)
+        return body;
+    return String(body);
 }
 export function fetchArgumentsMiddleware() {
     return async function fetchArgumentsMiddleware(ctx, next) {
@@ -70,6 +74,8 @@ export function fetchArgumentsMiddleware() {
         if (!request.headers.has('Content-Type') && request.body) {
             request.headers.set('Content-Type', inferContentTypeByBody(ctx.request.body));
         }
+        const abortController = new AbortController();
+        ctx[ABORT_PROPERTY] = abortController;
         const requestInit = {
             method: request.method.toUpperCase(),
             headers: request.headers,
@@ -82,7 +88,7 @@ export function fetchArgumentsMiddleware() {
             redirect: request.redirect,
             referrer: request.referrer,
             referrerPolicy: request.referrerPolicy,
-            signal: request.signal,
+            signal: abortController.signal,
         };
         ctx.fetchArguments = [url, requestInit];
         await next();

package/dist/esm/src/middlewares/fetch-middleware.js

@@ -8,6 +8,7 @@ export function fetchMiddleware() {
         if (!fetchArguments) {
             throw new Exception('fetchArguments is required');
         }
+        ctx.emitter.emit('fetch', ctx);
         const fetch = ctx.options.fetchAPI || globalThis.fetch;
         const response = await fetch(...fetchArguments);
         ctx.res = response;

package/dist/esm/src/middlewares/proxy-response-middleware.js

@@ -2,7 +2,7 @@ export function proxyResponseMiddleware() {
     return async function proxyResponseMiddleware(ctx, next) {
         await next();
         const res = ctx.res;
-        if (res && !('response' in ctx)) {
+        if (res) {
             ctx.response = new Proxy(res, {
                 get(res, prop) {
                     if (typeof prop === 'string') {

package/dist/esm/src/middlewares/retry-middleware.js

@@ -29,6 +29,9 @@ export function retryMiddleware() {
         for (let i = 0; i < retryTimes; i++) {
             let err = null;
             try {
+                ctx.fetchArguments = undefined;
+                ctx.response = undefined;
+                ctx.req = undefined;
                 ctx[NEXT_INVOKED_PROPERTY].entryNextTimes = 0;
                 ctx[NEXT_INVOKED_PROPERTY].outNextTimes = 0;
                 await next();
@@ -47,6 +50,8 @@ export function retryMiddleware() {
                 break;
             }
             const delay = await retryDelay(i, err, ctx);
+            ctx.retry = { attempt: i, error: err, delay };
+            ctx.emitter.emit('retry', ctx);
             if (delay > 0)
                 await sleep(delay);
         }

package/dist/esm/src/middlewares/timeout-middleware.js

@@ -4,18 +4,13 @@ export function timeoutMiddleware() {
             await next();
             return;
         }
-        if (ctx.request.signal) {
-            console.warn('[keq] request signal had be set manual, abort follow control will not take effect');
-            await next();
-            return;
-        }
-        const timeoutSignal = new AbortController();
-        ctx.request.signal = timeoutSignal.signal;
         const millisecond = ctx.options.timeout.millisecond;
-        setTimeout(() => {
-            const err = new DOMException(`keq request timeout(${millisecond}ms)`, 'AbortError');
-            timeoutSignal.abort(err);
-        }, millisecond);
+        ctx.emitter.on('fetch', (ctx) => {
+            setTimeout(() => {
+                const err = new DOMException(`keq request timeout(${millisecond}ms)`, 'AbortError');
+                ctx.abort(err);
+            }, millisecond);
+        });
         await next();
     };
 }

package/dist/esm/src/types/keq-context.d.ts

@@ -1,8 +1,11 @@
+import { Emitter } from 'mitt';
 import { URL } from 'whatwg-url';
-import { NEXT_INVOKED_PROPERTY, OUTPUT_PROPERTY } from "../constant";
-import { KeqRequestBody } from './keq-request-body';
-import { KeqRequestMethod } from './keq-request-method';
-import { KeqOptionsParameter } from './keq-options.js';
+import { ABORT_PROPERTY, NEXT_INVOKED_PROPERTY, OUTPUT_PROPERTY } from "../constant.js";
+import type { KeqRequestBody } from './keq-request-body.js';
+import type { KeqRequestMethod } from './keq-request-method.js';
+import type { KeqOptionsParameter } from './keq-options.js';
+import type { KeqEvents } from './keq-events.js';
+import type { KeqGlobal } from './keq-global.js';
 export interface KeqContextOptions extends KeqOptionsParameter {
     [key: string]: any;
 }
@@ -20,7 +23,6 @@ export interface KeqRequestContext {
     redirect?: RequestRedirect;
     referrer?: string;
     referrerPolicy?: ReferrerPolicy;
-    signal?: AbortSignal | null;
 }
 export interface KeqContext {
     /**
@@ -34,6 +36,9 @@ export interface KeqContext {
         entryNextTimes: number;
         outNextTimes: number;
     };
+    [ABORT_PROPERTY]?: AbortController;
+    abort: (reason: any) => void;
+    emitter: Emitter<Omit<KeqEvents, never>>;
     options: KeqContextOptions;
     /**
      * Fetch API Arguments
@@ -51,7 +56,13 @@ export interface KeqContext {
     output: any;
     [OUTPUT_PROPERTY]?: any;
     /** share data between requests */
-    global: Record<string, any>;
+    global: KeqGlobal;
+    /** retry information, undefined is no retry */
+    retry?: {
+        attempt: number;
+        error: unknown | null;
+        delay: number;
+    };
     /** extends by middleware */
     [key: string]: any;
 }

package/dist/esm/src/types/keq-context.js

@@ -1 +1 @@
-import { NEXT_INVOKED_PROPERTY, OUTPUT_PROPERTY } from "../constant";
+import { ABORT_PROPERTY, NEXT_INVOKED_PROPERTY, OUTPUT_PROPERTY } from "../constant.js";

package/dist/esm/src/types/keq-events.d.ts

@@ -0,0 +1,8 @@
+import type { KeqContext } from './keq-context.js';
+export interface KeqEvents {
+    fetch: KeqContext;
+    retry: KeqContext;
+}
+export type KeqListeners = {
+    [K in keyof KeqEvents]?: ((data: KeqEvents[K]) => void)[];
+};

package/dist/esm/src/types/keq-events.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/types/keq-flow-control.d.ts

@@ -1,4 +1,4 @@
-import { KeqContext } from './keq-context.js';
+import type { KeqContext } from './keq-context.js';
 export interface KeqFlowControl {
     mode: 'abort' | 'serial';
     signal: string | ((ctx: KeqContext) => string);

package/dist/esm/src/types/keq-global.d.ts

@@ -0,0 +1,6 @@
+import type { queueAsPromised } from 'fastq';
+import type { KeqNext } from './keq-next.js';
+export interface KeqGlobal {
+    abortFlowControl?: Record<string, ((reason: any) => void) | undefined>;
+    serialFlowControl?: Record<string, queueAsPromised<KeqNext, void>>;
+}

package/dist/esm/src/types/keq-global.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/types/keq-middleware.d.ts

@@ -1,3 +1,3 @@
-import { KeqContext } from './keq-context';
-import { KeqNext } from './keq-next';
+import type { KeqContext } from './keq-context.js';
+import type { KeqNext } from './keq-next.js';
 export type KeqMiddleware = (ctx: KeqContext, next: KeqNext) => Promise<void>;

package/dist/esm/src/types/keq-options.d.ts

@@ -1,9 +1,9 @@
-import { Keq } from "../keq.js";
-import { KeqFlowControl } from './keq-flow-control.js';
-import { KeqResolveMethod } from './keq-resolve-with-mode.js';
-import { KeqRetryDelay } from './keq-retry-delay';
-import { KeqRetryOn } from './keq-retry-on';
-import { KeqTimeout } from './keq-timeout.js';
+import type { Keq } from "../keq.js";
+import type { KeqFlowControl } from './keq-flow-control.js';
+import type { KeqResolveMethod } from './keq-resolve-with-mode.js';
+import type { KeqRetryDelay } from './keq-retry-delay.js';
+import type { KeqRetryOn } from './keq-retry-on.js';
+import type { KeqTimeout } from './keq-timeout.js';
 export interface KeqOptions<T> {
     /**
      * replace the default fetch api

package/dist/esm/src/types/keq-request-init.d.ts

@@ -1,2 +1,2 @@
-import { KeqRequestContext } from './keq-context';
+import type { KeqRequestContext } from './keq-context.js';
 export type KeqRequestInit = Partial<Omit<KeqRequestContext, 'url'>>;

package/dist/esm/src/types/keq-request.d.ts

@@ -1,8 +1,8 @@
-import { URL } from 'whatwg-url';
-import { Keq } from "../keq.js";
-import { KeqRouter } from "../router/keq-router.js";
-import { KeqMiddleware } from './keq-middleware';
-import { KeqRequestInit } from './keq-request-init';
+import type { URL } from 'whatwg-url';
+import type { KeqRouter } from "../router/keq-router.js";
+import type { Keq } from "../keq.js";
+import type { KeqMiddleware } from './keq-middleware.js';
+import type { KeqRequestInit } from './keq-request-init.js';
 type KeqRequestFn = <T = any>(url: string | URL | globalThis.URL) => Keq<T>;
 type GlobalURL = globalThis.URL;
 export interface KeqRequest {

package/dist/esm/src/types/keq-retry-delay.d.ts

@@ -1,2 +1,2 @@
-import { KeqContext } from './keq-context';
+import type { KeqContext } from './keq-context';
 export type KeqRetryDelay = number | ((attempt: number, error: unknown | null, ctx: KeqContext) => number | Promise<number>);

package/dist/esm/src/types/keq-retry-on.d.ts

@@ -1,2 +1,2 @@
-import { KeqContext } from './keq-context';
+import type { KeqContext } from './keq-context.js';
 export type KeqRetryOn = (attempt: number, error: unknown | null, ctx: KeqContext) => (boolean | Promise<boolean>);

package/dist/esm/src/types/keq-route.d.ts

@@ -1,2 +1,2 @@
-import { KeqContext } from './keq-context.js';
+import type { KeqContext } from './keq-context.js';
 export type KeqRoute = (ctx: KeqContext) => Promise<boolean> | boolean;

package/dist/umd/src/constant.d.ts

@@ -1,2 +1,3 @@
 export declare const OUTPUT_PROPERTY: unique symbol;
 export declare const NEXT_INVOKED_PROPERTY: unique symbol;
+export declare const ABORT_PROPERTY: unique symbol;

package/dist/umd/src/constant.js

@@ -9,7 +9,8 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.NEXT_INVOKED_PROPERTY = exports.OUTPUT_PROPERTY = void 0;
+    exports.ABORT_PROPERTY = exports.NEXT_INVOKED_PROPERTY = exports.OUTPUT_PROPERTY = void 0;
     exports.OUTPUT_PROPERTY = Symbol('outputProperty');
     exports.NEXT_INVOKED_PROPERTY = Symbol('nextInvokedProperty');
+    exports.ABORT_PROPERTY = Symbol('abortProperty');
 });

package/dist/umd/src/core.d.ts

@@ -2,12 +2,14 @@ import { URL } from 'whatwg-url';
 import type { KeqContextOptions, KeqRequestContext } from './types/keq-context.js';
 import type { KeqMiddleware } from './types/keq-middleware.js';
 import type { KeqRequestInit } from './types/keq-request-init.js';
+import { KeqEvents, KeqListeners } from './types/keq-events.js';
 /**
  * @description Keq 核心 API，发送请求必要的原子化的API
  */
 export declare class Core<T> {
     private requestPromise?;
-    protected requestContext: KeqRequestContext;
+    protected requestContext: Omit<KeqRequestContext, 'abort'>;
+    protected __listeners__: KeqListeners;
     protected __global__: Record<string, any>;
     protected __prepend_middlewares__: KeqMiddleware[];
     protected __append_middlewares__: KeqMiddleware[];
@@ -15,6 +17,7 @@ export declare class Core<T> {
     constructor(url: (URL | globalThis.URL), init: KeqRequestInit, global?: Record<string, any>);
     prependMiddlewares(...middlewares: KeqMiddleware[]): this;
     appendMiddlewares(...middlewares: KeqMiddleware[]): this;
+    on<K extends keyof KeqEvents>(event: K, listener: (data: KeqEvents[K]) => void): this;
     private run;
     end(): Promise<T>;
     /**

package/dist/umd/src/core.js

@@ -1,10 +1,13 @@
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "whatwg-url", "./exception/exception.js", "./util/clone.js", "./constant.js", "./util/compose-middleware.js", "./util/shadow-clone.js"], factory);
+        define(["require", "exports", "whatwg-url", "./exception/exception.js", "./util/clone.js", "./constant.js", "./util/compose-middleware.js", "./util/shadow-clone.js", "mitt"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -16,12 +19,14 @@
     const constant_js_1 = require("./constant.js");
     const compose_middleware_js_1 = require("./util/compose-middleware.js");
     const shadow_clone_js_1 = require("./util/shadow-clone.js");
+    const mitt_1 = __importDefault(require("mitt"));
     /**
      * @description Keq 核心 API，发送请求必要的原子化的API
      */
     class Core {
         requestPromise;
         requestContext;
+        __listeners__ = {};
         __global__;
         __prepend_middlewares__ = [];
         __append_middlewares__ = [];
@@ -48,6 +53,11 @@
             this.__append_middlewares__.unshift(...middlewares);
             return this;
         }
+        on(event, listener) {
+            this.__listeners__[event] = this.__listeners__[event] || [];
+            this.__listeners__[event].push(listener);
+            return this;
+        }
         async run() {
             const headers = new Headers();
             for (const [key, value] of this.requestContext.headers.entries()) {
@@ -67,15 +77,22 @@
                 redirect: this.requestContext.redirect,
                 referrer: this.requestContext.referrer,
                 referrerPolicy: this.requestContext.referrerPolicy,
-                signal: this.requestContext.signal,
             };
             const options = (0, shadow_clone_js_1.shadowClone)(this.__options__);
+            const emitter = (0, mitt_1.default)();
+            for (const eventName in this.__listeners__) {
+                const listeners = this.__listeners__[eventName];
+                for (const listener of listeners) {
+                    emitter.on(eventName, listener);
+                }
+            }
             const ctx = {
                 [constant_js_1.NEXT_INVOKED_PROPERTY]: {
                     finished: false,
                     entryNextTimes: 0,
                     outNextTimes: 0,
                 },
+                emitter,
                 request: requestContext,
                 options,
                 global: this.__global__,
@@ -85,6 +102,13 @@
                 set output(value) {
                     this[constant_js_1.OUTPUT_PROPERTY] = value;
                 },
+                [constant_js_1.ABORT_PROPERTY]: undefined,
+                abort(reason) {
+                    const abortController = this[constant_js_1.ABORT_PROPERTY];
+                    if (abortController) {
+                        abortController.abort(reason);
+                    }
+                },
             };
             const middleware = (0, compose_middleware_js_1.composeMiddleware)([...this.__prepend_middlewares__, ...this.__append_middlewares__]);
             // eslint-disable-next-line @typescript-eslint/no-empty-function

package/dist/umd/src/create-request.js

@@ -33,12 +33,12 @@
             }
         }
         const appendMiddlewares = options?.initMiddlewares ? [...options.initMiddlewares] : [
+            (0, retry_middleware_js_1.retryMiddleware)(),
             (0, serial_flow_control_middleware_js_1.serialFlowControlMiddleware)(),
             (0, abort_flow_control_middleware_js_1.abortFlowControlMiddleware)(),
             (0, timeout_middleware_js_1.timeoutMiddleware)(),
             (0, proxy_response_middleware_js_1.proxyResponseMiddleware)(),
             (0, fetch_arguments_middleware_js_1.fetchArgumentsMiddleware)(),
-            (0, retry_middleware_js_1.retryMiddleware)(),
             (0, fetch_middleware_js_1.fetchMiddleware)(),
         ];
         const prependMiddlewares = [];

package/dist/umd/src/index.d.ts

@@ -3,16 +3,18 @@ export { Keq } from './keq.js';
 export { request } from './request.js';
 export { composeMiddleware } from './util/compose-middleware.js';
 export { composeRoute } from './util/compose-route.js';
-export { KeqContext, KeqContextOptions } from './types/keq-context.js';
-export { KeqMiddleware } from './types/keq-middleware.js';
-export { KeqNext } from './types/keq-next.js';
-export { KeqOptions } from './types/keq-options.js';
-export { KeqRequestBody } from './types/keq-request-body.js';
-export { KeqRequestInit } from './types/keq-request-init.js';
-export { KeqRequest } from './types/keq-request.js';
-export { KeqRetryDelay } from './types/keq-retry-delay.js';
-export { KeqRetryOn } from './types/keq-retry-on.js';
-export { KeqRoute } from './types/keq-route.js';
+export type { KeqContext, KeqContextOptions } from './types/keq-context.js';
+export type { KeqMiddleware } from './types/keq-middleware.js';
+export type { KeqNext } from './types/keq-next.js';
+export type { KeqOptions } from './types/keq-options.js';
+export type { KeqRequestBody } from './types/keq-request-body.js';
+export type { KeqRequestInit } from './types/keq-request-init.js';
+export type { KeqRequest } from './types/keq-request.js';
+export type { KeqRetryDelay } from './types/keq-retry-delay.js';
+export type { KeqRetryOn } from './types/keq-retry-on.js';
+export type { KeqRoute } from './types/keq-route.js';
+export type { KeqGlobal } from './types/keq-global.js';
+export type { KeqEvents } from './types/keq-events.js';
 export { keqHostRoute } from './router/keq-host-route.js';
 export { keqLocationRoute } from './router/keq-location-route.js';
 export { keqMethodRoute } from './router/keq-method-route.js';

package/dist/umd/src/is/is-url-search-params.js

@@ -15,10 +15,10 @@
     function isUrlSearchParams(obj) {
         if (obj instanceof URLSearchParams)
             return true;
-        if ((0, is_object_js_1.isObject)(obj) &&
+        return ((0, is_object_js_1.isObject)(obj) &&
             (0, is_function_js_1.isFunction)(obj.append) &&
             (0, is_function_js_1.isFunction)(obj.delete) &&
-            (0, is_function_js_1.isFunction)(obj.entrie) &&
+            (0, is_function_js_1.isFunction)(obj.entries) &&
             (0, is_function_js_1.isFunction)(obj.forEac) &&
             (0, is_function_js_1.isFunction)(obj.get) &&
             (0, is_function_js_1.isFunction)(obj.getAll) &&
@@ -27,10 +27,7 @@
             (0, is_function_js_1.isFunction)(obj.set) &&
             (0, is_function_js_1.isFunction)(obj.values) &&
             (0, is_function_js_1.isFunction)(obj.sort) &&
-            (0, is_function_js_1.isFunction)(obj.toStri)) {
-            return true;
-        }
-        return false;
+            (0, is_function_js_1.isFunction)(obj.toString));
     }
     exports.isUrlSearchParams = isUrlSearchParams;
 });

package/dist/umd/src/keq.js

@@ -180,12 +180,10 @@
          * @param retryDelay Initial value used to calculate the retry in milliseconds (This is still randomized following the randomization factor)
          * @param retryCallback Will be called after request failed
          */
-        retry(retryTimes, retryDelay, retryOn) {
+        retry(retryTimes, retryDelay = 0, retryOn = (attempt, error) => !!error) {
             this.option('retryTimes', retryTimes);
             this.option('retryDelay', retryDelay);
-            if (retryOn !== undefined) {
-                this.option('retryOn', retryOn);
-            }
+            this.option('retryOn', retryOn);
             return this;
         }
         redirect(mod) {

package/dist/umd/src/middlewares/abort-flow-control-middleware.js

@@ -16,24 +16,22 @@
                 await next();
                 return;
             }
-            if (ctx.request.signal) {
-                console.warn('[keq] request signal had be set manual, abort follow control will not take effect');
-                await next();
-                return;
-            }
             const { signal } = ctx.options.flowControl;
             const key = typeof signal === 'string' ? signal : signal(ctx);
             if (!ctx.global.abortFlowControl)
                 ctx.global.abortFlowControl = {};
-            if (ctx.global.abortFlowControl[key]) {
-                const abortController = ctx.global.abortFlowControl[key];
-                abortController.abort(new DOMException('The previous request was not completed, so keq flowControl abort this request.', 'AbortError'));
+            const abort = ctx.global.abortFlowControl[key];
+            if (abort) {
+                const reason = new DOMException('The previous request was not completed, so keq flowControl abort this request.', 'AbortError');
+                abort(reason);
+            }
+            ctx.global.abortFlowControl[key] = ctx.abort.bind(ctx);
+            try {
+                await next();
+            }
+            finally {
+                ctx.global.abortFlowControl[key] = undefined;
             }
-            const abortController = new AbortController();
-            ctx.global.abortFlowControl[key] = abortController;
-            ctx.request.signal = abortController.signal;
-            await next();
-            ctx.global.abortFlowControl[key] = undefined;
         };
     }
     exports.abortFlowControlMiddleware = abortFlowControlMiddleware;

package/dist/umd/src/middlewares/fetch-arguments-middleware.js

@@ -4,7 +4,7 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "whatwg-url", "../exception/exception.js", "../util/compile-pathname-template.js"], factory);
+        define(["require", "exports", "whatwg-url", "../exception/exception.js", "../util/compile-pathname-template.js", "../constant.js"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -13,6 +13,7 @@
     const whatwg_url_1 = require("whatwg-url");
     const exception_js_1 = require("../exception/exception.js");
     const compile_pathname_template_js_1 = require("../util/compile-pathname-template.js");
+    const constant_js_1 = require("../constant.js");
     function compileUrl(obj, routeParams) {
         const url = new whatwg_url_1.URL(typeof obj === 'string' ? obj : obj.href);
         try {
@@ -74,6 +75,9 @@
             request.headers.delete('content-type');
             return form;
         }
+        if (body instanceof Buffer)
+            return body;
+        return String(body);
     }
     function fetchArgumentsMiddleware() {
         return async function fetchArgumentsMiddleware(ctx, next) {
@@ -82,6 +86,8 @@
             if (!request.headers.has('Content-Type') && request.body) {
                 request.headers.set('Content-Type', inferContentTypeByBody(ctx.request.body));
             }
+            const abortController = new AbortController();
+            ctx[constant_js_1.ABORT_PROPERTY] = abortController;
             const requestInit = {
                 method: request.method.toUpperCase(),
                 headers: request.headers,
@@ -94,7 +100,7 @@
                 redirect: request.redirect,
                 referrer: request.referrer,
                 referrerPolicy: request.referrerPolicy,
-                signal: request.signal,
+                signal: abortController.signal,
             };
             ctx.fetchArguments = [url, requestInit];
             await next();

package/dist/umd/src/middlewares/fetch-middleware.js

@@ -20,6 +20,7 @@
             if (!fetchArguments) {
                 throw new exception_js_1.Exception('fetchArguments is required');
             }
+            ctx.emitter.emit('fetch', ctx);
             const fetch = ctx.options.fetchAPI || globalThis.fetch;
             const response = await fetch(...fetchArguments);
             ctx.res = response;

package/dist/umd/src/middlewares/proxy-response-middleware.js

@@ -14,7 +14,7 @@
         return async function proxyResponseMiddleware(ctx, next) {
             await next();
             const res = ctx.res;
-            if (res && !('response' in ctx)) {
+            if (res) {
                 ctx.response = new Proxy(res, {
                     get(res, prop) {
                         if (typeof prop === 'string') {

package/dist/umd/src/middlewares/retry-middleware.js

@@ -41,6 +41,9 @@
             for (let i = 0; i < retryTimes; i++) {
                 let err = null;
                 try {
+                    ctx.fetchArguments = undefined;
+                    ctx.response = undefined;
+                    ctx.req = undefined;
                     ctx[constant_js_1.NEXT_INVOKED_PROPERTY].entryNextTimes = 0;
                     ctx[constant_js_1.NEXT_INVOKED_PROPERTY].outNextTimes = 0;
                     await next();
@@ -59,6 +62,8 @@
                     break;
                 }
                 const delay = await retryDelay(i, err, ctx);
+                ctx.retry = { attempt: i, error: err, delay };
+                ctx.emitter.emit('retry', ctx);
                 if (delay > 0)
                     await sleep(delay);
             }

package/dist/umd/src/middlewares/timeout-middleware.js

@@ -16,18 +16,13 @@
                 await next();
                 return;
             }
-            if (ctx.request.signal) {
-                console.warn('[keq] request signal had be set manual, abort follow control will not take effect');
-                await next();
-                return;
-            }
-            const timeoutSignal = new AbortController();
-            ctx.request.signal = timeoutSignal.signal;
             const millisecond = ctx.options.timeout.millisecond;
-            setTimeout(() => {
-                const err = new DOMException(`keq request timeout(${millisecond}ms)`, 'AbortError');
-                timeoutSignal.abort(err);
-            }, millisecond);
+            ctx.emitter.on('fetch', (ctx) => {
+                setTimeout(() => {
+                    const err = new DOMException(`keq request timeout(${millisecond}ms)`, 'AbortError');
+                    ctx.abort(err);
+                }, millisecond);
+            });
             await next();
         };
     }

package/dist/umd/src/types/keq-context.d.ts

@@ -1,8 +1,11 @@
+import { Emitter } from 'mitt';
 import { URL } from 'whatwg-url';
-import { NEXT_INVOKED_PROPERTY, OUTPUT_PROPERTY } from "../constant";
-import { KeqRequestBody } from './keq-request-body';
-import { KeqRequestMethod } from './keq-request-method';
-import { KeqOptionsParameter } from './keq-options.js';
+import { ABORT_PROPERTY, NEXT_INVOKED_PROPERTY, OUTPUT_PROPERTY } from "../constant.js";
+import type { KeqRequestBody } from './keq-request-body.js';
+import type { KeqRequestMethod } from './keq-request-method.js';
+import type { KeqOptionsParameter } from './keq-options.js';
+import type { KeqEvents } from './keq-events.js';
+import type { KeqGlobal } from './keq-global.js';
 export interface KeqContextOptions extends KeqOptionsParameter {
     [key: string]: any;
 }
@@ -20,7 +23,6 @@ export interface KeqRequestContext {
     redirect?: RequestRedirect;
     referrer?: string;
     referrerPolicy?: ReferrerPolicy;
-    signal?: AbortSignal | null;
 }
 export interface KeqContext {
     /**
@@ -34,6 +36,9 @@ export interface KeqContext {
         entryNextTimes: number;
         outNextTimes: number;
     };
+    [ABORT_PROPERTY]?: AbortController;
+    abort: (reason: any) => void;
+    emitter: Emitter<Omit<KeqEvents, never>>;
     options: KeqContextOptions;
     /**
      * Fetch API Arguments
@@ -51,7 +56,13 @@ export interface KeqContext {
     output: any;
     [OUTPUT_PROPERTY]?: any;
     /** share data between requests */
-    global: Record<string, any>;
+    global: KeqGlobal;
+    /** retry information, undefined is no retry */
+    retry?: {
+        attempt: number;
+        error: unknown | null;
+        delay: number;
+    };
     /** extends by middleware */
     [key: string]: any;
 }

package/dist/umd/src/types/keq-context.js

@@ -4,10 +4,10 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "../constant"], factory);
+        define(["require", "exports", "../constant.js"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    const constant_1 = require("../constant");
+    const constant_js_1 = require("../constant.js");
 });

package/dist/umd/src/types/keq-events.d.ts

@@ -0,0 +1,8 @@
+import type { KeqContext } from './keq-context.js';
+export interface KeqEvents {
+    fetch: KeqContext;
+    retry: KeqContext;
+}
+export type KeqListeners = {
+    [K in keyof KeqEvents]?: ((data: KeqEvents[K]) => void)[];
+};

package/dist/umd/src/types/keq-events.js

@@ -0,0 +1,12 @@
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});

package/dist/umd/src/types/keq-flow-control.d.ts

@@ -1,4 +1,4 @@
-import { KeqContext } from './keq-context.js';
+import type { KeqContext } from './keq-context.js';
 export interface KeqFlowControl {
     mode: 'abort' | 'serial';
     signal: string | ((ctx: KeqContext) => string);

package/dist/umd/src/types/keq-global.d.ts

@@ -0,0 +1,6 @@
+import type { queueAsPromised } from 'fastq';
+import type { KeqNext } from './keq-next.js';
+export interface KeqGlobal {
+    abortFlowControl?: Record<string, ((reason: any) => void) | undefined>;
+    serialFlowControl?: Record<string, queueAsPromised<KeqNext, void>>;
+}

package/dist/umd/src/types/keq-global.js

@@ -0,0 +1,12 @@
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});

package/dist/umd/src/types/keq-middleware.d.ts

@@ -1,3 +1,3 @@
-import { KeqContext } from './keq-context';
-import { KeqNext } from './keq-next';
+import type { KeqContext } from './keq-context.js';
+import type { KeqNext } from './keq-next.js';
 export type KeqMiddleware = (ctx: KeqContext, next: KeqNext) => Promise<void>;

package/dist/umd/src/types/keq-options.d.ts

@@ -1,9 +1,9 @@
-import { Keq } from "../keq.js";
-import { KeqFlowControl } from './keq-flow-control.js';
-import { KeqResolveMethod } from './keq-resolve-with-mode.js';
-import { KeqRetryDelay } from './keq-retry-delay';
-import { KeqRetryOn } from './keq-retry-on';
-import { KeqTimeout } from './keq-timeout.js';
+import type { Keq } from "../keq.js";
+import type { KeqFlowControl } from './keq-flow-control.js';
+import type { KeqResolveMethod } from './keq-resolve-with-mode.js';
+import type { KeqRetryDelay } from './keq-retry-delay.js';
+import type { KeqRetryOn } from './keq-retry-on.js';
+import type { KeqTimeout } from './keq-timeout.js';
 export interface KeqOptions<T> {
     /**
      * replace the default fetch api

package/dist/umd/src/types/keq-request-init.d.ts

@@ -1,2 +1,2 @@
-import { KeqRequestContext } from './keq-context';
+import type { KeqRequestContext } from './keq-context.js';
 export type KeqRequestInit = Partial<Omit<KeqRequestContext, 'url'>>;

package/dist/umd/src/types/keq-request.d.ts

@@ -1,8 +1,8 @@
-import { URL } from 'whatwg-url';
-import { Keq } from "../keq.js";
-import { KeqRouter } from "../router/keq-router.js";
-import { KeqMiddleware } from './keq-middleware';
-import { KeqRequestInit } from './keq-request-init';
+import type { URL } from 'whatwg-url';
+import type { KeqRouter } from "../router/keq-router.js";
+import type { Keq } from "../keq.js";
+import type { KeqMiddleware } from './keq-middleware.js';
+import type { KeqRequestInit } from './keq-request-init.js';
 type KeqRequestFn = <T = any>(url: string | URL | globalThis.URL) => Keq<T>;
 type GlobalURL = globalThis.URL;
 export interface KeqRequest {

package/dist/umd/src/types/keq-retry-delay.d.ts

@@ -1,2 +1,2 @@
-import { KeqContext } from './keq-context';
+import type { KeqContext } from './keq-context';
 export type KeqRetryDelay = number | ((attempt: number, error: unknown | null, ctx: KeqContext) => number | Promise<number>);

package/dist/umd/src/types/keq-retry-on.d.ts

@@ -1,2 +1,2 @@
-import { KeqContext } from './keq-context';
+import type { KeqContext } from './keq-context.js';
 export type KeqRetryOn = (attempt: number, error: unknown | null, ctx: KeqContext) => (boolean | Promise<boolean>);

package/dist/umd/src/types/keq-route.d.ts

@@ -1,2 +1,2 @@
-import { KeqContext } from './keq-context.js';
+import type { KeqContext } from './keq-context.js';
 export type KeqRoute = (ctx: KeqContext) => Promise<boolean> | boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keq",
-  "version": "2.5.4",
+  "version": "2.6.0",
   "description": "Request API write by Typescript for flexibility, readability, and a low learning curve.",
   "keywords": [
     "request",
@@ -44,6 +44,7 @@
     "clone": "^2.1.2",
     "fastq": "^1.17.1",
     "minimatch": "^9.0.4",
+    "mitt": "^3.0.1",
     "object.fromentries": "^2.0.8",
     "ts-custom-error": "^3.3.1",
     "whatwg-url": "^14.0.0"

package/dist/esm/src/exception/file-expected.exception.d.ts

@@ -1,4 +0,0 @@
-import { Exception } from './exception.js';
-export declare class FileExpectedException extends Exception {
-    constructor();
-}

package/dist/esm/src/exception/file-expected.exception.js

@@ -1,6 +0,0 @@
-import { Exception } from './exception.js';
-export class FileExpectedException extends Exception {
-    constructor() {
-        super('File/Blob (Browser) or Buffer (NodeJS) expected');
-    }
-}

package/dist/umd/src/exception/file-expected.exception.d.ts

@@ -1,4 +0,0 @@
-import { Exception } from './exception.js';
-export declare class FileExpectedException extends Exception {
-    constructor();
-}

package/dist/umd/src/exception/file-expected.exception.js

@@ -1,20 +0,0 @@
-(function (factory) {
-    if (typeof module === "object" && typeof module.exports === "object") {
-        var v = factory(require, exports);
-        if (v !== undefined) module.exports = v;
-    }
-    else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "./exception.js"], factory);
-    }
-})(function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.FileExpectedException = void 0;
-    const exception_js_1 = require("./exception.js");
-    class FileExpectedException extends exception_js_1.Exception {
-        constructor() {
-            super('File/Blob (Browser) or Buffer (NodeJS) expected');
-        }
-    }
-    exports.FileExpectedException = FileExpectedException;
-});