@raegent/earshot 0.3.0 → 0.3.1

package/dist/main.js

@@ -18381,7 +18381,7 @@ class ShadowGit {
 }
 
 // packages/core/src/version.ts
-var VERSION = "0.3.0";
+var VERSION = "0.3.1";
 
 // packages/core/src/session/repair.ts
 var REPAIR_TEXT = "No result was recorded for this call: earshot exited before the tool finished. " + "The call may or may not have run, so treat its effect as unknown and check " + "the current state rather than assuming either outcome.";
@@ -22757,23 +22757,38 @@ function compareVersions(a, b) {
     return -1;
   return left.pre < right.pre ? -1 : 1;
 }
-async function resolveLatest(kind, fetchImpl) {
-  if (kind === "npm") {
-    const response2 = await fetchImpl(REGISTRY);
-    if (!response2.ok)
-      throw new Error(`npm registry returned ${response2.status}`);
-    const body2 = await response2.json();
-    if (!body2.version)
-      throw new Error("npm registry returned no version");
-    return body2.version;
-  }
-  const response = await fetchImpl(RELEASE);
+function releaseAuth(env) {
+  const token = env.EARSHOT_GITHUB_TOKEN ?? env.GITHUB_TOKEN ?? env.GH_TOKEN;
+  return token ? { headers: { authorization: `Bearer ${token}` } } : {};
+}
+function releaseNotFound(env) {
+  return releaseAuth(env).headers === undefined ? "GitHub returned 404. The releases are not public, so this needs a token: " + "set GITHUB_TOKEN (or GH_TOKEN) to one that can read the repository." : "GitHub returned 404 for the token in GITHUB_TOKEN; it may not have access " + "to this repository.";
+}
+async function fetchRelease(fetchImpl, env) {
+  const response = await fetchImpl(RELEASE, releaseAuth(env));
+  if (response.status === 404)
+    throw new Error(releaseNotFound(env));
   if (!response.ok)
     throw new Error(`GitHub releases returned ${response.status}`);
   const body = await response.json();
   if (!body.tag_name)
     throw new Error("GitHub returned a release with no tag");
-  return body.tag_name.replace(/^v/, "");
+  const assets = {};
+  for (const asset of body.assets ?? [])
+    assets[asset.name] = asset.url;
+  return { version: body.tag_name.replace(/^v/, ""), assets };
+}
+async function resolveLatest(kind, fetchImpl, env = process.env) {
+  if (kind === "npm") {
+    const response = await fetchImpl(REGISTRY);
+    if (!response.ok)
+      throw new Error(`npm registry returned ${response.status}`);
+    const body = await response.json();
+    if (!body.version)
+      throw new Error("npm registry returned no version");
+    return body.version;
+  }
+  return (await fetchRelease(fetchImpl, env)).version;
 }
 function findChecksum(sums, asset) {
   for (const line of sums.split(`
@@ -22811,7 +22826,7 @@ async function runUpdate(options = {}) {
     },
     isProjectRoot: (dir) => existsSync2(join19(dir, "package.json"))
   });
-  const fetchImpl = options.fetch ?? ((url) => fetch(url));
+  const fetchImpl = options.fetch ?? ((url, init) => fetch(url, init));
   if (install.kind === "source" || install.kind === "unknown") {
     err(`earshot update: ${install.reason}
 `);
@@ -22826,8 +22841,14 @@ async function runUpdate(options = {}) {
     return 2;
   }
   let latest;
+  let release2;
   try {
-    latest = await resolveLatest(install.kind, fetchImpl);
+    if (install.kind === "binary") {
+      release2 = await fetchRelease(fetchImpl, options.env ?? process.env);
+      latest = release2.version;
+    } else {
+      latest = await resolveLatest(install.kind, fetchImpl, options.env ?? process.env);
+    }
   } catch (error) {
     err(`earshot update: ${error.message}
 `);
@@ -22871,7 +22892,7 @@ async function runUpdate(options = {}) {
 `);
     return 0;
   }
-  return await updateBinary(install, latest, options, out, err);
+  return await updateBinary(install, release2, options, out, err);
 }
 function runCommand2(command, args) {
   const result = spawnSync2(command, args, { stdio: "inherit", windowsHide: true, shell: false });
@@ -22894,11 +22915,12 @@ async function defaultConfirm(question) {
     rl.close();
   }
 }
-async function updateBinary(install, latest, options, out, err) {
+async function updateBinary(install, release2, options, out, err) {
   const target = install.path;
   const asset = install.asset;
   const dir = dirname9(target);
-  const fetchImpl = options.fetch ?? ((url) => fetch(url));
+  const latest = release2.version;
+  const fetchImpl = options.fetch ?? ((url, init) => fetch(url, init));
   await sweepStale(dir, target);
   out(`  ${target}   ${asset}
 `);
@@ -22919,16 +22941,29 @@ async function updateBinary(install, latest, options, out, err) {
 `);
     return 0;
   }
-  const base = `https://github.com/${REPO}/releases/download/v${latest}`;
+  const assetUrl = release2.assets[asset];
+  const sumsUrl = release2.assets.SHA256SUMS;
+  if (assetUrl === undefined || sumsUrl === undefined) {
+    err(`earshot update: release v${latest} does not publish ${assetUrl ? "SHA256SUMS" : asset}
+`);
+    return 1;
+  }
   const temp = join19(dir, `.earshot-update-${process.pid}.tmp`);
   try {
+    const auth2 = releaseAuth(options.env ?? process.env);
+    const octet = {
+      ...auth2,
+      headers: { ...auth2.headers, accept: "application/octet-stream" }
+    };
     out("  downloading… ");
-    const download = await fetchImpl(`${base}/${asset}`);
+    const download = await fetchImpl(assetUrl, octet);
+    if (download.status === 404)
+      throw new Error(releaseNotFound(options.env ?? process.env));
     if (!download.ok)
       throw new Error(`downloading ${asset} returned ${download.status}`);
     const bytes = new Uint8Array(await download.arrayBuffer());
     out("verifying SHA256… ");
-    const sumsResponse = await fetchImpl(`${base}/SHA256SUMS`);
+    const sumsResponse = await fetchImpl(sumsUrl, octet);
     if (!sumsResponse.ok)
       throw new Error(`SHA256SUMS returned ${sumsResponse.status}`);
     const expected = findChecksum(await sumsResponse.text(), asset);
@@ -23068,5 +23103,5 @@ async function main(argv = process.argv.slice(2)) {
 var code = await main();
 process.exitCode = code;
 
-//# debugId=8F9F015F9221906F64756E2164756E21
+//# debugId=6AB54613CF301A9064756E2164756E21
 //# sourceMappingURL=main.js.map