relight-cli 0.2.0 → 0.4.0

package/src/lib/providers/cf/db.js

@@ -7,110 +7,51 @@ import {
   importD1,
   getWorkersSubdomain,
 } from "../../clouds/cf.js";
-import { getAppConfig, pushAppConfig } from "./app.js";
 import { randomBytes } from "crypto";
 
-export async function createDatabase(cfg, appName, opts = {}) {
-  if (!opts.skipAppConfig) {
-    var appConfig = await getAppConfig(cfg, appName);
-    if (!appConfig) {
-      throw new Error(`App ${appName} not found.`);
-    }
-    if (appConfig.dbId) {
-      throw new Error(`App ${appName} already has a database: ${appConfig.dbName}`);
-    }
-  }
-
-  var dbName = `relight-${appName}`;
-  var result = await createD1Database(cfg.accountId, cfg.apiToken, dbName, {
+export async function createDatabase(cfg, name, opts = {}) {
+  var d1Name = `relight-${name}`;
+  var result = await createD1Database(cfg.accountId, cfg.apiToken, d1Name, {
     locationHint: opts.location,
     jurisdiction: opts.jurisdiction,
   });
 
   var subdomain = await getWorkersSubdomain(cfg.accountId, cfg.apiToken);
   var connectionUrl = subdomain
-    ? `https://relight-${appName}.${subdomain}.workers.dev`
+    ? `https://relight-${name}.${subdomain}.workers.dev`
     : null;
 
   var dbToken = randomBytes(32).toString("hex");
 
-  if (!opts.skipAppConfig) {
-    appConfig.dbId = result.uuid;
-    appConfig.dbName = dbName;
-
-    if (!appConfig.envKeys) appConfig.envKeys = [];
-    if (!appConfig.secretKeys) appConfig.secretKeys = [];
-    if (!appConfig.env) appConfig.env = {};
-
-    if (connectionUrl) {
-      appConfig.env["DB_URL"] = connectionUrl;
-      if (!appConfig.envKeys.includes("DB_URL")) appConfig.envKeys.push("DB_URL");
-    }
-
-    appConfig.env["DB_TOKEN"] = "[hidden]";
-    appConfig.secretKeys = appConfig.secretKeys.filter((k) => k !== "DB_TOKEN");
-    appConfig.secretKeys.push("DB_TOKEN");
-    appConfig.envKeys = appConfig.envKeys.filter((k) => k !== "DB_TOKEN");
-
-    var newSecrets = { DB_TOKEN: dbToken };
-
-    await pushAppConfig(cfg, appName, appConfig, { newSecrets });
-  }
-
   return {
     dbId: result.uuid,
-    dbName,
+    dbName: d1Name,
     dbToken,
     connectionUrl,
   };
 }
 
-export async function destroyDatabase(cfg, appName, opts = {}) {
-  var dbId = opts.dbId;
-  if (!dbId) {
-    var appConfig = await getAppConfig(cfg, appName);
-    if (!appConfig || !appConfig.dbId) {
-      throw new Error(`App ${appName} does not have a database.`);
-    }
-    dbId = appConfig.dbId;
-  }
-
-  await deleteD1Database(cfg.accountId, cfg.apiToken, dbId);
-
+export async function destroyDatabase(cfg, name, opts = {}) {
   if (!opts.dbId) {
-    delete appConfig.dbId;
-    delete appConfig.dbName;
-
-    if (appConfig.env) {
-      delete appConfig.env["DB_URL"];
-      delete appConfig.env["DB_TOKEN"];
-    }
-    if (appConfig.envKeys) appConfig.envKeys = appConfig.envKeys.filter((k) => k !== "DB_URL");
-    if (appConfig.secretKeys) appConfig.secretKeys = appConfig.secretKeys.filter((k) => k !== "DB_TOKEN");
-
-    await pushAppConfig(cfg, appName, appConfig);
+    throw new Error("dbId is required to destroy a CF database.");
   }
+  await deleteD1Database(cfg.accountId, cfg.apiToken, opts.dbId);
 }
 
-export async function getDatabaseInfo(cfg, appName, opts = {}) {
-  var dbId = opts.dbId;
-  if (!dbId) {
-    var appConfig = await getAppConfig(cfg, appName);
-    if (!appConfig || !appConfig.dbId) {
-      throw new Error(`App ${appName} does not have a database.`);
-    }
-    dbId = appConfig.dbId;
+export async function getDatabaseInfo(cfg, name, opts = {}) {
+  if (!opts.dbId) {
+    throw new Error("dbId is required to get CF database info.");
   }
 
-  var dbDetails = await getD1Database(cfg.accountId, cfg.apiToken, dbId);
+  var dbDetails = await getD1Database(cfg.accountId, cfg.apiToken, opts.dbId);
   var subdomain = await getWorkersSubdomain(cfg.accountId, cfg.apiToken);
   var connectionUrl = subdomain
-    ? `https://relight-${appName}.${subdomain}.workers.dev`
+    ? `https://relight-${name}.${subdomain}.workers.dev`
     : null;
 
   return {
-    dbId,
-    dbName: dbDetails.name || `relight-${appName}`,
+    dbId: opts.dbId,
+    dbName: dbDetails.name || `relight-${name}`,
     connectionUrl,
     size: dbDetails.file_size,
     numTables: dbDetails.num_tables,
@@ -118,27 +59,18 @@ export async function getDatabaseInfo(cfg, appName, opts = {}) {
   };
 }
 
-export async function queryDatabase(cfg, appName, sql, params, opts = {}) {
-  var dbId = opts.dbId;
-  if (!dbId) {
-    var appConfig = await getAppConfig(cfg, appName);
-    if (!appConfig || !appConfig.dbId) {
-      throw new Error(`App ${appName} does not have a database.`);
-    }
-    dbId = appConfig.dbId;
+export async function queryDatabase(cfg, name, sql, params, opts = {}) {
+  if (!opts.dbId) {
+    throw new Error("dbId is required to query a CF database.");
   }
-  return queryD1(cfg.accountId, cfg.apiToken, dbId, sql, params);
+  return queryD1(cfg.accountId, cfg.apiToken, opts.dbId, sql, params);
 }
 
-export async function importDatabase(cfg, appName, sqlContent, opts = {}) {
-  var dbId = opts.dbId;
-  if (!dbId) {
-    var appConfig = await getAppConfig(cfg, appName);
-    if (!appConfig || !appConfig.dbId) {
-      throw new Error(`App ${appName} does not have a database.`);
-    }
-    dbId = appConfig.dbId;
+export async function importDatabase(cfg, name, sqlContent, opts = {}) {
+  if (!opts.dbId) {
+    throw new Error("dbId is required to import into a CF database.");
   }
+  var dbId = opts.dbId;
 
   // Step 1: Init import
   var initRes = await importD1(cfg.accountId, cfg.apiToken, dbId, {
@@ -183,15 +115,11 @@ export async function importDatabase(cfg, appName, sqlContent, opts = {}) {
   }
 }
 
-export async function exportDatabase(cfg, appName, opts = {}) {
-  var dbId = opts.dbId;
-  if (!dbId) {
-    var appConfig = await getAppConfig(cfg, appName);
-    if (!appConfig || !appConfig.dbId) {
-      throw new Error(`App ${appName} does not have a database.`);
-    }
-    dbId = appConfig.dbId;
+export async function exportDatabase(cfg, name, opts = {}) {
+  if (!opts.dbId) {
+    throw new Error("dbId is required to export a CF database.");
   }
+  var dbId = opts.dbId;
 
   var exportRes = await exportD1(cfg.accountId, cfg.apiToken, dbId, {
     output_format: "polling",
@@ -221,48 +149,22 @@ export async function exportDatabase(cfg, appName, opts = {}) {
   return dumpRes.text();
 }
 
-export async function rotateToken(cfg, appName, opts = {}) {
+export async function rotateToken(cfg, name, opts = {}) {
   var subdomain = await getWorkersSubdomain(cfg.accountId, cfg.apiToken);
   var connectionUrl = subdomain
-    ? `https://relight-${appName}.${subdomain}.workers.dev`
+    ? `https://relight-${name}.${subdomain}.workers.dev`
     : null;
 
   var dbToken = randomBytes(32).toString("hex");
 
-  if (!opts.skipAppConfig) {
-    var appConfig = await getAppConfig(cfg, appName);
-    if (!appConfig || !appConfig.dbId) {
-      throw new Error(`App ${appName} does not have a database.`);
-    }
-
-    if (!appConfig.envKeys) appConfig.envKeys = [];
-    if (!appConfig.secretKeys) appConfig.secretKeys = [];
-    if (!appConfig.env) appConfig.env = {};
-
-    appConfig.env["DB_TOKEN"] = "[hidden]";
-    if (!appConfig.secretKeys.includes("DB_TOKEN")) appConfig.secretKeys.push("DB_TOKEN");
-    appConfig.envKeys = appConfig.envKeys.filter((k) => k !== "DB_TOKEN");
-
-    if (connectionUrl) {
-      appConfig.env["DB_URL"] = connectionUrl;
-      if (!appConfig.envKeys.includes("DB_URL")) appConfig.envKeys.push("DB_URL");
-    }
-
-    await pushAppConfig(cfg, appName, appConfig, { newSecrets: { DB_TOKEN: dbToken } });
-  }
-
   return { dbToken, connectionUrl };
 }
 
-export async function resetDatabase(cfg, appName, opts = {}) {
-  var dbId = opts.dbId;
-  if (!dbId) {
-    var appConfig = await getAppConfig(cfg, appName);
-    if (!appConfig || !appConfig.dbId) {
-      throw new Error(`App ${appName} does not have a database.`);
-    }
-    dbId = appConfig.dbId;
+export async function resetDatabase(cfg, name, opts = {}) {
+  if (!opts.dbId) {
+    throw new Error("dbId is required to reset a CF database.");
   }
+  var dbId = opts.dbId;
 
   var results = await queryD1(
     cfg.accountId, cfg.apiToken, dbId,

package/src/lib/providers/cf/dns.js

@@ -107,7 +107,7 @@ export async function removeDomain(cfg, appName, domain) {
 
 // --- Pure DNS record operations (for cross-cloud use) ---
 
-export async function addDnsRecord(cfg, domain, target, zone) {
+export async function addDnsRecord(cfg, domain, target, zone, opts = {}) {
   // Check for existing records
   var existing = await listDnsRecords(cfg.accountId, cfg.apiToken, zone.id, { name: domain });
   if (existing.length > 0) {
@@ -117,12 +117,12 @@ export async function addDnsRecord(cfg, domain, target, zone) {
     );
   }
 
-  // Create CNAME: domain -> target, proxied
+  var proxied = opts.proxied !== undefined ? opts.proxied : true;
   await createDnsRecord(cfg.accountId, cfg.apiToken, zone.id, {
     type: "CNAME",
     name: domain,
     content: target,
-    proxied: true,
+    proxied,
   });
 }
 

package/src/lib/providers/gcp/app.js

@@ -9,6 +9,13 @@ import {
   listLogEntries,
   queryTimeSeries,
   deleteSqlInstance,
+  ensureFirebaseProject,
+  createHostingSite,
+  getHostingSite,
+  deleteHostingSite,
+  deployHostingProxy,
+  addHostingCustomDomain,
+  deleteHostingCustomDomain,
 } from "../../clouds/gcp.js";
 
 // --- Helpers ---
@@ -199,8 +206,14 @@ export async function getAppInfo(cfg, appName) {
   var svc = await findService(token, cfg.project, appName);
   if (!svc) return null;
 
+  var region = parseRegionFromName(svc.name);
+  var svcId = svc.name.split("/").pop();
   var appConfig = await getAppConfig(cfg, appName);
-  return { appConfig, url: svc.uri || null };
+  return {
+    appConfig,
+    url: svc.uri || null,
+    consoleUrl: `https://console.cloud.google.com/run/detail/${region}/${svcId}?project=${cfg.project}`,
+  };
 }
 
 // --- Destroy ---
@@ -216,6 +229,11 @@ export async function destroyApp(cfg, appName) {
     } catch {}
   }
 
+  // Delete Firebase Hosting site if exists
+  try {
+    await deleteHostingSite(token, cfg.project, hostingSiteId(appName));
+  } catch {}
+
   // Delete Cloud Run service
   var svc = await findService(token, cfg.project, appName);
   if (!svc) throw new Error(`Service relight-${appName} not found.`);
@@ -275,6 +293,48 @@ export async function getAppUrl(cfg, appName) {
   return svc?.uri || null;
 }
 
+// --- Custom domain via Firebase Hosting ---
+
+function hostingSiteId(appName) {
+  return `relight-${appName}`;
+}
+
+async function ensureHostingSite(token, project, appName) {
+  var siteId = hostingSiteId(appName);
+  try {
+    await getHostingSite(token, project, siteId);
+  } catch {
+    await ensureFirebaseProject(token, project);
+    await createHostingSite(token, project, siteId);
+  }
+
+  // Deploy proxy config pointing to Cloud Run
+  var svc = await findService(token, project, appName);
+  if (!svc) throw new Error(`Service relight-${appName} not found.`);
+  var region = parseRegionFromName(svc.name);
+  var svcId = svc.name.split("/").pop();
+  await deployHostingProxy(token, siteId, svcId, region);
+
+  return siteId;
+}
+
+export async function mapCustomDomain(cfg, appName, domain) {
+  var token = await mintAccessToken(cfg.clientEmail, cfg.privateKey);
+  var siteId = await ensureHostingSite(token, cfg.project, appName);
+  await addHostingCustomDomain(token, cfg.project, siteId, domain);
+  return { dnsTarget: `${siteId}.web.app`, proxied: false };
+}
+
+export async function unmapCustomDomain(cfg, appName, domain) {
+  var token = await mintAccessToken(cfg.clientEmail, cfg.privateKey);
+  var siteId = hostingSiteId(appName);
+  try {
+    await deleteHostingCustomDomain(token, cfg.project, siteId, domain);
+  } catch (e) {
+    if (!e.message.includes("404")) throw e;
+  }
+}
+
 // --- Log streaming ---
 
 export async function streamLogs(cfg, appName) {
@@ -328,6 +388,10 @@ export async function getCosts(cfg, appNames, dateRange) {
   var token = await mintAccessToken(cfg.clientEmail, cfg.privateKey);
   var { sinceISO, untilISO } = dateRange;
 
+  // MQL datetime format: YYYY/MM/DD-HH:MM:SS (not ISO 8601)
+  var sinceMql = isoToMql(sinceISO);
+  var untilMql = isoToMql(untilISO);
+
   // Discover apps
   var apps;
   if (appNames) {
@@ -353,7 +417,7 @@ export async function getCosts(cfg, appNames, dateRange) {
         query: `fetch cloud_run_revision
           | metric 'run.googleapis.com/request_count'
           | filter resource.service_name == '${app.serviceName}'
-          | within d'${sinceISO}', d'${untilISO}'
+          | within d'${sinceMql}', d'${untilMql}'
           | group_by [], sum(val())`,
       });
       var reqData = reqRes.timeSeriesData || [];
@@ -362,7 +426,9 @@ export async function getCosts(cfg, appNames, dateRange) {
           usage.requests += Number(pt.values?.[0]?.int64Value || 0);
         }
       }
-    } catch {}
+    } catch (e) {
+      process.stderr.write(`  Warning: failed to fetch request metrics: ${e.message}\n`);
+    }
 
     try {
       // CPU allocation
@@ -370,7 +436,7 @@ export async function getCosts(cfg, appNames, dateRange) {
         query: `fetch cloud_run_revision
           | metric 'run.googleapis.com/container/cpu/allocation_time'
           | filter resource.service_name == '${app.serviceName}'
-          | within d'${sinceISO}', d'${untilISO}'
+          | within d'${sinceMql}', d'${untilMql}'
           | group_by [], sum(val())`,
       });
       var cpuData = cpuRes.timeSeriesData || [];
@@ -379,7 +445,9 @@ export async function getCosts(cfg, appNames, dateRange) {
           usage.cpuSeconds += Number(pt.values?.[0]?.doubleValue || 0);
         }
       }
-    } catch {}
+    } catch (e) {
+      process.stderr.write(`  Warning: failed to fetch CPU metrics: ${e.message}\n`);
+    }
 
     try {
       // Memory allocation
@@ -387,7 +455,7 @@ export async function getCosts(cfg, appNames, dateRange) {
         query: `fetch cloud_run_revision
           | metric 'run.googleapis.com/container/memory/allocation_time'
           | filter resource.service_name == '${app.serviceName}'
-          | within d'${sinceISO}', d'${untilISO}'
+          | within d'${sinceMql}', d'${untilMql}'
           | group_by [], sum(val())`,
       });
       var memData = memRes.timeSeriesData || [];
@@ -397,7 +465,9 @@ export async function getCosts(cfg, appNames, dateRange) {
           usage.memGibSeconds += Number(pt.values?.[0]?.doubleValue || 0);
         }
       }
-    } catch {}
+    } catch (e) {
+      process.stderr.write(`  Warning: failed to fetch memory metrics: ${e.message}\n`);
+    }
 
     results.push({ name: app.name, usage });
   }
@@ -405,6 +475,11 @@ export async function getCosts(cfg, appNames, dateRange) {
   return results;
 }
 
+function isoToMql(iso) {
+  // Convert 2026-03-01T00:00:00Z -> 2026/03/01-00:00:00
+  return iso.replace(/Z$/, "").replace(/^(\d{4})-(\d{2})-(\d{2})T/, "$1/$2/$3-");
+}
+
 // --- Regions ---
 
 export function getRegions() {