@mutmutco/installer-launcher 1.1.0 → 1.2.0

package/dist/launcher.js

@@ -676,7 +676,7 @@ async function installAcquisition(dir, candidate, version, acquisition, options)
 }
 
 // src/index.ts
-import { spawn as spawn2, spawnSync as spawnSync3 } from "node:child_process";
+import { spawn as spawn2, spawnSync as spawnSync4 } from "node:child_process";
 import { existsSync as existsSync8, readFileSync as readFileSync8, statSync, mkdtempSync as mkdtempSync2, unlinkSync as unlinkSync2, rmdirSync, mkdirSync as mkdirSync6, renameSync as renameSync5, rmSync as rmSync6, writeFileSync as writeFileSync8 } from "node:fs";
 import { tmpdir as tmpdir4 } from "node:os";
 import { dirname as dirname4, join as join7, resolve as resolve2 } from "node:path";
@@ -1898,7 +1898,7 @@ async function refreshLauncher(target, options = {}) {
 }
 
 // src/login-github.ts
-import { spawn } from "node:child_process";
+import { spawn, spawnSync as spawnSync3 } from "node:child_process";
 var realSleep = (ms) => new Promise((resolve3) => setTimeout(resolve3, ms));
 function openBrowser(url) {
   if (process.env.LAUNCHER_NO_OPEN === "1") return;
@@ -2015,7 +2015,33 @@ async function refreshAccessToken(config, refreshToken, fetchImpl = fetch) {
   if (typeof data.access_token !== "string" || typeof data.expires_in !== "number") {
     throw new Error("the sign-in server returned a malformed refresh");
   }
-  return { accessToken: data.access_token, expiresIn: data.expires_in };
+  return {
+    accessToken: data.access_token,
+    expiresIn: data.expires_in,
+    ...typeof data.refresh_token === "string" ? { refreshToken: data.refresh_token } : {}
+  };
+}
+function readGhToken() {
+  try {
+    const result = spawnSync3("gh", ["auth", "token", "--hostname", "github.com"], { encoding: "utf8", timeout: 1e4, windowsHide: true });
+    const token = result.status === 0 ? String(result.stdout).trim() : "";
+    return token && !/\s/u.test(token) ? token : null;
+  } catch {
+    return null;
+  }
+}
+async function loginWithGhToken(config, fetchImpl = fetch, readToken = readGhToken) {
+  const token = readToken();
+  if (!token) return null;
+  try {
+    const response = await postJson(`${config.host}/gate/github-token`, { token }, fetchImpl);
+    if (!response.ok) return null;
+    const data = await response.json();
+    if (typeof data.access_token !== "string" || typeof data.refresh_token !== "string" || typeof data.expires_in !== "number") return null;
+    return { accessToken: data.access_token, refreshToken: data.refresh_token, expiresIn: data.expires_in };
+  } catch {
+    return null;
+  }
 }
 
 // src/login-google.ts
@@ -2132,7 +2158,7 @@ function page(title, body) {
 }
 
 // src/index.ts
-var LAUNCHER_VERSION = true ? "1.1.0" : readVersionFromPackage();
+var LAUNCHER_VERSION = true ? "1.2.0" : readVersionFromPackage();
 function defaultPrint(message) {
   process.stdout.write(`${message}
 `);
@@ -2368,7 +2394,7 @@ async function ensureFreshToken(config, dir, fetchImpl = fetch) {
     }
     writeTokens(dir, {
       accessToken: refreshed2.accessToken,
-      refreshToken: stored.refreshToken,
+      refreshToken: refreshed2.refreshToken ?? stored.refreshToken,
       expiresAt: Date.now() + refreshed2.expiresIn * 1e3
     });
     return refreshed2.accessToken;
@@ -2423,6 +2449,13 @@ async function fetchAccessTokenOrLogin(config, dir, options, installer) {
   const fetchImpl = options.fetchImpl ?? fetch;
   const fresh = await ensureFreshToken(config, dir, fetchImpl);
   if (fresh) return fresh;
+  if (config.loginKind === "github") {
+    const reused = await loginWithGhToken(config, fetchImpl, options.readGhToken ?? (isSea() ? readGhToken : () => null));
+    if (reused) {
+      writeTokens(dir, { accessToken: reused.accessToken, refreshToken: reused.refreshToken, expiresAt: Date.now() + reused.expiresIn * 1e3 });
+      return reused.accessToken;
+    }
+  }
   await doLogin(config, dir, options, (line) => installer.relay(line), installer);
   const after = readTokens(dir);
   if (!after) throw new Error("sign-in did not produce a token");
@@ -2501,7 +2534,7 @@ function defaultRunEntry(entry2, cwd, env) {
   const [command2, ...args] = entry2;
   const shell = needsShell(command2);
   const commandLine = shell ? [command2, ...args].map(quoteForShell).join(" ") : command2;
-  const spawnEntry = (progress2) => spawnSync3(commandLine, shell ? [] : args, {
+  const spawnEntry = (progress2) => spawnSync4(commandLine, shell ? [] : args, {
     cwd,
     stdio: progress2 ? ["inherit", "inherit", "inherit", "pipe"] : "inherit",
     shell,

package/dist/launcher.sea.cjs

@@ -2049,7 +2049,33 @@ async function refreshAccessToken(config, refreshToken, fetchImpl = fetch) {
   if (typeof data.access_token !== "string" || typeof data.expires_in !== "number") {
     throw new Error("the sign-in server returned a malformed refresh");
   }
-  return { accessToken: data.access_token, expiresIn: data.expires_in };
+  return {
+    accessToken: data.access_token,
+    expiresIn: data.expires_in,
+    ...typeof data.refresh_token === "string" ? { refreshToken: data.refresh_token } : {}
+  };
+}
+function readGhToken() {
+  try {
+    const result = (0, import_node_child_process5.spawnSync)("gh", ["auth", "token", "--hostname", "github.com"], { encoding: "utf8", timeout: 1e4, windowsHide: true });
+    const token = result.status === 0 ? String(result.stdout).trim() : "";
+    return token && !/\s/u.test(token) ? token : null;
+  } catch {
+    return null;
+  }
+}
+async function loginWithGhToken(config, fetchImpl = fetch, readToken = readGhToken) {
+  const token = readToken();
+  if (!token) return null;
+  try {
+    const response = await postJson(`${config.host}/gate/github-token`, { token }, fetchImpl);
+    if (!response.ok) return null;
+    const data = await response.json();
+    if (typeof data.access_token !== "string" || typeof data.refresh_token !== "string" || typeof data.expires_in !== "number") return null;
+    return { accessToken: data.access_token, refreshToken: data.refresh_token, expiresIn: data.expires_in };
+  } catch {
+    return null;
+  }
 }
 
 // src/login-google.ts
@@ -2166,7 +2192,7 @@ function page(title, body) {
 }
 
 // src/index.ts
-var LAUNCHER_VERSION = true ? "1.1.0" : readVersionFromPackage();
+var LAUNCHER_VERSION = true ? "1.2.0" : readVersionFromPackage();
 function defaultPrint(message) {
   process.stdout.write(`${message}
 `);
@@ -2402,7 +2428,7 @@ async function ensureFreshToken(config, dir, fetchImpl = fetch) {
     }
     writeTokens(dir, {
       accessToken: refreshed2.accessToken,
-      refreshToken: stored.refreshToken,
+      refreshToken: refreshed2.refreshToken ?? stored.refreshToken,
       expiresAt: Date.now() + refreshed2.expiresIn * 1e3
     });
     return refreshed2.accessToken;
@@ -2457,6 +2483,13 @@ async function fetchAccessTokenOrLogin(config, dir, options, installer) {
   const fetchImpl = options.fetchImpl ?? fetch;
   const fresh = await ensureFreshToken(config, dir, fetchImpl);
   if (fresh) return fresh;
+  if (config.loginKind === "github") {
+    const reused = await loginWithGhToken(config, fetchImpl, options.readGhToken ?? ((0, import_node_sea2.isSea)() ? readGhToken : () => null));
+    if (reused) {
+      writeTokens(dir, { accessToken: reused.accessToken, refreshToken: reused.refreshToken, expiresAt: Date.now() + reused.expiresIn * 1e3 });
+      return reused.accessToken;
+    }
+  }
   await doLogin(config, dir, options, (line) => installer.relay(line), installer);
   const after = readTokens(dir);
   if (!after) throw new Error("sign-in did not produce a token");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/installer-launcher",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Single-executable (SEA) launcher: sign-in, gated payload fetch, self-update. One copy ships per product.",
   "type": "module",
   "license": "UNLICENSED",