dokku-compose 0.3.4 → 0.3.6

package/dist/index.js

@@ -4,6 +4,7 @@
 import { Command } from "commander";
 import * as fs3 from "fs";
 import * as yaml3 from "js-yaml";
+import { createRequire } from "module";
 
 // src/core/config.ts
 import * as fs from "fs";
@@ -99,12 +100,17 @@ function loadConfig(filePath) {
 
 // src/core/dokku.ts
 import { execa } from "execa";
+import { createHash } from "crypto";
+import * as os from "os";
+import * as path from "path";
 function createRunner(opts = {}) {
   const log = [];
+  const controlPath = opts.host ? path.join(os.tmpdir(), `dc-${createHash("sha1").update(opts.host).digest("hex").slice(0, 16)}.sock`) : null;
+  const sshControlFlags = controlPath ? ["-o", "ControlMaster=auto", "-o", `ControlPath=${controlPath}`, "-o", "ControlPersist=60"] : [];
   async function execDokku(args) {
     if (opts.host) {
       try {
-        const result = await execa("ssh", [`dokku@${opts.host}`, ...args]);
+        const result = await execa("ssh", [...sshControlFlags, `dokku@${opts.host}`, ...args]);
         return { stdout: result.stdout, ok: true };
       } catch (e) {
         return { stdout: e.stdout ?? "", ok: false };
@@ -136,6 +142,13 @@ function createRunner(opts = {}) {
       if (opts.dryRun) return false;
       const { ok } = await execDokku(args);
       return ok;
+    },
+    async close() {
+      if (!opts.host || !controlPath) return;
+      try {
+        await execa("ssh", ["-O", "exit", "-o", `ControlPath=${controlPath}`, `dokku@${opts.host}`]);
+      } catch {
+      }
     }
   };
 }
@@ -175,7 +188,9 @@ async function destroyApp(runner, app) {
 }
 async function exportApps(runner) {
   const output = await runner.query("apps:list");
-  return output.split("\n").map((s) => s.trim()).filter(Boolean);
+  return output.split("\n").map((s) => s.trim()).filter(
+    (s) => s && !s.startsWith("=====>")
+  );
 }
 
 // src/modules/domains.ts
@@ -261,9 +276,10 @@ async function ensureAppNetwork(runner, app, network) {
     await runner.run("network:set", app, "tld", network.tld);
   }
 }
+var DOCKER_BUILTIN_NETWORKS = /* @__PURE__ */ new Set(["bridge", "host", "none"]);
 async function exportNetworks(runner) {
   const output = await runner.query("network:list");
-  return output.split("\n").map((s) => s.trim()).filter(Boolean);
+  return output.split("\n").map((s) => s.trim()).filter((s) => s && !s.startsWith("=====>") && !DOCKER_BUILTIN_NETWORKS.has(s));
 }
 async function exportAppNetwork(runner, app) {
   const output = await runner.query("network:report", app);
@@ -470,7 +486,10 @@ async function exportAppNginx(runner, app) {
     const match = line.match(/^\s*Nginx\s+(.+?):\s*(.+?)\s*$/);
     if (match) {
       const key = match[1].toLowerCase().replace(/\s+/g, "-");
-      result[key] = match[2];
+      if (key.startsWith("computed-") || key.startsWith("global-") || key === "last-visited-at") continue;
+      const value = match[2].trim();
+      if (!value) continue;
+      result[key] = value;
     }
   }
   return Object.keys(result).length > 0 ? result : void 0;
@@ -688,6 +707,9 @@ async function runDown(runner, config, appFilter, opts) {
 // src/commands/export.ts
 async function runExport(runner, opts) {
   const config = { apps: {} };
+  const versionOutput = await runner.query("version");
+  const versionMatch = versionOutput.match(/(\d+\.\d+\.\d+)/);
+  if (versionMatch) config.dokku = { version: versionMatch[1] };
   const apps = opts.appFilter?.length ? opts.appFilter : await exportApps(runner);
   const networks = await exportNetworks(runner);
   if (networks.length > 0) config.networks = networks;
@@ -887,7 +909,9 @@ function validate(filePath) {
 }
 
 // src/index.ts
-var program = new Command().name("dokku-compose").version("0.3.0");
+var require2 = createRequire(import.meta.url);
+var { version } = require2("../package.json");
+var program = new Command().name("dokku-compose").version(version);
 function makeRunner(opts) {
   return createRunner({
     host: process.env.DOKKU_HOST,
@@ -897,10 +921,14 @@ function makeRunner(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("--fail-fast", "Stop on first error").action(async (apps, opts) => {
   const config = loadConfig(opts.file);
   const runner = makeRunner(opts);
-  await runUp(runner, config, apps);
-  if (opts.dryRun) {
-    console.log("\n# Commands that would run:");
-    for (const cmd of runner.dryRunLog) console.log(`dokku ${cmd}`);
+  try {
+    await runUp(runner, config, apps);
+    if (opts.dryRun) {
+      console.log("\n# Commands that would run:");
+      for (const cmd of runner.dryRunLog) console.log(`dokku ${cmd}`);
+    }
+  } finally {
+    await runner.close();
   }
 });
 program.command("down [apps...]").description("Destroy apps and services (requires --force)").option("-f, --file <path>", "Config file", "dokku-compose.yml").option("--force", "Required to destroy apps").action(async (apps, opts) => {
@@ -910,7 +938,11 @@ program.command("down [apps...]").description("Destroy apps and services (requir
   }
   const config = loadConfig(opts.file);
   const runner = makeRunner({});
-  await runDown(runner, config, apps, { force: true });
+  try {
+    await runDown(runner, config, apps, { force: true });
+  } finally {
+    await runner.close();
+  }
 });
 program.command("validate [file]").description("Validate dokku-compose.yml without touching the server").action((file = "dokku-compose.yml") => {
   const result = validate(file);
@@ -930,33 +962,45 @@ ${result.errors.length} error(s), ${result.warnings.length} warning(s)`);
 });
 program.command("export").description("Export server state to dokku-compose.yml format").option("--app <app>", "Export only a specific app").option("-o, --output <path>", "Write to file instead of stdout").action(async (opts) => {
   const runner = makeRunner({});
-  const result = await runExport(runner, {
-    appFilter: opts.app ? [opts.app] : void 0
-  });
-  const out = yaml3.dump(result, { lineWidth: 120 });
-  if (opts.output) {
-    fs3.writeFileSync(opts.output, out);
-    console.error(`Written to ${opts.output}`);
-  } else {
-    process.stdout.write(out);
+  try {
+    const result = await runExport(runner, {
+      appFilter: opts.app ? [opts.app] : void 0
+    });
+    const out = yaml3.dump(result, { lineWidth: 120 });
+    if (opts.output) {
+      fs3.writeFileSync(opts.output, out);
+      console.error(`Written to ${opts.output}`);
+    } else {
+      process.stdout.write(out);
+    }
+  } finally {
+    await runner.close();
   }
 });
 program.command("diff").description("Show what is out of sync between config and server").option("-f, --file <path>", "Config file", "dokku-compose.yml").option("--verbose", "Show git-style +/- diff").action(async (opts) => {
   const desired = loadConfig(opts.file);
   const runner = makeRunner({});
-  const current = await runExport(runner, {
-    appFilter: Object.keys(desired.apps)
-  });
-  const diff = computeDiff(desired, current);
-  const output = opts.verbose ? formatVerbose(diff) : formatSummary(diff);
-  process.stdout.write(output);
-  process.exit(diff.inSync ? 0 : 1);
+  try {
+    const current = await runExport(runner, {
+      appFilter: Object.keys(desired.apps)
+    });
+    const diff = computeDiff(desired, current);
+    const output = opts.verbose ? formatVerbose(diff) : formatSummary(diff);
+    process.stdout.write(output);
+    process.exit(diff.inSync ? 0 : 1);
+  } finally {
+    await runner.close();
+  }
 });
 program.command("ps [apps...]").description("Show status of configured apps").option("-f, --file <path>", "Config file", "dokku-compose.yml").action(async (apps, opts) => {
   const config = loadConfig(opts.file);
   const runner = makeRunner({});
-  const { runPs } = await import("./ps-33II4UU3.js");
-  await runPs(runner, config, apps);
+  try {
+    const { runPs } = await import("./ps-33II4UU3.js");
+    await runPs(runner, config, apps);
+  } finally {
+    await runner.close();
+  }
 });
 program.command("init [apps...]").description("Create a starter dokku-compose.yml").option("-f, --file <path>", "Config file", "dokku-compose.yml").action(async (apps, opts) => {
   const { runInit } = await import("./init-GIXEVLNW.js");

package/package.json

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