@tolinax/ayoune-cli 2026.7.1 → 2026.7.2

package/lib/commands/createDbCommand.js

@@ -5,14 +5,6 @@ import { EXIT_GENERAL_ERROR, EXIT_MISUSE } from "../exitCodes.js";
 import { cliError } from "../helpers/cliError.js";
 import { handleResponseFormatOptions } from "../helpers/handleResponseFormatOptions.js";
 import { apiCallHandler } from "../api/apiCallHandler.js";
-import { writeToTarget, getDbStats } from "../db/copyEngine.js";
-function formatBytes(bytes) {
-    if (bytes === 0)
-        return "0 B";
-    const units = ["B", "KB", "MB", "GB", "TB"];
-    const i = Math.floor(Math.log(bytes) / Math.log(1024));
-    return (bytes / Math.pow(1024, i)).toFixed(1) + " " + units[i];
-}
 function maskUri(uri) {
     return uri.replace(/:\/\/([^:]+):([^@]+)@/, "://***:***@");
 }
@@ -21,21 +13,24 @@ export function createDbCommand(program) {
         .command("db")
         .description("Copy query results to external databases, manage targets")
         .addHelpText("after", `
+All database operations go through the aggregation service — the CLI never
+connects to any database directly.
+
 Examples:
   ay db copy                          Interactive: pick target, pick query
   ay db copy my-local-db              Pick query for target "my-local-db"
-  ay db copy my-local-db active-users Fully autonomous: run query, write to target
+  ay db copy my-local-db active-users Fully autonomous
   ay db targets list                  List configured targets
   ay db targets add                   Add a new target
-  ay db stats                         Show aYOUne database stats`);
+  ay db targets test <slug>           Test connectivity to a target`);
     // ─── ay db copy [target] [query] ───────────────────────────────
     db.command("copy [target] [query]")
         .description("Run a saved query and write results to a target database")
         .option("--collection <name>", "Override target collection name")
         .option("--write-mode <mode>", "Override write mode (insert, upsert, replace)")
         .addHelpText("after", `
-Runs a saved aggregation query and writes the results to a pre-configured target.
-Both target and query are resolved by slug. If omitted, you'll be prompted to select.
+Executes a saved aggregation query via the aggregation service and writes
+the results to a pre-configured DataTarget. Both are resolved by slug.
 
 Examples:
   ay db copy                                 Interactive mode
@@ -43,7 +38,6 @@ Examples:
   ay db copy my-local-db active-users        Fully autonomous
   ay db copy my-local-db active-users --collection results --write-mode upsert`)
         .action(async (target, query, options) => {
-        var _a;
         try {
             const opts = { ...program.opts(), ...options };
             // Step 1: Resolve target
@@ -66,57 +60,29 @@ Examples:
                     cliError("Provide query slug or use interactive mode", EXIT_MISUSE);
                 queryData = await promptQuery();
             }
-            // Step 3: Execute query via aggregation API
-            const queryId = queryData._id;
-            spinner.start({ text: `Running query "${queryData.name}"...`, color: "magenta" });
-            const aggResult = await apiCallHandler("aggregation", `queries/execute/${queryId}`, "post");
-            spinner.stop();
-            const docs = Array.isArray(aggResult) ? aggResult : ((aggResult === null || aggResult === void 0 ? void 0 : aggResult.payload) || []);
-            if (!docs.length) {
-                spinner.success({ text: "Query returned 0 results — nothing to write" });
-                return;
-            }
-            console.log(chalk.dim(`  Query returned ${docs.length} documents\n`));
-            // Step 4: Write to target
-            const collection = opts.collection || targetData.targetCollection || ((_a = queryData.name) === null || _a === void 0 ? void 0 : _a.toLowerCase().replace(/\s+/g, "_")) || "query_results";
-            const writeMode = opts.writeMode || targetData.writeMode || "insert";
-            const batchSize = targetData.batchSize || 1000;
-            spinner.start({ text: `Writing ${docs.length} docs to ${maskUri(targetData.connectionUri)}/${collection}...`, color: "cyan" });
-            const result = await writeToTarget(targetData.connectionUri, targetData.database, collection, docs, writeMode, batchSize);
+            // Step 3: Call the aggregation service export endpoint
+            spinner.start({ text: `Running "${queryData.name}" → ${targetData.name}...`, color: "magenta" });
+            const body = {
+                queryId: queryData._id,
+                targetId: targetData._id,
+            };
+            if (opts.collection)
+                body.targetCollection = opts.collection;
+            if (opts.writeMode)
+                body.writeMode = opts.writeMode;
+            const res = await apiCallHandler("aggregation", "export", "post", body);
             spinner.stop();
-            // Step 5: Update target status via config-api
-            try {
-                await apiCallHandler("config", `datatargets/${targetData._id}`, "put", {
-                    lastUsed: new Date().toISOString(),
-                    lastStatus: result.errors > 0 ? "failed" : "success",
-                    lastResultCount: result.written,
-                    lastError: result.errors > 0 ? `${result.errors} write errors` : undefined,
-                });
-            }
-            catch (_b) {
-                // Non-critical — don't fail the copy if status update fails
-            }
             // Output
-            const wrapped = {
-                payload: {
-                    target: targetData.name,
-                    query: queryData.name,
-                    collection,
-                    writeMode,
-                    written: result.written,
-                    errors: result.errors,
-                    duration: result.duration,
-                },
-                meta: { written: result.written, errors: result.errors },
-            };
-            if (opts.responseFormat === "json" || opts.responseFormat === "yaml") {
-                handleResponseFormatOptions(opts, wrapped);
+            handleResponseFormatOptions(opts, res);
+            const p = res.payload || {};
+            if (p.written === 0 && p.errors === 0) {
+                spinner.success({ text: "Query returned 0 results — nothing written" });
             }
             else {
-                const icon = result.errors === 0 ? chalk.green("●") : chalk.yellow("●");
-                console.log(`\n  ${icon} ${result.written} docs written to ${chalk.cyan(collection)}${result.errors ? chalk.red(` (${result.errors} errors)`) : ""} ${chalk.dim(`(${result.duration}ms)`)}\n`);
+                const icon = (p.errors || 0) === 0 ? chalk.green("●") : chalk.yellow("●");
+                console.log(`\n  ${icon} ${p.written} docs written to ${chalk.cyan(p.collection || "?")}${p.errors ? chalk.red(` (${p.errors} errors)`) : ""} ${chalk.dim(`(query: ${p.queryTime}ms, write: ${p.writeTime}ms)`)}\n`);
             }
-            if (result.errors > 0)
+            if (p.errors > 0)
                 process.exit(EXIT_GENERAL_ERROR);
         }
         catch (e) {
@@ -154,7 +120,8 @@ Examples:
         .command("add")
         .description("Add a new database target")
         .option("--name <name>", "Target name")
-        .option("--uri <uri>", "MongoDB connection URI")
+        .option("--type <type>", "Database type (mongodb, postgresql, rest)", "mongodb")
+        .option("--uri <uri>", "Connection URI")
         .option("--database <db>", "Database name")
         .option("--collection <col>", "Default target collection name")
         .option("--write-mode <mode>", "Write mode: insert, upsert, replace", "insert")
@@ -162,18 +129,19 @@ Examples:
         var _a;
         try {
             const opts = { ...program.opts(), ...options };
-            let { name, uri, database, collection, writeMode } = opts;
-            // Interactive prompts for missing fields
+            let { name, type, uri, database, collection, writeMode } = opts;
             if (!name || !uri) {
                 if (!process.stdin.isTTY)
                     cliError("Provide --name and --uri in non-interactive mode", EXIT_MISUSE);
                 const answers = await inquirer.prompt([
                     ...(!name ? [{ type: "input", name: "name", message: "Target name:", validate: (v) => v.length > 0 || "Required" }] : []),
-                    ...(!uri ? [{ type: "input", name: "uri", message: "MongoDB connection URI:", validate: (v) => v.startsWith("mongodb") || "Must be a MongoDB URI" }] : []),
+                    ...(!opts.type || opts.type === "mongodb" ? [{ type: "list", name: "dbType", message: "Database type:", choices: ["mongodb", "postgresql", "rest"], default: "mongodb" }] : []),
+                    ...(!uri ? [{ type: "input", name: "uri", message: "Connection URI:", validate: (v) => v.length > 0 || "Required" }] : []),
                     ...(!database ? [{ type: "input", name: "database", message: "Database name (leave empty for URI default):" }] : []),
-                    ...(!collection ? [{ type: "input", name: "collection", message: "Default collection name (leave empty to derive from query):" }] : []),
+                    ...(!collection ? [{ type: "input", name: "collection", message: "Default collection/table name (leave empty to derive from query):" }] : []),
                 ]);
                 name = name || answers.name;
+                type = answers.dbType || type;
                 uri = uri || answers.uri;
                 database = database || answers.database || undefined;
                 collection = collection || answers.collection || undefined;
@@ -181,7 +149,7 @@ Examples:
             spinner.start({ text: "Creating target...", color: "cyan" });
             const body = {
                 name,
-                type: "mongodb",
+                type,
                 connectionUri: uri,
                 database: database || undefined,
                 targetCollection: collection || undefined,
@@ -214,47 +182,28 @@ Examples:
             cliError(e.message || "Failed to remove target", EXIT_GENERAL_ERROR);
         }
     });
-    // ─── ay db stats [uri] ─────────────────────────────────────────
-    db.command("stats [uri]")
-        .description("Show database statistics (defaults to aYOUne database)")
-        .addHelpText("after", `
-Defaults to MONGO_CONNECTSTRING when no URI is given.
-
-Examples:
-  ay db stats
-  ay db stats "mongodb://other/db" -r table`)
-        .action(async (uri, options) => {
+    // ay db targets test <slug>
+    targets
+        .command("test <slug>")
+        .description("Test connectivity to a target")
+        .action(async (slug, options) => {
         try {
             const opts = { ...program.opts(), ...options };
-            const dbUri = uri || process.env.MONGO_CONNECTSTRING || process.env.MONGODB_URI;
-            if (!dbUri) {
-                cliError("No database URI. Set MONGO_CONNECTSTRING env var or pass a URI.", EXIT_MISUSE);
-            }
-            if (!dbUri.startsWith("mongodb")) {
-                cliError("URI must start with mongodb:// or mongodb+srv://", EXIT_MISUSE);
-            }
-            spinner.start({ text: `Connecting to ${maskUri(dbUri)}...`, color: "cyan" });
-            const stats = await getDbStats(dbUri);
+            const target = await resolveTarget(slug);
+            spinner.start({ text: `Testing connection to "${slug}"...`, color: "cyan" });
+            const res = await apiCallHandler("aggregation", "export/test", "post", { targetId: target._id });
             spinner.stop();
-            const wrapped = {
-                payload: stats,
-                meta: { database: stats.database, collectionCount: stats.collections.length, totalSize: formatBytes(stats.totalSize) },
-            };
-            if (opts.responseFormat === "json" || opts.responseFormat === "yaml") {
-                handleResponseFormatOptions(opts, wrapped);
+            const p = res.payload || {};
+            if (p.connected) {
+                console.log(chalk.green(`\n  ● Connected to ${p.database} (${p.collections} collections)\n`));
             }
             else {
-                console.log(chalk.cyan.bold(`\n  Database: ${stats.database}\n`));
-                console.log(`  ${chalk.dim("Total size:")} ${formatBytes(stats.totalSize)}`);
-                console.log(`  ${chalk.dim("Collections:")} ${stats.collections.length}\n`);
-                for (const col of stats.collections) {
-                    console.log(`  ${chalk.white(col.name)}: ${col.documents.toLocaleString()} docs ${chalk.dim(`(${formatBytes(col.size)})`)}`);
-                }
-                console.log();
+                console.log(chalk.red(`\n  ● Connection failed: ${p.error}\n`));
+                process.exit(EXIT_GENERAL_ERROR);
             }
         }
         catch (e) {
-            cliError(e.message || "Failed to get stats", EXIT_GENERAL_ERROR);
+            cliError(e.message || "Connection test failed", EXIT_GENERAL_ERROR);
         }
     });
 }
@@ -267,7 +216,6 @@ async function resolveTarget(slugOrId) {
             cliError(`Target not found: ${slugOrId}`, EXIT_GENERAL_ERROR);
         return res.payload;
     }
-    // Resolve by slug
     const res = await apiCallHandler("config", "datatargets", "get", null, { slug: slugOrId, limit: 1 });
     const entries = res === null || res === void 0 ? void 0 : res.payload;
     if (!entries || (Array.isArray(entries) && entries.length === 0)) {
@@ -299,7 +247,7 @@ async function promptTarget() {
         cliError("No targets configured. Add one with: ay db targets add", EXIT_GENERAL_ERROR);
     }
     const choices = targets.map((t) => ({
-        name: `${t.name} ${chalk.dim(`(${maskUri(t.connectionUri)})`)}`,
+        name: `${t.name} ${chalk.dim(`(${t.type}: ${maskUri(t.connectionUri || "")})`)}`,
         value: t,
     }));
     const { selected } = await inquirer.prompt([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tolinax/ayoune-cli",
-  "version": "2026.7.1",
+  "version": "2026.7.2",
   "description": "CLI for the aYOUne Business-as-a-Service platform",
   "type": "module",
   "main": "./index.js",
@@ -134,7 +134,6 @@
     "lodash": "^4.17.21",
     "mkdirp": "^3.0.1",
     "moment": "^2.30.1",
-    "mongodb": "^6.21.0",
     "nanospinner": "^1.1.0",
     "node-localstorage": "^3.0.5",
     "os": "^0.1.2",