@pmate/cli 0.24.30 → 0.24.32

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

@@ -18362,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);
@@ -18375,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);
@@ -18389,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");
@@ -18820,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();
@@ -18839,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}"`,
@@ -18847,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();
@@ -18868,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();
@@ -19705,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();
@@ -19851,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": {
@@ -19862,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;
       }
@@ -20506,50 +20554,48 @@ var ServiceCommandHandler = class {
     const site = this.getStaticSiteConfig(service);
     const bucketName = site.bucket?.trim();
     const domainName = site.domain?.trim();
-    if (!bucketName) {
-      throw new Error(`Missing site.bucket for ${service.id}`);
-    }
-    if (!domainName) {
-      throw new Error(`Missing site.domain for ${service.id}`);
-    }
-    const subdomain = site.subdomain?.trim();
-    const rr = subdomain || "@";
-    const cdnDomain = subdomain ? `${subdomain}.${domainName}` : domainName;
-    const cname = await AliyunService.getCdnCname(cdnDomain);
-    if (cname) {
-      this.logDeletedRecords(
-        `Removed CNAME record for ${cdnDomain}`,
-        await AliyunService.deleteDomainRecords({
-          domainName,
-          rr,
-          type: "CNAME",
-          value: cname
-        })
-      );
-    } else {
-      ui.warn(`No CDN CNAME found for ${cdnDomain}; deleting matching CNAME records by host.`);
-      this.logDeletedRecords(
-        `Removed CNAME record for ${cdnDomain}`,
-        await AliyunService.deleteDomainRecords({
-          domainName,
-          rr,
-          type: "CNAME"
-        })
-      );
+    if (domainName) {
+      const subdomain = site.subdomain?.trim();
+      const rr = subdomain || "@";
+      const cdnDomain = subdomain ? `${subdomain}.${domainName}` : domainName;
+      const cname = await AliyunService.getCdnCname(cdnDomain);
+      if (cname) {
+        this.logDeletedRecords(
+          `Removed CNAME record for ${cdnDomain}`,
+          await AliyunService.deleteDomainRecords({
+            domainName,
+            rr,
+            type: "CNAME",
+            value: cname
+          })
+        );
+      } else {
+        ui.warn(`No CDN CNAME found for ${cdnDomain}; deleting matching CNAME records by host.`);
+        this.logDeletedRecords(
+          `Removed CNAME record for ${cdnDomain}`,
+          await AliyunService.deleteDomainRecords({
+            domainName,
+            rr,
+            type: "CNAME"
+          })
+        );
+      }
+      if (!subdomain) {
+        this.logDeletedRecords(
+          `Removed CNAME record for www.${domainName}`,
+          await AliyunService.deleteDomainRecords({
+            domainName,
+            rr: "www",
+            type: "CNAME",
+            value: domainName
+          })
+        );
+      }
+      await AliyunService.deleteCdnDomain(cdnDomain);
     }
-    if (!subdomain) {
-      this.logDeletedRecords(
-        `Removed CNAME record for www.${domainName}`,
-        await AliyunService.deleteDomainRecords({
-          domainName,
-          rr: "www",
-          type: "CNAME",
-          value: domainName
-        })
-      );
+    if (bucketName) {
+      await AliyunService.deleteBucketAndContents(bucketName);
     }
-    await AliyunService.deleteCdnDomain(cdnDomain);
-    await AliyunService.deleteBucketAndContents(bucketName);
   }
   async deleteServerResources(service) {
     const network = this.getNetworkConfig(service);
@@ -23065,7 +23111,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);
@@ -23094,7 +23140,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.30",
+  "version": "0.24.32",
   "description": "CLI utilities for the pMate project",
   "license": "MIT",
   "bin": {