webspresso 0.0.104 → 0.0.106

package/bin/commands/openapi.js

@@ -23,7 +23,7 @@ function registerCommand(program) {
     .option('--title <title>', 'OpenAPI specification title override')
     .option('--api-version <version>', 'OpenAPI specification version override')
     .option('--description <desc>', 'OpenAPI specification description override')
-    .option('--server <url>', 'Default server URL in spec', 'http://localhost:3000')
+    .option('--server <url>', 'Default server URL in spec', 'http://localhost:7331')
     .option('--include-orm', 'Include ORM model schemas in components', false)
     .option('--indent <spaces>', 'JSON indentation spaces', '2')
     .option('-p, --print', 'Print specification JSON to stdout', false)

package/bin/commands/secrets-pull.js

@@ -0,0 +1,208 @@
+/**
+ * CLI Command: webspresso secrets:pull
+ * Pulls production/staging secrets from Google Cloud Secret Manager or AWS Secrets Manager into a local .env.local file.
+ *
+ * @module bin/commands/secrets-pull
+ */
+
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const { createSecretManager } = require('../../core/secrets');
+
+/**
+ * Format key-value pairs as .env file content
+ * @param {Record<string, string>} entries
+ * @returns {string}
+ */
+function formatEnvFile(entries) {
+  const lines = [
+    '# Generated by Webspresso (webspresso secrets:pull)',
+    `# Date: ${new Date().toISOString()}`,
+    '',
+  ];
+
+  for (const [key, val] of Object.entries(entries)) {
+    const stringVal = String(val ?? '');
+    // Wrap in quotes if it contains spaces, newlines, or quotes
+    if (stringVal.includes('\n') || stringVal.includes(' ') || stringVal.includes('"') || stringVal.includes('#')) {
+      const escaped = stringVal.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\n/g, '\\n');
+      lines.push(`${key}="${escaped}"`);
+    } else {
+      lines.push(`${key}=${stringVal}`);
+    }
+  }
+
+  return lines.join('\n') + '\n';
+}
+
+/**
+ * Extract keys from an existing .env or .env.example file to know which secrets to pull
+ * @param {string} cwd
+ * @returns {string[]}
+ */
+function discoverExpectedSecretKeys(cwd) {
+  const candidates = ['.env.example', '.env.template', '.env.production', '.env'];
+  for (const candidate of candidates) {
+    const fullPath = path.join(cwd, candidate);
+    if (fs.existsSync(fullPath)) {
+      try {
+        const content = fs.readFileSync(fullPath, 'utf8');
+        const keys = [];
+        for (const line of content.split('\n')) {
+          const trimmed = line.trim();
+          if (trimmed && !trimmed.startsWith('#') && trimmed.includes('=')) {
+            const key = trimmed.split('=')[0].trim();
+            if (key) keys.push(key);
+          }
+        }
+        if (keys.length > 0) return keys;
+      } catch (_) {}
+    }
+  }
+  return ['SESSION_SECRET', 'DATABASE_URL', 'REDIS_URL'];
+}
+
+/**
+ * Execute secrets:pull command logic
+ * @param {Object} options
+ * @returns {Promise<{ success: boolean, count: number, output: string, values: Record<string, string> }>}
+ */
+async function runSecretsPull(options = {}) {
+  const cwd = options.cwd || process.cwd();
+  const platform = options.platform || 'auto';
+  const format = options.format || 'env';
+  const outputFile = options.output || '.env.local';
+  const dryRun = Boolean(options.dryRun);
+
+  const manager = createSecretManager({
+    provider: platform,
+    projectId: options.project,
+    region: options.region,
+    cache: false,
+    httpTransport: options.httpTransport,
+    token: options.token,
+    credentials: options.credentials,
+    accessKeyId: options.accessKeyId,
+    secretAccessKey: options.secretAccessKey,
+    ...options,
+  });
+
+  const pulledValues = {};
+
+  // 1. Pull JSON secret bundle if specified
+  if (options.bundle) {
+    const bundleContent = await manager.loadBundle(options.bundle, { inject: false });
+    Object.assign(pulledValues, bundleContent);
+  }
+
+  // 2. Pull individual secrets
+  let secretKeys = [];
+  if (options.secrets && options.secrets.length > 0) {
+    secretKeys = Array.isArray(options.secrets) ? options.secrets : String(options.secrets).split(',').map((s) => s.trim());
+  } else if (!options.bundle) {
+    secretKeys = discoverExpectedSecretKeys(cwd);
+  }
+
+  for (const item of secretKeys) {
+    if (!item) continue;
+    let envKey = item;
+    let secretName = item;
+
+    if (item.includes('=')) {
+      const parts = item.split('=');
+      envKey = parts[0].trim();
+      secretName = parts[1].trim();
+    }
+
+    try {
+      const val = await manager.get(secretName);
+      if (val !== null && val !== undefined) {
+        pulledValues[envKey] = typeof val === 'object' ? JSON.stringify(val) : String(val);
+      }
+    } catch (_) {
+      // Secret not found or network error, skip
+    }
+  }
+
+  const count = Object.keys(pulledValues).length;
+  const formattedContent = format === 'json'
+    ? JSON.stringify(pulledValues, null, 2)
+    : formatEnvFile(pulledValues);
+
+  if (!dryRun && count > 0) {
+    const outputPath = path.isAbsolute(outputFile) ? outputFile : path.join(cwd, outputFile);
+    fs.writeFileSync(outputPath, formattedContent, 'utf8');
+  }
+
+  return {
+    success: count > 0,
+    count,
+    output: formattedContent,
+    values: pulledValues,
+  };
+}
+
+/**
+ * Register command with Commander
+ * @param {import('commander').Command} program
+ */
+function registerCommand(program) {
+  program
+    .command('secrets:pull')
+    .alias('pull:secrets')
+    .alias('secrets:fetch')
+    .description('Pull secrets from Google Cloud Secret Manager or AWS Secrets Manager into a local .env.local file')
+    .option('-p, --platform <platform>', 'Cloud platform (cloudrun, gcp, aws, or auto)', 'auto')
+    .option('-s, --secrets <names...>', 'Secret identifiers or key=secret mappings')
+    .option('-b, --bundle <name>', 'JSON secret bundle name to unpack')
+    .option('-o, --output <file>', 'Output destination file', '.env.local')
+    .option('--format <format>', 'Output format (env or json)', 'env')
+    .option('--project <projectId>', 'GCP Project ID override')
+    .option('--region <region>', 'AWS Region override')
+    .option('--dry-run', 'Print pulled secrets to stdout without writing file', false)
+    .action(async (...actionArgs) => {
+      const cmd = actionArgs[actionArgs.length - 1];
+      const options = (cmd && typeof cmd.opts === 'function')
+        ? cmd.opts()
+        : (actionArgs.find((a) => a && typeof a === 'object') || {});
+
+      console.log('\n🔐 Webspresso Cloud Secrets Pull');
+      console.log('=================================');
+      console.log(`Target Platform : ${(options.platform || 'auto').toUpperCase()}`);
+      console.log(`Destination     : ${options.dryRun ? 'STDOUT (dry-run)' : options.output || '.env.local'}\n`);
+
+      try {
+        const result = await runSecretsPull({
+          cwd: process.cwd(),
+          ...options,
+        });
+
+        if (options.dryRun) {
+          console.log(result.output);
+        } else {
+          if (result.count === 0) {
+            console.log('⚠️  No secrets could be resolved from the cloud provider.');
+            console.log('👉 Tip: Check your cloud credentials or pass secret names with: -s SESSION_SECRET DATABASE_URL\n');
+          } else {
+            console.log(`✅ Successfully pulled ${result.count} secret(s) to ${options.output || '.env.local'}.\n`);
+            for (const key of Object.keys(result.values)) {
+              console.log(`   ✓ ${key}`);
+            }
+            console.log('');
+          }
+        }
+      } catch (err) {
+        console.error(`❌ Failed to pull secrets: ${err.message}\n`);
+        process.exit(1);
+      }
+    });
+}
+
+module.exports = {
+  registerCommand,
+  runSecretsPull,
+  formatEnvFile,
+  discoverExpectedSecretKeys,
+};

