dokku-compose 0.6.6 → 0.6.7

package/dist/index.js

@@ -142,11 +142,6 @@ function createRunner(opts = {}) {
         const result = await execa("dokku", args);
         return { stdout: result.stdout, ok: true };
       } catch (e) {
-        if (process.env.DOKKU_COMPOSE_DEBUG) {
-          console.error(`[debug] execDokku error for: dokku ${args.join(" ")}`);
-          console.error(`[debug]   exit code: ${e.exitCode}, stderr: ${(e.stderr ?? "").slice(0, 200)}`);
-          console.error(`[debug]   stdout length: ${(e.stdout ?? "").length}`);
-        }
         return { stdout: e.stdout ?? "", ok: false };
       }
     }
@@ -162,9 +157,6 @@ function createRunner(opts = {}) {
     },
     async query(...args) {
       const { stdout } = await execDokku(args);
-      if (process.env.DOKKU_COMPOSE_DEBUG && args[0]?.includes("builder-dockerfile")) {
-        console.error(`[debug] query ${args.join(" ")} => ${stdout.length} bytes`);
-      }
       return stdout.trim();
     },
     async check(...args) {
@@ -190,13 +182,9 @@ function createContext(runner) {
     runner,
     query(...args) {
       const key = args.join("\0");
-      const cached = cache.has(key);
-      if (!cached) {
+      if (!cache.has(key)) {
         cache.set(key, runner.query(...args));
       }
-      if (process.env.DOKKU_COMPOSE_DEBUG && args[0]?.includes("builder-dockerfile")) {
-        console.error(`[debug] ctx.query(${args.join(" ")}) cached=${cached}`);
-      }
       return cache.get(key);
     },
     check(...args) {
@@ -553,64 +541,32 @@ function parseBuildArgs(dockerOptsBuild) {
   for (const m of matches) args[m[1]] = m[2];
   return args;
 }
-function buildConfigFromReports(builderReport, dockerfileReport, appJsonReport, dockerOptsBuild) {
-  const config = {};
-  if (dockerfileReport["dockerfile-path"])
-    config.dockerfile = dockerfileReport["dockerfile-path"];
-  if (appJsonReport["selected"])
-    config.app_json = appJsonReport["selected"];
-  if (builderReport["build-dir"])
-    config.context = builderReport["build-dir"];
-  const args = parseBuildArgs(dockerOptsBuild);
-  if (Object.keys(args).length > 0) config.args = args;
-  return config;
-}
 var Builder = {
   key: "build",
   async read(ctx, target) {
-    const builderRaw = await ctx.query("builder:report", target);
-    const dockerfileRaw = await ctx.query("builder-dockerfile:report", target);
-    const appJsonRaw = await ctx.query("app-json:report", target);
-    const dockerOptsRaw = await ctx.query("docker-options:report", target);
+    const [builderRaw, dockerfileRaw, appJsonRaw, dockerOptsRaw] = await Promise.all([
+      ctx.query("builder:report", target),
+      ctx.query("builder-dockerfile:report", target),
+      ctx.query("app-json:report", target),
+      ctx.query("docker-options:report", target)
+    ]);
+    const config = {};
+    const builderReport = parseReport(builderRaw, "builder");
+    const dockerfileReport = parseReport(dockerfileRaw, "builder-dockerfile");
+    const appJsonReport = parseReport(appJsonRaw, "app-json");
     const dockerOptsReport = parseReport(dockerOptsRaw, "docker-options");
-    return buildConfigFromReports(
-      parseReport(builderRaw, "builder"),
-      parseReport(dockerfileRaw, "builder-dockerfile"),
-      parseReport(appJsonRaw, "app-json"),
-      dockerOptsReport["build"] ?? ""
-    );
-  },
-  async readAll(ctx) {
-    const builderRaw = await ctx.query("builder:report");
-    const dockerfileRaw = await ctx.query("builder-dockerfile:report");
-    const appJsonRaw = await ctx.query("app-json:report");
-    const dockerOptsRaw = await ctx.query("docker-options:report");
-    const builderBulk = parseBulkReport(builderRaw, "builder");
-    const dockerfileBulk = parseBulkReport(dockerfileRaw, "builder-dockerfile");
-    const appJsonBulk = parseBulkReport(appJsonRaw, "app-json");
-    const dockerOptsBulk = parseBulkReport(dockerOptsRaw, "docker-options");
-    if (process.env.DOKKU_COMPOSE_DEBUG) {
-      console.error("[debug] builderRaw length:", builderRaw.length);
-      console.error("[debug] dockerfileRaw length:", dockerfileRaw.length);
-      console.error("[debug] appJsonRaw length:", appJsonRaw.length);
-      console.error("[debug] dockerOptsRaw length:", dockerOptsRaw.length);
-      console.error("[debug] dockerfileRaw first 300:", JSON.stringify(dockerfileRaw.slice(0, 300)));
-      console.error("[debug] dockerOptsRaw first 300:", JSON.stringify(dockerOptsRaw.slice(0, 300)));
-      console.error("[debug] builderBulk keys:", [...builderBulk.keys()]);
-      console.error("[debug] dockerfileBulk keys:", [...dockerfileBulk.keys()]);
-      console.error("[debug] dockerOptsBulk keys:", [...dockerOptsBulk.keys()]);
-    }
-    const result = /* @__PURE__ */ new Map();
-    for (const app of builderBulk.keys()) {
-      result.set(app, buildConfigFromReports(
-        builderBulk.get(app) ?? {},
-        dockerfileBulk.get(app) ?? {},
-        appJsonBulk.get(app) ?? {},
-        dockerOptsBulk.get(app)?.["build"] ?? ""
-      ));
-    }
-    return result;
+    if (dockerfileReport["dockerfile-path"])
+      config.dockerfile = dockerfileReport["dockerfile-path"];
+    if (appJsonReport["selected"])
+      config.app_json = appJsonReport["selected"];
+    if (builderReport["build-dir"])
+      config.context = builderReport["build-dir"];
+    const args = parseBuildArgs(dockerOptsReport["build"] ?? "");
+    if (Object.keys(args).length > 0) config.args = args;
+    return config;
   },
+  // No readAll — builder-dockerfile:report and docker-options:report
+  // don't support bulk mode (no app arg) on all Dokku installations
   async onChange(ctx, target, { after }) {
     if (after.dockerfile)
       await ctx.run("builder-dockerfile:set", target, "dockerfile-path", after.dockerfile);
@@ -650,15 +606,8 @@ var DockerOptions = {
     const raw = await ctx.query("docker-options:report", target);
     return dockerOptsFromReport(parseReport(raw, "docker-options"));
   },
-  async readAll(ctx) {
-    const raw = await ctx.query("docker-options:report");
-    const bulk = parseBulkReport(raw, "docker-options");
-    const result = /* @__PURE__ */ new Map();
-    for (const [app, report] of bulk) {
-      result.set(app, dockerOptsFromReport(report));
-    }
-    return result;
-  },
+  // No readAll — docker-options:report doesn't support bulk mode (no app arg)
+  // on all Dokku installations due to basher environment issues
   async onChange(ctx, target, { before, after }) {
     for (const phase of PHASES) {
       const prev = new Set(before[phase] ?? []);

package/package.json

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