kasy-cli 1.21.7 → 1.21.8

package/lib/scaffold/backends/firebase/setup-from-scratch.js

@@ -19,6 +19,7 @@ const path = require('node:path');
 const fs = require('fs-extra');
 const os = require('node:os');
 const { getInstallGuide } = require('../../../utils/checks');
+const { keytoolBin } = require('../../../utils/env-tools');
 
 const execAsync = promisify(exec);
 
@@ -536,7 +537,7 @@ async function ensureDebugKeystore() {
   if (!(await fs.pathExists(DEBUG_KEYSTORE))) {
     await fs.ensureDir(androidDir);
     const createResult = await run(
-      `keytool -genkeypair -v -keystore "${DEBUG_KEYSTORE}" -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=Android Debug,O=Android,C=US" -noprompt`
+      `${keytoolBin()} -genkeypair -v -keystore "${DEBUG_KEYSTORE}" -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=Android Debug,O=Android,C=US" -noprompt`
     );
     if (!createResult.ok) return { ok: false, error: createResult.stderr || createResult.error };
   }
@@ -552,7 +553,7 @@ async function extractSha1() {
   if (!ensureResult.ok) return ensureResult;
 
   const result = await run(
-    `keytool -list -v -keystore "${DEBUG_KEYSTORE}" -alias androiddebugkey -storepass android -keypass android`
+    `${keytoolBin()} -list -v -keystore "${DEBUG_KEYSTORE}" -alias androiddebugkey -storepass android -keypass android`
   );
   if (!result.ok) return { ok: false, error: result.stderr || result.error };
 

package/lib/scaffold/backends/supabase/deploy.js

@@ -13,16 +13,29 @@ const { exec, execFile } = require('node:child_process');
 const { promisify } = require('node:util');
 const path = require('node:path');
 const fs = require('fs-extra');
+const { augmentedEnv } = require('../../../utils/env-tools');
 
 const execAsync = promisify(exec);
 const execFileAsync = promisify(execFile);
 
+/**
+ * Parse JSON from a CLI's stdout tolerantly. The Supabase CLI sometimes prints
+ * an "update available" notice before the JSON payload (more often on Windows),
+ * which would break a strict JSON.parse — so we grab from the first [ or {.
+ */
+function parseJsonLoose(stdout) {
+  const s = (stdout || '').trim();
+  const start = s.search(/[[{]/);
+  if (start === -1) return null;
+  try { return JSON.parse(s.slice(start)); } catch { return null; }
+}
+
 async function run(cmd, cwd, env = {}) {
   try {
     const { stdout, stderr } = await execAsync(cmd, {
       cwd,
       maxBuffer: 10 * 1024 * 1024,
-      env: { ...process.env, ...env },
+      env: { ...augmentedEnv(), ...env },
     });
     return { ok: true, stdout, stderr };
   } catch (err) {
@@ -40,13 +53,14 @@ async function run(cmd, cwd, env = {}) {
  */
 async function checkLoggedIn() {
   const result = await run('supabase projects list -o json', process.cwd());
-  if (!result.ok) return { ok: false, error: result.error };
-  try {
-    const data = JSON.parse(result.stdout);
-    return { ok: true, projects: Array.isArray(data) ? data : [] };
-  } catch {
+  // Trust the exit code: a successful command means we're authenticated. Only a
+  // non-zero exit (e.g. "Access token not provided") means login is required.
+  // The list itself is parsed best-effort (tolerant of update notices).
+  if (!result.ok) {
     return { ok: false, error: 'Supabase login required. Run: supabase login' };
   }
+  const data = parseJsonLoose(result.stdout);
+  return { ok: true, projects: Array.isArray(data) ? data : [] };
 }
 
 /**
@@ -69,13 +83,9 @@ async function getProjectsByOrg(orgId) {
 async function getOrgsList() {
   const result = await run('supabase orgs list -o json', process.cwd());
   if (!result.ok) return { ok: false, error: result.error };
-  try {
-    const data = JSON.parse(result.stdout);
-    const orgs = Array.isArray(data) ? data : [];
-    return { ok: true, orgs: orgs.map((o) => ({ id: o.id, name: o.name || o.id })) };
-  } catch {
-    return { ok: false, error: 'Could not parse orgs list. Run: supabase login' };
-  }
+  const data = parseJsonLoose(result.stdout);
+  const orgs = Array.isArray(data) ? data : [];
+  return { ok: true, orgs: orgs.map((o) => ({ id: o.id, name: o.name || o.id })) };
 }
 
 /**

package/lib/utils/env-tools.js

@@ -69,6 +69,30 @@ function pubCacheBin(name) {
   return `"${file}"`;
 }
 
+/**
+ * Quoted path to `keytool` (used for the Android debug SHA-1). It ships with
+ * the JDK and is almost never on PATH on Windows, so we look in JAVA_HOME and
+ * Android Studio's bundled JBR before falling back to bare `keytool`.
+ */
+function keytoolBin() {
+  const exe = isWindows ? 'keytool.exe' : 'keytool';
+  const candidates = [];
+  if (process.env.JAVA_HOME) candidates.push(path.join(process.env.JAVA_HOME, 'bin', exe));
+  if (isWindows) {
+    const pf = process.env.ProgramFiles;
+    const local = process.env.LOCALAPPDATA;
+    if (pf) candidates.push(path.win32.join(pf, 'Android', 'Android Studio', 'jbr', 'bin', exe));
+    if (local) candidates.push(path.win32.join(local, 'Programs', 'Android Studio', 'jbr', 'bin', exe));
+    if (pf) candidates.push(path.win32.join(pf, 'Android', 'Android Studio', 'jre', 'bin', exe));
+  } else {
+    candidates.push('/Applications/Android Studio.app/Contents/jbr/Contents/Home/bin/keytool');
+  }
+  for (const candidate of candidates) {
+    if (fs.existsSync(candidate)) return `"${candidate}"`;
+  }
+  return 'keytool';
+}
+
 /**
  * Well-known install dirs of tools that may not be on the frozen session PATH
  * yet — e.g. the Google Cloud SDK right after it's installed mid-run. Only
@@ -114,5 +138,6 @@ module.exports = {
   homeDir,
   pubCacheBinDir,
   pubCacheBin,
+  keytoolBin,
   augmentedEnv,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kasy-cli",
-  "version": "1.21.7",
+  "version": "1.21.8",
   "description": "CLI for scaffolding production-ready Flutter SaaS apps with Firebase, Supabase, or API REST backends.",
   "bin": {
     "kasy": "./bin/kasy.js"