Fix subscription status via CLI; derive domain status + badges

lib/plesk/client.ts

@@ -9,6 +9,7 @@ export type PleskConnection = {
 };
 
 export type PleskSubscription = {
+  plesk_subscription_id?: string;
   id?: string | number;
   guid?: string;
   subscription_id?: string | number;
@@ -137,51 +138,50 @@ export async function testPleskConnection(connection: PleskConnection) {
 }
 
 export async function listPleskSubscriptions(connection: PleskConnection) {
-  try {
-    const all: PleskSubscription[] = [];
+  const listOutput = await pleskCliCall(connection, "subscription", ["--list"]);
 
-    for (let page = 1; page <= 20; page += 1) {
-      const payload = await pleskRequest<PleskSubscription[]>(
-        connection,
-        `/api/v2/subscriptions?page=${page}&per_page=100`,
-      );
-      const rows = Array.isArray(payload) ? payload : [];
-      all.push(...rows);
-      if (rows.length < 100) break;
+  const subscriptionNames = listOutput
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter(Boolean);
+
+  const subscriptions: PleskSubscription[] = [];
+
+  for (const subscriptionName of subscriptionNames) {
+    let status = "unknown";
+
+    try {
+      const infoOutput = await pleskCliCall(connection, "subscription", [
+        "--info",
+        subscriptionName,
+      ]);
+      const normalizedInfo = infoOutput.toLowerCase();
+
+      const hasSuspendedMarker =
+        normalizedInfo.includes("suspended") ||
+        normalizedInfo.includes("webspace-off") ||
+        normalizedInfo.includes("disabled");
+
+      const hasActiveMarker =
+        normalizedInfo.includes("active") ||
+        normalizedInfo.includes("enabled") ||
+        normalizedInfo.includes("ok");
+
+      if (hasSuspendedMarker) status = "suspended";
+      else if (hasActiveMarker || !hasSuspendedMarker) status = "active";
+    } catch {
+      status = "unknown";
     }
 
-    return all;
-  } catch {
-    const cli = await pleskRequest<PleskCliResult>(
-      connection,
-      "/api/v2/cli/subscription/call",
-      {
-        method: "POST",
-        body: JSON.stringify({ params: ["--list"] }),
-      },
-    );
-
-    const stdout = cli?.stdout ?? "";
-    if (!stdout.trim()) {
-      return [];
-    }
-
-    return stdout
-      .split(/\r?\n/)
-      .map((line) => line.trim())
-      .filter(Boolean)
-      .map((line) => {
-        const columns = line.split(/\s+/);
-        const externalId = columns[0] ?? line;
-        return {
-          id: externalId,
-          subscription_id: externalId,
-          external_id: externalId,
-          name: columns.slice(1).join(" ") || externalId,
-          status: null,
-        };
-      });
+    subscriptions.push({
+      plesk_subscription_id: subscriptionName,
+      subscription_id: subscriptionName,
+      name: subscriptionName,
+      status,
+    });
   }
+
+  return subscriptions;
 }
 
 export async function pleskCliCall(
@@ -208,7 +208,7 @@ export async function pleskCliCall(
     );
   }
 
-  return { code, stdout, stderr };
+  return stdout;
 }
 
 export async function listPleskDomains(connection: PleskConnection) {

lib/plesk/sync.ts

@@ -82,13 +82,18 @@ export async function syncPleskInstance(
 
     const subscriptionsForUpsert = subscriptionsRaw
       .map((item: any) => {
-        const sourceId = item?.id ?? item?.guid ?? item?.subscription_id;
+        const sourceId =
+          item?.plesk_subscription_id ??
+          item?.name ??
+          item?.id ??
+          item?.guid ??
+          item?.subscription_id;
         if (!sourceId) return null;
         return {
           agency_id: instance.agency_id,
           plesk_instance_id: instance.id,
           plesk_subscription_id: String(sourceId),
-          name: item?.name ? String(item.name) : null,
+          name: item?.name ? String(item.name) : String(sourceId),
           status: item?.status ? String(item.status) : null,
           owner_login: item?.owner_login
             ? String(item.owner_login)