@prenta/core 2.0.0 → 2.2.0

package/dist/media/reoptimize.js

@@ -0,0 +1,371 @@
+/**
+ * Re-run the image pipeline on an existing media row.
+ *
+ * Upload already degrades when `sharp` is missing (store original, log a
+ * warning, leave width/height null). This module is the recovery path:
+ * `POST /media/:id/optimize`, `POST /media/:id/probe`, and
+ * `prenta migrate:media-optimize` all go through `reoptimizeMedia`.
+ *
+ * Fetch and store prefer the registered storage adapter (same as upload).
+ * Falling through to a public-URL fetch / `@vercel/blob` keeps hosts that
+ * never registered an adapter working. Optimize-only talking to blob while
+ * upload used the adapter is what 500'd every `/optimize` on those hosts.
+ */
+import { createLogger } from '../diagnostics/logger.js';
+import { safeFetch } from '../security/safe-fetch.js';
+import { validateWebhookUrl } from '../security/webhook.js';
+import { getStorageAdapter } from '../storage/index.js';
+import { hashMediaContent } from './content-hash.js';
+import { formatBytes, getImageMetadata, optimizeImage } from './optimize.js';
+const log = createLogger('media-reoptimize');
+const PRESERVE_FORMATS = new Set(['image/svg+xml', 'image/gif']);
+export class MediaSourceError extends Error {
+    constructor(message = 'Could not retrieve the original file for optimization') {
+        super(message);
+        this.name = 'MediaSourceError';
+    }
+}
+export class MediaStoreError extends Error {
+    constructor(message = 'Could not store the optimized file. The original is unchanged — check media storage configuration and retry.') {
+        super(message);
+        this.name = 'MediaStoreError';
+    }
+}
+export class MediaOptimizeError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'MediaOptimizeError';
+    }
+}
+function isFetchableUrl(url) {
+    if (!validateWebhookUrl(url).valid)
+        return false;
+    try {
+        return !new URL(url).hostname.toLowerCase().endsWith('.local');
+    }
+    catch {
+        return false;
+    }
+}
+function uniqueUrls(...values) {
+    const out = [];
+    for (const value of values) {
+        if (typeof value === 'string' && value.trim() && !out.includes(value))
+            out.push(value);
+    }
+    return out;
+}
+async function importBlobStorage() {
+    const mod = '@vercel/' + 'blob';
+    return import(/* webpackIgnore: true */ mod);
+}
+export async function fetchMediaBytes(media) {
+    const candidates = uniqueUrls(media.storageKey, media.publicUrl);
+    const storage = getStorageAdapter();
+    if (storage) {
+        for (const key of candidates) {
+            try {
+                const bytes = await storage.download(key);
+                if (bytes.byteLength > 0)
+                    return bytes;
+            }
+            catch {
+                /* try the next candidate / public fetch */
+            }
+        }
+    }
+    for (const url of candidates) {
+        if (!isFetchableUrl(url))
+            continue;
+        try {
+            const response = await safeFetch(url, {
+                method: 'GET',
+                timeoutMs: 15000,
+                followRedirects: true,
+            });
+            if (!response.ok)
+                continue;
+            const bytes = Buffer.from(await response.arrayBuffer());
+            if (bytes.byteLength > 0)
+                return bytes;
+        }
+        catch {
+            /* try next */
+        }
+    }
+    throw new MediaSourceError();
+}
+export async function storeMediaBytes(key, buffer, mimeType) {
+    const storage = getStorageAdapter();
+    if (storage) {
+        try {
+            return await storage.upload(key, buffer, mimeType);
+        }
+        catch (err) {
+            log.error('Storage adapter upload failed during optimize', {
+                error: err instanceof Error ? err.message : String(err),
+            });
+            throw new MediaStoreError();
+        }
+    }
+    try {
+        const blob = await importBlobStorage();
+        const result = await blob.put(key, buffer, {
+            access: 'public',
+            contentType: mimeType,
+        });
+        return result.url;
+    }
+    catch (err) {
+        log.error('Vercel Blob upload failed during optimize', {
+            error: err instanceof Error ? err.message : String(err),
+        });
+        throw new MediaStoreError();
+    }
+}
+async function deleteStoredBytes(key) {
+    const storage = getStorageAdapter();
+    if (storage) {
+        try {
+            await storage.delete(key);
+        }
+        catch {
+            /* best-effort */
+        }
+        return;
+    }
+    try {
+        const blob = await importBlobStorage();
+        await blob.del(key);
+    }
+    catch {
+        /* best-effort */
+    }
+}
+function summary(originalSize, optimizedSize, originalFormat, outputFormat, extra = {}) {
+    const savings = originalSize > 0 ? Math.max(0, Math.round((1 - optimizedSize / originalSize) * 100)) : 0;
+    return {
+        originalSize,
+        optimizedSize,
+        savings,
+        originalFormat,
+        outputFormat,
+        originalSizeFormatted: formatBytes(originalSize),
+        optimizedSizeFormatted: formatBytes(optimizedSize),
+        ...extra,
+    };
+}
+function needsDimensionWrite(media, next) {
+    if (next.width && next.width !== media.width)
+        return true;
+    if (next.height && next.height !== media.height)
+        return true;
+    if (next.blurHash && next.blurHash !== media.blurHash)
+        return true;
+    return false;
+}
+async function persistMetadata(db, media, next) {
+    if (!needsDimensionWrite(media, next))
+        return media;
+    return db.media.update({
+        where: { id: media.id },
+        data: {
+            ...(next.width ? { width: next.width } : {}),
+            ...(next.height ? { height: next.height } : {}),
+            ...(next.blurHash ? { blurHash: next.blurHash } : {}),
+        },
+    });
+}
+async function probeAndPersist(db, media, bytes) {
+    let meta;
+    try {
+        meta = await getImageMetadata(bytes);
+    }
+    catch (err) {
+        throw new MediaOptimizeError(err instanceof Error
+            ? err.message
+            : 'Image metadata probe failed. Add `sharp` as a direct dependency and redeploy.');
+    }
+    if (!meta?.width && !meta?.height) {
+        throw new MediaOptimizeError('Image metadata probe returned no dimensions. Add `sharp` as a direct dependency (`npm install sharp`) and redeploy.');
+    }
+    const updated = await persistMetadata(db, media, {
+        width: meta.width,
+        height: meta.height,
+    });
+    const wrote = updated !== media;
+    return {
+        status: wrote ? 'probed' : 'unchanged',
+        media: updated,
+        optimization: summary(bytes.byteLength, bytes.byteLength, media.mimeType, media.mimeType, {
+            alreadyOptimized: true,
+            probed: wrote,
+        }),
+    };
+}
+/**
+ * Re-encode or probe one media row. Never leaves the record pointing at a
+ * dead URL: store failures throw before the row is updated.
+ */
+export async function reoptimizeMedia(db, media, options = {}) {
+    if (!media.mimeType.startsWith('image/')) {
+        return {
+            status: 'skipped',
+            media,
+            optimization: summary(media.fileSize, media.fileSize, media.mimeType, media.mimeType, {
+                skipped: true,
+                reason: 'not-image',
+                alreadyOptimized: true,
+            }),
+        };
+    }
+    const bytes = await fetchMediaBytes(media);
+    const probeOnly = options.probeOnly === true || PRESERVE_FORMATS.has(media.mimeType);
+    if (probeOnly) {
+        return probeAndPersist(db, media, bytes);
+    }
+    // WebP is already the pipeline output. Still probe when dimensions are
+    // missing — that is the common leftover from a sharp-less upload.
+    if (media.mimeType === 'image/webp' && media.width && media.height) {
+        return {
+            status: 'unchanged',
+            media,
+            optimization: summary(bytes.byteLength, bytes.byteLength, media.mimeType, media.mimeType, {
+                alreadyOptimized: true,
+            }),
+        };
+    }
+    let result;
+    try {
+        result = await optimizeImage(bytes, media.filename, media.mimeType);
+    }
+    catch (err) {
+        log.warn('Image optimization failed — falling back to a dimension probe', {
+            mediaId: media.id,
+            error: err instanceof Error ? err.message : String(err),
+        });
+        try {
+            return await probeAndPersist(db, media, bytes);
+        }
+        catch {
+            throw new MediaOptimizeError('Image optimization failed. Add `sharp` as a direct dependency (`npm install sharp`) and redeploy.');
+        }
+    }
+    if (result.savings > 0) {
+        const sanitizedName = result.filename.replace(/[^a-zA-Z0-9._-]/g, '_');
+        const newKey = `prenta/media/${Date.now()}-${sanitizedName}`;
+        const newUrl = await storeMediaBytes(newKey, result.buffer, result.mimeType);
+        await deleteStoredBytes(media.storageKey);
+        const updated = await db.media.update({
+            where: { id: media.id },
+            data: {
+                filename: result.filename,
+                storageKey: newUrl,
+                publicUrl: newUrl,
+                mimeType: result.mimeType,
+                fileSize: result.optimizedSize,
+                width: result.width || undefined,
+                height: result.height || undefined,
+                blurHash: result.blurHash ?? undefined,
+                contentHash: hashMediaContent(result.buffer),
+            },
+        });
+        return {
+            status: 'reencoded',
+            media: updated,
+            optimization: summary(result.originalSize, result.optimizedSize, media.mimeType, result.mimeType),
+        };
+    }
+    const updated = await persistMetadata(db, media, {
+        width: result.width || null,
+        height: result.height || null,
+        blurHash: result.blurHash ?? null,
+    });
+    const wrote = updated !== media;
+    return {
+        status: wrote ? 'probed' : 'unchanged',
+        media: updated,
+        optimization: summary(result.originalSize, result.optimizedSize, media.mimeType, result.mimeType, {
+            alreadyOptimized: true,
+            probed: wrote,
+        }),
+    };
+}
+function shouldScan(media, onlyMissingDimensions) {
+    if (!media.mimeType.startsWith('image/'))
+        return false;
+    if (!onlyMissingDimensions)
+        return true;
+    return !media.width || !media.height;
+}
+/** Walk image rows and re-run optimize / probe. Idempotent. */
+export async function backfillMediaOptimization(db, options = {}) {
+    const dryRun = options.dryRun ?? false;
+    const probeOnly = options.probeOnly ?? false;
+    const onlyMissingDimensions = options.onlyMissingDimensions ?? false;
+    const batchSize = options.batchSize && options.batchSize > 0 ? options.batchSize : 50;
+    const result = {
+        scanned: 0,
+        reencoded: 0,
+        probed: 0,
+        unchanged: 0,
+        skipped: 0,
+        failed: 0,
+        errors: [],
+    };
+    let cursor;
+    for (;;) {
+        const batch = await db.media.findMany({
+            where: { deletedAt: null },
+            orderBy: { id: 'asc' },
+            take: batchSize,
+            ...(cursor ? { skip: 1, cursor: { id: cursor } } : {}),
+        });
+        if (batch.length === 0)
+            break;
+        cursor = batch[batch.length - 1].id;
+        for (const row of batch) {
+            if (!shouldScan(row, onlyMissingDimensions)) {
+                result.skipped++;
+                continue;
+            }
+            result.scanned++;
+            if (dryRun) {
+                result.unchanged++;
+                continue;
+            }
+            try {
+                const outcome = await reoptimizeMedia(db, row, { probeOnly });
+                switch (outcome.status) {
+                    case 'reencoded':
+                        result.reencoded++;
+                        break;
+                    case 'probed':
+                        result.probed++;
+                        break;
+                    case 'unchanged':
+                        result.unchanged++;
+                        break;
+                    case 'skipped':
+                        result.skipped++;
+                        break;
+                    default: {
+                        const _never = outcome.status;
+                        void _never;
+                    }
+                }
+            }
+            catch (err) {
+                result.failed++;
+                result.errors.push({
+                    id: row.id,
+                    message: err instanceof Error ? err.message : String(err),
+                });
+            }
+        }
+        if (batch.length < batchSize)
+            break;
+    }
+    return result;
+}
+//# sourceMappingURL=reoptimize.js.map

