-
Notifications
You must be signed in to change notification settings - Fork 4
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 8 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 | ||
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,86 @@ | ||
import { type CatOptions } from '@helia/unixfs' | ||
import { CodeError } from '@libp2p/interface' | ||
import { type ExporterOptions } from 'ipfs-unixfs-exporter' | ||
|
||
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] | ||
} | ||
|
||
/** | ||
* Type abstraction that will break the build if the supported range options change. | ||
*/ | ||
export interface HeliaRangeOptions extends Pick<ExporterOptions | CatOptions, 'offset' | 'length'> { | ||
suffixLength?: number | ||
} | ||
|
||
/** | ||
* 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 | ||
* | ||
* 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 | ||
*/ | ||
export function getRequestRange (headers: Headers | HeadersInit | undefined, size?: bigint): HeliaRangeOptions | undefined { | ||
SgtPooki marked this conversation as resolved.
Show resolved
Hide resolved
|
||
const range = getHeader(headers, 'Range') | ||
if (range == null) { | ||
return undefined | ||
} | ||
|
||
/** | ||
* Range: bytes=<start>-<end> | bytes=<start2>- | bytes=-<end2> | ||
*/ | ||
const match = range.match(/^bytes=((?<start>\d+)-(?<end>\d+)|(?<start2>\d+)-|-(?<end2>\d+))$/) | ||
SgtPooki marked this conversation as resolved.
Show resolved
Hide resolved
|
||
if (match?.groups == null) { | ||
throw new CodeError('ERR_INVALID_RANGE_REQUEST', 'Invalid range request') | ||
} | ||
const { start, end, start2, end2 } = match.groups | ||
|
||
let offset: number | undefined | ||
let length: number | undefined | ||
let suffixLength: number | undefined | ||
if (end2 != null) { | ||
if (size == null) { | ||
suffixLength = Number(end2) | ||
} else { | ||
const stop = BigInt(end2) | ||
offset = Number(size - stop) | ||
length = Number(stop) | ||
} | ||
} else if (start2 != null) { | ||
offset = parseInt(start2) | ||
} else { | ||
offset = parseInt(start) | ||
length = parseInt(end) - offset + 1 | ||
} | ||
|
||
return { | ||
offset, | ||
length, | ||
suffixLength | ||
} | ||
} |
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,53 @@ | ||
import { CodeError } from '@libp2p/interface' | ||
import type { SupportedBodyTypes } from '../types.js' | ||
|
||
/** | ||
* Gets the body size of a given body if it's possible to calculate it synchronously. | ||
*/ | ||
function syncBodySize (body: SupportedBodyTypes): number | null { | ||
SgtPooki marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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 | ||
} | ||
|
||
/** | ||
* This function returns the value of the `Content-Range` header for a given range. | ||
* If you know the total size of the body, you should pass it in the `options` object. | ||
SgtPooki marked this conversation as resolved.
Show resolved
Hide resolved
|
||
* | ||
* offset and length are 0-based, and the range is inclusive. | ||
* | ||
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Range | ||
*/ | ||
export function getContentRangeHeader ({ body, ...opts }: { offset?: number, length?: number, total?: number, body: SupportedBodyTypes }): string { | ||
const totalSizeNum = opts.total ?? syncBodySize(body) | ||
const rangeStart = opts.offset ?? 0 | ||
let rangeEnd = opts.length | ||
|
||
if (rangeEnd == null) { | ||
if (totalSizeNum == null) { | ||
throw new CodeError('Cannot calculate content range without total size or length', 'ERR_INVALID_CONTENT_RANGE') | ||
} | ||
rangeEnd = totalSizeNum - rangeStart + 1 | ||
} | ||
let end: number | ||
if (rangeStart != null && rangeEnd != null) { | ||
end = rangeStart + rangeEnd - 1 | ||
} else { | ||
end = totalSizeNum ?? 0 | ||
} | ||
const total = totalSizeNum ?? '*' // if we don't know the total size, we should use * | ||
|
||
return `bytes ${rangeStart}-${end}/${total}` | ||
} |
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
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.