package/bin/commands/start.js

@@ -10,7 +10,7 @@ function registerCommand(program) {
   program
     .command('start')
     .description('Start production server')
-    .option('-p, --port <port>', 'Port number', '3000')
+    .option('-p, --port <port>', 'Port number', '7331')
     .action((options) => {
       if (!fs.existsSync('server.js')) {
         console.error('❌ server.js not found! Make sure you are in a Webspresso project.');

package/bin/utils/db.js

@@ -38,7 +38,13 @@ function resolveDbConfigIfExists(configPath) {
   for (const p of paths) {
     const fullPath = path.resolve(process.cwd(), p);
     if (fs.existsSync(fullPath)) {
-      return { config: require(fullPath), path: fullPath };
+      try {
+        if (fs.statSync(fullPath).isFile()) {
+          return { config: require(fullPath), path: fullPath };
+        }
+      } catch {
+        // ignore
+      }
     }
   }
   return null;

package/bin/utils/project.js

@@ -56,7 +56,7 @@ function startDevServer(projectPath, useTailwind) {
       stdio: 'inherit',
       shell: true,
       cwd: projectPath,
-      env: { ...process.env, PORT: process.env.PORT || '3000', NODE_ENV: 'development' }
+      env: { ...process.env, PORT: process.env.PORT || '7331', NODE_ENV: 'development' }
     });
     
     // Handle exit
@@ -77,7 +77,7 @@ function startDevServer(projectPath, useTailwind) {
       stdio: 'inherit',
       shell: true,
       cwd: projectPath,
-      env: { ...process.env, PORT: process.env.PORT || '3000', NODE_ENV: 'development' }
+      env: { ...process.env, PORT: process.env.PORT || '7331', NODE_ENV: 'development' }
     });
     
     server.on('exit', (code) => {

package/bin/webspresso.js

@@ -24,6 +24,7 @@ const { registerCommand: registerAddEsbuild } = require('./commands/add-esbuild'
 const { registerCommand: registerDbMigrate } = require('./commands/db-migrate');
 const { registerCommand: registerDbRollback } = require('./commands/db-rollback');
 const { registerCommand: registerDbStatus } = require('./commands/db-status');
+const { registerCommand: registerDbStudio } = require('./commands/db-studio');
 const { registerCommand: registerDbMake } = require('./commands/db-make');
 const { registerCommand: registerDbScaffold } = require('./commands/db-scaffold');
 const { registerCommand: registerDbMakeMigrations } = require('./commands/db-makemigrations');
@@ -49,7 +50,15 @@ const { registerCommand: registerMakeJob } = require('./commands/make-job');
 const { registerCommand: registerOpenapi } = require('./commands/openapi');
 const { registerCommand: registerTypegen } = require('./commands/typegen');
 const { registerCommand: registerAddDocker } = require('./commands/add-docker');
+const { registerCommand: registerAddCloudflare } = require('./commands/add-cloudflare');
+const { registerCommand: registerAddCloudrun } = require('./commands/add-cloudrun');
+const { registerCommand: registerAddAws } = require('./commands/add-aws');
+const { registerCommand: registerAddCi } = require('./commands/add-ci');
+const { registerCommand: registerAddMigrationJob } = require('./commands/add-migration-job');
+const { registerCommand: registerAssetsSync } = require('./commands/assets-sync');
+const { registerCommand: registerExport } = require('./commands/export');
 const { registerCommand: registerDeployCheck } = require('./commands/deploy-check');
+const { registerCommand: registerSecretsPull } = require('./commands/secrets-pull');
 const { registerCommand: registerRun } = require('./commands/run');
 const { registerCommand: registerList } = require('./commands/list');
 const { registerCommand: registerMakeCommand } = require('./commands/make-command');
@@ -57,6 +66,8 @@ const { registerCommand: registerMakePolicy } = require('./commands/make-policy'
 const { registerCommand: registerMakeFactory } = require('./commands/make-factory');
 const { registerCommand: registerMakeEvent } = require('./commands/make-event');
 const { registerCommand: registerMakeMail } = require('./commands/make-mail');
+const { registerCommand: registerClientGen } = require('./commands/client-generate');
+const { registerCommand: registerConsole } = require('./commands/console');
 
 registerNew(program);
 registerPage(program);
@@ -64,12 +75,20 @@ registerApi(program);
 registerDev(program);
 registerStart(program);
 registerBuild(program);
+registerExport(program);
 registerAddTailwind(program);
 registerAddEsbuild(program);
 registerAddDocker(program);
+registerAddCloudflare(program);
+registerAddCloudrun(program);
+registerAddAws(program);
+registerAddCi(program);
+registerAddMigrationJob(program);
+registerAssetsSync(program);
 registerDbMigrate(program);
 registerDbRollback(program);
 registerDbStatus(program);
+registerDbStudio(program);
 registerDbMake(program);
 registerDbScaffold(program);
 registerDbMakeMigrations(program);
@@ -84,6 +103,7 @@ registerQueuePrune(program);
 registerUploadPrune(program);
 registerDoctor(program);
 registerDeployCheck(program);
+registerSecretsPull(program);
 registerUpgrade(program);
 registerOrmMap(program);
 registerService(program);
@@ -102,6 +122,8 @@ registerRun(program);
 registerList(program);
 registerOpenapi(program);
 registerTypegen(program);
+registerClientGen(program);
+registerConsole(program);
 
 // Parse arguments
 program.parse();