feat: support multiple byte-ranges (#207)

* fix: limit size of firstChunk

* fix: set content-length if we have it

* chore: fix lint errors

* feat: all plugins support byte ranges

* feat: support multiple byte ranges in request

* test: gateway conformance passes

* feat: remove old single-byterange code

* feat: multi byterange support for unixfs data

* fix: multi-range for unixfs

* fix: revalidate byte ranges when size changes

* chore: some cleanup

* test: re-add multi-range test with expectations

* chore: gwc update script recognizes all changes

* test: update test suite success rate

* test: increase gwc avg success rate

* chore: fix lint and dont throwIfAborted

* chore: add byteranges to dictionary

Author: SgtPooki

.github/dictionary.txt

@@ -16,3 +16,4 @@ Cantarell
 Noto
 Consolas
 filev
+byteranges

packages/gateway-conformance/package.json

@@ -144,7 +144,7 @@
     "@helia/http": "^2.1.1",
     "@helia/interface": "^5.3.1",
     "@helia/routers": "^3.1.1",
-    "@helia/verified-fetch": "^2.0.0",
+    "@helia/verified-fetch": "^3.0.2",
     "@libp2p/interface": "^2.10.1",
     "@libp2p/kad-dht": "^15.1.1",
     "@libp2p/logger": "^5.1.17",

packages/gateway-conformance/src/conformance.spec.ts

@@ -154,7 +154,7 @@ describe('@helia/verified-fetch - gateway conformance', function () {
         })
       }
 
