1tube 0.1.47 → 0.1.48

package/deno.lock

@@ -15,13 +15,14 @@
     "npm:@ai-sdk/google@2": "2.0.74_zod@3.25.76",
     "npm:@ai-sdk/openai@2": "2.0.106_zod@3.25.76",
     "npm:ai@6": "6.0.193_zod@3.25.76",
-    "npm:drizzle-kit@1.0.0-rc.3": "1.0.0-rc.3",
+    "npm:drizzle-kit@1.0.0-rc.4": "1.0.0-rc.4",
     "npm:drizzle-orm@1.0.0-rc.3": "1.0.0-rc.3_zod@3.25.76",
+    "npm:drizzle-orm@1.0.0-rc.4": "1.0.0-rc.4_zod@3.25.76",
     "npm:es-module-lexer@2": "2.1.0",
     "npm:esbuild@~0.25.5": "0.25.12",
     "npm:esbuild@~0.28.1": "0.28.1",
-    "npm:hono@4": "4.12.27",
-    "npm:hono@^4.12.27": "4.12.27",
+    "npm:hono@4": "4.12.30",
+    "npm:hono@^4.12.30": "4.12.30",
     "npm:typescript@latest": "6.0.3",
     "npm:zod@^3.23.0": "3.25.76"
   },
@@ -129,8 +130,8 @@
         "json-schema"
       ]
     },
-    "@drizzle-team/brocli@0.11.0": {
-      "integrity": "sha512-hD3pekGiPg0WPCCGAZmusBBJsDqGUR66Y452YgQsZOnkdQ7ViEPKuyP4huUGEZQefp8g34RRodXYmJ2TbCH+tg=="
+    "@drizzle-team/brocli@0.12.0": {
+      "integrity": "sha512-mlUE+rZ8CatQekLhnaiN91Iemdd+e2gFKooGlnRB3oPTL3VghLfX24dx7HrzMNeC1JrIB/0kpsfyty3f5HNfxQ=="
     },
     "@esbuild/aix-ppc64@0.25.12": {
       "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==",
@@ -417,8 +418,8 @@
         "zod"
       ]
     },
-    "drizzle-kit@1.0.0-rc.3": {
-      "integrity": "sha512-lwGIi6GTlEYzrtac1Szecns+zrAxjaOoNysfBCKRQOXQE7nMJ8IU2I2S6ek3FHEm1N30dQb5YrTdqV7zNH6n7A==",
+    "drizzle-kit@1.0.0-rc.4": {
+      "integrity": "sha512-KZCpjRyu+oYHLj/UJogfFlOkWhHVkaEI2EOT1U3NDVXUzLoTyPjqwFxwOrlQxsY6jzRyxcz4EacqboGfhEeYrA==",
       "dependencies": [
         "@drizzle-team/brocli",
         "@js-temporal/polyfill",
@@ -437,6 +438,15 @@
         "zod"
       ]
     },
+    "drizzle-orm@1.0.0-rc.4_zod@3.25.76": {
+      "integrity": "sha512-BT+pf+qoiYHqltoA88Jmf6ilGMXPlpfE0hEJKc2adRtMCAl25Swk/t5gXcWxZNAwdtf3F5gCd2FpeOyP/pT0Hw==",
+      "dependencies": [
+        "zod"
+      ],
+      "optionalPeers": [
+        "zod"
+      ]
+    },
     "es-module-lexer@2.1.0": {
       "integrity": "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ=="
     },
@@ -515,11 +525,11 @@
         "resolve-pkg-maps"
       ]
     },