package/dist/media/reoptimize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reoptimize.js","sourceRoot":"","sources":["../../src/media/reoptimize.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prenta/core",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "license": "MIT",
   "repository": {
     "type": "git",

package/prisma/migrations/0013_document_collab_models/migration.sql

@@ -0,0 +1,68 @@
+-- Collab / comments / notifications models that cms-core already queries
+-- (#729). Hosts that declared these by hand keep their data; IF NOT EXISTS
+-- lets migrate deploy succeed when the unmapped tables already exist under
+-- Prisma's default names — those hosts should rename onto the prenta_* maps
+-- in a follow-up if they still use the old names.
+
+CREATE TABLE IF NOT EXISTS "prenta_document_crdts" (
+    "documentId" TEXT NOT NULL,
+    "state" BYTEA NOT NULL,
+    "stateVector" BYTEA NOT NULL,
+    "version" INTEGER NOT NULL DEFAULT 0,
+    "lastUpdatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "lastUpdatedById" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "prenta_document_crdts_pkey" PRIMARY KEY ("documentId")
+);
+
+CREATE INDEX IF NOT EXISTS "prenta_document_crdts_lastUpdatedAt_idx" ON "prenta_document_crdts"("lastUpdatedAt");
+
+CREATE TABLE IF NOT EXISTS "prenta_document_comments" (
+    "id" TEXT NOT NULL,
+    "documentId" TEXT NOT NULL,
+    "parentId" TEXT,
+    "userId" TEXT,
+    "body" TEXT NOT NULL,
+    "anchor" JSONB,
+    "resolvedAt" TIMESTAMP(3),
+    "resolvedById" TEXT,
+    "deletedAt" TIMESTAMP(3),
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "prenta_document_comments_pkey" PRIMARY KEY ("id")
+);
+
+CREATE INDEX IF NOT EXISTS "prenta_document_comments_documentId_idx" ON "prenta_document_comments"("documentId");
+CREATE INDEX IF NOT EXISTS "prenta_document_comments_documentId_resolvedAt_idx" ON "prenta_document_comments"("documentId", "resolvedAt");
+CREATE INDEX IF NOT EXISTS "prenta_document_comments_parentId_idx" ON "prenta_document_comments"("parentId");
+CREATE INDEX IF NOT EXISTS "prenta_document_comments_userId_idx" ON "prenta_document_comments"("userId");
+CREATE INDEX IF NOT EXISTS "prenta_document_comments_createdAt_idx" ON "prenta_document_comments"("createdAt");
+
+ALTER TABLE "prenta_document_comments" DROP CONSTRAINT IF EXISTS "prenta_document_comments_parentId_fkey";
+ALTER TABLE "prenta_document_comments" ADD CONSTRAINT "prenta_document_comments_parentId_fkey" FOREIGN KEY ("parentId") REFERENCES "prenta_document_comments"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE "prenta_document_comments" DROP CONSTRAINT IF EXISTS "prenta_document_comments_userId_fkey";
+ALTER TABLE "prenta_document_comments" ADD CONSTRAINT "prenta_document_comments_userId_fkey" FOREIGN KEY ("userId") REFERENCES "prenta_users"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+CREATE TABLE IF NOT EXISTS "prenta_document_notifications" (
+    "id" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+    "kind" TEXT NOT NULL,
+    "documentId" TEXT,
+    "commentId" TEXT,
+    "payload" JSONB NOT NULL,
+    "readAt" TIMESTAMP(3),
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "prenta_document_notifications_pkey" PRIMARY KEY ("id")
+);
+
+CREATE INDEX IF NOT EXISTS "prenta_document_notifications_userId_readAt_idx" ON "prenta_document_notifications"("userId", "readAt");
+CREATE INDEX IF NOT EXISTS "prenta_document_notifications_userId_createdAt_idx" ON "prenta_document_notifications"("userId", "createdAt");
+CREATE INDEX IF NOT EXISTS "prenta_document_notifications_documentId_idx" ON "prenta_document_notifications"("documentId");
+CREATE INDEX IF NOT EXISTS "prenta_document_notifications_commentId_idx" ON "prenta_document_notifications"("commentId");
+
+ALTER TABLE "prenta_document_notifications" DROP CONSTRAINT IF EXISTS "prenta_document_notifications_userId_fkey";
+ALTER TABLE "prenta_document_notifications" ADD CONSTRAINT "prenta_document_notifications_userId_fkey" FOREIGN KEY ("userId") REFERENCES "prenta_users"("id") ON DELETE CASCADE ON UPDATE CASCADE;

package/prisma/schema.prisma

@@ -125,11 +125,13 @@ model User {
   updatedDocuments    Document[]           @relation("UpdatedDocuments")
   versions            Version[]
   media               Media[]
-  contentLocks        ContentLock[]
-  notifications       InAppNotification[]
-  contentTemplates    ContentTemplate[]
-  workflowAssigned    WorkflowState[]
-  passwordResetTokens PasswordResetToken[]
+  contentLocks            ContentLock[]
+  notifications           InAppNotification[]
+  contentTemplates        ContentTemplate[]
+  workflowAssigned        WorkflowState[]
+  passwordResetTokens     PasswordResetToken[]
+  documentComments        DocumentComment[]
+  documentNotifications   DocumentNotification[]
 
   @@map("prenta_users")
 }
@@ -993,3 +995,62 @@ model ContentIssue {
   @@index([documentId])
   @@map("prenta_content_issues")
 }
+
+/// Persisted Yjs state for a document (`@prenta/realtime`). Optional: empty
+/// when collaboration is unused. Cms-core queries this from `/realtime/sync`.
+model DocumentCRDT {
+  documentId      String   @id
+  state           Bytes
+  stateVector     Bytes
+  version         Int      @default(0)
+  lastUpdatedAt   DateTime @default(now()) @updatedAt
+  lastUpdatedById String?
+  createdAt       DateTime @default(now())
+
+  @@index([lastUpdatedAt])
+  @@map("prenta_document_crdts")
+}
+
+/// Threaded inline comment. Soft-deletes keep replies attached. Optional.
+model DocumentComment {
+  id           String    @id @default(cuid())
+  documentId   String
+  parentId     String?
+  parent       DocumentComment?  @relation("CommentThread", fields: [parentId], references: [id], onDelete: Cascade)
+  replies      DocumentComment[] @relation("CommentThread")
+  userId       String?
+  user         User?     @relation(fields: [userId], references: [id], onDelete: SetNull)
+  body         String    @db.Text
+  anchor       Json?
+  resolvedAt   DateTime?
+  resolvedById String?
+  deletedAt    DateTime?
+  createdAt    DateTime  @default(now())
+  updatedAt    DateTime  @updatedAt
+
+  @@index([documentId])
+  @@index([documentId, resolvedAt])
+  @@index([parentId])
+  @@index([userId])
+  @@index([createdAt])
+  @@map("prenta_document_comments")
+}
+
+/// Per-user notification feed for collaboration events.
+model DocumentNotification {
+  id         String    @id @default(cuid())
+  userId     String
+  user       User      @relation(fields: [userId], references: [id], onDelete: Cascade)
+  kind       String
+  documentId String?
+  commentId  String?
+  payload    Json
+  readAt     DateTime?
+  createdAt  DateTime  @default(now())
+
+  @@index([userId, readAt])
+  @@index([userId, createdAt])
+  @@index([documentId])
+  @@index([commentId])
+  @@map("prenta_document_notifications")
+}