dokku-compose 0.4.0 → 0.5.1

package/dist/index.js

@@ -156,12 +156,10 @@ function createRunner(opts = {}) {
       await execDokku(args);
     },
     async query(...args) {
-      if (opts.dryRun) return "";
       const { stdout } = await execDokku(args);
       return stdout.trim();
     },
     async check(...args) {
-      if (opts.dryRun) return false;
       const { ok } = await execDokku(args);
       return ok;
     },
@@ -284,6 +282,40 @@ var Apps = {
   }
 };
 
+// src/resources/parsers.ts
+function parseReport(raw, namespace) {
+  const result = {};
+  const prefix = new RegExp(`^${namespace}\\s+`, "i");
+  for (const line of raw.split("\n")) {
+    if (line.trimStart().startsWith("=====>")) continue;
+    const colonIdx = line.indexOf(":");
+    if (colonIdx === -1) continue;
+    const rawKey = line.slice(0, colonIdx).trim();
+    if (!rawKey) continue;
+    const value = line.slice(colonIdx + 1).trim();
+    const stripped = rawKey.replace(prefix, "");
+    const key = stripped.toLowerCase().replace(/\s+/g, "-");
+    if (key.startsWith("computed-") || key.startsWith("global-") || key === "last-visited-at") continue;
+    if (!value) continue;
+    result[key] = value;
+  }
+  return result;
+}
+function parseBulkReport(raw, namespace) {
+  const result = /* @__PURE__ */ new Map();
+  const sections = raw.split(/(?=^=====> )/m).filter((s) => s.trim());
+  for (const section of sections) {
+    const headerEnd = section.indexOf("\n");
+    if (headerEnd === -1) continue;
+    const header = section.slice(0, headerEnd);
+    const match = header.match(/^=====> (.+?)\s+\S+\s+information/);
+    if (!match) continue;
+    const app = match[1];
+    result.set(app, parseReport(section, namespace));
+  }
+  return result;
+}
+
 // src/resources/lists.ts
 function splitWords(raw) {
   return raw.split(/\s+/).map((s) => s.trim()).filter(Boolean);
@@ -297,6 +329,15 @@ var Ports = {
     const raw = await ctx.query("ports:report", target, "--ports-map");
     return splitWords(raw);
   },
+  readAll: async (ctx) => {
+    const raw = await ctx.query("ports:report");
+    const bulk = parseBulkReport(raw, "ports");
+    const result = /* @__PURE__ */ new Map();
+    for (const [app, report] of bulk) {
+      result.set(app, report["map"] ? splitWords(report["map"]) : []);
+    }
+    return result;
+  },
   onChange: async (ctx, target, change) => {
     await ctx.run("ports:set", target, ...change.after);
   }
@@ -307,6 +348,15 @@ var Domains = {
     const raw = await ctx.query("domains:report", target, "--domains-app-vhosts");
     return splitLines(raw);
   },
+  readAll: async (ctx) => {
+    const raw = await ctx.query("domains:report");
+    const bulk = parseBulkReport(raw, "domains");
+    const result = /* @__PURE__ */ new Map();
+    for (const [app, report] of bulk) {
+      result.set(app, report["app-vhosts"] ? splitWords(report["app-vhosts"]) : []);
+    }
+    return result;
+  },
   onChange: async (ctx, target, { added, removed }) => {
     for (const d of removed) await ctx.run("domains:remove", target, d);
     for (const d of added) await ctx.run("domains:add", target, d);
@@ -318,32 +368,21 @@ var Storage = {
     const raw = await ctx.query("storage:report", target, "--storage-mounts");
     return splitLines(raw);
   },
+  readAll: async (ctx) => {
+    const raw = await ctx.query("storage:report");
+    const bulk = parseBulkReport(raw, "storage");
+    const result = /* @__PURE__ */ new Map();
+    for (const [app, report] of bulk) {
+      result.set(app, report["mounts"] ? splitLines(report["mounts"]) : []);
+    }
+    return result;
+  },
   onChange: async (ctx, target, { added, removed }) => {
     for (const m of removed) await ctx.run("storage:unmount", target, m);
     for (const m of added) await ctx.run("storage:mount", target, m);
   }
 };
 
-// src/resources/parsers.ts
-function parseReport(raw, namespace) {
-  const result = {};
-  const prefix = new RegExp(`^${namespace}\\s+`, "i");
-  for (const line of raw.split("\n")) {
-    if (line.trimStart().startsWith("=====>")) continue;
-    const colonIdx = line.indexOf(":");
-    if (colonIdx === -1) continue;
-    const rawKey = line.slice(0, colonIdx).trim();
-    if (!rawKey) continue;
-    const value = line.slice(colonIdx + 1).trim();
-    const stripped = rawKey.replace(prefix, "");
-    const key = stripped.toLowerCase().replace(/\s+/g, "-");
-    if (key.startsWith("computed-") || key.startsWith("global-") || key === "last-visited-at") continue;
-    if (!value) continue;
-    result[key] = value;
-  }
-  return result;
-}
-
 // src/resources/properties.ts
 function propertyResource(opts) {
   return {
@@ -352,6 +391,10 @@ function propertyResource(opts) {
       const raw = await ctx.query(`${opts.namespace}:report`, target);
       return parseReport(raw, opts.namespace);
     },
+    async readAll(ctx) {
+      const raw = await ctx.query(`${opts.namespace}:report`);
+      return parseBulkReport(raw, opts.namespace);
+    },
     async onChange(ctx, target, change) {
       for (const [key, value] of Object.entries({ ...change.added, ...change.modified })) {
         await ctx.run(opts.setCmd, target, key, String(value));
@@ -387,6 +430,15 @@ var Scheduler = {
     const report = parseReport(raw, "scheduler");
     return report["selected"] ?? "";
   },
+  async readAll(ctx) {
+    const raw = await ctx.query("scheduler:report");
+    const bulk = parseBulkReport(raw, "scheduler");
+    const result = /* @__PURE__ */ new Map();
+    for (const [app, report] of bulk) {
+      result.set(app, report["selected"] ?? "");
+    }
+    return result;
+  },
   async onChange(ctx, target, change) {
     await ctx.run("scheduler:set", target, "selected", change.after);
   }
@@ -399,6 +451,15 @@ var Proxy = {
     const raw = await ctx.query("proxy:report", target, "--proxy-enabled");
     return raw.trim() === "true";
   },
+  readAll: async (ctx) => {
+    const raw = await ctx.query("proxy:report");
+    const bulk = parseBulkReport(raw, "proxy");
+    const result = /* @__PURE__ */ new Map();
+    for (const [app, report] of bulk) {
+      result.set(app, report["enabled"] === "true");
+    }
+    return result;
+  },
   onChange: async (ctx, target, { after }) => {
     await ctx.run(after ? "proxy:enable" : "proxy:disable", target);
   }
@@ -451,6 +512,15 @@ var Certs = {
     const raw = await ctx.query("certs:report", target, "--ssl-enabled");
     return raw.trim() === "true";
   },
+  readAll: async (ctx) => {
+    const raw = await ctx.query("certs:report");
+    const bulk = parseBulkReport(raw, "ssl");
+    const result = /* @__PURE__ */ new Map();
+    for (const [app, report] of bulk) {
+      result.set(app, report["enabled"] === "true");
+    }
+    return result;
+  },
   onChange: async (ctx, target, { before, after }) => {
     if (after === false && before) {
       await ctx.run("certs:remove", target);
@@ -505,6 +575,15 @@ var Git = {
     const report = await ctx.query("git:report", target, "--git-deploy-branch");
     return { deploy_branch: report.trim() || void 0 };
   },
+  readAll: async (ctx) => {
+    const raw = await ctx.query("git:report");
+    const bulk = parseBulkReport(raw, "git");
+    const result = /* @__PURE__ */ new Map();
+    for (const [app, report] of bulk) {
+      result.set(app, { deploy_branch: report["deploy-branch"] || void 0 });
+    }
+    return result;
+  },
   onChange: async (ctx, target, { after }) => {
     if (after.deploy_branch) {
       await ctx.run("git:set", target, "deploy-branch", after.deploy_branch);
@@ -542,6 +621,15 @@ var Networks = {
     const raw = await ctx.query("network:report", target, "--network-attach-post-deploy");
     return raw.trim() ? raw.trim().split(/\s+/) : [];
   },
+  readAll: async (ctx) => {
+    const raw = await ctx.query("network:report");
+    const bulk = parseBulkReport(raw, "network");
+    const result = /* @__PURE__ */ new Map();
+    for (const [app, report] of bulk) {
+      result.set(app, report["attach-post-deploy"] ? report["attach-post-deploy"].split(/\s+/) : []);
+    }
+    return result;
+  },
   onChange: async (ctx, target, { after }) => {
     await ctx.run("network:set", target, "attach-post-deploy", ...after);
   }
@@ -858,12 +946,19 @@ async function runExport(ctx, opts) {
   if (networks.length > 0) config.networks = networks;
   const services = await exportServices(ctx);
   if (Object.keys(services).length > 0) config.services = services;
+  const prefetched = /* @__PURE__ */ new Map();
+  await Promise.all(
+    ALL_APP_RESOURCES.filter((r) => !r.forceApply && !r.key.startsWith("_") && r.readAll).map(async (r) => {
+      prefetched.set(r.key, await r.readAll(ctx));
+    })
+  );
   for (const app of apps) {
     const appConfig = {};
     for (const resource of ALL_APP_RESOURCES) {
       if (resource.key.startsWith("_")) continue;
       if (resource.forceApply) continue;
-      const value = await resource.read(ctx, app);
+      const bulk = prefetched.get(resource.key);
+      const value = bulk ? bulk.get(app) : await resource.read(ctx, app);
       if (value === void 0 || value === null || value === "") continue;
       if (Array.isArray(value) && value.length === 0) continue;
       if (typeof value === "object" && !Array.isArray(value) && Object.keys(value).length === 0) continue;
@@ -886,6 +981,12 @@ async function runExport(ctx, opts) {
 import chalk2 from "chalk";
 async function computeDiff(ctx, config) {
   const result = { apps: {}, services: {}, inSync: true };
+  const prefetched = /* @__PURE__ */ new Map();
+  await Promise.all(
+    ALL_APP_RESOURCES.filter((r) => !r.forceApply && !r.key.startsWith("_") && r.readAll).map(async (r) => {
+      prefetched.set(r.key, await r.readAll(ctx));
+    })
+  );
   for (const [app, appConfig] of Object.entries(config.apps)) {
     const appDiff = {};
     for (const resource of ALL_APP_RESOURCES) {
@@ -898,7 +999,8 @@ async function computeDiff(ctx, config) {
         desired = appConfig[resource.key];
       }
       if (desired === void 0) continue;
-      const current = await resource.read(ctx, app);
+      const bulk = prefetched.get(resource.key);
+      const current = bulk ? bulk.get(app) : await resource.read(ctx, app);
       const change = computeChange(current, desired);
       if (!change.changed) {
         appDiff[resource.key] = { status: "in-sync", desired, current };
@@ -1027,6 +1129,14 @@ function validate(filePath) {
   return { errors, warnings };
 }
 
+// src/core/mask.ts
+function maskSensitiveArgs(cmd) {
+  return cmd.replace(/(\S*(?:TOKEN|SECRET|PASSWORD|KEY|AUTH|CREDENTIAL)\S*)=(\S+)/gi, (_, key, value) => {
+    if (value.length <= 4) return `${key}=****`;
+    return `${key}=****${value.slice(-4)}`;
+  });
+}
+
 // src/index.ts
 var require2 = createRequire(import.meta.url);
 var { version } = require2("../package.json");
@@ -1037,7 +1147,7 @@ function makeRunner(opts) {
     dryRun: opts.dryRun ?? false
   });
 }
-program.command("up [apps...]").description("Create/update apps and services to match config").option("-f, --file <path>", "Config file", "dokku-compose.yml").option("--dry-run", "Print commands without executing").option("--fail-fast", "Stop on first error").action(async (apps, opts) => {
+program.command("up [apps...]").description("Create/update apps and services to match config").option("-f, --file <path>", "Config file", "dokku-compose.yml").option("--dry-run", "Print commands without executing").option("--sensitive", "Show sensitive values in dry-run output (masked by default)").option("--fail-fast", "Stop on first error").action(async (apps, opts) => {
   const config = loadConfig(opts.file);
   const runner = makeRunner(opts);
   const ctx = createContext(runner);
@@ -1045,7 +1155,10 @@ program.command("up [apps...]").description("Create/update apps and services to
     await runUp(ctx, config, apps);
     if (opts.dryRun) {
       console.log("\n# Commands that would run:");
-      for (const cmd of runner.dryRunLog) console.log(`dokku ${cmd}`);
+      for (const cmd of runner.dryRunLog) {
+        const line = opts.sensitive ? cmd : maskSensitiveArgs(cmd);
+        console.log(`dokku ${line}`);
+      }
     }
   } finally {
     await ctx.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dokku-compose",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "Docker Compose for Dokku — declare your entire server in a single YAML file.",
   "main": "dist/index.js",
   "exports": "./dist/index.js",