fix(project-files): align public sharing with current renderer contracts

Author: mzxchandra

apps/sim/lib/projects/files/__integration__/content-sharing.integration.ts

@@ -670,9 +670,7 @@ describe('Public file shares against PostgreSQL and private storage', () => {
       const { updateProjectFileShare } = await import('@/lib/projects/files/application/shares')
       const { authorizePublicFileShare, readPublicFileShare, readPublicFileShareContent } =
         await import('@/lib/public-shares/application')
-      const { uploadWorkspaceFile } = await import(
-        '@/lib/uploads/contexts/workspace/workspace-file-manager'
-      )
+      const { uploadWorkspaceFile } = await import('@/lib/uploads/contexts/workspace/file-manager')
       const { upsertFileShare } = await import('@/lib/public-shares/manager')
       const f = await fixture()
       const { file } = await createProjectFile.execute({

apps/sim/lib/public-shares/application/owner-adapters.ts

@@ -4,7 +4,11 @@ import { OrchestrationError } from '@/lib/core/orchestration/types'
 import type { DbTransaction } from '@/lib/db/types'
 import { lockProject, lockWorkspaceProject } from '@/lib/projects/membership'
 import { requireProjectApiEnabled } from '@/lib/projects/rollout.server'
-import { type E2BDocFormat, resolveServableDoc } from '@/lib/uploads/documents/compile'
+import {
+  type E2BDocFormat,
+  fileDocumentCacheIdentity,
+  resolveServableDoc,
+} from '@/lib/uploads/documents/compile'
 import { loadCompiledDoc } from '@/lib/uploads/documents/compiled-store'
 import { fileDocumentInputIdentity } from '@/lib/uploads/documents/input-identity'
 import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types'
@@ -78,12 +82,17 @@ const adapters: FileOwnerAdapters<PublicFileOwnerAdapter> = {
     },
     storageContext: 'project',
     pageOptions: (projectId) => ({ projectId }),
-    async readCompiled({ owner, source, format, dependencies }) {
+    async readCompiled({ owner, source, sourceMime, format, dependencies }) {
       const buffer = await loadCompiledDoc(
         owner,
         source.toString('utf8'),
         format.ext,
-        fileDocumentInputIdentity(owner, dependencies),
+        fileDocumentCacheIdentity(
+          source.toString('utf8'),
+          format,
+          sourceMime,
+          fileDocumentInputIdentity(owner, dependencies)
+        ),
         { maxBytes: MAX_BUFFERED_TRANSFER_BYTES }
       )
       if (!buffer)

apps/sim/lib/public-shares/application/read.ts

@@ -21,7 +21,7 @@ import {
 import {
   getBoundWorkspaceFileSecretProvenanceByMetadata,
   mergeWorkspaceFileSecretProvenance,
-} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance'
+} from '@/lib/uploads/contexts/workspace/file-secret-provenance'
 import { downloadFile, headObject } from '@/lib/uploads/core/storage-service'
 import {
   collectReferencedFileIds,
@@ -32,7 +32,7 @@ import {
 import { hasEmbeddedFileRef } from '@/lib/uploads/server/embedded-image-refs'
 import { resolveServableImageBytes } from '@/lib/uploads/server/image-derivative'
 import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types'
-import { resolveEffectiveMimeType } from '@/lib/uploads/utils/file-utils'
+import { resolveEffectiveMimeType } from '@/lib/uploads/utils/file'
 import { sniffImageContentType } from '@/lib/uploads/utils/validation'
 import { reportWorkspaceFileDelivery } from '@/lib/workspace-files/application/file-delivery-observer'
 import { fileOwnerCondition } from '@/lib/workspace-files/ownership-query'

apps/sim/scripts/test-project-file-public-e2e.ts

@@ -10,7 +10,8 @@ import sharp from 'sharp'
 import { encryptSecret } from '@/lib/core/security/encryption'
 import { getStorageProvider } from '@/lib/uploads/config'
 import { UPLOAD_DIR_SERVER } from '@/lib/uploads/core/setup.server'
-import { storeCompiledDoc } from '@/lib/uploads/documents/compiled-store'
+import { fileDocumentCacheIdentity, getE2BDocFormat } from '@/lib/uploads/documents/compile'
+import { compiledArtifactKey, storeCompiledDoc } from '@/lib/uploads/documents/compiled-store'
 
 /** Real public wire/cookie proof; SQL and Redis only seed disposable sharing and OTP fixtures. */
 const base = new URL(required(process.env.PROJECT_FILE_PUBLIC_BASE_URL))
@@ -305,17 +306,25 @@ try {
           json(unavailable, 409).error,
           'This document is still being prepared. Please try again shortly.'
         )
-        let key: string | undefined
+        const format = await getE2BDocFormat('output.pptx')
+        assert.ok(format)
+        const cacheIdentity =
+          owner === 'project'
+            ? fileDocumentCacheIdentity(source, format, 'text/x-pptxgenjs')
+            : undefined
+        const key = compiledArtifactKey(
+          { entityType: owner, entityId: owner === 'workspace' ? workspaceId : projectId },
+          source,
+          'pptx',
+          cacheIdentity
+        )
         await storeCompiledDoc(
           { entityType: owner, entityId: owner === 'workspace' ? workspaceId : projectId },
           source,
           'pptx',
           'application/vnd.openxmlformats-officedocument.presentationml.presentation',
           Buffer.from('PK\u0003\u0004output-fixture'),
-          undefined,
-          (writtenKey) => {
-            key = writtenKey
-          }
+          cacheIdentity
         )
         const path = resolve(UPLOAD_DIR_SERVER, required(key))
         assert.ok(path.startsWith(`${resolve(UPLOAD_DIR_SERVER)}${sep}`))

knip.jsonc

@@ -59,6 +59,8 @@
         "lib/api/contracts/file-copy-input.ts": ["exports", "types"],
         // API contract conventions require named boundary schemas and wire aliases before client adoption.
         "lib/api/contracts/project-file-downloads.ts": ["exports", "types"],
+        "lib/api/contracts/project-file-shares.ts": ["exports", "types"],
+        "lib/api/contracts/v2/project-file-shares.ts": ["exports", "types"],
         "lib/api/contracts/project-file-extraction.ts": ["exports", "types"],
         "lib/api/contracts/v2/project-file-downloads.ts": ["exports", "types"],
         "lib/api/contracts/v2/project-file-extraction.ts": ["exports", "types"],