@tamyla/clodo-framework 3.0.11 → 3.0.13

package/dist/orchestration/multi-domain-orchestrator.js

@@ -39,6 +39,13 @@ export class MultiDomainOrchestrator {
     this.cloudflareToken = options.cloudflareToken;
     this.cloudflareAccountId = options.cloudflareAccountId;
 
+    // Configure wrangler to use API token when available
+    // This ensures all wrangler operations use the same account as API operations
+    if (this.cloudflareToken) {
+      process.env.CLOUDFLARE_API_TOKEN = this.cloudflareToken;
+      console.log(`🔑 Configured wrangler to use API token authentication`);
+    }
+
     // Initialize modular components
     this.domainResolver = new DomainResolver({
       environment: this.environment,
@@ -74,7 +81,8 @@ export class MultiDomainOrchestrator {
     this.wranglerConfigManager = new WranglerConfigManager({
       projectRoot: this.servicePath,
       dryRun: this.dryRun,
-      verbose: options.verbose || false
+      verbose: options.verbose || false,
+      accountId: this.cloudflareAccountId
     });
 
     // ConfigurationValidator is a static class - don't instantiate
@@ -283,26 +291,60 @@ export class MultiDomainOrchestrator {
       // Use API-based operations if credentials are available
       if (this.cloudflareToken && this.cloudflareAccountId) {
         console.log(`     🔑 Using API token authentication for account: ${this.cloudflareAccountId}`);
-        exists = await databaseExists(databaseName, {
-          apiToken: this.cloudflareToken,
-          accountId: this.cloudflareAccountId
-        });
-        if (exists) {
-          console.log(`   ✅ Database already exists: ${databaseName}`);
-          databaseId = await getDatabaseId(databaseName, {
+        try {
+          exists = await databaseExists(databaseName, {
             apiToken: this.cloudflareToken,
             accountId: this.cloudflareAccountId
           });
-          console.log(`   📊 Existing Database ID: ${databaseId}`);
-        } else {
-          console.log(`     📦 Creating database: ${databaseName}`);
-          databaseId = await createDatabase(databaseName, {
-            apiToken: this.cloudflareToken,
-            accountId: this.cloudflareAccountId
-          });
-          console.log(`   ✅ Database created: ${databaseName}`);
-          console.log(`   📊 Database ID: ${databaseId}`);
-          created = true;
+          if (exists) {
+            console.log(`   ✅ Database already exists: ${databaseName}`);
+            databaseId = await getDatabaseId(databaseName, {
+              apiToken: this.cloudflareToken,
+              accountId: this.cloudflareAccountId
+            });
+            console.log(`   📊 Existing Database ID: ${databaseId}`);
+          } else {
+            console.log(`     📦 Creating database: ${databaseName}`);
+            databaseId = await createDatabase(databaseName, {
+              apiToken: this.cloudflareToken,
+              accountId: this.cloudflareAccountId
+            });
+            console.log(`   ✅ Database created: ${databaseName}`);
+            console.log(`   📊 Database ID: ${databaseId}`);
+            created = true;
+          }
+        } catch (apiError) {
+          // Check if this is an authentication or permission error
+          if (apiError.message.includes('permission denied') || apiError.message.includes('403') || apiError.message.includes('authentication failed') || apiError.message.includes('401')) {
+            if (apiError.message.includes('401')) {
+              console.log(`   ❌ API token authentication failed (invalid/expired token)`);
+              console.log(`   🔗 Check/create token at: https://dash.cloudflare.com/profile/api-tokens`);
+            } else {
+              console.log(`   ⚠️  API token lacks D1 database permissions`);
+              console.log(`   💡 Required permission: 'Cloudflare D1:Edit'`);
+              console.log(`   🔗 Update token at: https://dash.cloudflare.com/profile/api-tokens`);
+            }
+            console.log(`   🔄 Falling back to OAuth authentication...`);
+            console.log(`   ⚠️  WARNING: OAuth uses your personal account, not the API token account!`);
+
+            // Fall back to OAuth-based operations with warning
+            console.log(`     🔐 Using OAuth authentication (wrangler CLI)`);
+            exists = await databaseExists(databaseName);
+            if (exists) {
+              console.log(`   ✅ Database already exists: ${databaseName}`);
+              databaseId = await getDatabaseId(databaseName);
+              console.log(`   📊 Existing Database ID: ${databaseId}`);
+            } else {
+              console.log(`     📦 Creating database: ${databaseName}`);
+              databaseId = await createDatabase(databaseName);
+              console.log(`   ✅ Database created: ${databaseName}`);
+              console.log(`   📊 Database ID: ${databaseId}`);
+              created = true;
+            }
+          } else {
+            // Re-throw non-auth/permission errors
+            throw apiError;
+          }
         }
       } else {
         // Fallback to CLI-based operations (OAuth)
@@ -333,6 +375,11 @@ export class MultiDomainOrchestrator {
       console.log(`   📁 Service path: ${this.servicePath}`);
       console.log(`   📁 Current working directory: ${process.cwd()}`);
       try {
+        // Set account_id if API credentials are available
+        if (this.cloudflareAccountId) {
+          await this.wranglerConfigManager.setAccountId(this.cloudflareAccountId);
+        }
+
         // Ensure environment section exists
         await this.wranglerConfigManager.ensureEnvironment(this.environment);
 
@@ -550,7 +597,7 @@ export class MultiDomainOrchestrator {
   }
 
   /**
-   * Validate domain deployment with real HTTP health check
+   * Validate domain deployment with real HTTP health check (with retries)
    */
   async validateDomainDeployment(domain) {
     console.log(`   ✅ Validating deployment for ${domain}`);
@@ -567,54 +614,75 @@ export class MultiDomainOrchestrator {
       return true;
     }
     console.log(`   🔍 Running health check: ${deploymentUrl}/health`);
-    try {
-      const startTime = Date.now();
-
-      // Perform actual HTTP health check
-      const response = await fetch(`${deploymentUrl}/health`, {
-        method: 'GET',
-        headers: {
-          'User-Agent': 'Clodo-Orchestrator/2.0'
-        },
-        signal: AbortSignal.timeout(10000) // 10 second timeout
-      });
-      const responseTime = Date.now() - startTime;
-      const status = response.status;
-      if (status === 200) {
-        console.log(`   ✅ Health check passed (${status}) - Response time: ${responseTime}ms`);
-
-        // Log successful health check
-        this.stateManager.logAuditEvent('HEALTH_CHECK_PASSED', domain, {
-          url: deploymentUrl,
-          status,
-          responseTime,
-          environment: this.environment
-        });
-        return true;
-      } else {
-        console.log(`   ⚠️  Health check returned ${status} - deployment may have issues`);
-        this.stateManager.logAuditEvent('HEALTH_CHECK_WARNING', domain, {
-          url: deploymentUrl,
-          status,
-          responseTime,
-          environment: this.environment
+
+    // Retry logic for health checks
+    const maxRetries = 3;
+    const retryDelay = 5000; // 5 seconds between retries
+
+    for (let attempt = 1; attempt <= maxRetries; attempt++) {
+      try {
+        const startTime = Date.now();
+        console.log(`   Attempt ${attempt}/${maxRetries}...`);
+
+        // Perform actual HTTP health check
+        const response = await fetch(`${deploymentUrl}/health`, {
+          method: 'GET',
+          headers: {
+            'User-Agent': 'Clodo-Orchestrator/2.0'
+          },
+          signal: AbortSignal.timeout(15000) // 15 second timeout
         });
+        const responseTime = Date.now() - startTime;
+        const status = response.status;
+        if (status === 200) {
+          console.log(`   ✅ Health check passed (${status}) - Response time: ${responseTime}ms`);
+
+          // Log successful health check
+          this.stateManager.logAuditEvent('HEALTH_CHECK_PASSED', domain, {
+            url: deploymentUrl,
+            status,
+            responseTime,
+            attempt,
+            environment: this.environment
+          });
+          return true;
+        } else {
+          const errorMsg = `Health check returned ${status} - deployment may have issues`;
+          console.log(`   ⚠️  ${errorMsg}`);
+          this.stateManager.logAuditEvent('HEALTH_CHECK_WARNING', domain, {
+            url: deploymentUrl,
+            status,
+            responseTime,
+            attempt,
+            environment: this.environment
+          });
 
-        // Don't fail deployment for non-200 status, just warn
-        return true;
-      }
-    } catch (error) {
-      console.log(`   ⚠️  Health check failed: ${error.message}`);
-      console.log(`   💡 This may be expected if the worker isn't fully propagated yet`);
-      this.stateManager.logAuditEvent('HEALTH_CHECK_FAILED', domain, {
-        url: deploymentUrl,
-        error: error.message,
-        environment: this.environment
-      });
+          // Don't fail deployment for non-200 status, just warn
+          return true;
+        }
+      } catch (error) {
+        const isLastAttempt = attempt === maxRetries;
+        const errorMsg = `Health check failed: ${error.message}`;
+        if (isLastAttempt) {
+          console.log(`   ❌ ${errorMsg} (final attempt)`);
+          console.log(`   💡 The service may still be deploying. Check manually: curl ${deploymentUrl}/health`);
+          this.stateManager.logAuditEvent('HEALTH_CHECK_FAILED', domain, {
+            url: deploymentUrl,
+            error: error.message,
+            attempts: maxRetries,
+            environment: this.environment
+          });
 
-      // Don't fail deployment for health check failure - it might just need time
-      return true;
+          // Don't fail deployment for health check failure - it might just need time
+          return true;
+        } else {
+          console.log(`   ⚠️  ${errorMsg} (attempt ${attempt}/${maxRetries})`);
+          console.log(`   ⏳ Retrying in ${retryDelay / 1000} seconds...`);
+          await new Promise(resolve => setTimeout(resolve, retryDelay));
+        }
+      }
     }
+    return true;
   }
 
   /**

package/dist/service-management/AssessmentCache.js

@@ -0,0 +1,303 @@
+/**
+ * Assessment Cache System
+ *
+ * Caches assessment results to avoid redundant analysis of project artifacts.
+ * Provides intelligent cache invalidation based on file changes and time-based expiration.
+ */
+
+import crypto from 'crypto';
+import fs from 'fs/promises';
+import path from 'path';
+import { existsSync } from 'fs';
+export class AssessmentCache {
+  constructor(options = {}) {
+    this.cacheDir = options.cacheDir || './.clodo-cache/assessment';
+    this.ttl = options.ttl || 5 * 60 * 1000; // 5 minutes default
+    this.maxEntries = options.maxEntries || 50;
+    this.enableDiskCache = options.enableDiskCache !== false;
+    this.memoryCache = new Map();
+    this.initialized = false;
+  }
+
+  /**
+   * Initialize the cache system
+   */
+  async initialize() {
+    if (this.initialized) return;
+    if (this.enableDiskCache) {
+      await this.ensureCacheDirectory();
+      await this.loadFromDisk();
+    }
+    this.initialized = true;
+  }
+
+  /**
+   * Generate cache key from project state and inputs
+   */
+  async generateCacheKey(projectPath, inputs = {}) {
+    const keyData = {
+      projectPath: path.resolve(projectPath),
+      inputs: this.sanitizeInputs(inputs),
+      projectFiles: await this.getProjectFileHashes(projectPath)
+    };
+    const keyString = JSON.stringify(keyData, Object.keys(keyData).sort());
+    return crypto.createHash('sha256').update(keyString).digest('hex');
+  }
+
+  /**
+   * Sanitize inputs for cache key generation (remove sensitive data)
+   */
+  sanitizeInputs(inputs) {
+    const sanitized = {
+      ...inputs
+    };
+
+    // Remove sensitive fields but keep their presence for cache invalidation
+    const sensitiveFields = ['apiToken', 'cloudflareToken', 'token', 'secret', 'password'];
+    sensitiveFields.forEach(field => {
+      if (sanitized[field]) {
+        sanitized[field] = 'present'; // Just mark presence, not value
+      }
+    });
+    return sanitized;
+  }
+
+  /**
+   * Get hashes of relevant project files for cache invalidation
+   */
+  async getProjectFileHashes(projectPath) {
+    const relevantFiles = ['package.json', 'wrangler.toml', 'src/index.js', 'src/worker.js', 'dist/index.js'];
+    const hashes = {};
+    for (const file of relevantFiles) {
+      const filePath = path.join(projectPath, file);
+      try {
+        const stats = await fs.stat(filePath);
+        const content = await fs.readFile(filePath, 'utf8');
+        hashes[file] = {
+          mtime: stats.mtime.getTime(),
+          size: stats.size,
+          hash: crypto.createHash('md5').update(content).digest('hex').substring(0, 8)
+        };
+      } catch (error) {
+        // File doesn't exist, that's fine
+        hashes[file] = null;
+      }
+    }
+    return hashes;
+  }
+
+  /**
+   * Get cached assessment result
+   */
+  async get(cacheKey) {
+    await this.initialize();
+
+    // Check memory cache first
+    const memoryEntry = this.memoryCache.get(cacheKey);
+    if (memoryEntry && !this.isExpired(memoryEntry)) {
+      return memoryEntry.data;
+    }
+
+    // Check disk cache if enabled
+    if (this.enableDiskCache) {
+      const diskEntry = await this.loadFromDiskCache(cacheKey);
+      if (diskEntry && !this.isExpired(diskEntry)) {
+        // Restore to memory cache
+        this.memoryCache.set(cacheKey, diskEntry);
+        return diskEntry.data;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Store assessment result in cache
+   */
+  async set(cacheKey, data) {
+    await this.initialize();
+    const entry = {
+      data,
+      timestamp: Date.now(),
+      key: cacheKey
+    };
+
+    // Store in memory
+    this.memoryCache.set(cacheKey, entry);
+
+    // Store on disk if enabled
+    if (this.enableDiskCache) {
+      await this.saveToDiskCache(cacheKey, entry);
+    }
+
+    // Maintain cache size limits
+    await this.cleanup();
+  }
+
+  /**
+   * Check if cache entry is expired
+   */
+  isExpired(entry) {
+    return Date.now() - entry.timestamp > this.ttl;
+  }
+
+  /**
+   * Clear expired entries and maintain size limits
+   */
+  async cleanup() {
+    const now = Date.now();
+    const validEntries = new Map();
+
+    // Clean memory cache
+    for (const [key, entry] of this.memoryCache) {
+      if (!this.isExpired(entry)) {
+        validEntries.set(key, entry);
+      }
+    }
+
+    // If still too many entries, remove oldest
+    if (validEntries.size > this.maxEntries) {
+      const sortedEntries = Array.from(validEntries.entries()).sort((a, b) => a[1].timestamp - b[1].timestamp);
+      const toKeep = sortedEntries.slice(-this.maxEntries);
+      validEntries.clear();
+      toKeep.forEach(([key, entry]) => validEntries.set(key, entry));
+    }
+    this.memoryCache = validEntries;
+
+    // Clean disk cache
+    if (this.enableDiskCache) {
+      await this.cleanupDiskCache();
+    }
+  }
+
+  /**
+   * Clear all cache entries
+   */
+  async clear() {
+    this.memoryCache.clear();
+    if (this.enableDiskCache) {
+      await this.clearDiskCache();
+    }
+  }
+
+  /**
+   * Get cache statistics
+   */
+  async getStats() {
+    const now = Date.now();
+    const memoryEntries = Array.from(this.memoryCache.values());
+    return {
+      memory: {
+        total: memoryEntries.length,
+        valid: memoryEntries.filter(entry => !this.isExpired(entry)).length,
+        expired: memoryEntries.filter(entry => this.isExpired(entry)).length
+      },
+      disk: this.enableDiskCache ? await this.getDiskStats() : null,
+      ttl: this.ttl,
+      maxEntries: this.maxEntries
+    };
+  }
+
+  // Disk cache implementation
+  async ensureCacheDirectory() {
+    try {
+      await fs.mkdir(this.cacheDir, {
+        recursive: true
+      });
+    } catch (error) {
+      // Directory might already exist, ignore
+    }
+  }
+  getCacheFilePath(key) {
+    return path.join(this.cacheDir, `${key}.json`);
+  }
+  async saveToDiskCache(key, entry) {
+    try {
+      const filePath = this.getCacheFilePath(key);
+      await fs.writeFile(filePath, JSON.stringify(entry, null, 2));
+    } catch (error) {
+      // Disk cache failure shouldn't break functionality
+      console.warn('Failed to save to disk cache:', error.message);
+    }
+  }
+  async loadFromDiskCache(key) {
+    try {
+      const filePath = this.getCacheFilePath(key);
+      const content = await fs.readFile(filePath, 'utf8');
+      return JSON.parse(content);
+    } catch (error) {
+      return null;
+    }
+  }
+  async loadFromDisk() {
+    try {
+      const files = await fs.readdir(this.cacheDir);
+      const cacheFiles = files.filter(file => file.endsWith('.json'));
+      for (const file of cacheFiles) {
+        const key = file.replace('.json', '');
+        const entry = await this.loadFromDiskCache(key);
+        if (entry && !this.isExpired(entry)) {
+          this.memoryCache.set(key, entry);
+        }
+      }
+    } catch (error) {
+      // Disk cache loading failure is not critical
+    }
+  }
+  async cleanupDiskCache() {
+    try {
+      const files = await fs.readdir(this.cacheDir);
+      const cacheFiles = files.filter(file => file.endsWith('.json'));
+      for (const file of cacheFiles) {
+        const key = file.replace('.json', '');
+        const entry = await this.loadFromDiskCache(key);
+        if (!entry || this.isExpired(entry)) {
+          await fs.unlink(path.join(this.cacheDir, file));
+        }
+      }
+    } catch (error) {
+      // Cleanup failure is not critical
+    }
+  }
+  async clearDiskCache() {
+    try {
+      const files = await fs.readdir(this.cacheDir);
+      for (const file of files) {
+        if (file.endsWith('.json')) {
+          await fs.unlink(path.join(this.cacheDir, file));
+        }
+      }
+    } catch (error) {
+      // Clear failure is not critical
+    }
+  }
+  async getDiskStats() {
+    try {
+      const files = await fs.readdir(this.cacheDir);
+      const cacheFiles = files.filter(file => file.endsWith('.json'));
+      let valid = 0;
+      let expired = 0;
+      for (const file of cacheFiles) {
+        const key = file.replace('.json', '');
+        const entry = await this.loadFromDiskCache(key);
+        if (entry) {
+          if (this.isExpired(entry)) {
+            expired++;
+          } else {
+            valid++;
+          }
+        }
+      }
+      return {
+        total: cacheFiles.length,
+        valid,
+        expired
+      };
+    } catch (error) {
+      return {
+        total: 0,
+        valid: 0,
+        expired: 0
+      };
+    }
+  }
+}