fast-npm-meta 1.4.1 → 1.5.0

package/dist/cli.mjs

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 import process$1 from "node:process";
-
 //#region ../node_modules/.pnpm/cac@7.0.0/node_modules/cac/dist/index.js
 function toArr(any) {
 	return any == null ? [] : Array.isArray(any) ? any : [any];
@@ -618,11 +617,9 @@ var CAC = class extends EventTarget {
 * @param name The program name to display in help and version message
 */
 const cac = (name = "") => new CAC(name);
-
 //#endregion
 //#region package.json
-var version = "1.4.1";
-
+var version = "1.5.0";
 //#endregion
 //#region ../node_modules/.pnpm/is-network-error@1.3.0/node_modules/is-network-error/index.js
 const objectToString = Object.prototype.toString;
@@ -645,9 +642,8 @@ function isNetworkError(error) {
 	if (message.startsWith("error sending request for url")) return true;
 	return errorMessages.has(message);
 }
-
 //#endregion
-//#region ../node_modules/.pnpm/p-retry@7.1.1/node_modules/p-retry/index.js
+//#region ../node_modules/.pnpm/p-retry@8.0.0/node_modules/p-retry/index.js
 function validateRetries(retries) {
 	if (typeof retries === "number") {
 		if (retries < 0) throw new TypeError("Expected `retries` to be a non-negative number.");
@@ -660,6 +656,10 @@ function validateNumberOption(name, value, { min = 0, allowInfinity = false } =
 	if (!allowInfinity && !Number.isFinite(value)) throw new TypeError(`Expected \`${name}\` to be a finite number.`);
 	if (value < min) throw new TypeError(`Expected \`${name}\` to be \u2265 ${min}.`);
 }
+function validateFunctionOption(name, value) {
+	if (value === void 0) return;
+	if (typeof value !== "function") throw new TypeError(`Expected \`${name}\` to be a function.`);
+}
 var AbortError = class extends Error {
 	constructor(message) {
 		super();
@@ -685,48 +685,69 @@ function calculateRemainingTime(start, max) {
 	if (!Number.isFinite(max)) return max;
 	return max - (performance.now() - start);
 }
+async function delayForRetry(delay, options) {
+	if (delay <= 0) return;
+	await new Promise((resolve, reject) => {
+		const onAbort = () => {
+			clearTimeout(timeoutToken);
+			options.signal?.removeEventListener("abort", onAbort);
+			reject(options.signal.reason);
+		};
+		const timeoutToken = setTimeout(() => {
+			options.signal?.removeEventListener("abort", onAbort);
+			resolve();
+		}, delay);
+		if (options.unref) timeoutToken.unref?.();
+		options.signal?.addEventListener("abort", onAbort, { once: true });
+	});
+}
 async function onAttemptFailure({ error, attemptNumber, retriesConsumed, startTime, options }) {
 	const normalizedError = error instanceof Error ? error : /* @__PURE__ */ new TypeError(`Non-error was thrown: "${error}". You should only throw errors.`);
 	if (normalizedError instanceof AbortError) throw normalizedError.originalError;
 	const retriesLeft = Number.isFinite(options.retries) ? Math.max(0, options.retries - retriesConsumed) : options.retries;
 	const maxRetryTime = options.maxRetryTime ?? Number.POSITIVE_INFINITY;
+	const delayTime = calculateDelay(retriesConsumed, options);
+	if (calculateRemainingTime(startTime, maxRetryTime) <= 0) {
+		const context = Object.freeze({
+			error: normalizedError,
+			attemptNumber,
+			retriesLeft,
+			retriesConsumed,
+			retryDelay: 0
+		});
+		await options.onFailedAttempt(context);
+		throw normalizedError;
+	}
+	const consumeRetryContext = Object.freeze({
+		error: normalizedError,
+		attemptNumber,
+		retriesLeft,
+		retriesConsumed,
+		retryDelay: retriesLeft > 0 ? delayTime : 0
+	});
+	const consumeRetry = await options.shouldConsumeRetry(consumeRetryContext);
+	const effectiveDelay = consumeRetry && retriesLeft > 0 ? delayTime : 0;
 	const context = Object.freeze({
 		error: normalizedError,
 		attemptNumber,
 		retriesLeft,
-		retriesConsumed
+		retriesConsumed,
+		retryDelay: effectiveDelay
 	});
 	await options.onFailedAttempt(context);
 	if (calculateRemainingTime(startTime, maxRetryTime) <= 0) throw normalizedError;
-	const consumeRetry = await options.shouldConsumeRetry(context);
-	const remainingTime = calculateRemainingTime(startTime, maxRetryTime);
-	if (remainingTime <= 0 || retriesLeft <= 0) throw normalizedError;
-	if (normalizedError instanceof TypeError && !isNetworkError(normalizedError)) {
-		if (consumeRetry) throw normalizedError;
-		options.signal?.throwIfAborted();
-		return false;
-	}
+	if (calculateRemainingTime(startTime, maxRetryTime) <= 0 || retriesLeft <= 0) throw normalizedError;
+	if (normalizedError instanceof TypeError && !isNetworkError(normalizedError)) throw normalizedError;
 	if (!await options.shouldRetry(context)) throw normalizedError;
+	const remainingTimeAfterShouldRetry = calculateRemainingTime(startTime, maxRetryTime);
+	if (remainingTimeAfterShouldRetry <= 0) throw normalizedError;
 	if (!consumeRetry) {
 		options.signal?.throwIfAborted();
 		return false;
 	}
-	const delayTime = calculateDelay(retriesConsumed, options);
-	const finalDelay = Math.min(delayTime, remainingTime);
+	const finalDelay = Math.min(effectiveDelay, remainingTimeAfterShouldRetry);
 	options.signal?.throwIfAborted();
-	if (finalDelay > 0) await new Promise((resolve, reject) => {
-		const onAbort = () => {
-			clearTimeout(timeoutToken);
-			options.signal?.removeEventListener("abort", onAbort);
-			reject(options.signal.reason);
-		};
-		const timeoutToken = setTimeout(() => {
-			options.signal?.removeEventListener("abort", onAbort);
-			resolve();
-		}, finalDelay);
-		if (options.unref) timeoutToken.unref?.();
-		options.signal?.addEventListener("abort", onAbort, { once: true });
-	});
+	await delayForRetry(finalDelay, options);
 	options.signal?.throwIfAborted();
 	return true;
 }
@@ -743,6 +764,9 @@ async function pRetry(input, options = {}) {
 	options.onFailedAttempt ??= () => {};
 	options.shouldRetry ??= () => true;
 	options.shouldConsumeRetry ??= () => true;
+	validateFunctionOption("onFailedAttempt", options.onFailedAttempt);
+	validateFunctionOption("shouldRetry", options.shouldRetry);
+	validateFunctionOption("shouldConsumeRetry", options.shouldConsumeRetry);
 	validateNumberOption("factor", options.factor, {
 		min: 0,
 		allowInfinity: false
@@ -783,7 +807,6 @@ async function pRetry(input, options = {}) {
 	}
 	throw new Error("Retry attempts exhausted without throwing an error.");
 }
-
 //#endregion
 //#region src/api.ts
 const defaultRetryOptions = {
@@ -835,7 +858,6 @@ function toArray(data) {
 	if (Array.isArray(data)) return data;
 	return [data];
 }
-
 //#endregion
 //#region src/cli.ts
 const cli = cac("fast-npm-meta");
@@ -874,6 +896,5 @@ cli.command("full <...pkgs>", "Get full package metadata (versions list, dist-ta
 cli.help();
 cli.version(version);
 cli.parse();
-
 //#endregion
-export {  };
+export {};

package/dist/index.mjs

@@ -19,9 +19,8 @@ function isNetworkError(error) {
 	if (message.startsWith("error sending request for url")) return true;
 	return errorMessages.has(message);
 }
-
 //#endregion
-//#region ../node_modules/.pnpm/p-retry@7.1.1/node_modules/p-retry/index.js
+//#region ../node_modules/.pnpm/p-retry@8.0.0/node_modules/p-retry/index.js
 function validateRetries(retries) {
 	if (typeof retries === "number") {
 		if (retries < 0) throw new TypeError("Expected `retries` to be a non-negative number.");
@@ -34,6 +33,10 @@ function validateNumberOption(name, value, { min = 0, allowInfinity = false } =
 	if (!allowInfinity && !Number.isFinite(value)) throw new TypeError(`Expected \`${name}\` to be a finite number.`);
 	if (value < min) throw new TypeError(`Expected \`${name}\` to be \u2265 ${min}.`);
 }
+function validateFunctionOption(name, value) {
+	if (value === void 0) return;
+	if (typeof value !== "function") throw new TypeError(`Expected \`${name}\` to be a function.`);
+}
 var AbortError = class extends Error {
 	constructor(message) {
 		super();
@@ -59,48 +62,69 @@ function calculateRemainingTime(start, max) {
 	if (!Number.isFinite(max)) return max;
 	return max - (performance.now() - start);
 }
+async function delayForRetry(delay, options) {
+	if (delay <= 0) return;
+	await new Promise((resolve, reject) => {
+		const onAbort = () => {
+			clearTimeout(timeoutToken);
+			options.signal?.removeEventListener("abort", onAbort);
+			reject(options.signal.reason);
+		};
+		const timeoutToken = setTimeout(() => {
+			options.signal?.removeEventListener("abort", onAbort);
+			resolve();
+		}, delay);
+		if (options.unref) timeoutToken.unref?.();
+		options.signal?.addEventListener("abort", onAbort, { once: true });
+	});
+}
 async function onAttemptFailure({ error, attemptNumber, retriesConsumed, startTime, options }) {
 	const normalizedError = error instanceof Error ? error : /* @__PURE__ */ new TypeError(`Non-error was thrown: "${error}". You should only throw errors.`);
 	if (normalizedError instanceof AbortError) throw normalizedError.originalError;
 	const retriesLeft = Number.isFinite(options.retries) ? Math.max(0, options.retries - retriesConsumed) : options.retries;
 	const maxRetryTime = options.maxRetryTime ?? Number.POSITIVE_INFINITY;
+	const delayTime = calculateDelay(retriesConsumed, options);
+	if (calculateRemainingTime(startTime, maxRetryTime) <= 0) {
+		const context = Object.freeze({
+			error: normalizedError,
+			attemptNumber,
+			retriesLeft,
+			retriesConsumed,
+			retryDelay: 0
+		});
+		await options.onFailedAttempt(context);
+		throw normalizedError;
+	}
+	const consumeRetryContext = Object.freeze({
+		error: normalizedError,
+		attemptNumber,
+		retriesLeft,
+		retriesConsumed,
+		retryDelay: retriesLeft > 0 ? delayTime : 0
+	});
+	const consumeRetry = await options.shouldConsumeRetry(consumeRetryContext);
+	const effectiveDelay = consumeRetry && retriesLeft > 0 ? delayTime : 0;
 	const context = Object.freeze({
 		error: normalizedError,
 		attemptNumber,
 		retriesLeft,
-		retriesConsumed
+		retriesConsumed,
+		retryDelay: effectiveDelay
 	});
 	await options.onFailedAttempt(context);
 	if (calculateRemainingTime(startTime, maxRetryTime) <= 0) throw normalizedError;
-	const consumeRetry = await options.shouldConsumeRetry(context);
-	const remainingTime = calculateRemainingTime(startTime, maxRetryTime);
-	if (remainingTime <= 0 || retriesLeft <= 0) throw normalizedError;
-	if (normalizedError instanceof TypeError && !isNetworkError(normalizedError)) {
-		if (consumeRetry) throw normalizedError;
-		options.signal?.throwIfAborted();
-		return false;
-	}
+	if (calculateRemainingTime(startTime, maxRetryTime) <= 0 || retriesLeft <= 0) throw normalizedError;
+	if (normalizedError instanceof TypeError && !isNetworkError(normalizedError)) throw normalizedError;
 	if (!await options.shouldRetry(context)) throw normalizedError;
+	const remainingTimeAfterShouldRetry = calculateRemainingTime(startTime, maxRetryTime);
+	if (remainingTimeAfterShouldRetry <= 0) throw normalizedError;
 	if (!consumeRetry) {
 		options.signal?.throwIfAborted();
 		return false;
 	}
-	const delayTime = calculateDelay(retriesConsumed, options);
-	const finalDelay = Math.min(delayTime, remainingTime);
+	const finalDelay = Math.min(effectiveDelay, remainingTimeAfterShouldRetry);
 	options.signal?.throwIfAborted();
-	if (finalDelay > 0) await new Promise((resolve, reject) => {
-		const onAbort = () => {
-			clearTimeout(timeoutToken);
-			options.signal?.removeEventListener("abort", onAbort);
-			reject(options.signal.reason);
-		};
-		const timeoutToken = setTimeout(() => {
-			options.signal?.removeEventListener("abort", onAbort);
-			resolve();
-		}, finalDelay);
-		if (options.unref) timeoutToken.unref?.();
-		options.signal?.addEventListener("abort", onAbort, { once: true });
-	});
+	await delayForRetry(finalDelay, options);
 	options.signal?.throwIfAborted();
 	return true;
 }
@@ -117,6 +141,9 @@ async function pRetry(input, options = {}) {
 	options.onFailedAttempt ??= () => {};
 	options.shouldRetry ??= () => true;
 	options.shouldConsumeRetry ??= () => true;
+	validateFunctionOption("onFailedAttempt", options.onFailedAttempt);
+	validateFunctionOption("shouldRetry", options.shouldRetry);
+	validateFunctionOption("shouldConsumeRetry", options.shouldConsumeRetry);
 	validateNumberOption("factor", options.factor, {
 		min: 0,
 		allowInfinity: false
@@ -157,7 +184,6 @@ async function pRetry(input, options = {}) {
 	}
 	throw new Error("Retry attempts exhausted without throwing an error.");
 }
-
 //#endregion
 //#region src/api.ts
 const defaultRetryOptions = {
@@ -217,7 +243,6 @@ function toArray(data) {
 	if (Array.isArray(data)) return data;
 	return [data];
 }
-
 //#endregion
 //#region src/helpers.ts
 const NPM_REGISTRY = "https://registry.npmjs.org/";
@@ -234,6 +259,5 @@ function pickRegistry(scope, npmConfigs, defaultRegistry = NPM_REGISTRY) {
 	if (!registry) registry = npmConfigs.registry || defaultRegistry;
 	return registry;
 }
-
 //#endregion
-export { NPM_REGISTRY, defaultOptions, getLatestVersion, getLatestVersionBatch, getVersions, getVersionsBatch, pickRegistry };
+export { NPM_REGISTRY, defaultOptions, getLatestVersion, getLatestVersionBatch, getVersions, getVersionsBatch, pickRegistry };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fast-npm-meta",
   "type": "module",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "Get npm package metadata",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -28,8 +28,13 @@
   ],
   "devDependencies": {
     "cac": "^7.0.0",
-    "p-retry": "^7.1.1",
-    "tsdown": "^0.20.3"
+    "p-retry": "^8.0.0",
+    "tsdown": "^0.21.7"
+  },
+  "inlinedDependencies": {
+    "cac": "7.0.0",
+    "is-network-error": "1.3.0",
+    "p-retry": "8.0.0"
   },
   "scripts": {
     "build": "tsdown",