fix(db): harden workspace file size cutover

Author: waleedlatif1

apps/sim/app/api/files/export/[id]/route.test.ts

@@ -58,7 +58,7 @@ function assetRecord(id: string, size: number) {
     originalName: `${id}.png`,
     contentType: 'image/png',
     context: 'workspace',
-    size,
+    sizeBytes: size,
     workspaceId: 'ws-1',
   }
 }
@@ -69,7 +69,7 @@ const DOC_RECORD = {
   originalName: 'doc.md',
   contentType: 'text/markdown',
   context: 'workspace',
-  size: 1024,
+  sizeBytes: 1024,
   workspaceId: 'ws-1',
 }
 

apps/sim/app/api/files/export/[id]/route.ts

@@ -17,6 +17,7 @@ import { getServeStoragePrefix } from '@/lib/uploads/config'
 import { downloadFile } from '@/lib/uploads/core/storage-service'
 import { extractEmbeddedFileRefs } from '@/lib/uploads/server/embedded-image-refs'
 import { getFileMetadataById } from '@/lib/uploads/server/metadata'
+import { getWorkspaceFileSize } from '@/lib/uploads/shared/types'
 import { storedFileId } from '@/lib/uploads/utils/embedded-image-ref'
 import { formatFileSize } from '@/lib/uploads/utils/file-utils'
 import { verifyFileAccess } from '@/app/api/files/authorization'
