Merge branch 'master' into feature/plesk-status-parsing

Reviewed-on: http://gitea.lan:3000/robbond/pleskSaas/pulls/5

components/dashboard/dashboard-controls.tsx

@@ -60,6 +60,10 @@ function getDomainStatusBadge(status: string | null) {
     return "bg-emerald-100 text-emerald-700";
   }
 
+  if (normalized.includes("ok")) {
+    return "bg-emerald-100 text-emerald-700";
+  }
+
   return "bg-slate-100 text-slate-600";
 }
 

lib/plesk/client.ts

@@ -138,37 +138,24 @@ export async function testPleskConnection(connection: PleskConnection) {
 }
 
 export async function listPleskSubscriptions(connection: PleskConnection) {
-  const listOutput = await pleskCliCall(connection, "subscription", ["--list"]);
+  const listResult = await pleskCliCall(connection, "subscription", ["--list"]);
 
-  const subscriptionNames = listOutput
+  const subscriptionNames = (listResult.stdout ?? "")
     .split(/\r?\n/)
     .map((line) => line.trim())
     .filter(Boolean);
 
   const subscriptions: PleskSubscription[] = [];
 
-  for (const subscriptionName of subscriptionNames) {
+  for (const subscriptionName of subscriptionNames.slice(0, 500)) {
-    let status = "unknown";
+    let status: "active" | "suspended" | "unknown" = "unknown";
 
     try {
-      const infoOutput = await pleskCliCall(connection, "subscription", [
+      const infoResult = await pleskCliCall(connection, "subscription", [
         "--info",
         subscriptionName,
       ]);
-      const normalizedInfo = infoOutput.toLowerCase();
+      status = parseSubscriptionStatusFromInfo(infoResult.stdout ?? "");
-
-      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";
     }
@@ -184,6 +171,29 @@ export async function listPleskSubscriptions(connection: PleskConnection) {
   return subscriptions;
 }
 
+export function parseSubscriptionStatusFromInfo(
+  stdout: string,
+): "active" | "suspended" | "unknown" {
+  const line = stdout
+    .split(/\r?\n/)
+    .map((entry) => entry.trim())
+    .find((entry) => /^domain\s+status\s*:/i.test(entry));
+
+  if (!line) return "unknown";
+
+  const value = line
+    .replace(/^domain\s+status\s*:/i, "")
+    .trim()
+    .toLowerCase();
+
+  if (value.includes("ok")) return "active";
+  if (value.includes("suspend") || value.includes("disabled")) {
+    return "suspended";
+  }
+
+  return "unknown";
+}
+
 export async function pleskCliCall(
   connection: PleskConnection,
   command: string,
@@ -208,7 +218,7 @@ export async function pleskCliCall(
     );
   }
 
-  return stdout;
+  return { code, stdout, stderr };
 }
 
 export async function listPleskDomains(connection: PleskConnection) {

lib/plesk/sync.ts

@@ -94,7 +94,7 @@ export async function syncPleskInstance(
           plesk_instance_id: instance.id,
           plesk_subscription_id: String(sourceId),
           name: item?.name ? String(item.name) : String(sourceId),
-          status: item?.status ? String(item.status) : null,
+          status: item?.status ? String(item.status) : "unknown",
           owner_login: item?.owner_login
             ? String(item.owner_login)
             : item?.owner?.login

supabase/migrations/CL37_domain_status_backfill_from_subscription.sql

@@ -1,10 +1,9 @@
 -- One-time backfill: align existing domain status with linked subscription status
 update public.plesk_domains d
-set status = s.status
+set status = coalesce(s.status, 'unknown')
 from public.plesk_subscriptions s
 where d.subscription_id = s.id
-  and d.agency_id = s.agency_id
+  and d.agency_id = s.agency_id;
-  and (d.status is null or d.status = 'unknown');
 
 update public.plesk_subscriptions
 set status = 'unknown'