@pmate/cli 0.24.26 → 0.24.28

package/dist/index.d.ts

@@ -913,6 +913,7 @@ type ServiceCommandArgs = {
     action: "deploy" | "stop";
     namespace: string;
     name: string;
+    env?: string;
     baseUrl?: string;
     json: boolean;
 } | {
@@ -920,6 +921,7 @@ type ServiceCommandArgs = {
     action: "init";
     namespace: string;
     name: string;
+    env: string;
     cwd?: string;
     baseUrl?: string;
     json: boolean;
@@ -943,6 +945,36 @@ type ServiceCommandArgs = {
     includeSecretValue: boolean;
     baseUrl?: string;
     json: boolean;
+} | {
+    type: Command.Service;
+    action: "service-env-list";
+    appId: string;
+    baseUrl?: string;
+    json: boolean;
+} | {
+    type: Command.Service;
+    action: "service-env-get";
+    appId: string;
+    envName: string;
+    baseUrl?: string;
+    json: boolean;
+} | {
+    type: Command.Service;
+    action: "service-env-add";
+    appId: string;
+    envName: string;
+    baseUrl?: string;
+    json: boolean;
+} | {
+    type: Command.Service;
+    action: "service-env-expose";
+    appId: string;
+    envName: string;
+    exposeType?: "https" | "websocket";
+    off: boolean;
+    domain?: string;
+    baseUrl?: string;
+    json: boolean;
 } | {
     type: Command.Service;
     action: "env-get";

package/dist/index.js

@@ -18212,6 +18212,20 @@ var ServiceRegistryClient = class {
       }
     );
   }
+  async getServiceEnv(serviceId, envName) {
+    const payload = await this.request(
+      "GET",
+      `/services/by-id/${encodeURIComponent(serviceId)}/envs/${encodeURIComponent(envName)}`
+    );
+    return payload.item;
+  }
+  async appendDeployHistory(serviceId, input) {
+    return this.requestWithBody(
+      "POST",
+      `/services/by-id/${encodeURIComponent(serviceId)}/deploy-history`,
+      input
+    );
+  }
   async pullEnv(serviceId, options) {
     const pathname = `/services/by-id/${encodeURIComponent(serviceId)}/env/pull`;
     const response = await fetch(`${this.resolveBaseUrl()}${pathname}`, {
@@ -18327,6 +18341,12 @@ var ServiceRuntimeRunner = class {
   }
   async deploy(service, options = {}) {
     switch (this.getType(service)) {
+      case "node-api":
+        await this.deployNode(service, options);
+        return;
+      case "node-job":
+        await this.deployScriptManaged(service);
+        return;
       case "vite":
         await this.deployVite(service, options);
         return;
@@ -18334,14 +18354,14 @@ var ServiceRuntimeRunner = class {
         await this.deployStatic(service, options);
         return;
       case "node":
-        await this.deployNode(service);
+        await this.deployNode(service, options);
         return;
       case "rust":
       case "python":
         await this.deployScriptManaged(service);
         return;
       case "fc":
-        await this.deployFc(service);
+        await this.deployFc(service, options);
         return;
       case "ios":
       case "android":
@@ -18354,6 +18374,7 @@ var ServiceRuntimeRunner = class {
   }
   async stop(service) {
     switch (this.getType(service)) {
+      case "node-job":
       case "rust":
       case "python":
         await this.stopScriptManaged(service);
@@ -18376,6 +18397,12 @@ var ServiceRuntimeRunner = class {
       case "static":
         await this.initStaticLike(service);
         return;
+      case "node-api":
+        await this.initServerApp(service, options, { ensurePackageJson: true });
+        return;
+      case "node-job":
+        await this.initServerApp(service, options, { ensurePackageJson: false });
+        return;
       case "node":
         await this.initServerApp(service, options, { ensurePackageJson: true });
         return;
@@ -18588,7 +18615,7 @@ var ServiceRuntimeRunner = class {
     }
     await AliyunService.uploadDirectory(srcDir, bucketName);
   }
-  async deployFc(service) {
+  async deployFc(service, options = {}) {
     const fc = this.getFc(service);
     this.validateFcConfig(service, fc);
     const repoRoot = this.resolveRepoRoot(service);
@@ -18606,7 +18633,7 @@ var ServiceRuntimeRunner = class {
     await this.runCommand("pnpm", ["--filter", pkgName, "build"], repoRoot);
     const registry = new ServiceRegistryClient();
     const appId = `${service.namespace}:${service.name}`;
-    const stage = fc.deployStage ?? "prod";
+    const stage = this.envNameToStage(options.envName ?? fc.deployStage ?? "prod");
     const requiredEnv = await this.syncFcRequiredEnv(service, registry, stage);
     const resolved = await registry.resolveEnv(appId, {
       stage,
@@ -18704,7 +18731,7 @@ var ServiceRuntimeRunner = class {
       url: this.buildFcUrl(fc)
     });
   }
-  async deployNode(service) {
+  async deployNode(service, options = {}) {
     const network = this.getNetwork(service);
     const server = network.server?.trim();
     const repository = network.repository?.trim();
@@ -18731,7 +18758,7 @@ var ServiceRuntimeRunner = class {
       `pkg="${appDir}/package.json"`,
       `if [ -f "$pkg" ] && node -e 'const fs=require("node:fs"); const p=JSON.parse(fs.readFileSync(process.argv[1],"utf8")); process.exit(p?.scripts?.build ? 0 : 1);' "$pkg"; then (cd "${appDir}" && pnpm run build); fi`
     ].join("; ");
-    const envSyncCommand = await this.buildNodeEnvSyncCommand(service.id, appDir);
+    const envSyncCommand = await this.buildNodeEnvSyncCommand(service.id, appDir, options.envName);
     const command = [
       `cd "$HOME"`,
       `[ -d "${repoDir}/.git" ] || git clone "${gitUrl}" "${repoDir}"`,
@@ -18749,13 +18776,13 @@ var ServiceRuntimeRunner = class {
     ].join(" && ");
     await this.runRemoteCommand(server, command);
   }
-  async buildNodeEnvSyncCommand(serviceId, appDir) {
+  async buildNodeEnvSyncCommand(serviceId, appDir, envName = "prod") {
     if (!this.envProvider) {
       return void 0;
     }
     let pulled;
     try {
-      pulled = await this.envProvider(serviceId, { stage: "prod", format: "dotenv" });
+      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 .env.local sync.`);
@@ -18977,6 +19004,12 @@ var ServiceRuntimeRunner = class {
     }
     return payload.data;
   }
+  envNameToStage(envName) {
+    if (envName === "dev" || envName === "preview" || envName === "prod") {
+      return envName;
+    }
+    return "preview";
+  }
   renderPage(page, options = {}) {
     ui.info("Page", {
       page: page.page,
@@ -19758,17 +19791,32 @@ var ServiceCommandHandler = class {
       }
       case "deploy": {
         const record = await registry.getService(args.namespace, args.name);
-        await runtime.deploy(record);
+        const service = await this.materializeServiceEnv(registry, record, args.env);
+        try {
+          await runtime.deploy(service, { envName: args.env });
+          await this.appendDeployHistory(registry, record.id, args.env, "success");
+        } catch (error) {
+          await this.appendDeployHistory(
+            registry,
+            record.id,
+            args.env,
+            "failed",
+            error instanceof Error ? error.message : String(error)
+          );
+          throw error;
+        }
         return;
       }
       case "stop": {
         const record = await registry.getService(args.namespace, args.name);
-        await runtime.stop(record);
+        const service = args.env ? await this.materializeServiceEnv(registry, record, args.env) : record;
+        await runtime.stop(service);
         return;
       }
       case "init": {
         const record = await registry.getService(args.namespace, args.name);
-        await runtime.init(record, { cwd: args.cwd });
+        const service = await this.materializeServiceEnv(registry, record, args.env);
+        await runtime.init(service, { cwd: args.cwd });
         return;
       }
       case "log": {
@@ -19901,7 +19949,183 @@ var ServiceCommandHandler = class {
         this.renderJson(payload, args.json);
         return;
       }
+      case "service-env-list": {
+        const payload = await this.request(
+          baseUrl,
+          "GET",
+          this.buildServiceEnvBasePath(args.appId)
+        );
+        this.renderJson(payload, true);
+        return;
+      }
+      case "service-env-get": {
+        const payload = await this.request(
+          baseUrl,
+          "GET",
+          `${this.buildServiceEnvBasePath(args.appId)}/${encodeURIComponent(args.envName)}`
+        );
+        this.renderJson(payload, true);
+        return;
+      }
+      case "service-env-add": {
+        const payload = await this.request(
+          baseUrl,
+          "PUT",
+          `${this.buildServiceEnvBasePath(args.appId)}/${encodeURIComponent(args.envName)}`,
+          {
+            name: args.envName
+          }
+        );
+        ui.success(`Updated service env ${args.envName} for ${args.appId}`);
+        this.renderJson(payload, args.json);
+        return;
+      }
+      case "service-env-expose": {
+        const payload = await this.request(
+          baseUrl,
+          "POST",
+          `${this.buildServiceEnvBasePath(args.appId)}/${encodeURIComponent(args.envName)}/expose`,
+          {
+            ...args.exposeType ? { type: args.exposeType } : {},
+            ...args.domain ? { domain: args.domain } : {},
+            ...args.off ? { off: true } : {}
+          }
+        );
+        ui.success(
+          args.off ? `Disabled network for ${args.appId} ${args.envName}` : `Updated network for ${args.appId} ${args.envName}`
+        );
+        this.renderJson(payload, args.json);
+        return;
+      }
+    }
+  }
+  async materializeServiceEnv(registry, service, envName) {
+    if (!envName || !this.isDefinitionStyleService(service)) {
+      return service;
     }
+    const env = await registry.getServiceEnv(service.id, envName);
+    return this.buildRuntimeServiceRecord(service, env);
+  }
+  isDefinitionStyleService(service) {
+    return "repository" in service || "type" in service && (service.type === "node-api" || service.type === "node-job") || !("site" in service) && !("network" in service) && !("fc" in service) && !("runtimeType" in service);
+  }
+  buildRuntimeServiceRecord(service, env) {
+    if (!("type" in service)) {
+      return service;
+    }
+    const repository = service.repository?.trim();
+    const dir = service.dir?.trim();
+    const runtime = env.runtime;
+    if (!runtime) {
+      throw new Error(`Missing runtime for ${service.id} env ${env.name}`);
+    }
+    if (!repository) {
+      throw new Error(`Missing service.repository for ${service.id}`);
+    }
+    if (!dir) {
+      throw new Error(`Missing service.dir for ${service.id}`);
+    }
+    if (runtime.type === "ali-oss") {
+      const domainParts = splitPrimaryDomain(env.network?.domain);
+      return {
+        id: service.id,
+        namespace: service.namespace,
+        name: service.name,
+        type: service.type === "static" ? "static" : "vite",
+        site: {
+          exposeType: "static-site",
+          repository,
+          dir,
+          bucket: requireString(runtime.bucket, `runtime.bucket for ${service.id} ${env.name}`),
+          domain: domainParts.domain,
+          ...domainParts.subdomain ? { subdomain: domainParts.subdomain } : {}
+        }
+      };
+    }
+    if (runtime.type === "ssh-pm2") {
+      return {
+        id: service.id,
+        namespace: service.namespace,
+        name: runtime.appName?.trim() || service.name,
+        type: service.type === "node-api" ? "node-api" : "node",
+        network: {
+          exposeType: env.network?.type === "websocket" ? "websocket" : env.network ? "rest" : "internal",
+          repository,
+          dir,
+          server: requireString(runtime.server, `runtime.server for ${service.id} ${env.name}`),
+          ...runtime.port !== void 0 ? { port: runtime.port } : {},
+          ...splitPrimaryDomain(env.network?.domain)
+        }
+      };
+    }
+    if (runtime.type === "ssh-script") {
+      return {
+        id: service.id,
+        namespace: service.namespace,
+        name: service.name,
+        type: service.type === "node-job" ? "node-job" : service.type === "rust" ? "rust" : "python",
+        network: {
+          exposeType: env.network?.type === "websocket" ? "websocket" : env.network ? "rest" : "internal",
+          repository,
+          dir: runtime.cwd?.trim() || dir,
+          server: requireString(runtime.server, `runtime.server for ${service.id} ${env.name}`),
+          ...runtime.port !== void 0 ? { port: runtime.port } : {},
+          ...splitPrimaryDomain(env.network?.domain)
+        },
+        runner: {
+          script: requireString(runtime.command, `runtime.command for ${service.id} ${env.name}`)
+        }
+      };
+    }
+    if (runtime.type === "fc") {
+      const domainParts = splitPrimaryDomain(env.network?.domain);
+      return {
+        id: service.id,
+        namespace: service.namespace,
+        name: service.name,
+        type: "fc",
+        fc: {
+          provider: runtime.provider ?? "aliyun",
+          region: requireString(runtime.region, `runtime.region for ${service.id} ${env.name}`),
+          repository,
+          dir,
+          functionName: requireString(runtime.functionName, `runtime.functionName for ${service.id} ${env.name}`),
+          ...runtime.configFile ? { configFile: runtime.configFile } : {},
+          ...runtime.qualifier ? { qualifier: runtime.qualifier } : {},
+          ...domainParts.domain ? { domain: domainParts.domain } : {},
+          ...domainParts.subdomain ? { subdomain: domainParts.subdomain } : {},
+          deployStage: env.name === "prod" || env.name === "preview" || env.name === "dev" ? env.name : "preview"
+        }
+      };
+    }
+    throw new Error(`Unsupported runtime ${runtime.type} for ${service.id} env ${env.name}`);
+  }
+  async appendDeployHistory(registry, serviceId, environment, status, message) {
+    let lastError;
+    for (let attempt = 1; attempt <= 5; attempt += 1) {
+      try {
+        await registry.appendDeployHistory(serviceId, {
+          environment,
+          status,
+          ...message ? { message } : {}
+        });
+        return;
+      } catch (error2) {
+        lastError = error2;
+        if (attempt < 5 && shouldRetryDeployHistoryAppend(error2)) {
+          await sleep3(attempt * 1e3);
+          continue;
+        }
+        break;
+      }
+    }
+    const error = lastError;
+    ui.warn("Failed to append deploy history", {
+      serviceId,
+      environment,
+      status,
+      message: error instanceof Error ? error.message : String(error)
+    });
   }
   resolveBaseUrl(baseUrl) {
     return (baseUrl || process.env.PMATE_APPS_API_BASE_URL || "https://apps-api.pmate.chat").replace(/\/+$/, "");
@@ -19943,6 +20167,9 @@ var ServiceCommandHandler = class {
   buildEnvBasePath(appId) {
     return `/services/by-id/${encodeURIComponent(appId)}/env`;
   }
+  buildServiceEnvBasePath(appId) {
+    return `/services/by-id/${encodeURIComponent(appId)}/envs`;
+  }
   buildEnvPath(appId, query) {
     const params = new URLSearchParams();
     if (query.scope) {
@@ -20308,6 +20535,33 @@ var ServiceCommandHandler = class {
     ui.plain(JSON.stringify(value, null, 2));
   }
 };
+function requireString(value, field) {
+  if (typeof value !== "string" || !value.trim()) {
+    throw new Error(`Missing ${field}`);
+  }
+  return value.trim();
+}
+function splitPrimaryDomain(host) {
+  const normalized = host?.trim();
+  if (!normalized) {
+    return { domain: "pmate.chat" };
+  }
+  const parts = normalized.split(".").filter(Boolean);
+  if (parts.length <= 2) {
+    return { domain: normalized };
+  }
+  return {
+    subdomain: parts.slice(0, -2).join("."),
+    domain: parts.slice(-2).join(".")
+  };
+}
+function shouldRetryDeployHistoryAppend(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  return message.includes("status 502") || message.includes("status 503") || message.includes("status 504") || message.includes("fetch failed") || message.includes("ECONNRESET") || message.includes("ETIMEDOUT");
+}
+function sleep3(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
 
 // src/commands/VercelCommandHandler.ts
 var import_node_child_process12 = require("child_process");
@@ -22556,10 +22810,14 @@ init_namespacedRef();
 function parseServiceArgs(tokens) {
   const rest = [...tokens];
   const rawAction = rest.shift();
-  if (rawAction && looksLikeNamespacedRef(rawAction) && rest[0] === "env") {
+  if (rawAction && looksLikeNamespacedRef(rawAction) && rest[0] === "env-vars") {
     rest.shift();
     return parseServiceEnvArgs(rawAction, rest);
   }
+  if (rawAction && looksLikeNamespacedRef(rawAction) && rest[0] === "env") {
+    rest.shift();
+    return parseServiceEnvDefinitionArgs(rawAction, rest);
+  }
   const action = rawAction === "view" ? "view" : rawAction;
   if (!action) {
     throw new Error("Missing service action. Use: service list|get|view|create|update|rename|delete|deploy|stop|init|log");
@@ -22629,6 +22887,7 @@ function parseServiceArgs(tokens) {
     let history = false;
     let search;
     let follow = false;
+    let env;
     while (rest.length > 0) {
       const token = rest.shift();
       switch (token) {
@@ -22641,6 +22900,12 @@ function parseServiceArgs(tokens) {
           }
           cwd = requireValue6(rest, token);
           break;
+        case "--env":
+          if (action !== "deploy" && action !== "init" && action !== "stop") {
+            throw new Error(`Unknown service ${action} option: ${token}`);
+          }
+          env = requireValue6(rest, token);
+          break;
         case "--page":
           page = Number.parseInt(requireValue6(rest, token), 10);
           break;
@@ -22668,10 +22933,16 @@ function parseServiceArgs(tokens) {
       return { type: "service" /* Service */, action, namespace, name, baseUrl, json, page, history, search, follow };
     }
     if (action === "deploy" || action === "stop") {
-      return { type: "service" /* Service */, action, namespace, name, baseUrl, json };
+      if (action === "deploy" && !env) {
+        throw new Error("Missing required option --env for service deploy");
+      }
+      return { type: "service" /* Service */, action, namespace, name, env, baseUrl, json };
     }
     if (action === "init") {
-      return { type: "service" /* Service */, action, namespace, name, cwd, baseUrl, json };
+      if (!env) {
+        throw new Error("Missing required option --env for service init");
+      }
+      return { type: "service" /* Service */, action, namespace, name, env, cwd, baseUrl, json };
     }
     return { type: "service" /* Service */, action, namespace, name, baseUrl, json };
   }
@@ -22839,6 +23110,106 @@ function parseBareRenameId3(value, entityName) {
 function looksLikeNamespacedRef(value) {
   return value.includes(":") && !value.startsWith("-");
 }
+function parseServiceEnvDefinitionArgs(appId, tokens) {
+  const rest = [...tokens];
+  const action = rest.shift();
+  if (!action) {
+    throw new Error("Usage: service <ns:service> env list|get|add|expose");
+  }
+  let baseUrl;
+  let json = false;
+  if (action === "list") {
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--base-url":
+          baseUrl = requireValue6(rest, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown service env list option: ${token}`);
+      }
+    }
+    return { type: "service" /* Service */, action: "service-env-list", appId, baseUrl, json };
+  }
+  if (action === "get" || action === "add") {
+    const envName = rest.shift();
+    if (!envName || envName.startsWith("-")) {
+      throw new Error(`Usage: service <ns:service> env ${action} <env> [--base-url <url>] [--json]`);
+    }
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--base-url":
+          baseUrl = requireValue6(rest, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown service env ${action} option: ${token}`);
+      }
+    }
+    return {
+      type: "service" /* Service */,
+      action: action === "get" ? "service-env-get" : "service-env-add",
+      appId,
+      envName,
+      baseUrl,
+      json
+    };
+  }
+  if (action === "expose") {
+    const envName = rest.shift();
+    if (!envName || envName.startsWith("-")) {
+      throw new Error("Usage: service <ns:service> env expose <env> [--type https|websocket] [--domain <domain>] [--off]");
+    }
+    let exposeType;
+    let domain;
+    let off = false;
+    while (rest.length > 0) {
+      const token = rest.shift();
+      switch (token) {
+        case "--type": {
+          const value = requireValue6(rest, token);
+          if (value !== "https" && value !== "websocket") {
+            throw new Error("--type must be https or websocket");
+          }
+          exposeType = value;
+          break;
+        }
+        case "--domain":
+          domain = requireValue6(rest, token);
+          break;
+        case "--off":
+          off = true;
+          break;
+        case "--base-url":
+          baseUrl = requireValue6(rest, token);
+          break;
+        case "--json":
+          json = true;
+          break;
+        default:
+          throw new Error(`Unknown service env expose option: ${token}`);
+      }
+    }
+    return {
+      type: "service" /* Service */,
+      action: "service-env-expose",
+      appId,
+      envName,
+      exposeType,
+      domain,
+      off,
+      baseUrl,
+      json
+    };
+  }
+  throw new Error(`Unknown service env action: ${action}`);
+}
 function parseServiceEnvArgs(appId, tokens) {
   const rest = [...tokens];
   const action = rest.shift();
@@ -22855,6 +23226,7 @@ function parseServiceEnvArgs(appId, tokens) {
       const token = rest.shift();
       switch (token) {
         case "--scope":
+        case "--env":
           scope = requireValue6(rest, token);
           break;
         case "--include-secret-meta":
@@ -22886,6 +23258,7 @@ function parseServiceEnvArgs(appId, tokens) {
       const token = rest.shift();
       switch (token) {
         case "--scope":
+        case "--env":
           scope = requireValue6(rest, token);
           break;
         case "--include-secret-value":
@@ -22901,9 +23274,7 @@ function parseServiceEnvArgs(appId, tokens) {
           throw new Error(`Unknown service env get option: ${token}`);
       }
     }
-    if (!scope) {
-      throw new Error("Usage: service <ns:app> env get <key> --scope <scope> [--include-secret-value]");
-    }
+    scope = scope ?? "all";
     return { type: "service" /* Service */, action: "env-get", appId, key, scope, includeSecretValue, baseUrl, json };
   }
   if (action === "set") {
@@ -22922,6 +23293,7 @@ function parseServiceEnvArgs(appId, tokens) {
       const token = rest.shift();
       switch (token) {
         case "--scope":
+        case "--env":
           scope = requireValue6(rest, token);
           break;
         case "--secret":
@@ -22940,9 +23312,7 @@ function parseServiceEnvArgs(appId, tokens) {
           throw new Error(`Unknown service env set option: ${token}`);
       }
     }
-    if (!scope) {
-      throw new Error("Usage: service <ns:app> env set <key> [value] --scope <scope> [--secret] [--prompt]");
-    }
+    scope = scope ?? "all";
     if (!value && !secret && !prompt) {
       throw new Error("Missing env value. Pass a value or use --prompt.");
     }
@@ -22958,6 +23328,7 @@ function parseServiceEnvArgs(appId, tokens) {
       const token = rest.shift();
       switch (token) {
         case "--scope":
+        case "--env":
           scope = requireValue6(rest, token);
           break;
         case "--base-url":
@@ -22970,9 +23341,7 @@ function parseServiceEnvArgs(appId, tokens) {
           throw new Error(`Unknown service env unset option: ${token}`);
       }
     }
-    if (!scope) {
-      throw new Error("Usage: service <ns:app> env unset <key> --scope <scope>");
-    }
+    scope = scope ?? "all";
     return { type: "service" /* Service */, action: "env-unset", appId, key, scope, baseUrl, json };
   }
   if (action === "resolve") {

package/package.json

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