@pmate/cli 0.21.11 → 0.21.13

package/dist/index.js

@@ -17575,7 +17575,7 @@ var import_node_readline = require("readline");
 var import_chalk3 = __toESM(require("chalk"));
 var ServiceRuntimeRunner = class {
   async deploy(service, options = {}) {
-    switch (service.runtimeType) {
+    switch (this.getType(service)) {
       case "vite":
         await this.deployVite(service, options);
         return;
@@ -17589,12 +17589,17 @@ var ServiceRuntimeRunner = class {
       case "python":
         await this.deployScriptManaged(service);
         return;
+      case "ios":
+      case "android":
+        throw new Error(
+          `Service type "${this.getType(service)}" is registry-only for now; deploy is not supported yet`
+        );
       default:
-        throw new Error(`Unsupported runtimeType for deploy: ${service.runtimeType}`);
+        throw new Error(`Unsupported service type for deploy: ${this.getType(service)}`);
     }
   }
   async init(service, options = {}) {
-    switch (service.runtimeType) {
+    switch (this.getType(service)) {
       case "vite":
       case "static":
         await this.initStaticLike(service);
@@ -17606,8 +17611,13 @@ var ServiceRuntimeRunner = class {
       case "python":
         await this.initServerApp(service, options, { ensurePackageJson: false });
         return;
+      case "ios":
+      case "android":
+        throw new Error(
+          `Service type "${this.getType(service)}" is registry-only for now; init is not supported yet`
+        );
       default:
-        throw new Error(`Unsupported runtimeType for init: ${service.runtimeType}`);
+        throw new Error(`Unsupported service type for init: ${this.getType(service)}`);
     }
   }
   async log(service, options = {}) {
@@ -17677,14 +17687,56 @@ var ServiceRuntimeRunner = class {
       }
     }
   }
-  getDeploy(service) {
-    return service.deploy ?? {};
+  isLegacy(service) {
+    return "runtimeType" in service;
+  }
+  getType(service) {
+    return this.isLegacy(service) ? service.runtimeType : service.type;
+  }
+  getSite(service) {
+    if (!this.isLegacy(service) && service.site) {
+      return service.site;
+    }
+    const deploy = this.isLegacy(service) ? service.deploy ?? {} : {};
+    return {
+      exposeType: "static-site",
+      repository: String(deploy.repository ?? ""),
+      dir: String(deploy.dir ?? ""),
+      bucket: String(deploy.bucket ?? ""),
+      domain: String(deploy.domain ?? ""),
+      ...deploy.subdomain ? { subdomain: deploy.subdomain } : {}
+    };
+  }
+  getNetwork(service) {
+    if (!this.isLegacy(service) && service.network) {
+      return service.network;
+    }
+    const deploy = this.isLegacy(service) ? service.deploy ?? {} : {};
+    const exposeType = deploy.port === void 0 ? "internal" : deploy.serviceType === "ws" ? "websocket" : "rest";
+    return {
+      exposeType,
+      repository: String(deploy.repository ?? ""),
+      dir: String(deploy.dir ?? ""),
+      server: String(deploy.server ?? ""),
+      ...deploy.port !== void 0 ? { port: Number(deploy.port) } : {},
+      ...deploy.domain ? { domain: deploy.domain } : {},
+      ...deploy.subdomain ? { subdomain: deploy.subdomain } : {}
+    };
+  }
+  getRunner(service) {
+    if (!this.isLegacy(service) && service.runner) {
+      return service.runner;
+    }
+    const deploy = this.isLegacy(service) ? service.deploy ?? {} : {};
+    return {
+      script: String(deploy.script ?? "")
+    };
   }
   resolveRepoRoot(service, cwd) {
     if (cwd) {
       return import_node_path23.default.resolve(process.cwd(), cwd);
     }
-    const repository = this.getDeploy(service).repository?.trim();
+    const repository = this.getType(service) === "vite" || this.getType(service) === "static" ? this.getSite(service).repository?.trim() : this.getType(service) === "ios" || this.getType(service) === "android" ? void 0 : this.getNetwork(service).repository?.trim();
     if (repository) {
       const repoName = repository.replace(/\/+$/, "").split("/").pop()?.replace(/\.git$/i, "");
       if (repoName) {
@@ -17698,9 +17750,9 @@ var ServiceRuntimeRunner = class {
   }
   resolveLocalDir(service, cwd) {
     const repoRoot = this.resolveRepoRoot(service, cwd);
-    const dir = this.getDeploy(service).dir?.trim();
+    const dir = this.getType(service) === "vite" || this.getType(service) === "static" ? this.getSite(service).dir?.trim() : this.getType(service) === "ios" || this.getType(service) === "android" ? void 0 : this.getNetwork(service).dir?.trim();
     if (!dir) {
-      throw new Error(`Missing deploy.dir for ${service.id}`);
+      throw new Error(`Missing service dir for ${service.id}`);
     }
     return import_node_path23.default.resolve(repoRoot, dir);
   }
@@ -17720,9 +17772,10 @@ var ServiceRuntimeRunner = class {
     if (!(0, import_node_fs18.existsSync)(distDir)) {
       throw new Error(`No dist directory found at ${distDir}`);
     }
-    const bucketName = this.getDeploy(service).bucket?.trim();
+    const site = this.getSite(service);
+    const bucketName = site.bucket?.trim();
     if (!bucketName) {
-      throw new Error(`Missing deploy.bucket for ${service.id}`);
+      throw new Error(`Missing site.bucket for ${service.id}`);
     }
     await AliyunService.uploadDirectory(distDir, bucketName);
   }
@@ -17732,29 +17785,30 @@ var ServiceRuntimeRunner = class {
     if (!(0, import_node_fs18.existsSync)(srcDir)) {
       throw new Error(`No src directory found at ${srcDir}`);
     }
-    const bucketName = this.getDeploy(service).bucket?.trim();
+    const site = this.getSite(service);
+    const bucketName = site.bucket?.trim();
     if (!bucketName) {
-      throw new Error(`Missing deploy.bucket for ${service.id}`);
+      throw new Error(`Missing site.bucket for ${service.id}`);
     }
     await AliyunService.uploadDirectory(srcDir, bucketName);
   }
   async deployNode(service) {
-    const deploy = this.getDeploy(service);
-    const server = deploy.server?.trim();
-    const repository = deploy.repository?.trim();
+    const network = this.getNetwork(service);
+    const server = network.server?.trim();
+    const repository = network.repository?.trim();
     if (!server) {
-      throw new Error(`Missing deploy.server for ${service.id}`);
+      throw new Error(`Missing network.server for ${service.id}`);
     }
     if (!repository) {
-      throw new Error(`Missing deploy.repository for ${service.id}`);
+      throw new Error(`Missing network.repository for ${service.id}`);
     }
-    const port = deploy.port;
+    const port = network.port;
     if (port !== void 0 && (!Number.isFinite(port) || port <= 0)) {
-      throw new Error(`Invalid deploy.port for ${service.id}`);
+      throw new Error(`Invalid network.port for ${service.id}`);
     }
-    const appDir = deploy.dir?.trim();
+    const appDir = network.dir?.trim();
     if (!appDir) {
-      throw new Error(`Missing deploy.dir for ${service.id}`);
+      throw new Error(`Missing network.dir for ${service.id}`);
     }
     const repoDir = this.getRepoDirName(repository);
     const repoUrl = this.getRepoUrl(repository);
@@ -17782,18 +17836,19 @@ var ServiceRuntimeRunner = class {
     await this.runRemoteCommand(server, command);
   }
   async deployScriptManaged(service) {
-    const deploy = this.getDeploy(service);
-    const server = deploy.server?.trim();
-    const repository = deploy.repository?.trim();
-    const script = deploy.script?.trim();
+    const network = this.getNetwork(service);
+    const runner = this.getRunner(service);
+    const server = network.server?.trim();
+    const repository = network.repository?.trim();
+    const script = runner.script?.trim();
     if (!server) {
-      throw new Error(`Missing deploy.server for ${service.id}`);
+      throw new Error(`Missing network.server for ${service.id}`);
     }
     if (!repository) {
-      throw new Error(`Missing deploy.repository for ${service.id}`);
+      throw new Error(`Missing network.repository for ${service.id}`);
     }
     if (!script) {
-      throw new Error(`Missing deploy.script for ${service.id}`);
+      throw new Error(`Missing runner.script for ${service.id}`);
     }
     const repoDir = this.getRepoDirName(repository);
     const repoUrl = this.getRepoUrl(repository);
@@ -17812,43 +17867,43 @@ var ServiceRuntimeRunner = class {
     await this.runRemoteCommand(server, command);
   }
   async initStaticLike(service) {
-    const deploy = this.getDeploy(service);
-    const bucketName = deploy.bucket?.trim();
-    const baseDomain = deploy.domain?.trim();
+    const site = this.getSite(service);
+    const bucketName = site.bucket?.trim();
+    const baseDomain = site.domain?.trim();
     if (!bucketName) {
-      throw new Error(`Missing deploy.bucket for ${service.id}`);
+      throw new Error(`Missing site.bucket for ${service.id}`);
     }
     if (!baseDomain) {
-      throw new Error(`Missing deploy.domain for ${service.id}`);
+      throw new Error(`Missing site.domain for ${service.id}`);
     }
     await setupStaticSiteBucket({
       bucketName,
       domainName: baseDomain,
-      subdomain: deploy.subdomain,
-      routeType: service.runtimeType === "vite" ? "spa" : "spa"
+      subdomain: site.subdomain,
+      routeType: this.getType(service) === "vite" ? "spa" : "spa"
     });
   }
   async initServerApp(service, options, config) {
-    const deploy = this.getDeploy(service);
-    const subdomain = deploy.subdomain?.trim();
-    const port = deploy.port;
-    const server = deploy.server?.trim();
-    const serviceType = (deploy.serviceType || "rest").trim();
+    const network = this.getNetwork(service);
+    const subdomain = "subdomain" in network ? network.subdomain?.trim() : void 0;
+    const port = network.port;
+    const server = network.server?.trim();
+    const exposeType = network.exposeType;
     if (subdomain && port === void 0) {
-      throw new Error(`Missing deploy.port for ${service.id} (required when subdomain is set)`);
+      throw new Error(`Missing network.port for ${service.id} (required when subdomain is set)`);
     }
     if (subdomain && !server) {
-      throw new Error(`Missing deploy.server for ${service.id}`);
+      throw new Error(`Missing network.server for ${service.id}`);
     }
-    if (serviceType !== "rest" && serviceType !== "ws") {
-      throw new Error(`Invalid deploy.serviceType for ${service.id}`);
+    if (!["rest", "rpc", "websocket", "internal"].includes(exposeType)) {
+      throw new Error(`Invalid network.exposeType for ${service.id}`);
     }
     if (subdomain) {
       const serverAddress = await resolveServerAddress(server);
-      const templateName = serviceType === "ws" ? "nginx.ws.template" : "nginx.rest.template";
+      const templateName = exposeType === "websocket" ? "nginx.ws.template" : "nginx.rest.template";
       const templatePath = this.resolveTemplatePath(templateName);
       const template = (0, import_node_fs18.readFileSync)(templatePath, "utf8");
-      const host = `${subdomain}.${deploy.domain?.trim() || "pmate.chat"}`;
+      const host = `${subdomain}.${("domain" in network ? network.domain?.trim() : void 0) || "pmate.chat"}`;
       const rendered = template.replace(/\$\{\{PORT\}\}/g, String(port)).replace(/\$\{\{HOSTS\}\}/g, host).replace(/\$\{\{HOST\}\}/g, host);
       const remotePath = `/etc/nginx/sites-enabled/${subdomain}.conf`;
       ui.info(`Uploading nginx config to ${server}`);
@@ -17856,7 +17911,7 @@ var ServiceRuntimeRunner = class {
       ui.success(`Uploaded nginx config to ${server}`, remotePath);
       await this.reloadNginx(server);
       ui.success(`Reloaded nginx on ${server}`);
-      const baseDomain = deploy.domain?.trim() || "pmate.chat";
+      const baseDomain = ("domain" in network ? network.domain?.trim() : void 0) || "pmate.chat";
       const existingA = await AliyunService.getARecordValue(baseDomain, subdomain);
       if (existingA) {
         if (existingA !== serverAddress) {
@@ -17899,18 +17954,19 @@ var ServiceRuntimeRunner = class {
     }
   }
   async showScriptLogs(service) {
-    const deploy = this.getDeploy(service);
-    const server = deploy.server?.trim();
-    const repository = deploy.repository?.trim();
-    const script = deploy.script?.trim();
+    const network = this.getNetwork(service);
+    const runner = this.getRunner(service);
+    const server = network.server?.trim();
+    const repository = network.repository?.trim();
+    const script = runner.script?.trim();
     if (!server) {
-      throw new Error(`Missing deploy.server for ${service.id}`);
+      throw new Error(`Missing network.server for ${service.id}`);
     }
     if (!repository) {
-      throw new Error(`Missing deploy.repository for ${service.id}`);
+      throw new Error(`Missing network.repository for ${service.id}`);
     }
     if (!script) {
-      throw new Error(`Missing deploy.script for ${service.id}`);
+      throw new Error(`Missing runner.script for ${service.id}`);
     }
     const repoDir = this.getRepoDirName(repository);
     const scriptPath = script.startsWith("/") || script.startsWith("./") ? script : `./${script}`;
@@ -18480,9 +18536,6 @@ var ServiceRegistryClient = class {
       if (namespace && item.namespace !== namespace) {
         return false;
       }
-      if (server && item.deploy?.server?.trim() !== server) {
-        return false;
-      }
       return true;
     });
   }
@@ -18858,12 +18911,20 @@ var ServiceCommandHandler = class {
     if (!payload || typeof payload !== "object") {
       return;
     }
-    const deploy = payload.deploy;
-    if (!deploy || typeof deploy !== "object") {
-      return;
+    let serverValue;
+    let portValue;
+    const network = payload.network;
+    if (network && typeof network === "object") {
+      serverValue = network.server;
+      portValue = network.port;
+    } else {
+      const deploy = payload.deploy;
+      if (!deploy || typeof deploy !== "object") {
+        return;
+      }
+      serverValue = deploy.server;
+      portValue = deploy.port;
     }
-    const serverValue = deploy.server;
-    const portValue = deploy.port;
     const server = typeof serverValue === "string" ? serverValue.trim() : "";
     const port = typeof portValue === "number" ? portValue : typeof portValue === "string" && portValue.trim() ? Number(portValue) : void 0;
     if (!server || port === void 0 || !Number.isFinite(port)) {
@@ -18871,7 +18932,8 @@ var ServiceCommandHandler = class {
     }
     const services = await registry.listServices({ server });
     const conflict = services.find((service) => {
-      if (service.deploy?.port !== port) {
+      const servicePort = "network" in service && service.network && typeof service.network === "object" ? service.network.port : "deploy" in service && service.deploy && typeof service.deploy === "object" ? service.deploy.port : void 0;
+      if (servicePort !== port) {
         return false;
       }
       if (!currentService) {

package/package.json

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