@@ -103,7 +104,7 @@ export const GET = withRouteHandler(
         metadata: {
           fileId: record.id,
           fileName: record.originalName,
-          bytes: record.size,
+          bytes: getWorkspaceFileSize(record),
           format,
           assetCount,
         },
@@ -178,7 +179,8 @@ export const GET = withRouteHandler(
     // The body counts against the same budget as its assets — the zip holds both, so a
     // limit that measured only the attachments would not describe the archive produced.
     const bundleBytes =
-      mdBuffer.length + assetTargets.reduce((sum, target) => sum + target.record.size, 0)
+      mdBuffer.length +
+      assetTargets.reduce((sum, target) => sum + getWorkspaceFileSize(target.record), 0)
     if (bundleBytes > MAX_EXPORT_TOTAL_BYTES) {
       return NextResponse.json(
         {

apps/sim/app/api/files/public/[token]/content/route.test.ts

@@ -52,7 +52,7 @@ const passwordShare = {
     workspaceId: 'ws-1',
     originalName: 'report.pdf',
     contentType: 'application/pdf',
-    size: 4,
+    sizeBytes: 4,
   },
   workspaceName: 'Acme',
   ownerName: 'Jane',

apps/sim/app/api/files/public/[token]/route.test.ts

@@ -52,7 +52,7 @@ const publicShare = {
     workspaceId: 'ws-secret',
     originalName: 'report.pdf',
     contentType: 'application/pdf',
-    size: 2048,
+    sizeBytes: 2048,
   },
   workspaceName: 'Acme Workspace',
   ownerName: 'Jane Doe',

apps/sim/app/api/files/public/[token]/route.ts

@@ -13,6 +13,7 @@ import { generateRequestId } from '@/lib/core/utils/request'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import { enforcePublicFileRateLimit } from '@/lib/public-shares/rate-limit'
 import { resolveActiveShareByToken } from '@/lib/public-shares/share-manager'
+import { getWorkspaceFileSize } from '@/lib/uploads/shared/types'
 
 export const dynamic = 'force-dynamic'
 
@@ -58,7 +59,7 @@ export const GET = withRouteHandler(
         token,
         name: file.originalName,
         type: file.contentType,
-        size: file.size,
+        size: getWorkspaceFileSize(file),
         workspaceName,
         ownerName,
       })

apps/sim/app/api/files/uploads/finalizers.ts

@@ -1,7 +1,7 @@
 import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit'
 import { type Principal, resolvePrincipalAuditAttribution } from '@sim/auth/principal'
 import { db } from '@sim/db'
-import { workspaceFiles } from '@sim/db/schema'
+import { type WorkspaceFileRow, workspaceFileColumns, workspaceFiles } from '@sim/db/schema'
 import { generateId } from '@sim/utils/id'
 import { eq, sql } from 'drizzle-orm'
 import type { V2File } from '@/lib/api/contracts/v2/files'
@@ -80,7 +80,7 @@ interface FinalizedMetadataInput {
   size: number
 }
 
-type FileMetadataRecord = typeof workspaceFiles.$inferSelect
+type FileMetadataRecord = WorkspaceFileRow
 
 /**
  * Finalizes the domain resource represented by a verified upload object.
@@ -371,7 +371,7 @@ async function insertOrLoadFileMetadata(
       contentUpdatedAt: now,
     })
     .onConflictDoNothing()
-    .returning()
+    .returning(workspaceFileColumns)
 
   if (inserted) return { file: inserted, created: true }
 
@@ -386,7 +386,7 @@ async function insertOrLoadFileMetadata(
 
 async function findFileMetadataByKey(key: string): Promise<FileMetadataRecord | undefined> {
   const [file] = await db
-    .select()
+    .select(workspaceFileColumns)
     .from(workspaceFiles)
     .where(eq(workspaceFiles.key, key))
     .orderBy(sql`${workspaceFiles.deletedAt} IS NULL DESC`)

apps/sim/app/f/[token]/page.tsx

@@ -9,6 +9,7 @@ import {
   validateAuthToken,
 } from '@/lib/core/security/deployment'
 import { resolveActiveShareByToken } from '@/lib/public-shares/share-manager'
+import { getWorkspaceFileSize } from '@/lib/uploads/shared/types'
 import { PublicFileAuth } from '@/app/f/[token]/public-file-auth'
 import { PublicFileEmailAuth } from '@/app/f/[token]/public-file-email-auth'
 import { PublicFileSSOAuth } from '@/app/f/[token]/public-file-sso-auth'
@@ -117,7 +118,7 @@ export default async function PublicFilePage({ params }: PublicFilePageProps) {
       token={token}
       name={file.originalName}
       type={file.contentType}
-      size={file.size}
+      size={getWorkspaceFileSize(file)}
       version={file.updatedAt.getTime()}
       workspaceName={workspaceName}
       ownerName={ownerName}

apps/sim/background/cleanup-soft-deletes.test.ts

@@ -159,7 +159,7 @@ describe('cleanup soft deletes', () => {
         },
       ])
     mockDeleteFiles.mockResolvedValueOnce({ deleted: 2, failed: [] })
-    dbChainMockFns.returning.mockResolvedValueOnce([{ id: 'file-deleted', size: 7 }])
+    dbChainMockFns.returning.mockResolvedValueOnce([{ id: 'file-deleted', sizeBytes: 7 }])
 
     await runCleanupSoftDeletes(basePayload)
 

apps/sim/background/cleanup-soft-deletes.ts

@@ -328,12 +328,12 @@ async function deleteExpiredBillableWorkspaceFileRows(
             )
             .returning({
               id: workspaceFiles.id,
-              size: sql<number>`${workspaceFiles.sizeBytes}`.mapWith(Number),
+              sizeBytes: workspaceFiles.sizeBytes,
             })
-          if (deletedRows.some(({ size }) => size < 0)) {
-            throw new Error('Cannot delete workspace files with negative stored-byte metadata')
-          }
-          const deletedBytes = deletedRows.reduce((total, { size }) => total + size, 0)
+          const deletedBytes = deletedRows.reduce(
+            (total, row) => total + getWorkspaceFileSize(row),
+            0
+          )
           await decrementStorageUsageForBillingContextInTx(tx, billingContext, deletedBytes)
           return deletedRows.length
         })

apps/sim/ee/workspace-forking/lib/copy/copy-files.ts

@@ -1,5 +1,5 @@
 import { db } from '@sim/db'
-import { workspaceFiles } from '@sim/db/schema'
+import { workspaceFileColumns, workspaceFiles } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { getErrorMessage } from '@sim/utils/errors'
 import { generateId } from '@sim/utils/id'
@@ -180,7 +180,7 @@ export async function planForkFileCopies(params: {
     fileKeys.length > 0 ? inArray(workspaceFiles.key, fileKeys) : undefined,
   ].filter((clause): clause is NonNullable<typeof clause> => clause !== undefined)
   const metas = await tx
-    .select()
+    .select(workspaceFileColumns)
     .from(workspaceFiles)
     .where(
       and(