-      const knownSuccessRate = 44.14
+      const knownSuccessRate = 55.02
       it(`has expected success rate of ${knownSuccessRate}%`, () => {
         // check latest success rate with `SUCCESS_RATE=100 npm run test -- -g 'total'`
         const expectedSuccessRate = process.env.SUCCESS_RATE != null ? Number.parseFloat(process.env.SUCCESS_RATE) : knownSuccessRate

packages/gateway-conformance/src/expected-failing-tests.json

@@ -63,7 +63,6 @@
   "TestPlainCodec/GET_plain_JSON_codec_without_Accept_or_format=_has_expected_%22json%22_Content-Type_and_body_as-is_-_single_range",
   "TestPlainCodec/GET_plain_JSON_codec_without_Accept_or_format=_has_expected_%22json%22_Content-Type_and_body_as-is_-_multi_range/Check_0/Header_Content-Disposition",
   "TestPlainCodec/GET_plain_JSON_codec_without_Accept_or_format=_has_expected_%22json%22_Content-Type_and_body_as-is_-_multi_range/Check_0",
-  "TestPlainCodec/GET_plain_JSON_codec_without_Accept_or_format=_has_expected_%22json%22_Content-Type_and_body_as-is_-_multi_range/Check_1",
   "TestPlainCodec/GET_plain_JSON_codec_without_Accept_or_format=_has_expected_%22json%22_Content-Type_and_body_as-is_-_multi_range",
   "TestPlainCodec/GET_plain_JSON_codec_with_%3Fformat=_has_expected_json_Content-Type_and_body_as-is_-_full_request/Check_0/Header_Content-Disposition",
   "TestPlainCodec/GET_plain_JSON_codec_with_%3Fformat=_has_expected_json_Content-Type_and_body_as-is_-_full_request/Check_0",
@@ -73,7 +72,6 @@
   "TestPlainCodec/GET_plain_JSON_codec_with_%3Fformat=_has_expected_json_Content-Type_and_body_as-is_-_single_range",
   "TestPlainCodec/GET_plain_JSON_codec_with_%3Fformat=_has_expected_json_Content-Type_and_body_as-is_-_multi_range/Check_0/Header_Content-Disposition",
   "TestPlainCodec/GET_plain_JSON_codec_with_%3Fformat=_has_expected_json_Content-Type_and_body_as-is_-_multi_range/Check_0",
-  "TestPlainCodec/GET_plain_JSON_codec_with_%3Fformat=_has_expected_json_Content-Type_and_body_as-is_-_multi_range/Check_1",
   "TestPlainCodec/GET_plain_JSON_codec_with_%3Fformat=_has_expected_json_Content-Type_and_body_as-is_-_multi_range",
   "TestPlainCodec/GET_plain_JSON_codec_with_Accept_has_expected_json_Content-Type_and_body_as-is%2C_with_single_range_request_-_full_request/Check_0/Header_Content-Disposition",
   "TestPlainCodec/GET_plain_JSON_codec_with_Accept_has_expected_json_Content-Type_and_body_as-is%2C_with_single_range_request_-_full_request/Check_0",
@@ -83,7 +81,6 @@
   "TestPlainCodec/GET_plain_JSON_codec_with_Accept_has_expected_json_Content-Type_and_body_as-is%2C_with_single_range_request_-_single_range",
   "TestPlainCodec/GET_plain_JSON_codec_with_Accept_has_expected_json_Content-Type_and_body_as-is%2C_with_single_range_request_-_multi_range/Check_0/Header_Content-Disposition",
   "TestPlainCodec/GET_plain_JSON_codec_with_Accept_has_expected_json_Content-Type_and_body_as-is%2C_with_single_range_request_-_multi_range/Check_0",
-  "TestPlainCodec/GET_plain_JSON_codec_with_Accept_has_expected_json_Content-Type_and_body_as-is%2C_with_single_range_request_-_multi_range/Check_1",
   "TestPlainCodec/GET_plain_JSON_codec_with_Accept_has_expected_json_Content-Type_and_body_as-is%2C_with_single_range_request_-_multi_range",
   "TestPlainCodec/GET_plain_JSON_codec_with_format=dag-json_interprets_json_as_dag-%2A_variant_and_produces_expected_Content-Type_and_body/Header_Content-Disposition",
   "TestPlainCodec/GET_plain_JSON_codec_with_format=dag-json_interprets_json_as_dag-%2A_variant_and_produces_expected_Content-Type_and_body",
@@ -92,7 +89,6 @@
   "TestPlainCodec/GET_plain_JSON_codec_with_format=dag-json_interprets_json_as_dag-%2A_variant_and_produces_expected_Content-Type_and_body%2C_with_single_range_request_-_single_range",
   "TestPlainCodec/GET_plain_JSON_codec_with_format=dag-json_interprets_json_as_dag-%2A_variant_and_produces_expected_Content-Type_and_body%2C_with_single_range_request_-_multi_range/Check_0/Header_Content-Disposition",
   "TestPlainCodec/GET_plain_JSON_codec_with_format=dag-json_interprets_json_as_dag-%2A_variant_and_produces_expected_Content-Type_and_body%2C_with_single_range_request_-_multi_range/Check_0",
-  "TestPlainCodec/GET_plain_JSON_codec_with_format=dag-json_interprets_json_as_dag-%2A_variant_and_produces_expected_Content-Type_and_body%2C_with_single_range_request_-_multi_range/Check_1",
   "TestPlainCodec/GET_plain_JSON_codec_with_format=dag-json_interprets_json_as_dag-%2A_variant_and_produces_expected_Content-Type_and_body%2C_with_single_range_request_-_multi_range",
   "TestPlainCodec/GET_plain_CBOR_codec_without_Accept_or_format=_has_expected_%22cbor%22_Content-Type_and_body_as-is_-_full_request/Check_0/Header_Content-Disposition",
   "TestPlainCodec/GET_plain_CBOR_codec_without_Accept_or_format=_has_expected_%22cbor%22_Content-Type_and_body_as-is_-_full_request/Check_0",
@@ -253,14 +249,6 @@
   "TestGatewaySymlink/Test_the_symlink/Body",
   "TestGatewaySymlink/Test_the_symlink",
   "TestGatewaySymlink",
-  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_single_range_request_includes_correct_bytes/Header_Content-Range",
-  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_single_range_request_includes_correct_bytes",
-  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_suffix_range_request_includes_correct_bytes_from_the_end_of_file/Header_Content-Range",
-  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_suffix_range_request_includes_correct_bytes_from_the_end_of_file/Body",
-  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_suffix_range_request_includes_correct_bytes_from_the_end_of_file",
-  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_multiple_range_request_returned_HTTP_206/Status_code",
-  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_multiple_range_request_returned_HTTP_206",
-  "TestGatewayUnixFSFileRanges",
   "TestRedirectsFileSupport/request_for_%7Bcid%7D.ipfs.example.com%2Fredirect-one_redirects_with_default_of_301%2C_per__redirects_file/Status_code",
   "TestRedirectsFileSupport/request_for_%7Bcid%7D.ipfs.example.com%2Fredirect-one_redirects_with_default_of_301%2C_per__redirects_file/Header_Location",
   "TestRedirectsFileSupport/request_for_%7Bcid%7D.ipfs.example.com%2Fredirect-one_redirects_with_default_of_301%2C_per__redirects_file",
@@ -569,6 +557,7 @@
   "TestTrustlessCarOrderAndDuplicates/GET_CAR_with_order=dfs_and_dups=n_of_UnixFS_Directory_With_Duplicate_Files",
   "TestTrustlessCarOrderAndDuplicates/GET_CAR_smoke-test_with_order=unk_of_UnixFS_Directory/Header_Content-Type#01",
   "TestTrustlessCarOrderAndDuplicates/GET_CAR_smoke-test_with_order=unk_of_UnixFS_Directory",
+  "TestTrustlessCarOrderAndDuplicates/GET_CAR_with_order=dfs_and_dups=y_of_identity_CID/Header_Content-Type",
   "TestTrustlessCarOrderAndDuplicates/GET_CAR_with_order=dfs_and_dups=y_of_identity_CID/Header_Content-Type#01",
   "TestTrustlessCarOrderAndDuplicates/GET_CAR_with_order=dfs_and_dups=y_of_identity_CID/Body",
   "TestTrustlessCarOrderAndDuplicates/GET_CAR_with_order=dfs_and_dups=y_of_identity_CID",
@@ -592,8 +581,5 @@
   "TestTrustlessRaw/GET_with_application%2Fvnd.ipld.raw_header_returns_expected_response_headers",
   "TestTrustlessRaw/GET_with_application%2Fvnd.ipld.raw_header_returns_expected_caching_headers/Header_X-IPFS-Roots",
   "TestTrustlessRaw/GET_with_application%2Fvnd.ipld.raw_header_returns_expected_caching_headers",
-  "TestTrustlessRaw",
-  "TestTrustlessRawRanges/GET_with_application%2Fvnd.ipld.raw_with_range_request_includes_correct_bytes_-_multi_range/Check_1",
-  "TestTrustlessRawRanges/GET_with_application%2Fvnd.ipld.raw_with_range_request_includes_correct_bytes_-_multi_range",
-  "TestTrustlessRawRanges"
+  "TestTrustlessRaw"
 ]

packages/gateway-conformance/src/expected-passing-tests.json

@@ -47,6 +47,7 @@
   "TestPlainCodec/GET_plain_JSON_codec_without_Accept_or_format=_has_expected_%22json%22_Content-Type_and_body_as-is_-_multi_range/Check_1/Check_0",
   "TestPlainCodec/GET_plain_JSON_codec_without_Accept_or_format=_has_expected_%22json%22_Content-Type_and_body_as-is_-_multi_range/Check_1/Check_1",
   "TestPlainCodec/GET_plain_JSON_codec_without_Accept_or_format=_has_expected_%22json%22_Content-Type_and_body_as-is_-_multi_range/Check_1/Check_2",
+  "TestPlainCodec/GET_plain_JSON_codec_without_Accept_or_format=_has_expected_%22json%22_Content-Type_and_body_as-is_-_multi_range/Check_1",
   "TestPlainCodec/GET_plain_JSON_codec_with_%3Fformat=_has_expected_json_Content-Type_and_body_as-is_-_full_request/Check_1/Status_code",
   "TestPlainCodec/GET_plain_JSON_codec_with_%3Fformat=_has_expected_json_Content-Type_and_body_as-is_-_full_request/Check_1/Body",
   "TestPlainCodec/GET_plain_JSON_codec_with_%3Fformat=_has_expected_json_Content-Type_and_body_as-is_-_full_request/Check_1",
@@ -56,6 +57,7 @@
   "TestPlainCodec/GET_plain_JSON_codec_with_%3Fformat=_has_expected_json_Content-Type_and_body_as-is_-_multi_range/Check_1/Check_0",
   "TestPlainCodec/GET_plain_JSON_codec_with_%3Fformat=_has_expected_json_Content-Type_and_body_as-is_-_multi_range/Check_1/Check_1",
   "TestPlainCodec/GET_plain_JSON_codec_with_%3Fformat=_has_expected_json_Content-Type_and_body_as-is_-_multi_range/Check_1/Check_2",
+  "TestPlainCodec/GET_plain_JSON_codec_with_%3Fformat=_has_expected_json_Content-Type_and_body_as-is_-_multi_range/Check_1",
   "TestPlainCodec/GET_plain_JSON_codec_with_Accept_has_expected_json_Content-Type_and_body_as-is%2C_with_single_range_request_-_full_request/Check_1/Status_code",
   "TestPlainCodec/GET_plain_JSON_codec_with_Accept_has_expected_json_Content-Type_and_body_as-is%2C_with_single_range_request_-_full_request/Check_1/Body",
   "TestPlainCodec/GET_plain_JSON_codec_with_Accept_has_expected_json_Content-Type_and_body_as-is%2C_with_single_range_request_-_full_request/Check_1",
@@ -65,6 +67,7 @@
   "TestPlainCodec/GET_plain_JSON_codec_with_Accept_has_expected_json_Content-Type_and_body_as-is%2C_with_single_range_request_-_multi_range/Check_1/Check_0",
   "TestPlainCodec/GET_plain_JSON_codec_with_Accept_has_expected_json_Content-Type_and_body_as-is%2C_with_single_range_request_-_multi_range/Check_1/Check_1",
   "TestPlainCodec/GET_plain_JSON_codec_with_Accept_has_expected_json_Content-Type_and_body_as-is%2C_with_single_range_request_-_multi_range/Check_1/Check_2",
+  "TestPlainCodec/GET_plain_JSON_codec_with_Accept_has_expected_json_Content-Type_and_body_as-is%2C_with_single_range_request_-_multi_range/Check_1",
   "TestPlainCodec/GET_plain_JSON_codec_with_format=dag-json_interprets_json_as_dag-%2A_variant_and_produces_expected_Content-Type_and_body/Status_code",
   "TestPlainCodec/GET_plain_JSON_codec_with_format=dag-json_interprets_json_as_dag-%2A_variant_and_produces_expected_Content-Type_and_body/Header_Content-Type",
   "TestPlainCodec/GET_plain_JSON_codec_with_format=dag-json_interprets_json_as_dag-%2A_variant_and_produces_expected_Content-Type_and_body/Body",
@@ -74,6 +77,7 @@
   "TestPlainCodec/GET_plain_JSON_codec_with_format=dag-json_interprets_json_as_dag-%2A_variant_and_produces_expected_Content-Type_and_body%2C_with_single_range_request_-_multi_range/Check_1/Check_0",
   "TestPlainCodec/GET_plain_JSON_codec_with_format=dag-json_interprets_json_as_dag-%2A_variant_and_produces_expected_Content-Type_and_body%2C_with_single_range_request_-_multi_range/Check_1/Check_1",
   "TestPlainCodec/GET_plain_JSON_codec_with_format=dag-json_interprets_json_as_dag-%2A_variant_and_produces_expected_Content-Type_and_body%2C_with_single_range_request_-_multi_range/Check_1/Check_2",
+  "TestPlainCodec/GET_plain_JSON_codec_with_format=dag-json_interprets_json_as_dag-%2A_variant_and_produces_expected_Content-Type_and_body%2C_with_single_range_request_-_multi_range/Check_1",
   "TestPlainCodec/GET_plain_CBOR_codec_without_Accept_or_format=_has_expected_%22cbor%22_Content-Type_and_body_as-is_-_single_range/Check_1/Check_0",
   "TestPlainCodec/GET_plain_CBOR_codec_without_Accept_or_format=_has_expected_%22cbor%22_Content-Type_and_body_as-is_-_single_range/Check_1/Check_1",
   "TestPlainCodec/GET_plain_CBOR_codec_without_Accept_or_format=_has_expected_%22cbor%22_Content-Type_and_body_as-is_-_multi_range/Check_1/Check_0",
@@ -325,16 +329,28 @@
   "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_includes_Accept-Ranges_header/Body",
   "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_includes_Accept-Ranges_header",
   "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_single_range_request_includes_correct_bytes/Status_code",
+  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_single_range_request_includes_correct_bytes/Header_Content-Range",
   "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_single_range_request_includes_correct_bytes/Body",
+  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_single_range_request_includes_correct_bytes",
   "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_suffix_range_request_includes_correct_bytes_from_the_end_of_file/Status_code",
+  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_suffix_range_request_includes_correct_bytes_from_the_end_of_file/Header_Content-Range",
+  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_suffix_range_request_includes_correct_bytes_from_the_end_of_file/Body",
+  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_suffix_range_request_includes_correct_bytes_from_the_end_of_file",
+  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_multiple_range_request_returned_HTTP_206/Status_code",
   "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_multiple_range_request_returned_HTTP_206/Header_Content-Type",
   "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_multiple_range_request_returned_HTTP_206/Header_Content-Range",
+  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_multiple_range_request_returned_HTTP_206",
+  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_multiple_range_request_includes_correct_bytes/Status_code",
+  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_multiple_range_request_includes_correct_bytes/Header_Content-Type",
+  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_multiple_range_request_includes_correct_bytes/Body",
+  "TestGatewayUnixFSFileRanges/GET_for_%2Fipfs%2F_file_with_multiple_range_request_includes_correct_bytes",
   "TestGatewayUnixFSFileRanges/GET_Range_of_file_succeeds_even_if_the_gateway_is_missing_a_block_AFTER_the_requested_range/Status_code",
   "TestGatewayUnixFSFileRanges/GET_Range_of_file_succeeds_even_if_the_gateway_is_missing_a_block_AFTER_the_requested_range/Header_Content-Range",
   "TestGatewayUnixFSFileRanges/GET_Range_of_file_succeeds_even_if_the_gateway_is_missing_a_block_AFTER_the_requested_range",
   "TestGatewayUnixFSFileRanges/GET_Range_of_file_succeeds_even_if_the_gateway_is_missing_a_block_BEFORE_the_requested_range/Status_code",
   "TestGatewayUnixFSFileRanges/GET_Range_of_file_succeeds_even_if_the_gateway_is_missing_a_block_BEFORE_the_requested_range/Header_Content-Range",
   "TestGatewayUnixFSFileRanges/GET_Range_of_file_succeeds_even_if_the_gateway_is_missing_a_block_BEFORE_the_requested_range",
+  "TestGatewayUnixFSFileRanges",
   "TestPathGatewayMiscellaneous/GET_for_%2Fipfs%2F_file_whose_filename_contains_percentage-encoded_characters_works/Body",
   "TestPathGatewayMiscellaneous/GET_for_%2Fipfs%2F_file_whose_filename_contains_percentage-encoded_characters_works",
   "TestPathGatewayMiscellaneous",
@@ -651,7 +667,6 @@
   "TestTrustlessCarOrderAndDuplicates/GET_CAR_smoke-test_with_order=unk_of_UnixFS_Directory/Header_Content-Type",
   "TestTrustlessCarOrderAndDuplicates/GET_CAR_smoke-test_with_order=unk_of_UnixFS_Directory/Body",
   "TestTrustlessCarOrderAndDuplicates/GET_CAR_with_order=dfs_and_dups=y_of_identity_CID/Status_code",
-  "TestTrustlessCarOrderAndDuplicates/GET_CAR_with_order=dfs_and_dups=y_of_identity_CID/Header_Content-Type",
   "TestTrustlessCarOrderAndDuplicates/GET_CAR_with_Accept_and_%3Fformat%2C_specific_Accept_header_is_prioritized/Status_code",
   "TestTrustlessCarOrderAndDuplicates/GET_CAR_with_Accept_and_%3Fformat%2C_specific_Accept_header_is_prioritized/Header_Content-Type",
   "TestTrustlessCarOrderAndDuplicates/GET_CAR_with_Accept_and_%3Fformat%2C_specific_Accept_header_is_prioritized/Body",
@@ -693,5 +708,8 @@
   "TestTrustlessRawRanges/GET_with_application%2Fvnd.ipld.raw_with_range_request_includes_correct_bytes_-_multi_range/Check_0",
   "TestTrustlessRawRanges/GET_with_application%2Fvnd.ipld.raw_with_range_request_includes_correct_bytes_-_multi_range/Check_1/Check_0",
   "TestTrustlessRawRanges/GET_with_application%2Fvnd.ipld.raw_with_range_request_includes_correct_bytes_-_multi_range/Check_1/Check_1",
-  "TestTrustlessRawRanges/GET_with_application%2Fvnd.ipld.raw_with_range_request_includes_correct_bytes_-_multi_range/Check_1/Check_2"
+  "TestTrustlessRawRanges/GET_with_application%2Fvnd.ipld.raw_with_range_request_includes_correct_bytes_-_multi_range/Check_1/Check_2",
+  "TestTrustlessRawRanges/GET_with_application%2Fvnd.ipld.raw_with_range_request_includes_correct_bytes_-_multi_range/Check_1",
+  "TestTrustlessRawRanges/GET_with_application%2Fvnd.ipld.raw_with_range_request_includes_correct_bytes_-_multi_range",
+  "TestTrustlessRawRanges"
 ]

