dokku-compose 0.6.4 → 0.6.6

package/dist/index.js

@@ -142,6 +142,11 @@ 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 };
       }
     }
@@ -157,6 +162,9 @@ 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) {
@@ -182,9 +190,13 @@ function createContext(runner) {
     runner,
     query(...args) {
       const key = args.join("\0");
-      if (!cache.has(key)) {
+      const cached = cache.has(key);
+      if (!cached) {
         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) {
@@ -556,12 +568,10 @@ function buildConfigFromReports(builderReport, dockerfileReport, appJsonReport,
 var Builder = {
   key: "build",
   async read(ctx, 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 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 dockerOptsReport = parseReport(dockerOptsRaw, "docker-options");
     return buildConfigFromReports(
       parseReport(builderRaw, "builder"),
@@ -571,12 +581,10 @@ var Builder = {
     );
   },
   async readAll(ctx) {
-    const [builderRaw, dockerfileRaw, appJsonRaw, dockerOptsRaw] = await Promise.all([
-      ctx.query("builder:report"),
-      ctx.query("builder-dockerfile:report"),
-      ctx.query("app-json:report"),
-      ctx.query("docker-options:report")
-    ]);
+    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");

package/package.json

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