@launchmatic/cli 0.7.1 → 0.7.3

package/dist/index.js

@@ -21963,13 +21963,16 @@ function discoverServices(repoRoot = findRepoRoot()) {
   for (const absDir of dirs) {
     if (!isLikelyDeployable(absDir)) continue;
     const detection = detectLocal(absDir);
+    const rootDir = toPosix(relative(repoRoot, absDir));
+    const dockerfile = existsSync3(join2(absDir, "Dockerfile")) ? `${rootDir}/Dockerfile` : void 0;
     out.push({
       name: deriveName(repoRoot, absDir),
-      rootDir: toPosix(relative(repoRoot, absDir)),
+      rootDir,
       framework: detection.framework,
       buildCmd: detection.buildCmd,
       startCmd: detection.startCmd,
-      port: detection.port
+      port: detection.port,
+      ...dockerfile ? { dockerfile } : {}
     });
   }
   out.sort((a, b) => a.rootDir.localeCompare(b.rootDir));
@@ -22427,42 +22430,124 @@ async function pollDeploymentStatus(deploymentId, spinner) {
 }
 
 // src/commands/logs.ts
+function resolveServiceId(opts) {
+  try {
+    return readContext().serviceId;
+  } catch {
+  }
+  const manifest = readManifest();
+  if (!manifest || manifest.services.length === 0) {
+    console.error(
+      source_default.red(
+        `No .launchmatic.json here and no ${MANIFEST_FILE} at the repo root.`
+      )
+    );
+    return null;
+  }
+  if (!opts.service) {
+    const names = manifest.services.map((s) => s.name).join(", ");
+    console.error(
+      source_default.red(
+        `Specify which service with --service <name>. Known: ${names}`
+      )
+    );
+    return null;
+  }
+  const match = manifest.services.find((s) => s.name === opts.service);
+  if (!match?.serviceId) {
+    console.error(source_default.red(`No service named "${opts.service}" in ${MANIFEST_FILE}.`));
+    return null;
+  }
+  return match.serviceId;
+}
 function registerLogs(program3) {
-  program3.command("logs").description("Stream live logs from a deployment").action(async () => {
-    if (!isLoggedIn()) {
-      console.error(source_default.red('Not logged in. Run "lm login" first.'));
-      process.exitCode = 1;
-      return;
+  program3.command("logs").description(
+    "Stream runtime logs (default) or print build logs for a deployment"
+  ).option(
+    "-b, --build",
+    "Print build logs for a deployment instead of streaming runtime logs (use --deployment to target a specific one; defaults to the latest)"
+  ).option(
+    "-d, --deployment <id>",
+    "Deployment id for --build (defaults to the latest deployment)"
+  ).option(
+    "-s, --service <name>",
+    "Monorepo: which service to read logs for (matches launchmatic.json)"
+  ).action(
+    async (opts) => {
+      if (!isLoggedIn()) {
+        console.error(source_default.red('Not logged in. Run "lm login" first.'));
+        process.exitCode = 1;
+        return;
+      }
+      const serviceId = resolveServiceId({ service: opts.service });
+      if (!serviceId) {
+        process.exitCode = 1;
+        return;
+      }
+      if (opts.build) {
+        await printBuildLogs(serviceId, opts.deployment);
+        return;
+      }
+      await streamRuntimeLogs(serviceId);
     }
-    const ctx = readContext();
-    const apiUrl = getApiUrl();
-    const wsUrl = apiUrl.replace(/^http/, "ws");
-    const wsToken = await getWsToken();
-    console.log(source_default.dim("Streaming logs (Ctrl+C to stop)...\n"));
-    const ws = new wrapper_default(
-      `${wsUrl}/ws/runtime-logs/${ctx.serviceId}?token=${wsToken}`
+  );
+}
+async function printBuildLogs(serviceId, deploymentId) {
+  let targetId = deploymentId;
+  if (!targetId) {
+    const { data: data2 } = await api(
+      `/api/deployments?serviceId=${serviceId}&page=1&limit=1`
     );
-    ws.on("message", (data) => {
-      const msg = data.toString();
-      try {
-        const parsed = JSON.parse(msg);
-        const ts = parsed.timestamp ? source_default.dim(`[${new Date(parsed.timestamp).toLocaleTimeString()}]`) : "";
-        const line = parsed.message || parsed.line || msg;
-        console.log(`${ts} ${line}`);
-      } catch {
-        console.log(msg);
-      }
-    });
-    ws.on("error", (err) => {
-      console.error(source_default.red(`WebSocket error: ${err.message}`));
-      process.exitCode = 1;
-    });
-    ws.on("close", () => {
-      console.log(source_default.dim("\nLog stream ended."));
-    });
-    process.on("SIGINT", () => {
-      ws.close();
-    });
+    if (!data2 || data2.length === 0) {
+      console.log(source_default.dim("No deployments yet."));
+      return;
+    }
+    targetId = data2[0].id;
+  }
+  const { data } = await api(
+    `/api/deployments/${targetId}`
+  );
+  console.log(source_default.bold("Deployment: ") + data.id);
+  console.log(source_default.bold("Status:     ") + data.status);
+  if (data.commitSha) console.log(source_default.bold("Commit:     ") + data.commitSha);
+  if (data.branch) console.log(source_default.bold("Branch:     ") + data.branch);
+  console.log(source_default.bold("Started:    ") + new Date(data.createdAt).toLocaleString());
+  console.log();
+  if (!data.buildLogs) {
+    console.log(source_default.dim("No build logs recorded for this deployment."));
+    return;
+  }
+  console.log(source_default.bold("\u2500\u2500 Build logs \u2500\u2500"));
+  console.log(data.buildLogs);
+}
+async function streamRuntimeLogs(serviceId) {
+  const apiUrl = getApiUrl();
+  const wsUrl = apiUrl.replace(/^http/, "ws");
+  const wsToken = await getWsToken();
+  console.log(source_default.dim("Streaming logs (Ctrl+C to stop)...\n"));
+  const ws = new wrapper_default(
+    `${wsUrl}/ws/runtime-logs/${serviceId}?token=${wsToken}`
+  );
+  ws.on("message", (data) => {
+    const msg = data.toString();
+    try {
+      const parsed = JSON.parse(msg);
+      const ts = parsed.timestamp ? source_default.dim(`[${new Date(parsed.timestamp).toLocaleTimeString()}]`) : "";
+      const line = parsed.message || parsed.line || msg;
+      console.log(`${ts} ${line}`);
+    } catch {
+      console.log(msg);
+    }
+  });
+  ws.on("error", (err) => {
+    console.error(source_default.red(`WebSocket error: ${err.message}`));
+    process.exitCode = 1;
+  });
+  ws.on("close", () => {
+    console.log(source_default.dim("\nLog stream ended."));
+  });
+  process.on("SIGINT", () => {
+    ws.close();
   });
 }
 
@@ -25673,6 +25758,14 @@ function registerDeployments(program3) {
       if (data.imageTag) {
         console.log(source_default.bold("Image:      ") + data.imageTag);
       }
+      if (data.buildLogs) {
+        console.log();
+        console.log(source_default.bold("\u2500\u2500 Build logs \u2500\u2500"));
+        console.log(data.buildLogs);
+      } else {
+        console.log();
+        console.log(source_default.dim("(no build logs recorded)"));
+      }
     } catch (err) {
       spinner.fail(source_default.red(`Failed: ${err instanceof Error ? err.message : "Unknown error"}`));
       process.exitCode = 1;
@@ -26328,10 +26421,15 @@ Discovered ${discoveredInfra.length} infra dependenc${discoveredInfra.length ===
     discovered = await reviewList(
       `services`,
       discovered,
-      (s) => `${source_default.cyan(s.name)}  ${source_default.dim(s.rootDir)}${s.framework ? source_default.dim(` [${s.framework}]`) : ""}`,
+      (s) => {
+        const fw = s.framework ? source_default.dim(` [${s.framework}]`) : "";
+        const df = s.dockerfile ? source_default.dim(` Dockerfile=${s.dockerfile}`) : "";
+        return `${source_default.cyan(s.name)}  ${source_default.dim(s.rootDir)}${fw}${df}`;
+      },
       [
         { key: "name", label: "name" },
         { key: "rootDir", label: "rootDir" },
+        { key: "dockerfile", label: "dockerfile (path from repo root)" },
         { key: "framework", label: "framework" },
         { key: "buildCmd", label: "buildCmd" },
         { key: "startCmd", label: "startCmd" },
@@ -26426,6 +26524,7 @@ Discovered ${discoveredInfra.length} infra dependenc${discoveredInfra.length ===
       if (s.framework) payload.framework = s.framework;
       if (s.buildCmd) payload.buildCmd = s.buildCmd;
       if (s.startCmd) payload.startCmd = s.startCmd;
+      if (s.dockerfile) payload.dockerfilePath = s.dockerfile;
       if (gitInfo.repoOwner && gitInfo.repoName) {
         payload.repoOwner = gitInfo.repoOwner;
         payload.repoName = gitInfo.repoName;
@@ -26453,7 +26552,8 @@ Discovered ${discoveredInfra.length} infra dependenc${discoveredInfra.length ===
       framework: s.framework,
       buildCmd: s.buildCmd,
       startCmd: s.startCmd,
-      port: s.port
+      port: s.port,
+      ...s.dockerfile ? { dockerfile: s.dockerfile } : {}
     });
   }
   const infra = [];
@@ -26612,6 +26712,20 @@ async function up(opts) {
   console.log();
   const results = await Promise.allSettled(
     selected.map(async ({ entry }) => {
+      const patch = {};
+      if (entry.dockerfile !== void 0) patch.dockerfilePath = entry.dockerfile || null;
+      if (entry.rootDir) patch.rootDir = `/${entry.rootDir.replace(/^\/+/, "")}`;
+      if (entry.buildCmd) patch.buildCmd = entry.buildCmd;
+      if (entry.startCmd) patch.startCmd = entry.startCmd;
+      if (Object.keys(patch).length > 0) {
+        try {
+          await api(`/api/services/${entry.serviceId}`, {
+            method: "PATCH",
+            body: JSON.stringify(patch)
+          });
+        } catch {
+        }
+      }
       const res = await api("/api/deployments", {
         method: "POST",
         body: JSON.stringify({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@launchmatic/cli",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "Launchmatic CLI — deploy from your terminal",
   "private": false,
   "type": "module",