@pmate/cli 0.24.29 → 0.24.31

package/dist/index.d.ts

@@ -936,6 +936,7 @@ type ServiceCommandArgs = {
     history: boolean;
     search?: string;
     follow: boolean;
+    env?: string;
 } | {
     type: Command.Service;
     action: "deploy-logs" | "deploy-history";

package/dist/index.js

@@ -18201,6 +18201,13 @@ var ServiceRegistryClient = class {
     );
     return payload.items;
   }
+  async listServiceEnvs(serviceId) {
+    const payload = await this.request(
+      "GET",
+      `/services/by-id/${encodeURIComponent(serviceId)}/envs`
+    );
+    return payload.items;
+  }
   async resolveEnv(serviceId, options) {
     return this.requestWithBody(
       "POST",
@@ -18355,7 +18362,7 @@ var ServiceRuntimeRunner = class {
         await this.deployNode(service, options);
         return;
       case "node-job":
-        await this.deployScriptManaged(service);
+        await this.deployScriptManaged(service, options);
         return;
       case "vite":
         await this.deployVite(service, options);
@@ -18368,7 +18375,7 @@ var ServiceRuntimeRunner = class {
         return;
       case "rust":
       case "python":
-        await this.deployScriptManaged(service);
+        await this.deployScriptManaged(service, options);
         return;
       case "fc":
         await this.deployFc(service, options);
@@ -18382,12 +18389,12 @@ var ServiceRuntimeRunner = class {
         throw new Error(`Unsupported service type for deploy: ${this.getType(service)}`);
     }
   }
-  async stop(service) {
+  async stop(service, options = {}) {
     switch (this.getType(service)) {
       case "node-job":
       case "rust":
       case "python":
-        await this.stopScriptManaged(service);
+        await this.stopScriptManaged(service, options);
         return;
       case "node":
         throw new Error("service stop is only supported for script-managed python/rust services for now");
@@ -18813,7 +18820,7 @@ var ServiceRuntimeRunner = class {
       `echo "[pmate] Synced env to $env_local"`
     ].join(" && ");
   }
-  async deployScriptManaged(service) {
+  async deployScriptManaged(service, options = {}) {
     const network = this.getNetwork(service);
     const runner = this.getRunner(service);
     const server = network.server?.trim();
@@ -18832,6 +18839,8 @@ var ServiceRuntimeRunner = class {
     const repoUrl = this.getRepoUrl(repository);
     const gitUrl = this.withToken(repoUrl);
     const scriptPath = script.startsWith("/") || script.startsWith("./") ? script : `./${script}`;
+    const envName = options.envName ?? "prod";
+    const envSyncCommand = await this.buildScriptEnvSyncCommand(service.id, envName);
     const command = [
       `cd "$HOME"`,
       `[ -d "${repoDir}/.git" ] || git clone "${gitUrl}" "${repoDir}"`,
@@ -18840,11 +18849,12 @@ var ServiceRuntimeRunner = class {
       `if [ -f ~/.bashrc ]; then . ~/.bashrc; fi`,
       `if [ -n "$(git status --porcelain)" ]; then git reset --hard HEAD; git clean -fd; fi`,
       `git pull`,
-      `"${scriptPath}" restart`
+      ...envSyncCommand ? [envSyncCommand] : [],
+      `"${scriptPath}" restart --env ${shellQuote2(envName)}`
     ].join(" && ");
     await this.runRemoteCommand(server, command);
   }
-  async stopScriptManaged(service) {
+  async stopScriptManaged(service, options = {}) {
     const network = this.getNetwork(service);
     const runner = this.getRunner(service);
     const server = network.server?.trim();
@@ -18861,15 +18871,51 @@ var ServiceRuntimeRunner = class {
     }
     const repoDir = this.getRepoDirName(repository);
     const scriptPath = script.startsWith("/") || script.startsWith("./") ? script : `./${script}`;
+    const envName = options.envName ?? "prod";
+    const envSyncCommand = await this.buildScriptEnvSyncCommand(service.id, envName);
     const command = [
       `cd "$HOME"`,
       `cd "${repoDir}"`,
       `if [ -f ~/.profile ]; then . ~/.profile; fi`,
       `if [ -f ~/.bashrc ]; then . ~/.bashrc; fi`,
-      `"${scriptPath}" stop`
+      ...envSyncCommand ? [envSyncCommand] : [],
+      `"${scriptPath}" stop --env ${shellQuote2(envName)}`
     ].join(" && ");
     await this.runRemoteCommand(server, command);
   }
+  async buildScriptEnvSyncCommand(serviceId, envName) {
+    if (!this.envProvider) {
+      return void 0;
+    }
+    let pulled;
+    try {
+      pulled = await this.envProvider(serviceId, { stage: this.envNameToStage(envName), format: "dotenv" });
+    } catch (error) {
+      if (error instanceof ServiceEnvNotFoundError) {
+        ui.warn(`No env found for ${serviceId}; skipping PMate env file sync.`);
+        return void 0;
+      }
+      throw error;
+    }
+    const serviceRef = parseServiceRef(serviceId);
+    const envFile = `.pmate/services/${serviceRef.namespace}/${serviceRef.name}/${envName}.env`;
+    const content = [
+      `PMATE_SERVICE_ID=${serviceId}`,
+      `PMATE_SERVICE_NAMESPACE=${serviceRef.namespace}`,
+      `PMATE_SERVICE_NAME=${serviceRef.name}`,
+      `PMATE_SERVICE_ENV=${envName}`,
+      pulled?.content?.trimEnd() ?? "",
+      ""
+    ].join("\n");
+    const encodedContent = Buffer.from(content, "utf8").toString("base64");
+    return [
+      `env_file="$HOME/${envFile}"`,
+      `mkdir -p "$(dirname "$env_file")"`,
+      `printf '%s' ${shellQuote2(encodedContent)} | base64 --decode > "$env_file"`,
+      `chmod 600 "$env_file"`,
+      `echo "[pmate] Synced env to $env_file"`
+    ].join(" && ");
+  }
   async initStaticLike(service) {
     const site = this.getSite(service);
     const bucketName = site.bucket?.trim();
@@ -19698,6 +19744,13 @@ var ServiceRuntimeRunner = class {
 function shellQuote2(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
+function parseServiceRef(serviceId) {
+  const [namespace, name, extra] = serviceId.split(":");
+  if (!namespace || !name || extra !== void 0) {
+    throw new Error(`Invalid service id: ${serviceId}`);
+  }
+  return { namespace, name };
+}
 
 // src/commands/ServiceCommandHandler.ts
 init_namespacedRef();
@@ -19718,12 +19771,36 @@ var ServiceCommandHandler = class {
         this.renderList(items, args.json);
         return;
       }
-      case "get":
-      case "view": {
+      case "get": {
         const record = await registry.getService(args.namespace, args.name);
         this.renderJson(record, true);
         return;
       }
+      case "view": {
+        const record = await registry.getService(args.namespace, args.name);
+        const [envsResult, envVarsResult] = await Promise.allSettled([
+          registry.listServiceEnvs(record.id),
+          registry.listEnvItems(record.id, { includeSecretMeta: true })
+        ]);
+        const envs = envsResult.status === "fulfilled" ? envsResult.value : [];
+        const envVars = envVarsResult.status === "fulfilled" ? envVarsResult.value : [];
+        const errors = [
+          envsResult.status === "rejected" ? { section: "envs", message: errorMessage(envsResult.reason) } : void 0,
+          envVarsResult.status === "rejected" ? { section: "envVars", message: errorMessage(envVarsResult.reason) } : void 0
+        ].filter((item) => item !== void 0);
+        const payload = {
+          service: record,
+          envs,
+          envVars,
+          ...errors.length > 0 ? { errors } : {}
+        };
+        if (args.json) {
+          this.renderJson(payload, true);
+        } else {
+          this.renderServiceView(payload);
+        }
+        return;
+      }
       case "create": {
         const payload = this.readJsonFile(args.filePath);
         await this.requireNamespace(payload, baseUrl);
@@ -19820,7 +19897,7 @@ var ServiceCommandHandler = class {
       case "stop": {
         const record = await registry.getService(args.namespace, args.name);
         const service = args.env ? await this.materializeServiceEnv(registry, record, args.env) : record;
-        await runtime.stop(service);
+        await runtime.stop(service, { envName: args.env });
         return;
       }
       case "init": {
@@ -19831,11 +19908,13 @@ var ServiceCommandHandler = class {
       }
       case "log": {
         const record = await registry.getService(args.namespace, args.name);
-        await runtime.log(record, {
+        const service = args.env ? await this.materializeServiceEnv(registry, record, args.env) : record;
+        await runtime.log(service, {
           page: args.page,
           history: args.history,
           search: args.search,
-          follow: args.follow
+          follow: args.follow,
+          envName: args.env
         });
         return;
       }
@@ -20370,6 +20449,85 @@ var ServiceCommandHandler = class {
       ui.info(`${time} ${item.environment} ${status}${message}`, item);
     }
   }
+  renderServiceView(payload) {
+    const service = payload.service;
+    ui.title(`Service ${service.id}`);
+    ui.plain("");
+    this.renderField("Type", this.getServiceType(service));
+    this.renderField("Repository", "repository" in service ? service.repository : void 0);
+    this.renderField("Directory", "dir" in service ? service.dir : void 0);
+    this.renderField("Status", "status" in service ? service.status : void 0);
+    this.renderField("Updated", formatTimestamp("updatedAt" in service ? service.updatedAt : void 0));
+    ui.plain("");
+    ui.title("Environments");
+    if (payload.envs.length === 0) {
+      ui.plain("  none");
+    } else {
+      for (const env of payload.envs) {
+        ui.plain(`  ${env.name}`);
+        const runtime = env.runtime;
+        if (runtime) {
+          this.renderField("Runtime", runtime.type, 4);
+          this.renderRuntimeFields(runtime);
+        } else {
+          this.renderField("Runtime", "none", 4);
+        }
+        const network = env.network;
+        if (network) {
+          this.renderField("Network", network.type, 4);
+          this.renderField("Domain", network.domain ? `https://${network.domain}` : void 0, 4);
+        } else {
+          this.renderField("Network", "none", 4);
+        }
+      }
+    }
+    ui.plain("");
+    ui.title("Env Vars");
+    if (payload.envVars.length === 0) {
+      ui.plain("  none");
+    } else {
+      for (const item of payload.envVars) {
+        const key = item.key ?? item.name ?? item.id ?? "unknown";
+        const scope = item.scope ? ` [${item.scope}]` : "";
+        const kind = item.kind ? ` ${item.kind}` : "";
+        const value = item.value !== void 0 ? ` = ${item.value}` : "";
+        ui.plain(`  ${key}${scope}${kind}${value}`);
+      }
+    }
+    for (const error of payload.errors ?? []) {
+      ui.warn(`Could not load ${error.section}`, { message: error.message });
+    }
+  }
+  renderRuntimeFields(runtime) {
+    if ("bucket" in runtime) {
+      this.renderField("Bucket", runtime.bucket, 4);
+    }
+    if ("server" in runtime) {
+      this.renderField("Server", runtime.server, 4);
+    }
+    if ("port" in runtime) {
+      this.renderField("Port", runtime.port, 4);
+    }
+    if ("region" in runtime) {
+      this.renderField("Region", runtime.region, 4);
+    }
+    if ("functionName" in runtime) {
+      this.renderField("Function", runtime.functionName, 4);
+    }
+    if ("command" in runtime) {
+      this.renderField("Command", runtime.command, 4);
+    }
+    if ("cwd" in runtime) {
+      this.renderField("Cwd", runtime.cwd, 4);
+    }
+  }
+  renderField(label, value, indent = 0) {
+    if (value === void 0 || value === null || value === "") {
+      return;
+    }
+    const padding = " ".repeat(indent);
+    ui.plain(`${padding}${label.padEnd(11)} ${String(value)}`);
+  }
   async deleteServiceResources(service) {
     switch (this.getServiceType(service)) {
       case "vite":
@@ -20583,6 +20741,15 @@ function requireString(value, field) {
   }
   return value.trim();
 }
+function errorMessage(error) {
+  return error instanceof Error ? error.message : String(error);
+}
+function formatTimestamp(value) {
+  if (typeof value !== "number" || !Number.isFinite(value)) {
+    return void 0;
+  }
+  return new Date(value).toISOString();
+}
 function splitPrimaryDomain(host) {
   const normalized = host?.trim();
   if (!normalized) {
@@ -22905,6 +23072,9 @@ function parseServiceArgs(tokens) {
         case "--base-url":
           baseUrl = requireValue6(rest, token);
           break;
+        case "--json":
+          json = true;
+          break;
         default:
           throw new Error(`Unknown service view option: ${token}`);
       }
@@ -22943,7 +23113,7 @@ function parseServiceArgs(tokens) {
           cwd = requireValue6(rest, token);
           break;
         case "--env":
-          if (action !== "deploy" && action !== "init" && action !== "stop" && action !== "deploy-logs" && action !== "deploy-history") {
+          if (action !== "deploy" && action !== "init" && action !== "stop" && action !== "log" && action !== "deploy-logs" && action !== "deploy-history") {
             throw new Error(`Unknown service ${action} option: ${token}`);
           }
           env = requireValue6(rest, token);
@@ -22972,7 +23142,7 @@ function parseServiceArgs(tokens) {
     const namespace = parsedRef.namespace;
     const name = parsedRef.objectId;
     if (action === "log") {
-      return { type: "service" /* Service */, action, namespace, name, baseUrl, json, page, history, search, follow };
+      return { type: "service" /* Service */, action, namespace, name, baseUrl, json, page, history, search, follow, env };
     }
     if (action === "deploy-logs" || action === "deploy-history") {
       return { type: "service" /* Service */, action, namespace, name, env, page, baseUrl, json };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmate/cli",
-  "version": "0.24.29",
+  "version": "0.24.31",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {