@pmate/cli 0.20.11 → 0.21.0

package/dist/index.d.ts

@@ -554,6 +554,7 @@ type ServiceCommandArgs = {
     action: "list";
     namespace?: string;
     repository?: string;
+    server?: string;
     baseUrl?: string;
     json: boolean;
 } | {

package/dist/index.js

@@ -158,7 +158,15 @@ function loadExistingSessionStoreOrEmpty() {
       sessions: {}
     };
   }
-  return loadSessionStore();
+  try {
+    return loadSessionStore();
+  } catch {
+    return {
+      version: SESSION_STORE_VERSION,
+      activeAppRef: DEFAULT_APP_ID,
+      sessions: {}
+    };
+  }
 }
 function loadSessionStoreWithPath() {
   const sessionPath = buildSessionStorePath();
@@ -21009,15 +21017,24 @@ var ServiceRegistryClient = class {
     if (repository) {
       searchParams.set("repo", repository);
     }
+    const server = filters?.server?.trim();
+    if (server) {
+      searchParams.set("server", server);
+    }
     const payload = await this.request(
       "GET",
       `/services${searchParams.size > 0 ? `?${searchParams.toString()}` : ""}`
     );
     const namespace = filters?.namespace?.trim();
-    if (!namespace) {
-      return payload.items;
-    }
-    return payload.items.filter((item) => item.namespace === namespace);
+    return payload.items.filter((item) => {
+      if (namespace && item.namespace !== namespace) {
+        return false;
+      }
+      if (server && item.deploy?.server?.trim() !== server) {
+        return false;
+      }
+      return true;
+    });
   }
   async getService(namespace, name) {
     return this.request(
@@ -21087,7 +21104,8 @@ var ServiceCommandHandler = class {
       case "list": {
         const items = await registry.listServices({
           namespace: args.namespace,
-          repository: args.repository
+          repository: args.repository,
+          server: args.server
         });
         this.renderList(items, args.json);
         return;
@@ -21101,6 +21119,7 @@ var ServiceCommandHandler = class {
       case "create": {
         const payload = this.readJsonFile(args.filePath);
         await this.requireNamespace(payload, baseUrl);
+        await this.requireUniqueServerPort(payload, registry);
         const record = await this.request(
           baseUrl,
           "POST",
@@ -21113,6 +21132,10 @@ var ServiceCommandHandler = class {
       }
       case "update": {
         const payload = this.readJsonFile(args.filePath);
+        await this.requireUniqueServerPort(payload, registry, {
+          namespace: args.namespace,
+          name: args.name
+        });
         const record = await this.request(
           baseUrl,
           "PUT",
@@ -21225,6 +21248,37 @@ var ServiceCommandHandler = class {
       throw new Error(`Namespace "${namespace}" is not registered. Run: pmate ns create ${namespace}`);
     }
   }
+  async requireUniqueServerPort(payload, registry, currentService) {
+    if (!payload || typeof payload !== "object") {
+      return;
+    }
+    const deploy = payload.deploy;
+    if (!deploy || typeof deploy !== "object") {
+      return;
+    }
+    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)) {
+      return;
+    }
+    const services = await registry.listServices({ server });
+    const conflict = services.find((service) => {
+      if (service.deploy?.port !== port) {
+        return false;
+      }
+      if (!currentService) {
+        return true;
+      }
+      return !(service.namespace === currentService.namespace && service.name === currentService.name);
+    });
+    if (conflict) {
+      throw new Error(
+        `Port ${port} is already used on server ${server} by ${formatNamespacedDisplayId(conflict.namespace, conflict.name)}`
+      );
+    }
+  }
   renderList(items, asJson) {
     if (asJson) {
       ui.plain(JSON.stringify(items, null, 2));
@@ -21235,11 +21289,7 @@ var ServiceCommandHandler = class {
       return;
     }
     for (const item of items) {
-      ui.info(formatNamespacedDisplayId(item.namespace, item.name), {
-        kind: item.kind,
-        runtimeType: item.runtimeType,
-        status: item.status
-      });
+      ui.info(formatNamespacedDisplayId(item.namespace, item.name), item);
     }
   }
   renderJson(value, asJson) {
@@ -22375,6 +22425,7 @@ function parseServiceArgs(tokens) {
   if (action === "list") {
     let namespace;
     let repository;
+    let server;
     while (rest.length > 0) {
       const token = rest.shift();
       switch (token) {
@@ -22384,6 +22435,9 @@ function parseServiceArgs(tokens) {
         case "--repo":
           repository = requireValue5(rest, token);
           break;
+        case "--server":
+          server = requireValue5(rest, token);
+          break;
         case "--base-url":
           baseUrl = requireValue5(rest, token);
           break;
@@ -22394,7 +22448,7 @@ function parseServiceArgs(tokens) {
           throw new Error(`Unknown service list option: ${token}`);
       }
     }
-    return { type: "service" /* Service */, action, namespace, repository, baseUrl, json };
+    return { type: "service" /* Service */, action, namespace, repository, server, baseUrl, json };
   }
   if (action === "view") {
     const ref = rest.shift();
@@ -22935,7 +22989,7 @@ var HELP_TEXT = [
   `  ${import_chalk4.default.gray("                  delete <ns:objectId> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  default base URL: https://apps-api.pmate.chat")}`,
   `  ${import_chalk4.default.cyan("service")}          Manage service registry entries via apps-api`,
-  `  ${import_chalk4.default.gray("                  list [--namespace <ns>] [--repo <owner/name|https://github.com/owner/name>] [--base-url <url>] [--json]")}`,
+  `  ${import_chalk4.default.gray("                  list [--namespace <ns>] [--repo <owner/name|https://github.com/owner/name>] [--server <name>] [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  get <ns:objectId> [--base-url <url>] [--json]")}`,
   `  ${import_chalk4.default.gray("                  view <ns:objectId> [--base-url <url>]")}`,
   `  ${import_chalk4.default.gray("                  create --file <path> [--base-url <url>] [--json]")}`,

package/package.json

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