@authrim/setup 0.1.63 → 0.1.64

package/dist/core/wrangler-sync.js

@@ -0,0 +1,242 @@
+/**
+ * Wrangler Configuration Sync Utility
+ *
+ * Manages synchronization between master wrangler.toml files in .authrim/{env}/wrangler/
+ * and the deployment copies in packages/ar-star/wrangler.{env}.toml.
+ *
+ * Features:
+ * - Detects manual modifications to deployment configs
+ * - Protects user edits from being overwritten
+ * - Maintains portable master copies in environment directory
+ */
+import { existsSync } from 'node:fs';
+import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { join, basename } from 'node:path';
+import { getEnvironmentPaths } from './paths.js';
+import { generateWranglerConfig, toToml } from './wrangler.js';
+import { CORE_WORKER_COMPONENTS } from './naming.js';
+// =============================================================================
+// Utility Functions
+// =============================================================================
+/**
+ * Normalize TOML content for comparison (remove comments, whitespace variations)
+ */
+function normalizeToml(content) {
+    return content
+        .split('\n')
+        .map(line => line.trim())
+        .filter(line => line && !line.startsWith('#'))
+        .join('\n');
+}
+/**
+ * Get the master wrangler.toml path for a component
+ */
+export function getMasterWranglerPath(envPaths, component) {
+    return join(envPaths.wrangler, `${component}.toml`);
+}
+/**
+ * Get the deploy wrangler.toml path for a component
+ */
+export function getDeployWranglerPath(packagesDir, component, env) {
+    return join(packagesDir, component, `wrangler.${env}.toml`);
+}
+// =============================================================================
+// Status Check
+// =============================================================================
+/**
+ * Check the sync status of all wrangler configs
+ */
+export async function checkWranglerStatus(options) {
+    const { baseDir, env, packagesDir } = options;
+    const envPaths = getEnvironmentPaths({ baseDir, env });
+    const results = [];
+    for (const component of CORE_WORKER_COMPONENTS) {
+        const masterPath = getMasterWranglerPath(envPaths, component);
+        const deployPath = getDeployWranglerPath(packagesDir, component, env);
+        const masterExists = existsSync(masterPath);
+        const deployExists = existsSync(deployPath);
+        let inSync = true;
+        if (masterExists && deployExists) {
+            const masterContent = await readFile(masterPath, 'utf-8');
+            const deployContent = await readFile(deployPath, 'utf-8');
+            inSync = normalizeToml(masterContent) === normalizeToml(deployContent);
+        }
+        else if (masterExists !== deployExists) {
+            inSync = false;
+        }
+        results.push({
+            component,
+            masterExists,
+            deployExists,
+            inSync,
+            masterPath,
+            deployPath,
+        });
+    }
+    return results;
+}
+// =============================================================================
+// Generate and Save Master Configs
+// =============================================================================
+/**
+ * Generate and save master wrangler.toml files to .authrim/{env}/wrangler/
+ */
+export async function saveMasterWranglerConfigs(config, resourceIds, options) {
+    const { baseDir, env, dryRun, onProgress } = options;
+    const envPaths = getEnvironmentPaths({ baseDir, env });
+    const files = [];
+    const errors = [];
+    // Create wrangler directory
+    if (!dryRun) {
+        await mkdir(envPaths.wrangler, { recursive: true });
+    }
+    for (const component of CORE_WORKER_COMPONENTS) {
+        try {
+            const wranglerConfig = generateWranglerConfig(component, config, resourceIds);
+            const tomlContent = toToml(wranglerConfig);
+            const masterPath = getMasterWranglerPath(envPaths, component);
+            if (!dryRun) {
+                await writeFile(masterPath, tomlContent, 'utf-8');
+                onProgress?.(`  Saved ${component}.toml`);
+            }
+            else {
+                onProgress?.(`  Would save ${component}.toml`);
+            }
+            files.push(masterPath);
+        }
+        catch (error) {
+            errors.push(`${component}: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    return { success: errors.length === 0, files, errors };
+}
+// =============================================================================
+// Sync to Deploy Location
+// =============================================================================
+/**
+ * Sync master wrangler configs to deployment locations
+ *
+ * This copies from .authrim/{env}/wrangler/ to packages/ar-star/wrangler.{env}.toml
+ * while detecting and protecting manual edits.
+ */
+export async function syncWranglerConfigs(options, onManualEdit) {
+    const { baseDir, env, packagesDir, force, dryRun, onProgress } = options;
+    const envPaths = getEnvironmentPaths({ baseDir, env });
+    const result = {
+        success: true,
+        synced: [],
+        manualEdits: [],
+        skipped: [],
+        errors: [],
+    };
+    // Check if master wrangler directory exists
+    if (!existsSync(envPaths.wrangler)) {
+        result.errors.push('Master wrangler directory not found. Run init first.');
+        result.success = false;
+        return result;
+    }
+    for (const component of CORE_WORKER_COMPONENTS) {
+        const masterPath = getMasterWranglerPath(envPaths, component);
+        const deployPath = getDeployWranglerPath(packagesDir, component, env);
+        const componentDir = join(packagesDir, component);
+        // Skip if component directory doesn't exist
+        if (!existsSync(componentDir)) {
+            result.skipped.push(component);
+            continue;
+        }
+        // Skip if master doesn't exist
+        if (!existsSync(masterPath)) {
+            result.skipped.push(component);
+            continue;
+        }
+        try {
+            const masterContent = await readFile(masterPath, 'utf-8');
+            // Check if deploy file exists and is different
+            if (existsSync(deployPath)) {
+                const deployContent = await readFile(deployPath, 'utf-8');
+                const masterNormalized = normalizeToml(masterContent);
+                const deployNormalized = normalizeToml(deployContent);
+                if (masterNormalized === deployNormalized) {
+                    // Already in sync
+                    result.synced.push(component);
+                    continue;
+                }
+                // Manual edit detected
+                result.manualEdits.push(component);
+                if (!force && onManualEdit) {
+                    const action = await onManualEdit(component, masterPath, deployPath);
+                    switch (action) {
+                        case 'keep':
+                            onProgress?.(`  ${component}: Keeping manual changes`);
+                            continue;
+                        case 'backup':
+                            if (!dryRun) {
+                                const backupPath = deployPath + '.backup';
+                                await writeFile(backupPath, deployContent, 'utf-8');
+                                onProgress?.(`  ${component}: Backed up to ${basename(backupPath)}`);
+                            }
+                            // Fall through to overwrite
+                            break;
+                        case 'overwrite':
+                            // Continue to overwrite
+                            break;
+                    }
+                }
+            }
+            // Write master content to deploy location
+            if (!dryRun) {
+                await writeFile(deployPath, masterContent, 'utf-8');
+                onProgress?.(`  ${component}: Synced`);
+            }
+            else {
+                onProgress?.(`  ${component}: Would sync`);
+            }
+            result.synced.push(component);
+        }
+        catch (error) {
+            result.errors.push(`${component}: ${error instanceof Error ? error.message : String(error)}`);
+            result.success = false;
+        }
+    }
+    return result;
+}
+// =============================================================================
+// Backup and Restore
+// =============================================================================
+/**
+ * Backup deploy wrangler configs before sync
+ */
+export async function backupDeployConfigs(options) {
+    const { env, packagesDir, onProgress } = options;
+    const backedUp = [];
+    for (const component of CORE_WORKER_COMPONENTS) {
+        const deployPath = getDeployWranglerPath(packagesDir, component, env);
+        if (existsSync(deployPath)) {
+            const content = await readFile(deployPath, 'utf-8');
+            const backupPath = deployPath + '.backup';
+            await writeFile(backupPath, content, 'utf-8');
+            backedUp.push(component);
+            onProgress?.(`  Backed up ${component}/wrangler.${env}.toml`);
+        }
+    }
+    return backedUp;
+}
+/**
+ * Restore deploy wrangler configs from backup
+ */
+export async function restoreDeployConfigs(options) {
+    const { env, packagesDir, onProgress } = options;
+    const restored = [];
+    for (const component of CORE_WORKER_COMPONENTS) {
+        const deployPath = getDeployWranglerPath(packagesDir, component, env);
+        const backupPath = deployPath + '.backup';
+        if (existsSync(backupPath)) {
+            const content = await readFile(backupPath, 'utf-8');
+            await writeFile(deployPath, content, 'utf-8');
+            restored.push(component);
+            onProgress?.(`  Restored ${component}/wrangler.${env}.toml`);
+        }
+    }
+    return restored;
+}
+//# sourceMappingURL=wrangler-sync.js.map

package/dist/core/wrangler-sync.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrangler-sync.js","sourceRoot":"","sources":["../../src/core/wrangler-sync.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -14,6 +14,7 @@ import { deployCommand, statusCommand } from './cli/commands/deploy.js';
 import { configCommand } from './cli/commands/config.js';
 import { deleteCommand } from './cli/commands/delete.js';
 import { infoCommand } from './cli/commands/info.js';
+import { migrateCommand, migrateStatusCommand } from './cli/commands/migrate.js';
 // Read version from package.json
 const require = createRequire(import.meta.url);
 const pkg = require('../package.json');
@@ -62,7 +63,8 @@ program
     .option('--show', 'Show current configuration')
     .option('--validate', 'Validate configuration file')
     .option('--json', 'Output in JSON format for scripting')
-    .option('--config <path>', 'Configuration file path', 'authrim-config.json')
+    .option('--config <path>', 'Configuration file path')
+    .option('--env <name>', 'Environment name (auto-detects config path)')
     .action(configCommand);
 program
     .command('manage')
@@ -181,5 +183,18 @@ program
     .option('--d1', 'Show only D1 database information')
     .option('--workers', 'Show only Worker information')
     .action(infoCommand);
+program
+    .command('migrate')
+    .description('Migrate from legacy flat file structure to new .authrim/{env}/ structure')
+    .option('--env <name>', 'Migrate specific environment only')
+    .option('--dry-run', 'Show what would be done without making changes')
+    .option('--no-backup', 'Skip backup creation')
+    .option('--delete-legacy', 'Delete legacy files after successful migration')
+    .option('-y, --yes', 'Skip confirmation prompts')
+    .action(migrateCommand);
+program
+    .command('migrate-status')
+    .description('Show current directory structure status and migration recommendation')
+    .action(migrateStatusCommand);
 program.parse();
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/web/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/web/api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAiD5B;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAG7C;AAED;;GAEG;AACH,wBAAgB,eAAe,IAAI,MAAM,CAExC;AA0ED,wBAAgB,eAAe,IAAI,IAAI,CA00BtC"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/web/api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAwD5B;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAG7C;AAED;;GAEG;AACH,wBAAgB,eAAe,IAAI,MAAM,CAExC;AA0ED,wBAAgB,eAAe,IAAI,IAAI,CAs5BtC"}

package/dist/web/api.js

@@ -18,6 +18,7 @@ import { isWranglerInstalled, checkAuth, provisionResources, detectEnvironments,
 import { AuthrimConfigSchema, createDefaultConfig, D1LocationSchema, D1JurisdictionSchema, } from '../core/config.js';
 import { generateAllSecrets, saveKeysToDirectory, keysExistForEnvironment } from '../core/keys.js';
 import { createLockFile, saveLockFile, loadLockFile } from '../core/lock.js';
+import { getEnvironmentPaths, resolvePaths, listEnvironments, } from '../core/paths.js';
 import { generateWranglerConfig, toToml } from '../core/wrangler.js';
 import { deployAll, uploadSecrets, buildApiPackages, deployPages, } from '../core/deploy.js';
 import { getEnabledComponents } from '../core/naming.js';
@@ -132,10 +133,42 @@ export function createApiRoutes() {
         });
     });
     // Load existing config (no auth required - read-only)
+    // Supports both new (.authrim/{env}/config.json) and legacy (authrim-config.json) structures
     api.get('/config', async (c) => {
-        const configPath = 'authrim-config.json';
+        const envParam = c.req.query('env');
+        const baseDir = process.cwd();
+        // Find config file
+        let configPath = null;
+        let structureType = 'legacy';
+        if (envParam) {
+            // Specific environment requested
+            const resolved = resolvePaths({ baseDir, env: envParam });
+            if (resolved.type === 'new') {
+                configPath = resolved.paths.config;
+                structureType = 'new';
+            }
+            else {
+                configPath = resolved.paths.config;
+                structureType = 'legacy';
+            }
+        }
+        else {
+            // Auto-detect: try new structure first, then legacy
+            const environments = listEnvironments(baseDir);
+            if (environments.length > 0) {
+                const envPaths = getEnvironmentPaths({ baseDir, env: environments[0] });
+                if (existsSync(envPaths.config)) {
+                    configPath = envPaths.config;
+                    structureType = 'new';
+                }
+            }
+            if (!configPath || !existsSync(configPath)) {
+                configPath = 'authrim-config.json';
+                structureType = 'legacy';
+            }
+        }
         if (!existsSync(configPath)) {
-            return c.json({ exists: false, config: null });
+            return c.json({ exists: false, config: null, structure: structureType, environments: listEnvironments(baseDir) });
         }
         try {
             const content = await readFile(configPath, 'utf-8');
@@ -147,6 +180,9 @@ export function createApiRoutes() {
                     exists: true,
                     config: rawConfig,
                     valid: false,
+                    structure: structureType,
+                    configPath,
+                    environments: listEnvironments(baseDir),
                     errors: parseResult.error.errors.map((e) => ({
                         path: e.path.join('.'),
                         message: e.message,
@@ -154,7 +190,14 @@ export function createApiRoutes() {
                 });
             }
             state.config = parseResult.data;
-            return c.json({ exists: true, config: parseResult.data, valid: true });
+            return c.json({
+                exists: true,
+                config: parseResult.data,
+                valid: true,
+                structure: structureType,
+                configPath,
+                environments: listEnvironments(baseDir),
+            });
         }
         catch (error) {
             if (error instanceof SyntaxError) {
@@ -187,14 +230,23 @@ export function createApiRoutes() {
         }
     });
     // Save config (with lock to prevent race conditions)
+    // Saves to new structure: .authrim/{env}/config.json
     api.post('/config', async (c) => {
         return withLock(async () => {
             try {
                 const body = await c.req.json();
                 const config = AuthrimConfigSchema.parse(body);
-                await writeFile('authrim-config.json', JSON.stringify(config, null, 2));
+                const baseDir = process.cwd();
+                const env = config.environment.prefix;
+                // Use new structure for saving
+                const envPaths = getEnvironmentPaths({ baseDir, env });
+                // Ensure directory exists
+                const { mkdir } = await import('node:fs/promises');
+                await mkdir(envPaths.root, { recursive: true });
+                // Save config
+                await writeFile(envPaths.config, JSON.stringify(config, null, 2));
                 state.config = config;
-                return c.json({ success: true });
+                return c.json({ success: true, configPath: envPaths.config, structure: 'new' });
             }
             catch (error) {
                 if (error instanceof z.ZodError) {
@@ -262,21 +314,26 @@ export function createApiRoutes() {
         }
     });
     // Generate keys (with lock)
+    // Saves to new structure: .authrim/{env}/keys/
     api.post('/keys/generate', async (c) => {
         return withLock(async () => {
             try {
                 const body = await c.req.json();
-                const { keyId, keysDir = '.keys', env } = body;
+                const { keyId, env } = body;
+                const baseDir = process.cwd();
                 addProgress('Generating cryptographic keys...');
                 const secrets = generateAllSecrets(keyId);
-                addProgress(`Saving keys to directory: .keys/${env || 'default'}/`);
-                await saveKeysToDirectory(secrets, keysDir, env);
+                // Use new structure for saving keys
+                const envPaths = getEnvironmentPaths({ baseDir, env: env || 'default' });
+                addProgress(`Saving keys to directory: ${envPaths.keys}/`);
+                await saveKeysToDirectory(secrets, { baseDir, env: env || 'default' });
                 addProgress('Keys generated successfully');
                 // Only return public information
                 return c.json({
                     success: true,
                     keyId: secrets.keyPair.keyId,
                     publicKeyJwk: secrets.keyPair.publicKeyJwk,
+                    keysPath: envPaths.keys,
                 });
             }
             catch (error) {
@@ -311,19 +368,19 @@ export function createApiRoutes() {
                     // Warning but not an error - just log it
                     addProgress('Warning: Resend API key should start with "re_"');
                 }
-                // Save secrets to keys directory
-                const keysDir = `.keys/${env}`;
+                // Save secrets to keys directory (use new structure)
+                const baseDir = process.cwd();
+                const envPaths = getEnvironmentPaths({ baseDir, env });
+                const keysDir = envPaths.keys;
                 // Ensure directory exists
                 const { mkdir } = await import('node:fs/promises');
                 await mkdir(keysDir, { recursive: true });
                 // Save API key
-                const apiKeyFile = join(keysDir, 'resend_api_key.txt');
-                await writeFile(apiKeyFile, apiKey.trim());
-                addProgress(`Saved ${provider} API key to ${apiKeyFile}`);
+                await writeFile(envPaths.keyFiles.resendApiKey, apiKey.trim());
+                addProgress(`Saved ${provider} API key to ${envPaths.keyFiles.resendApiKey}`);
                 // Save from address
-                const fromAddressFile = join(keysDir, 'email_from.txt');
-                await writeFile(fromAddressFile, fromAddress.trim());
-                addProgress(`Saved email from address to ${fromAddressFile}`);
+                await writeFile(envPaths.keyFiles.emailFrom, fromAddress.trim());
+                addProgress(`Saved email from address to ${envPaths.keyFiles.emailFrom}`);
                 // Save from name if provided
                 if (fromName) {
                     const fromNameFile = join(keysDir, 'email_from_name.txt');
@@ -500,19 +557,27 @@ export function createApiRoutes() {
                     addProgress('Packages built successfully');
                 }
                 // Upload secrets first (secrets are read but not stored in state)
-                // Keys are stored in .keys/{env}/ directory
-                const keysDir = `.keys/${env}`;
+                // Check both new (.authrim/{env}/keys/) and legacy (.keys/{env}/) structures
+                const baseDir = process.cwd();
+                const resolved = resolvePaths({ baseDir, env });
+                let keysDir;
+                if (resolved.type === 'new') {
+                    keysDir = resolved.paths.keys;
+                }
+                else {
+                    keysDir = resolved.paths.keys;
+                }
                 if (!dryRun && existsSync(keysDir)) {
                     addProgress(`Uploading secrets from ${keysDir}...`);
                     const secrets = {};
                     const secretFiles = [
-                        { file: `${keysDir}/private.pem`, name: 'PRIVATE_KEY_PEM' },
-                        { file: `${keysDir}/rp_token_encryption_key.txt`, name: 'RP_TOKEN_ENCRYPTION_KEY' },
-                        { file: `${keysDir}/admin_api_secret.txt`, name: 'ADMIN_API_SECRET' },
-                        { file: `${keysDir}/key_manager_secret.txt`, name: 'KEY_MANAGER_SECRET' },
+                        { file: join(keysDir, 'private.pem'), name: 'PRIVATE_KEY_PEM' },
+                        { file: join(keysDir, 'rp_token_encryption_key.txt'), name: 'RP_TOKEN_ENCRYPTION_KEY' },
+                        { file: join(keysDir, 'admin_api_secret.txt'), name: 'ADMIN_API_SECRET' },
+                        { file: join(keysDir, 'key_manager_secret.txt'), name: 'KEY_MANAGER_SECRET' },
                         // Email provider secrets (optional)
-                        { file: `${keysDir}/resend_api_key.txt`, name: 'RESEND_API_KEY' },
-                        { file: `${keysDir}/email_from.txt`, name: 'EMAIL_FROM' },
+                        { file: join(keysDir, 'resend_api_key.txt'), name: 'RESEND_API_KEY' },
+                        { file: join(keysDir, 'email_from.txt'), name: 'EMAIL_FROM' },
                     ];
                     for (const { file, name } of secretFiles) {
                         if (existsSync(file)) {
@@ -636,22 +701,31 @@ export function createApiRoutes() {
         });
     });
     // Complete initial admin setup (store setup token in KV)
+    // Supports both new (.authrim/{env}/keys/) and legacy (.keys/{env}/) structures
     api.post('/admin/setup', async (c) => {
         return withLock(async () => {
             try {
                 const body = await c.req.json();
-                const { env, baseUrl, keysDir = '.keys' } = body;
-                addProgress(`Admin setup request: env=${env}, baseUrl=${baseUrl}, keysDir=${keysDir}`);
+                const { env, baseUrl } = body;
+                const baseDir = process.cwd();
+                // Determine structure type
+                const resolved = resolvePaths({ baseDir, env });
+                const isLegacy = resolved.type === 'legacy';
+                const tokenPath = isLegacy
+                    ? resolved.paths.keyFiles.setupToken
+                    : resolved.paths.keyFiles.setupToken;
+                addProgress(`Admin setup request: env=${env}, baseUrl=${baseUrl}, structure=${resolved.type}`);
                 if (!env || !baseUrl) {
                     addProgress('Error: env and baseUrl are required');
                     return c.json({ success: false, error: 'env and baseUrl are required' }, 400);
                 }
                 addProgress('Setting up initial admin...');
-                addProgress(`Looking for setup token at: ${keysDir}/${env}/setup_token.txt`);
+                addProgress(`Looking for setup token at: ${tokenPath}`);
                 const result = await completeInitialSetup({
                     env,
                     baseUrl,
-                    keysDir,
+                    baseDir,
+                    legacy: isLegacy,
                     onProgress: addProgress,
                 });
                 addProgress(`completeInitialSetup result: ${JSON.stringify(result)}`);