mirror of
https://github.com/R0m1k3/Socialflow.git
synced 2026-10-18 04:36:32 +02:00
feat: Add MinIO endpoint/public URL configuration via settings UI
Store endpointUrl and publicUrl in cloudinary_config DB table so MinIO connection can be fully configured from the app settings without needing environment variables. - DB migration: adds endpoint_url and public_url columns - Schema: adds endpointUrl/publicUrl to cloudinaryConfig table - MinIO service: reads endpoint from DB (falls back to MINIO_ENDPOINT env) - buildMinioUrl: accepts optional publicUrl override from DB config - All routes updated to pass config.publicUrl to buildMinioUrl - Settings UI (desktop + mobile): adds Endpoint URL and Public URL fields Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
1 parent
841ffb306c
commit
ba94e7cc7d
8 files changed
+105
-21
No files matched your search
@@ -111,6 +111,18 @@ export async function migrate() {
|
||||
ALTER TABLE "posts"
|
||||
ADD COLUMN IF NOT EXISTS "generation_error" text;
|
||||
`);
|
||||
|
||||
// cloudinary_config.endpoint_url (MinIO internal endpoint URL)
|
||||
await client.query(`
|
||||
ALTER TABLE "cloudinary_config"
|
||||
ADD COLUMN IF NOT EXISTS "endpoint_url" text;
|
||||
`);
|
||||
|
||||
// cloudinary_config.public_url (MinIO public-facing base URL)
|
||||
await client.query(`
|
||||
ALTER TABLE "cloudinary_config"
|
||||
ADD COLUMN IF NOT EXISTS "public_url" text;
|
||||
`);
|
||||
// page_analytics_history.page_engagement
|
||||
await client.query(`
|
||||
ALTER TABLE "page_analytics_history"
|
||||
|
||||
+2
-2
@@ -822,7 +822,7 @@ export async function registerRoutes(app: Express): Promise<Server> {
|
||||
if (cloudinaryConfig && cloudinaryConfig.logoPublicId) {
|
||||
try {
|
||||
// Build logo URL from Cloudinary
|
||||
const logoUrl = buildMinioUrl(cloudinaryConfig.cloudName, cloudinaryConfig.logoPublicId);
|
||||
const logoUrl = buildMinioUrl(cloudinaryConfig.cloudName, cloudinaryConfig.logoPublicId, cloudinaryConfig.publicUrl);
|
||||
console.log("📥 Downloading logo from:", logoUrl);
|
||||
|
||||
// Download logo
|
||||
@@ -1631,7 +1631,7 @@ export async function registerRoutes(app: Express): Promise<Server> {
|
||||
|
||||
// Don't send the API secret to the client
|
||||
const { apiSecret, ...safeConfig } = config;
|
||||
const logoUrl = config.logoPublicId ? buildMinioUrl(config.cloudName, config.logoPublicId) : null;
|
||||
const logoUrl = config.logoPublicId ? buildMinioUrl(config.cloudName, config.logoPublicId, config.publicUrl) : null;
|
||||
res.json({ ...safeConfig, logoUrl });
|
||||
} catch (error) {
|
||||
console.error("Error fetching Cloudinary config:", error);
|
||||
|
||||
@@ -343,7 +343,7 @@ reelsRouter.post('/reels/preview', async (req: Request, res: Response) => {
|
||||
try {
|
||||
const config = await storage.getCloudinaryConfig();
|
||||
if (config && config.logoPublicId) {
|
||||
watermarkUrl = buildMinioUrl(config.cloudName, config.logoPublicId);
|
||||
watermarkUrl = buildMinioUrl(config.cloudName, config.logoPublicId, config.publicUrl);
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Error fetching watermark configuration', e);
|
||||
@@ -556,7 +556,7 @@ async function processReelBackground(
|
||||
try {
|
||||
const config = await storage.getCloudinaryConfig();
|
||||
if (config && config.logoPublicId) {
|
||||
watermarkUrl = buildMinioUrl(config.cloudName, config.logoPublicId);
|
||||
watermarkUrl = buildMinioUrl(config.cloudName, config.logoPublicId, config.publicUrl);
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Error fetching watermark configuration', e);
|
||||
|
||||
@@ -128,7 +128,7 @@ remotionRouter.post("/render", upload.fields([{ name: "images", maxCount: 4 }, {
|
||||
try {
|
||||
const cloudinaryConfig = await dbStorage.getCloudinaryConfig();
|
||||
if (cloudinaryConfig?.cloudName && cloudinaryConfig?.logoPublicId) {
|
||||
logoUrl = buildMinioUrl(cloudinaryConfig.cloudName, cloudinaryConfig.logoPublicId);
|
||||
logoUrl = buildMinioUrl(cloudinaryConfig.cloudName, cloudinaryConfig.logoPublicId, cloudinaryConfig.publicUrl);
|
||||
console.log("🏢 Logo URL:", logoUrl);
|
||||
}
|
||||
} catch (e) {
|
||||
|
||||
+14
-14
@@ -3,9 +3,10 @@ import { storage } from '../storage';
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
|
||||
function getS3Client(accessKey: string, secretKey: string): S3Client {
|
||||
function getS3Client(accessKey: string, secretKey: string, endpointUrl?: string | null): S3Client {
|
||||
const endpoint = endpointUrl || process.env.MINIO_ENDPOINT || 'http://localhost:9000';
|
||||
return new S3Client({
|
||||
endpoint: process.env.MINIO_ENDPOINT || 'http://localhost:9000',
|
||||
endpoint,
|
||||
region: 'us-east-1',
|
||||
credentials: { accessKeyId: accessKey, secretAccessKey: secretKey },
|
||||
forcePathStyle: true,
|
||||
@@ -14,11 +15,10 @@ function getS3Client(accessKey: string, secretKey: string): S3Client {
|
||||
|
||||
/**
|
||||
* Builds the public URL for a stored object.
|
||||
* MINIO_PUBLIC_URL = public-facing base (e.g. https://media.example.com)
|
||||
* Object URL = ${MINIO_PUBLIC_URL}/${bucketName}/${objectKey}
|
||||
* Uses DB publicUrl > MINIO_PUBLIC_URL env > MINIO_ENDPOINT env > localhost fallback.
|
||||
*/
|
||||
export function buildMinioUrl(bucketName: string, objectKey: string): string {
|
||||
const base = (process.env.MINIO_PUBLIC_URL || process.env.MINIO_ENDPOINT || 'http://localhost:9000').replace(/\/$/, '');
|
||||
export function buildMinioUrl(bucketName: string, objectKey: string, publicUrlOverride?: string | null): string {
|
||||
const base = (publicUrlOverride || process.env.MINIO_PUBLIC_URL || process.env.MINIO_ENDPOINT || 'http://localhost:9000').replace(/\/$/, '');
|
||||
return `${base}/${bucketName}/${objectKey}`;
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ class MinioService {
|
||||
const config = await storage.getCloudinaryConfig();
|
||||
if (!config) throw new Error('MinIO non configuré. Veuillez configurer le stockage dans les Paramètres.');
|
||||
|
||||
const client = getS3Client(config.apiKey, config.apiSecret);
|
||||
const client = getS3Client(config.apiKey, config.apiSecret, config.endpointUrl);
|
||||
const bucket = config.cloudName;
|
||||
const safeName = path.basename(fileName).replace(/\s+/g, '-');
|
||||
const objectKey = `social-flow/${Date.now()}-${safeName}`;
|
||||
@@ -52,7 +52,7 @@ class MinioService {
|
||||
ContentType: mimeType,
|
||||
}));
|
||||
|
||||
const url = buildMinioUrl(bucket, objectKey);
|
||||
const url = buildMinioUrl(bucket, objectKey, config.publicUrl);
|
||||
return { publicId: objectKey, originalUrl: url, facebookFeedUrl: url, instagramFeedUrl: url, instagramStoryUrl: url };
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ class MinioService {
|
||||
const config = await storage.getCloudinaryConfig();
|
||||
if (!config) throw new Error('MinIO non configuré.');
|
||||
|
||||
const client = getS3Client(config.apiKey, config.apiSecret);
|
||||
const client = getS3Client(config.apiKey, config.apiSecret, config.endpointUrl);
|
||||
await client.send(new DeleteObjectCommand({ Bucket: config.cloudName, Key: publicId }));
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ class MinioService {
|
||||
const config = await storage.getCloudinaryConfig();
|
||||
if (!config) throw new Error('MinIO non configuré.');
|
||||
|
||||
const client = getS3Client(config.apiKey, config.apiSecret);
|
||||
const client = getS3Client(config.apiKey, config.apiSecret, config.endpointUrl);
|
||||
const safeName = path.basename(originalFileName).replace(/\s+/g, '-');
|
||||
const objectKey = `social-flow/stories/story-${Date.now()}-${safeName}`;
|
||||
|
||||
@@ -79,14 +79,14 @@ class MinioService {
|
||||
ContentType: 'image/jpeg',
|
||||
}));
|
||||
|
||||
return buildMinioUrl(config.cloudName, objectKey);
|
||||
return buildMinioUrl(config.cloudName, objectKey, config.publicUrl);
|
||||
}
|
||||
|
||||
async uploadLogo(buffer: Buffer, fileName: string): Promise<{ publicId: string; url: string }> {
|
||||
const config = await storage.getCloudinaryConfig();
|
||||
if (!config) throw new Error('MinIO non configuré.');
|
||||
|
||||
const client = getS3Client(config.apiKey, config.apiSecret);
|
||||
const client = getS3Client(config.apiKey, config.apiSecret, config.endpointUrl);
|
||||
const ext = path.extname(fileName) || '.png';
|
||||
const objectKey = `social-flow/logos/logo-${Date.now()}${ext}`;
|
||||
|
||||
@@ -97,14 +97,14 @@ class MinioService {
|
||||
ContentType: fileName.match(/\.png$/i) ? 'image/png' : 'image/jpeg',
|
||||
}));
|
||||
|
||||
return { publicId: objectKey, url: buildMinioUrl(config.cloudName, objectKey) };
|
||||
return { publicId: objectKey, url: buildMinioUrl(config.cloudName, objectKey, config.publicUrl) };
|
||||
}
|
||||
|
||||
async deleteLogo(publicId: string): Promise<void> {
|
||||
const config = await storage.getCloudinaryConfig();
|
||||
if (!config) throw new Error('MinIO non configuré.');
|
||||
|
||||
const client = getS3Client(config.apiKey, config.apiSecret);
|
||||
const client = getS3Client(config.apiKey, config.apiSecret, config.endpointUrl);
|
||||
await client.send(new DeleteObjectCommand({ Bucket: config.cloudName, Key: publicId }));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user