Replace proper-url-join dependency with global.URL

package.json

@@ -47,11 +47,9 @@
   "homepage": "https://github.com/i-like-robots/hardened-fetch",
   "dependencies": {
     "@types/http-errors": "^2.0.4",
-    "@types/proper-url-join": "^2.1.4",
     "@web3-storage/parse-link-header": "^3.1.0",
     "bottleneck": "^2.19.5",
-    "http-errors": "^2.0.0",
-    "proper-url-join": "^2.1.1"
+    "http-errors": "^2.0.0"
   },
   "devDependencies": {
     "@types/node": "^18.11.8",

src/HardenedFetch.ts

@@ -1,4 +1,3 @@
-import join from 'proper-url-join'
 import Bottleneck from 'bottleneck'
 import { parseLinkHeader } from '@web3-storage/parse-link-header'
 import { handleFailed } from './handleFailed.js'
@@ -34,16 +33,14 @@ export class HardenedFetch {
   }
 
   fetch(url: string, init: RequestInit = {}, timeout: number = 30_000) {
-    if (this.options.baseUrl && !url.startsWith('http')) {
-      url = join(this.options.baseUrl, url)
-    }
+    const resolvedUrl = new URL(url, this.options.baseUrl)
 
     if (this.options.defaultHeaders) {
       const headers = Object.assign({}, this.options.defaultHeaders, init.headers)
       init = Object.assign({}, init, { headers })
     }
 
-    return this.queue.schedule(makeRequest, url, init, timeout)
+    return this.queue.schedule(makeRequest, resolvedUrl, init, timeout)
   }
 
   async *paginatedFetch(url: string, init: RequestInit = {}, timeout: number = 30_000) {

src/makeRequest.ts

@@ -1,9 +1,9 @@
 import createHttpError from 'http-errors'
 
 export async function makeRequest(
-  url: string,
+  url: string | URL,
   init: RequestInit = {},
-  timeout = 9000
+  timeout = 30_000
 ): Promise<Response> {
   const signal = AbortSignal.timeout(timeout)
   const request = new Request(url, { ...init, signal })