diff --git a/keyserver/src/services/blob.js b/keyserver/src/services/blob.js --- a/keyserver/src/services/blob.js +++ b/keyserver/src/services/blob.js @@ -5,7 +5,6 @@ getBlobFetchableURL, makeBlobServiceEndpointURL, } from 'lib/utils/blob-service.js'; -import { getMessageForException } from 'lib/utils/errors.js'; import { createHTTPAuthorizationHeader } from 'lib/utils/services-utils.js'; import { verifyUserLoggedIn } from '../user/login.js'; @@ -36,7 +35,21 @@ +holder: string, }; -async function uploadBlob(blob: Blob, hash: string): Promise { +type BlobOperationResult = + | { + +success: true, + } + | { + +success: false, + +reason: 'HASH_IN_USE' | 'OTHER', + +status: number, + +statusText: string, + }; + +async function uploadBlob( + blob: Blob, + hash: string, +): Promise { const formData = new FormData(); formData.append('blob_hash', hash); formData.append('blob_data', blob); @@ -53,11 +66,21 @@ if (!uploadBlobResponse.ok) { const { status, statusText } = uploadBlobResponse; - throw new Error(`Payload upload failed with HTTP ${status}: ${statusText}`); + const reason = status === 409 ? 'HASH_IN_USE' : 'OTHER'; + return { + success: false, + reason, + status, + statusText, + }; } + + return { success: true }; } -async function assignHolder(params: BlobDescriptor): Promise { +async function assignHolder( + params: BlobDescriptor, +): Promise { const { hash, holder } = params; const headers = await createRequestHeaders(); const assignHolderResponse = await fetch( @@ -74,23 +97,39 @@ if (!assignHolderResponse.ok) { const { status, statusText } = assignHolderResponse; - throw new Error( - `Holder assignment failed with HTTP ${status}: ${statusText}`, - ); + return { success: false, reason: 'OTHER', status, statusText }; } + + return { success: true }; } -async function upload(blob: Blob, params: BlobDescriptor): Promise { +async function upload( + blob: Blob, + params: BlobDescriptor, +): Promise< + | { + +success: true, + } + | { + +success: false, + +assignHolderResult: BlobOperationResult, + +uploadBlobResult: BlobOperationResult, + }, +> { const { hash, holder } = params; - try { - await Promise.all([assignHolder({ hash, holder }), uploadBlob(blob, hash)]); - } catch (e) { - throw new Error( - `Payload upload failed with: ${ - getMessageForException(e) ?? 'unknown error' - }`, - ); + + const [holderResult, uploadResult] = await Promise.all([ + assignHolder({ hash, holder }), + uploadBlob(blob, hash), + ]); + if (holderResult.success && uploadResult.success) { + return { success: true }; } + return { + success: false, + assignHolderResult: holderResult, + uploadBlobResult: uploadResult, + }; } export type BlobDownloadResult =