-    "hono@4.12.27": {
-      "integrity": "sha512-1yrb/+w6HWQJrUCLkJ2IF5jNIPvvFkblV5RNOYl6bV+OA6p9GLcMpHFFGTosSvHvcAUibuUukRqhlYI4z32C7Q=="
+    "hono@4.12.30": {
+      "integrity": "sha512-emn+JoJjrN9YTpRDS5it/UI2SO9BAE37T6I3d963RxcZ81G9A4pr2SZTEiiaiKbzx+NKRg5BZ89fCL7gCJCUog=="
     },
-    "jiti@2.6.1": {
-      "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
+    "jiti@2.7.0": {
+      "integrity": "sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==",
       "bin": true
     },
     "jsbi@4.3.2": {
@@ -553,9 +563,9 @@
     ],
     "packageJson": {
       "dependencies": [
-        "npm:drizzle-kit@1.0.0-rc.3",
-        "npm:drizzle-orm@1.0.0-rc.3",
-        "npm:hono@^4.12.27"
+        "npm:drizzle-kit@1.0.0-rc.4",
+        "npm:drizzle-orm@1.0.0-rc.4",
+        "npm:hono@^4.12.30"
       ]
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "1tube",
-  "version": "0.1.47",
+  "version": "0.1.48",
   "private": false,
   "description": "Self-hosted Supabase Edge Functions gateway for Deno, plus an ESLint plugin for consumers",
   "license": "MIT",
@@ -61,10 +61,10 @@
     "prepublishOnly": "bun run build:edge && bun run typecheck && bun run check && bun run smoke:bin"
   },
   "dependencies": {
-    "drizzle-orm": "1.0.0-rc.3",
-    "hono": "^4.12.27"
+    "drizzle-orm": "1.0.0-rc.4",
+    "hono": "^4.12.30"
   },
   "devDependencies": {
-    "drizzle-kit": "1.0.0-rc.3"
+    "drizzle-kit": "1.0.0-rc.4"
   }
 }

package/src/server.ts

@@ -819,9 +819,18 @@ async function readDenoImportMap(
 // confusing failures.
 const SECRETS_REQUIRED_IN_PROD = ["JWT_SECRET"];
 
-async function applyDevDefaults() {
+/** Keys edge handlers typically need once `--dev` has finished bootstrapping. */
+const DEV_SUPABASE_KEYS_REQUIRED = [
+  "SUPABASE_ANON_KEY",
+  "SUPABASE_SERVICE_ROLE_KEY",
+] as const;
+
+function missingDevSupabaseKeys(): string[] {
+  return DEV_SUPABASE_KEYS_REQUIRED.filter((key) => !Deno.env.get(key));
+}
+
+function applyStatusEnv(statusEnv: Record<string, string>): number {
   let applied = 0;
-  const statusEnv = await readLocalSupabaseStatusEnv();
   for (const [target, sources] of Object.entries(LOCAL_SUPABASE_STATUS_KEYS)) {
     if (Deno.env.get(target)) continue;
     const value = sources
@@ -833,11 +842,87 @@ async function applyDevDefaults() {
     Deno.env.set(target, value);
     applied++;
   }
+  return applied;
+}
 
-  if (!Deno.env.get("SUPABASE_URL") && Deno.env.get("VITE_SUPABASE_URL")) {
-    Deno.env.set("SUPABASE_URL", Deno.env.get("VITE_SUPABASE_URL")!);
+/**
+ * Map host-project aliases (Vite publishable key, modern secret names) onto
+ * the legacy SUPABASE_* names edge functions still read.
+ */
+function applyDevEnvAliases(): number {
+  let applied = 0;
+  const aliasPairs: Array<[from: string, to: string]> = [
+    ["VITE_SUPABASE_URL", "SUPABASE_URL"],
+    ["VITE_SUPABASE_PUBLISHABLE_KEY", "SUPABASE_PUBLISHABLE_KEY"],
+    ["VITE_SUPABASE_PUBLISHABLE_KEY", "SUPABASE_ANON_KEY"],
+    ["SUPABASE_PUBLISHABLE_KEY", "SUPABASE_ANON_KEY"],
+    ["SUPABASE_SECRET_KEY", "SUPABASE_SERVICE_ROLE_KEY"],
+  ];
+  for (const [from, to] of aliasPairs) {
+    if (Deno.env.get(to)) continue;
+    const value = Deno.env.get(from);
+    if (!value) continue;
+    Deno.env.set(to, value);
     applied++;
   }
+  return applied;
+}
+
+function devStatusRetryConfig(): { attempts: number; delayMs: number } {
+  const attemptsRaw = parseInt(
+    Deno.env.get("1TUBE_DEV_STATUS_ATTEMPTS") || "",
+    10,
+  );
+  const delayRaw = parseInt(
+    Deno.env.get("1TUBE_DEV_STATUS_RETRY_MS") || "",
+    10,
+  );
+  return {
+    attempts: Number.isFinite(attemptsRaw) && attemptsRaw > 0
+      ? attemptsRaw
+      : 5,
+    delayMs: Number.isFinite(delayRaw) && delayRaw >= 0 ? delayRaw : 1000,
+  };
+}
+
+async function applyDevDefaults() {
+  let applied = applyDevEnvAliases();
+
+  const skipStatus = (Deno.env.get("1TUBE_DEV_SKIP_SUPABASE_STATUS") || "") ===
+    "1";
+  const { attempts, delayMs } = devStatusRetryConfig();
+
+  if (!skipStatus) {
+    for (let attempt = 1; attempt <= attempts; attempt++) {
+      const missing = missingDevSupabaseKeys();
+      if (missing.length === 0) break;
+
+      if (attempt > 1) {
+        console.warn(
+          `[1tube] Local Supabase keys still missing (${
+            missing.join(", ")
+          }); retrying \`supabase status\` (${attempt}/${attempts})…`,
+        );
+        if (delayMs > 0) {
+          await new Promise((resolve) => setTimeout(resolve, delayMs));
+        }
+      }
+
+      const statusEnv = await readLocalSupabaseStatusEnv();
+      if (Object.keys(statusEnv).length === 0) {
+        if (attempt === 1) {
+          console.warn(
+            "[1tube] Could not read local Supabase keys via `supabase status` " +
+              "(CLI missing or stack not ready); will retry…",
+          );
+        }
+        continue;
+      }
+      applied += applyStatusEnv(statusEnv);
+      // Status may only populate PUBLISHABLE/SECRET; re-alias onto ANON/SERVICE.
+      applied += applyDevEnvAliases();
+    }
+  }
 
   for (const [key, value] of Object.entries(LOCAL_SUPABASE_DEFAULTS)) {
     if (!Deno.env.get(key)) {
@@ -848,12 +933,27 @@ async function applyDevDefaults() {
   if (applied > 0) {
     console.log(`[1tube] Applied ${applied} dev default(s) (1TUBE_DEV=1)`);
   }
+
+  const missing = missingDevSupabaseKeys();
+  if (missing.length > 0) {
+    console.error(
+      `[1tube] FATAL: --dev could not resolve ${missing.join(", ")} after ` +
+        `${skipStatus ? "skipping" : `${attempts} attempt(s) at`} ` +
+        `\`supabase status\`. ` +
+        `Start local Supabase (\`supabase start\`) so status works, or set ` +
+        `the missing vars in .env (SUPABASE_ANON_KEY / SUPABASE_SERVICE_ROLE_KEY, ` +
+        `or VITE_SUPABASE_PUBLISHABLE_KEY + SUPABASE_SERVICE_ROLE_KEY).`,
+    );
+    Deno.exit(EXIT_CODES.CONFIG);
+  }
 }
 
 async function readLocalSupabaseStatusEnv(): Promise<Record<string, string>> {
   const runners: Array<{ command: string; args: string[] }> = [
     { command: "supabase", args: ["status", "-o", "env"] },
     { command: "bunx", args: ["supabase", "status", "-o", "env"] },
+    { command: "bun", args: ["x", "supabase", "status", "-o", "env"] },
+    { command: "npx", args: ["--yes", "supabase", "status", "-o", "env"] },
   ];
 
   for (const runner of runners) {
@@ -861,12 +961,17 @@ async function readLocalSupabaseStatusEnv(): Promise<Record<string, string>> {
       const output = await new Deno.Command(runner.command, {
         args: runner.args,
         stdout: "piped",
-        stderr: "null",
+        stderr: "piped",
       }).output();
-      if (!output.success) continue;
-      return parseSupabaseStatusEnv(new TextDecoder().decode(output.stdout));
+      const stdout = new TextDecoder().decode(output.stdout);
+      const parsed = parseSupabaseStatusEnv(stdout);
+      // Accept stdout even on non-zero exit — `supabase status` often warns
+      // about stopped optional services while still printing usable keys.
+      if (parsed.ANON_KEY || parsed.PUBLISHABLE_KEY || parsed.SERVICE_ROLE_KEY) {
+        return parsed;
+      }
     } catch {
-      // CLI not installed on PATH (or bunx unavailable). Try the next runner.
+      // CLI not installed on PATH (or bunx/npx unavailable). Try the next runner.
     }
   }
   return {};