@package-pal/cli 0.0.18 → 0.0.20

package/bin/ppal

@@ -1,16 +1,47 @@
 #!/usr/bin/env node
 
 // Fallback, if post-install script did not execute.
-// Requires more overhead due to launching Node process which then launches the CLI process.
+// Adds more overhead due to launching a Node process which launches the CLI process.
 
 import { getPathInfo } from '../src/lib/install/functions/get-path-info.js';
 import { getPlatformInfo } from '../src/lib/install/functions/get-platform-info.js';
+import { join } from 'path';
+import { existsSync, mkdirSync, rmSync } from 'fs';
+import { loadMissingBinary } from '../src/lib/install/functions/load-missing-binary.js';
 
-const {
-	platform, targetPackage,
-} = getPlatformInfo();
-const { targetBinPath } = getPathInfo({ platform, targetPackage });
 
-require('child_process').execFileSync(targetBinPath, process.argv.slice(2), {
-	stdio: 'inherit',
-})
+/**
+ * @param binPath {string}
+ */
+const exec = (binPath) => {
+	require('child_process').execFileSync(binPath, process.argv.slice(2), {
+		stdio: 'inherit',
+	})
+}
+
+async function main() {
+	const {
+		platform, targetPackage
+	} = getPlatformInfo();
+	const { targetBinPath, binExecutableName, outputBinDir } = getPathInfo({ platform, targetPackage });
+	const binarySourceDir = join(outputBinDir, 'source');
+
+	if (targetBinPath) {
+		rmSync(binarySourceDir, { force: true, recursive: true });
+		return exec(targetBinPath);
+	}
+
+	const prevDownloadedBinPath = join(binarySourceDir, binExecutableName);
+	if (!existsSync(prevDownloadedBinPath)) {
+		rmSync(binarySourceDir, { force: true, recursive: true });
+		mkdirSync(binarySourceDir, { recursive: true });
+		await loadMissingBinary({binExecutableName, targetPackage, outputBinDir: binarySourceDir});
+	}
+
+	exec(targetBinPath);
+}
+
+main().catch((err) => {
+	console.error(err);
+	process.exit(1);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@package-pal/cli",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "CLI tool exposing core PackagePal functionality.",
   "keywords": [
     "package",
@@ -33,6 +33,9 @@
     "@package-pal/cli-darwin-x64": "0.0.2",
     "@package-pal/cli-windows-x64": "0.0.2"
   },
+  "engines": {
+    "node": ">=18"
+  },
   "bin": {
     "ppal": "bin/ppal"
   },

package/src/lib/install/functions/link-existing-binary.js

@@ -3,10 +3,10 @@ import {
 } from 'fs';
 
 /**
- * @param {{ platform: Bun.Platform, binExecutableName: string, targetBinPath: string, outputBinBasePath: string, outputBinPath: string }} options
+ * @param {{ platform: Bun.Platform, targetBinPath: string, outputBinPath: string }} options
  */
 export const linkExistingBinary = ({
-	platform, binExecutableName, targetBinPath, outputBinBasePath, outputBinPath,
+	platform, targetBinPath, outputBinPath,
 }) => {
 	const isWin = platform === 'win32';
 

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

@@ -5,7 +5,7 @@ import { pipeline } from 'stream/promises';
 import { x } from 'tar';
 import packageJson from '../../../../package.json' with { type: 'json' };
 
-const maxRetries = 3;
+const maxAttempts = 5;
 const initialBackoffMs = 500;
 
 /**
@@ -60,14 +60,14 @@ const tryDownloadAndExtract = (
 const downloadAndExtract = async (
 	tarballUrl, binExecutableName, outputBinDir,
 ) => {
-	for (let attempt = 1; attempt <= maxRetries; attempt++) {
+	for (let attempt = 1; attempt <= maxAttempts; attempt++) {
 		try {
 			await tryDownloadAndExtract(
 				tarballUrl, binExecutableName, outputBinDir,
 			);
 			return;
 		} catch (error) {
-			if (attempt < maxRetries) {
+			if (attempt < maxAttempts) {
 				const delay = initialBackoffMs * 2 ** (attempt - 1);
 				console.warn(`Download failed (attempt ${attempt.toString()}), retrying in ${delay.toString()}ms...`);
 			} else {

package/src/lib/install/functions/prepare-binary.js

@@ -1,5 +1,6 @@
-import { mkdirSync } from 'fs';
-import { clearPlaceholderBinary } from './clear-placeholder-binary.js';
+import {
+	mkdirSync, rmSync,
+} from 'fs';
 import { linkExistingBinary } from './link-existing-binary.js';
 import { loadMissingBinary } from './load-missing-binary.js';
 
@@ -9,19 +10,15 @@ import { loadMissingBinary } from './load-missing-binary.js';
 export const prepareBinary = ({
 	platform, binExecutableName, targetPackage, targetBinPath, outputBinDir, outputBinBasePath, outputBinPath,
 }) => {
-	clearPlaceholderBinary({
-		platform,
-		outputBinBasePath,
-	});
+	rmSync(outputBinBasePath, { force: true });
+	rmSync(outputBinPath, { force: true });
 	mkdirSync(outputBinDir, { recursive: true });
 
 	if (targetBinPath) {
 		console.info(`Expected CLI binary package is available in '${targetBinPath}'.`);
 		linkExistingBinary({
 			platform,
-			binExecutableName,
 			targetBinPath,
-			outputBinBasePath,
 			outputBinPath,
 		});
 		return Promise.resolve();

package/src/lib/install/functions/clear-placeholder-binary.js

@@ -1,17 +0,0 @@
-import { rmSync } from 'fs';
-
-/**
- * @param {{ platform: Bun.Platform, outputBinBasePath: string }} options
- */
-export const clearPlaceholderBinary = ({
-	platform, outputBinBasePath,
-}) => {
-	console.info(`Clearing '${outputBinBasePath}' files.`);
-
-	rmSync(outputBinBasePath, { force: true });
-
-	if (platform === 'win32') {
-		rmSync(`${outputBinBasePath}.exe`, { force: true });
-		rmSync(`${outputBinBasePath}.cmd`, { force: true });
-	}
-};