@microlink/mql 0.13.6 → 0.13.8

package/README.md

@@ -10,4 +10,4 @@
 **microlink** © [Microlink](https://microlink.io), Released under the [MIT](https://github.com/microlinkhq/sdk/blob/master/LICENSE.md) License.<br>
 Authored and maintained by Kiko Beats with help from [contributors](https://github.com/microlinkhq/sdk/contributors).
 
-> [microlink.io](https://microlink.io) · GitHub [@MicrolinkHQ](https://github.com/microlinkhq) · Twitter [@microlinkhq](https://twitter.com/microlinkhq)
+> [microlink.io](https://microlink.io) · GitHub [@MicrolinkHQ](https://github.com/microlinkhq) · X [@microlinkhq](https://x.com/microlinkhq)

package/lightweight/index.js

@@ -27,18 +27,7 @@ function getAugmentedNamespace(n) {
 	return a;
 }
 
-var lightweight$2 = {exports: {}};
-
-const REGEX_HTTP_PROTOCOL = /^https?:\/\//i;
-
-var lightweight$1 = url => {
-  try {
-    const { href } = new URL(url);
-    return REGEX_HTTP_PROTOCOL.test(href) && href
-  } catch (err) {
-    return false
-  }
-};
+var lightweight$1 = {exports: {}};
 
 var dist = {};
 
@@ -70,32 +59,16 @@ function flattie(input, glue, toNull) {
 
 dist.flattie = flattie;
 
-// eslint-lint-disable-next-line @typescript-eslint/naming-convention
 class HTTPError extends Error {
+    response;
+    request;
+    options;
     constructor(response, request, options) {
         const code = (response.status || response.status === 0) ? response.status : '';
         const title = response.statusText || '';
         const status = `${code} ${title}`.trim();
         const reason = status ? `status code ${status}` : 'an unknown error';
-        super(`Request failed with ${reason}`);
-        Object.defineProperty(this, "response", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "request", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "options", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+        super(`Request failed with ${reason}: ${request.method} ${request.url}`);
         this.name = 'HTTPError';
         this.response = response;
         this.request = request;
@@ -104,14 +77,9 @@ class HTTPError extends Error {
 }
 
 class TimeoutError extends Error {
+    request;
     constructor(request) {
-        super('Request timed out');
-        Object.defineProperty(this, "request", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+        super(`Request timed out: ${request.method} ${request.url}`);
         this.name = 'TimeoutError';
         this.request = request;
     }
@@ -142,10 +110,22 @@ const mergeHeaders = (source1 = {}, source2 = {}) => {
     }
     return result;
 };
+function newHookValue(original, incoming, property) {
+    return (Object.hasOwn(incoming, property) && incoming[property] === undefined)
+        ? []
+        : deepMerge(original[property] ?? [], incoming[property] ?? []);
+}
+const mergeHooks = (original = {}, incoming = {}) => ({
+    beforeRequest: newHookValue(original, incoming, 'beforeRequest'),
+    beforeRetry: newHookValue(original, incoming, 'beforeRetry'),
+    afterResponse: newHookValue(original, incoming, 'afterResponse'),
+    beforeError: newHookValue(original, incoming, 'beforeError'),
+});
 // TODO: Make this strongly-typed (no `any`).
 const deepMerge = (...sources) => {
     let returnValue = {};
     let headers = {};
+    let hooks = {};
     for (const source of sources) {
         if (Array.isArray(source)) {
             if (!Array.isArray(returnValue)) {
@@ -160,6 +140,10 @@ const deepMerge = (...sources) => {
                 }
                 returnValue = { ...returnValue, [key]: value };
             }
+            if (isObject$1(source.hooks)) {
+                hooks = mergeHooks(hooks, source.hooks);
+                returnValue.hooks = hooks;
+            }
             if (isObject$1(source.headers)) {
                 headers = mergeHeaders(headers, source.headers);
                 returnValue.headers = headers;
@@ -175,15 +159,24 @@ const supportsRequestStreams = (() => {
     const supportsReadableStream = typeof globalThis.ReadableStream === 'function';
     const supportsRequest = typeof globalThis.Request === 'function';
     if (supportsReadableStream && supportsRequest) {
-        hasContentType = new globalThis.Request('https://empty.invalid', {
-            body: new globalThis.ReadableStream(),
-            method: 'POST',
-            // @ts-expect-error - Types are outdated.
-            get duplex() {
-                duplexAccessed = true;
-                return 'half';
-            },
-        }).headers.has('Content-Type');
+        try {
+            hasContentType = new globalThis.Request('https://empty.invalid', {
+                body: new globalThis.ReadableStream(),
+                method: 'POST',
+                // @ts-expect-error - Types are outdated.
+                get duplex() {
+                    duplexAccessed = true;
+                    return 'half';
+                },
+            }).headers.has('Content-Type');
+        }
+        catch (error) {
+            // QQBrowser on iOS throws "unsupported BodyInit type" error (see issue #581)
+            if (error instanceof Error && error.message === 'unsupported BodyInit type') {
+                return false;
+            }
+            throw error;
+        }
     }
     return duplexAccessed && !hasContentType;
 })();
@@ -204,6 +197,7 @@ const stop = Symbol('stop');
 const kyOptionKeys = {
     json: true,
     parseJson: true,
+    stringifyJson: true,
     searchParams: true,
     prefixUrl: true,
     retry: true,
@@ -261,7 +255,6 @@ const normalizeRetryOptions = (retry = {}) => {
     return {
         ...defaultRetryOptions,
         ...retry,
-        afterStatusCodes: retryAfterStatusCodes,
     };
 };
 
@@ -377,47 +370,18 @@ class Ky {
         }
         return result;
     }
+    request;
+    abortController;
+    _retryCount = 0;
+    _input;
+    _options;
     // eslint-disable-next-line complexity
     constructor(input, options = {}) {
-        Object.defineProperty(this, "request", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "abortController", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "_retryCount", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 0
-        });
-        Object.defineProperty(this, "_input", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "_options", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this._input = input;
-        const credentials = this._input instanceof Request && 'credentials' in Request.prototype
-            ? this._input.credentials
-            : undefined;
         this._options = {
-            ...(credentials && { credentials }), // For exactOptionalPropertyTypes
             ...options,
             headers: mergeHeaders(this._input.headers, options.headers),
-            hooks: deepMerge({
+            hooks: mergeHooks({
                 beforeRequest: [],
                 beforeRetry: [],
                 beforeError: [],
@@ -445,18 +409,20 @@ class Ky {
         }
         if (supportsAbortController) {
             this.abortController = new globalThis.AbortController();
-            if (this._options.signal) {
-                const originalSignal = this._options.signal;
-                this._options.signal.addEventListener('abort', () => {
-                    this.abortController.abort(originalSignal.reason);
-                });
-            }
+            const originalSignal = this._options.signal ?? this._input.signal;
+            originalSignal?.addEventListener('abort', () => {
+                this.abortController.abort(originalSignal.reason);
+            });
             this._options.signal = this.abortController.signal;
         }
         if (supportsRequestStreams) {
             // @ts-expect-error - Types are outdated.
             this._options.duplex = 'half';
         }
+        if (this._options.json !== undefined) {
+            this._options.body = this._options.stringifyJson?.(this._options.json) ?? JSON.stringify(this._options.json);
+            this._options.headers.set('content-type', this._options.headers.get('content-type') ?? 'application/json');
+        }
         this.request = new globalThis.Request(this._input, this._options);
         if (this._options.searchParams) {
             // eslint-disable-next-line unicorn/prevent-abbreviations
@@ -474,41 +440,38 @@ class Ky {
             // The spread of `this.request` is required as otherwise it misses the `duplex` option for some reason and throws.
             this.request = new globalThis.Request(new globalThis.Request(url, { ...this.request }), this._options);
         }
-        if (this._options.json !== undefined) {
-            this._options.body = JSON.stringify(this._options.json);
-            this.request.headers.set('content-type', this._options.headers.get('content-type') ?? 'application/json');
-            this.request = new globalThis.Request(this.request, { body: this._options.body });
-        }
     }
     _calculateRetryDelay(error) {
         this._retryCount++;
-        if (this._retryCount <= this._options.retry.limit && !(error instanceof TimeoutError)) {
-            if (error instanceof HTTPError) {
-                if (!this._options.retry.statusCodes.includes(error.response.status)) {
-                    return 0;
-                }
-                const retryAfter = error.response.headers.get('Retry-After');
-                if (retryAfter && this._options.retry.afterStatusCodes.includes(error.response.status)) {
-                    let after = Number(retryAfter);
-                    if (Number.isNaN(after)) {
-                        after = Date.parse(retryAfter) - Date.now();
-                    }
-                    else {
-                        after *= 1000;
-                    }
-                    if (this._options.retry.maxRetryAfter !== undefined && after > this._options.retry.maxRetryAfter) {
-                        return 0;
-                    }
-                    return after;
+        if (this._retryCount > this._options.retry.limit || error instanceof TimeoutError) {
+            throw error;
+        }
+        if (error instanceof HTTPError) {
+            if (!this._options.retry.statusCodes.includes(error.response.status)) {
+                throw error;
+            }
+            const retryAfter = error.response.headers.get('Retry-After')
+                ?? error.response.headers.get('RateLimit-Reset')
+                ?? error.response.headers.get('X-RateLimit-Reset') // GitHub
+                ?? error.response.headers.get('X-Rate-Limit-Reset'); // Twitter
+            if (retryAfter && this._options.retry.afterStatusCodes.includes(error.response.status)) {
+                let after = Number(retryAfter) * 1000;
+                if (Number.isNaN(after)) {
+                    after = Date.parse(retryAfter) - Date.now();
                 }
-                if (error.response.status === 413) {
-                    return 0;
+                else if (after >= Date.parse('2024-01-01')) {
+                    // A large number is treated as a timestamp (fixed threshold protects against clock skew)
+                    after -= Date.now();
                 }
+                const max = this._options.retry.maxRetryAfter ?? after;
+                return after < max ? after : max;
+            }
+            if (error.response.status === 413) {
+                throw error;
             }
-            const retryDelay = this._options.retry.delay(this._retryCount);
-            return Math.min(this._options.retry.backoffLimit, retryDelay);
         }
-        return 0;
+        const retryDelay = this._options.retry.delay(this._retryCount);
+        return Math.min(this._options.retry.backoffLimit, retryDelay);
     }
     _decorateResponse(response) {
         if (this._options.parseJson) {
@@ -522,24 +485,24 @@ class Ky {
         }
         catch (error) {
             const ms = Math.min(this._calculateRetryDelay(error), maxSafeTimeout);
-            if (ms !== 0 && this._retryCount > 0) {
-                await delay(ms, { signal: this._options.signal });
-                for (const hook of this._options.hooks.beforeRetry) {
-                    // eslint-disable-next-line no-await-in-loop
-                    const hookResult = await hook({
-                        request: this.request,
-                        options: this._options,
-                        error: error,
-                        retryCount: this._retryCount,
-                    });
-                    // If `stop` is returned from the hook, the retry process is stopped
-                    if (hookResult === stop) {
-                        return;
-                    }
+            if (this._retryCount < 1) {
+                throw error;
+            }
+            await delay(ms, { signal: this._options.signal });
+            for (const hook of this._options.hooks.beforeRetry) {
+                // eslint-disable-next-line no-await-in-loop
+                const hookResult = await hook({
+                    request: this.request,
+                    options: this._options,
+                    error: error,
+                    retryCount: this._retryCount,
+                });
+                // If `stop` is returned from the hook, the retry process is stopped
+                if (hookResult === stop) {
+                    return;
                 }
-                return this._retry(function_);
             }
-            throw error;
+            return this._retry(function_);
         }
     }
     async _fetch() {
@@ -555,10 +518,13 @@ class Ky {
             }
         }
         const nonRequestOptions = findUnknownOptions(this.request, this._options);
+        // Cloning is done here to prepare in advance for retries
+        const mainRequest = this.request;
+        this.request = mainRequest.clone();
         if (this._options.timeout === false) {
-            return this._options.fetch(this.request.clone(), nonRequestOptions);
+            return this._options.fetch(mainRequest, nonRequestOptions);
         }
-        return timeout(this.request.clone(), nonRequestOptions, this.abortController, this._options);
+        return timeout(mainRequest, nonRequestOptions, this.abortController, this._options);
     }
     /* istanbul ignore next */
     _stream(response, onDownloadProgress) {
@@ -613,7 +579,12 @@ const createInstance = (defaults) => {
         ky[method] = (input, options) => Ky.create(input, validateAndMerge(defaults, options, { method }));
     }
     ky.create = (newDefaults) => createInstance(validateAndMerge(newDefaults));
-    ky.extend = (newDefaults) => createInstance(validateAndMerge(defaults, newDefaults));
+    ky.extend = (newDefaults) => {
+        if (typeof newDefaults === 'function') {
+            newDefaults = newDefaults(defaults ?? {});
+        }
+        return createInstance(validateAndMerge(defaults, newDefaults));
+    };
     ky.stop = stop;
     return ky;
 };
@@ -626,7 +597,7 @@ var distribution = /*#__PURE__*/Object.freeze({
 	default: ky$1
 });
 
-var require$$2 = /*@__PURE__*/getAugmentedNamespace(distribution);
+var require$$1 = /*@__PURE__*/getAugmentedNamespace(distribution);
 
 const ENDPOINT = {
   FREE: 'https://api.microlink.io/',
@@ -658,15 +629,22 @@ const parseBody = (input, error, url) => {
   }
 };
 
+const isURL = url => {
+  try {
+    return /^https?:\/\//i.test(new URL(url).href)
+  } catch (_) {
+    return false
+  }
+};
+
 const factory$1 = streamResponseType => ({
   VERSION,
   MicrolinkError,
-  urlHttp,
   got,
   flatten
 }) => {
   const assertUrl = (url = '') => {
-    if (!urlHttp(url)) {
+    if (!isURL(url)) {
       const message = `The \`url\` as \`${url}\` is not valid. Ensure it has protocol (http or https) and hostname.`;
       throw new MicrolinkError({
         status: 'fail',
@@ -766,9 +744,8 @@ const factory$1 = streamResponseType => ({
 
 var factory_1 = factory$1;
 
-const urlHttp = lightweight$1;
 const { flattie: flatten } = dist;
-const { default: ky } = require$$2;
+const { default: ky } = require$$1;
 
 const factory = factory_1('arrayBuffer');
 
@@ -815,22 +792,21 @@ got.stream = (...args) => ky(...args).then(res => res.body);
 
 const mql = factory({
   MicrolinkError,
-  urlHttp,
   got,
   flatten,
-  VERSION: '0.13.6'
+  VERSION: '0.13.8'
 });
 
-lightweight$2.exports = mql;
-var arrayBuffer = lightweight$2.exports.arrayBuffer = mql.extend({ responseType: 'arrayBuffer' });
-var extend = lightweight$2.exports.extend = mql.extend;
-var fetchFromApi = lightweight$2.exports.fetchFromApi = mql.fetchFromApi;
-var getApiUrl = lightweight$2.exports.getApiUrl = mql.getApiUrl;
-var mapRules = lightweight$2.exports.mapRules = mql.mapRules;
-var MicrolinkError_1 = lightweight$2.exports.MicrolinkError = mql.MicrolinkError;
-var version = lightweight$2.exports.version = mql.version;
+lightweight$1.exports = mql;
+var arrayBuffer = lightweight$1.exports.arrayBuffer = mql.extend({ responseType: 'arrayBuffer' });
+var extend = lightweight$1.exports.extend = mql.extend;
+var fetchFromApi = lightweight$1.exports.fetchFromApi = mql.fetchFromApi;
+var getApiUrl = lightweight$1.exports.getApiUrl = mql.getApiUrl;
+var mapRules = lightweight$1.exports.mapRules = mql.mapRules;
+var MicrolinkError_1 = lightweight$1.exports.MicrolinkError = mql.MicrolinkError;
+var version = lightweight$1.exports.version = mql.version;
 
-var lightweightExports = lightweight$2.exports;
+var lightweightExports = lightweight$1.exports;
 var lightweight = /*@__PURE__*/getDefaultExportFromCjs(lightweightExports);
 
 export { MicrolinkError_1 as MicrolinkError, arrayBuffer, lightweight as default, extend, fetchFromApi, getApiUrl, mapRules, version };

package/lightweight/index.umd.js

@@ -33,18 +33,7 @@
 		return a;
 	}
 
-	var lightweight$2 = {exports: {}};
-
-	const REGEX_HTTP_PROTOCOL = /^https?:\/\//i;
-
-	var lightweight$1 = url => {
-	  try {
-	    const { href } = new URL(url);
-	    return REGEX_HTTP_PROTOCOL.test(href) && href
-	  } catch (err) {
-	    return false
-	  }
-	};
+	var lightweight$1 = {exports: {}};
 
 	var dist = {};
 
@@ -76,32 +65,16 @@
 
 	dist.flattie = flattie;
 
-	// eslint-lint-disable-next-line @typescript-eslint/naming-convention
 	class HTTPError extends Error {
+	    response;
+	    request;
+	    options;
 	    constructor(response, request, options) {
 	        const code = (response.status || response.status === 0) ? response.status : '';
 	        const title = response.statusText || '';
 	        const status = `${code} ${title}`.trim();
 	        const reason = status ? `status code ${status}` : 'an unknown error';
-	        super(`Request failed with ${reason}`);
-	        Object.defineProperty(this, "response", {
-	            enumerable: true,
-	            configurable: true,
-	            writable: true,
-	            value: void 0
-	        });
-	        Object.defineProperty(this, "request", {
-	            enumerable: true,
-	            configurable: true,
-	            writable: true,
-	            value: void 0
-	        });
-	        Object.defineProperty(this, "options", {
-	            enumerable: true,
-	            configurable: true,
-	            writable: true,
-	            value: void 0
-	        });
+	        super(`Request failed with ${reason}: ${request.method} ${request.url}`);
 	        this.name = 'HTTPError';
 	        this.response = response;
 	        this.request = request;
@@ -110,14 +83,9 @@
 	}
 
 	class TimeoutError extends Error {
+	    request;
 	    constructor(request) {
-	        super('Request timed out');
-	        Object.defineProperty(this, "request", {
-	            enumerable: true,
-	            configurable: true,
-	            writable: true,
-	            value: void 0
-	        });
+	        super(`Request timed out: ${request.method} ${request.url}`);
 	        this.name = 'TimeoutError';
 	        this.request = request;
 	    }
@@ -148,10 +116,22 @@
 	    }
 	    return result;
 	};
+	function newHookValue(original, incoming, property) {
+	    return (Object.hasOwn(incoming, property) && incoming[property] === undefined)
+	        ? []
+	        : deepMerge(original[property] ?? [], incoming[property] ?? []);
+	}
+	const mergeHooks = (original = {}, incoming = {}) => ({
+	    beforeRequest: newHookValue(original, incoming, 'beforeRequest'),
+	    beforeRetry: newHookValue(original, incoming, 'beforeRetry'),
+	    afterResponse: newHookValue(original, incoming, 'afterResponse'),
+	    beforeError: newHookValue(original, incoming, 'beforeError'),
+	});
 	// TODO: Make this strongly-typed (no `any`).
 	const deepMerge = (...sources) => {
 	    let returnValue = {};
 	    let headers = {};
+	    let hooks = {};
 	    for (const source of sources) {
 	        if (Array.isArray(source)) {
 	            if (!Array.isArray(returnValue)) {
@@ -166,6 +146,10 @@
 	                }
 	                returnValue = { ...returnValue, [key]: value };
 	            }
+	            if (isObject$1(source.hooks)) {
+	                hooks = mergeHooks(hooks, source.hooks);
+	                returnValue.hooks = hooks;
+	            }
 	            if (isObject$1(source.headers)) {
 	                headers = mergeHeaders(headers, source.headers);
 	                returnValue.headers = headers;
@@ -181,15 +165,24 @@
 	    const supportsReadableStream = typeof globalThis.ReadableStream === 'function';
 	    const supportsRequest = typeof globalThis.Request === 'function';
 	    if (supportsReadableStream && supportsRequest) {
-	        hasContentType = new globalThis.Request('https://empty.invalid', {
-	            body: new globalThis.ReadableStream(),
-	            method: 'POST',
-	            // @ts-expect-error - Types are outdated.
-	            get duplex() {
-	                duplexAccessed = true;
-	                return 'half';
-	            },
-	        }).headers.has('Content-Type');
+	        try {
+	            hasContentType = new globalThis.Request('https://empty.invalid', {
+	                body: new globalThis.ReadableStream(),
+	                method: 'POST',
+	                // @ts-expect-error - Types are outdated.
+	                get duplex() {
+	                    duplexAccessed = true;
+	                    return 'half';
+	                },
+	            }).headers.has('Content-Type');
+	        }
+	        catch (error) {
+	            // QQBrowser on iOS throws "unsupported BodyInit type" error (see issue #581)
+	            if (error instanceof Error && error.message === 'unsupported BodyInit type') {
+	                return false;
+	            }
+	            throw error;
+	        }
 	    }
 	    return duplexAccessed && !hasContentType;
 	})();
@@ -210,6 +203,7 @@
 	const kyOptionKeys = {
 	    json: true,
 	    parseJson: true,
+	    stringifyJson: true,
 	    searchParams: true,
 	    prefixUrl: true,
 	    retry: true,
@@ -267,7 +261,6 @@
 	    return {
 	        ...defaultRetryOptions,
 	        ...retry,
-	        afterStatusCodes: retryAfterStatusCodes,
 	    };
 	};
 
@@ -383,47 +376,18 @@
 	        }
 	        return result;
 	    }
+	    request;
+	    abortController;
+	    _retryCount = 0;
+	    _input;
+	    _options;
 	    // eslint-disable-next-line complexity
 	    constructor(input, options = {}) {
-	        Object.defineProperty(this, "request", {
-	            enumerable: true,
-	            configurable: true,
-	            writable: true,
-	            value: void 0
-	        });
-	        Object.defineProperty(this, "abortController", {
-	            enumerable: true,
-	            configurable: true,
-	            writable: true,
-	            value: void 0
-	        });
-	        Object.defineProperty(this, "_retryCount", {
-	            enumerable: true,
-	            configurable: true,
-	            writable: true,
-	            value: 0
-	        });
-	        Object.defineProperty(this, "_input", {
-	            enumerable: true,
-	            configurable: true,
-	            writable: true,
-	            value: void 0
-	        });
-	        Object.defineProperty(this, "_options", {
-	            enumerable: true,
-	            configurable: true,
-	            writable: true,
-	            value: void 0
-	        });
 	        this._input = input;
-	        const credentials = this._input instanceof Request && 'credentials' in Request.prototype
-	            ? this._input.credentials
-	            : undefined;
 	        this._options = {
-	            ...(credentials && { credentials }), // For exactOptionalPropertyTypes
 	            ...options,
 	            headers: mergeHeaders(this._input.headers, options.headers),
-	            hooks: deepMerge({
+	            hooks: mergeHooks({
 	                beforeRequest: [],
 	                beforeRetry: [],
 	                beforeError: [],
@@ -451,18 +415,20 @@
 	        }
 	        if (supportsAbortController) {
 	            this.abortController = new globalThis.AbortController();
-	            if (this._options.signal) {
-	                const originalSignal = this._options.signal;
-	                this._options.signal.addEventListener('abort', () => {
-	                    this.abortController.abort(originalSignal.reason);
-	                });
-	            }
+	            const originalSignal = this._options.signal ?? this._input.signal;
+	            originalSignal?.addEventListener('abort', () => {
+	                this.abortController.abort(originalSignal.reason);
+	            });
 	            this._options.signal = this.abortController.signal;
 	        }
 	        if (supportsRequestStreams) {
 	            // @ts-expect-error - Types are outdated.
 	            this._options.duplex = 'half';
 	        }
+	        if (this._options.json !== undefined) {
+	            this._options.body = this._options.stringifyJson?.(this._options.json) ?? JSON.stringify(this._options.json);
+	            this._options.headers.set('content-type', this._options.headers.get('content-type') ?? 'application/json');
+	        }
 	        this.request = new globalThis.Request(this._input, this._options);
 	        if (this._options.searchParams) {
 	            // eslint-disable-next-line unicorn/prevent-abbreviations
@@ -480,41 +446,38 @@
 	            // The spread of `this.request` is required as otherwise it misses the `duplex` option for some reason and throws.
 	            this.request = new globalThis.Request(new globalThis.Request(url, { ...this.request }), this._options);
 	        }
-	        if (this._options.json !== undefined) {
-	            this._options.body = JSON.stringify(this._options.json);
-	            this.request.headers.set('content-type', this._options.headers.get('content-type') ?? 'application/json');
-	            this.request = new globalThis.Request(this.request, { body: this._options.body });
-	        }
 	    }
 	    _calculateRetryDelay(error) {
 	        this._retryCount++;
-	        if (this._retryCount <= this._options.retry.limit && !(error instanceof TimeoutError)) {
-	            if (error instanceof HTTPError) {
-	                if (!this._options.retry.statusCodes.includes(error.response.status)) {
-	                    return 0;
-	                }
-	                const retryAfter = error.response.headers.get('Retry-After');
-	                if (retryAfter && this._options.retry.afterStatusCodes.includes(error.response.status)) {
-	                    let after = Number(retryAfter);
-	                    if (Number.isNaN(after)) {
-	                        after = Date.parse(retryAfter) - Date.now();
-	                    }
-	                    else {
-	                        after *= 1000;
-	                    }
-	                    if (this._options.retry.maxRetryAfter !== undefined && after > this._options.retry.maxRetryAfter) {
-	                        return 0;
-	                    }
-	                    return after;
+	        if (this._retryCount > this._options.retry.limit || error instanceof TimeoutError) {
+	            throw error;
+	        }
+	        if (error instanceof HTTPError) {
+	            if (!this._options.retry.statusCodes.includes(error.response.status)) {
+	                throw error;
+	            }
+	            const retryAfter = error.response.headers.get('Retry-After')
+	                ?? error.response.headers.get('RateLimit-Reset')
+	                ?? error.response.headers.get('X-RateLimit-Reset') // GitHub
+	                ?? error.response.headers.get('X-Rate-Limit-Reset'); // Twitter
+	            if (retryAfter && this._options.retry.afterStatusCodes.includes(error.response.status)) {
+	                let after = Number(retryAfter) * 1000;
+	                if (Number.isNaN(after)) {
+	                    after = Date.parse(retryAfter) - Date.now();
 	                }
-	                if (error.response.status === 413) {
-	                    return 0;
+	                else if (after >= Date.parse('2024-01-01')) {
+	                    // A large number is treated as a timestamp (fixed threshold protects against clock skew)
+	                    after -= Date.now();
 	                }
+	                const max = this._options.retry.maxRetryAfter ?? after;
+	                return after < max ? after : max;
+	            }
+	            if (error.response.status === 413) {
+	                throw error;
 	            }
-	            const retryDelay = this._options.retry.delay(this._retryCount);
-	            return Math.min(this._options.retry.backoffLimit, retryDelay);
 	        }
-	        return 0;
+	        const retryDelay = this._options.retry.delay(this._retryCount);
+	        return Math.min(this._options.retry.backoffLimit, retryDelay);
 	    }
 	    _decorateResponse(response) {
 	        if (this._options.parseJson) {
@@ -528,24 +491,24 @@
 	        }
 	        catch (error) {
 	            const ms = Math.min(this._calculateRetryDelay(error), maxSafeTimeout);
-	            if (ms !== 0 && this._retryCount > 0) {
-	                await delay(ms, { signal: this._options.signal });
-	                for (const hook of this._options.hooks.beforeRetry) {
-	                    // eslint-disable-next-line no-await-in-loop
-	                    const hookResult = await hook({
-	                        request: this.request,
-	                        options: this._options,
-	                        error: error,
-	                        retryCount: this._retryCount,
-	                    });
-	                    // If `stop` is returned from the hook, the retry process is stopped
-	                    if (hookResult === stop) {
-	                        return;
-	                    }
+	            if (this._retryCount < 1) {
+	                throw error;
+	            }
+	            await delay(ms, { signal: this._options.signal });
+	            for (const hook of this._options.hooks.beforeRetry) {
+	                // eslint-disable-next-line no-await-in-loop
+	                const hookResult = await hook({
+	                    request: this.request,
+	                    options: this._options,
+	                    error: error,
+	                    retryCount: this._retryCount,
+	                });
+	                // If `stop` is returned from the hook, the retry process is stopped
+	                if (hookResult === stop) {
+	                    return;
 	                }
-	                return this._retry(function_);
 	            }
-	            throw error;
+	            return this._retry(function_);
 	        }
 	    }
 	    async _fetch() {
@@ -561,10 +524,13 @@
 	            }
 	        }
 	        const nonRequestOptions = findUnknownOptions(this.request, this._options);
+	        // Cloning is done here to prepare in advance for retries
+	        const mainRequest = this.request;
+	        this.request = mainRequest.clone();
 	        if (this._options.timeout === false) {
-	            return this._options.fetch(this.request.clone(), nonRequestOptions);
+	            return this._options.fetch(mainRequest, nonRequestOptions);
 	        }
-	        return timeout(this.request.clone(), nonRequestOptions, this.abortController, this._options);
+	        return timeout(mainRequest, nonRequestOptions, this.abortController, this._options);
 	    }
 	    /* istanbul ignore next */
 	    _stream(response, onDownloadProgress) {
@@ -619,7 +585,12 @@
 	        ky[method] = (input, options) => Ky.create(input, validateAndMerge(defaults, options, { method }));
 	    }
 	    ky.create = (newDefaults) => createInstance(validateAndMerge(newDefaults));
-	    ky.extend = (newDefaults) => createInstance(validateAndMerge(defaults, newDefaults));
+	    ky.extend = (newDefaults) => {
+	        if (typeof newDefaults === 'function') {
+	            newDefaults = newDefaults(defaults ?? {});
+	        }
+	        return createInstance(validateAndMerge(defaults, newDefaults));
+	    };
 	    ky.stop = stop;
 	    return ky;
 	};
@@ -632,7 +603,7 @@
 		default: ky$1
 	});
 
-	var require$$2 = /*@__PURE__*/getAugmentedNamespace(distribution);
+	var require$$1 = /*@__PURE__*/getAugmentedNamespace(distribution);
 
 	const ENDPOINT = {
 	  FREE: 'https://api.microlink.io/',
@@ -664,15 +635,22 @@
 	  }
 	};
 
+	const isURL = url => {
+	  try {
+	    return /^https?:\/\//i.test(new URL(url).href)
+	  } catch (_) {
+	    return false
+	  }
+	};
+
 	const factory$1 = streamResponseType => ({
 	  VERSION,
 	  MicrolinkError,
-	  urlHttp,
 	  got,
 	  flatten
 	}) => {
 	  const assertUrl = (url = '') => {
-	    if (!urlHttp(url)) {
+	    if (!isURL(url)) {
 	      const message = `The \`url\` as \`${url}\` is not valid. Ensure it has protocol (http or https) and hostname.`;
 	      throw new MicrolinkError({
 	        status: 'fail',
@@ -772,9 +750,8 @@
 
 	var factory_1 = factory$1;
 
-	const urlHttp = lightweight$1;
 	const { flattie: flatten } = dist;
-	const { default: ky } = require$$2;
+	const { default: ky } = require$$1;
 
 	const factory = factory_1('arrayBuffer');
 
@@ -821,22 +798,21 @@
 
 	const mql = factory({
 	  MicrolinkError,
-	  urlHttp,
 	  got,
 	  flatten,
-	  VERSION: '0.13.6'
+	  VERSION: '0.13.8'
 	});
 
-	lightweight$2.exports = mql;
-	var arrayBuffer = lightweight$2.exports.arrayBuffer = mql.extend({ responseType: 'arrayBuffer' });
-	var extend = lightweight$2.exports.extend = mql.extend;
-	var fetchFromApi = lightweight$2.exports.fetchFromApi = mql.fetchFromApi;
-	var getApiUrl = lightweight$2.exports.getApiUrl = mql.getApiUrl;
-	var mapRules = lightweight$2.exports.mapRules = mql.mapRules;
-	var MicrolinkError_1 = lightweight$2.exports.MicrolinkError = mql.MicrolinkError;
-	var version = lightweight$2.exports.version = mql.version;
+	lightweight$1.exports = mql;
+	var arrayBuffer = lightweight$1.exports.arrayBuffer = mql.extend({ responseType: 'arrayBuffer' });
+	var extend = lightweight$1.exports.extend = mql.extend;
+	var fetchFromApi = lightweight$1.exports.fetchFromApi = mql.fetchFromApi;
+	var getApiUrl = lightweight$1.exports.getApiUrl = mql.getApiUrl;
+	var mapRules = lightweight$1.exports.mapRules = mql.mapRules;
+	var MicrolinkError_1 = lightweight$1.exports.MicrolinkError = mql.MicrolinkError;
+	var version = lightweight$1.exports.version = mql.version;
 
-	var lightweightExports = lightweight$2.exports;
+	var lightweightExports = lightweight$1.exports;
 	var lightweight = /*@__PURE__*/getDefaultExportFromCjs(lightweightExports);
 
 	exports.MicrolinkError = MicrolinkError_1;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@microlink/mql",
   "description": "Microlink Query Language. The official HTTP client to interact with Microlink API for Node.js, browsers & Deno.",
   "homepage": "https://microlink.io/mql",
-  "version": "0.13.6",
+  "version": "0.13.8",
   "types": "lightweight/index.d.ts",
   "exports": {
     "require": "./src/node.js",
@@ -48,14 +48,13 @@
   "dependencies": {
     "flattie": "~1.1.0",
     "got": "~11.8.6",
-    "url-http": "~1.2.0",
     "whoops": "~4.1.7"
   },
   "devDependencies": {
     "@commitlint/cli": "latest",
     "@commitlint/config-conventional": "latest",
     "@ksmithut/prettier-standard": "latest",
-    "@rollup/plugin-commonjs": "latest",
+    "@rollup/plugin-commonjs": "26",
     "@rollup/plugin-node-resolve": "latest",
     "@rollup/plugin-replace": "latest",
     "@rollup/plugin-terser": "latest",
@@ -67,7 +66,6 @@
     "github-generate-release": "latest",
     "ky": "latest",
     "nano-staged": "latest",
-    "npm-check-updates": "latest",
     "prettier-standard": "latest",
     "rollup": "latest",
     "rollup-plugin-filesize": "latest",
@@ -98,14 +96,11 @@
     "postrelease": "npm run release:tags && npm run release:github && (ci-publish || npm publish --access=public)",
     "prebuild": "npm run clean:build",
     "prepublishOnly": "npm run build",
-    "prerelease": "npm run update:check",
     "pretest": "npm run lint && npm run build",
     "release": "standard-version -a",
     "release:github": "github-generate-release",
     "release:tags": "git push --follow-tags origin HEAD:master",
-    "test": "c8 ava --verbose",
-    "update": "ncu -u",
-    "update:check": "ncu -- --error-level 2"
+    "test": "c8 ava --verbose"
   },
   "license": "MIT",
   "ava": {
@@ -118,7 +113,12 @@
   "commitlint": {
     "extends": [
       "@commitlint/config-conventional"
-    ]
+    ],
+    "rules": {
+      "body-max-line-length": [
+        0
+      ]
+    }
   },
   "nano-staged": {
     "*.js": [

package/src/factory.js

@@ -28,15 +28,22 @@ const parseBody = (input, error, url) => {
   }
 }
 
+const isURL = url => {
+  try {
+    return /^https?:\/\//i.test(new URL(url).href)
+  } catch (_) {
+    return false
+  }
+}
+
 const factory = streamResponseType => ({
   VERSION,
   MicrolinkError,
-  urlHttp,
   got,
   flatten
 }) => {
   const assertUrl = (url = '') => {
-    if (!urlHttp(url)) {
+    if (!isURL(url)) {
       const message = `The \`url\` as \`${url}\` is not valid. Ensure it has protocol (http or https) and hostname.`
       throw new MicrolinkError({
         status: 'fail',

package/src/node.js

@@ -1,6 +1,5 @@
 const mql = require('./factory')('buffer')({
   MicrolinkError: require('whoops')('MicrolinkError'),
-  urlHttp: require('url-http/lightweight'),
   got: require('got').extend({ headers: { 'user-agent': undefined } }),
   flatten: require('flattie').flattie,
   VERSION: require('../package.json').version