Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/generateS3Client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ export function generateS3Client<T>({
maxAttempts: RETRY_ATTEMPTS,
requestHandler: oneBlinkRequestHandler,
credentials: {} as AwsCredentialIdentity,
requestChecksumCalculation:
oneBlinkHttpHandler.requestChecksumCalculation,
// Sign requests with our own Authorization header instead
// of letting AWS SDK attempt to generate credentials
signer: {
Expand Down
3 changes: 3 additions & 0 deletions src/http-handlers/FetchHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ import { HttpRequest, HttpResponse } from '@smithy/protocol-http'
import { HttpHandlerOptions } from '@smithy/types'
import { IOneBlinkHttpHandler } from './types.js'
import { GetObjectCommandOutput } from '@aws-sdk/client-s3'
import { RequestChecksumCalculation } from '@aws-sdk/middleware-flexible-checksums'

export class OneBlinkFetchHandler implements IOneBlinkHttpHandler {
requestChecksumCalculation = RequestChecksumCalculation.WHEN_REQUIRED

async handleRequest(request: HttpRequest, options?: HttpHandlerOptions) {
const { FetchHttpHandler } = await import('@smithy/fetch-http-handler')
const fetchHttpHandler = new FetchHttpHandler()
Expand Down
3 changes: 3 additions & 0 deletions src/http-handlers/NodeJsHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ import { HttpRequest, HttpResponse } from '@smithy/protocol-http'
import { HttpHandlerOptions } from '@smithy/types'
import { IOneBlinkHttpHandler, FailResponse } from './types.js'
import { GetObjectCommandOutput } from '@aws-sdk/client-s3'
import { RequestChecksumCalculation } from '@aws-sdk/middleware-flexible-checksums'

export class OneBlinkNodeJsHandler implements IOneBlinkHttpHandler {
requestChecksumCalculation = RequestChecksumCalculation.WHEN_SUPPORTED

async handleRequest(
request: HttpRequest,
options?: HttpHandlerOptions | undefined,
Expand Down
6 changes: 6 additions & 0 deletions src/http-handlers/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { GetObjectCommandOutput } from '@aws-sdk/client-s3'
import { RequestChecksumCalculation } from '@aws-sdk/middleware-flexible-checksums'
import { AWSTypes } from '@oneblink/types'
import { HttpRequest, HttpResponse } from '@smithy/protocol-http'
import { HttpHandlerOptions } from '@smithy/types'
Expand All @@ -14,6 +15,11 @@ export type FailResponse = {
}

export interface IOneBlinkHttpHandler {
/**
* Need this to avoid this [issue with the AWS
* SDK](https://github.com/aws/aws-sdk-js-v3/issues/6810)
*/
requestChecksumCalculation: RequestChecksumCalculation
handleRequest: (
request: HttpRequest,
options?: HttpHandlerOptions,
Expand Down