chofex-cli 0.1.146 → 0.1.147

package/dist/index.js

@@ -59464,7 +59464,9 @@ If the browser did not open automatically, open that URL yourself.`);
       redirect_uri: redirectUri,
       code_verifier: verifier
     });
-    await saveCredentials(credentialsFromToken(body));
+    const credentials = credentialsFromToken(body);
+    await saveCredentials(credentials);
+    return credentials.accessToken;
   } finally {
     clearTimeout(timeout3);
     server.close();
@@ -62460,7 +62462,7 @@ var uploadPicture = exports_Effect.fn("uploadPicture")(function* (options, path4
 import { spawn as spawn3 } from "node:child_process";
 import { mkdtemp as mkdtemp2, rm as rm2 } from "node:fs/promises";
 import { tmpdir as tmpdir2 } from "node:os";
-import { join as join3 } from "node:path";
+import { dirname as dirname2, join as join3 } from "node:path";
 var cliPackageName = "chofex-cli";
 var upgradeVersion = "latest";
 var npmUpgradeArguments = (cacheDirectory) => [
@@ -62471,31 +62473,81 @@ var npmUpgradeArguments = (cacheDirectory) => [
   "--prefer-online",
   `--cache=${cacheDirectory}`
 ];
-var runNpm = (arguments_) => new Promise((resolve4, reject) => {
-  const executable = process.platform === "win32" ? "npm.cmd" : "npm";
+var runProcess = (executable, arguments_, input) => new Promise((resolve4, reject) => {
+  const stdin = input === undefined ? "ignore" : "pipe";
   const child = spawn3(executable, arguments_, {
-    stdio: ["ignore", "ignore", "pipe"]
+    stdio: [stdin, "ignore", "pipe"]
   });
   let stderr = "";
-  child.stderr.setEncoding("utf8");
-  child.stderr.on("data", (chunk) => {
+  const stderrStream = child.stderr;
+  if (stderrStream === null) {
+    child.kill();
+    reject(new Error(`Could not capture stderr from ${executable}`));
+    return;
+  }
+  stderrStream.setEncoding("utf8");
+  stderrStream.on("data", (chunk) => {
     stderr += chunk;
   });
   child.on("error", reject);
   child.on("close", (exitCode) => {
     resolve4({ exitCode: exitCode ?? 1, stderr: stderr.trim() });
   });
+  if (input !== undefined) {
+    const stdinStream = child.stdin;
+    if (stdinStream === null) {
+      child.kill();
+      reject(new Error(`Could not send input to ${executable}`));
+      return;
+    }
+    stdinStream.end(input);
+  }
 });
-var upgradeCli = async (runner = runNpm) => {
+var runNpm = (arguments_) => {
+  const executable = process.platform === "win32" ? "npm.cmd" : "npm";
+  return runProcess(executable, arguments_);
+};
+var installerUrl = "https://hacktheandes.com/install";
+var runInstaller = async (installDirectory) => {
+  const response = await fetch(installerUrl);
+  if (!response.ok) {
+    throw new Error(`installer download returned HTTP ${response.status}`);
+  }
+  const script = await response.text();
+  const arguments_ = [
+    "-s",
+    "--",
+    "--install-dir",
+    installDirectory,
+    "--no-modify-path"
+  ];
+  if (process.platform === "win32") {
+    arguments_.push("--defer-until-pid", String(process.pid));
+  }
+  return runProcess("bash", arguments_, script);
+};
+var isStandaloneExecutable = () => typeof Bun !== "undefined" && Bun.isStandaloneExecutable;
+var assertSuccessful = (result3, program) => {
+  if (result3.exitCode === 0)
+    return;
+  let detail = "";
+  if (result3.stderr)
+    detail = `: ${result3.stderr}`;
+  throw new Error(`${program} exited with code ${result3.exitCode}${detail}`);
+};
+var upgradeCli = async (options = {}) => {
+  const standalone = options.standalone ?? isStandaloneExecutable();
+  if (standalone) {
+    const runner2 = options.installerRunner ?? runInstaller;
+    const result3 = await runner2(dirname2(process.execPath));
+    assertSuccessful(result3, "installer");
+    return;
+  }
+  const runner = options.npmRunner ?? runNpm;
   const cacheDirectory = await mkdtemp2(join3(tmpdir2(), "chofex-npm-cache-"));
   try {
     const result3 = await runner(npmUpgradeArguments(cacheDirectory));
-    if (result3.exitCode === 0)
-      return;
-    let detail = "";
-    if (result3.stderr)
-      detail = `: ${result3.stderr}`;
-    throw new Error(`npm exited with code ${result3.exitCode}${detail}`);
+    assertSuccessful(result3, "npm");
   } finally {
     await rm2(cacheDirectory, { recursive: true, force: true });
   }
@@ -62633,17 +62685,18 @@ var confirmCommand = exports_Command.make("confirm", {
 ]));
 var loginCommand = exports_Command.make("login", {}, exports_Effect.fn("loginCommand")(function* () {
   const options = yield* root;
-  const operation = exports_Effect.tryPromise({
-    try: async () => {
-      await login();
-      return {
-        version: 1,
-        ok: true,
-        requestId: crypto.randomUUID(),
-        data: { authenticated: true }
-      };
-    },
-    catch: (error2) => cliError("LOGIN_FAILED", String(error2))
+  const operation = exports_Effect.gen(function* () {
+    const token = yield* exports_Effect.tryPromise({
+      try: () => login(),
+      catch: (error2) => cliError("LOGIN_FAILED", String(error2))
+    });
+    yield* getCurrentUser({ apiUrl: options.apiUrl, token }).pipe(exports_Effect.catch(() => exports_Effect.succeed(undefined)));
+    return {
+      version: 1,
+      ok: true,
+      requestId: crypto.randomUUID(),
+      data: { authenticated: true }
+    };
   });
   yield* execute(options.output, operation, () => "Signed in successfully.");
 })).pipe(exports_Command.withDescription("Sign in through Clerk OAuth in your browser"));
@@ -62693,7 +62746,7 @@ var makeUpgradeCommand = (name) => exports_Command.make(name, {}, exports_Effect
         }
       };
     },
-    catch: (error2) => cliError("UPGRADE_FAILED", `npm could not update ${cliPackageName}`, false, String(error2))
+    catch: (error2) => cliError("UPGRADE_FAILED", `Could not update ${cliPackageName}`, false, String(error2))
   });
   yield* execute(options.output, operation, () => `Updated ${cliPackageName} to the ${upgradeVersion} version.`);
 })).pipe(exports_Command.withDescription("Update chofex-cli to the latest version"));
@@ -62929,8 +62982,13 @@ ${shortcuts.flatMap((line) => wrap(line, width)).join(`
 };
 
 // src/index.ts
-var packageMetadata = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8"));
-var cliVersion = packageMetadata.version;
+var readCliVersion = () => {
+  if (typeof CHOFEX_VERSION !== "undefined")
+    return CHOFEX_VERSION;
+  const packageMetadata = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8"));
+  return packageMetadata.version;
+};
+var cliVersion = readCliVersion();
 var arguments_ = process.argv.slice(2);
 var jsonOutputRequested = (arguments_2) => {
   if (arguments_2.includes("--output=json"))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chofex-cli",
-  "version": "0.1.146",
+  "version": "0.1.147",
   "description": "Command-line client for Hack the Andes",
   "type": "module",
   "bin": {