@package-pal/cli 0.0.6 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@package-pal/cli",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "CLI tool exposing core PackagePal functionality.",
   "keywords": [
     "package",
@@ -12,13 +12,15 @@
   ],
   "license": "MIT",
   "type": "module",
+  "dependencies": {
+    "tar": "^7.4.3"
+  },
   "devDependencies": {
     "@clack/prompts": "^0.11.0",
     "@package-pal/core": "^0.0.2",
     "@package-pal/util": "^0.0.4",
     "@stricli/core": "^1.2.0",
     "@types/bun": "^1.2.19",
-    "tar": "^7.4.3",
     "typescript": "^5.8.3",
     "yoctocolors": "^2.1.1"
   },

package/src/lib/install/functions/get-path-info.js

@@ -2,7 +2,7 @@ import {
 	dirname, join, resolve,
 } from 'path';
 import { fileURLToPath } from 'url';
-import packageJson from '../../../../package.json' with { type: 'json' };;
+import packageJson from '../../../../package.json' with { type: 'json' };
 
 /**
  * @param {Bun.Platform} platform

package/src/lib/install/functions/get-platform-info.js

@@ -19,11 +19,10 @@ export const getPlatformInfo = () => {
 		case 'linux':
 			let isMusl = false;
 			try {
-				// Determine if the OS is using musl libc.
 				// The report will not have a glibcVersionRuntime property if musl is being used.
-				// @ts-expect-error unknown type
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-				isMusl = !process.report.getReport().header?.glibcVersionRuntime;
+				/** @type {{ header?: { glibcVersionRuntime?: unknown } }} */
+				const report = process.report.getReport();
+				isMusl = !report.header?.glibcVersionRuntime;
 			} catch {
 				isMusl = true;
 			}
@@ -39,7 +38,7 @@ export const getPlatformInfo = () => {
 	}
 
 	if (!targetPackage) {
-		throw new Error(`Unsupported platform: ${usePlatform} ${useArch}.`);
+		throw new Error(`Unsupported target: ${usePlatform} ${useArch}.`);
 	}
 
 	return {

package/src/lib/install/functions/load-missing-binary.js

@@ -3,52 +3,72 @@ import { pipeline } from 'stream/promises';
 import { x } from 'tar';
 import packageJson from '../../../../package.json' with { type: 'json' };
 
+const maxRetries = 3;
+const initialBackoffMs = 500;
+
 /**
  * @param {string} tarballUrl
  * @param {string} binName
  * @param {string} outputBinDir
  */
-const downloadAndExtract = async (
+const tryDownloadAndExtract = (
 	tarballUrl, binName, outputBinDir,
 ) => {
-	for (let i = 0; i < 3; i++) {
-		try {
-			await new Promise((resolve, reject) => {
-				get(tarballUrl, (res) => {
-					if (res.statusCode === 301 || res.statusCode === 302) {
-						if (!res.headers.location) {
-							reject(new Error(`Failed to download binary: Redirect location missing.`));
-							return;
-						}
+	return new Promise((resolve, reject) => {
+		get(tarballUrl, (res) => {
+			const isRedirect = res.statusCode === 301 || res.statusCode === 302;
+			const isSuccess = res.statusCode === 200;
 
-						downloadAndExtract(
-							res.headers.location, binName, outputBinDir,
-						).then(resolve, reject);
-						return;
-					}
-
-					if (res.statusCode !== 200) {
-						reject(new Error(`Failed to download binary: ${res.statusCode?.toString() ?? 'Unknown'}.`));
-						return;
-					}
+			if (isRedirect) {
+				if (!res.headers.location) {
+					reject(new Error(`Failed to download binary: Redirect location missing.`));
+					return;
+				}
+				downloadAndExtract(
+					res.headers.location, binName, outputBinDir,
+				)
+					.then(resolve)
+					.catch(reject);
+				return;
+			}
 
-					const extractStream = x({
-						cwd: outputBinDir,
-						strip: 1,
-						filter: path => path === `package/bin/${binName}`,
-					});
+			if (!isSuccess) {
+				reject(new Error(`Failed to download binary: ${res.statusCode?.toString() ?? 'Unknown'}`));
+				return;
+			}
 
-					pipeline(res, extractStream).then(resolve)
-						.catch(reject);
-				}).on('error', reject);
+			const extractStream = x({
+				cwd: outputBinDir,
+				strip: 1,
+				filter: path => path === `package/bin/${binName}`,
 			});
 
+			pipeline(res, extractStream).then(resolve)
+				.catch(reject);
+		}).on('error', reject);
+	});
+};
+
+/**
+ * @param {string} tarballUrl
+ * @param {string} binName
+ * @param {string} outputBinDir
+ */
+const downloadAndExtract = async (
+	tarballUrl, binName, outputBinDir,
+) => {
+	for (let attempt = 1; attempt <= maxRetries; attempt++) {
+		try {
+			await tryDownloadAndExtract(
+				tarballUrl, binName, outputBinDir,
+			);
 			return;
-		} catch (e) {
-			if (i < 2) {
-				console.warn(`Download failed, retrying...`);
+		} catch (error) {
+			if (attempt < maxRetries) {
+				const delay = initialBackoffMs * 2 ** (attempt - 1);
+				console.warn(`Download failed (attempt ${attempt.toString()}), retrying in ${delay.toString()}ms...`);
 			} else {
-				throw e;
+				throw error;
 			}
 		}
 	}
@@ -63,15 +83,16 @@ export const loadMissingBinary = async (
 	binName, targetPackage, outputBinDir,
 ) => {
 	const fullTargetPackageName = `@package-pal/${targetPackage}`;
-	// @ts-expect-error unknown key
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-	const targetPackageVersion = packageJson.optionalDependencies[fullTargetPackageName];
+	/** @type {Record<string, string>} */
+	const optionalDeps = packageJson.optionalDependencies;
+	const targetPackageVersion = optionalDeps[fullTargetPackageName];
+
 	if (!targetPackageVersion) {
 		throw new Error(`No version found for target package '${fullTargetPackageName}'.`);
 	}
 
-	const tarballUrl = `https://registry.npmjs.org/${fullTargetPackageName}/-/${fullTargetPackageName.replace('@', '').replace('/', '-')}-${String(targetPackageVersion)}.tgz`;
-	console.log(`Downloading '${fullTargetPackageName}' from ${tarballUrl}...`);
+	const tarballUrl = `https://registry.npmjs.org/${fullTargetPackageName}/-/${targetPackage}-${targetPackageVersion}.tgz`;
+	console.log(`Downloading '${fullTargetPackageName}' into '${outputBinDir}' from ${tarballUrl}...`);
 
 	await downloadAndExtract(
 		tarballUrl, binName, outputBinDir,