fix: allow setting retryDelay as a request option

src/middleware.browser.ts

@@ -15,7 +15,6 @@ export * from './middleware/promise'
 export * from './middleware/proxy'
 export * from './middleware/retry/browser-retry'
 export * from './middleware/urlEncoded'
-export type * from './types'
 
 import {agent} from './middleware/agent/browser-agent'
 import {buildKeepAlive} from './middleware/keepAlive'

src/middleware.ts

@@ -15,7 +15,6 @@ export * from './middleware/promise'
 export * from './middleware/proxy'
 export * from './middleware/retry/node-retry'
 export * from './middleware/urlEncoded'
-export type * from './types'
 
 import {agent} from './middleware/agent/node-agent'
 import {buildKeepAlive} from './middleware/keepAlive'

src/middleware/base.ts

@@ -1,4 +1,4 @@
-import type {Middleware} from '../types'
+import type {Middleware} from 'get-it'
 
 const leadingSlash = /^\//
 const trailingSlash = /\/$/

src/middleware/debug.ts

@@ -1,6 +1,5 @@
 import debugIt from 'debug'
-
-import type {Middleware} from '../types'
+import type {Middleware} from 'get-it'
 
 const SENSITIVE_HEADERS = ['cookie', 'authorization']
 

src/middleware/defaultOptionsProcessor.ts

@@ -1,4 +1,4 @@
-import type {MiddlewareHooks, RequestOptions} from '../types'
+import type {MiddlewareHooks, RequestOptions} from 'get-it'
 
 const isReactNative = typeof navigator === 'undefined' ? false : navigator.product === 'ReactNative'
 

src/middleware/defaultOptionsValidator.ts

@@ -1,4 +1,4 @@
-import type {MiddlewareHooks} from '../types'
+import type {MiddlewareHooks} from 'get-it'
 
 const validUrl = /^https?:\/\//i
 

src/middleware/headers.ts

