@hasna/cloud 0.1.23 → 0.1.25

package/dist/cli/index.js

@@ -12798,9 +12798,33 @@ import { existsSync as existsSync9, statSync as statSync6 } from "fs";
 import { join as join9 } from "path";
 import { homedir as homedir8 } from "os";
 var program2 = new Command;
+function logSync(direction, service, rows, errors2) {
+  try {
+    const logDir = join9(homedir8(), ".hasna", "cloud");
+    const logPath = join9(logDir, "sync.log");
+    const { mkdirSync: mkdirSync6, appendFileSync } = __require("fs");
+    mkdirSync6(logDir, { recursive: true });
+    const ts = new Date().toISOString();
+    appendFileSync(logPath, `${ts} ${direction.padEnd(4)} ${service.padEnd(20)} ${rows} rows, ${errors2} errors
+`);
+  } catch {}
+}
 program2.name("cloud").description("Shared cloud infrastructure \u2014 database adapter, sync engine, feedback, dotfile migration").version("0.1.8");
-program2.command("setup").description("Configure cloud settings").option("--host <host>", "RDS hostname").option("--port <port>", "RDS port", "5432").option("--username <user>", "RDS username").option("--password-env <env>", "Env var for RDS password", "HASNA_RDS_PASSWORD").option("--ssl", "Enable SSL", true).option("--no-ssl", "Disable SSL").option("--mode <mode>", "Mode: local, cloud, or hybrid", "local").option("--sync-interval <minutes>", "Auto-sync interval in minutes", "0").action((opts) => {
+program2.command("setup").description("Configure cloud settings \u2014 interactive wizard or flags").option("--host <host>", "RDS hostname").option("--port <port>", "RDS port", "5432").option("--username <user>", "RDS username").option("--password-env <env>", "Env var for RDS password", "HASNA_RDS_PASSWORD").option("--ssl", "Enable SSL", true).option("--no-ssl", "Disable SSL").option("--mode <mode>", "Mode: local, cloud, or hybrid").option("--schedule <interval>", "Sync schedule (e.g. 30m, 1h)").option("--migrate", "Run PG migrations after setup").option("--pull", "Pull data from cloud after setup").action(async (opts) => {
   const config = getCloudConfig();
+  const isAutoDetect = !opts.host && !opts.username;
+  if (isAutoDetect) {
+    const envHost = process.env.HASNA_RDS_HOST;
+    const envUser = process.env.HASNA_RDS_USERNAME;
+    if (envHost && !config.rds.host) {
+      config.rds.host = envHost;
+      console.log(`Auto-detected RDS host: ${envHost}`);
+    }
+    if (envUser && !config.rds.username) {
+      config.rds.username = envUser;
+      console.log(`Auto-detected RDS username: ${envUser}`);
+    }
+  }
   if (opts.host)
     config.rds.host = opts.host;
   if (opts.port)
@@ -12810,13 +12834,86 @@ program2.command("setup").description("Configure cloud settings").option("--host
   if (opts.passwordEnv)
     config.rds.password_env = opts.passwordEnv;
   config.rds.ssl = opts.ssl;
-  if (opts.mode)
+  if (opts.mode) {
     config.mode = opts.mode;
-  if (opts.syncInterval)
-    config.auto_sync_interval_minutes = parseInt(opts.syncInterval, 10);
+  } else if (config.mode === "local" && config.rds.host) {
+    config.mode = "hybrid";
+    console.log("Mode set to: hybrid (auto-upgraded from local)");
+  }
   saveCloudConfig(config);
-  console.log("Cloud configuration saved.");
-  console.log(JSON.stringify(config, null, 2));
+  console.log(`
+\u2713 Configuration saved
+`);
+  const password = process.env[config.rds.password_env];
+  if (!password) {
+    console.error(`\u2717 ${config.rds.password_env} not set in environment`);
+    console.error(`  Add it to ~/.secrets/hasna/rds/live.env and source it`);
+    return;
+  }
+  if (config.rds.host) {
+    process.stdout.write("Testing PG connection... ");
+    try {
+      const connStr = getConnectionString("postgres");
+      const pg2 = new PgAdapterAsync2(connStr);
+      await pg2.all("SELECT 1");
+      await pg2.close();
+      console.log(`\u2713 Connected
+`);
+    } catch (err) {
+      console.log(`\u2717 Failed: ${err?.message ?? String(err)}`);
+      return;
+    }
+    if (opts.migrate !== false) {
+      console.log("Creating databases & running migrations...");
+      const dbResults = await ensureAllPgDatabases();
+      const created = dbResults.filter((r) => r.created);
+      if (created.length > 0) {
+        console.log(`  Created ${created.length} database(s): ${created.map((r) => r.service).join(", ")}`);
+      }
+      const migResults = await migrateAllServices();
+      const applied = migResults.filter((r) => r.applied.length > 0);
+      const totalApplied = migResults.reduce((s, r) => s + r.applied.length, 0);
+      if (totalApplied > 0) {
+        console.log(`  Applied ${totalApplied} migration(s) across ${applied.length} service(s)`);
+      } else {
+        console.log("  All migrations up to date");
+      }
+      console.log("");
+    }
+    if (opts.schedule) {
+      try {
+        const minutes = parseInterval(opts.schedule);
+        await registerSyncSchedule(minutes);
+        console.log(`\u2713 Sync scheduled every ${minutes}m
+`);
+      } catch (err) {
+        console.error(`\u2717 Schedule failed: ${err?.message}`);
+      }
+    }
+    if (opts.pull) {
+      console.log("Pulling data from cloud...");
+      const services = discoverServices();
+      for (const service of services) {
+        try {
+          const dbPath = getDbPath2(service);
+          const local = new SqliteAdapter2(dbPath);
+          const connStr = getConnectionString(service);
+          const cloud = new PgAdapterAsync2(connStr);
+          const tables = (await listPgTables(cloud)).filter((t) => !isSyncExcludedTable(t));
+          if (tables.length > 0) {
+            const results = await syncPull(cloud, local, { tables });
+            const written = results.reduce((s, r) => s + r.rowsWritten, 0);
+            if (written > 0)
+              console.log(`  ${service}: ${written} rows`);
+          }
+          local.close();
+          await cloud.close();
+        } catch {}
+      }
+      console.log("");
+    }
+  }
+  console.log("Setup complete. Run `cloud doctor` to verify everything.");
 });
 program2.command("status").description("Show current cloud configuration and connection health").action(async () => {
   const config = getCloudConfig();
@@ -12843,7 +12940,7 @@ Checking PostgreSQL connection...`);
   }
 });
 var syncCmd = program2.command("sync").description("Sync data between local and cloud");
-syncCmd.command("push").description("Push local data to cloud").option("--service <name>", "Service name").option("--all", "Push all discovered services").option("--tables <tables>", "Comma-separated table names (default: all)").action(async (opts) => {
+syncCmd.command("push").description("Push local data to cloud").option("--service <name>", "Service name").option("--all", "Push all discovered services").option("--tables <tables>", "Comma-separated table names (default: all)").option("--dry-run", "Preview what would be synced without executing").action(async (opts) => {
   const config = getCloudConfig();
   if (config.mode === "local") {
     console.error("Error: mode is 'local'. Run `cloud setup --mode hybrid` or `--mode cloud` first.");
@@ -12878,6 +12975,19 @@ syncCmd.command("push").description("Push local data to cloud").option("--servic
       local.close();
       continue;
     }
+    if (opts.dryRun) {
+      const rowCounts = tables.map((t) => {
+        try {
+          const r = local.get(`SELECT COUNT(*) as cnt FROM "${t}"`);
+          return `${t}: ${r?.cnt ?? 0} rows`;
+        } catch {
+          return `${t}: ?`;
+        }
+      });
+      console.log(`[${service}] Would push ${tables.length} table(s): ${rowCounts.join(", ")}`);
+      local.close();
+      continue;
+    }
     console.log(`[${service}] Pushing ${tables.length} table(s) to cloud...`);
     let connStr;
     try {
@@ -12903,6 +13013,7 @@ syncCmd.command("push").description("Push local data to cloud").option("--servic
     const totalErrors = results.reduce((s, r) => s + r.errors.length, 0);
     grandTotalWritten += totalWritten;
     grandTotalErrors += totalErrors;
+    logSync("push", service, totalWritten, totalErrors);
     if (opts.all) {
       console.log(`  ${service}: ${totalWritten} rows pushed${totalErrors > 0 ? `, ${totalErrors} errors` : ""}`);
     } else {
@@ -12922,7 +13033,7 @@ Done. ${totalWritten} rows pushed, ${totalErrors} errors.`);
 Done. ${services.length} services, ${grandTotalWritten} rows pushed, ${grandTotalErrors} errors.`);
   }
 });
-syncCmd.command("pull").description("Pull cloud data to local").option("--service <name>", "Service name").option("--all", "Pull all discovered services").option("--tables <tables>", "Comma-separated table names (default: all)").action(async (opts) => {
+syncCmd.command("pull").description("Pull cloud data to local").option("--service <name>", "Service name").option("--all", "Pull all discovered services").option("--tables <tables>", "Comma-separated table names (default: all)").option("--dry-run", "Preview what would be synced without executing").action(async (opts) => {
   const config = getCloudConfig();
   if (config.mode === "local") {
     console.error("Error: mode is 'local'. Run `cloud setup --mode hybrid` or `--mode cloud` first.");
@@ -12981,6 +13092,12 @@ syncCmd.command("pull").description("Pull cloud data to local").option("--servic
       await cloud.close();
       continue;
     }
+    if (opts.dryRun) {
+      console.log(`[${service}] Would pull ${tables.length} table(s): ${tables.join(", ")}`);
+      local.close();
+      await cloud.close();
+      continue;
+    }
     if (!opts.all)
       console.log(`Pulling ${tables.length} table(s) from cloud...`);
     const results = await syncPull(cloud, local, {
@@ -12997,6 +13114,7 @@ syncCmd.command("pull").description("Pull cloud data to local").option("--servic
     const totalErrors = results.reduce((s, r) => s + r.errors.length, 0);
     grandTotalWritten += totalWritten;
     grandTotalErrors += totalErrors;
+    logSync("pull", service, totalWritten, totalErrors);
     if (opts.all) {
       if (totalWritten > 0 || totalErrors > 0) {
         console.log(`  ${service}: ${totalWritten} rows pulled${totalErrors > 0 ? `, ${totalErrors} errors` : ""}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/cloud",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "Shared cloud infrastructure — database adapter (SQLite + PostgreSQL), sync engine, feedback system, unified dotfile config",
   "license": "Apache-2.0",
   "type": "module",