1tube 0.1.17 → 0.1.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "1tube",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "private": false,
   "description": "Self-hosted Supabase Edge Functions gateway for Deno, plus an ESLint plugin for consumers",
   "license": "MIT",

package/src/backends/workerd/runtime-overrides.ts

@@ -484,13 +484,23 @@ export class RuntimeOverrideStore {
       if (extracted.length > 0) return { source: "sourcemap", files: extracted };
     }
 
-    const bundleFile = entry.moduleFiles[0] ?? entry.bundleFile;
-    const bundle = await readTextIfExists(join(prebuiltDir, bundleFile));
-    if (bundle !== null) {
+    const emittedFiles = [...new Set(entry.moduleFiles.length ? entry.moduleFiles : [entry.bundleFile])];
+    const emittedSources: EditableSourceFile[] = [];
+    for (const moduleFile of emittedFiles) {
+      const bundle = await readTextIfExists(join(prebuiltDir, moduleFile));
+      if (bundle !== null) {
+        emittedSources.push({
+          path: moduleFile,
+          content: bundle,
+          language: langFor(moduleFile),
+        });
+      }
+    }
+    if (emittedSources.length > 0) {
       return {
         source: "bundle",
-        files: [{ path: basename(bundleFile), content: bundle, language: "javascript" }],
-        warning: "Authored source was not packaged with this firmware; showing emitted JS fallback.",
+        files: emittedSources.sort((a, b) => emittedSortKey(entry.bundleFile, a.path).localeCompare(emittedSortKey(entry.bundleFile, b.path))),
+        warning: "Authored source was not packaged with this firmware; showing emitted JS fallback modules.",
       };
     }
     return {
@@ -553,6 +563,12 @@ function sourceSortKey(path: string): string {
   return `5:${path}`;
 }
 
+function emittedSortKey(entryFile: string, path: string): string {
+  if (path === entryFile) return `0:${path}`;
+  if (basename(path) === basename(entryFile)) return `1:${path}`;
+  return `5:${path}`;
+}
+
 function defaultManifestForFile(): Record<string, unknown> {
   const manifest = defaultManifest();
   return {

package/src/server.ts

@@ -398,6 +398,15 @@ const LOCAL_SUPABASE_DEFAULTS: Record<string, string> = {
   JWT_SECRET: "super-secret-jwt-token-with-at-least-32-characters-long",
 };
 
+const LOCAL_SUPABASE_STATUS_KEYS: Record<string, string[]> = {
+  SUPABASE_URL: ["API_URL"],
+  JWT_SECRET: ["JWT_SECRET"],
+  SUPABASE_ANON_KEY: ["ANON_KEY"],
+  SUPABASE_PUBLISHABLE_KEY: ["PUBLISHABLE_KEY"],
+  SUPABASE_SECRET_KEY: ["SECRET_KEY"],
+  SUPABASE_SERVICE_ROLE_KEY: ["SERVICE_ROLE_KEY"],
+};
+
 // Only secrets the gateway *itself* uses on the hot path. Anything an edge
 // function happens to need (publishable/secret keys, OPENAI_API_KEY, …) is
 // the function author's contract with the host — refusing to boot because
@@ -405,8 +414,24 @@ const LOCAL_SUPABASE_DEFAULTS: Record<string, string> = {
 // confusing failures.
 const SECRETS_REQUIRED_IN_PROD = ["JWT_SECRET"];
 
-function applyDevDefaults() {
+async function applyDevDefaults() {
   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
+      .map((source) => statusEnv[source])
+      .find((candidate) => typeof candidate === "string" && candidate.length > 0);
+    if (!value) continue;
+    Deno.env.set(target, value);
+    applied++;
+  }
+
+  if (!Deno.env.get("SUPABASE_URL") && Deno.env.get("VITE_SUPABASE_URL")) {
+    Deno.env.set("SUPABASE_URL", Deno.env.get("VITE_SUPABASE_URL")!);
+    applied++;
+  }
+
   for (const [key, value] of Object.entries(LOCAL_SUPABASE_DEFAULTS)) {
     if (!Deno.env.get(key)) {
       Deno.env.set(key, value);
@@ -418,6 +443,48 @@ function applyDevDefaults() {
   }
 }
 
+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"] },
+  ];
+
+  for (const runner of runners) {
+    try {
+      const output = await new Deno.Command(runner.command, {
+        args: runner.args,
+        stdout: "piped",
+        stderr: "null",
+      }).output();
+      if (!output.success) continue;
+      return parseSupabaseStatusEnv(new TextDecoder().decode(output.stdout));
+    } catch {
+      // CLI not installed on PATH (or bunx unavailable). Try the next runner.
+    }
+  }
+  return {};
+}
+
+function parseSupabaseStatusEnv(text: string): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const rawLine of text.split(/\r?\n/)) {
+    const line = rawLine.trim();
+    if (!line || line.startsWith("#")) continue;
+    const eq = line.indexOf("=");
+    if (eq <= 0) continue;
+    const key = line.slice(0, eq).trim();
+    let value = line.slice(eq + 1).trim();
+    if (
+      (value.startsWith('"') && value.endsWith('"')) ||
+      (value.startsWith("'") && value.endsWith("'"))
+    ) {
+      value = value.slice(1, -1);
+    }
+    out[key] = value;
+  }
+  return out;
+}
+
 function enforceProdSecrets() {
   // We deliberately do NOT reject "well-known dev default" values
   // here. The local Supabase Docker stack ships with a fixed
@@ -463,7 +530,7 @@ function requireInternal(c: Context): Response | null {
 }
 
 if (opts.dev) {
-  applyDevDefaults();
+  await applyDevDefaults();
 } else {
   enforceProdSecrets();
 }