feat(logging): add best-effort requested/succeeded/failed action logs

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

app/api/plesk/domains/[id]/action/route.ts

@@ -5,15 +5,54 @@ import { assertAgencyAdmin, getRouteAgencyContextOrThrow } from "@/lib/agency";
 import { assertRateLimit } from "@/lib/api/rate-limit";
 import { assertSameOrigin } from "@/lib/api/security";
 import {
-  suspendPleskSubscription,
+  parseSubscriptionStatusDetailsFromInfo,
-  unsuspendPleskSubscription,
+  pleskCliCall,
 } from "@/lib/plesk/client";
 import { createSupabaseRouteClient } from "@/lib/supabase/route";
 
 const actionSchema = z.object({
   action: z.enum(["suspend", "unsuspend"]),
+  subscription_id: z.string().uuid().optional(),
 });
 
+const LOG_EXCERPT_LIMIT = 500;
+
+const DOMAIN_ACTION_EVENTS = {
+  suspend: {
+    requested: "domain_suspend_requested",
+    succeeded: "domain_suspend_succeeded",
+    failed: "domain_suspend_failed",
+  },
+  unsuspend: {
+    requested: "domain_unsuspend_requested",
+    succeeded: "domain_unsuspend_succeeded",
+    failed: "domain_unsuspend_failed",
+  },
+} as const;
+
+function excerpt(value: string | null | undefined) {
+  if (!value) return null;
+  const trimmed = value.trim();
+  if (!trimmed) return null;
+  return trimmed.length > LOG_EXCERPT_LIMIT
+    ? `${trimmed.slice(0, LOG_EXCERPT_LIMIT)}…`
+    : trimmed;
+}
+
+async function insertActionLogBestEffort(
+  supabase: any,
+  payload: Record<string, unknown>,
+) {
+  try {
+    const { error } = await supabase.from("actions_log").insert(payload);
+    if (error) {
+      console.error("[actions_log] insert failed", error.message);
+    }
+  } catch (error) {
+    console.error("[actions_log] insert threw", error);
+  }
+}
+
 export async function POST(
   req: Request,
   { params }: { params: { id: string } },
@@ -22,8 +61,13 @@ export async function POST(
   let context: Awaited<ReturnType<typeof getRouteAgencyContextOrThrow>> | null =
     null;
   let domain: { id: string; subscription_id: string | null } | null = null;
-  let subscription: { id: string; plesk_subscription_id: string } | null = null;
+  let subscription: {
+    id: string;
+    plesk_subscription_id: string;
+    plesk_instance_id: string;
+  } | null = null;
   let requestedAction: "suspend" | "unsuspend" | null = null;
+  const startedAt = Date.now();
 
   try {
     assertSameOrigin(req);
@@ -32,7 +76,8 @@ export async function POST(
     assertAgencyAdmin(context);
     assertRateLimit(`plesk-domain-action:${context.userId}`, 10, 60_000);
 
-    const { action } = actionSchema.parse(await req.json());
+    const payload = actionSchema.parse(await req.json());
+    const { action } = payload;
     requestedAction = action;
 
     const { data: domainRow, error: domainError } = await supabase
@@ -46,21 +91,23 @@ export async function POST(
       throw new Error("Domain not found");
     }
 
+    const resolvedSubscriptionId =
+      payload.subscription_id ??
+      (domainRow.subscription_id ? String(domainRow.subscription_id) : null);
+
     domain = {
       id: String(domainRow.id),
-      subscription_id: domainRow.subscription_id
+      subscription_id: resolvedSubscriptionId,
-        ? String(domainRow.subscription_id)
-        : null,
     };
 
-    if (!domain.subscription_id) {
+    if (!resolvedSubscriptionId) {
       throw new Error("Domain is not linked to a subscription");
     }
 
     const { data: subscriptionRow, error: subscriptionError } = await supabase
       .from("plesk_subscriptions")
       .select("id, plesk_subscription_id, plesk_instance_id")
-      .eq("id", domain.subscription_id)
+      .eq("id", resolvedSubscriptionId)
       .eq("agency_id", context.agencyId)
       .single();
 
@@ -71,6 +118,7 @@ export async function POST(
     subscription = {
       id: String(subscriptionRow.id),
       plesk_subscription_id: String(subscriptionRow.plesk_subscription_id),
+      plesk_instance_id: String(subscriptionRow.plesk_instance_id),
     };
 
     const { data: instance, error: instanceError } = await supabase
@@ -90,29 +138,117 @@ export async function POST(
       encryptedSecret: instance.encrypted_secret,
     } as const;
 
-    if (action === "suspend") {
+    const domainIdentifier = subscription.plesk_subscription_id;
-      await suspendPleskSubscription(
+    const siteArgs =
-        connection,
+      action === "suspend"
-        subscription.plesk_subscription_id,
+        ? ["--suspend", domainIdentifier]
-      );
+        : ["--on", domainIdentifier];
-    } else {
-      await unsuspendPleskSubscription(
-        connection,
-        subscription.plesk_subscription_id,
-      );
-    }
 
-    await supabase.from("actions_log").insert({
+    await insertActionLogBestEffort(supabase, {
       agency_id: context.agencyId,
       actor_user_id: context.userId,
       target_type: "plesk_domain",
       target_id: domain.id,
-      action: `domain_${action}`,
+      action: DOMAIN_ACTION_EVENTS[action].requested,
-      status: "success",
+      status: "pending",
       metadata: {
         domain_id: domain.id,
         subscription_id: subscription.id,
+        plesk_instance_id: subscription.plesk_instance_id,
         plesk_subscription_id: subscription.plesk_subscription_id,
+        cli_command: "site",
+        cli_args: siteArgs,
+      },
+    });
+
+    const siteResult = await pleskCliCall(connection, "site", siteArgs);
+
+    const fallbackStatus = action === "suspend" ? "suspended" : "active";
+    let refreshedStatus = fallbackStatus;
+    let refreshedStatusRaw: string | null = null;
+    let refreshErrorMessage: string | null = null;
+
+    try {
+      const infoResult = await pleskCliCall(connection, "subscription", [
+        "--info",
+        domainIdentifier,
+      ]);
+
+      const parsed = parseSubscriptionStatusDetailsFromInfo(
+        infoResult.stdout ?? "",
+      );
+      refreshedStatus = parsed.status;
+      refreshedStatusRaw = parsed.statusRaw;
+
+      if (
+        action === "unsuspend" &&
+        refreshedStatus === "suspended" &&
+        (refreshedStatusRaw ?? "").toLowerCase().includes("subscriber")
+      ) {
+        throw new Error(
+          "Domain remains suspended because its subscriber/customer account is suspended.",
+        );
+      }
+    } catch (refreshError) {
+      refreshErrorMessage =
+        refreshError instanceof Error
+          ? refreshError.message.slice(0, 1000)
+          : "subscription_status_refresh_failed";
+
+      await insertActionLogBestEffort(supabase, {
+        agency_id: context.agencyId,
+        actor_user_id: context.userId,
+        target_type: "plesk_subscription",
+        target_id: subscription.id,
+        action: "subscription_status_refresh_failed",
+        status: "failed",
+        error_message: refreshErrorMessage,
+        metadata: {
+          subscription_id: subscription.id,
+          plesk_subscription_id: subscription.plesk_subscription_id,
+          plesk_instance_id: subscription.plesk_instance_id,
+          source: "domain_action",
+          domain_id: domain.id,
+        },
+      });
+    }
+
+    await supabase
+      .from("plesk_subscriptions")
+      .update({
+        status: refreshedStatus,
+        status_raw: refreshedStatusRaw,
+        last_status_sync_at: new Date().toISOString(),
+      })
+      .eq("id", subscription.id)
+      .eq("agency_id", context.agencyId);
+
+    await supabase
+      .from("plesk_domains")
+      .update({ status: refreshedStatus })
+      .eq("agency_id", context.agencyId)
+      .eq("subscription_id", subscription.id);
+
+    await insertActionLogBestEffort(supabase, {
+      agency_id: context.agencyId,
+      actor_user_id: context.userId,
+      target_type: "plesk_domain",
+      target_id: domain.id,
+      action: DOMAIN_ACTION_EVENTS[action].succeeded,
+      status: "success",
+      metadata: {
+        duration_ms: Date.now() - startedAt,
+        domain_id: domain.id,
+        subscription_id: subscription.id,
+        plesk_instance_id: subscription.plesk_instance_id,
+        plesk_subscription_id: subscription.plesk_subscription_id,
+        cli_command: "site",
+        cli_args: siteArgs,
+        cli_exit_code: siteResult.code,
+        cli_stdout_excerpt: excerpt(siteResult.stdout),
+        cli_stderr_excerpt: excerpt(siteResult.stderr),
+        refreshed_status: refreshedStatus,
+        refresh_error: refreshErrorMessage,
       },
     });
 
@@ -121,20 +257,41 @@ export async function POST(
     if (context && domain) {
       const message =
         error instanceof Error ? error.message : "Domain action failed";
-      await supabase.from("actions_log").insert({
+      if (requestedAction) {
-        agency_id: context.agencyId,
+        await insertActionLogBestEffort(supabase, {
-        actor_user_id: context.userId,
+          agency_id: context.agencyId,
-        target_type: "plesk_domain",
+          actor_user_id: context.userId,
-        target_id: domain.id,
+          target_type: "plesk_domain",
-        action: requestedAction ? `domain_${requestedAction}` : "domain_action",
+          target_id: domain.id,
-        status: "failed",
+          action: DOMAIN_ACTION_EVENTS[requestedAction].failed,
-        error_message: message,
+          status: "failed",
-        metadata: {
+          error_message: message,
-          domain_id: domain.id,
+          metadata: {
-          subscription_id: subscription?.id ?? domain.subscription_id,
+            duration_ms: Date.now() - startedAt,
-          plesk_subscription_id: subscription?.plesk_subscription_id ?? null,
+            domain_id: domain.id,
-        },
+            subscription_id: subscription?.id ?? domain.subscription_id,
-      });
+            plesk_instance_id: subscription?.plesk_instance_id ?? null,
+            plesk_subscription_id: subscription?.plesk_subscription_id ?? null,
+          },
+        });
+      } else {
+        await insertActionLogBestEffort(supabase, {
+          agency_id: context.agencyId,
+          actor_user_id: context.userId,
+          target_type: "plesk_domain",
+          target_id: domain.id,
+          action: "domain_action_failed",
+          status: "failed",
+          error_message: message,
+          metadata: {
+            duration_ms: Date.now() - startedAt,
+            domain_id: domain.id,
+            subscription_id: subscription?.id ?? domain.subscription_id,
+            plesk_instance_id: subscription?.plesk_instance_id ?? null,
+            plesk_subscription_id: subscription?.plesk_subscription_id ?? null,
+          },
+        });
+      }
     }
 
     return NextResponse.json(

app/api/plesk/subscriptions/[id]/action/route.ts

@@ -16,6 +16,44 @@ const actionSchema = z.object({
   action: z.enum(["suspend", "unsuspend"]),
 });
 
+const LOG_EXCERPT_LIMIT = 500;
+
+const SUBSCRIPTION_ACTION_EVENTS = {
+  suspend: {
+    requested: "subscription_suspend_requested",
+    succeeded: "subscription_suspend_succeeded",
+    failed: "subscription_suspend_failed",
+  },
+  unsuspend: {
+    requested: "subscription_unsuspend_requested",
+    succeeded: "subscription_unsuspend_succeeded",
+    failed: "subscription_unsuspend_failed",
+  },
+} as const;
+
+function excerpt(value: string | null | undefined) {
+  if (!value) return null;
+  const trimmed = value.trim();
+  if (!trimmed) return null;
+  return trimmed.length > LOG_EXCERPT_LIMIT
+    ? `${trimmed.slice(0, LOG_EXCERPT_LIMIT)}…`
+    : trimmed;
+}
+
+async function insertActionLogBestEffort(
+  supabase: any,
+  payload: Record<string, unknown>,
+) {
+  try {
+    const { error } = await supabase.from("actions_log").insert(payload);
+    if (error) {
+      console.error("[actions_log] insert failed", error.message);
+    }
+  } catch (error) {
+    console.error("[actions_log] insert threw", error);
+  }
+}
+
 export async function POST(
   req: Request,
   { params }: { params: { id: string } },
@@ -29,6 +67,7 @@ export async function POST(
     plesk_subscription_id: string;
     plesk_instance_id: string;
   } | null = null;
+  const startedAt = Date.now();
 
   try {
     assertSameOrigin(req);
@@ -70,17 +109,37 @@ export async function POST(
       encryptedSecret: instance.encrypted_secret,
     } as const;
 
-    if (payload.action === "suspend") {
+    const cliArgs =
-      await suspendPleskSubscription(
+      payload.action === "suspend"
-        connection,
+        ? ["--webspace-off", subscription.plesk_subscription_id]
-        subscription.plesk_subscription_id,
+        : ["--unsuspend", subscription.plesk_subscription_id];
-      );
+
-    } else {
+    await insertActionLogBestEffort(supabase, {
-      await unsuspendPleskSubscription(
+      agency_id: context.agencyId,
-        connection,
+      actor_user_id: context.userId,
-        subscription.plesk_subscription_id,
+      target_type: "plesk_subscription",
-      );
+      target_id: subscription.id,
-    }
+      action: SUBSCRIPTION_ACTION_EVENTS[payload.action].requested,
+      status: "pending",
+      metadata: {
+        subscription_id: subscription.id,
+        plesk_instance_id: subscription.plesk_instance_id,
+        plesk_subscription_id: subscription.plesk_subscription_id,
+        cli_command: "subscription",
+        cli_args: cliArgs,
+      },
+    });
+
+    const actionCliResult =
+      payload.action === "suspend"
+        ? await suspendPleskSubscription(
+            connection,
+            subscription.plesk_subscription_id,
+          )
+        : await unsuspendPleskSubscription(
+            connection,
+            subscription.plesk_subscription_id,
+          );
 
     const fallbackStatus =
       payload.action === "suspend" ? "suspended" : "active";
@@ -104,7 +163,7 @@ export async function POST(
           ? refreshError.message.slice(0, 1000)
           : "subscription_status_refresh_failed";
 
-      await supabase.from("actions_log").insert({
+      await insertActionLogBestEffort(supabase, {
         agency_id: context.agencyId,
         actor_user_id: context.userId,
         target_type: "plesk_subscription",
@@ -135,17 +194,23 @@ export async function POST(
       .eq("agency_id", context.agencyId)
       .eq("subscription_id", subscription.id);
 
-    await supabase.from("actions_log").insert({
+    await insertActionLogBestEffort(supabase, {
       agency_id: context.agencyId,
       actor_user_id: context.userId,
       target_type: "plesk_subscription",
       target_id: subscription.id,
-      action: payload.action,
+      action: SUBSCRIPTION_ACTION_EVENTS[payload.action].succeeded,
       status: "success",
       metadata: {
+        duration_ms: Date.now() - startedAt,
+        cli_command: "subscription",
+        cli_args: cliArgs,
         plesk_subscription_id: subscription.plesk_subscription_id,
         refreshed_status: refreshedStatus,
         refresh_error: refreshErrorMessage,
+        cli_exit_code: actionCliResult.code,
+        cli_stdout_excerpt: excerpt(actionCliResult.stdout),
+        cli_stderr_excerpt: excerpt(actionCliResult.stderr),
         db_status_update_error: updateError?.message ?? null,
       },
     });
@@ -160,18 +225,37 @@ export async function POST(
     if (supabase && context && subscription) {
       const message =
         error instanceof Error ? error.message : "Subscription action failed";
-      await supabase.from("actions_log").insert({
+      if (requestedAction) {
-        agency_id: context.agencyId,
+        await insertActionLogBestEffort(supabase, {
-        actor_user_id: context.userId,
+          agency_id: context.agencyId,
-        target_type: "plesk_subscription",
+          actor_user_id: context.userId,
-        target_id: subscription.id,
+          target_type: "plesk_subscription",
-        action: requestedAction ?? "subscription_action",
+          target_id: subscription.id,
-        status: "failed",
+          action: SUBSCRIPTION_ACTION_EVENTS[requestedAction].failed,
-        error_message: message,
+          status: "failed",
-        metadata: {
+          error_message: message,
-          plesk_subscription_id: subscription.plesk_subscription_id,
+          metadata: {
-        },
+            duration_ms: Date.now() - startedAt,
-      });
+            plesk_subscription_id: subscription.plesk_subscription_id,
+            plesk_instance_id: subscription.plesk_instance_id,
+          },
+        });
+      } else {
+        await insertActionLogBestEffort(supabase, {
+          agency_id: context.agencyId,
+          actor_user_id: context.userId,
+          target_type: "plesk_subscription",
+          target_id: subscription.id,
+          action: "subscription_action_failed",
+          status: "failed",
+          error_message: message,
+          metadata: {
+            duration_ms: Date.now() - startedAt,
+            plesk_subscription_id: subscription.plesk_subscription_id,
+            plesk_instance_id: subscription.plesk_instance_id,
+          },
+        });
+      }
     }
 
     return NextResponse.json(

app/dashboard/page.tsx

@@ -154,6 +154,19 @@ export default async function DashboardPage() {
     ]),
   );
 
+  const subscriptionDisplayNameById = new Map<string, string>(
+    (domainSubscriptions ?? [])
+      .filter((subscription: any) => subscription?.id)
+      .map((subscription: any) => [
+        String(subscription.id),
+        String(
+          subscription?.name ||
+            subscription?.plesk_subscription_id ||
+            subscription?.id,
+        ),
+      ]),
+  );
+
   const subscriptionStatusByExternalId = new Map<string, string | null>(
     (domainSubscriptions ?? [])
       .filter((subscription: any) =>
@@ -278,6 +291,10 @@ export default async function DashboardPage() {
           return {
             ...domain,
             status: joinedStatus ?? "unknown",
+            subscription_name: domain.subscription_id
+              ? (subscriptionDisplayNameById.get(domain.subscription_id) ??
+                null)
+              : null,
           };
         })}
         autoSyncByInstance={Object.fromEntries(autoSyncByInstance.entries())}

components/dashboard/dashboard-controls.tsx

@@ -32,6 +32,7 @@ type Domain = {
   id: string;
   plesk_instance_id: string;
   subscription_id: string | null;
+  subscription_name?: string | null;
   domain_name: string;
   status: string | null;
   hosting_type: string | null;
@@ -72,6 +73,23 @@ function getDomainStatusBadge(status: string | null) {
   return "bg-slate-100 text-slate-600";
 }
 
+function formatDomainStatusLabel(status: string | null) {
+  const normalized = (status ?? "unknown").toLowerCase();
+
+  if (normalized.includes("suspend")) return "Suspended";
+  if (normalized.includes("disabled")) return "Disabled";
+  if (normalized.includes("expired")) return "Expired";
+  if (
+    normalized.includes("active") ||
+    normalized.includes("ok") ||
+    normalized.includes("enabled")
+  ) {
+    return "Active";
+  }
+
+  return "Unknown";
+}
+
 function isDomainSuspended(status: string | null) {
   const normalized = (status ?? "unknown").toLowerCase();
   return normalized.includes("suspend") || normalized.includes("disabled");
@@ -239,13 +257,23 @@ export function DashboardControls({
   }
 
   async function onDomainAction(
-    domainId: string,
+    domain: Domain,
     action: "suspend" | "unsuspend",
   ) {
+    if (!domain.subscription_id) {
+      setMessage(
+        "Domain is not linked to a subscription yet. Run Sync Now (or backfill links) and try again.",
+      );
+      return;
+    }
+
     setLoading(true);
     setMessage(null);
     try {
-      await runRequest(`/api/plesk/domains/${domainId}/action`, { action });
+      await runRequest(`/api/plesk/domains/${domain.id}/action`, {
+        action,
+        subscription_id: domain.subscription_id,
+      });
       setMessage("Domain action completed.");
       window.location.reload();
     } catch (error) {
@@ -608,16 +636,26 @@ export function DashboardControls({
                           {domain.domain_name}
                         </a>
                         {domain.subscription_id ? (
-                          <p className="text-xs font-normal text-slate-500">
+                          <p
-                            Subscription: {domain.subscription_id}
+                            className="text-xs font-normal text-slate-500"
+                            title={`Subscription UUID: ${domain.subscription_id}`}
+                          >
+                            Subscription: {domain.subscription_name ?? "Linked"}
                           </p>
-                        ) : null}
+                        ) : (
+                          <p
+                            className="text-xs font-normal text-amber-700"
+                            title="Run sync to link this domain to a subscription"
+                          >
+                            Subscription: Unlinked
+                          </p>
+                        )}
                       </td>
                       <td className="px-2 py-2">
                         <span
                           className={`inline-flex rounded px-2 py-0.5 text-xs font-medium ${getDomainStatusBadge(domain.status)}`}
                         >
-                          {domain.status ?? "unknown"}
+                          {formatDomainStatusLabel(domain.status)}
                         </span>
                       </td>
                       <td className="px-2 py-2">
@@ -633,19 +671,33 @@ export function DashboardControls({
                       <td className="px-2 py-2">
                         <div className="flex gap-2">
                           <button
-                            onClick={() => onDomainAction(domain.id, "suspend")}
+                            onClick={() => onDomainAction(domain, "suspend")}
                             disabled={
-                              loading || isDomainSuspended(domain.status)
+                              loading ||
+                              !domain.subscription_id ||
+                              isDomainSuspended(domain.status)
+                            }
+                            title={
+                              !domain.subscription_id
+                                ? "Not linked to a subscription yet — run sync"
+                                : undefined
                             }
                             className="rounded border border-rose-300 px-2 py-1 text-xs text-rose-700 disabled:cursor-not-allowed disabled:opacity-60"
                           >
                             Suspend
                           </button>
                           <button
-                            onClick={() =>
+                            onClick={() => onDomainAction(domain, "unsuspend")}
-                              onDomainAction(domain.id, "unsuspend")
+                            disabled={
+                              loading ||
+                              !domain.subscription_id ||
+                              isDomainActive(domain.status)
+                            }
+                            title={
+                              !domain.subscription_id
+                                ? "Not linked to a subscription yet — run sync"
+                                : undefined
                             }
-                            disabled={loading || isDomainActive(domain.status)}
                             className="rounded border border-emerald-300 px-2 py-1 text-xs text-emerald-700 disabled:cursor-not-allowed disabled:opacity-60"
                           >
                             Unsuspend

lib/plesk/client.ts

@@ -289,7 +289,7 @@ export async function unsuspendPleskSubscription(
   subscriptionName: string,
 ) {
   return pleskCliCall(connection, "subscription", [
-    "--webspace-on",
+    "--unsuspend",
     subscriptionName,
   ]);
 }