@eggplanty/mycli 0.1.22 → 0.1.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eggplanty/mycli",
-  "version": "0.1.22",
+  "version": "0.1.23",
   "description": "A simple CLI demo built with Go",
   "bin": {
     "mycli": "scripts/run.js"

package/scripts/install.js

@@ -32,53 +32,110 @@ if (!platform || !arch) {
 const isWindows = process.platform === "win32";
 const ext = isWindows ? ".zip" : ".tar.gz";
 const archiveName = `${NAME}-${VERSION}-${platform}-${arch}${ext}`;
-const url = `https://github.com/${REPO}/releases/download/v${VERSION}/${archiveName}`;
 const token = process.env.MYCLI_TOKEN || "";
 const binDir = path.join(__dirname, "..", "bin");
 const dest = path.join(binDir, NAME + (isWindows ? ".exe" : ""));
 
 fs.mkdirSync(binDir, { recursive: true });
 
-function download(url, destPath, useAuth = true) {
+function httpGet(url, headers = {}) {
   return new Promise((resolve, reject) => {
     const parsed = new URL(url);
     const client = parsed.protocol === "https:" ? https : require("http");
-    const headers = {};
-    if (token && useAuth) {
-      headers["Authorization"] = `token ${token}`;
-      headers["Accept"] = "application/octet-stream";
-    }
     client
-      .get({ hostname: parsed.hostname, path: parsed.pathname + parsed.search, headers }, (res) => {
-        if (res.statusCode === 302 || res.statusCode === 301) {
-          // Do not send auth token to redirected hosts (e.g. S3)
-          return download(res.headers.location, destPath, false).then(
-            resolve,
-            reject
-          );
-        }
-        if (res.statusCode !== 200) {
-          return reject(
-            new Error(`Download failed with status ${res.statusCode}: ${url}`)
-          );
-        }
-        const file = fs.createWriteStream(destPath);
-        res.pipe(file);
-        file.on("finish", () => {
-          file.close();
-          resolve();
-        });
-      })
+      .get(
+        {
+          hostname: parsed.hostname,
+          path: parsed.pathname + parsed.search,
+          headers: { "User-Agent": "mycli-installer", ...headers },
+        },
+        (res) => resolve(res)
+      )
       .on("error", reject);
   });
 }
 
+function downloadToFile(url, destPath, headers = {}) {
+  return new Promise(async (resolve, reject) => {
+    try {
+      const res = await httpGet(url, headers);
+      if (res.statusCode === 302 || res.statusCode === 301) {
+        // Do not send auth token to redirected hosts (e.g. S3)
+        return downloadToFile(res.headers.location, destPath).then(
+          resolve,
+          reject
+        );
+      }
+      if (res.statusCode !== 200) {
+        return reject(
+          new Error(`Download failed with status ${res.statusCode}: ${url}`)
+        );
+      }
+      const file = fs.createWriteStream(destPath);
+      res.pipe(file);
+      file.on("finish", () => {
+        file.close();
+        resolve();
+      });
+    } catch (err) {
+      reject(err);
+    }
+  });
+}
+
+async function getAssetDownloadUrl() {
+  if (!token) {
+    // No token, use public download URL directly
+    return `https://github.com/${REPO}/releases/download/v${VERSION}/${archiveName}`;
+  }
+
+  // For private repos, use GitHub API to find the asset and get its download URL
+  const apiUrl = `https://api.github.com/repos/${REPO}/releases/tags/v${VERSION}`;
+  const res = await httpGet(apiUrl, {
+    Authorization: `token ${token}`,
+    Accept: "application/vnd.github.v3+json",
+  });
+
+  if (res.statusCode !== 200) {
+    throw new Error(
+      `Failed to fetch release info (status ${res.statusCode}). Check that the token is valid and the release v${VERSION} exists.`
+    );
+  }
+
+  const body = await new Promise((resolve, reject) => {
+    let data = "";
+    res.on("data", (chunk) => (data += chunk));
+    res.on("end", () => resolve(data));
+    res.on("error", reject);
+  });
+
+  const release = JSON.parse(body);
+  const asset = release.assets.find((a) => a.name === archiveName);
+  if (!asset) {
+    const available = release.assets.map((a) => a.name).join(", ");
+    throw new Error(
+      `Asset "${archiveName}" not found in release v${VERSION}. Available assets: ${available || "(none)"}`
+    );
+  }
+
+  // Return the API URL for downloading the asset
+  return asset.url;
+}
+
 async function install() {
   const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "mycli-"));
   const archivePath = path.join(tmpDir, archiveName);
 
   try {
-    await download(url, archivePath);
+    const downloadUrl = await getAssetDownloadUrl();
+
+    const headers = {};
+    if (token && downloadUrl.includes("api.github.com")) {
+      headers["Authorization"] = `token ${token}`;
+      headers["Accept"] = "application/octet-stream";
+    }
+
+    await downloadToFile(downloadUrl, archivePath, headers);
 
     if (isWindows) {
       execSync(