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

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

components/dashboard/dashboard-controls.tsx

@@ -49,6 +49,24 @@ type Props = {
   >;
 };
 
+function getDomainStatusBadge(status: string | null) {
+  const normalized = (status ?? "unknown").toLowerCase();
+
+  if (normalized.includes("suspend") || normalized.includes("disabled")) {
+    return "bg-rose-100 text-rose-700";
+  }
+
+  if (normalized.includes("active") || normalized.includes("enabled")) {
+    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";
+}
+
 export function DashboardControls({
   instances,
   subscriptions,
@@ -351,14 +369,28 @@ export function DashboardControls({
                         <span className="font-medium">{instance.status}</span>
                       </p>
                       <p className="text-xs text-slate-500">
-                        Last sync: {formatDateTime(instance.last_sync_at)}
-                        {instance.last_sync_status
-                          ? ` (${instance.last_sync_status})`
-                          : ""}
+                        Subscriptions: {instance.last_sync_subscriptions ?? 0}
                       </p>
                       <p className="text-xs text-slate-500">
-                        Last counts: {instance.last_sync_subscriptions ?? 0}{" "}
-                        subscriptions, {instance.last_sync_domains ?? 0} domains
+                        Domains: {instance.last_sync_domains ?? 0}
+                      </p>
+                      <p className="text-xs text-slate-500">
+                        Last sync status:{" "}
+                        <span
+                          className={`inline-flex rounded px-2 py-0.5 text-[11px] font-medium ${
+                            instance.last_sync_status === "success"
+                              ? "bg-emerald-100 text-emerald-700"
+                              : instance.last_sync_status === "failed" ||
+                                  instance.last_sync_status === "error"
+                                ? "bg-rose-100 text-rose-700"
+                                : "bg-slate-100 text-slate-600"
+                          }`}
+                        >
+                          {instance.last_sync_status ?? "unknown"}
+                        </span>
+                      </p>
+                      <p className="text-xs text-slate-500">
+                        Last sync time: {formatDateTime(instance.last_sync_at)}
                       </p>
                       <p className="text-xs text-slate-500">
                         Last connected:{" "}
@@ -521,11 +553,15 @@ export function DashboardControls({
                 ) : (
                   filteredDomains.map((domain) => (
                     <tr key={domain.id} className="border-b border-slate-100">
-                      <td className="px-2 py-2 font-medium text-slate-900">
+                      <td className="font-medium text-slate-900">
                         {domain.domain_name}
                       </td>
                       <td className="px-2 py-2">
-                        {domain.status ?? "unknown"}
+                        <span
+                          className={`inline-flex rounded px-2 py-0.5 text-xs font-medium ${getDomainStatusBadge(domain.status)}`}
+                        >
+                          {domain.status ?? "unknown"}
+                        </span>
                       </td>
                       <td className="px-2 py-2">
                         {domain.hosting_type ?? "unknown"}

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,60 @@ export async function testPleskConnection(connection: PleskConnection) {
 }
 
 export async function listPleskSubscriptions(connection: PleskConnection) {
-  try {
-    const all: PleskSubscription[] = [];
+  const listResult = 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 = (listResult.stdout ?? "")
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter(Boolean);
+
+  const subscriptions: PleskSubscription[] = [];
+
+  for (const subscriptionName of subscriptionNames.slice(0, 500)) {
+    let status: "active" | "suspended" | "unknown" = "unknown";
+
+    try {
+      const infoResult = await pleskCliCall(connection, "subscription", [
+        "--info",
+        subscriptionName,
+      ]);
+      status = parseSubscriptionStatusFromInfo(infoResult.stdout ?? "");
+    } 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 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(

lib/plesk/sync.ts

@@ -82,14 +82,19 @@ 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,
-          status: item?.status ? String(item.status) : null,
+          name: item?.name ? String(item.name) : String(sourceId),
+          status: item?.status ? String(item.status) : "unknown",
           owner_login: item?.owner_login
             ? String(item.owner_login)
             : item?.owner?.login
@@ -113,12 +118,44 @@ export async function syncPleskInstance(
       if (error) throw new Error(error.message);
     }
 
+    const { data: localSubscriptions, error: localSubscriptionsError } =
+      await supabase
+        .from("plesk_subscriptions")
+        .select("id, plesk_subscription_id, status")
+        .eq("agency_id", instance.agency_id)
+        .eq("plesk_instance_id", instance.id);
+
+    if (localSubscriptionsError) {
+      throw new Error(localSubscriptionsError.message);
+    }
+
+    const subscriptionByExternalId = new Map<
+      string,
+      { id: string; status: string | null }
+    >(
+      (localSubscriptions ?? [])
+        .filter((row: any) => row?.plesk_subscription_id && row?.id)
+        .map((row: any) => [
+          String(row.plesk_subscription_id),
+          {
+            id: String(row.id),
+            status: row?.status ? String(row.status) : null,
+          },
+        ]),
+    );
+
     const domainsForUpsert = domainsRaw
       .map((item: any) => {
         const domainId = item?.id ?? item?.guid ?? item?.name;
         const domainName = item?.name ?? item?.domain_name ?? item?.domain;
-        const externalSubscriptionId =
+        const subExternalId =
           item?.subscription?.id ?? item?.subscription_id ?? item?.webspace_id;
+        const externalSubscriptionId = subExternalId
+          ? String(subExternalId)
+          : null;
+        const localSubscription = externalSubscriptionId
+          ? subscriptionByExternalId.get(externalSubscriptionId)
+          : undefined;
         const rawCreated = item?.created_at ?? item?.created;
         const sourceCreatedAt = rawCreated
           ? new Date(String(rawCreated)).toISOString()
@@ -135,18 +172,12 @@ export async function syncPleskInstance(
         return {
           agency_id: instance.agency_id,
           plesk_instance_id: instance.id,
-          subscription_id: null,
-          external_subscription_id: externalSubscriptionId
-            ? String(externalSubscriptionId)
-            : null,
+          subscription_id: localSubscription?.id ?? null,
+          external_subscription_id: externalSubscriptionId,
           plesk_domain_id: String(domainId),
           domain_name: String(domainName),
-          status: item?.status ? String(item.status) : null,
-          hosting_type: item?.hosting_type
-            ? String(item.hosting_type)
-            : item?.hosting?.type
-              ? String(item.hosting.type)
-              : null,
+          status: localSubscription?.status ?? "unknown",
+          hosting_type: item?.hosting_type ? String(item.hosting_type) : null,
           source_created_at: sourceCreatedAt,
           aliases_count: aliasesCount,
         };

supabase/migrations/CL37_domain_status_backfill_from_subscription.sql

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