Compare commits
2 Commits
feature/cl
...
feat/cl4-s
| Author | SHA1 | Date | |
|---|---|---|---|
| 9deac1388d | |||
| e87f86ae86 |
@@ -4,7 +4,6 @@ SUPABASE_SERVICE_ROLE_KEY=
|
||||
|
||||
NEXT_PUBLIC_APP_URL=http://localhost:3000
|
||||
JOB_SECRET=
|
||||
CRON_SECRET=
|
||||
|
||||
ENCRYPTION_KEY=
|
||||
PLESK_CRED_ENC_KEY=
|
||||
|
||||
37
README.md
37
README.md
@@ -63,9 +63,7 @@ values ('<agency_uuid>', '<auth_user_uuid>', 'owner');
|
||||
|
||||
- `POST /api/plesk/instances` — create + validate Plesk connection
|
||||
- `POST /api/plesk/instances/:id/sync` — pull/sync subscriptions + domains from one Plesk instance
|
||||
- `POST /api/plesk/instances/:id/autosync` — update auto-sync enabled/frequency for one Plesk instance
|
||||
- `POST /api/jobs/plesk-sync-all` — background sync job for all connected instances (requires `X-JOB-SECRET`)
|
||||
- `POST /api/cron/autosync` — scheduled auto-sync tick (requires `X-CRON-SECRET`)
|
||||
- `POST /api/plesk/subscriptions/:id/action` — suspend or unsuspend
|
||||
- `POST /api/stripe/checkout` — create Stripe Checkout session
|
||||
- `POST /api/stripe/portal` — create Stripe Customer Portal session
|
||||
@@ -76,7 +74,6 @@ values ('<agency_uuid>', '<auth_user_uuid>', 'owner');
|
||||
- Set a strong `ENCRYPTION_KEY`; it encrypts stored Plesk auth secrets.
|
||||
- Set a strong `PLESK_CRED_ENC_KEY` (32-byte base64 or 64-char hex) for Plesk credential encryption.
|
||||
- Set `JOB_SECRET` for internal cron-triggered job auth.
|
||||
- Set `CRON_SECRET` for `/api/cron/autosync` auth.
|
||||
- `/api/stripe/webhook` is excluded from auth middleware for Stripe signature verification.
|
||||
- Current implementation is intentionally MVP-focused; add stronger validation, retries, idempotency keys, and richer error observability for production.
|
||||
|
||||
@@ -100,37 +97,3 @@ Notes:
|
||||
- Job uses DB lock (`job_locks`) to avoid overlapping runs.
|
||||
- Job processes at most 10 connected instances per run.
|
||||
- Instances synced in the last 3 minutes are skipped.
|
||||
|
||||
## 6) Auto Sync Worker (CL6)
|
||||
|
||||
New scheduler fields live on `plesk_instances`:
|
||||
|
||||
- `auto_sync_enabled`
|
||||
- `auto_sync_frequency_minutes`
|
||||
- `last_auto_sync_at`
|
||||
- `next_auto_sync_at`
|
||||
- `auto_sync_lock_until`
|
||||
- `auto_sync_lock_token`
|
||||
|
||||
Endpoint for periodic worker ticks:
|
||||
|
||||
```bash
|
||||
curl -sS -X POST http://localhost:3000/api/cron/autosync \
|
||||
-H "X-CRON-SECRET: <CRON_SECRET>"
|
||||
```
|
||||
|
||||
Recommended system cron (every 5 minutes):
|
||||
|
||||
```cron
|
||||
*/5 * * * * curl -sS -X POST https://<your-host>/api/cron/autosync -H "X-CRON-SECRET: ${CRON_SECRET}"
|
||||
```
|
||||
|
||||
Or schedule the same call from Jenkins.
|
||||
|
||||
Worker safety behavior:
|
||||
|
||||
- processes at most 5 instances per tick
|
||||
- concurrency limited to 2 at a time
|
||||
- per-instance lock lease 15 minutes
|
||||
- per-instance timeout guard 14 minutes
|
||||
- per-instance failures are isolated and logged to `actions_log`
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
import { NextResponse } from "next/server";
|
||||
|
||||
import { env } from "@/lib/env";
|
||||
import { runAutoSyncTick } from "@/lib/plesk/auto-sync";
|
||||
import { createSupabaseAdminClient } from "@/lib/supabase/admin";
|
||||
|
||||
export async function POST(req: Request) {
|
||||
const startedAt = Date.now();
|
||||
|
||||
try {
|
||||
const secret = req.headers.get("x-cron-secret");
|
||||
if (!env.cronSecret || !secret || secret !== env.cronSecret) {
|
||||
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
|
||||
}
|
||||
|
||||
const supabase = createSupabaseAdminClient() as any;
|
||||
const summary = await runAutoSyncTick(supabase);
|
||||
|
||||
return NextResponse.json({
|
||||
...summary,
|
||||
duration_ms: Date.now() - startedAt,
|
||||
});
|
||||
} catch (error) {
|
||||
console.error("[autosync cron] failed", error);
|
||||
|
||||
return NextResponse.json(
|
||||
{
|
||||
error: "Auto-sync job failed",
|
||||
instances_considered: 0,
|
||||
locks_acquired: 0,
|
||||
succeeded: 0,
|
||||
failed: 0,
|
||||
duration_ms: Date.now() - startedAt,
|
||||
},
|
||||
{ status: 500 },
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,38 +0,0 @@
|
||||
import { NextResponse } from "next/server";
|
||||
|
||||
import { env } from "@/lib/env";
|
||||
import { runHealthCheckTick } from "@/lib/plesk/health";
|
||||
import { createSupabaseAdminClient } from "@/lib/supabase/admin";
|
||||
|
||||
export async function POST(req: Request) {
|
||||
const startedAt = Date.now();
|
||||
|
||||
try {
|
||||
const secret = req.headers.get("x-cron-secret");
|
||||
if (!env.cronSecret || !secret || secret !== env.cronSecret) {
|
||||
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
|
||||
}
|
||||
|
||||
const supabase = createSupabaseAdminClient() as any;
|
||||
const summary = await runHealthCheckTick(supabase);
|
||||
|
||||
return NextResponse.json({
|
||||
...summary,
|
||||
duration_ms: Date.now() - startedAt,
|
||||
});
|
||||
} catch (error) {
|
||||
console.error("[health cron] failed", error);
|
||||
|
||||
return NextResponse.json(
|
||||
{
|
||||
error: "Health check job failed",
|
||||
checked: 0,
|
||||
ok: 0,
|
||||
degraded: 0,
|
||||
failed: 0,
|
||||
duration_ms: Date.now() - startedAt,
|
||||
},
|
||||
{ status: 500 },
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -5,54 +5,15 @@ import { assertAgencyAdmin, getRouteAgencyContextOrThrow } from "@/lib/agency";
|
||||
import { assertRateLimit } from "@/lib/api/rate-limit";
|
||||
import { assertSameOrigin } from "@/lib/api/security";
|
||||
import {
|
||||
parseSubscriptionStatusDetailsFromInfo,
|
||||
pleskCliCall,
|
||||
suspendPleskSubscription,
|
||||
unsuspendPleskSubscription,
|
||||
} 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 } },
|
||||
@@ -61,13 +22,8 @@ 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;
|
||||
plesk_instance_id: string;
|
||||
} | null = null;
|
||||
let subscription: { id: string; plesk_subscription_id: string } | null = null;
|
||||
let requestedAction: "suspend" | "unsuspend" | null = null;
|
||||
const startedAt = Date.now();
|
||||
|
||||
try {
|
||||
assertSameOrigin(req);
|
||||
@@ -76,8 +32,7 @@ export async function POST(
|
||||
assertAgencyAdmin(context);
|
||||
assertRateLimit(`plesk-domain-action:${context.userId}`, 10, 60_000);
|
||||
|
||||
const payload = actionSchema.parse(await req.json());
|
||||
const { action } = payload;
|
||||
const { action } = actionSchema.parse(await req.json());
|
||||
requestedAction = action;
|
||||
|
||||
const { data: domainRow, error: domainError } = await supabase
|
||||
@@ -91,23 +46,21 @@ 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: resolvedSubscriptionId,
|
||||
subscription_id: domainRow.subscription_id
|
||||
? String(domainRow.subscription_id)
|
||||
: null,
|
||||
};
|
||||
|
||||
if (!resolvedSubscriptionId) {
|
||||
if (!domain.subscription_id) {
|
||||
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", resolvedSubscriptionId)
|
||||
.eq("id", domain.subscription_id)
|
||||
.eq("agency_id", context.agencyId)
|
||||
.single();
|
||||
|
||||
@@ -118,7 +71,6 @@ 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
|
||||
@@ -138,117 +90,29 @@ export async function POST(
|
||||
encryptedSecret: instance.encrypted_secret,
|
||||
} as const;
|
||||
|
||||
const domainIdentifier = subscription.plesk_subscription_id;
|
||||
const siteArgs =
|
||||
action === "suspend"
|
||||
? ["--suspend", domainIdentifier]
|
||||
: ["--on", domainIdentifier];
|
||||
if (action === "suspend") {
|
||||
await suspendPleskSubscription(
|
||||
connection,
|
||||
subscription.plesk_subscription_id,
|
||||
);
|
||||
} else {
|
||||
await unsuspendPleskSubscription(
|
||||
connection,
|
||||
subscription.plesk_subscription_id,
|
||||
);
|
||||
}
|
||||
|
||||
await insertActionLogBestEffort(supabase, {
|
||||
await supabase.from("actions_log").insert({
|
||||
agency_id: context.agencyId,
|
||||
actor_user_id: context.userId,
|
||||
target_type: "plesk_domain",
|
||||
target_id: domain.id,
|
||||
action: DOMAIN_ACTION_EVENTS[action].requested,
|
||||
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,
|
||||
action: `domain_${action}`,
|
||||
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,
|
||||
},
|
||||
});
|
||||
|
||||
@@ -257,41 +121,20 @@ export async function POST(
|
||||
if (context && domain) {
|
||||
const message =
|
||||
error instanceof Error ? error.message : "Domain action failed";
|
||||
if (requestedAction) {
|
||||
await insertActionLogBestEffort(supabase, {
|
||||
await supabase.from("actions_log").insert({
|
||||
agency_id: context.agencyId,
|
||||
actor_user_id: context.userId,
|
||||
target_type: "plesk_domain",
|
||||
target_id: domain.id,
|
||||
action: DOMAIN_ACTION_EVENTS[requestedAction].failed,
|
||||
action: requestedAction ? `domain_${requestedAction}` : "domain_action",
|
||||
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,
|
||||
},
|
||||
});
|
||||
} 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(
|
||||
|
||||
@@ -1,87 +0,0 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import { z } from "zod";
|
||||
|
||||
import { assertAgencyAdmin, getRouteAgencyContextOrThrow } from "@/lib/agency";
|
||||
import { assertRateLimit } from "@/lib/api/rate-limit";
|
||||
import { assertSameOrigin } from "@/lib/api/security";
|
||||
import { createSupabaseRouteClient } from "@/lib/supabase/route";
|
||||
|
||||
const autosyncSchema = z.object({
|
||||
auto_sync_enabled: z.boolean(),
|
||||
auto_sync_frequency_minutes: z.number().int().min(5).max(10080).optional(),
|
||||
});
|
||||
|
||||
export async function POST(
|
||||
req: Request,
|
||||
{ params }: { params: { id: string } },
|
||||
) {
|
||||
try {
|
||||
assertSameOrigin(req);
|
||||
|
||||
const context = await getRouteAgencyContextOrThrow();
|
||||
assertAgencyAdmin(context);
|
||||
assertRateLimit(`plesk-autosync-settings:${context.userId}`, 20, 60_000);
|
||||
|
||||
const input = autosyncSchema.parse(await req.json());
|
||||
const frequency = input.auto_sync_frequency_minutes ?? 60;
|
||||
const nowIso = new Date().toISOString();
|
||||
const nextAtIso = new Date(
|
||||
Date.now() + frequency * 60 * 1000,
|
||||
).toISOString();
|
||||
|
||||
const supabase = createSupabaseRouteClient() as any;
|
||||
|
||||
const updates = {
|
||||
auto_sync_enabled: input.auto_sync_enabled,
|
||||
auto_sync_frequency_minutes: frequency,
|
||||
next_auto_sync_at: input.auto_sync_enabled ? nextAtIso : null,
|
||||
auto_sync_lock_until: null,
|
||||
auto_sync_lock_token: null,
|
||||
last_auto_sync_at: input.auto_sync_enabled ? undefined : null,
|
||||
} as Record<string, unknown>;
|
||||
|
||||
const { data: instance, error } = await supabase
|
||||
.from("plesk_instances")
|
||||
.update(updates)
|
||||
.eq("id", params.id)
|
||||
.eq("agency_id", context.agencyId)
|
||||
.select(
|
||||
"id, auto_sync_enabled, auto_sync_frequency_minutes, last_auto_sync_at, next_auto_sync_at, auto_sync_lock_until",
|
||||
)
|
||||
.single();
|
||||
|
||||
if (error || !instance) {
|
||||
throw new Error(error?.message ?? "Plesk instance not found");
|
||||
}
|
||||
|
||||
try {
|
||||
await supabase.from("actions_log").insert({
|
||||
agency_id: context.agencyId,
|
||||
actor_user_id: context.userId,
|
||||
target_type: "plesk_instance",
|
||||
target_id: params.id,
|
||||
action: "autosync_settings_updated",
|
||||
status: "success",
|
||||
metadata: {
|
||||
auto_sync_enabled: input.auto_sync_enabled,
|
||||
auto_sync_frequency_minutes: frequency,
|
||||
updated_at: nowIso,
|
||||
},
|
||||
});
|
||||
} catch {
|
||||
// best effort logging
|
||||
}
|
||||
|
||||
return NextResponse.json({ instance });
|
||||
} catch (error) {
|
||||
return NextResponse.json(
|
||||
{
|
||||
error:
|
||||
error instanceof Error
|
||||
? error.message
|
||||
: "Failed to update auto-sync settings",
|
||||
},
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,51 +0,0 @@
|
||||
import { NextResponse } from "next/server";
|
||||
|
||||
import { assertAgencyAdmin, getRouteAgencyContextOrThrow } from "@/lib/agency";
|
||||
import { assertRateLimit } from "@/lib/api/rate-limit";
|
||||
import { assertSameOrigin } from "@/lib/api/security";
|
||||
import { backfillDomainSubscriptionLinks } from "@/lib/plesk/sync";
|
||||
import { createSupabaseRouteClient } from "@/lib/supabase/route";
|
||||
|
||||
export async function POST(
|
||||
req: Request,
|
||||
{ params }: { params: { id: string } },
|
||||
) {
|
||||
try {
|
||||
assertSameOrigin(req);
|
||||
|
||||
const context = await getRouteAgencyContextOrThrow();
|
||||
assertAgencyAdmin(context);
|
||||
assertRateLimit(`plesk-backfill-links:${context.userId}`, 5, 60_000);
|
||||
|
||||
const supabase = createSupabaseRouteClient() as any;
|
||||
|
||||
const { data: instance, error: instanceError } = await supabase
|
||||
.from("plesk_instances")
|
||||
.select("id")
|
||||
.eq("id", params.id)
|
||||
.eq("agency_id", context.agencyId)
|
||||
.single();
|
||||
|
||||
if (instanceError || !instance) {
|
||||
throw new Error("Plesk instance not found");
|
||||
}
|
||||
|
||||
const result = await backfillDomainSubscriptionLinks(supabase, {
|
||||
agencyId: context.agencyId,
|
||||
instanceId: params.id,
|
||||
actorUserId: context.userId,
|
||||
});
|
||||
|
||||
return NextResponse.json({ ok: true, ...result });
|
||||
} catch (error) {
|
||||
return NextResponse.json(
|
||||
{
|
||||
error:
|
||||
error instanceof Error
|
||||
? error.message
|
||||
: "Backfill domain links failed",
|
||||
},
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,73 +0,0 @@
|
||||
import { NextResponse } from "next/server";
|
||||
|
||||
import { assertAgencyAdmin, getRouteAgencyContextOrThrow } from "@/lib/agency";
|
||||
import { assertRateLimit } from "@/lib/api/rate-limit";
|
||||
import { assertSameOrigin } from "@/lib/api/security";
|
||||
import { runInstanceHealthCheck } from "@/lib/plesk/health";
|
||||
import { createSupabaseRouteClient } from "@/lib/supabase/route";
|
||||
|
||||
export async function POST(
|
||||
req: Request,
|
||||
{ params }: { params: { id: string } },
|
||||
) {
|
||||
try {
|
||||
assertSameOrigin(req);
|
||||
|
||||
const context = await getRouteAgencyContextOrThrow();
|
||||
assertAgencyAdmin(context);
|
||||
assertRateLimit(`plesk-health-check:${context.userId}`, 20, 60_000);
|
||||
|
||||
const supabase = createSupabaseRouteClient() as any;
|
||||
|
||||
const { data: instance, error: instanceError } = await supabase
|
||||
.from("plesk_instances")
|
||||
.select(
|
||||
"id, agency_id, base_url, auth_type, encrypted_secret, health_enabled, health_check_frequency_minutes, health_next_check_at, health_lock_until",
|
||||
)
|
||||
.eq("id", params.id)
|
||||
.eq("agency_id", context.agencyId)
|
||||
.single();
|
||||
|
||||
if (instanceError || !instance) {
|
||||
throw new Error("Plesk instance not found");
|
||||
}
|
||||
|
||||
const result = await runInstanceHealthCheck(supabase, instance, {
|
||||
actorUserId: context.userId,
|
||||
force: true,
|
||||
source: "manual",
|
||||
});
|
||||
|
||||
if (!result.checked) {
|
||||
return NextResponse.json(
|
||||
{ error: "Health check is already running for this instance" },
|
||||
{ status: 409 },
|
||||
);
|
||||
}
|
||||
|
||||
const { data: updated } = await supabase
|
||||
.from("plesk_instances")
|
||||
.select(
|
||||
"id, health_enabled, health_status, health_last_checked_at, health_last_ok_at, health_last_error, health_last_latency_ms, health_check_frequency_minutes, health_next_check_at",
|
||||
)
|
||||
.eq("id", params.id)
|
||||
.eq("agency_id", context.agencyId)
|
||||
.single();
|
||||
|
||||
return NextResponse.json({
|
||||
ok: true,
|
||||
result,
|
||||
instance: updated,
|
||||
});
|
||||
} catch (error) {
|
||||
return NextResponse.json(
|
||||
{
|
||||
error:
|
||||
error instanceof Error
|
||||
? error.message
|
||||
: "Health check execution failed",
|
||||
},
|
||||
{ status: 400 },
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -5,8 +5,6 @@ import { assertAgencyAdmin, getRouteAgencyContextOrThrow } from "@/lib/agency";
|
||||
import { assertRateLimit } from "@/lib/api/rate-limit";
|
||||
import { assertSameOrigin } from "@/lib/api/security";
|
||||
import {
|
||||
parseSubscriptionStatusDetailsFromInfo,
|
||||
pleskCliCall,
|
||||
suspendPleskSubscription,
|
||||
unsuspendPleskSubscription,
|
||||
} from "@/lib/plesk/client";
|
||||
@@ -16,44 +14,6 @@ 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 } },
|
||||
@@ -67,7 +27,6 @@ export async function POST(
|
||||
plesk_subscription_id: string;
|
||||
plesk_instance_id: string;
|
||||
} | null = null;
|
||||
const startedAt = Date.now();
|
||||
|
||||
try {
|
||||
assertSameOrigin(req);
|
||||
@@ -109,153 +68,58 @@ export async function POST(
|
||||
encryptedSecret: instance.encrypted_secret,
|
||||
} as const;
|
||||
|
||||
const cliArgs =
|
||||
payload.action === "suspend"
|
||||
? ["--webspace-off", subscription.plesk_subscription_id]
|
||||
: ["--unsuspend", subscription.plesk_subscription_id];
|
||||
|
||||
await insertActionLogBestEffort(supabase, {
|
||||
agency_id: context.agencyId,
|
||||
actor_user_id: context.userId,
|
||||
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(
|
||||
if (payload.action === "suspend") {
|
||||
await suspendPleskSubscription(
|
||||
connection,
|
||||
subscription.plesk_subscription_id,
|
||||
);
|
||||
|
||||
const fallbackStatus =
|
||||
payload.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",
|
||||
} else {
|
||||
await unsuspendPleskSubscription(
|
||||
connection,
|
||||
subscription.plesk_subscription_id,
|
||||
]);
|
||||
const parsed = parseSubscriptionStatusDetailsFromInfo(
|
||||
infoResult.stdout ?? "",
|
||||
);
|
||||
refreshedStatus = parsed.status;
|
||||
refreshedStatusRaw = parsed.statusRaw;
|
||||
} 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,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
const newStatus = payload.action === "suspend" ? "suspended" : "active";
|
||||
const { error: updateError } = await supabase
|
||||
.from("plesk_subscriptions")
|
||||
.update({
|
||||
status: refreshedStatus,
|
||||
status_raw: refreshedStatusRaw,
|
||||
last_status_sync_at: new Date().toISOString(),
|
||||
})
|
||||
.update({ status: newStatus })
|
||||
.eq("id", subscription.id);
|
||||
|
||||
await supabase
|
||||
.from("plesk_domains")
|
||||
.update({ status: refreshedStatus })
|
||||
.eq("agency_id", context.agencyId)
|
||||
.eq("subscription_id", subscription.id);
|
||||
|
||||
await insertActionLogBestEffort(supabase, {
|
||||
await supabase.from("actions_log").insert({
|
||||
agency_id: context.agencyId,
|
||||
actor_user_id: context.userId,
|
||||
target_type: "plesk_subscription",
|
||||
target_id: subscription.id,
|
||||
action: SUBSCRIPTION_ACTION_EVENTS[payload.action].succeeded,
|
||||
action: payload.action,
|
||||
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,
|
||||
},
|
||||
});
|
||||
|
||||
return NextResponse.json({
|
||||
ok: true,
|
||||
status: refreshedStatus,
|
||||
status: newStatus,
|
||||
dbStatusUpdated: !updateError,
|
||||
refreshError: refreshErrorMessage,
|
||||
});
|
||||
} catch (error) {
|
||||
if (supabase && context && subscription) {
|
||||
const message =
|
||||
error instanceof Error ? error.message : "Subscription action failed";
|
||||
if (requestedAction) {
|
||||
await insertActionLogBestEffort(supabase, {
|
||||
await supabase.from("actions_log").insert({
|
||||
agency_id: context.agencyId,
|
||||
actor_user_id: context.userId,
|
||||
target_type: "plesk_subscription",
|
||||
target_id: subscription.id,
|
||||
action: SUBSCRIPTION_ACTION_EVENTS[requestedAction].failed,
|
||||
action: requestedAction ?? "subscription_action",
|
||||
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,
|
||||
},
|
||||
});
|
||||
} 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(
|
||||
|
||||
@@ -1,297 +0,0 @@
|
||||
import Link from "next/link";
|
||||
|
||||
import { getServerAgencyContextOrRedirect } from "@/lib/agency";
|
||||
import { createSupabaseServerClient } from "@/lib/supabase/server";
|
||||
import { formatDateTime } from "@/lib/dates";
|
||||
|
||||
const PAGE_SIZE = 50;
|
||||
|
||||
type SearchParams = {
|
||||
page?: string;
|
||||
instance?: string;
|
||||
action?: string;
|
||||
status?: string;
|
||||
};
|
||||
|
||||
function getSingleParam(value: string | string[] | undefined) {
|
||||
if (!value) return "";
|
||||
return Array.isArray(value) ? (value[0] ?? "") : value;
|
||||
}
|
||||
|
||||
function buildQueryString(next: Record<string, string | number | undefined>) {
|
||||
const params = new URLSearchParams();
|
||||
|
||||
for (const [key, value] of Object.entries(next)) {
|
||||
if (value == null) continue;
|
||||
const normalized = String(value);
|
||||
if (!normalized) continue;
|
||||
params.set(key, normalized);
|
||||
}
|
||||
|
||||
return params.toString();
|
||||
}
|
||||
|
||||
export default async function ActivityPage({
|
||||
searchParams,
|
||||
}: {
|
||||
searchParams?: SearchParams;
|
||||
}) {
|
||||
const context = await getServerAgencyContextOrRedirect();
|
||||
const supabase = createSupabaseServerClient() as any;
|
||||
|
||||
const selectedInstance = getSingleParam(searchParams?.instance);
|
||||
const selectedAction = getSingleParam(searchParams?.action);
|
||||
const selectedStatus = getSingleParam(searchParams?.status);
|
||||
const page = Math.max(
|
||||
Number(getSingleParam(searchParams?.page) || "1") || 1,
|
||||
1,
|
||||
);
|
||||
|
||||
const { data: instances } = await supabase
|
||||
.from("plesk_instances")
|
||||
.select("id, name, base_url")
|
||||
.eq("agency_id", context.agencyId)
|
||||
.order("name", { ascending: true });
|
||||
|
||||
let baseQuery = supabase
|
||||
.from("actions_log")
|
||||
.select(
|
||||
"id, created_at, target_type, target_id, action, status, error_message, metadata",
|
||||
{ count: "exact" },
|
||||
)
|
||||
.eq("agency_id", context.agencyId)
|
||||
.order("created_at", { ascending: false });
|
||||
|
||||
if (selectedAction) {
|
||||
baseQuery = baseQuery.eq("action", selectedAction);
|
||||
}
|
||||
|
||||
if (selectedStatus) {
|
||||
baseQuery = baseQuery.eq("status", selectedStatus);
|
||||
}
|
||||
|
||||
if (selectedInstance) {
|
||||
baseQuery = baseQuery.or(
|
||||
`target_id.eq.${selectedInstance},metadata->>plesk_instance_id.eq.${selectedInstance}`,
|
||||
);
|
||||
}
|
||||
|
||||
const from = (page - 1) * PAGE_SIZE;
|
||||
const to = from + PAGE_SIZE - 1;
|
||||
|
||||
const { data: logs, count } = await baseQuery.range(from, to);
|
||||
|
||||
const { data: recentForActions } = await supabase
|
||||
.from("actions_log")
|
||||
.select("action")
|
||||
.eq("agency_id", context.agencyId)
|
||||
.order("created_at", { ascending: false })
|
||||
.limit(200);
|
||||
|
||||
const actionOptions = Array.from(
|
||||
new Set((recentForActions ?? []).map((entry: any) => String(entry.action))),
|
||||
).sort();
|
||||
|
||||
const instanceNameById = new Map<string, string>(
|
||||
(instances ?? []).map((instance: any) => [
|
||||
String(instance.id),
|
||||
String(instance.name ?? instance.base_url ?? instance.id),
|
||||
]),
|
||||
);
|
||||
|
||||
const total = count ?? 0;
|
||||
const hasPrev = page > 1;
|
||||
const hasNext = to + 1 < total;
|
||||
|
||||
return (
|
||||
<main className="mx-auto w-full max-w-6xl space-y-4 px-6 py-8">
|
||||
<div className="flex items-center justify-between">
|
||||
<div>
|
||||
<h1 className="text-2xl font-bold text-slate-900">Activity Log</h1>
|
||||
<p className="text-sm text-slate-600">
|
||||
Recent actions for your agency
|
||||
</p>
|
||||
</div>
|
||||
<Link href="/dashboard" className="text-sm text-brand-700 underline">
|
||||
Back to dashboard
|
||||
</Link>
|
||||
</div>
|
||||
|
||||
<form className="grid gap-2 rounded-xl border border-slate-200 bg-white p-4 md:grid-cols-4">
|
||||
<div>
|
||||
<label className="text-xs font-medium text-slate-600">Instance</label>
|
||||
<select
|
||||
name="instance"
|
||||
defaultValue={selectedInstance}
|
||||
className="mt-1 w-full rounded border border-slate-300 px-2 py-1.5 text-sm"
|
||||
>
|
||||
<option value="">All instances</option>
|
||||
{(instances ?? []).map((instance: any) => (
|
||||
<option key={String(instance.id)} value={String(instance.id)}>
|
||||
{String(instance.name ?? instance.base_url ?? instance.id)}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="text-xs font-medium text-slate-600">Action</label>
|
||||
<select
|
||||
name="action"
|
||||
defaultValue={selectedAction}
|
||||
className="mt-1 w-full rounded border border-slate-300 px-2 py-1.5 text-sm"
|
||||
>
|
||||
<option value="">All actions</option>
|
||||
{actionOptions.map((action) => (
|
||||
<option key={action} value={action}>
|
||||
{action}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="text-xs font-medium text-slate-600">Status</label>
|
||||
<select
|
||||
name="status"
|
||||
defaultValue={selectedStatus}
|
||||
className="mt-1 w-full rounded border border-slate-300 px-2 py-1.5 text-sm"
|
||||
>
|
||||
<option value="">All statuses</option>
|
||||
<option value="pending">Pending</option>
|
||||
<option value="success">Success</option>
|
||||
<option value="failed">Failed</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div className="flex items-end gap-2">
|
||||
<button className="rounded border px-3 py-1.5 text-sm">Apply</button>
|
||||
<Link
|
||||
href="/dashboard/activity"
|
||||
className="rounded border px-3 py-1.5 text-sm"
|
||||
>
|
||||
Reset
|
||||
</Link>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<div className="overflow-x-auto rounded-xl border border-slate-200 bg-white">
|
||||
<table className="min-w-full text-left text-sm">
|
||||
<thead>
|
||||
<tr className="border-b border-slate-200 text-xs uppercase text-slate-500">
|
||||
<th className="px-3 py-2">Time</th>
|
||||
<th className="px-3 py-2">Instance</th>
|
||||
<th className="px-3 py-2">Action</th>
|
||||
<th className="px-3 py-2">Target</th>
|
||||
<th className="px-3 py-2">Status</th>
|
||||
<th className="px-3 py-2">Message</th>
|
||||
<th className="px-3 py-2">Details</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{(logs ?? []).length === 0 ? (
|
||||
<tr>
|
||||
<td className="px-3 py-4 text-slate-500" colSpan={7}>
|
||||
No activity found.
|
||||
</td>
|
||||
</tr>
|
||||
) : (
|
||||
(logs ?? []).map((row: any) => {
|
||||
const metadata =
|
||||
row?.metadata && typeof row.metadata === "object"
|
||||
? (row.metadata as Record<string, unknown>)
|
||||
: null;
|
||||
|
||||
const instanceId =
|
||||
(metadata?.plesk_instance_id as string | undefined) ??
|
||||
(row.target_type === "plesk_instance"
|
||||
? (row.target_id as string | null)
|
||||
: null);
|
||||
|
||||
return (
|
||||
<tr
|
||||
key={row.id}
|
||||
className="border-b border-slate-100 align-top"
|
||||
>
|
||||
<td className="px-3 py-2">
|
||||
{formatDateTime(row.created_at)}
|
||||
</td>
|
||||
<td className="px-3 py-2">
|
||||
{instanceId
|
||||
? (instanceNameById.get(instanceId) ?? instanceId)
|
||||
: "-"}
|
||||
</td>
|
||||
<td className="px-3 py-2">{row.action ?? "-"}</td>
|
||||
<td className="px-3 py-2">
|
||||
{row.target_type ?? "-"}
|
||||
{row.target_id ? ` (${row.target_id})` : ""}
|
||||
</td>
|
||||
<td className="px-3 py-2">{row.status ?? "-"}</td>
|
||||
<td className="px-3 py-2">{row.error_message ?? "-"}</td>
|
||||
<td className="px-3 py-2">
|
||||
{metadata ? (
|
||||
<details>
|
||||
<summary className="cursor-pointer text-xs text-brand-700">
|
||||
View
|
||||
</summary>
|
||||
<pre className="mt-1 max-w-[460px] overflow-auto rounded bg-slate-50 p-2 text-[11px] text-slate-700">
|
||||
{JSON.stringify(metadata, null, 2)}
|
||||
</pre>
|
||||
</details>
|
||||
) : (
|
||||
"-"
|
||||
)}
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})
|
||||
)}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center justify-between text-sm">
|
||||
<p className="text-slate-500">
|
||||
Showing {Math.min(total, from + 1)} - {Math.min(total, to + 1)} of{" "}
|
||||
{total}
|
||||
</p>
|
||||
<div className="flex gap-2">
|
||||
{hasPrev ? (
|
||||
<Link
|
||||
href={`/dashboard/activity?${buildQueryString({
|
||||
page: page - 1,
|
||||
instance: selectedInstance,
|
||||
action: selectedAction,
|
||||
status: selectedStatus,
|
||||
})}`}
|
||||
className="rounded border px-3 py-1.5"
|
||||
>
|
||||
Previous
|
||||
</Link>
|
||||
) : (
|
||||
<span className="rounded border px-3 py-1.5 text-slate-400">
|
||||
Previous
|
||||
</span>
|
||||
)}
|
||||
{hasNext ? (
|
||||
<Link
|
||||
href={`/dashboard/activity?${buildQueryString({
|
||||
page: page + 1,
|
||||
instance: selectedInstance,
|
||||
action: selectedAction,
|
||||
status: selectedStatus,
|
||||
})}`}
|
||||
className="rounded border px-3 py-1.5"
|
||||
>
|
||||
Next
|
||||
</Link>
|
||||
) : (
|
||||
<span className="rounded border px-3 py-1.5 text-slate-400">
|
||||
Next
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
@@ -3,7 +3,6 @@ import { DashboardControls } from "@/components/dashboard/dashboard-controls";
|
||||
import { getServerAgencyContextOrRedirect } from "@/lib/agency";
|
||||
import type { Database } from "@/lib/types";
|
||||
import { createSupabaseServerClient } from "@/lib/supabase/server";
|
||||
import Link from "next/link";
|
||||
|
||||
type AgencySummary = Pick<
|
||||
Database["public"]["Tables"]["agencies"]["Row"],
|
||||
@@ -17,36 +16,6 @@ type ActionLogSummary = Pick<
|
||||
Database["public"]["Tables"]["actions_log"]["Row"],
|
||||
"target_id" | "status" | "action" | "created_at" | "error_message"
|
||||
>;
|
||||
type HealthLogSummary = Pick<
|
||||
Database["public"]["Tables"]["actions_log"]["Row"],
|
||||
| "id"
|
||||
| "target_id"
|
||||
| "status"
|
||||
| "action"
|
||||
| "created_at"
|
||||
| "error_message"
|
||||
| "metadata"
|
||||
>;
|
||||
|
||||
function normalizeDomainLike(value: string) {
|
||||
return value.trim().toLowerCase().replace(/\.$/, "");
|
||||
}
|
||||
|
||||
function findBestSuffixStatusMatch(
|
||||
normalizedDomain: string,
|
||||
candidates: Array<{ normalizedName: string; status: string | null }>,
|
||||
) {
|
||||
let best: { normalizedName: string; status: string | null } | null = null;
|
||||
|
||||
for (const candidate of candidates) {
|
||||
if (!normalizedDomain.endsWith(`.${candidate.normalizedName}`)) continue;
|
||||
if (!best || candidate.normalizedName.length > best.normalizedName.length) {
|
||||
best = candidate;
|
||||
}
|
||||
}
|
||||
|
||||
return best?.status ?? null;
|
||||
}
|
||||
|
||||
export default async function DashboardPage() {
|
||||
const context = await getServerAgencyContextOrRedirect();
|
||||
@@ -59,7 +28,6 @@ export default async function DashboardPage() {
|
||||
{ data: domains },
|
||||
{ data: billing },
|
||||
{ data: autoSyncLogs },
|
||||
{ data: healthLogs },
|
||||
] = (await Promise.all([
|
||||
supabase
|
||||
.from("agencies")
|
||||
@@ -69,7 +37,7 @@ export default async function DashboardPage() {
|
||||
supabase
|
||||
.from("plesk_instances")
|
||||
.select(
|
||||
"id, name, base_url, auth_type, status, error_message, last_connected_at, last_sync_at, last_sync_status, last_sync_error, last_sync_subscriptions, last_sync_domains, auto_sync_enabled, auto_sync_frequency_minutes, last_auto_sync_at, next_auto_sync_at, auto_sync_lock_until, health_enabled, health_status, health_last_checked_at, health_last_ok_at, health_last_error, health_last_latency_ms, health_check_frequency_minutes, health_next_check_at, health_lock_until",
|
||||
"id, name, base_url, auth_type, status, error_message, last_connected_at, last_sync_at, last_sync_status, last_sync_error, last_sync_subscriptions, last_sync_domains",
|
||||
)
|
||||
.eq("agency_id", context.agencyId)
|
||||
.order("created_at", { ascending: false }),
|
||||
@@ -82,7 +50,7 @@ export default async function DashboardPage() {
|
||||
supabase
|
||||
.from("plesk_domains")
|
||||
.select(
|
||||
"id, plesk_instance_id, subscription_id, external_subscription_id, status, domain_name, hosting_type, source_created_at, aliases_count, updated_at",
|
||||
"id, plesk_instance_id, subscription_id, domain_name, status, hosting_type, source_created_at, aliases_count, updated_at",
|
||||
)
|
||||
.eq("agency_id", context.agencyId)
|
||||
.order("updated_at", { ascending: false })
|
||||
@@ -100,21 +68,6 @@ export default async function DashboardPage() {
|
||||
.eq("action", "plesk_sync_auto")
|
||||
.order("created_at", { ascending: false })
|
||||
.limit(200),
|
||||
supabase
|
||||
.from("actions_log")
|
||||
.select(
|
||||
"id, target_id, status, action, created_at, error_message, metadata",
|
||||
)
|
||||
.eq("agency_id", context.agencyId)
|
||||
.eq("target_type", "plesk_instance")
|
||||
.in("action", [
|
||||
"health_check_started",
|
||||
"health_check_ok",
|
||||
"health_check_degraded",
|
||||
"health_check_failed",
|
||||
])
|
||||
.order("created_at", { ascending: false })
|
||||
.limit(400),
|
||||
])) as [
|
||||
{ data: AgencySummary | null },
|
||||
{
|
||||
@@ -131,20 +84,6 @@ export default async function DashboardPage() {
|
||||
last_sync_error: string | null;
|
||||
last_sync_subscriptions: number;
|
||||
last_sync_domains: number;
|
||||
auto_sync_enabled: boolean;
|
||||
auto_sync_frequency_minutes: number;
|
||||
last_auto_sync_at: string | null;
|
||||
next_auto_sync_at: string | null;
|
||||
auto_sync_lock_until: string | null;
|
||||
health_enabled: boolean;
|
||||
health_status: "ok" | "degraded" | "down" | "unknown";
|
||||
health_last_checked_at: string | null;
|
||||
health_last_ok_at: string | null;
|
||||
health_last_error: string | null;
|
||||
health_last_latency_ms: number | null;
|
||||
health_check_frequency_minutes: number;
|
||||
health_next_check_at: string | null;
|
||||
health_lock_until: string | null;
|
||||
}> | null;
|
||||
error: { message: string } | null;
|
||||
},
|
||||
@@ -162,7 +101,6 @@ export default async function DashboardPage() {
|
||||
id: string;
|
||||
plesk_instance_id: string;
|
||||
subscription_id: string | null;
|
||||
external_subscription_id: string | null;
|
||||
domain_name: string;
|
||||
status: string | null;
|
||||
hosting_type: string | null;
|
||||
@@ -173,85 +111,8 @@ export default async function DashboardPage() {
|
||||
},
|
||||
{ data: BillingSummary | null },
|
||||
{ data: ActionLogSummary[] | null },
|
||||
{ data: HealthLogSummary[] | null },
|
||||
];
|
||||
|
||||
const domainInstanceIds = Array.from(
|
||||
new Set((domains ?? []).map((domain) => domain.plesk_instance_id)),
|
||||
);
|
||||
|
||||
const { data: domainSubscriptions } =
|
||||
domainInstanceIds.length > 0
|
||||
? await supabase
|
||||
.from("plesk_subscriptions")
|
||||
.select("id, plesk_instance_id, plesk_subscription_id, name, status")
|
||||
.eq("agency_id", context.agencyId)
|
||||
.in("plesk_instance_id", domainInstanceIds)
|
||||
: { data: [] };
|
||||
|
||||
const subscriptionStatusById = new Map<string, string | null>(
|
||||
(domainSubscriptions ?? []).map((subscription: any) => [
|
||||
String(subscription.id),
|
||||
subscription?.status ? String(subscription.status) : null,
|
||||
]),
|
||||
);
|
||||
|
||||
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) =>
|
||||
Boolean(
|
||||
subscription?.plesk_instance_id &&
|
||||
subscription?.plesk_subscription_id,
|
||||
),
|
||||
)
|
||||
.map((subscription: any) => [
|
||||
`${String(subscription.plesk_instance_id)}:${String(subscription.plesk_subscription_id)}`,
|
||||
subscription?.status ? String(subscription.status) : null,
|
||||
]),
|
||||
);
|
||||
|
||||
const subscriptionStatusByInstanceAndName = new Map<string, string | null>(
|
||||
(domainSubscriptions ?? [])
|
||||
.filter((subscription: any) =>
|
||||
Boolean(subscription?.plesk_instance_id && subscription?.name),
|
||||
)
|
||||
.map((subscription: any) => [
|
||||
`${String(subscription.plesk_instance_id)}:${normalizeDomainLike(String(subscription.name))}`,
|
||||
subscription?.status ? String(subscription.status) : null,
|
||||
]),
|
||||
);
|
||||
|
||||
const subscriptionStatusNameCandidatesByInstance = new Map<
|
||||
string,
|
||||
Array<{ normalizedName: string; status: string | null }>
|
||||
>();
|
||||
|
||||
for (const subscription of domainSubscriptions ?? []) {
|
||||
if (!subscription?.plesk_instance_id || !subscription?.name) continue;
|
||||
|
||||
const instanceId = String(subscription.plesk_instance_id);
|
||||
const existing =
|
||||
subscriptionStatusNameCandidatesByInstance.get(instanceId) ?? [];
|
||||
existing.push({
|
||||
normalizedName: normalizeDomainLike(String(subscription.name)),
|
||||
status: subscription?.status ? String(subscription.status) : null,
|
||||
});
|
||||
subscriptionStatusNameCandidatesByInstance.set(instanceId, existing);
|
||||
}
|
||||
|
||||
const autoSyncByInstance = new Map<
|
||||
string,
|
||||
{ status: string; created_at: string; error_message: string | null }
|
||||
@@ -266,33 +127,6 @@ export default async function DashboardPage() {
|
||||
});
|
||||
}
|
||||
|
||||
const healthEventsByInstance = new Map<
|
||||
string,
|
||||
Array<{
|
||||
id: string;
|
||||
action: string;
|
||||
status: string;
|
||||
created_at: string;
|
||||
error_message: string | null;
|
||||
metadata: unknown;
|
||||
}>
|
||||
>();
|
||||
|
||||
for (const log of healthLogs ?? []) {
|
||||
if (!log.target_id) continue;
|
||||
const existing = healthEventsByInstance.get(log.target_id) ?? [];
|
||||
if (existing.length >= 10) continue;
|
||||
existing.push({
|
||||
id: log.id,
|
||||
action: log.action,
|
||||
status: log.status,
|
||||
created_at: log.created_at,
|
||||
error_message: log.error_message,
|
||||
metadata: log.metadata,
|
||||
});
|
||||
healthEventsByInstance.set(log.target_id, existing);
|
||||
}
|
||||
|
||||
return (
|
||||
<main className="mx-auto flex w-full max-w-6xl flex-col gap-6 px-6 py-8">
|
||||
<header className="flex items-center justify-between">
|
||||
@@ -302,15 +136,7 @@ export default async function DashboardPage() {
|
||||
</h1>
|
||||
<p className="text-sm text-slate-600">Role: {context.role}</p>
|
||||
</div>
|
||||
<div className="flex items-center gap-3">
|
||||
<Link
|
||||
href="/dashboard/activity"
|
||||
className="text-sm text-brand-700 underline"
|
||||
>
|
||||
Activity
|
||||
</Link>
|
||||
<SignOutButton />
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<section className="grid gap-4 md:grid-cols-3">
|
||||
@@ -341,43 +167,8 @@ export default async function DashboardPage() {
|
||||
<DashboardControls
|
||||
instances={instances ?? []}
|
||||
subscriptions={subscriptions ?? []}
|
||||
domains={(domains ?? []).map((domain) => {
|
||||
const joinedStatusByLocalId = domain.subscription_id
|
||||
? subscriptionStatusById.get(domain.subscription_id)
|
||||
: null;
|
||||
const joinedStatusByExternalId = domain.external_subscription_id
|
||||
? subscriptionStatusByExternalId.get(
|
||||
`${domain.plesk_instance_id}:${domain.external_subscription_id}`,
|
||||
)
|
||||
: null;
|
||||
const joinedStatusByName = subscriptionStatusByInstanceAndName.get(
|
||||
`${domain.plesk_instance_id}:${normalizeDomainLike(domain.domain_name)}`,
|
||||
);
|
||||
const joinedStatusBySuffix = findBestSuffixStatusMatch(
|
||||
normalizeDomainLike(domain.domain_name),
|
||||
subscriptionStatusNameCandidatesByInstance.get(
|
||||
domain.plesk_instance_id,
|
||||
) ?? [],
|
||||
);
|
||||
const joinedStatus =
|
||||
joinedStatusByLocalId ??
|
||||
joinedStatusByExternalId ??
|
||||
joinedStatusByName ??
|
||||
joinedStatusBySuffix;
|
||||
|
||||
return {
|
||||
...domain,
|
||||
status: joinedStatus ?? "unknown",
|
||||
subscription_name: domain.subscription_id
|
||||
? (subscriptionDisplayNameById.get(domain.subscription_id) ??
|
||||
null)
|
||||
: null,
|
||||
};
|
||||
})}
|
||||
domains={domains ?? []}
|
||||
autoSyncByInstance={Object.fromEntries(autoSyncByInstance.entries())}
|
||||
healthEventsByInstance={Object.fromEntries(
|
||||
healthEventsByInstance.entries(),
|
||||
)}
|
||||
/>
|
||||
</main>
|
||||
);
|
||||
|
||||
@@ -18,20 +18,6 @@ type Instance = {
|
||||
last_sync_error: string | null;
|
||||
last_sync_subscriptions: number;
|
||||
last_sync_domains: number;
|
||||
auto_sync_enabled: boolean;
|
||||
auto_sync_frequency_minutes: number;
|
||||
last_auto_sync_at: string | null;
|
||||
next_auto_sync_at: string | null;
|
||||
auto_sync_lock_until: string | null;
|
||||
health_enabled: boolean;
|
||||
health_status: "ok" | "degraded" | "down" | "unknown";
|
||||
health_last_checked_at: string | null;
|
||||
health_last_ok_at: string | null;
|
||||
health_last_error: string | null;
|
||||
health_last_latency_ms: number | null;
|
||||
health_check_frequency_minutes: number;
|
||||
health_next_check_at: string | null;
|
||||
health_lock_until: string | null;
|
||||
};
|
||||
|
||||
type Subscription = {
|
||||
@@ -46,7 +32,6 @@ 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;
|
||||
@@ -63,44 +48,8 @@ type Props = {
|
||||
string,
|
||||
{ status: string; created_at: string; error_message: string | null }
|
||||
>;
|
||||
healthEventsByInstance: Record<
|
||||
string,
|
||||
Array<{
|
||||
id: string;
|
||||
action: string;
|
||||
status: string;
|
||||
created_at: string;
|
||||
error_message: string | null;
|
||||
metadata: unknown;
|
||||
}>
|
||||
>;
|
||||
};
|
||||
|
||||
function getHealthBadge(status: string | null) {
|
||||
const normalized = (status ?? "unknown").toLowerCase();
|
||||
|
||||
if (normalized === "ok") {
|
||||
return { label: "OK", className: "bg-emerald-100 text-emerald-700" };
|
||||
}
|
||||
|
||||
if (normalized === "degraded") {
|
||||
return { label: "Degraded", className: "bg-amber-100 text-amber-700" };
|
||||
}
|
||||
|
||||
if (normalized === "down") {
|
||||
return { label: "Down", className: "bg-rose-100 text-rose-700" };
|
||||
}
|
||||
|
||||
return { label: "Unknown", className: "bg-slate-100 text-slate-600" };
|
||||
}
|
||||
|
||||
function mapHealthResult(action: string) {
|
||||
if (action === "health_check_ok") return "ok";
|
||||
if (action === "health_check_degraded") return "degraded";
|
||||
if (action === "health_check_failed") return "failed";
|
||||
return "started";
|
||||
}
|
||||
|
||||
function getDomainStatusBadge(status: string | null) {
|
||||
const normalized = (status ?? "unknown").toLowerCase();
|
||||
|
||||
@@ -123,23 +72,6 @@ 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");
|
||||
@@ -165,9 +97,7 @@ export function DashboardControls({
|
||||
subscriptions,
|
||||
domains,
|
||||
autoSyncByInstance,
|
||||
healthEventsByInstance,
|
||||
}: Props) {
|
||||
const autoSyncFrequencyOptions = [15, 30, 60, 180, 360, 1440];
|
||||
const [instanceName, setInstanceName] = useState("");
|
||||
const [baseUrl, setBaseUrl] = useState("");
|
||||
const [authType, setAuthType] = useState<"api_key" | "basic">("api_key");
|
||||
@@ -291,41 +221,6 @@ export function DashboardControls({
|
||||
}
|
||||
}
|
||||
|
||||
async function onRunHealthCheck(instanceId: string) {
|
||||
setLoading(true);
|
||||
setMessage(null);
|
||||
try {
|
||||
await runRequest(`/api/plesk/instances/${instanceId}/health`);
|
||||
setMessage("Health check completed.");
|
||||
window.location.reload();
|
||||
} catch (error) {
|
||||
setMessage(
|
||||
error instanceof Error ? error.message : "Health check failed",
|
||||
);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function onUpdateAutoSync(
|
||||
instanceId: string,
|
||||
input: { auto_sync_enabled: boolean; auto_sync_frequency_minutes: number },
|
||||
) {
|
||||
setLoading(true);
|
||||
setMessage(null);
|
||||
try {
|
||||
await runRequest(`/api/plesk/instances/${instanceId}/autosync`, input);
|
||||
setMessage("Auto-sync settings updated.");
|
||||
window.location.reload();
|
||||
} catch (error) {
|
||||
setMessage(
|
||||
error instanceof Error ? error.message : "Auto-sync update failed",
|
||||
);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function onSubscriptionAction() {
|
||||
if (!actionSubId) return;
|
||||
setLoading(true);
|
||||
@@ -344,23 +239,13 @@ export function DashboardControls({
|
||||
}
|
||||
|
||||
async function onDomainAction(
|
||||
domain: Domain,
|
||||
domainId: string,
|
||||
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/${domain.id}/action`, {
|
||||
action,
|
||||
subscription_id: domain.subscription_id,
|
||||
});
|
||||
await runRequest(`/api/plesk/domains/${domainId}/action`, { action });
|
||||
setMessage("Domain action completed.");
|
||||
window.location.reload();
|
||||
} catch (error) {
|
||||
@@ -504,17 +389,12 @@ export function DashboardControls({
|
||||
key={instance.id}
|
||||
className="rounded border border-slate-200 p-3"
|
||||
>
|
||||
{(() => {
|
||||
const health = getHealthBadge(instance.health_status);
|
||||
|
||||
return (
|
||||
<div className="flex items-start justify-between gap-2">
|
||||
<div>
|
||||
{autoSyncByInstance[instance.id] ? (
|
||||
<span
|
||||
className={`inline-flex rounded px-2 py-0.5 text-[11px] font-medium ${
|
||||
autoSyncByInstance[instance.id].status ===
|
||||
"success"
|
||||
autoSyncByInstance[instance.id].status === "success"
|
||||
? "bg-emerald-100 text-emerald-700"
|
||||
: "bg-rose-100 text-rose-700"
|
||||
}`}
|
||||
@@ -530,32 +410,10 @@ export function DashboardControls({
|
||||
</p>
|
||||
<p className="mt-1 text-xs text-slate-600">
|
||||
Status:{" "}
|
||||
<span className="font-medium">
|
||||
{instance.status}
|
||||
</span>
|
||||
<span className="font-medium">{instance.status}</span>
|
||||
</p>
|
||||
<p className="text-xs text-slate-500">
|
||||
Health:{" "}
|
||||
<span
|
||||
title={instance.health_last_error ?? undefined}
|
||||
className={`inline-flex rounded px-2 py-0.5 text-[11px] font-medium ${health.className}`}
|
||||
>
|
||||
{health.label}
|
||||
</span>
|
||||
</p>
|
||||
<p className="text-xs text-slate-500">
|
||||
Health last checked:{" "}
|
||||
{formatDateTime(instance.health_last_checked_at)}
|
||||
</p>
|
||||
<p className="text-xs text-slate-500">
|
||||
Health latency:{" "}
|
||||
{instance.health_last_latency_ms != null
|
||||
? `${instance.health_last_latency_ms} ms`
|
||||
: "—"}
|
||||
</p>
|
||||
<p className="text-xs text-slate-500">
|
||||
Subscriptions:{" "}
|
||||
{instance.last_sync_subscriptions ?? 0}
|
||||
Subscriptions: {instance.last_sync_subscriptions ?? 0}
|
||||
</p>
|
||||
<p className="text-xs text-slate-500">
|
||||
Domains: {instance.last_sync_domains ?? 0}
|
||||
@@ -576,8 +434,7 @@ export function DashboardControls({
|
||||
</span>
|
||||
</p>
|
||||
<p className="text-xs text-slate-500">
|
||||
Last sync time:{" "}
|
||||
{formatDateTime(instance.last_sync_at)}
|
||||
Last sync time: {formatDateTime(instance.last_sync_at)}
|
||||
</p>
|
||||
<p className="text-xs text-slate-500">
|
||||
Last connected:{" "}
|
||||
@@ -585,32 +442,6 @@ export function DashboardControls({
|
||||
? formatDateTime(instance.last_connected_at)
|
||||
: "never"}
|
||||
</p>
|
||||
<p className="text-xs text-slate-500">
|
||||
Auto-sync:{" "}
|
||||
{instance.auto_sync_enabled
|
||||
? "Enabled"
|
||||
: "Disabled"}
|
||||
</p>
|
||||
<p className="text-xs text-slate-500">
|
||||
Auto-sync frequency:{" "}
|
||||
{instance.auto_sync_frequency_minutes ?? 60} min
|
||||
</p>
|
||||
<p className="text-xs text-slate-500">
|
||||
Last auto-sync:{" "}
|
||||
{formatDateTime(instance.last_auto_sync_at)}
|
||||
</p>
|
||||
<p className="text-xs text-slate-500">
|
||||
Next auto-sync:{" "}
|
||||
{formatDateTime(instance.next_auto_sync_at)}
|
||||
</p>
|
||||
<p className="text-xs text-slate-500">
|
||||
Lock status:{" "}
|
||||
{instance.auto_sync_lock_until &&
|
||||
new Date(instance.auto_sync_lock_until).getTime() >
|
||||
Date.now()
|
||||
? "Sync in progress"
|
||||
: "Idle"}
|
||||
</p>
|
||||
{autoSyncByInstance[instance.id] ? (
|
||||
<p className="text-xs text-slate-500">
|
||||
Last auto-sync:{" "}
|
||||
@@ -635,54 +466,8 @@ export function DashboardControls({
|
||||
{autoSyncByInstance[instance.id].error_message}
|
||||
</p>
|
||||
) : null}
|
||||
{instance.health_last_error ? (
|
||||
<p
|
||||
className="mt-1 text-xs text-rose-600"
|
||||
title={instance.health_last_error}
|
||||
>
|
||||
Health error: {instance.health_last_error}
|
||||
</p>
|
||||
) : null}
|
||||
</div>
|
||||
<div className="flex flex-col gap-2">
|
||||
<div className="flex items-center gap-2">
|
||||
<label className="text-xs text-slate-600">
|
||||
Auto-sync
|
||||
</label>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={instance.auto_sync_enabled}
|
||||
onChange={(e: ChangeEvent<HTMLInputElement>) =>
|
||||
onUpdateAutoSync(instance.id, {
|
||||
auto_sync_enabled: e.target.checked,
|
||||
auto_sync_frequency_minutes:
|
||||
instance.auto_sync_frequency_minutes ?? 60,
|
||||
})
|
||||
}
|
||||
disabled={loading}
|
||||
/>
|
||||
</div>
|
||||
<select
|
||||
value={String(
|
||||
instance.auto_sync_frequency_minutes ?? 60,
|
||||
)}
|
||||
onChange={(e: ChangeEvent<HTMLSelectElement>) =>
|
||||
onUpdateAutoSync(instance.id, {
|
||||
auto_sync_enabled: instance.auto_sync_enabled,
|
||||
auto_sync_frequency_minutes: Number(
|
||||
e.target.value,
|
||||
),
|
||||
})
|
||||
}
|
||||
disabled={loading}
|
||||
className="rounded border px-2 py-1 text-xs"
|
||||
>
|
||||
{autoSyncFrequencyOptions.map((minutes) => (
|
||||
<option key={minutes} value={minutes}>
|
||||
Every {minutes} min
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
<button
|
||||
onClick={() => onTestConnection(instance.id)}
|
||||
disabled={loading}
|
||||
@@ -690,13 +475,6 @@ export function DashboardControls({
|
||||
>
|
||||
Test Connection
|
||||
</button>
|
||||
<button
|
||||
onClick={() => onRunHealthCheck(instance.id)}
|
||||
disabled={loading}
|
||||
className="rounded border px-3 py-1.5 text-xs"
|
||||
>
|
||||
Run Health Check
|
||||
</button>
|
||||
<button
|
||||
onClick={() => onSync(instance.id)}
|
||||
disabled={loading}
|
||||
@@ -706,108 +484,6 @@ export function DashboardControls({
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
})()}
|
||||
|
||||
<div className="mt-3 rounded border border-slate-100 bg-slate-50 p-3">
|
||||
<p className="text-xs font-semibold uppercase tracking-wide text-slate-600">
|
||||
Health Panel
|
||||
</p>
|
||||
<div className="mt-2 grid gap-1 text-xs text-slate-600 sm:grid-cols-2">
|
||||
<p>
|
||||
Current Status:{" "}
|
||||
<span className="font-medium">
|
||||
{getHealthBadge(instance.health_status).label}
|
||||
</span>
|
||||
</p>
|
||||
<p>
|
||||
Last Checked:{" "}
|
||||
<span className="font-medium">
|
||||
{formatDateTime(instance.health_last_checked_at)}
|
||||
</span>
|
||||
</p>
|
||||
<p>
|
||||
Last Successful Check:{" "}
|
||||
<span className="font-medium">
|
||||
{formatDateTime(instance.health_last_ok_at)}
|
||||
</span>
|
||||
</p>
|
||||
<p>
|
||||
Latency:{" "}
|
||||
<span className="font-medium">
|
||||
{instance.health_last_latency_ms != null
|
||||
? `${instance.health_last_latency_ms} ms`
|
||||
: "—"}
|
||||
</span>
|
||||
</p>
|
||||
<p className="sm:col-span-2">
|
||||
Last Error:{" "}
|
||||
<span className="font-medium">
|
||||
{instance.health_last_error ?? "—"}
|
||||
</span>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="mt-3 overflow-x-auto">
|
||||
<table className="min-w-full text-left text-xs">
|
||||
<thead>
|
||||
<tr className="border-b border-slate-200 text-slate-500">
|
||||
<th className="px-2 py-1">Time</th>
|
||||
<th className="px-2 py-1">Event</th>
|
||||
<th className="px-2 py-1">Result</th>
|
||||
<th className="px-2 py-1">Message</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{(healthEventsByInstance[instance.id] ?? [])
|
||||
.length === 0 ? (
|
||||
<tr>
|
||||
<td
|
||||
className="px-2 py-2 text-slate-500"
|
||||
colSpan={4}
|
||||
>
|
||||
No health events yet.
|
||||
</td>
|
||||
</tr>
|
||||
) : (
|
||||
(healthEventsByInstance[instance.id] ?? []).map(
|
||||
(event) => (
|
||||
<tr
|
||||
key={event.id}
|
||||
className="border-b border-slate-100 align-top"
|
||||
>
|
||||
<td className="px-2 py-1">
|
||||
{formatDateTime(event.created_at)}
|
||||
</td>
|
||||
<td className="px-2 py-1">{event.action}</td>
|
||||
<td className="px-2 py-1">
|
||||
{mapHealthResult(event.action)}
|
||||
</td>
|
||||
<td className="px-2 py-1">
|
||||
{event.error_message ?? "—"}
|
||||
{event.metadata ? (
|
||||
<details>
|
||||
<summary className="cursor-pointer text-[11px] text-brand-700">
|
||||
metadata
|
||||
</summary>
|
||||
<pre className="mt-1 max-w-[440px] overflow-auto rounded bg-white p-2 text-[10px] text-slate-700">
|
||||
{JSON.stringify(
|
||||
event.metadata,
|
||||
null,
|
||||
2,
|
||||
)}
|
||||
</pre>
|
||||
</details>
|
||||
) : null}
|
||||
</td>
|
||||
</tr>
|
||||
),
|
||||
)
|
||||
)}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
))
|
||||
)}
|
||||
@@ -932,26 +608,16 @@ export function DashboardControls({
|
||||
{domain.domain_name}
|
||||
</a>
|
||||
{domain.subscription_id ? (
|
||||
<p
|
||||
className="text-xs font-normal text-slate-500"
|
||||
title={`Subscription UUID: ${domain.subscription_id}`}
|
||||
>
|
||||
Subscription: {domain.subscription_name ?? "Linked"}
|
||||
<p className="text-xs font-normal text-slate-500">
|
||||
Subscription: {domain.subscription_id}
|
||||
</p>
|
||||
) : (
|
||||
<p
|
||||
className="text-xs font-normal text-amber-700"
|
||||
title="Run sync to link this domain to a subscription"
|
||||
>
|
||||
Subscription: Unlinked
|
||||
</p>
|
||||
)}
|
||||
) : null}
|
||||
</td>
|
||||
<td className="px-2 py-2">
|
||||
<span
|
||||
className={`inline-flex rounded px-2 py-0.5 text-xs font-medium ${getDomainStatusBadge(domain.status)}`}
|
||||
>
|
||||
{formatDomainStatusLabel(domain.status)}
|
||||
{domain.status ?? "unknown"}
|
||||
</span>
|
||||
</td>
|
||||
<td className="px-2 py-2">
|
||||
@@ -967,33 +633,19 @@ export function DashboardControls({
|
||||
<td className="px-2 py-2">
|
||||
<div className="flex gap-2">
|
||||
<button
|
||||
onClick={() => onDomainAction(domain, "suspend")}
|
||||
onClick={() => onDomainAction(domain.id, "suspend")}
|
||||
disabled={
|
||||
loading ||
|
||||
!domain.subscription_id ||
|
||||
isDomainSuspended(domain.status)
|
||||
}
|
||||
title={
|
||||
!domain.subscription_id
|
||||
? "Not linked to a subscription yet — run sync"
|
||||
: undefined
|
||||
loading || isDomainSuspended(domain.status)
|
||||
}
|
||||
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={() => onDomainAction(domain, "unsuspend")}
|
||||
disabled={
|
||||
loading ||
|
||||
!domain.subscription_id ||
|
||||
isDomainActive(domain.status)
|
||||
}
|
||||
title={
|
||||
!domain.subscription_id
|
||||
? "Not linked to a subscription yet — run sync"
|
||||
: undefined
|
||||
onClick={() =>
|
||||
onDomainAction(domain.id, "unsuspend")
|
||||
}
|
||||
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
|
||||
|
||||
@@ -1,202 +0,0 @@
|
||||
# Cline Development Super Prompt
|
||||
|
||||
You are acting as a senior software engineer working on this repository.
|
||||
|
||||
Before making any modifications you must understand the project structure and current implementation.
|
||||
|
||||
Always read:
|
||||
|
||||
`docs/ai-project-context.md`
|
||||
|
||||
before implementing tasks.
|
||||
|
||||
---
|
||||
|
||||
## Working Method
|
||||
|
||||
When given a task follow this process.
|
||||
|
||||
Step 1
|
||||
Search the repository for relevant code.
|
||||
|
||||
Step 2
|
||||
Identify the correct extension point for the feature.
|
||||
|
||||
Step 3
|
||||
Design the minimal safe implementation.
|
||||
|
||||
Step 4
|
||||
Modify only the required files.
|
||||
|
||||
Step 5
|
||||
Verify existing functionality remains intact.
|
||||
|
||||
Never rewrite large parts of the system unless explicitly instructed.
|
||||
|
||||
---
|
||||
|
||||
## Repository Exploration Rules
|
||||
|
||||
Before editing files:
|
||||
|
||||
Search for related implementations.
|
||||
|
||||
Look for:
|
||||
|
||||
- plesk integration
|
||||
- sync logic
|
||||
- API routes
|
||||
- database queries
|
||||
- dashboard components
|
||||
|
||||
Use existing patterns instead of creating new ones.
|
||||
|
||||
---
|
||||
|
||||
## Database Rules
|
||||
|
||||
The project uses Supabase Postgres.
|
||||
|
||||
Never introduce breaking schema changes.
|
||||
|
||||
All schema updates must be done using safe migrations.
|
||||
|
||||
Never remove columns that may contain production data.
|
||||
|
||||
Always assume the database already contains data.
|
||||
|
||||
---
|
||||
|
||||
## Multi-Tenant Security
|
||||
|
||||
This system is multi-tenant.
|
||||
|
||||
Users belong to agencies.
|
||||
|
||||
All queries must respect agency boundaries.
|
||||
|
||||
Never bypass Supabase Row Level Security.
|
||||
|
||||
Never expose data across agencies.
|
||||
|
||||
---
|
||||
|
||||
## Plesk Integration Safety
|
||||
|
||||
The platform interacts with Plesk servers using both REST API and CLI commands.
|
||||
|
||||
CLI output can vary between Plesk versions.
|
||||
|
||||
Always parse CLI output defensively.
|
||||
|
||||
Never assume fixed output formatting.
|
||||
|
||||
External integration failures must not crash the application.
|
||||
|
||||
---
|
||||
|
||||
## Sync Pipeline Rules
|
||||
|
||||
The sync system is critical to the platform.
|
||||
|
||||
Never break existing sync behaviour.
|
||||
|
||||
If one subscription fails during sync:
|
||||
|
||||
Continue processing the rest.
|
||||
|
||||
Log the failure.
|
||||
|
||||
Do not abort the entire sync job.
|
||||
|
||||
---
|
||||
|
||||
## Logging Requirements
|
||||
|
||||
Operational events should be written to:
|
||||
|
||||
`actions_log`
|
||||
|
||||
Examples include:
|
||||
|
||||
- instance_connected
|
||||
- sync_started
|
||||
- sync_completed
|
||||
- subscription_suspended
|
||||
- subscription_unsuspended
|
||||
|
||||
Logging errors must never break primary workflows.
|
||||
|
||||
---
|
||||
|
||||
## UI Safety
|
||||
|
||||
Frontend components must:
|
||||
|
||||
Handle missing or null data safely.
|
||||
|
||||
Avoid crashing when API responses change.
|
||||
|
||||
Display statuses using badges instead of raw text.
|
||||
|
||||
---
|
||||
|
||||
## Git Workflow
|
||||
|
||||
The repository uses:
|
||||
|
||||
`master` as the default branch.
|
||||
|
||||
All development must occur in feature branches.
|
||||
|
||||
Example workflow:
|
||||
|
||||
```bash
|
||||
git checkout master
|
||||
git pull
|
||||
git checkout -b feature/<feature-name>
|
||||
```
|
||||
|
||||
Commit frequently with clear commit messages.
|
||||
|
||||
Never commit directly to master.
|
||||
|
||||
---
|
||||
|
||||
## Implementation Guidelines
|
||||
|
||||
Prefer small modular changes.
|
||||
|
||||
Avoid large refactors unless requested.
|
||||
|
||||
Keep API routes lightweight.
|
||||
|
||||
Place integration logic inside lib folders.
|
||||
|
||||
Reuse existing utilities where possible.
|
||||
|
||||
---
|
||||
|
||||
## Error Handling
|
||||
|
||||
External services can fail.
|
||||
|
||||
Always implement safe error handling.
|
||||
|
||||
Prefer returning partial results over failing the entire operation.
|
||||
|
||||
Log unexpected behaviour.
|
||||
|
||||
---
|
||||
|
||||
## Expected Output
|
||||
|
||||
When implementing tasks you should:
|
||||
|
||||
Modify only the required files.
|
||||
|
||||
Maintain existing architecture.
|
||||
|
||||
Add clear commit messages.
|
||||
|
||||
Ensure the application remains stable.
|
||||
@@ -14,7 +14,6 @@ for (const key of requiredEnvs) {
|
||||
export const env = {
|
||||
appUrl: process.env.NEXT_PUBLIC_APP_URL ?? "http://localhost:3000",
|
||||
jobSecret: process.env.JOB_SECRET ?? "",
|
||||
cronSecret: process.env.CRON_SECRET ?? "",
|
||||
encryptionKey: process.env.ENCRYPTION_KEY ?? "",
|
||||
pleskCredEncKey: process.env.PLESK_CRED_ENC_KEY ?? "",
|
||||
stripeSecretKey: process.env.STRIPE_SECRET_KEY ?? "",
|
||||
|
||||
@@ -1,232 +0,0 @@
|
||||
import { randomUUID } from "crypto";
|
||||
|
||||
import { syncPleskInstance } from "@/lib/plesk/sync";
|
||||
|
||||
type SupabaseLike = any;
|
||||
|
||||
type AutoSyncInstance = {
|
||||
id: string;
|
||||
agency_id: string;
|
||||
base_url: string;
|
||||
auth_type: "api_key" | "basic";
|
||||
encrypted_secret: string;
|
||||
last_connected_at: string | null;
|
||||
auto_sync_enabled: boolean;
|
||||
auto_sync_frequency_minutes: number | null;
|
||||
next_auto_sync_at: string | null;
|
||||
auto_sync_lock_until: string | null;
|
||||
};
|
||||
|
||||
type AutoSyncSummary = {
|
||||
instances_considered: number;
|
||||
locks_acquired: number;
|
||||
succeeded: number;
|
||||
failed: number;
|
||||
duration_ms: number;
|
||||
};
|
||||
|
||||
const MAX_INSTANCES_PER_TICK = 5;
|
||||
const MAX_CONCURRENCY = 2;
|
||||
const LOCK_LEASE_SECONDS = 15 * 60;
|
||||
const INSTANCE_TIMEOUT_MS = 14 * 60 * 1000;
|
||||
|
||||
function isDue(instance: AutoSyncInstance, now: number) {
|
||||
if (!instance.next_auto_sync_at) return true;
|
||||
const dueAt = new Date(instance.next_auto_sync_at).getTime();
|
||||
return Number.isFinite(dueAt) && dueAt <= now;
|
||||
}
|
||||
|
||||
function isUnlocked(instance: AutoSyncInstance, now: number) {
|
||||
if (!instance.auto_sync_lock_until) return true;
|
||||
const lockUntil = new Date(instance.auto_sync_lock_until).getTime();
|
||||
return !Number.isFinite(lockUntil) || lockUntil <= now;
|
||||
}
|
||||
|
||||
async function insertActionLogBestEffort(
|
||||
supabase: SupabaseLike,
|
||||
payload: Record<string, unknown>,
|
||||
) {
|
||||
try {
|
||||
const { error } = await supabase.from("actions_log").insert(payload);
|
||||
if (error) {
|
||||
console.error("[autosync] actions_log insert failed", error.message);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("[autosync] actions_log insert threw", error);
|
||||
}
|
||||
}
|
||||
|
||||
async function withTimeout<T>(
|
||||
promise: Promise<T>,
|
||||
timeoutMs: number,
|
||||
): Promise<T> {
|
||||
let timeout: ReturnType<typeof setTimeout> | null = null;
|
||||
|
||||
const timeoutPromise = new Promise<never>((_, reject) => {
|
||||
timeout = setTimeout(() => {
|
||||
reject(new Error("Auto-sync timed out"));
|
||||
}, timeoutMs);
|
||||
});
|
||||
|
||||
try {
|
||||
return await Promise.race([promise, timeoutPromise]);
|
||||
} finally {
|
||||
if (timeout) clearTimeout(timeout);
|
||||
}
|
||||
}
|
||||
|
||||
export async function runAutoSyncTick(
|
||||
supabase: SupabaseLike,
|
||||
): Promise<AutoSyncSummary> {
|
||||
const startedAt = Date.now();
|
||||
const now = Date.now();
|
||||
|
||||
const { data: rows, error } = await supabase
|
||||
.from("plesk_instances")
|
||||
.select(
|
||||
"id, agency_id, base_url, auth_type, encrypted_secret, last_connected_at, auto_sync_enabled, auto_sync_frequency_minutes, next_auto_sync_at, auto_sync_lock_until",
|
||||
)
|
||||
.eq("status", "connected")
|
||||
.eq("auto_sync_enabled", true)
|
||||
.order("next_auto_sync_at", { ascending: true, nullsFirst: true })
|
||||
.limit(50);
|
||||
|
||||
if (error) {
|
||||
throw new Error(error.message);
|
||||
}
|
||||
|
||||
const eligible = ((rows ?? []) as AutoSyncInstance[])
|
||||
.filter((instance) => isDue(instance, now) && isUnlocked(instance, now))
|
||||
.slice(0, MAX_INSTANCES_PER_TICK);
|
||||
|
||||
let locksAcquired = 0;
|
||||
let succeeded = 0;
|
||||
let failed = 0;
|
||||
|
||||
const queue = [...eligible];
|
||||
|
||||
async function processInstance(instance: AutoSyncInstance) {
|
||||
const lockToken = randomUUID();
|
||||
const { data: lockAcquired, error: lockError } = await supabase.rpc(
|
||||
"acquire_instance_auto_sync_lock",
|
||||
{
|
||||
p_instance_id: instance.id,
|
||||
p_lock_token: lockToken,
|
||||
p_ttl_seconds: LOCK_LEASE_SECONDS,
|
||||
},
|
||||
);
|
||||
|
||||
if (lockError || !lockAcquired) return;
|
||||
locksAcquired += 1;
|
||||
|
||||
const perInstanceStartedAt = Date.now();
|
||||
const frequencyMinutes = Math.max(
|
||||
instance.auto_sync_frequency_minutes ?? 60,
|
||||
5,
|
||||
);
|
||||
|
||||
await insertActionLogBestEffort(supabase, {
|
||||
agency_id: instance.agency_id,
|
||||
actor_user_id: null,
|
||||
target_type: "plesk_instance",
|
||||
target_id: instance.id,
|
||||
action: "autosync_started",
|
||||
status: "pending",
|
||||
metadata: {
|
||||
instance_id: instance.id,
|
||||
lock_token: lockToken,
|
||||
frequency_minutes: frequencyMinutes,
|
||||
},
|
||||
});
|
||||
|
||||
try {
|
||||
await withTimeout(
|
||||
syncPleskInstance(supabase, instance, null, "autosync"),
|
||||
INSTANCE_TIMEOUT_MS,
|
||||
);
|
||||
|
||||
succeeded += 1;
|
||||
|
||||
await insertActionLogBestEffort(supabase, {
|
||||
agency_id: instance.agency_id,
|
||||
actor_user_id: null,
|
||||
target_type: "plesk_instance",
|
||||
target_id: instance.id,
|
||||
action: "autosync_completed",
|
||||
status: "success",
|
||||
metadata: {
|
||||
instance_id: instance.id,
|
||||
lock_token: lockToken,
|
||||
duration_ms: Date.now() - perInstanceStartedAt,
|
||||
},
|
||||
});
|
||||
} catch (syncError) {
|
||||
failed += 1;
|
||||
|
||||
const errorMessage =
|
||||
syncError instanceof Error
|
||||
? syncError.message.slice(0, 500)
|
||||
: "autosync_failed";
|
||||
|
||||
await insertActionLogBestEffort(supabase, {
|
||||
agency_id: instance.agency_id,
|
||||
actor_user_id: null,
|
||||
target_type: "plesk_instance",
|
||||
target_id: instance.id,
|
||||
action: "autosync_failed",
|
||||
status: "failed",
|
||||
error_message: errorMessage,
|
||||
metadata: {
|
||||
instance_id: instance.id,
|
||||
lock_token: lockToken,
|
||||
duration_ms: Date.now() - perInstanceStartedAt,
|
||||
error_summary: errorMessage,
|
||||
},
|
||||
});
|
||||
} finally {
|
||||
const nowIso = new Date().toISOString();
|
||||
const nextAutoSyncAtIso = new Date(
|
||||
Date.now() + frequencyMinutes * 60 * 1000,
|
||||
).toISOString();
|
||||
|
||||
const { error: scheduleError } = await supabase
|
||||
.from("plesk_instances")
|
||||
.update({
|
||||
last_auto_sync_at: nowIso,
|
||||
next_auto_sync_at: nextAutoSyncAtIso,
|
||||
auto_sync_lock_until: null,
|
||||
auto_sync_lock_token: null,
|
||||
})
|
||||
.eq("id", instance.id)
|
||||
.eq("auto_sync_lock_token", lockToken);
|
||||
|
||||
if (scheduleError) {
|
||||
console.error(
|
||||
"[autosync] schedule update failed",
|
||||
scheduleError.message,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const workers = Array.from(
|
||||
{ length: Math.min(MAX_CONCURRENCY, queue.length) },
|
||||
async () => {
|
||||
while (queue.length > 0) {
|
||||
const instance = queue.shift();
|
||||
if (!instance) break;
|
||||
await processInstance(instance);
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
await Promise.all(workers);
|
||||
|
||||
return {
|
||||
instances_considered: eligible.length,
|
||||
locks_acquired: locksAcquired,
|
||||
succeeded,
|
||||
failed,
|
||||
duration_ms: Date.now() - startedAt,
|
||||
};
|
||||
}
|
||||
@@ -289,7 +289,7 @@ export async function unsuspendPleskSubscription(
|
||||
subscriptionName: string,
|
||||
) {
|
||||
return pleskCliCall(connection, "subscription", [
|
||||
"--unsuspend",
|
||||
"--webspace-on",
|
||||
subscriptionName,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -1,345 +0,0 @@
|
||||
import { randomUUID } from "crypto";
|
||||
|
||||
import { testPleskConnection } from "@/lib/plesk/client";
|
||||
|
||||
type SupabaseLike = any;
|
||||
|
||||
type HealthStatus = "ok" | "degraded" | "down" | "unknown";
|
||||
|
||||
type HealthInstance = {
|
||||
id: string;
|
||||
agency_id: string;
|
||||
base_url: string;
|
||||
auth_type: "api_key" | "basic";
|
||||
encrypted_secret: string;
|
||||
health_enabled: boolean;
|
||||
health_check_frequency_minutes: number | null;
|
||||
health_next_check_at: string | null;
|
||||
health_lock_until: string | null;
|
||||
};
|
||||
|
||||
type HealthCheckResult = {
|
||||
status: Exclude<HealthStatus, "unknown">;
|
||||
latency_ms: number;
|
||||
error_message: string | null;
|
||||
};
|
||||
|
||||
type RunSingleHealthCheckResult = {
|
||||
checked: boolean;
|
||||
status?: Exclude<HealthStatus, "unknown">;
|
||||
latency_ms?: number;
|
||||
error_message?: string | null;
|
||||
};
|
||||
|
||||
export type HealthTickSummary = {
|
||||
checked: number;
|
||||
ok: number;
|
||||
degraded: number;
|
||||
failed: number;
|
||||
duration_ms: number;
|
||||
};
|
||||
|
||||
const MAX_INSTANCES_PER_TICK = 10;
|
||||
const MAX_CONCURRENCY = 3;
|
||||
const LOCK_LEASE_SECONDS = 5 * 60;
|
||||
const HEALTH_TIMEOUT_MS = 15_000;
|
||||
const DEGRADED_LATENCY_THRESHOLD_MS = 2_500;
|
||||
|
||||
function isDue(instance: HealthInstance, now: number) {
|
||||
if (!instance.health_next_check_at) return true;
|
||||
const dueAt = new Date(instance.health_next_check_at).getTime();
|
||||
return Number.isFinite(dueAt) && dueAt <= now;
|
||||
}
|
||||
|
||||
function isUnlocked(instance: HealthInstance, now: number) {
|
||||
if (!instance.health_lock_until) return true;
|
||||
const lockUntil = new Date(instance.health_lock_until).getTime();
|
||||
return !Number.isFinite(lockUntil) || lockUntil <= now;
|
||||
}
|
||||
|
||||
async function insertActionLogBestEffort(
|
||||
supabase: SupabaseLike,
|
||||
payload: Record<string, unknown>,
|
||||
) {
|
||||
try {
|
||||
const { error } = await supabase.from("actions_log").insert(payload);
|
||||
if (error) {
|
||||
console.error("[health] actions_log insert failed", error.message);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("[health] actions_log insert threw", error);
|
||||
}
|
||||
}
|
||||
|
||||
async function withTimeout<T>(
|
||||
promise: Promise<T>,
|
||||
timeoutMs: number,
|
||||
): Promise<T> {
|
||||
let timeout: ReturnType<typeof setTimeout> | null = null;
|
||||
|
||||
const timeoutPromise = new Promise<never>((_, reject) => {
|
||||
timeout = setTimeout(() => {
|
||||
reject(new Error("Health check timed out"));
|
||||
}, timeoutMs);
|
||||
});
|
||||
|
||||
try {
|
||||
return await Promise.race([promise, timeoutPromise]);
|
||||
} finally {
|
||||
if (timeout) clearTimeout(timeout);
|
||||
}
|
||||
}
|
||||
|
||||
async function checkPleskInstanceHealth(
|
||||
instance: Pick<HealthInstance, "base_url" | "auth_type" | "encrypted_secret">,
|
||||
): Promise<HealthCheckResult> {
|
||||
const startedAt = Date.now();
|
||||
|
||||
try {
|
||||
await withTimeout(
|
||||
testPleskConnection({
|
||||
baseUrl: instance.base_url,
|
||||
authType: instance.auth_type,
|
||||
encryptedSecret: instance.encrypted_secret,
|
||||
}),
|
||||
HEALTH_TIMEOUT_MS,
|
||||
);
|
||||
|
||||
const latencyMs = Date.now() - startedAt;
|
||||
const status: "ok" | "degraded" =
|
||||
latencyMs > DEGRADED_LATENCY_THRESHOLD_MS ? "degraded" : "ok";
|
||||
|
||||
return {
|
||||
status,
|
||||
latency_ms: latencyMs,
|
||||
error_message: null,
|
||||
};
|
||||
} catch (error) {
|
||||
return {
|
||||
status: "down",
|
||||
latency_ms: Date.now() - startedAt,
|
||||
error_message:
|
||||
error instanceof Error
|
||||
? error.message.slice(0, 1000)
|
||||
: "health_check_failed",
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
export async function runInstanceHealthCheck(
|
||||
supabase: SupabaseLike,
|
||||
instance: HealthInstance,
|
||||
input?: {
|
||||
actorUserId?: string | null;
|
||||
force?: boolean;
|
||||
source?: "cron" | "manual";
|
||||
},
|
||||
): Promise<RunSingleHealthCheckResult> {
|
||||
const lockToken = randomUUID();
|
||||
const actorUserId = input?.actorUserId ?? null;
|
||||
const source = input?.source ?? "cron";
|
||||
|
||||
const { data: lockAcquired, error: lockError } = await supabase.rpc(
|
||||
"acquire_instance_health_lock",
|
||||
{
|
||||
p_instance_id: instance.id,
|
||||
p_lock_token: lockToken,
|
||||
p_ttl_seconds: LOCK_LEASE_SECONDS,
|
||||
p_force: Boolean(input?.force),
|
||||
},
|
||||
);
|
||||
|
||||
if (lockError || !lockAcquired) {
|
||||
return { checked: false };
|
||||
}
|
||||
|
||||
const startedAt = Date.now();
|
||||
const nowIso = new Date().toISOString();
|
||||
const frequencyMinutes = Math.max(
|
||||
instance.health_check_frequency_minutes ?? 30,
|
||||
5,
|
||||
);
|
||||
const nextCheckAtIso = new Date(
|
||||
Date.now() + frequencyMinutes * 60 * 1000,
|
||||
).toISOString();
|
||||
|
||||
await insertActionLogBestEffort(supabase, {
|
||||
agency_id: instance.agency_id,
|
||||
actor_user_id: actorUserId,
|
||||
target_type: "plesk_instance",
|
||||
target_id: instance.id,
|
||||
action: "health_check_started",
|
||||
status: "pending",
|
||||
metadata: {
|
||||
instance_id: instance.id,
|
||||
lock_token: lockToken,
|
||||
source,
|
||||
},
|
||||
});
|
||||
|
||||
try {
|
||||
const result = await checkPleskInstanceHealth(instance);
|
||||
|
||||
const updates: Record<string, unknown> = {
|
||||
health_status: result.status,
|
||||
health_last_checked_at: nowIso,
|
||||
health_last_latency_ms: result.latency_ms,
|
||||
health_last_error: result.error_message,
|
||||
health_next_check_at: nextCheckAtIso,
|
||||
health_lock_until: null,
|
||||
health_lock_token: null,
|
||||
};
|
||||
|
||||
if (result.status === "ok") {
|
||||
updates.health_last_ok_at = nowIso;
|
||||
}
|
||||
|
||||
const { error: updateError } = await supabase
|
||||
.from("plesk_instances")
|
||||
.update(updates)
|
||||
.eq("id", instance.id)
|
||||
.eq("health_lock_token", lockToken);
|
||||
|
||||
if (updateError) {
|
||||
throw new Error(updateError.message);
|
||||
}
|
||||
|
||||
const action =
|
||||
result.status === "ok"
|
||||
? "health_check_ok"
|
||||
: result.status === "degraded"
|
||||
? "health_check_degraded"
|
||||
: "health_check_failed";
|
||||
|
||||
await insertActionLogBestEffort(supabase, {
|
||||
agency_id: instance.agency_id,
|
||||
actor_user_id: actorUserId,
|
||||
target_type: "plesk_instance",
|
||||
target_id: instance.id,
|
||||
action,
|
||||
status: result.status === "down" ? "failed" : "success",
|
||||
error_message: result.error_message,
|
||||
metadata: {
|
||||
instance_id: instance.id,
|
||||
lock_token: lockToken,
|
||||
source,
|
||||
latency_ms: result.latency_ms,
|
||||
duration_ms: Date.now() - startedAt,
|
||||
},
|
||||
});
|
||||
|
||||
return {
|
||||
checked: true,
|
||||
status: result.status,
|
||||
latency_ms: result.latency_ms,
|
||||
error_message: result.error_message,
|
||||
};
|
||||
} catch (error) {
|
||||
const errorMessage =
|
||||
error instanceof Error
|
||||
? error.message.slice(0, 1000)
|
||||
: "health_check_failed";
|
||||
|
||||
await supabase
|
||||
.from("plesk_instances")
|
||||
.update({
|
||||
health_status: "down",
|
||||
health_last_checked_at: nowIso,
|
||||
health_last_error: errorMessage,
|
||||
health_next_check_at: nextCheckAtIso,
|
||||
})
|
||||
.eq("id", instance.id);
|
||||
|
||||
await insertActionLogBestEffort(supabase, {
|
||||
agency_id: instance.agency_id,
|
||||
actor_user_id: actorUserId,
|
||||
target_type: "plesk_instance",
|
||||
target_id: instance.id,
|
||||
action: "health_check_failed",
|
||||
status: "failed",
|
||||
error_message: errorMessage,
|
||||
metadata: {
|
||||
instance_id: instance.id,
|
||||
lock_token: lockToken,
|
||||
source,
|
||||
duration_ms: Date.now() - startedAt,
|
||||
},
|
||||
});
|
||||
|
||||
return {
|
||||
checked: true,
|
||||
status: "down",
|
||||
latency_ms: Date.now() - startedAt,
|
||||
error_message: errorMessage,
|
||||
};
|
||||
} finally {
|
||||
await supabase.rpc("release_instance_health_lock", {
|
||||
p_instance_id: instance.id,
|
||||
p_lock_token: lockToken,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
export async function runHealthCheckTick(
|
||||
supabase: SupabaseLike,
|
||||
): Promise<HealthTickSummary> {
|
||||
const startedAt = Date.now();
|
||||
const now = Date.now();
|
||||
|
||||
const { data: rows, error } = await supabase
|
||||
.from("plesk_instances")
|
||||
.select(
|
||||
"id, agency_id, base_url, auth_type, encrypted_secret, health_enabled, health_check_frequency_minutes, health_next_check_at, health_lock_until",
|
||||
)
|
||||
.eq("health_enabled", true)
|
||||
.order("health_next_check_at", { ascending: true, nullsFirst: true })
|
||||
.limit(50);
|
||||
|
||||
if (error) {
|
||||
throw new Error(error.message);
|
||||
}
|
||||
|
||||
const eligible = ((rows ?? []) as HealthInstance[])
|
||||
.filter((instance) => isDue(instance, now) && isUnlocked(instance, now))
|
||||
.slice(0, MAX_INSTANCES_PER_TICK);
|
||||
|
||||
let checked = 0;
|
||||
let ok = 0;
|
||||
let degraded = 0;
|
||||
let failed = 0;
|
||||
|
||||
const queue = [...eligible];
|
||||
|
||||
const workers = Array.from(
|
||||
{ length: Math.min(MAX_CONCURRENCY, queue.length) },
|
||||
async () => {
|
||||
while (queue.length > 0) {
|
||||
const instance = queue.shift();
|
||||
if (!instance) break;
|
||||
|
||||
const result = await runInstanceHealthCheck(supabase, instance, {
|
||||
actorUserId: null,
|
||||
force: false,
|
||||
source: "cron",
|
||||
});
|
||||
|
||||
if (!result.checked || !result.status) continue;
|
||||
|
||||
checked += 1;
|
||||
if (result.status === "ok") ok += 1;
|
||||
else if (result.status === "degraded") degraded += 1;
|
||||
else failed += 1;
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
await Promise.all(workers);
|
||||
|
||||
return {
|
||||
checked,
|
||||
ok,
|
||||
degraded,
|
||||
failed,
|
||||
duration_ms: Date.now() - startedAt,
|
||||
};
|
||||
}
|
||||
@@ -22,34 +22,8 @@ type InstanceRow = Pick<
|
||||
| "last_connected_at"
|
||||
>;
|
||||
|
||||
type LocalSubscriptionLookupRow = {
|
||||
id: string;
|
||||
plesk_subscription_id: string;
|
||||
name: string | null;
|
||||
status: string | null;
|
||||
};
|
||||
|
||||
const MIN_INTERVAL_MS = 3 * 60 * 1000;
|
||||
|
||||
function normalizeDomainLike(value: string) {
|
||||
return value.trim().toLowerCase().replace(/\.$/, "");
|
||||
}
|
||||
|
||||
function findBestSuffixSubscriptionMatch<
|
||||
T extends { normalizedName: string; id: string; status: string | null },
|
||||
>(normalizedDomain: string, candidates: T[]) {
|
||||
let best: T | undefined;
|
||||
|
||||
for (const candidate of candidates) {
|
||||
if (!normalizedDomain.endsWith(`.${candidate.normalizedName}`)) continue;
|
||||
if (!best || candidate.normalizedName.length > best.normalizedName.length) {
|
||||
best = candidate;
|
||||
}
|
||||
}
|
||||
|
||||
return best;
|
||||
}
|
||||
|
||||
export async function syncPleskInstance(
|
||||
supabase: SupabaseLike,
|
||||
instance: InstanceRow,
|
||||
@@ -182,7 +156,7 @@ export async function syncPleskInstance(
|
||||
const { data: localSubscriptions, error: localSubscriptionsError } =
|
||||
await supabase
|
||||
.from("plesk_subscriptions")
|
||||
.select("id, plesk_subscription_id, name, status")
|
||||
.select("id, plesk_subscription_id, status")
|
||||
.eq("agency_id", instance.agency_id)
|
||||
.eq("plesk_instance_id", instance.id);
|
||||
|
||||
@@ -190,116 +164,33 @@ export async function syncPleskInstance(
|
||||
throw new Error(localSubscriptionsError.message);
|
||||
}
|
||||
|
||||
const subscriptionsIndexed = ((localSubscriptions ?? []) as Array<any>)
|
||||
.filter((row): row is LocalSubscriptionLookupRow =>
|
||||
Boolean(row?.plesk_subscription_id && row?.id),
|
||||
)
|
||||
.map((row) => ({
|
||||
id: String(row.id),
|
||||
pleskSubscriptionId: String(row.plesk_subscription_id),
|
||||
status: row?.status ? String(row.status) : null,
|
||||
name: row?.name ? String(row.name) : null,
|
||||
}));
|
||||
|
||||
const subscriptionByExternalId = new Map<
|
||||
string,
|
||||
{
|
||||
id: string;
|
||||
pleskSubscriptionId: string;
|
||||
status: string | null;
|
||||
name: string | null;
|
||||
}
|
||||
>(subscriptionsIndexed.map((row) => [row.pleskSubscriptionId, row]));
|
||||
|
||||
const subscriptionByLocalId = new Map<
|
||||
string,
|
||||
{
|
||||
id: string;
|
||||
pleskSubscriptionId: string;
|
||||
status: string | null;
|
||||
name: string | null;
|
||||
}
|
||||
>(subscriptionsIndexed.map((row) => [row.id, row]));
|
||||
|
||||
const subscriptionByName = new Map<
|
||||
string,
|
||||
{
|
||||
id: string;
|
||||
pleskSubscriptionId: string;
|
||||
status: string | null;
|
||||
name: string | null;
|
||||
}
|
||||
{ id: string; status: string | null }
|
||||
>(
|
||||
subscriptionsIndexed
|
||||
.filter((row) => row.name)
|
||||
.map((row) => [normalizeDomainLike(String(row.name)), row]),
|
||||
(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 subscriptionNameCandidates: Array<{
|
||||
id: string;
|
||||
pleskSubscriptionId: string;
|
||||
status: string | null;
|
||||
normalizedName: string;
|
||||
}> = subscriptionsIndexed
|
||||
.filter((row) => row.name)
|
||||
.map((row) => ({
|
||||
id: row.id,
|
||||
pleskSubscriptionId: row.pleskSubscriptionId,
|
||||
status: row.status,
|
||||
normalizedName: normalizeDomainLike(String(row.name)),
|
||||
}));
|
||||
|
||||
const domainsForUpsert = domainsRaw
|
||||
.map((item: any) => {
|
||||
const domainId = item?.id ?? item?.guid ?? item?.name;
|
||||
const domainName = item?.name ?? item?.domain_name ?? item?.domain;
|
||||
const normalizedDomainName = domainName
|
||||
? normalizeDomainLike(String(domainName))
|
||||
: null;
|
||||
const subExternalId =
|
||||
item?.subscription?.id ?? item?.subscription_id ?? item?.webspace_id;
|
||||
const rawExternalSubscriptionId = subExternalId
|
||||
const externalSubscriptionId = subExternalId
|
||||
? String(subExternalId)
|
||||
: null;
|
||||
const subscriptionNameHint =
|
||||
item?.subscription?.name ??
|
||||
item?.subscription_name ??
|
||||
item?.webspace_name ??
|
||||
item?.webspace ??
|
||||
null;
|
||||
|
||||
const localSubscriptionByExternal = rawExternalSubscriptionId
|
||||
? subscriptionByExternalId.get(rawExternalSubscriptionId)
|
||||
const localSubscription = externalSubscriptionId
|
||||
? subscriptionByExternalId.get(externalSubscriptionId)
|
||||
: undefined;
|
||||
const localSubscriptionByLocalId = rawExternalSubscriptionId
|
||||
? subscriptionByLocalId.get(rawExternalSubscriptionId)
|
||||
: undefined;
|
||||
const localSubscriptionByName = subscriptionNameHint
|
||||
? subscriptionByName.get(
|
||||
normalizeDomainLike(String(subscriptionNameHint)),
|
||||
)
|
||||
: undefined;
|
||||
const localSubscriptionByDomainName = normalizedDomainName
|
||||
? subscriptionByName.get(normalizedDomainName)
|
||||
: undefined;
|
||||
const localSubscriptionBySuffix = normalizedDomainName
|
||||
? findBestSuffixSubscriptionMatch(
|
||||
normalizedDomainName,
|
||||
subscriptionNameCandidates,
|
||||
)
|
||||
: undefined;
|
||||
const localSubscription =
|
||||
localSubscriptionByExternal ??
|
||||
localSubscriptionByLocalId ??
|
||||
localSubscriptionByName ??
|
||||
localSubscriptionByDomainName ??
|
||||
localSubscriptionBySuffix;
|
||||
|
||||
const externalSubscriptionId = localSubscription
|
||||
? localSubscription.pleskSubscriptionId
|
||||
: subscriptionNameHint
|
||||
? String(subscriptionNameHint)
|
||||
: rawExternalSubscriptionId;
|
||||
const rawCreated = item?.created_at ?? item?.created;
|
||||
const sourceCreatedAt = rawCreated
|
||||
? new Date(String(rawCreated)).toISOString()
|
||||
@@ -328,10 +219,6 @@ export async function syncPleskInstance(
|
||||
})
|
||||
.filter(Boolean) as Array<Record<string, unknown>>;
|
||||
|
||||
const unlinkedDomains = domainsForUpsert.filter(
|
||||
(domain) => !domain.subscription_id,
|
||||
);
|
||||
|
||||
if (domainsForUpsert.length > 0) {
|
||||
const { error } = await supabase
|
||||
.from("plesk_domains")
|
||||
@@ -366,10 +253,6 @@ export async function syncPleskInstance(
|
||||
metadata: {
|
||||
subscriptions_seen: subscriptionsRaw.length,
|
||||
domains_seen: domainsRaw.length,
|
||||
unlinked_domains: unlinkedDomains.length,
|
||||
unlinked_domain_samples: unlinkedDomains
|
||||
.slice(0, 25)
|
||||
.map((domain) => String(domain.domain_name ?? "unknown")),
|
||||
},
|
||||
});
|
||||
|
||||
@@ -442,146 +325,3 @@ export async function syncPleskInstance(
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
export async function backfillDomainSubscriptionLinks(
|
||||
supabase: SupabaseLike,
|
||||
input: {
|
||||
agencyId: string;
|
||||
instanceId: string;
|
||||
actorUserId?: string | null;
|
||||
},
|
||||
) {
|
||||
const { agencyId, instanceId, actorUserId } = input;
|
||||
|
||||
const { data: subscriptions, error: subscriptionsError } = await supabase
|
||||
.from("plesk_subscriptions")
|
||||
.select("id, plesk_subscription_id, name, status")
|
||||
.eq("agency_id", agencyId)
|
||||
.eq("plesk_instance_id", instanceId);
|
||||
|
||||
if (subscriptionsError) {
|
||||
throw new Error(subscriptionsError.message);
|
||||
}
|
||||
|
||||
const { data: domains, error: domainsError } = await supabase
|
||||
.from("plesk_domains")
|
||||
.select("id, domain_name, external_subscription_id, subscription_id")
|
||||
.eq("agency_id", agencyId)
|
||||
.eq("plesk_instance_id", instanceId)
|
||||
.is("subscription_id", null);
|
||||
|
||||
if (domainsError) {
|
||||
throw new Error(domainsError.message);
|
||||
}
|
||||
|
||||
const subscriptionByExternalId = new Map<
|
||||
string,
|
||||
{ id: string; status: string }
|
||||
>(
|
||||
(subscriptions ?? [])
|
||||
.filter((subscription: any) => subscription?.plesk_subscription_id)
|
||||
.map((subscription: any) => [
|
||||
String(subscription.plesk_subscription_id),
|
||||
{
|
||||
id: String(subscription.id),
|
||||
status: subscription?.status
|
||||
? String(subscription.status)
|
||||
: "unknown",
|
||||
},
|
||||
]),
|
||||
);
|
||||
|
||||
const subscriptionByName = new Map<string, { id: string; status: string }>(
|
||||
(subscriptions ?? [])
|
||||
.filter((subscription: any) => subscription?.name)
|
||||
.map((subscription: any) => [
|
||||
normalizeDomainLike(String(subscription.name)),
|
||||
{
|
||||
id: String(subscription.id),
|
||||
status: subscription?.status
|
||||
? String(subscription.status)
|
||||
: "unknown",
|
||||
},
|
||||
]),
|
||||
);
|
||||
|
||||
const subscriptionNameCandidates: Array<{
|
||||
id: string;
|
||||
status: string;
|
||||
normalizedName: string;
|
||||
}> = (subscriptions ?? [])
|
||||
.filter((subscription: any) => subscription?.name)
|
||||
.map((subscription: any) => ({
|
||||
id: String(subscription.id),
|
||||
status: subscription?.status ? String(subscription.status) : "unknown",
|
||||
normalizedName: normalizeDomainLike(String(subscription.name)),
|
||||
}));
|
||||
|
||||
let linkedCount = 0;
|
||||
const failures: Array<{ domain_id: string; error: string }> = [];
|
||||
|
||||
for (const domain of domains ?? []) {
|
||||
const matchByExternal = domain?.external_subscription_id
|
||||
? subscriptionByExternalId.get(String(domain.external_subscription_id))
|
||||
: undefined;
|
||||
const matchByDomainName = domain?.domain_name
|
||||
? subscriptionByName.get(normalizeDomainLike(String(domain.domain_name)))
|
||||
: undefined;
|
||||
const normalizedDomainName = domain?.domain_name
|
||||
? normalizeDomainLike(String(domain.domain_name))
|
||||
: null;
|
||||
const matchBySuffix = normalizedDomainName
|
||||
? findBestSuffixSubscriptionMatch(
|
||||
normalizedDomainName,
|
||||
subscriptionNameCandidates,
|
||||
)
|
||||
: undefined;
|
||||
const linkedSubscription =
|
||||
matchByExternal ?? matchByDomainName ?? matchBySuffix;
|
||||
|
||||
if (!linkedSubscription) continue;
|
||||
|
||||
const { error: updateError } = await supabase
|
||||
.from("plesk_domains")
|
||||
.update({
|
||||
subscription_id: linkedSubscription.id,
|
||||
status: linkedSubscription.status,
|
||||
})
|
||||
.eq("id", domain.id)
|
||||
.eq("agency_id", agencyId);
|
||||
|
||||
if (updateError) {
|
||||
failures.push({
|
||||
domain_id: String(domain.id),
|
||||
error: updateError.message,
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
linkedCount += 1;
|
||||
}
|
||||
|
||||
await supabase.from("actions_log").insert({
|
||||
agency_id: agencyId,
|
||||
actor_user_id: actorUserId ?? null,
|
||||
target_type: "plesk_instance",
|
||||
target_id: instanceId,
|
||||
action: "domain_subscription_backfill",
|
||||
status: failures.length > 0 ? "failed" : "success",
|
||||
error_message:
|
||||
failures.length > 0
|
||||
? `${failures.length} domain links failed during backfill`
|
||||
: null,
|
||||
metadata: {
|
||||
attempted: (domains ?? []).length,
|
||||
linked: linkedCount,
|
||||
failures: failures.slice(0, 25),
|
||||
},
|
||||
});
|
||||
|
||||
return {
|
||||
attempted: (domains ?? []).length,
|
||||
linked: linkedCount,
|
||||
failed: failures.length,
|
||||
};
|
||||
}
|
||||
|
||||
48
lib/types.ts
48
lib/types.ts
@@ -83,22 +83,6 @@ export type Database = {
|
||||
last_sync_error: string | null;
|
||||
last_sync_subscriptions: number;
|
||||
last_sync_domains: number;
|
||||
auto_sync_enabled: boolean;
|
||||
auto_sync_frequency_minutes: number;
|
||||
last_auto_sync_at: string | null;
|
||||
next_auto_sync_at: string | null;
|
||||
auto_sync_lock_until: string | null;
|
||||
auto_sync_lock_token: string | null;
|
||||
health_enabled: boolean;
|
||||
health_status: "ok" | "degraded" | "down" | "unknown";
|
||||
health_last_checked_at: string | null;
|
||||
health_last_ok_at: string | null;
|
||||
health_last_error: string | null;
|
||||
health_last_latency_ms: number | null;
|
||||
health_check_frequency_minutes: number;
|
||||
health_next_check_at: string | null;
|
||||
health_lock_until: string | null;
|
||||
health_lock_token: string | null;
|
||||
created_at: string;
|
||||
};
|
||||
Insert: {
|
||||
@@ -117,22 +101,6 @@ export type Database = {
|
||||
last_sync_error?: string | null;
|
||||
last_sync_subscriptions?: number;
|
||||
last_sync_domains?: number;
|
||||
auto_sync_enabled?: boolean;
|
||||
auto_sync_frequency_minutes?: number;
|
||||
last_auto_sync_at?: string | null;
|
||||
next_auto_sync_at?: string | null;
|
||||
auto_sync_lock_until?: string | null;
|
||||
auto_sync_lock_token?: string | null;
|
||||
health_enabled?: boolean;
|
||||
health_status?: "ok" | "degraded" | "down" | "unknown";
|
||||
health_last_checked_at?: string | null;
|
||||
health_last_ok_at?: string | null;
|
||||
health_last_error?: string | null;
|
||||
health_last_latency_ms?: number | null;
|
||||
health_check_frequency_minutes?: number;
|
||||
health_next_check_at?: string | null;
|
||||
health_lock_until?: string | null;
|
||||
health_lock_token?: string | null;
|
||||
created_at?: string;
|
||||
};
|
||||
Update: {
|
||||
@@ -151,22 +119,6 @@ export type Database = {
|
||||
last_sync_error?: string | null;
|
||||
last_sync_subscriptions?: number;
|
||||
last_sync_domains?: number;
|
||||
auto_sync_enabled?: boolean;
|
||||
auto_sync_frequency_minutes?: number;
|
||||
last_auto_sync_at?: string | null;
|
||||
next_auto_sync_at?: string | null;
|
||||
auto_sync_lock_until?: string | null;
|
||||
auto_sync_lock_token?: string | null;
|
||||
health_enabled?: boolean;
|
||||
health_status?: "ok" | "degraded" | "down" | "unknown";
|
||||
health_last_checked_at?: string | null;
|
||||
health_last_ok_at?: string | null;
|
||||
health_last_error?: string | null;
|
||||
health_last_latency_ms?: number | null;
|
||||
health_check_frequency_minutes?: number;
|
||||
health_next_check_at?: string | null;
|
||||
health_lock_until?: string | null;
|
||||
health_lock_token?: string | null;
|
||||
created_at?: string;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
-- CL8: instance health monitoring fields + lock helpers
|
||||
|
||||
alter table public.plesk_instances
|
||||
add column if not exists health_enabled boolean not null default true,
|
||||
add column if not exists health_status text not null default 'unknown',
|
||||
add column if not exists health_last_checked_at timestamptz,
|
||||
add column if not exists health_last_ok_at timestamptz,
|
||||
add column if not exists health_last_error text,
|
||||
add column if not exists health_last_latency_ms integer,
|
||||
add column if not exists health_check_frequency_minutes integer not null default 30,
|
||||
add column if not exists health_next_check_at timestamptz,
|
||||
add column if not exists health_lock_until timestamptz,
|
||||
add column if not exists health_lock_token text;
|
||||
|
||||
alter table public.plesk_instances
|
||||
drop constraint if exists plesk_instances_health_status_check;
|
||||
|
||||
alter table public.plesk_instances
|
||||
add constraint plesk_instances_health_status_check
|
||||
check (health_status in ('ok', 'degraded', 'down', 'unknown'));
|
||||
|
||||
alter table public.plesk_instances
|
||||
drop constraint if exists plesk_instances_health_check_frequency_minutes_check;
|
||||
|
||||
alter table public.plesk_instances
|
||||
add constraint plesk_instances_health_check_frequency_minutes_check
|
||||
check (health_check_frequency_minutes between 5 and 10080);
|
||||
|
||||
create index if not exists idx_plesk_instances_health_due
|
||||
on public.plesk_instances (health_enabled, health_next_check_at);
|
||||
|
||||
create or replace function public.acquire_instance_health_lock(
|
||||
p_instance_id uuid,
|
||||
p_lock_token text,
|
||||
p_ttl_seconds integer default 300,
|
||||
p_force boolean default false
|
||||
)
|
||||
returns boolean
|
||||
language plpgsql
|
||||
security definer
|
||||
set search_path = public
|
||||
as $$
|
||||
declare
|
||||
v_acquired boolean := false;
|
||||
begin
|
||||
update public.plesk_instances
|
||||
set
|
||||
health_lock_until = now() + make_interval(secs => p_ttl_seconds),
|
||||
health_lock_token = p_lock_token
|
||||
where id = p_instance_id
|
||||
and health_enabled = true
|
||||
and (
|
||||
p_force = true
|
||||
or health_next_check_at is null
|
||||
or health_next_check_at <= now()
|
||||
)
|
||||
and (health_lock_until is null or health_lock_until < now());
|
||||
|
||||
get diagnostics v_acquired = row_count;
|
||||
return v_acquired;
|
||||
end;
|
||||
$$;
|
||||
|
||||
create or replace function public.release_instance_health_lock(
|
||||
p_instance_id uuid,
|
||||
p_lock_token text
|
||||
)
|
||||
returns void
|
||||
language sql
|
||||
security definer
|
||||
set search_path = public
|
||||
as $$
|
||||
update public.plesk_instances
|
||||
set health_lock_until = null,
|
||||
health_lock_token = null
|
||||
where id = p_instance_id
|
||||
and health_lock_token = p_lock_token;
|
||||
$$;
|
||||
@@ -1,62 +0,0 @@
|
||||
-- CL6: auto-sync worker scheduling fields + per-instance lock helpers
|
||||
|
||||
alter table public.plesk_instances
|
||||
add column if not exists auto_sync_enabled boolean not null default false,
|
||||
add column if not exists auto_sync_frequency_minutes integer not null default 60,
|
||||
add column if not exists last_auto_sync_at timestamptz,
|
||||
add column if not exists next_auto_sync_at timestamptz,
|
||||
add column if not exists auto_sync_lock_until timestamptz,
|
||||
add column if not exists auto_sync_lock_token text;
|
||||
|
||||
alter table public.plesk_instances
|
||||
drop constraint if exists plesk_instances_auto_sync_frequency_minutes_check;
|
||||
|
||||
alter table public.plesk_instances
|
||||
add constraint plesk_instances_auto_sync_frequency_minutes_check
|
||||
check (auto_sync_frequency_minutes between 5 and 10080);
|
||||
|
||||
create index if not exists idx_plesk_instances_auto_sync_due
|
||||
on public.plesk_instances (auto_sync_enabled, next_auto_sync_at);
|
||||
|
||||
create or replace function public.acquire_instance_auto_sync_lock(
|
||||
p_instance_id uuid,
|
||||
p_lock_token text,
|
||||
p_ttl_seconds integer default 900
|
||||
)
|
||||
returns boolean
|
||||
language plpgsql
|
||||
security definer
|
||||
set search_path = public
|
||||
as $$
|
||||
declare
|
||||
v_acquired boolean := false;
|
||||
begin
|
||||
update public.plesk_instances
|
||||
set
|
||||
auto_sync_lock_until = now() + make_interval(secs => p_ttl_seconds),
|
||||
auto_sync_lock_token = p_lock_token
|
||||
where id = p_instance_id
|
||||
and auto_sync_enabled = true
|
||||
and (next_auto_sync_at is null or next_auto_sync_at <= now())
|
||||
and (auto_sync_lock_until is null or auto_sync_lock_until < now());
|
||||
|
||||
get diagnostics v_acquired = row_count;
|
||||
return v_acquired;
|
||||
end;
|
||||
$$;
|
||||
|
||||
create or replace function public.release_instance_auto_sync_lock(
|
||||
p_instance_id uuid,
|
||||
p_lock_token text
|
||||
)
|
||||
returns void
|
||||
language sql
|
||||
security definer
|
||||
set search_path = public
|
||||
as $$
|
||||
update public.plesk_instances
|
||||
set auto_sync_lock_until = null,
|
||||
auto_sync_lock_token = null
|
||||
where id = p_instance_id
|
||||
and auto_sync_lock_token = p_lock_token;
|
||||
$$;
|
||||
Reference in New Issue
Block a user