packages/gateway-conformance/src/update-expected-tests.ts

@@ -72,7 +72,7 @@ if (failingTestAdditions.length > 0 || failingTestAdditions.length > 0) {
   console.warn('WARNING: There are previously passing tests that are now failing, is this expected?')
 }
 
-if (failingTestAdditions.length > 0 || passingTestAdditions.length > 0) {
+if (passingTestRemovals.length + failingTestRemovals.length + passingTestAdditions.length + failingTestAdditions.length > 0) {
   const answer = await confirm('Are you sure you want to update the expected-passing-tests.json and expected-failing-tests.json files with the latest test results?')
 
   if (!answer) {

packages/verified-fetch/src/plugins/plugin-handle-byte-range-context.ts

@@ -1,4 +1,5 @@
 import { ByteRangeContext } from '../utils/byte-range-context.js'
+import { badRangeResponse } from '../utils/responses.js'
 import { BasePlugin } from './plugin-base.js'
 import type { PluginContext } from './types.js'
 
@@ -19,6 +20,11 @@ export class ByteRangeContextPlugin extends BasePlugin {
     context.byteRangeContext = new ByteRangeContext(this.pluginOptions.logger, context.options?.headers)
     context.modified++
 
+    if (context.byteRangeContext.isRangeRequest && !context.byteRangeContext.isValidRangeRequest) {
+      // invalid range request.. fail
+      return badRangeResponse(context.resource)
+    }
+
     return null
   }
 }

packages/verified-fetch/src/plugins/plugin-handle-car.ts

@@ -98,8 +98,8 @@ export class CarPlugin extends BasePlugin {
 
     context.byteRangeContext.setBody(toBrowserReadableStream(iter()))
 
-    const response = okRangeResponse(context.resource, context.byteRangeContext.getBody(), { byteRangeContext: context.byteRangeContext, log: this.log })
-    response.headers.set('content-type', 'application/vnd.ipld.car; version=1')
+    const response = okRangeResponse(context.resource, context.byteRangeContext.getBody('application/vnd.ipld.car; version=1'), { byteRangeContext: context.byteRangeContext, log: this.log })
+    response.headers.set('content-type', context.byteRangeContext.getContentType() ?? 'application/vnd.ipld.car; version=1')
 
     return response
   }