@aptos-labs/aptos-cli 0.0.10 → 0.0.11

package/bin/aptos

@@ -1,10 +1,11 @@
 #!/usr/bin/env node
 
-const https = require("https");
+const { spawn } = require("child_process");
 const fs = require("fs");
 const os = require("os");
-const path = require("path");
-const { spawn, spawnSync } = require("child_process");
+
+const PNAME = "aptos-cli";
+const VERSION = "2.0.2";
 
 // Get all arguments passed to the script
 const getOS = () => {
@@ -21,159 +22,48 @@ const getOS = () => {
   }
 };
 
-const PNAME = "aptos-cli";
-const VERSION = "2.0.2";
-const currentOS = getOS();
-const url = `https://github.com/aptos-labs/aptos-core/releases/download/${PNAME}-v${VERSION}/${PNAME}-${VERSION}-${currentOS}-x86_64.zip`;
-
-// Determine the appropriate unzip command based on the operating system
-const unzipCommand =
-  process.platform === "win32"
-    ? 'powershell -Command "Expand-Archive"'
-    : "unzip";
-
-// Define the path to the zip file and the destination directory
-const zipFileName = path.basename(url);
-const binaryName = `${PNAME}-${VERSION}-${currentOS}`;
-const tmpDir = path.join(__dirname, "tmp");
-
-// Ensure the destination directory exists
-if (!fs.existsSync(tmpDir)) {
-  fs.mkdirSync(tmpDir, { recursive: true });
-}
+const main = async () => {
+  const os = getOS();
+  const binaryName = `${PNAME}-${VERSION}-${os}`;
 
-async function downloadBinary(url) {
-  await new Promise((resolve, reject) => {
-    https.get(url, (response) => {
-      if (response.statusCode === 302 && response.headers.location) {
-        // If it's a redirect, follow the new location and download from there
-        resolve(downloadBinary(response.headers.location));
-      } else if (response.statusCode === 200) {
-        // Pipe the response to a writable stream to save the zip file
-        const writeStream = fs.createWriteStream(
-          path.join(tmpDir, zipFileName)
+  // If binary does not exist, download it
+  if (!fs.existsSync(`${__dirname}/${binaryName}`)) {
+    await new Promise((resolve, reject) => {
+      const url = `https://github.com/aptos-labs/aptos-core/releases/download/${PNAME}-v${VERSION}/${PNAME}-${VERSION}-${os}-x86_64.zip`;
+      console.log("Downloading aptos CLI...");
+      let downloadProcess;
+      if (os === "Windows") {
+        downloadProcess = spawn(
+          `curl -L -o C:/tmp/aptos.zip ${url} & powershell Expand-Archive -Path C:/tmp/aptos.zip -DestinationPath C:/tmp -Force & move C:/tmp/aptos ${__dirname}/${binaryName}`,
+          {
+            stdio: "inherit",
+            shell: true,
+          }
         );
-        response.pipe(writeStream);
-
-        writeStream.on("finish", () => {
-          console.log(`File "${zipFileName}" downloaded successfully.`);
-
-          // Unzip the downloaded zip file
-          const unzipProcess = spawn(unzipCommand, [
-            path.join(tmpDir, zipFileName),
-            "-d",
-            tmpDir,
-          ]);
-
-          unzipProcess.on("close", (code) => {
-            if (code === 0) {
-              console.log(`File "${zipFileName}" unzipped successfully.`);
-
-              // Copy the unzipped files to the current working directory
-              const sourceDir = path.join(tmpDir, "aptos");
-
-              fs.renameSync(sourceDir, `${__dirname}/${binaryName}`);
-
-              console.log(`Files copied to current working directory.`);
-
-              // Remove the temporary directory
-              fs.rmSync(tmpDir, { recursive: true });
-
-              resolve();
-            } else {
-              console.error(`Failed to unzip file: ${code}`);
-            }
-          });
-        });
       } else {
-        console.error(
-          `Failed to download file: ${response.statusCode} ${response.statusMessage}`
+        downloadProcess = spawn(
+          `curl -L -o /tmp/aptos.zip ${url}; unzip -o -q /tmp/aptos.zip -d /tmp; mv /tmp/aptos ${__dirname}/${binaryName};`,
+          {
+            stdio: "inherit",
+            shell: true,
+          }
         );
-        reject("Error occurred while downloading aptos CLI");
       }
-    });
-  });
-}
 
-const main = async () => {
-  if (!fs.existsSync(`${__dirname}/${binaryName}`)) {
-    await downloadBinary(url);
+      downloadProcess.on("close", (code) => {
+        if (code !== 0) {
+          reject("Error occurred while downloading aptos CLI");
+        }
+        console.log("Download complete");
+        resolve();
+      });
+    });
   }
+
   // Spawn a child process to execute the binary with the provided arguments
-  spawnSync(`${__dirname}/${binaryName}`, process.argv.slice(2), {
+  spawn(`${__dirname}/${binaryName}`, process.argv.slice(2), {
     stdio: "inherit",
   });
-  process.exit(0);
 };
 
 main().catch(console.error);
-
-//////////////////////
-
-// const { spawn } = require("child_process");
-// const fs = require("fs");
-// const os = require("os");
-
-// const PNAME = "aptos-cli";
-// const VERSION = "2.0.2";
-
-// // Get all arguments passed to the script
-// const getOS = () => {
-//   const platform = os.platform();
-//   switch (platform) {
-//     case "darwin":
-//       return "MacOSX";
-//     case "linux":
-//       return "Ubuntu";
-//     case "win32":
-//       return "Windows";
-//     default:
-//       throw new Error(`Unsupported OS ${platform}`);
-//   }
-// };
-
-// const main = async () => {
-//   const os = getOS();
-//   const binaryName = `${PNAME}-${VERSION}-${os}`;
-
-//   // If binary does not exist, download it
-//   if (!fs.existsSync(`${__dirname}/${binaryName}`)) {
-//     await new Promise((resolve, reject) => {
-//       const url = `https://github.com/aptos-labs/aptos-core/releases/download/${PNAME}-v${VERSION}/${PNAME}-${VERSION}-${os}-x86_64.zip`;
-//       console.log("Downloading aptos CLI...");
-//       let downloadProcess;
-//       if (os === "Windows") {
-//         downloadProcess = spawn(
-//           `curl -o C:\\tmp\\aptos.zip ${url} && powershell -Command "Expand-Archive -Path C:\\tmp\\aptos.zip -DestinationPath C:\\tmp -Force" && move C:\\tmp\\aptos ${__dirname}\\${binaryName}`,
-//           {
-//             stdio: "inherit",
-//             shell: true,
-//           }
-//         );
-//       } else {
-//         downloadProcess = spawn(
-//           `curl -L -o /tmp/aptos.zip ${url}; unzip -o -q /tmp/aptos.zip -d /tmp; mv /tmp/aptos ${__dirname}/${binaryName};`,
-//           {
-//             stdio: "inherit",
-//             shell: true,
-//           }
-//         );
-//       }
-
-//       downloadProcess.on("close", (code) => {
-//         if (code !== 0) {
-//           reject("Error occurred while downloading aptos CLI");
-//         }
-//         console.log("Download complete");
-//         resolve();
-//       });
-//     });
-//   }
-
-//   // Spawn a child process to execute the binary with the provided arguments
-//   spawn(`${__dirname}/${binaryName}`, process.argv.slice(2), {
-//     stdio: "inherit",
-//   });
-// };
-
-// main().catch(console.error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-labs/aptos-cli",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "Aptos CLI available from npmjs",
   "bin": {
     "aptos": "bin/aptos"