Skip to content

Commit

Permalink
handle localIDs in part and complete endpoints
Browse files Browse the repository at this point in the history
  • Loading branch information
FlintSH committed Mar 1, 2025
1 parent 6702332 commit cc0fcf4
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
20 changes: 10 additions & 10 deletions app/api/files/chunks/[uploadId]/complete/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ async function getAuthenticatedUser(req: Request) {
}

// Get upload metadata from temp file
async function getUploadMetadata(uploadId: string) {
async function getUploadMetadata(localId: string) {
try {
const TEMP_DIR = join(process.cwd(), 'tmp', 'uploads')
const metadataPath = join(TEMP_DIR, uploadId)
const metadataPath = join(TEMP_DIR, `meta-${localId}`)
const data = await readFile(metadataPath, 'utf8')
return JSON.parse(data)
} catch (error) {
if (error instanceof Error) {
console.error(
`Error reading metadata for upload ${uploadId}:`,
`Error reading metadata for upload ${localId}:`,
error.message
)
}
Expand All @@ -57,13 +57,13 @@ async function getUploadMetadata(uploadId: string) {
}

// Delete upload metadata file
async function deleteUploadMetadata(uploadId: string) {
async function deleteUploadMetadata(localId: string) {
try {
const TEMP_DIR = join(process.cwd(), 'tmp', 'uploads')
const metadataPath = join(TEMP_DIR, uploadId)
const metadataPath = join(TEMP_DIR, `meta-${localId}`)
await unlink(metadataPath)
} catch (err) {
console.error(`Error deleting metadata for upload ${uploadId}:`, err)
console.error(`Error deleting metadata for upload ${localId}:`, err)
}
}

Expand All @@ -77,9 +77,9 @@ export async function POST(
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
}

const { uploadId } = await context.params
const { uploadId: localId } = await context.params

const metadata = await getUploadMetadata(uploadId)
const metadata = await getUploadMetadata(localId)
if (!metadata) {
return NextResponse.json({ error: 'Upload not found' }, { status: 404 })
}
Expand All @@ -98,7 +98,7 @@ export async function POST(
const storageProvider = await getStorageProvider()
await storageProvider.completeMultipartUpload(
metadata.fileKey,
uploadId,
metadata.s3UploadId,
parts
)

Expand Down Expand Up @@ -134,7 +134,7 @@ export async function POST(
})

// Clean up metadata
await deleteUploadMetadata(uploadId)
await deleteUploadMetadata(localId)

// Process OCR if it's an image
if (metadata.mimeType.startsWith('image/')) {
Expand Down
18 changes: 9 additions & 9 deletions app/api/files/chunks/[uploadId]/part/[partNumber]/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ async function getAuthenticatedUser(req: Request) {
}

// Get upload metadata from temp file
async function getUploadMetadata(uploadId: string) {
async function getUploadMetadata(localId: string) {
try {
const TEMP_DIR = join(process.cwd(), 'tmp', 'uploads')
const metadataPath = join(TEMP_DIR, uploadId)
const metadataPath = join(TEMP_DIR, `meta-${localId}`)
const data = await readFile(metadataPath, 'utf8')
return JSON.parse(data)
} catch (error) {
if (error instanceof Error) {
console.error(
`Error reading metadata for upload ${uploadId}:`,
`Error reading metadata for upload ${localId}:`,
error.message
)
}
Expand All @@ -65,9 +65,9 @@ export async function GET(
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
}

const { uploadId, partNumber } = await context.params
const { uploadId: localId, partNumber } = await context.params

const metadata = await getUploadMetadata(uploadId)
const metadata = await getUploadMetadata(localId)
if (!metadata) {
return NextResponse.json({ error: 'Upload not found' }, { status: 404 })
}
Expand All @@ -79,7 +79,7 @@ export async function GET(
const storageProvider = await getStorageProvider()
const url = await storageProvider.getPresignedPartUploadUrl(
metadata.fileKey,
uploadId,
metadata.s3UploadId,
parseInt(partNumber)
)

Expand Down Expand Up @@ -110,9 +110,9 @@ export async function PUT(
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
}

const { uploadId, partNumber } = await context.params
const { uploadId: localId, partNumber } = await context.params

const metadata = await getUploadMetadata(uploadId)
const metadata = await getUploadMetadata(localId)
if (!metadata) {
return NextResponse.json({ error: 'Upload not found' }, { status: 404 })
}
Expand All @@ -128,7 +128,7 @@ export async function PUT(
const storageProvider = await getStorageProvider()
const response = await storageProvider.uploadPart(
metadata.fileKey,
uploadId,
metadata.s3UploadId,
parseInt(partNumber),
Buffer.from(chunk)
)
Expand Down

0 comments on commit cc0fcf4

Please sign in to comment.