-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: support http range header #10
Merged
SgtPooki
merged 42 commits into
main
from
9-heliaverified-fetch-http-range-request-support
Mar 15, 2024
Merged
Changes from all commits
Commits
Show all changes
42 commits
Select commit
Hold shift + click to select a range
aa705a7
chore: limit body parameters to the types used
SgtPooki 089ae24
chore: add response-header helper and tests
SgtPooki 5af9252
feat: add range header parsing support
SgtPooki 3b2e379
feat: verified-fetch supports range-requests
SgtPooki d805a51
test: fix dns test asserting test failure since we are catching it now
SgtPooki 4d8e57d
fix: return 500 error when streaming unixfs content throws
SgtPooki aa25f0c
fix: cleanup code and unexecuting tests hiding errors
SgtPooki 60b56c9
chore: some cleanup and code coverage
SgtPooki 6da36fd
tmp: most things working
SgtPooki cac2b79
fix: stream slicing and test correctness
SgtPooki 72618bc
chore: fixed some ByteRangeContext tests
SgtPooki 698ee8f
test: add back header helpers
SgtPooki e413fa5
fix: unixfs tests are passing
SgtPooki 96c7f00
fix: range-requests on raw content
SgtPooki deb2f2b
feat: tests are passing
SgtPooki f357a3d
chore: log string casing
SgtPooki 83e80d8
chore: use 502 response instead of 500
SgtPooki 121747b
chore: use libp2p/interface for types in src
SgtPooki 05a6dfb
chore: failing to create range resp logs error
SgtPooki 9dcd798
chore: Apply suggestions from code review
SgtPooki f296f0b
chore: fix broken tests from github PR patches (my own)
SgtPooki 912ee47
chore: re-enable stream tests for ByteRangeContext
SgtPooki b0b6a4a
chore: clean up getBody a bit
SgtPooki f399bed
chore: ByteRangeContext getBody cleanup
SgtPooki 607e5be
Merge branch 'main' into 9-heliaverified-fetch-http-range-request-sup…
SgtPooki eb0224b
chore: apply suggestions from code review
SgtPooki d1e6a82
fix: getSlicedBody uses correct types
SgtPooki 07ab941
chore: remove extra stat call
SgtPooki ac621a2
chore: fix jsdoc with '*/'
SgtPooki 46dc133
chore: fileSize is public property, but should not be used
SgtPooki 36f6c96
test: fix blob comparisons that broke or were never worjing properly
SgtPooki acdd632
Merge branch 'main' into 9-heliaverified-fetch-http-range-request-sup…
SgtPooki b48c672
Merge branch 'main' into 9-heliaverified-fetch-http-range-request-sup…
SgtPooki 5fc7ceb
chore: Update byte-range-context.ts
SgtPooki 19c2713
chore: jsdoc cleanup
SgtPooki a1686a3
Revert "chore: fileSize is public property, but should not be used"
SgtPooki e7e3fd0
chore: jsdoc comments explaining .fileSize use
SgtPooki c184e2a
chore: isRangeRequest is public
SgtPooki d633456
chore: getters/setters update
SgtPooki 314adca
chore: remove unnecessary _contentRangeHeaderValue
SgtPooki 8837738
chore: ByteRangeContext uses setFileSize and getFileSize
SgtPooki 3963006
chore: remove .stat changes that are no longer needed
SgtPooki File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,3 @@ | ||
export type RequestFormatShorthand = 'raw' | 'car' | 'tar' | 'ipns-record' | 'dag-json' | 'dag-cbor' | 'json' | 'cbor' | ||
|
||
export type SupportedBodyTypes = string | ArrayBuffer | Blob | ReadableStream<Uint8Array> | null | ||
303 changes: 303 additions & 0 deletions
303
packages/verified-fetch/src/utils/byte-range-context.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,303 @@ | ||
import { calculateByteRangeIndexes, getHeader } from './request-headers.js' | ||
import { getContentRangeHeader } from './response-headers.js' | ||
import type { SupportedBodyTypes } from '../types.js' | ||
import type { ComponentLogger, Logger } from '@libp2p/interface' | ||
|
||
type SliceableBody = Exclude<SupportedBodyTypes, ReadableStream<Uint8Array> | null> | ||
|
||
/** | ||
* Gets the body size of a given body if it's possible to calculate it synchronously. | ||
*/ | ||
function getBodySizeSync (body: SupportedBodyTypes): number | null { | ||
if (typeof body === 'string') { | ||
return body.length | ||
} | ||
if (body instanceof ArrayBuffer || body instanceof Uint8Array) { | ||
return body.byteLength | ||
} | ||
if (body instanceof Blob) { | ||
return body.size | ||
} | ||
|
||
if (body instanceof ReadableStream) { | ||
return null | ||
} | ||
|
||
return null | ||
} | ||
|
||
function getByteRangeFromHeader (rangeHeader: string): { start: string, end: string } { | ||
/** | ||
* Range: bytes=<start>-<end> | bytes=<start2>- | bytes=-<end2> | ||
*/ | ||
const match = rangeHeader.match(/^bytes=(?<start>\d+)?-(?<end>\d+)?$/) | ||
if (match?.groups == null) { | ||
throw new Error('Invalid range request') | ||
} | ||
|
||
const { start, end } = match.groups | ||
|
||
return { start, end } | ||
} | ||
|
||
export class ByteRangeContext { | ||
public readonly isRangeRequest: boolean | ||
|
||
/** | ||
* This property is purposefully only set in `set fileSize` and should not be set directly. | ||
*/ | ||
private _fileSize: number | null | undefined | ||
private _body: SupportedBodyTypes = null | ||
private readonly rangeRequestHeader: string | undefined | ||
private readonly log: Logger | ||
private readonly requestRangeStart: number | null | ||
private readonly requestRangeEnd: number | null | ||
private byteStart: number | undefined | ||
private byteEnd: number | undefined | ||
private byteSize: number | undefined | ||
|
||
constructor (logger: ComponentLogger, private readonly headers?: HeadersInit) { | ||
this.log = logger.forComponent('helia:verified-fetch:byte-range-context') | ||
this.rangeRequestHeader = getHeader(this.headers, 'Range') | ||
if (this.rangeRequestHeader != null) { | ||
this.isRangeRequest = true | ||
this.log.trace('range request detected') | ||
try { | ||
const { start, end } = getByteRangeFromHeader(this.rangeRequestHeader) | ||
this.requestRangeStart = start != null ? parseInt(start) : null | ||
this.requestRangeEnd = end != null ? parseInt(end) : null | ||
} catch (e) { | ||
this.log.error('error parsing range request header: %o', e) | ||
this.requestRangeStart = null | ||
this.requestRangeEnd = null | ||
} | ||
|
||
this.setOffsetDetails() | ||
} else { | ||
this.log.trace('no range request detected') | ||
this.isRangeRequest = false | ||
this.requestRangeStart = null | ||
this.requestRangeEnd = null | ||
} | ||
} | ||
|
||
public setBody (body: SupportedBodyTypes): void { | ||
this._body = body | ||
// if fileSize was already set, don't recalculate it | ||
this.setFileSize(this._fileSize ?? getBodySizeSync(body)) | ||
|
||
this.log.trace('set request body with fileSize %o', this._fileSize) | ||
} | ||
|
||
public getBody (): SupportedBodyTypes { | ||
const body = this._body | ||
if (body == null) { | ||
this.log.trace('body is null') | ||
return body | ||
} | ||
if (!this.isRangeRequest || !this.isValidRangeRequest) { | ||
this.log.trace('returning body unmodified for non-range, or invalid range, request') | ||
return body | ||
} | ||
const byteStart = this.byteStart | ||
const byteEnd = this.byteEnd | ||
const byteSize = this.byteSize | ||
if (byteStart != null || byteEnd != null) { | ||
this.log.trace('returning body with byteStart=%o, byteEnd=%o, byteSize=%o', byteStart, byteEnd, byteSize) | ||
if (body instanceof ReadableStream) { | ||
// stream should already be spliced by `unixfs.cat` | ||
return body | ||
} | ||
return this.getSlicedBody(body) | ||
} | ||
|
||
// we should not reach this point, but return body untouched. | ||
this.log.error('returning unmodified body for valid range request') | ||
return body | ||
} | ||
|
||
private getSlicedBody <T extends SliceableBody>(body: T): SliceableBody { | ||
if (this.isPrefixLengthRequest) { | ||
this.log.trace('sliced body with byteStart %o', this.byteStart) | ||
return body.slice(this.offset) satisfies SliceableBody | ||
} | ||
if (this.isSuffixLengthRequest && this.length != null) { | ||
this.log.trace('sliced body with length %o', -this.length) | ||
return body.slice(-this.length) satisfies SliceableBody | ||
} | ||
const offset = this.byteStart ?? 0 | ||
const length = this.byteEnd == null ? undefined : this.byteEnd + 1 | ||
this.log.trace('returning body with offset %o and length %o', offset, length) | ||
|
||
return body.slice(offset, length) satisfies SliceableBody | ||
} | ||
|
||
private get isSuffixLengthRequest (): boolean { | ||
return this.requestRangeStart == null && this.requestRangeEnd != null | ||
} | ||
|
||
private get isPrefixLengthRequest (): boolean { | ||
return this.requestRangeStart != null && this.requestRangeEnd == null | ||
} | ||
|
||
/** | ||
* Sometimes, we need to set the fileSize explicitly because we can't calculate | ||
* the size of the body (e.g. for unixfs content where we call .stat). | ||
* | ||
* This fileSize should otherwise only be called from `setBody`. | ||
*/ | ||
public setFileSize (size: number | bigint | null): void { | ||
this._fileSize = size != null ? Number(size) : null | ||
this.log.trace('set _fileSize to %o', this._fileSize) | ||
// when fileSize changes, we need to recalculate the offset details | ||
this.setOffsetDetails() | ||
} | ||
|
||
public getFileSize (): number | null | undefined { | ||
return this._fileSize | ||
} | ||
|
||
private isValidByteStart (): boolean { | ||
if (this.byteStart != null) { | ||
if (this.byteStart < 0) { | ||
return false | ||
} | ||
if (this._fileSize != null && this.byteStart > this._fileSize) { | ||
return false | ||
} | ||
} | ||
return true | ||
} | ||
|
||
private isValidByteEnd (): boolean { | ||
if (this.byteEnd != null) { | ||
if (this.byteEnd < 0) { | ||
return false | ||
} | ||
if (this._fileSize != null && this.byteEnd > this._fileSize) { | ||
return false | ||
} | ||
} | ||
return true | ||
} | ||
|
||
/** | ||
* We may get the values required to determine if this is a valid range request at different times | ||
* so we need to calculate it when asked. | ||
*/ | ||
public get isValidRangeRequest (): boolean { | ||
if (!this.isRangeRequest) { | ||
return false | ||
} | ||
if (this.requestRangeStart == null && this.requestRangeEnd == null) { | ||
this.log.trace('invalid range request, range request values not provided') | ||
return false | ||
} | ||
if (!this.isValidByteStart()) { | ||
this.log.trace('invalid range request, byteStart is less than 0 or greater than fileSize') | ||
return false | ||
} | ||
if (!this.isValidByteEnd()) { | ||
this.log.trace('invalid range request, byteEnd is less than 0 or greater than fileSize') | ||
return false | ||
} | ||
if (this.requestRangeEnd != null && this.requestRangeStart != null) { | ||
// we may not have enough info.. base check on requested bytes | ||
if (this.requestRangeStart > this.requestRangeEnd) { | ||
this.log.trace('invalid range request, start is greater than end') | ||
return false | ||
} else if (this.requestRangeStart < 0) { | ||
this.log.trace('invalid range request, start is less than 0') | ||
return false | ||
} else if (this.requestRangeEnd < 0) { | ||
this.log.trace('invalid range request, end is less than 0') | ||
return false | ||
} | ||
} | ||
|
||
return true | ||
} | ||
|
||
/** | ||
* Given all the information we have, this function returns the offset that will be used when: | ||
* 1. calling unixfs.cat | ||
* 2. slicing the body | ||
*/ | ||
public get offset (): number { | ||
if (this.byteStart === 0) { | ||
return 0 | ||
} | ||
if (this.isPrefixLengthRequest || this.isSuffixLengthRequest) { | ||
if (this.byteStart != null) { | ||
// we have to subtract by 1 because the offset is inclusive | ||
return this.byteStart - 1 | ||
} | ||
} | ||
|
||
return this.byteStart ?? 0 | ||
} | ||
|
||
/** | ||
* Given all the information we have, this function returns the length that will be used when: | ||
* 1. calling unixfs.cat | ||
* 2. slicing the body | ||
*/ | ||
public get length (): number | undefined { | ||
return this.byteSize ?? undefined | ||
} | ||
|
||
/** | ||
* Converts a range request header into helia/unixfs supported range options | ||
* Note that the gateway specification says we "MAY" support multiple ranges (https://specs.ipfs.tech/http-gateways/path-gateway/#range-request-header) but we don't | ||
* | ||
* Also note that @helia/unixfs and ipfs-unixfs-exporter expect length and offset to be numbers, the range header is a string, and the size of the resource is likely a bigint. | ||
* | ||
* SUPPORTED: | ||
* Range: bytes=<range-start>-<range-end> | ||
* Range: bytes=<range-start>- | ||
* Range: bytes=-<suffix-length> // must pass size so we can calculate the offset. suffix-length is the number of bytes from the end of the file. | ||
* | ||
* NOT SUPPORTED: | ||
* Range: bytes=<range-start>-<range-end>, <range-start>-<range-end> | ||
* Range: bytes=<range-start>-<range-end>, <range-start>-<range-end>, <range-start>-<range-end> | ||
* | ||
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Range#directives | ||
*/ | ||
private setOffsetDetails (): void { | ||
if (this.requestRangeStart == null && this.requestRangeEnd == null) { | ||
this.log.trace('requestRangeStart and requestRangeEnd are null') | ||
return | ||
} | ||
|
||
const { start, end, byteSize } = calculateByteRangeIndexes(this.requestRangeStart ?? undefined, this.requestRangeEnd ?? undefined, this._fileSize ?? undefined) | ||
this.log.trace('set byteStart to %o, byteEnd to %o, byteSize to %o', start, end, byteSize) | ||
this.byteStart = start | ||
this.byteEnd = end | ||
this.byteSize = byteSize | ||
} | ||
|
||
/** | ||
* This function returns the value of the "content-range" header. | ||
* | ||
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Range | ||
* | ||
* Returns a string representing the following content ranges: | ||
* | ||
* @example | ||
* - Content-Range: <unit> <byteStart>-<byteEnd>/<byteSize> | ||
* - Content-Range: <unit> <byteStart>-<byteEnd>/* | ||
*/ | ||
// - Content-Range: <unit> */<byteSize> // this is purposefully not in jsdoc block | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @achingbrain is this better than all as single line comments? |
||
public get contentRangeHeaderValue (): string { | ||
if (!this.isValidRangeRequest) { | ||
this.log.error('cannot get contentRangeHeaderValue for invalid range request') | ||
throw new Error('Invalid range request') | ||
} | ||
|
||
return getContentRangeHeader({ | ||
byteStart: this.byteStart, | ||
byteEnd: this.byteEnd, | ||
byteSize: this._fileSize ?? undefined | ||
}) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
export function getHeader (headers: HeadersInit | undefined, header: string): string | undefined { | ||
SgtPooki marked this conversation as resolved.
Show resolved
Hide resolved
|
||
if (headers == null) { | ||
return undefined | ||
} | ||
if (headers instanceof Headers) { | ||
return headers.get(header) ?? undefined | ||
} | ||
if (Array.isArray(headers)) { | ||
const entry = headers.find(([key]) => key.toLowerCase() === header.toLowerCase()) | ||
return entry?.[1] | ||
} | ||
const key = Object.keys(headers).find(k => k.toLowerCase() === header.toLowerCase()) | ||
if (key == null) { | ||
return undefined | ||
} | ||
|
||
return headers[key] | ||
} | ||
|
||
/** | ||
* Given two ints from a Range header, and potential fileSize, returns: | ||
* 1. number of bytes the response should contain. | ||
* 2. the start index of the range. // inclusive | ||
* 3. the end index of the range. // inclusive | ||
*/ | ||
export function calculateByteRangeIndexes (start: number | undefined, end: number | undefined, fileSize?: number): { byteSize?: number, start?: number, end?: number } { | ||
if (start != null && end != null) { | ||
if (start > end) { | ||
throw new Error('Invalid range') | ||
} | ||
|
||
return { byteSize: end - start + 1, start, end } | ||
} else if (start == null && end != null) { | ||
// suffix byte range requested | ||
if (fileSize == null) { | ||
return { end } | ||
} | ||
const result = { byteSize: end, start: fileSize - end + 1, end: fileSize } | ||
return result | ||
} else if (start != null && end == null) { | ||
if (fileSize == null) { | ||
return { start } | ||
} | ||
const byteSize = fileSize - start + 1 | ||
const end = fileSize | ||
return { byteSize, start, end } | ||
} | ||
|
||
// both start and end are undefined | ||
return { byteSize: fileSize } | ||
} | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Picking nits but
Types
is redundant in a type,Supported
is a business-logic kind of decision not a type, so justBody
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would rather do something like
ResponseBody
, but i'm good with any.Body
could easily be a type that comes from builtin/global types that could cause confusion.SupportedBody
would be better I guess.. but it's explicitly informing devs reading the code that it's not just typicalResponse.body
types.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ResponseBody
would be fine. It's a minor point tbh.