3d06644914
- Replaced all instances of the placeholder image path from "/static/images/placeholder.jpg" to "/static/images/replaceable_template_image.png". - Added a new Nginx location block for serving app data with a long cache expiration. - Enhanced the image generation service to return the new template image when generation fails. - Updated various services and endpoints to ensure consistent handling of asset paths, including resolving backend asset URLs. - Removed Electron-specific checks from several components to streamline API calls and improve compatibility with web deployments. - Improved error handling and logging in the PDF export process. - Adjusted Next.js configuration for API routing to ensure proper asset serving in Docker environments.
103 lines
2.8 KiB
TypeScript
103 lines
2.8 KiB
TypeScript
// Utility to get the FastAPI base URL
|
|
export function getFastAPIUrl(): string {
|
|
if (process.env.NEXT_PUBLIC_FAST_API) {
|
|
return process.env.NEXT_PUBLIC_FAST_API;
|
|
}
|
|
|
|
const queryFastApiUrl = getFastApiUrlFromQuery();
|
|
if (queryFastApiUrl) {
|
|
return queryFastApiUrl;
|
|
}
|
|
|
|
// Docker/web runtime: route backend assets and APIs through current origin
|
|
// (nginx reverse-proxies /api/v1, /app_data, /static).
|
|
if (typeof window !== "undefined") {
|
|
return window.location.origin;
|
|
}
|
|
|
|
return "http://127.0.0.1:5000";
|
|
}
|
|
|
|
function getFastApiUrlFromQuery(): string | null {
|
|
if (typeof window === "undefined") return null;
|
|
try {
|
|
const params = new URLSearchParams(window.location.search);
|
|
const value = params.get("fastapiUrl");
|
|
if (!value) return null;
|
|
|
|
const parsed = new URL(value);
|
|
if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
|
|
return null;
|
|
}
|
|
return parsed.origin;
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
function isAbsoluteHttpUrl(path: string): boolean {
|
|
return /^https?:\/\//i.test(path);
|
|
}
|
|
|
|
function withLeadingSlash(path: string): string {
|
|
return path.startsWith("/") ? path : `/${path}`;
|
|
}
|
|
|
|
// Utility to construct API URL for Docker/web runtime.
|
|
export function getApiUrl(path: string): string {
|
|
if (isAbsoluteHttpUrl(path)) {
|
|
return path;
|
|
}
|
|
|
|
const normalizedPath = withLeadingSlash(path);
|
|
const isFastApiEndpoint = normalizedPath.startsWith("/api/v1/");
|
|
const hasConfiguredFastApi =
|
|
!!process.env.NEXT_PUBLIC_FAST_API || !!getFastApiUrlFromQuery();
|
|
|
|
// In web/docker, /api/v1 is typically reverse-proxied by the web server.
|
|
// If a FastAPI origin is explicitly configured, use it instead of same-origin proxy.
|
|
if (isFastApiEndpoint && hasConfiguredFastApi) {
|
|
return `${getFastAPIUrl()}${normalizedPath}`;
|
|
}
|
|
|
|
return normalizedPath;
|
|
}
|
|
|
|
function hasBackendAssetPrefix(path: string): boolean {
|
|
return path.startsWith("/static/") || path.startsWith("/app_data/");
|
|
}
|
|
|
|
// Resolve backend-served asset paths to the FastAPI origin.
|
|
export function resolveBackendAssetUrl(path?: string): string {
|
|
if (!path) return "";
|
|
|
|
const trimmedPath = path.trim();
|
|
if (!trimmedPath) return "";
|
|
|
|
if (
|
|
trimmedPath.startsWith("data:") ||
|
|
trimmedPath.startsWith("blob:") ||
|
|
trimmedPath.startsWith("file:")
|
|
) {
|
|
return trimmedPath;
|
|
}
|
|
|
|
if (isAbsoluteHttpUrl(trimmedPath)) {
|
|
try {
|
|
const parsed = new URL(trimmedPath);
|
|
if (hasBackendAssetPrefix(parsed.pathname)) {
|
|
return `${getFastAPIUrl()}${parsed.pathname}${parsed.search}${parsed.hash}`;
|
|
}
|
|
return trimmedPath;
|
|
} catch {
|
|
return trimmedPath;
|
|
}
|
|
}
|
|
|
|
const normalizedPath = withLeadingSlash(trimmedPath);
|
|
if (hasBackendAssetPrefix(normalizedPath)) {
|
|
return `${getFastAPIUrl()}${normalizedPath}`;
|
|
}
|
|
|
|
return trimmedPath;
|
|
}
|