sim-setup 1.0.31-preview.176.1 → 1.0.31-preview.177.1

package/dist/index.js

@@ -12016,6 +12016,45 @@ function dockerText(args, cwd = ROOT) {
   const result = spawnSync8("docker", args, { cwd, encoding: "utf8" });
   return result.status === 0 ? result.stdout.trim() : null;
 }
+function composeServiceState(stateOutput) {
+  if (stateOutput === null)
+    return "unknown";
+  const states = stateOutput.split(`
+`).map((state) => state.trim()).filter(Boolean);
+  if (states.length === 0)
+    return null;
+  return { state: states.includes("running") ? "running" : "stopped" };
+}
+function composeServiceQuery(project, service) {
+  return [
+    "ps",
+    "-a",
+    "--filter",
+    `label=com.docker.compose.project=${project}`,
+    "--filter",
+    `label=com.docker.compose.service=${service}`,
+    "--format",
+    "{{.State}}"
+  ];
+}
+function serviceStatusRows(installs, standalone, query = (args) => dockerText(args)) {
+  const rows = [];
+  const stacks = installs.filter((install) => install.kind === "compose");
+  if (stacks.length === 0 || installs.some((install) => install.kind === "dev")) {
+    rows.push({ label: `postgres (${DB_CONTAINER})`, state: standalone.db }, { label: `redis (${REDIS_CONTAINER})`, state: standalone.redis });
+  }
+  for (const stack of stacks) {
+    const scope = stacks.length > 1 ? `${stack.project} ` : "";
+    rows.push({
+      label: `${scope}postgres (compose db)`,
+      state: composeServiceState(query(composeServiceQuery(stack.project, "db")))
+    }, {
+      label: `${scope}redis (compose redis)`,
+      state: composeServiceState(query(composeServiceQuery(stack.project, "redis")))
+    });
+  }
+  return rows;
+}
 function dockerInherit(args, cwd = ROOT) {
   return spawnSync8("docker", args, { cwd, stdio: "inherit" }).status ?? 1;
 }
@@ -12394,10 +12433,21 @@ ${theme.heading("◆ Sim status")}
   }
   for (const install of installs)
     console.log(` ${glyph.pass} ${describeInstall(install)}`);
-  const containerState = (state) => docker ? state ? state.state : "absent" : "unknown (docker down)";
+  const containerState = (state) => {
+    if (!docker)
+      return "unknown (docker down)";
+    if (state === "unknown")
+      return "unknown (docker query failed)";
+    return state ? state.state : "absent";
+  };
   console.log();
-  console.log(` postgres (${DB_CONTAINER}):  ${containerState(detection.dbContainer)}`);
-  console.log(` redis (${REDIS_CONTAINER}):     ${containerState(detection.redisContainer)}`);
+  const rows = serviceStatusRows(installs, {
+    db: detection.dbContainer,
+    redis: detection.redisContainer
+  });
+  const width = Math.max(...rows.map((row) => row.label.length)) + 3;
+  for (const row of rows)
+    console.log(` ${`${row.label}:`.padEnd(width)}${containerState(row.state)}`);
   const [app, realtime] = await Promise.all([
     httpHealth(`${APP_URL}/api/health`),
     httpHealth(REALTIME_HEALTH)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sim-setup",
-  "version": "1.0.31-preview.176.1",
+  "version": "1.0.31-preview.177.1",
   "description": "Set up and manage a self-hosted Sim installation",
   "type": "module",
   "bin": {