fix: preview URL resolved from Gitea repo via Coolify git_repository match
Made-with: Cursor
This commit is contained in:
@@ -2,11 +2,16 @@ import { NextResponse } from 'next/server';
|
|||||||
import { getServerSession } from 'next-auth';
|
import { getServerSession } from 'next-auth';
|
||||||
import { authOptions } from '@/lib/auth/authOptions';
|
import { authOptions } from '@/lib/auth/authOptions';
|
||||||
import { query } from '@/lib/db-postgres';
|
import { query } from '@/lib/db-postgres';
|
||||||
|
import { listApplications, CoolifyApplication } from '@/lib/coolify';
|
||||||
|
|
||||||
|
const GITEA_BASE = process.env.GITEA_API_URL ?? 'https://git.vibnai.com';
|
||||||
|
|
||||||
export interface PreviewApp {
|
export interface PreviewApp {
|
||||||
name: string;
|
name: string;
|
||||||
url: string | null;
|
url: string | null;
|
||||||
status: 'live' | 'deploying' | 'failed' | 'unknown';
|
status: string;
|
||||||
|
coolifyUuid: string | null;
|
||||||
|
gitRepo: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function GET(
|
export async function GET(
|
||||||
@@ -20,6 +25,7 @@ export async function GET(
|
|||||||
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
|
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 1. Load project — get the Gitea repo name
|
||||||
const rows = await query<{ data: Record<string, unknown> }>(
|
const rows = await query<{ data: Record<string, unknown> }>(
|
||||||
`SELECT p.data FROM fs_projects p
|
`SELECT p.data FROM fs_projects p
|
||||||
JOIN fs_users u ON u.id = p.user_id
|
JOIN fs_users u ON u.id = p.user_id
|
||||||
@@ -32,26 +38,58 @@ export async function GET(
|
|||||||
}
|
}
|
||||||
|
|
||||||
const data = rows[0].data ?? {};
|
const data = rows[0].data ?? {};
|
||||||
|
const giteaRepo = data.giteaRepo as string | undefined; // e.g. "mark/scout-ai-engine"
|
||||||
|
|
||||||
// Gather apps with their deployment URLs
|
if (!giteaRepo) {
|
||||||
const storedApps = (data.apps as Array<{ name: string; fqdn?: string; coolifyServiceUuid?: string }>) ?? [];
|
return NextResponse.json({ apps: [], message: 'No Gitea repo linked to this project' });
|
||||||
const lastDeployment = (data as any).contextSnapshot?.lastDeployment ?? null;
|
}
|
||||||
|
|
||||||
const apps: PreviewApp[] = storedApps.map(app => ({
|
// 2. Build the possible Gitea remote URLs for this repo (with and without .git)
|
||||||
|
const repoBase = `${GITEA_BASE}/${giteaRepo}`;
|
||||||
|
const repoUrls = new Set([repoBase, `${repoBase}.git`]);
|
||||||
|
|
||||||
|
// 3. Fetch all Coolify applications and match by git_repository
|
||||||
|
let coolifyApps: CoolifyApplication[] = [];
|
||||||
|
try {
|
||||||
|
coolifyApps = await listApplications();
|
||||||
|
} catch (err) {
|
||||||
|
console.error('[preview-url] Coolify fetch failed:', err);
|
||||||
|
// Fall back to stored data
|
||||||
|
}
|
||||||
|
|
||||||
|
const matched = coolifyApps.filter(app =>
|
||||||
|
app.git_repository && repoUrls.has(app.git_repository.replace(/\/$/, ''))
|
||||||
|
);
|
||||||
|
|
||||||
|
if (matched.length > 0) {
|
||||||
|
const apps: PreviewApp[] = matched.map(app => ({
|
||||||
name: app.name,
|
name: app.name,
|
||||||
url: app.fqdn ? (app.fqdn.startsWith('http') ? app.fqdn : `https://${app.fqdn}`) : null,
|
url: app.fqdn
|
||||||
status: app.fqdn ? 'live' : 'unknown',
|
? (app.fqdn.startsWith('http') ? app.fqdn : `https://${app.fqdn}`)
|
||||||
|
: null,
|
||||||
|
status: app.status ?? 'unknown',
|
||||||
|
coolifyUuid: app.uuid,
|
||||||
|
gitRepo: app.git_repository ?? null,
|
||||||
}));
|
}));
|
||||||
|
return NextResponse.json({ apps, source: 'coolify' });
|
||||||
|
}
|
||||||
|
|
||||||
// If no stored apps but we have a last deployment URL, surface it
|
// 4. Fallback: use whatever URL was stored by the Coolify webhook
|
||||||
if (apps.length === 0 && lastDeployment?.url) {
|
const lastDeployment = (data as any).contextSnapshot?.lastDeployment ?? null;
|
||||||
apps.push({
|
if (lastDeployment?.url) {
|
||||||
name: 'app',
|
const apps: PreviewApp[] = [{
|
||||||
|
name: giteaRepo.split('/').pop() ?? 'app',
|
||||||
url: lastDeployment.url.startsWith('http') ? lastDeployment.url : `https://${lastDeployment.url}`,
|
url: lastDeployment.url.startsWith('http') ? lastDeployment.url : `https://${lastDeployment.url}`,
|
||||||
status: lastDeployment.status === 'finished' ? 'live' : lastDeployment.status === 'in_progress' ? 'deploying' : 'unknown',
|
status: lastDeployment.status === 'finished' ? 'running' : lastDeployment.status ?? 'unknown',
|
||||||
|
coolifyUuid: lastDeployment.applicationUuid ?? null,
|
||||||
|
gitRepo: giteaRepo,
|
||||||
|
}];
|
||||||
|
return NextResponse.json({ apps, source: 'webhook' });
|
||||||
|
}
|
||||||
|
|
||||||
|
return NextResponse.json({
|
||||||
|
apps: [],
|
||||||
|
message: `No Coolify app found for repo: ${giteaRepo}`,
|
||||||
|
giteaRepo,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Also expose the raw last deployment for the panel header
|
|
||||||
return NextResponse.json({ apps, lastDeployment });
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -188,6 +188,10 @@ export async function createMonorepoAppService(opts: {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function listApplications(): Promise<CoolifyApplication[]> {
|
||||||
|
return coolifyFetch('/applications');
|
||||||
|
}
|
||||||
|
|
||||||
export async function deployApplication(uuid: string): Promise<{ deployment_uuid: string }> {
|
export async function deployApplication(uuid: string): Promise<{ deployment_uuid: string }> {
|
||||||
return coolifyFetch(`/applications/${uuid}/deploy`, { method: 'POST' });
|
return coolifyFetch(`/applications/${uuid}/deploy`, { method: 'POST' });
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user