@edge-base/cli 0.1.5 → 0.2.0

package/dist/lib/dev-sidecar.js

@@ -41,8 +41,7 @@ async function verifyAdminJwt(token, secret) {
     }
 }
 async function verifyAuth(req, adminSecret) {
-    const internalSecret = req.headers['x-edgebase-internal-secret'] ??
-        req.headers['X-EdgeBase-Internal-Secret'];
+    const internalSecret = req.headers['x-edgebase-internal-secret'] ?? req.headers['X-EdgeBase-Internal-Secret'];
     const internalValue = Array.isArray(internalSecret) ? internalSecret[0] : internalSecret;
     if (internalValue && internalValue === adminSecret) {
         return true;
@@ -81,6 +80,14 @@ function readBody(req) {
 function parsePath(urlPath) {
     return urlPath.split('/').filter(Boolean);
 }
+function sanitizeForLog(value) {
+    const escape = String.fromCharCode(27);
+    const ansiPattern = new RegExp(`${escape}\\[[0-9;]*[A-Za-z]`, 'g');
+    const cleaned = value
+        .replace(ansiPattern, '')
+        .replace(/[\r\n\t]+/g, ' ');
+    return cleaned.replace(/[^ -~]/g, '?');
+}
 function isDynamicDbBlock(dbBlock) {
     if (!dbBlock)
         return false;
@@ -96,8 +103,8 @@ function parseAuthSettingsTarget(value) {
     return value === 'release' ? 'release' : 'development';
 }
 function isManagedAuthEnvKey(key) {
-    return MANAGED_AUTH_ENV_KEYS.includes(key)
-        || MANAGED_AUTH_ENV_PREFIXES.some((prefix) => key.startsWith(prefix));
+    return (MANAGED_AUTH_ENV_KEYS.includes(key) ||
+        MANAGED_AUTH_ENV_PREFIXES.some((prefix) => key.startsWith(prefix)));
 }
 function readAuthEnvValues(projectDir, target) {
     if (target === 'release') {
@@ -150,10 +157,12 @@ function getOAuthEnvKeys(provider) {
 }
 function getEnvTargets(projectDir, target) {
     if (target === 'release') {
-        return [{
+        return [
+            {
                 filePath: join(projectDir, '.env.release'),
                 header: RELEASE_ENV_HEADER,
-            }];
+            },
+        ];
     }
     const envDevelopmentPath = join(projectDir, '.env.development');
     const devVarsPath = join(projectDir, '.dev.vars');
@@ -195,7 +204,10 @@ function syncOAuthSecretsToLocalEnv(projectDir, target, allowedOAuthProviders, o
         }
         if (envKeys.scopes) {
             const scopesValue = Array.isArray(config.scopes)
-                ? config.scopes.map((scope) => scope.trim()).filter(Boolean).join(',')
+                ? config.scopes
+                    .map((scope) => scope.trim())
+                    .filter(Boolean)
+                    .join(',')
                 : null;
             updateEnvValue(projectDir, target, envKeys.scopes, scopesValue && scopesValue.length > 0 ? scopesValue : null);
         }
@@ -231,10 +243,14 @@ function readAuthSettings(config) {
         };
     }
     return {
-        providers: Array.isArray(authConfig.allowedOAuthProviders) ? authConfig.allowedOAuthProviders : [],
+        providers: Array.isArray(authConfig.allowedOAuthProviders)
+            ? authConfig.allowedOAuthProviders
+            : [],
         emailAuth: authConfig.emailAuth !== false,
         anonymousAuth: !!authConfig.anonymousAuth,
-        allowedRedirectUrls: Array.isArray(authConfig.allowedRedirectUrls) ? authConfig.allowedRedirectUrls : [],
+        allowedRedirectUrls: Array.isArray(authConfig.allowedRedirectUrls)
+            ? authConfig.allowedRedirectUrls
+            : [],
         session: {
             accessTokenTTL: authConfig.session?.accessTokenTTL ?? null,
             refreshTokenTTL: authConfig.session?.refreshTokenTTL ?? null,
@@ -348,7 +364,7 @@ async function executeWorkerSql(opts, authorization, namespace, sql, params = []
     }
     let message = `SQL execution failed with ${response.status}`;
     try {
-        const payload = await response.json();
+        const payload = (await response.json());
         if (payload.message) {
             message = payload.message;
         }
@@ -370,7 +386,7 @@ async function callWorkerAdmin(opts, authorization, path, body) {
     if (!response.ok) {
         let message = `${path} failed with ${response.status}`;
         try {
-            const payload = await response.json();
+            const payload = (await response.json());
             if (payload.message) {
                 message = payload.message;
             }
@@ -449,9 +465,11 @@ function readCurrentSchema(configPath) {
     try {
         // Use a quick approach: read config via tsx eval
         const projectDir = resolve(configPath, '..');
+        const moduleUrl = pathToFileURL(resolve(configPath)).href;
         const result = execTsxSync([
             '-e',
-            `import c from ${JSON.stringify(configPath)}; const d=c.default??c; const s={}; for (const [ns,b] of Object.entries(d.databases??{})) { for (const [t,tc] of Object.entries((b as any).tables??{})) { s[t]={namespace:ns,fields:(tc as any).schema??{},fts:(tc as any).fts??[]}; } } console.log(JSON.stringify(s));`,
+            `(async()=>{const moduleUrl=process.argv[1];const mod=await import(moduleUrl);const d=mod.default??mod;const s={};for(const [ns,b] of Object.entries(d.databases??{})){for(const [t,tc] of Object.entries((b as any).tables??{})){s[t]={namespace:ns,fields:(tc as any).schema??{},fts:(tc as any).fts??[]};}}console.log(JSON.stringify(s));})().catch((error)=>{console.error(error instanceof Error?error.message:String(error));process.exit(1);});`,
+            moduleUrl,
         ], { cwd: projectDir, encoding: 'utf-8', timeout: 10000, stdio: ['pipe', 'pipe', 'ignore'] }).trim();
         return JSON.parse(result);
     }
@@ -471,7 +489,10 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // POST /postgres/query — pooled local PostgreSQL query bridge for Worker dev mode
-    if (method === 'POST' && segments[0] === 'postgres' && segments[1] === 'query' && segments.length === 2) {
+    if (method === 'POST' &&
+        segments[0] === 'postgres' &&
+        segments[1] === 'query' &&
+        segments.length === 2) {
         const body = await readBody(req);
         const namespace = body.namespace;
         const sql = body.sql;
@@ -492,7 +513,10 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // POST /postgres/ensure-schema — persistent local PostgreSQL schema warmup/cache
-    if (method === 'POST' && segments[0] === 'postgres' && segments[1] === 'ensure-schema' && segments.length === 2) {
+    if (method === 'POST' &&
+        segments[0] === 'postgres' &&
+        segments[1] === 'ensure-schema' &&
+        segments.length === 2) {
         const body = await readBody(req);
         const namespace = body.namespace;
         if (!namespace)
@@ -508,7 +532,10 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // POST /schema/tables — create table
-    if (method === 'POST' && segments[0] === 'schema' && segments[1] === 'tables' && segments.length === 2) {
+    if (method === 'POST' &&
+        segments[0] === 'schema' &&
+        segments[1] === 'tables' &&
+        segments.length === 2) {
         const body = await readBody(req);
         const dbKey = body.dbKey || 'shared';
         const name = body.name;
@@ -520,7 +547,10 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // POST /schema/databases — create database block
-    if (method === 'POST' && segments[0] === 'schema' && segments[1] === 'databases' && segments.length === 2) {
+    if (method === 'POST' &&
+        segments[0] === 'schema' &&
+        segments[1] === 'databases' &&
+        segments.length === 2) {
         const body = await readBody(req);
         const name = body.name;
         const topology = body.topology ?? 'single';
@@ -543,14 +573,18 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // POST /integrations/neon/databases — create postgres DB block + configure Neon envs
-    if (method === 'POST' && segments[0] === 'integrations' && segments[1] === 'neon' && segments[2] === 'databases' && segments.length === 3) {
+    if (method === 'POST' &&
+        segments[0] === 'integrations' &&
+        segments[1] === 'neon' &&
+        segments[2] === 'databases' &&
+        segments.length === 3) {
         const body = await readBody(req);
         const name = body.name;
         const topology = body.topology ?? 'single';
         const envKey = body.envKey;
         const projectName = body.projectName;
         const projectId = body.projectId;
-        const mode = (body.mode ?? 'reuse');
+        const mode = body.mode ?? 'reuse';
         const targetLabel = body.targetLabel;
         const placeholder = body.placeholder;
         const helperText = body.helperText;
@@ -588,12 +622,16 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // POST /integrations/neon/connect — configure Neon envs for an existing postgres DB block
-    if (method === 'POST' && segments[0] === 'integrations' && segments[1] === 'neon' && segments[2] === 'connect' && segments.length === 3) {
+    if (method === 'POST' &&
+        segments[0] === 'integrations' &&
+        segments[1] === 'neon' &&
+        segments[2] === 'connect' &&
+        segments.length === 3) {
         const body = await readBody(req);
         const namespace = body.namespace;
         const envKey = body.envKey;
         const projectId = body.projectId;
-        const mode = (body.mode ?? 'reuse');
+        const mode = body.mode ?? 'reuse';
         if (!namespace)
             throw new Error('namespace is required.');
         const config = loadSidecarConfig(opts);
@@ -628,13 +666,17 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // POST /integrations/neon/upgrade — migrate a D1 single DB block to Neon-backed postgres
-    if (method === 'POST' && segments[0] === 'integrations' && segments[1] === 'neon' && segments[2] === 'upgrade' && segments.length === 3) {
+    if (method === 'POST' &&
+        segments[0] === 'integrations' &&
+        segments[1] === 'neon' &&
+        segments[2] === 'upgrade' &&
+        segments.length === 3) {
         const body = await readBody(req);
         const namespace = body.namespace;
         const envKey = body.envKey;
         const projectName = body.projectName;
         const projectId = body.projectId;
-        const mode = (body.mode ?? 'reuse');
+        const mode = body.mode ?? 'reuse';
         const authorization = req.headers.authorization;
         if (!namespace)
             throw new Error('namespace is required.');
@@ -646,8 +688,9 @@ async function handleRoute(req, res, opts) {
             throw new Error(`Only D1-backed single database blocks can be upgraded automatically. '${namespace}' is on '${provider}'.`);
         }
         const effectiveEnvKey = resolveRequestedPostgresEnvKey(namespace, envKey);
+        const namespaceLabel = sanitizeForLog(namespace);
         console.log();
-        console.log(chalk.blue(`📦 Starting D1 -> Postgres migration for database block '${namespace}'...`));
+        console.log(chalk.blue(`📦 Starting D1 -> Postgres migration for database block '${namespaceLabel}'...`));
         console.log(chalk.dim('  This migrates every table in the block, not just the current table.'));
         console.log(chalk.dim('  1/4 Exporting all tables from D1...'));
         const dump = await callWorkerAdmin(opts, authorization, 'data/backup/dump-data', { namespace });
@@ -675,7 +718,7 @@ async function handleRoute(req, res, opts) {
             tables: dump.tables,
             skipWipe: false,
         });
-        console.log(chalk.green(`✓ Database block '${namespace}' is now running on Postgres (${dumpedTableCount} table${dumpedTableCount === 1 ? '' : 's'} restored).`));
+        console.log(chalk.green(`✓ Database block '${namespaceLabel}' is now running on Postgres (${dumpedTableCount} table${dumpedTableCount === 1 ? '' : 's'} restored).`));
         json(res, 200, {
             ok: true,
             mode,
@@ -687,12 +730,16 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // GET /integrations/neon/projects — list existing Neon projects for dashboard selection
-    if (method === 'GET' && segments[0] === 'integrations' && segments[1] === 'neon' && segments[2] === 'projects' && segments.length === 3) {
+    if (method === 'GET' &&
+        segments[0] === 'integrations' &&
+        segments[1] === 'neon' &&
+        segments[2] === 'projects' &&
+        segments.length === 3) {
         const forceRefresh = url.searchParams.get('refresh') === '1';
-        const isCacheFresh = !forceRefresh
-            && neonProjectsCache
-            && (Date.now() - neonProjectsCache.loadedAt) < NEON_PROJECT_CACHE_TTL_MS;
-        const items = (isCacheFresh && neonProjectsCache)
+        const isCacheFresh = !forceRefresh &&
+            neonProjectsCache &&
+            Date.now() - neonProjectsCache.loadedAt < NEON_PROJECT_CACHE_TTL_MS;
+        const items = isCacheFresh && neonProjectsCache
             ? neonProjectsCache.items
             : await listAvailableNeonProjects({
                 projectDir: opts.projectDir,
@@ -707,7 +754,11 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // POST /schema/storage/buckets — create storage bucket
-    if (method === 'POST' && segments[0] === 'schema' && segments[1] === 'storage' && segments[2] === 'buckets' && segments.length === 3) {
+    if (method === 'POST' &&
+        segments[0] === 'schema' &&
+        segments[1] === 'storage' &&
+        segments[2] === 'buckets' &&
+        segments.length === 3) {
         const body = await readBody(req);
         const name = body.name;
         if (!name)
@@ -717,7 +768,10 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // DELETE /schema/tables/:name — delete table
-    if (method === 'DELETE' && segments[0] === 'schema' && segments[1] === 'tables' && segments.length === 3) {
+    if (method === 'DELETE' &&
+        segments[0] === 'schema' &&
+        segments[1] === 'tables' &&
+        segments.length === 3) {
         const tableName = segments[2];
         const body = await readBody(req);
         const dbKey = body.dbKey || 'shared';
@@ -726,7 +780,11 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // PUT /schema/tables/:name/rename — rename table
-    if (method === 'PUT' && segments[0] === 'schema' && segments[1] === 'tables' && segments[3] === 'rename' && segments.length === 4) {
+    if (method === 'PUT' &&
+        segments[0] === 'schema' &&
+        segments[1] === 'tables' &&
+        segments[3] === 'rename' &&
+        segments.length === 4) {
         const tableName = segments[2];
         const body = await readBody(req);
         const dbKey = body.dbKey || 'shared';
@@ -753,7 +811,11 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // POST /schema/tables/:name/columns — add column
-    if (method === 'POST' && segments[0] === 'schema' && segments[1] === 'tables' && segments[3] === 'columns' && segments.length === 4) {
+    if (method === 'POST' &&
+        segments[0] === 'schema' &&
+        segments[1] === 'tables' &&
+        segments[3] === 'columns' &&
+        segments.length === 4) {
         const tableName = segments[2];
         const body = await readBody(req);
         const dbKey = body.dbKey || 'shared';
@@ -768,7 +830,11 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // PUT /schema/tables/:name/columns/:col — update column
-    if (method === 'PUT' && segments[0] === 'schema' && segments[1] === 'tables' && segments[3] === 'columns' && segments.length === 5) {
+    if (method === 'PUT' &&
+        segments[0] === 'schema' &&
+        segments[1] === 'tables' &&
+        segments[3] === 'columns' &&
+        segments.length === 5) {
         const tableName = segments[2];
         const columnName = segments[4];
         const body = await readBody(req);
@@ -781,7 +847,11 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // DELETE /schema/tables/:name/columns/:col — remove column
-    if (method === 'DELETE' && segments[0] === 'schema' && segments[1] === 'tables' && segments[3] === 'columns' && segments.length === 5) {
+    if (method === 'DELETE' &&
+        segments[0] === 'schema' &&
+        segments[1] === 'tables' &&
+        segments[3] === 'columns' &&
+        segments.length === 5) {
         const tableName = segments[2];
         const columnName = segments[4];
         const body = await readBody(req);
@@ -791,7 +861,11 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // POST /schema/tables/:name/indexes — add index
-    if (method === 'POST' && segments[0] === 'schema' && segments[1] === 'tables' && segments[3] === 'indexes' && segments.length === 4) {
+    if (method === 'POST' &&
+        segments[0] === 'schema' &&
+        segments[1] === 'tables' &&
+        segments[3] === 'indexes' &&
+        segments.length === 4) {
         const tableName = segments[2];
         const body = await readBody(req);
         const dbKey = body.dbKey || 'shared';
@@ -803,7 +877,11 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // DELETE /schema/tables/:name/indexes/:idx — remove index
-    if (method === 'DELETE' && segments[0] === 'schema' && segments[1] === 'tables' && segments[3] === 'indexes' && segments.length === 5) {
+    if (method === 'DELETE' &&
+        segments[0] === 'schema' &&
+        segments[1] === 'tables' &&
+        segments[3] === 'indexes' &&
+        segments.length === 5) {
         const tableName = segments[2];
         const indexIdx = parseInt(segments[4], 10);
         const body = await readBody(req);
@@ -813,7 +891,11 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // PUT /schema/tables/:name/fts — set FTS fields
-    if (method === 'PUT' && segments[0] === 'schema' && segments[1] === 'tables' && segments[3] === 'fts' && segments.length === 4) {
+    if (method === 'PUT' &&
+        segments[0] === 'schema' &&
+        segments[1] === 'tables' &&
+        segments[3] === 'fts' &&
+        segments.length === 4) {
         const tableName = segments[2];
         const body = await readBody(req);
         const dbKey = body.dbKey || 'shared';
@@ -824,14 +906,20 @@ async function handleRoute(req, res, opts) {
     }
     // ─── Auth Settings Editing ───
     // GET /auth/settings — read current auth config
-    if (method === 'GET' && segments[0] === 'auth' && segments[1] === 'settings' && segments.length === 2) {
+    if (method === 'GET' &&
+        segments[0] === 'auth' &&
+        segments[1] === 'settings' &&
+        segments.length === 2) {
         const target = parseAuthSettingsTarget(url.searchParams.get('target'));
         const config = loadSidecarConfig(opts, target);
         json(res, 200, { ok: true, target, ...readAuthSettings(config) });
         return;
     }
     // PUT /auth/settings — save auth config
-    if (method === 'PUT' && segments[0] === 'auth' && segments[1] === 'settings' && segments.length === 2) {
+    if (method === 'PUT' &&
+        segments[0] === 'auth' &&
+        segments[1] === 'settings' &&
+        segments.length === 2) {
         const target = parseAuthSettingsTarget(url.searchParams.get('target'));
         const body = await readBody(req);
         const session = body.session;
@@ -903,7 +991,10 @@ async function handleRoute(req, res, opts) {
     }
     // ─── Email Template Editing ───
     // PUT /email/templates — save email subject/template override (with optional locale)
-    if (method === 'PUT' && segments[0] === 'email' && segments[1] === 'templates' && segments.length === 2) {
+    if (method === 'PUT' &&
+        segments[0] === 'email' &&
+        segments[1] === 'templates' &&
+        segments.length === 2) {
         const body = await readBody(req);
         const type = body.type;
         const locale = body.locale ?? 'en';
@@ -953,13 +1044,18 @@ async function handleRoute(req, res, opts) {
         return;
     }
     // GET /email/templates — read current email config
-    if (method === 'GET' && segments[0] === 'email' && segments[1] === 'templates' && segments.length === 2) {
+    if (method === 'GET' &&
+        segments[0] === 'email' &&
+        segments[1] === 'templates' &&
+        segments.length === 2) {
         // Re-read the full config to get email section
         try {
             const projectDir = resolve(opts.configPath, '..');
+            const moduleUrl = pathToFileURL(resolve(opts.configPath)).href;
             const result = execTsxSync([
                 '-e',
-                `import c from ${JSON.stringify(opts.configPath)}; const d=c.default??c; const e=d.email??{}; console.log(JSON.stringify({appName:e.appName||'EdgeBase',subjects:e.subjects||{},templates:e.templates||{}}));`,
+                `(async()=>{const moduleUrl=process.argv[1];const mod=await import(moduleUrl);const d=mod.default??mod;const e=d.email??{};console.log(JSON.stringify({appName:e.appName||'EdgeBase',subjects:e.subjects||{},templates:e.templates||{}}));})().catch((error)=>{console.error(error instanceof Error?error.message:String(error));process.exit(1);});`,
+                moduleUrl,
             ], { cwd: projectDir, encoding: 'utf-8', timeout: 10000, stdio: ['pipe', 'pipe', 'ignore'] }).trim();
             const emailConfig = JSON.parse(result);
             json(res, 200, { ok: true, ...emailConfig });
@@ -1002,7 +1098,7 @@ export function startSidecar(opts) {
             console.log(chalk.dim(`  📐 Schema Editor sidecar skipped (:${opts.port} already in use)`));
             return;
         }
-        console.log(chalk.dim('  📐 Schema Editor sidecar skipped:'), err.message);
+        console.log(chalk.dim('  📐 Schema Editor sidecar skipped:'), sanitizeForLog(err.message));
     });
     server.listen(opts.port, () => {
         console.log(chalk.dim(`  📐 Schema Editor sidecar on :${opts.port}`));
@@ -1034,7 +1130,8 @@ export function parseEnvFile(filePath) {
             const key = trimmed.slice(0, eqIdx).trim();
             let value = trimmed.slice(eqIdx + 1).trim();
             // Strip surrounding quotes
-            if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
+            if ((value.startsWith('"') && value.endsWith('"')) ||
+                (value.startsWith("'") && value.endsWith("'"))) {
                 value = value.slice(1, -1);
             }
             vars[key] = value;