✨ Add 'base' option, fix 'null' origin

Author: exah

package.json

@@ -70,6 +70,7 @@
     ],
     "rules": {
       "prettier/prettier": 2,
+      "@typescript-eslint/no-floating-promises": 0,
       "@typescript-eslint/consistent-type-definitions": 0,
       "@typescript-eslint/explicit-function-return-type": 0,
       "@typescript-eslint/method-signature-style": 0,

src/index.ts

@@ -34,6 +34,12 @@ interface RequestMethod<P extends Payload> {
 }
 
 interface RequiredOptions<P extends Payload> extends RequestInit {
+  /**
+   * Base of the request URL, default to `location.origin` if available.
+   * Provide a valid url if you want to use relative `resource` path
+   * when module loaded in `file://`, `about:blank` or Node.js environment.
+   */
+  base?: string
   /**
    * Part of the request URL
    */
@@ -124,6 +130,10 @@ const CONTENT_TYPES = {
 } as const
 
 const DEFAULTS: RequiredOptions<Payload> = {
+  base:
+    typeof location !== 'undefined' && location.origin !== 'null'
+      ? location.origin
+      : undefined,
   highWaterMark: 1024 * 1024 * 10, // 10mb
   onRequest: () => {},
   onResponse(result) {
@@ -208,20 +218,17 @@ function request<P extends Payload>(
   baseOptions: Options<P>
 ): ResponsePromise<P> {
   const options: RequestOptions<P> = mergeOptions(DEFAULTS, baseOptions)
-  const promise = new Promise<Response<P>>((resolve, reject) => {
-    const url = new URL(
-      options.resource,
-      typeof location === 'undefined' ? undefined : location.origin
-    )
 
+  let timerID: ReturnType<typeof setTimeout>
+  const promise = new Promise<Response<P>>((resolve, reject) => {
+    const url = new URL(options.resource, options.base)
     url.search += options.params
 
     if (options.json != null) {
       options.body = JSON.stringify(options.json)
       options.headers.set('content-type', CONTENT_TYPES.json)
     }
 
-    let timerID: ReturnType<typeof setTimeout>
     if (options.timeout! > 0) {
       const controller = new AbortController()
 
@@ -240,14 +247,11 @@ function request<P extends Payload>(
       options.signal = controller.signal
     }
 
-    // Running fetch in next tick allow us to set headers after creating promise
-    setTimeout(() =>
-      Promise.resolve(options.onRequest(url, options))
-        .then(() => fetch(url, options))
-        .then((response) => Object.assign(response, { options }))
-        .then(resolve, reject)
-        .then(() => clearTimeout(timerID))
-    )
+    Promise.resolve(options.onRequest(url, options))
+      .then(() => fetch(url, options))
+      .then((response) => Object.assign(response, { options }))
+      .then(resolve, reject)
+      .then(() => clearTimeout(timerID))
   })
     .then(options.onResponse)
     .then(options.onSuccess, options.onFailure) as ResponsePromise<P>