-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: implement new ipns record&answer properties (#23)
* feat: implement new ipns record&answer properties * fix: parseUrlString response includes defined ttl, set ttl if ipnsCached * test: fix firefox failure * feat: support http range header (#10) * chore: limit body parameters to the types used * chore: add response-header helper and tests * feat: add range header parsing support * feat: verified-fetch supports range-requests * test: fix dns test asserting test failure since we are catching it now * fix: return 500 error when streaming unixfs content throws * fix: cleanup code and unexecuting tests hiding errors * chore: some cleanup and code coverage * tmp: most things working * fix: stream slicing and test correctness * chore: fixed some ByteRangeContext tests * test: add back header helpers * fix: unixfs tests are passing * fix: range-requests on raw content * feat: tests are passing moved transform stream over to https://github.com/SgtPooki/streams * chore: log string casing * chore: use 502 response instead of 500 * chore: use libp2p/interface for types in src * chore: failing to create range resp logs error * chore: Apply suggestions from code review * chore: fix broken tests from github PR patches (my own) * chore: re-enable stream tests for ByteRangeContext * chore: clean up getBody a bit * chore: ByteRangeContext getBody cleanup * chore: apply suggestions from code review Co-authored-by: Alex Potsides <alex@achingbrain.net> * fix: getSlicedBody uses correct types * chore: remove extra stat call * chore: fix jsdoc with '*/' * chore: fileSize is public property, but should not be used * test: fix blob comparisons that broke or were never worjing properly * chore: Update byte-range-context.ts Co-authored-by: Alex Potsides <alex@achingbrain.net> * chore: jsdoc cleanup * Revert "chore: fileSize is public property, but should not be used" This reverts commit 46dc133. * chore: jsdoc comments explaining .fileSize use * chore: isRangeRequest is public * chore: getters/setters update * chore: remove unnecessary _contentRangeHeaderValue * chore: ByteRangeContext uses setFileSize and getFileSize * chore: remove .stat changes that are no longer needed --------- Co-authored-by: Alex Potsides <alex@achingbrain.net> * chore(release): 1.2.0 [skip ci] ## @helia/verified-fetch [1.2.0](https://github.com/ipfs/helia-verified-fetch/compare/@helia/verified-fetch-1.1.3...@helia/verified-fetch-1.2.0) (2024-03-15) ### Features * support http range header ([#10](#10)) ([9f5078a](9f5078a)) ### Trivial Changes * fix build ([#22](#22)) ([01261fe](01261fe)) * chore(release): 1.7.0 [skip ci] ## @helia/verified-fetch-interop [1.7.0](https://github.com/ipfs/helia-verified-fetch/compare/@helia/verified-fetch-interop-1.6.0...@helia/verified-fetch-interop-1.7.0) (2024-03-15) ### Dependencies * **@helia/verified-fetch:** upgraded to 1.2.0 * chore: apply pr comments * fix: some ipns ttl precision cleanup --------- Co-authored-by: Alex Potsides <alex@achingbrain.net> Co-authored-by: semantic-release-bot <semantic-release-bot@martynus.net>
- Loading branch information
3 people
authored
Mar 18, 2024
1 parent
f9ba592
commit 9065aba
Showing
21 changed files
with
1,161 additions
and
86 deletions.
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
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
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 | ||
| 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
Oops, something went wrong.