@@ -1,4 +1,4 @@
-import type {Middleware} from '../types'
+import type {Middleware} from 'get-it'
 
 /** @public */
 export function headers(_headers: any, opts: any = {}) {

src/middleware/httpErrors.ts

@@ -1,4 +1,4 @@
-import type {Middleware} from '../types'
+import type {Middleware} from 'get-it'
 
 class HttpError extends Error {
   response: any

src/middleware/injectResponse.ts

@@ -1,4 +1,4 @@
-import type {Middleware, MiddlewareHooks, MiddlewareResponse} from '../types'
+import type {Middleware, MiddlewareHooks, MiddlewareResponse} from 'get-it'
 
 /** @public */
 export function injectResponse(

src/middleware/jsonRequest.ts

@@ -1,4 +1,5 @@
-import type {Middleware} from '../types'
+import type {Middleware} from 'get-it'
+
 import {isBuffer} from '../util/isBuffer'
 import {isPlainObject} from '../util/isPlainObject'
 

src/middleware/jsonResponse.ts

@@ -1,4 +1,4 @@
-import type {Middleware} from '../types'
+import type {Middleware} from 'get-it'
 
 /** @public */
 export function jsonResponse(opts?: any) {

src/middleware/mtls.ts

@@ -1,4 +1,5 @@
-import type {Middleware} from '../types'
+import type {Middleware} from 'get-it'
+
 import {isBrowserOptions} from '../util/isBrowserOptions'
 
 /** @public */

src/middleware/observable.ts

@@ -1,4 +1,5 @@
-import type {Middleware} from '../types'
+import type {Middleware} from 'get-it'
+
 import global from '../util/global'
 
 /** @public */

src/middleware/progress/browser-progress.ts

@@ -1,4 +1,4 @@
-import type {Middleware} from '../../types'
+import type {Middleware} from 'get-it'
 
 /** @public */
 export function progress() {

src/middleware/progress/node-progress.ts

@@ -1,7 +1,6 @@
+import type {Middleware} from 'get-it'
 import progressStream from 'progress-stream'
 
-import type {Middleware} from '../../types'
-
 function normalizer(stage: 'download' | 'upload') {
   return (prog: any) => ({
     stage,

src/middleware/promise.ts

@@ -1,4 +1,4 @@
-import type {Middleware} from '../types'
+import type {Middleware} from 'get-it'
 
 /** @public */
 export const promise = (

src/middleware/proxy.ts

@@ -1,4 +1,4 @@
-import type {Middleware} from '../types'
+import type {Middleware} from 'get-it'
 
 /** @public */
 export function proxy(_proxy: any) {

src/middleware/retry/browser-retry.ts

@@ -1,4 +1,5 @@
-import type {RetryOptions} from '../../types'
+import type {RetryOptions} from 'get-it'
+
 import defaultShouldRetry from '../../util/browser-shouldRetry'
 import sharedRetry from './shared-retry'
 

src/middleware/retry/node-retry.ts

@@ -1,4 +1,5 @@
-import type {RetryOptions} from '../../types'
+import type {RetryOptions} from 'get-it'
+
 import defaultShouldRetry from '../../util/node-shouldRetry'
 import sharedRetry from './shared-retry'
 

src/middleware/retry/shared-retry.ts

@@ -1,4 +1,4 @@
-import type {Middleware, RetryOptions} from '../../types'
+import type {Middleware, RetryOptions} from 'get-it'
 
 const isStream = (stream: any) =>
   stream !== null && typeof stream === 'object' && typeof stream.pipe === 'function'
@@ -13,6 +13,7 @@ export default (opts: RetryOptions) => {
     onError: (err, context) => {
       const options = context.options
       const max = options.maxRetries || maxRetries
+      const delay = options.retryDelay || retryDelay
       const shouldRetry = options.shouldRetry || allowRetry
       const attemptNumber = options.attemptNumber || 0
 
@@ -32,7 +33,7 @@ export default (opts: RetryOptions) => {
       })
 
       // Wait a given amount of time before doing the request again
-      setTimeout(() => context.channels.request.publish(newContext), retryDelay(attemptNumber))
+      setTimeout(() => context.channels.request.publish(newContext), delay(attemptNumber))
 
       // Signal that we've handled the error and that it should not propagate further
       return null

src/middleware/urlEncoded.ts

@@ -1,4 +1,5 @@
-import type {Middleware} from '../types'
+import type {Middleware} from 'get-it'
+
 import {isBuffer} from '../util/isBuffer'
 import {isPlainObject} from '../util/isPlainObject'
 

src/request/browser-request.ts

@@ -1,6 +1,6 @@
+import type {HttpRequest, MiddlewareResponse, RequestAdapter, RequestOptions} from 'get-it'
 import parseHeaders from 'parse-headers'
 
-import type {HttpRequest, MiddlewareResponse, RequestAdapter, RequestOptions} from '../types'
 import {FetchXhr} from './browser/fetchXhr'
 
 /**

src/request/node-request.ts

@@ -1,5 +1,11 @@
 import decompressResponse from 'decompress-response'
 import follow, {type FollowResponse, type RedirectableRequest} from 'follow-redirects'
+import type {
+  FinalizeNodeOptionsPayload,
+  HttpRequest,
+  MiddlewareResponse,
+  RequestAdapter,
+} from 'get-it'
 import http from 'http'
 import https from 'https'
 import toStream from 'into-stream'
@@ -8,12 +14,6 @@ import progressStream from 'progress-stream'
 import qs from 'querystring'
 import url from 'url'
 
-import type {
-  FinalizeNodeOptionsPayload,
-  HttpRequest,
-  MiddlewareResponse,
-  RequestAdapter,
-} from '../types'
 import {lowerCaseHeaders} from '../util/lowerCaseHeaders'
 import {getProxyOptions, rewriteUriForProxy} from './node/proxy'
 import {concat} from './node/simpleConcat'

src/types.ts

@@ -12,6 +12,7 @@ export interface RequestOptions {
   headers?: any
   maxRedirects?: number
   maxRetries?: number
+  retryDelay?: (attemptNumber: number) => number
   method?: string
   proxy?: any
   query?: any

src/util/isBrowserOptions.ts

@@ -1,4 +1,4 @@
-import type {RequestOptions} from '../types'
+import type {RequestOptions} from 'get-it'
 
 export function isBrowserOptions(options: unknown): options is RequestOptions {
   return typeof options === 'object' && options !== null && !('protocol' in options)

src/util/middlewareReducer.ts

@@ -1,4 +1,4 @@
-import type {ApplyMiddleware, MiddlewareReducer} from '../types'
+import type {ApplyMiddleware, MiddlewareReducer} from 'get-it'
 
 export const middlewareReducer = (middleware: MiddlewareReducer) =>
   function applyMiddleware(hook, defaultValue, ...args) {

src/util/pubsub.ts

@@ -1,6 +1,6 @@
 // Code borrowed from https://github.com/bjoerge/nano-pubsub
 
-import type {PubSub, Subscriber} from '../types'
+import type {PubSub, Subscriber} from 'get-it'
 
 export function createPubSub<Message = void>(): PubSub<Message> {
   const subscribers: {[id: string]: Subscriber<Message>} = Object.create(null)