From 4a95ee35a87d8bdb04c964a439f99aed9dca2c2c Mon Sep 17 00:00:00 2001
From: Adin Schmahmann <adin.schmahmann@gmail.com>
Date: Mon, 4 Dec 2023 01:05:27 -0500
Subject: [PATCH 01/26] ci: add gateway-conformance tests

---
 .github/workflows/gateway-conformance.yml | 120 ++++++++++++++++++++++
 1 file changed, 120 insertions(+)
 create mode 100644 .github/workflows/gateway-conformance.yml

diff --git a/.github/workflows/gateway-conformance.yml b/.github/workflows/gateway-conformance.yml
new file mode 100644
index 0000000..ac8896a
--- /dev/null
+++ b/.github/workflows/gateway-conformance.yml
@@ -0,0 +1,120 @@
+name: Gateway Conformance
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  gateway-conformance:
+    runs-on: ubuntu-latest
+    steps:
+      # 1. Start the Kubo gateway
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: 1.21.x
+
+      - name: Install Kubo gateway from source
+        #uses: ipfs/download-ipfs-distribution-action@v1
+        run: |
+          go install github.com/ipfs/kubo/cmd/ipfs@v0.24.0
+      - name: Setup kubo config
+        run: |
+          ipfs init --profile=test
+          ipfs config Addresses.Gateway "/ip4/127.0.0.1/tcp/8080"
+
+      # 2. Download the gateway-conformance fixtures
+      - name: Download gateway-conformance fixtures
+        uses: ipfs/gateway-conformance/.github/actions/extract-fixtures@v0.4.1
+        with:
+          output: fixtures
+
+      - name: Start Kubo gateway
+        uses: ipfs/start-ipfs-daemon-action@v1
+
+      # 3. Populate the Kubo gateway with the gateway-conformance fixtures
+      - name: Import fixtures
+        run: |
+          # Import car files
+          find ./fixtures -name '*.car' -exec ipfs dag import --pin-roots=false --offline {} \;
+
+          # Import ipns records
+          records=$(find ./fixtures -name '*.ipns-record')
+          for record in $records
+          do
+              key=$(basename -s .ipns-record "$record" | cut -d'_' -f1)
+              ipfs routing put --allow-offline "/ipns/$key" "$record"
+          done
+
+          # Import dnslink records
+          # the IPFS_NS_MAP env will be used by the daemon
+          export IPFS_NS_MAP=$(cat "./fixtures/dnslinks.json" | jq -r '.subdomains | to_entries | map("\(.key).example.com:\(.value)") | join(",")')
+          export IPFS_NS_MAP="$(cat "./fixtures/dnslinks.json" | jq -r '.domains | to_entries | map("\(.key):\(.value)") | join(",")'),${IPFS_NS_MAP}"
+          echo "IPFS_NS_MAP=${IPFS_NS_MAP}" >> $GITHUB_ENV
+
+      # 4. Build helia-http-gateway
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          
+      - name: Checkout helia-http-gateway
+        uses: actions/checkout@v3
+        with:
+          path: helia-http-gateway
+          
+      - name: Install dependencies
+        run: npm ci
+        working-directory: helia-http-gateway
+        
+      - name: Build helia-http-gateway
+        run: npm run build
+        working-directory: helia-http-gateway
+
+      # 5. Start helia-http-gateway
+      - name: Start helia-http-gateway
+        env:
+          GATEWAY_CONFORMANCE_TEST: true
+          TRUSTLESS_GATEWAY: "http://127.0.0.1:8080"
+          USE_LIBP2P: false
+          PORT: 8090
+        run: |
+          # run gw
+          node dist/src/index.js &
+        working-directory: helia-http-gateway
+
+      # 6. Run the gateway-conformance tests
+      - name: Run gateway-conformance tests
+        uses: ipfs/gateway-conformance/.github/actions/test@v0.4.1
+        with:
+          gateway-url: http://127.0.0.1:8090
+          json: output.json
+          xml: output.xml
+          html: output.html
+          markdown: output.md
+          specs: +trustless-gateway,+path-gateway,+subdomain-gateway,+dnslink-gateway,+redirects-file
+          # use below to skip specific test if needed
+          # args: -skip 'TestFooBr/GET_response_for_something'
+          #
+          # only-if-cached: helia-ht does not guarantee local cache, we will adjust upstream test (which was Kubo-specific)
+          # for now disabling these test cases
+          args: -skip 'TestGatewayCache/.*_for_/ipfs/_with_only-if-cached_succeeds_when_in_local_datastore'
+
+      # 7. Upload the results
+      - name: Upload MD summary
+        if: failure() || success()
+        run: cat output.md >> $GITHUB_STEP_SUMMARY
+      - name: Upload HTML report
+        if: failure() || success()
+        uses: actions/upload-artifact@v3
+        with:
+          name: gateway-conformance.html
+          path: output.html
+      - name: Upload JSON report
+        if: failure() || success()
+        uses: actions/upload-artifact@v3
+        with:
+          name: gateway-conformance.json
+          path: output.json

From db993faf1131ac9742008849db0f68173cfeaf54 Mon Sep 17 00:00:00 2001
From: Adin Schmahmann <adin.schmahmann@gmail.com>
Date: Mon, 4 Dec 2023 03:36:13 -0500
Subject: [PATCH 02/26] ci(gateway-conformance): use minimal specs for websites
 (no _redirects)

---
 .github/workflows/gateway-conformance.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gateway-conformance.yml b/.github/workflows/gateway-conformance.yml
index ac8896a..562444e 100644
--- a/.github/workflows/gateway-conformance.yml
+++ b/.github/workflows/gateway-conformance.yml
@@ -94,7 +94,7 @@ jobs:
           xml: output.xml
           html: output.html
           markdown: output.md
-          specs: +trustless-gateway,+path-gateway,+subdomain-gateway,+dnslink-gateway,+redirects-file
+          specs: -trustless-gateway,+path-gateway,+subdomain-gateway,+dnslink-gateway,-path-dag-gateway,-path-tar-gateway
           # use below to skip specific test if needed
           # args: -skip 'TestFooBr/GET_response_for_something'
           #

From 46c4ad9d92130f4812e8cb7246233bb9586c2f2e Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Mon, 4 Dec 2023 13:36:34 -0800
Subject: [PATCH 03/26] feat: enable gateway conformance testing locally

---
 .gitignore           |   2 +
 package-lock.json    | 658 ++++++++++++++++++++++++++++++++++++++-----
 package.json         |   7 +
 scripts/kubo-init.js | 134 +++++++++
 scripts/tmp/.gitkeep |   0
 5 files changed, 730 insertions(+), 71 deletions(-)
 create mode 100644 scripts/kubo-init.js
 create mode 100644 scripts/tmp/.gitkeep

diff --git a/.gitignore b/.gitignore
index 149c6fe..45168ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -134,3 +134,5 @@ build
 /playwright/.cache/
 screenshots
 .envrc
+scripts/tmp/fixtures
+scripts/tmp/kubo-path.txt
diff --git a/package-lock.json b/package-lock.json
index 2b623b4..afe3a42 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,6 +31,8 @@
         "concurrently": "^8.2.2",
         "cross-env": "^7.0.3",
         "debug": "4.3.4",
+        "execa": "^8.0.1",
+        "glob": "^10.3.10",
         "typescript": "5.x",
         "wait-on": "^7.1.0"
       },
@@ -1601,6 +1603,48 @@
         "rimraf": "^3.0.2"
       }
     },
+    "node_modules/@clinic/flame/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/@clinic/flame/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@clinic/flame/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/@clinic/flame/node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -6311,6 +6355,16 @@
         "inherits": "2.0.3"
       }
     },
+    "node_modules/browserify/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
     "node_modules/browserify/node_modules/buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
@@ -6336,12 +6390,44 @@
         "typedarray": "^0.0.6"
       }
     },
+    "node_modules/browserify/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/browserify/node_modules/inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
       "dev": true
     },
+    "node_modules/browserify/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/browserify/node_modules/punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
@@ -6508,6 +6594,48 @@
         "node": ">=12"
       }
     },
+    "node_modules/c8/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/c8/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/c8/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/c8/node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -7145,6 +7273,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/clinic/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
     "node_modules/clinic/node_modules/buffer": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
@@ -7325,6 +7463,26 @@
         "node": ">=6"
       }
     },
+    "node_modules/clinic/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/clinic/node_modules/got": {
       "version": "9.6.0",
       "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
@@ -7483,6 +7641,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/clinic/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/clinic/node_modules/normalize-url": {
       "version": "4.5.1",
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
@@ -9414,6 +9584,36 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/del/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/del/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/del/node_modules/globby": {
       "version": "11.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
@@ -9434,6 +9634,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/del/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/del/node_modules/p-map": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
@@ -10095,6 +10307,38 @@
         "node": ">=12"
       }
     },
+    "node_modules/electron-mocha-main/node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/electron-mocha-main/node_modules/glob/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/electron-mocha-main/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -12214,6 +12458,48 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/flat-cache/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/flat-cache/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/flat-cache/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/flat-cache/node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -12610,6 +12896,36 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/gh-pages/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/gh-pages/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/gh-pages/node_modules/globby": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
@@ -12626,6 +12942,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/gh-pages/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/gh-pages/node_modules/pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -12659,20 +12987,22 @@
       }
     },
     "node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "version": "10.3.10",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
       "dev": true,
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.3.5",
+        "minimatch": "^9.0.1",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+        "path-scurry": "^1.10.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": "*"
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -12690,26 +13020,29 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/glob/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "node_modules/glob/node_modules/foreground-child": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
       "dev": true,
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/glob/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/glob/node_modules/minipass": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
+      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
       "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
       "engines": {
-        "node": "*"
+        "node": ">=16 || 14 >=14.17"
       }
     },
     "node_modules/global-agent": {
@@ -14809,6 +15142,48 @@
         "node": ">=8"
       }
     },
+    "node_modules/istanbul-lib-processinfo/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/istanbul-lib-processinfo/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/istanbul-lib-processinfo/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/istanbul-lib-processinfo/node_modules/p-map": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
@@ -17728,6 +18103,48 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/mocha/node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/mocha/node_modules/glob/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/mocha/node_modules/glob/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/mocha/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -22725,6 +23142,16 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/nyc/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
     "node_modules/nyc/node_modules/camelcase": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
@@ -22776,6 +23203,26 @@
         "node": ">=8"
       }
     },
+    "node_modules/nyc/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/nyc/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -22797,6 +23244,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/nyc/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/nyc/node_modules/p-limit": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -23918,6 +24377,16 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/patch-package/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
     "node_modules/patch-package/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -23983,6 +24452,26 @@
         "node": ">=10"
       }
     },
+    "node_modules/patch-package/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/patch-package/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -23992,6 +24481,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/patch-package/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/patch-package/node_modules/path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
@@ -26720,53 +27221,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/rimraf/node_modules/foreground-child": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rimraf/node_modules/glob": {
-      "version": "10.3.10",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
-      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
-      "dev": true,
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^2.3.5",
-        "minimatch": "^9.0.1",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-        "path-scurry": "^1.10.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rimraf/node_modules/minipass": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
     "node_modules/ripemd160": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
@@ -28226,6 +28680,48 @@
         "node": ">=8"
       }
     },
+    "node_modules/spawn-wrap/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/spawn-wrap/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/spawn-wrap/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/spawn-wrap/node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -28954,6 +29450,26 @@
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/test-exclude/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/test-exclude/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
diff --git a/package.json b/package.json
index 8dd0837..6061c50 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,11 @@
     "test:http-e2e": "cross-env USE_BITSWAP=false USE_LIBP2P=false playwright test",
     "test:e2e-flame": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-flame\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"",
     "test:e2e-doctor": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-doctor\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"",
+    "test:gwc-kubo": "node ./scripts/kubo-init.js",
+    "test:gwc-helia": "npm run build && USE_LIBP2P=false PORT=8090 TRUSTLESS_GATEWAY='http://127.0.0.1:8080' npm start",
+    "test:gwc-execute": "docker run --network host -v $PWD:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 test --gateway-url http://localhost:8090 --json report.json --specs -path-ipns-gateway,-trustless-block-gateway,-trustless-car-gateway,-trustless-car-gateway-optional,-trustless-ipns-gateway,-trustless-gateway,-subdomain-gateway,-redirects-file -- -timeout 30m",
+    "test:gwc": "concurrently -k -s all -n \"kubo,helia,gateway-conformance\" -c \"magenta,blue,green\" \"npm run test:gwc-kubo\" \"wait-on 'tcp:8080' && npm run test:gwc-helia\" \"wait-on 'tcp:8090' && npm run test:gwc-execute\"",
+    "test:gateway-conformance": "TRUSTLESS_GATEWAY='http://localhost:8080' echo 'gateway conformance'",
     "healthcheck": "node dist/src/healthcheck.js",
     "debug:until-death": "./debugging/until-death.sh",
     "debug:test-gateways": "./debugging/test-gateways.sh"
@@ -57,6 +62,8 @@
     "concurrently": "^8.2.2",
     "cross-env": "^7.0.3",
     "debug": "4.3.4",
+    "execa": "^8.0.1",
+    "glob": "^10.3.10",
     "typescript": "5.x",
     "wait-on": "^7.1.0"
   },
diff --git a/scripts/kubo-init.js b/scripts/kubo-init.js
new file mode 100644
index 0000000..b2678f0
--- /dev/null
+++ b/scripts/kubo-init.js
@@ -0,0 +1,134 @@
+/**
+ * This is part of the gateway conformance testing of helia-http-gateway. See ../DEVELOPER-NOTES.md for more details.
+ */
+
+import { writeFile, readFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { dirname, basename, relative } from 'node:path'
+import debug from 'debug'
+import { $ } from 'execa'
+import { glob } from 'glob'
+
+const log = debug('kubo-init')
+const error = log.extend('error')
+debug.enable('kubo-init*')
+
+const kuboFilePath = './scripts/tmp/kubo-path.txt'
+const GWC_FIXTURES_PATH = `${dirname(kuboFilePath)}/fixtures`
+
+async function main () {
+  await $`mkdir -p ${dirname(kuboFilePath)}`
+
+  const tmpDir = await writeKuboMetaData()
+
+  await attemptKuboInit(tmpDir)
+
+  await configureKubo(tmpDir)
+
+  const ipfsNsMap = await loadFixtures(tmpDir)
+  // execute the daemon
+  const execaOptions = getExecaOptions({ tmpDir, ipfsNsMap })
+  await $(execaOptions)`npx kubo daemon --offline`
+}
+
+/**
+ *
+ * @param {Record<string, string>} param0
+ * @param {string} param0.tmpDir
+ * @param {string} [param0.cwd]
+ * @param {string} [param0.ipfsNsMap]
+ *
+ * @returns {import('execa').Options}
+ */
+function getExecaOptions ({ cwd, ipfsNsMap, tmpDir }) {
+  return {
+    cwd,
+    env: {
+      IPFS_PATH: tmpDir,
+      IPFS_NS_MAP: ipfsNsMap
+    }
+  }
+}
+
+async function attemptKuboInit (tmpDir) {
+  const execaOptions = getExecaOptions({ tmpDir })
+  try {
+    await $(execaOptions)`npx -y kubo init`
+    log('Kubo initialized at %s', tmpDir)
+  } catch (e) {
+    if (!e.stderr.includes('already exists!')) {
+      throw e
+    }
+    log('Kubo was already initialized at %s', tmpDir)
+  }
+}
+
+async function writeKuboMetaData () {
+  let tmpDir
+  try {
+    const currentIpfsPath = await readFile('./scripts/tmp/kubo-path.txt', 'utf-8')
+    log('Existing kubo path found at %s', currentIpfsPath)
+    tmpDir = currentIpfsPath
+  } catch (e) {
+    error('Failed to read Kubo path from %s', kuboFilePath, e)
+    tmpDir = tmpdir() + '/kubo-tmp'
+    log('Using temporary Kubo path at %s', tmpDir)
+  }
+  try {
+    await writeFile(kuboFilePath, tmpDir)
+  } catch (e) {
+    error('Failed to save Kubo path to %s', kuboFilePath, e)
+  }
+  return tmpDir
+}
+
+async function configureKubo (tmpDir) {
+  const execaOptions = getExecaOptions({ tmpDir })
+  try {
+    await $(execaOptions)`npx -y kubo config Addresses.Gateway /ip4/127.0.0.1/tcp/8080`
+    log('Kubo configured')
+  } catch (e) {
+    error('Failed to configure Kubo', e)
+  }
+}
+
+async function downloadFixtures () {
+  log('Downloading fixtures')
+  try {
+    await $`docker run -v ${process.cwd()}:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 extract-fixtures --directory ${GWC_FIXTURES_PATH} --merged false`
+  } catch (e) {
+    error('Error downloading fixtures, assuming current or previous success', e)
+  }
+}
+
+async function loadFixtures (tmpDir) {
+  await downloadFixtures()
+  const execaOptions = getExecaOptions({ tmpDir })
+
+  for (const carFile of await glob([`${GWC_FIXTURES_PATH}/**/*.car`])) {
+    log('Loading *.car fixture %s', carFile)
+    const { stdout } = await $(execaOptions)`npx kubo dag import --pin-roots=false --offline ${carFile}`
+    stdout.split('\n').forEach(log)
+  }
+
+  for (const ipnsRecord of await glob([`${GWC_FIXTURES_PATH}/**/*.ipns-record`])) {
+    const key = basename(ipnsRecord, '.ipns-record')
+    const relativePath = relative(GWC_FIXTURES_PATH, ipnsRecord)
+    log('Loading *.ipns-record fixture %s', relativePath)
+    const { stdout } = await $(({ ...execaOptions }))`cd ${GWC_FIXTURES_PATH} && npx kubo routing put --allow-offline "/ipns/${key}" "${relativePath}"`
+    stdout.split('\n').forEach(log)
+  }
+
+  const json = await readFile(`${GWC_FIXTURES_PATH}/dnslinks.json`, 'utf-8')
+  const { subdomains, domains } = JSON.parse(json)
+  const subdomainDnsLinks = Object.entries(subdomains).map(([key, value]) => `${key}.example.com:${value}`).join(',')
+  const domainDnsLinks = Object.entries(domains).map(([key, value]) => `${key}:${value}`).join(',')
+  const ipfsNsMap = `${domainDnsLinks},${subdomainDnsLinks}`
+
+  return ipfsNsMap
+}
+
+main().catch(e => {
+  error(e)
+  process.exit(1)
+})
diff --git a/scripts/tmp/.gitkeep b/scripts/tmp/.gitkeep
new file mode 100644
index 0000000..e69de29

From a57d76cceb3bbb279192de38d0cf31f2ac72021b Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Mon, 4 Dec 2023 13:42:13 -0800
Subject: [PATCH 04/26] docs: gwc info added to DEVELOPER-NOTES.md

---
 DEVELOPER-NOTES.md | 25 +++++++++++++++++++++++++
 package.json       |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 DEVELOPER-NOTES.md

diff --git a/DEVELOPER-NOTES.md b/DEVELOPER-NOTES.md
new file mode 100644
index 0000000..2fbc72e
--- /dev/null
+++ b/DEVELOPER-NOTES.md
@@ -0,0 +1,25 @@
+# Developer notes
+
+<!-- toc -->
+
+## Gateway Conformance testing
+
+We have some code enabled that makes running gateway-conformance testing against helia-http-gateway easy. Follow the instructions in this section to run gateway-conformance tests locally
+
+### Prerequisites
+
+1. [Install docker](https://docs.docker.com/get-docker/)
+2. [Install nodejs](https://nodejs.org/en/download/)
+
+### Run gateway-conformance tests locally
+
+```sh
+$ npm run test:gwc
+```
+
+### Some callouts
+
+1. The file `./scripts/kubo-init.js` executes kubo using `execa` instead of `ipfsd-ctl` so there may be some gotchas, but it should be as cross-platform and stable as the `execa` library.
+1. The IPFS_PATH used is a temporary directory. Your OS should handle removing it when vital, but you can also remove it manually. The path to this directory is printed out when the tests start, and saved in a file at `./scripts/tmp/kubo-path.txt`.
+1. The tests save gateway-conformance fixtures to `./scripts/tmp/fixtures`. You can remove this directory manually if you want to re-run the tests with a fresh set of fixtures.
+1. The results of the gateway-conformance tests are saved to `./gwc-report.json`. This file is overwritten every time the tests are run.
diff --git a/package.json b/package.json
index 6061c50..5ec89bd 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "test:e2e-doctor": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-doctor\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"",
     "test:gwc-kubo": "node ./scripts/kubo-init.js",
     "test:gwc-helia": "npm run build && USE_LIBP2P=false PORT=8090 TRUSTLESS_GATEWAY='http://127.0.0.1:8080' npm start",
-    "test:gwc-execute": "docker run --network host -v $PWD:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 test --gateway-url http://localhost:8090 --json report.json --specs -path-ipns-gateway,-trustless-block-gateway,-trustless-car-gateway,-trustless-car-gateway-optional,-trustless-ipns-gateway,-trustless-gateway,-subdomain-gateway,-redirects-file -- -timeout 30m",
+    "test:gwc-execute": "docker run --network host -v $PWD:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 test --gateway-url http://localhost:8090 --json gwc-report.json --specs -path-ipns-gateway,-trustless-block-gateway,-trustless-car-gateway,-trustless-car-gateway-optional,-trustless-ipns-gateway,-trustless-gateway,-subdomain-gateway,-redirects-file -- -timeout 30m",
     "test:gwc": "concurrently -k -s all -n \"kubo,helia,gateway-conformance\" -c \"magenta,blue,green\" \"npm run test:gwc-kubo\" \"wait-on 'tcp:8080' && npm run test:gwc-helia\" \"wait-on 'tcp:8090' && npm run test:gwc-execute\"",
     "test:gateway-conformance": "TRUSTLESS_GATEWAY='http://localhost:8080' echo 'gateway conformance'",
     "healthcheck": "node dist/src/healthcheck.js",

From 98afa15b7fb0cd6b7f5ee31156ce4b136b3c66b5 Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Mon, 4 Dec 2023 13:52:34 -0800
Subject: [PATCH 05/26] fix(test:gwc): test:gwc-setup split out from test:gwc

---
 package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 5ec89bd..b3bde97 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,9 @@
     "test:e2e-doctor": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-doctor\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"",
     "test:gwc-kubo": "node ./scripts/kubo-init.js",
     "test:gwc-helia": "npm run build && USE_LIBP2P=false PORT=8090 TRUSTLESS_GATEWAY='http://127.0.0.1:8080' npm start",
-    "test:gwc-execute": "docker run --network host -v $PWD:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 test --gateway-url http://localhost:8090 --json gwc-report.json --specs -path-ipns-gateway,-trustless-block-gateway,-trustless-car-gateway,-trustless-car-gateway-optional,-trustless-ipns-gateway,-trustless-gateway,-subdomain-gateway,-redirects-file -- -timeout 30m",
-    "test:gwc": "concurrently -k -s all -n \"kubo,helia,gateway-conformance\" -c \"magenta,blue,green\" \"npm run test:gwc-kubo\" \"wait-on 'tcp:8080' && npm run test:gwc-helia\" \"wait-on 'tcp:8090' && npm run test:gwc-execute\"",
+    "test:gwc-setup": "concurrently -k -s all -n \"kubo,helia\" -c \"magenta,blue\" \"npm run test:gwc-kubo\" \"wait-on 'tcp:8080' && npm run test:gwc-helia\"",
+    "test:gwc-execute": "docker run --network host -v $PWD:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 test --gateway-url http://localhost:8090 --json gwc-report.json --specs subdomain-ipfs-gateway,subdomain-ipns-gateway -- -timeout 30m",
+    "test:gwc": "concurrently -k -s all -n \"kubo&helia,gateway-conformance\" -c \"magenta,blue\" \"npm run test:gwc-setup\" \"wait-on 'tcp:8090' && npm run test:gwc-execute\"",
     "test:gateway-conformance": "TRUSTLESS_GATEWAY='http://localhost:8080' echo 'gateway conformance'",
     "healthcheck": "node dist/src/healthcheck.js",
     "debug:until-death": "./debugging/until-death.sh",

From 5549c417e6b6a6187f492c9c48d93d887e2ca2a4 Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Mon, 4 Dec 2023 14:27:19 -0800
Subject: [PATCH 06/26] fix: use proper env var and cleanup scripts

---
 .github/workflows/gateway-conformance.yml | 8 ++++----
 package.json                              | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gateway-conformance.yml b/.github/workflows/gateway-conformance.yml
index 562444e..ddad9e4 100644
--- a/.github/workflows/gateway-conformance.yml
+++ b/.github/workflows/gateway-conformance.yml
@@ -59,16 +59,16 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 20
-          
+
       - name: Checkout helia-http-gateway
         uses: actions/checkout@v3
         with:
           path: helia-http-gateway
-          
+
       - name: Install dependencies
         run: npm ci
         working-directory: helia-http-gateway
-        
+
       - name: Build helia-http-gateway
         run: npm run build
         working-directory: helia-http-gateway
@@ -77,7 +77,7 @@ jobs:
       - name: Start helia-http-gateway
         env:
           GATEWAY_CONFORMANCE_TEST: true
-          TRUSTLESS_GATEWAY: "http://127.0.0.1:8080"
+          TRUSTLESS_GATEWAYS: "http://127.0.0.1:8080"
           USE_LIBP2P: false
           PORT: 8090
         run: |
diff --git a/package.json b/package.json
index b3bde97..bf2dd55 100644
--- a/package.json
+++ b/package.json
@@ -18,11 +18,10 @@
     "test:e2e-flame": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-flame\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"",
     "test:e2e-doctor": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-doctor\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"",
     "test:gwc-kubo": "node ./scripts/kubo-init.js",
-    "test:gwc-helia": "npm run build && USE_LIBP2P=false PORT=8090 TRUSTLESS_GATEWAY='http://127.0.0.1:8080' npm start",
+    "test:gwc-helia": "npm run build && USE_LIBP2P=false PORT=8090 TRUSTLESS_GATEWAYS='http://127.0.0.1:8080' npm start",
     "test:gwc-setup": "concurrently -k -s all -n \"kubo,helia\" -c \"magenta,blue\" \"npm run test:gwc-kubo\" \"wait-on 'tcp:8080' && npm run test:gwc-helia\"",
-    "test:gwc-execute": "docker run --network host -v $PWD:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 test --gateway-url http://localhost:8090 --json gwc-report.json --specs subdomain-ipfs-gateway,subdomain-ipns-gateway -- -timeout 30m",
+    "test:gwc-execute": "docker run --network host -v $PWD:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 test --gateway-url 'http://localhost:8090' --subdomain-url 'http://localhost:8090' --json gwc-report.json --specs subdomain-ipns-gateway -- -timeout 30m",
     "test:gwc": "concurrently -k -s all -n \"kubo&helia,gateway-conformance\" -c \"magenta,blue\" \"npm run test:gwc-setup\" \"wait-on 'tcp:8090' && npm run test:gwc-execute\"",
-    "test:gateway-conformance": "TRUSTLESS_GATEWAY='http://localhost:8080' echo 'gateway conformance'",
     "healthcheck": "node dist/src/healthcheck.js",
     "debug:until-death": "./debugging/until-death.sh",
     "debug:test-gateways": "./debugging/test-gateways.sh"

From 0778d65eb5c1eb978ee0e743391945e4e4a8a37f Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Mon, 4 Dec 2023 14:38:36 -0800
Subject: [PATCH 07/26] chore(ci:gwc): enable only subdomain ipfs and ipns

---
 .github/workflows/gateway-conformance.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gateway-conformance.yml b/.github/workflows/gateway-conformance.yml
index ddad9e4..345a181 100644
--- a/.github/workflows/gateway-conformance.yml
+++ b/.github/workflows/gateway-conformance.yml
@@ -94,7 +94,7 @@ jobs:
           xml: output.xml
           html: output.html
           markdown: output.md
-          specs: -trustless-gateway,+path-gateway,+subdomain-gateway,+dnslink-gateway,-path-dag-gateway,-path-tar-gateway
+          specs: subdomain-ipfs-gateway,subdomain-ipns-gateway
           # use below to skip specific test if needed
           # args: -skip 'TestFooBr/GET_response_for_something'
           #

From daefd4f16a39ba18e5271ec3a1e3781007e7753b Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Mon, 4 Dec 2023 14:46:15 -0800
Subject: [PATCH 08/26] fix: enable kubo routing-v1 for ipns

---
 scripts/kubo-init.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/kubo-init.js b/scripts/kubo-init.js
index b2678f0..50a7211 100644
--- a/scripts/kubo-init.js
+++ b/scripts/kubo-init.js
@@ -86,6 +86,7 @@ async function configureKubo (tmpDir) {
   const execaOptions = getExecaOptions({ tmpDir })
   try {
     await $(execaOptions)`npx -y kubo config Addresses.Gateway /ip4/127.0.0.1/tcp/8080`
+    await $(execaOptions)`npx -y kubo config --json Gateway.ExposeRoutingAPI true`
     log('Kubo configured')
   } catch (e) {
     error('Failed to configure Kubo', e)

From 8722856223c2ced89d87f8055b8da2fdb315f53d Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Mon, 4 Dec 2023 14:47:06 -0800
Subject: [PATCH 09/26] chore: kubo-init daemon starting line

---
 scripts/kubo-init.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/kubo-init.js b/scripts/kubo-init.js
index 50a7211..8912fa8 100644
--- a/scripts/kubo-init.js
+++ b/scripts/kubo-init.js
@@ -28,6 +28,7 @@ async function main () {
   const ipfsNsMap = await loadFixtures(tmpDir)
   // execute the daemon
   const execaOptions = getExecaOptions({ tmpDir, ipfsNsMap })
+  log('Starting Kubo daemon...')
   await $(execaOptions)`npx kubo daemon --offline`
 }
 

From 13ed71ac1707ba8c3097c13389aa478481251d82 Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Mon, 4 Dec 2023 15:23:19 -0800
Subject: [PATCH 10/26] fix(ci:gwc): set subdomain-url arg

---
 .github/workflows/gateway-conformance.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/gateway-conformance.yml b/.github/workflows/gateway-conformance.yml
index 345a181..a686821 100644
--- a/.github/workflows/gateway-conformance.yml
+++ b/.github/workflows/gateway-conformance.yml
@@ -90,6 +90,7 @@ jobs:
         uses: ipfs/gateway-conformance/.github/actions/test@v0.4.1
         with:
           gateway-url: http://127.0.0.1:8090
+          subdomain-url: http://127.0.0.1:8090
           json: output.json
           xml: output.xml
           html: output.html

From 4b004675e8a485fcf1e8e0a7f68bda6cbc686060 Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Mon, 4 Dec 2023 15:41:58 -0800
Subject: [PATCH 11/26] fix(ci:gwc): skip dir list and gateway cache tests

---
 .github/workflows/gateway-conformance.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gateway-conformance.yml b/.github/workflows/gateway-conformance.yml
index a686821..fcb4cb7 100644
--- a/.github/workflows/gateway-conformance.yml
+++ b/.github/workflows/gateway-conformance.yml
@@ -101,7 +101,7 @@ jobs:
           #
           # only-if-cached: helia-ht does not guarantee local cache, we will adjust upstream test (which was Kubo-specific)
           # for now disabling these test cases
-          args: -skip 'TestGatewayCache/.*_for_/ipfs/_with_only-if-cached_succeeds_when_in_local_datastore'
+          args: -skip '^.*(DirectoryListing|TestGatewayCache).*$'
 
       # 7. Upload the results
       - name: Upload MD summary

From d39a3dbe7a517314e6d1ebf5496b50d1b83e6f8e Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Mon, 4 Dec 2023 15:42:26 -0800
Subject: [PATCH 12/26] chore(ci:gcw): don't use bitswap

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bf2dd55..277735c 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "test:e2e-flame": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-flame\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"",
     "test:e2e-doctor": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-doctor\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"",
     "test:gwc-kubo": "node ./scripts/kubo-init.js",
-    "test:gwc-helia": "npm run build && USE_LIBP2P=false PORT=8090 TRUSTLESS_GATEWAYS='http://127.0.0.1:8080' npm start",
+    "test:gwc-helia": "npm run build && USE_LIBP2P=false USE_BITSWAP=false PORT=8090 TRUSTLESS_GATEWAYS='http://127.0.0.1:8080' npm start",
     "test:gwc-setup": "concurrently -k -s all -n \"kubo,helia\" -c \"magenta,blue\" \"npm run test:gwc-kubo\" \"wait-on 'tcp:8080' && npm run test:gwc-helia\"",
     "test:gwc-execute": "docker run --network host -v $PWD:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 test --gateway-url 'http://localhost:8090' --subdomain-url 'http://localhost:8090' --json gwc-report.json --specs subdomain-ipns-gateway -- -timeout 30m",
     "test:gwc": "concurrently -k -s all -n \"kubo&helia,gateway-conformance\" -c \"magenta,blue\" \"npm run test:gwc-setup\" \"wait-on 'tcp:8090' && npm run test:gwc-execute\"",

From ad5be2e9ebdd326898bc6f1ac3e4559700e37ea1 Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Mon, 4 Dec 2023 15:57:36 -0800
Subject: [PATCH 13/26] docs(ci:gwc): add more details about gwc local testing

---
 DEVELOPER-NOTES.md | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/DEVELOPER-NOTES.md b/DEVELOPER-NOTES.md
index 2fbc72e..233526d 100644
--- a/DEVELOPER-NOTES.md
+++ b/DEVELOPER-NOTES.md
@@ -11,14 +11,35 @@ We have some code enabled that makes running gateway-conformance testing against
 1. [Install docker](https://docs.docker.com/get-docker/)
 2. [Install nodejs](https://nodejs.org/en/download/)
 
-### Run gateway-conformance tests locally
+### Run gateway-conformance tests locally (once)
 
 ```sh
 $ npm run test:gwc
 ```
 
+### Continuously develop while running gateway-conformance tests
+
+```sh
+# terminal 1
+$ npm run test:gwc-kubo
+
+# terminal 2
+$ npm run test:gwc-helia # you will need to stop and start this one in-between code changes. It's not watching for changes
+
+# terminal 3
+$ npm run test:gwc
+
+# OR from the gateway-conformance repo directly with something like:
+go run ./cmd/gateway-conformance/main.go test --gateway-url 'http://localhost:8090' --subdomain-url 'http://localhost:8090' --specs subdomain-ipfs-gateway,subdomain-ipns-gateway --json gwc-report.json -- -timeout 30m
+
+```
+
+
+
 ### Some callouts
 
+1. You may want to run the gateway-conformance tests directly from the repo if you're on a macOS M1 due to some issues with docker and the proxying that the gateway-conformance testing tool uses. If you do this, you'll need to run `make gateway-conformance` in the `gateway-conformance` repo root, and then run the tests with something like `go run ./cmd/gateway-conformance/main.go test --gateway-url 'http://localhost:8090' --subdomain-url 'http://localhost:8090' --specs subdomain-ipfs-gateway,subdomain-ipns-gateway --json gwc-report.json -- -timeout 30m`.
+    - If you want to run a specific test, you can pass the `-run` gotest flag. e.g. `go run ./cmd/gateway-conformance/main.go test --gateway-url 'http://localhost:8090' --subdomain-url 'http://localhost:8090' --json gwc-report.json -- -timeout 30m -run 'TestGatewaySubdomains/request_for_example.com%2Fipfs%2F%7BCIDv1%7D_redirects_to_subdomain_%28HTTP_proxy_tunneling_via_CONNECT%29#01'`
 1. The file `./scripts/kubo-init.js` executes kubo using `execa` instead of `ipfsd-ctl` so there may be some gotchas, but it should be as cross-platform and stable as the `execa` library.
 1. The IPFS_PATH used is a temporary directory. Your OS should handle removing it when vital, but you can also remove it manually. The path to this directory is printed out when the tests start, and saved in a file at `./scripts/tmp/kubo-path.txt`.
 1. The tests save gateway-conformance fixtures to `./scripts/tmp/fixtures`. You can remove this directory manually if you want to re-run the tests with a fresh set of fixtures.

From b137aac780d35cc0ac55858197de22cc097d14af Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Mon, 4 Dec 2023 16:40:46 -0800
Subject: [PATCH 14/26] docs(ci:gwc): more documentation of things

---
 DEVELOPER-NOTES.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/DEVELOPER-NOTES.md b/DEVELOPER-NOTES.md
index 233526d..e6c8dfd 100644
--- a/DEVELOPER-NOTES.md
+++ b/DEVELOPER-NOTES.md
@@ -24,7 +24,8 @@ $ npm run test:gwc
 $ npm run test:gwc-kubo
 
 # terminal 2
-$ npm run test:gwc-helia # you will need to stop and start this one in-between code changes. It's not watching for changes
+# you will need to stop and start this one in-between code changes. It's not watching for changes
+$ DEBUG="helia-http-gateway*" FILE_DATASTORE_PATH=./tmp/datastore npm run test:gwc-helia
 
 # terminal 3
 $ npm run test:gwc
@@ -44,3 +45,4 @@ go run ./cmd/gateway-conformance/main.go test --gateway-url 'http://localhost:80
 1. The IPFS_PATH used is a temporary directory. Your OS should handle removing it when vital, but you can also remove it manually. The path to this directory is printed out when the tests start, and saved in a file at `./scripts/tmp/kubo-path.txt`.
 1. The tests save gateway-conformance fixtures to `./scripts/tmp/fixtures`. You can remove this directory manually if you want to re-run the tests with a fresh set of fixtures.
 1. The results of the gateway-conformance tests are saved to `./gwc-report.json`. This file is overwritten every time the tests are run.
+1. The gateway-conformance tests are flaky and commands & documentation are not up to date. Running commands with CLI flags is supposed to work, and env vars aren't documented, but ENV_VARs are the only way to get the tests to run, but not when ran with docker. See [this issue](https://github.com/ipfs/gateway-conformance/issues/185#issuecomment-1839801366)

From fc3e4f315a6ad37daecdfaeeaf3301aab3e0b16d Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Tue, 5 Dec 2023 10:18:05 -0800
Subject: [PATCH 15/26] chore: add ECHO_HEADERS & notes

---
 DEVELOPER-NOTES.md | 33 +++++++++++++++++++++++++++++++++
 README.md          |  1 +
 package.json       |  2 +-
 src/constants.ts   |  2 ++
 src/heliaServer.ts |  8 +++++++-
 src/index.ts       | 13 ++++++++++++-
 6 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/DEVELOPER-NOTES.md b/DEVELOPER-NOTES.md
index e6c8dfd..0792442 100644
--- a/DEVELOPER-NOTES.md
+++ b/DEVELOPER-NOTES.md
@@ -22,6 +22,7 @@ $ npm run test:gwc
 ```sh
 # terminal 1
 $ npm run test:gwc-kubo
+# You can also set up the kubo backing node with the instructions at https://github.com/ipfs/gateway-conformance/blob/main/docs/development.md#developing-against-kubo
 
 # terminal 2
 # you will need to stop and start this one in-between code changes. It's not watching for changes
@@ -46,3 +47,35 @@ go run ./cmd/gateway-conformance/main.go test --gateway-url 'http://localhost:80
 1. The tests save gateway-conformance fixtures to `./scripts/tmp/fixtures`. You can remove this directory manually if you want to re-run the tests with a fresh set of fixtures.
 1. The results of the gateway-conformance tests are saved to `./gwc-report.json`. This file is overwritten every time the tests are run.
 1. The gateway-conformance tests are flaky and commands & documentation are not up to date. Running commands with CLI flags is supposed to work, and env vars aren't documented, but ENV_VARs are the only way to get the tests to run, but not when ran with docker. See [this issue](https://github.com/ipfs/gateway-conformance/issues/185#issuecomment-1839801366)
+
+
+## Tiros info
+
+### Deploying to Tiros
+
+Go to https://github.com/plprobelab/probelab-infra/blob/main/aws/tf/tiros.tf
+
+update helia stuff
+
+run terraform apply (with AWS Config)
+
+### Kick off helia-http-gateway task manually:
+
+1. https://us-west-1.console.aws.amazon.com/ecs/v2/clusters/prod-usw1-ecs-cluster/run-task?region=us-west-1
+1. select launch type FARGATE
+1. select deployment configuration application type to be task
+1. select task-helia family
+1. select vpc (non-default)
+1. select security group for tiros
+1. Click create
+
+### Todo
+
+- [ ] Fix helia_health_cmd (https://github.com/plprobelab/probelab-infra/blob/7ec47f16e84113545cdb06b07f865a3bc5787a0b/aws/tf/tiros.tf#L5C4-L5C4) to use the new helia-health command
+- [ ] fix node max memory for helia-http-gateway docker container to support at least 4GB
+
+### Links
+
+graphs for runs are at https://probelab.grafana.net/d/GpwxraxVk/tiros-ops?orgId=1&from=now-7d&to=now&inspect=8&inspectTab=error
+AWS logs for runs are at https://us-west-1.console.aws.amazon.com/cloudwatch/home?region=us-west-1#logsV2:log-groups/log-group/prod-usw1-cmi-tiros-ipfs (you need to be logged in to AWS)
+
diff --git a/README.md b/README.md
index f058735..7733e9b 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,7 @@ $ docker run -it -p 8080:8080 -e DEBUG="helia-http-gateway*" helia-http-gateway:
 | `TRUSTLESS_GATEWAYS` | Comma separated list of trusted gateways to fetch content from | [Defined in Helia](https://github.com/ipfs/helia/blob/main/packages/helia/src/block-brokers/trustless-gateway/index.ts) |
 | `USE_LIBP2P` | Whether to use libp2p networking | `true` |
 | `RESOLVE_REDIRECTS` | Whether to resolve redirects before looking up dnslink entries | `true` |
+| `ECHO_HEADERS` | A debug flag to indicate whether you want to output request and response headers | `false` |
 
 <!--
 TODO: currently broken when used in docker, but they work when running locally (you can cache datastore and blockstore locally to speed things up if you want)
diff --git a/package.json b/package.json
index 277735c..015e9cb 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "test:gwc-kubo": "node ./scripts/kubo-init.js",
     "test:gwc-helia": "npm run build && USE_LIBP2P=false USE_BITSWAP=false PORT=8090 TRUSTLESS_GATEWAYS='http://127.0.0.1:8080' npm start",
     "test:gwc-setup": "concurrently -k -s all -n \"kubo,helia\" -c \"magenta,blue\" \"npm run test:gwc-kubo\" \"wait-on 'tcp:8080' && npm run test:gwc-helia\"",
-    "test:gwc-execute": "docker run --network host -v $PWD:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 test --gateway-url 'http://localhost:8090' --subdomain-url 'http://localhost:8090' --json gwc-report.json --specs subdomain-ipns-gateway -- -timeout 30m",
+    "test:gwc-execute": "docker run --network host -v $PWD:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 test --gateway-url='http://127.0.0.1:8090' --subdomain-url='http://helia-http-gateway.localhost' --verbose --json gwc-report.json --specs subdomain-ipns-gateway,subdomain-ipfs-gateway -- -timeout 30m",
     "test:gwc": "concurrently -k -s all -n \"kubo&helia,gateway-conformance\" -c \"magenta,blue\" \"npm run test:gwc-setup\" \"wait-on 'tcp:8090' && npm run test:gwc-execute\"",
     "healthcheck": "node dist/src/healthcheck.js",
     "debug:until-death": "./debugging/until-death.sh",
diff --git a/src/constants.ts b/src/constants.ts
index 022db0f..6dda6ea 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -9,6 +9,8 @@ export const USE_SUBDOMAINS = process.env.USE_SUBDOMAINS !== 'false'
 
 export const RESOLVE_REDIRECTS = process.env.RESOLVE_REDIRECTS !== 'false'
 
+export const ECHO_HEADERS = process.env.ECHO_HEADERS === 'true'
+
 /**
  * If set to any value other than 'true', we will disable prometheus metrics.
  *
diff --git a/src/heliaServer.ts b/src/heliaServer.ts
index be71d42..e9617c5 100644
--- a/src/heliaServer.ts
+++ b/src/heliaServer.ts
@@ -94,7 +94,13 @@ export class HeliaServer {
       {
         path: '/*',
         type: 'GET',
-        handler: async (request, reply): Promise<void> => this.fetch({ request, reply })
+        handler: async (request, reply): Promise<void> => {
+          try {
+            await this.fetch({ request, reply })
+          } catch {
+            await reply.code(200).send('try /ipfs/<cid> or /ipns/<name>')
+          }
+        }
       },
       {
         path: '/',
diff --git a/src/index.ts b/src/index.ts
index 69c3867..2278915 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,7 +1,7 @@
 import debug from 'debug'
 import Fastify from 'fastify'
 import metricsPlugin from 'fastify-metrics'
-import { FASTIFY_DEBUG, HOST, PORT, METRICS } from './constants.js'
+import { FASTIFY_DEBUG, HOST, PORT, METRICS, ECHO_HEADERS } from './constants.js'
 import { HeliaServer, type RouteEntry } from './heliaServer.js'
 
 const logger = debug('helia-http-gateway')
@@ -33,6 +33,17 @@ heliaServer.routes.forEach(({ path, type, handler }: RouteEntry) => {
   })
 })
 
+if ([ECHO_HEADERS].includes(true)) {
+  app.addHook('onRequest', async (request, reply) => {
+    if (ECHO_HEADERS) {
+      logger('fastify hook onRequest: echoing headers.')
+      Object.keys(request.headers).forEach((headerName) => {
+        logger('\t %s: %s', headerName, request.headers[headerName])
+      })
+    }
+  })
+}
+
 await app.listen({ port: PORT, host: HOST })
 
 const stopWebServer = async (): Promise<void> => {

From 337bf7e27b9621d7f4625ae70aca2ef056bd9adc Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Tue, 5 Dec 2023 12:19:48 -0800
Subject: [PATCH 16/26] chore: some more things

---
 package-lock.json  | 319 +++++++++++++++++++++++++++++++++++----------
 package.json       |   7 +-
 src/heliaServer.ts |  35 ++++-
 src/index.ts       |  34 ++++-
 4 files changed, 315 insertions(+), 80 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index afe3a42..d1d8473 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,8 +7,10 @@
     "": {
       "name": "helia-http-gateway",
       "version": "0.0.1",
+      "hasInstallScript": true,
       "license": "Apache-2.0 OR MIT",
       "dependencies": {
+        "@fastify/cors": "^8.4.2",
         "@helia/unixfs": "1.x",
         "blockstore-level": "^1.1.4",
         "datastore-level": "^10.1.4",
@@ -33,6 +35,7 @@
         "debug": "4.3.4",
         "execa": "^8.0.1",
         "glob": "^10.3.10",
+        "patch-package": "^8.0.0",
         "typescript": "5.x",
         "wait-on": "^7.1.0"
       },
@@ -2346,6 +2349,15 @@
         "node": ">=14"
       }
     },
+    "node_modules/@fastify/cors": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/@fastify/cors/-/cors-8.4.2.tgz",
+      "integrity": "sha512-IVynbcPG9eWiJ0P/A1B+KynmiU/yTYbu3ooBUSIeHfca/N1XLb9nIJVCws+YTr2q63MA8Y6QLeXQczEv4npM9g==",
+      "dependencies": {
+        "fastify-plugin": "^4.0.0",
+        "mnemonist": "0.39.5"
+      }
+    },
     "node_modules/@fastify/deepmerge": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@fastify/deepmerge/-/deepmerge-1.3.0.tgz",
@@ -15688,12 +15700,36 @@
       "integrity": "sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A==",
       "dev": true
     },
+    "node_modules/json-stable-stringify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.0.tgz",
+      "integrity": "sha512-zfA+5SuwYN2VWqN1/5HZaDzQKLJHaBVMZIIM+wuYjdptkaQsqzDdqjqf+lZZJUuJq1aanHiY8LhH8LmH+qBYJA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "isarray": "^2.0.5",
+        "jsonify": "^0.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
+    "node_modules/json-stable-stringify/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -15730,6 +15766,15 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/jsonify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
+      "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/jsonparse": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
@@ -17955,6 +18000,14 @@
       "integrity": "sha512-VoAYUqmPRmzKbbqRejjqceGFp3VF81Qe8XXFGU0UXLxB7Mf4GGvyGq5Qn3k4AiQgDEV6WzobqlPOd+j0+m6IrA==",
       "dev": true
     },
+    "node_modules/mnemonist": {
+      "version": "0.39.5",
+      "resolved": "https://registry.npmjs.org/mnemonist/-/mnemonist-0.39.5.tgz",
+      "integrity": "sha512-FPUtkhtJ0efmEFGpU14x7jGbTB+s18LrzRL2KgoWz9YvcY3cPomz8tih01GbHwnGk/OmkOKfqd/RAQoc8Lm7DQ==",
+      "dependencies": {
+        "obliterator": "^2.0.1"
+      }
+    },
     "node_modules/mocha": {
       "version": "10.2.0",
       "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz",
@@ -23501,6 +23554,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/obliterator": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/obliterator/-/obliterator-2.0.4.tgz",
+      "integrity": "sha512-lgHwxlxV1qIg1Eap7LgIeoBWIMFibOjbrYPIPJZcI1mmGAI2m3lNYpK12Y+GBdPQ0U1hRwSord7GIaawz962qQ=="
+    },
     "node_modules/observable-webworkers": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/observable-webworkers/-/observable-webworkers-2.0.1.tgz",
@@ -24334,31 +24392,32 @@
       }
     },
     "node_modules/patch-package": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.5.1.tgz",
-      "integrity": "sha512-I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz",
+      "integrity": "sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==",
       "dev": true,
       "dependencies": {
         "@yarnpkg/lockfile": "^1.1.0",
         "chalk": "^4.1.2",
-        "cross-spawn": "^6.0.5",
+        "ci-info": "^3.7.0",
+        "cross-spawn": "^7.0.3",
         "find-yarn-workspace-root": "^2.0.0",
         "fs-extra": "^9.0.0",
-        "is-ci": "^2.0.0",
+        "json-stable-stringify": "^1.0.2",
         "klaw-sync": "^6.0.0",
         "minimist": "^1.2.6",
         "open": "^7.4.2",
         "rimraf": "^2.6.3",
-        "semver": "^5.6.0",
+        "semver": "^7.5.3",
         "slash": "^2.0.0",
         "tmp": "^0.0.33",
-        "yaml": "^1.10.2"
+        "yaml": "^2.2.2"
       },
       "bin": {
         "patch-package": "index.js"
       },
       "engines": {
-        "node": ">=10",
+        "node": ">=14",
         "npm": ">5"
       }
     },
@@ -24403,6 +24462,21 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/patch-package/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/patch-package/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -24421,22 +24495,6 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/patch-package/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
-      }
-    },
     "node_modules/patch-package/node_modules/fs-extra": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
@@ -24493,15 +24551,6 @@
         "node": "*"
       }
     },
-    "node_modules/patch-package/node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/patch-package/node_modules/rimraf": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -24514,36 +24563,6 @@
         "rimraf": "bin.js"
       }
     },
-    "node_modules/patch-package/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/patch-package/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/patch-package/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/patch-package/node_modules/slash": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
@@ -24565,16 +24584,13 @@
         "node": ">=8"
       }
     },
-    "node_modules/patch-package/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+    "node_modules/patch-package/node_modules/yaml": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
+      "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==",
       "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
+      "engines": {
+        "node": ">= 14"
       }
     },
     "node_modules/path": {
@@ -25955,6 +25971,16 @@
         "readable-stream": "^3.4.0"
       }
     },
+    "node_modules/react-native-test-runner/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
     "node_modules/react-native-test-runner/node_modules/buffer": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
@@ -26087,6 +26113,26 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/react-native-test-runner/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/react-native-test-runner/node_modules/globby": {
       "version": "11.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
@@ -26189,6 +26235,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/react-native-test-runner/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/react-native-test-runner/node_modules/normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -26273,6 +26331,78 @@
         "node": ">=8"
       }
     },
+    "node_modules/react-native-test-runner/node_modules/patch-package": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.5.1.tgz",
+      "integrity": "sha512-I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA==",
+      "dev": true,
+      "dependencies": {
+        "@yarnpkg/lockfile": "^1.1.0",
+        "chalk": "^4.1.2",
+        "cross-spawn": "^6.0.5",
+        "find-yarn-workspace-root": "^2.0.0",
+        "fs-extra": "^9.0.0",
+        "is-ci": "^2.0.0",
+        "klaw-sync": "^6.0.0",
+        "minimist": "^1.2.6",
+        "open": "^7.4.2",
+        "rimraf": "^2.6.3",
+        "semver": "^5.6.0",
+        "slash": "^2.0.0",
+        "tmp": "^0.0.33",
+        "yaml": "^1.10.2"
+      },
+      "bin": {
+        "patch-package": "index.js"
+      },
+      "engines": {
+        "node": ">=10",
+        "npm": ">5"
+      }
+    },
+    "node_modules/react-native-test-runner/node_modules/patch-package/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/react-native-test-runner/node_modules/patch-package/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/react-native-test-runner/node_modules/patch-package/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/react-native-test-runner/node_modules/patch-package/node_modules/slash": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/react-native-test-runner/node_modules/read-pkg": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
@@ -26315,6 +26445,39 @@
         "node": ">=8"
       }
     },
+    "node_modules/react-native-test-runner/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/react-native-test-runner/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-native-test-runner/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/react-native-test-runner/node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -26412,6 +26575,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/react-native-test-runner/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
     "node_modules/react-refresh": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz",
diff --git a/package.json b/package.json
index 015e9cb..7299d0b 100644
--- a/package.json
+++ b/package.json
@@ -18,13 +18,14 @@
     "test:e2e-flame": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-flame\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"",
     "test:e2e-doctor": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-doctor\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"",
     "test:gwc-kubo": "node ./scripts/kubo-init.js",
-    "test:gwc-helia": "npm run build && USE_LIBP2P=false USE_BITSWAP=false PORT=8090 TRUSTLESS_GATEWAYS='http://127.0.0.1:8080' npm start",
+    "test:gwc-helia": "npm run build && USE_LIBP2P=false USE_BITSWAP=false PORT=8090 TRUSTLESS_GATEWAYS='http://127.0.0.1:8080' FILE_DATASTORE_PATH=./data/datastore FILE_BLOCKSTORE_PATH=./data/blockstore DEBUG='helia-http-gateway*' ECHO_HEADERS='true' npm start",
     "test:gwc-setup": "concurrently -k -s all -n \"kubo,helia\" -c \"magenta,blue\" \"npm run test:gwc-kubo\" \"wait-on 'tcp:8080' && npm run test:gwc-helia\"",
     "test:gwc-execute": "docker run --network host -v $PWD:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 test --gateway-url='http://127.0.0.1:8090' --subdomain-url='http://helia-http-gateway.localhost' --verbose --json gwc-report.json --specs subdomain-ipns-gateway,subdomain-ipfs-gateway -- -timeout 30m",
     "test:gwc": "concurrently -k -s all -n \"kubo&helia,gateway-conformance\" -c \"magenta,blue\" \"npm run test:gwc-setup\" \"wait-on 'tcp:8090' && npm run test:gwc-execute\"",
     "healthcheck": "node dist/src/healthcheck.js",
     "debug:until-death": "./debugging/until-death.sh",
-    "debug:test-gateways": "./debugging/test-gateways.sh"
+    "debug:test-gateways": "./debugging/test-gateways.sh",
+    "postinstall": "patch-package"
   },
   "type": "module",
   "repository": {
@@ -64,10 +65,12 @@
     "debug": "4.3.4",
     "execa": "^8.0.1",
     "glob": "^10.3.10",
+    "patch-package": "^8.0.0",
     "typescript": "5.x",
     "wait-on": "^7.1.0"
   },
   "dependencies": {
+    "@fastify/cors": "^8.4.2",
     "@helia/unixfs": "1.x",
     "blockstore-level": "^1.1.4",
     "datastore-level": "^10.1.4",
diff --git a/src/heliaServer.ts b/src/heliaServer.ts
index e9617c5..92e88ba 100644
--- a/src/heliaServer.ts
+++ b/src/heliaServer.ts
@@ -10,7 +10,7 @@ const HELIA_RELEASE_INFO_API = (version: string): string => `https://api.github.
 
 export interface RouteEntry<T extends RouteGenericInterface = RouteGenericInterface> {
   path: string
-  type: 'GET' | 'POST'
+  type: 'GET' | 'POST' | 'OPTIONS'
   handler(request: FastifyRequest<T>, reply: FastifyReply): Promise<void>
 }
 
@@ -123,7 +123,8 @@ export class HeliaServer {
    * Redirects to the subdomain gateway.
    */
   private async handleEntry ({ request, reply }: RouteHandler): Promise<void> {
-    const { ns: namespace, address, '*': relativePath } = request.params as EntryParams
+    const { query, params } = request
+    const { ns: namespace, address, '*': relativePath } = params as EntryParams
     this.log('Handling entry: ', { address, namespace, relativePath })
     if (!USE_SUBDOMAINS) {
       this.log('Subdomains are disabled, fetching without subdomain')
@@ -137,9 +138,22 @@ export class HeliaServer {
     if (this.HAS_UPPERCASE_REGEX.test(address)) {
       cidv1Address = CID.parse(address).toV1().toString()
     }
-    const finalUrl = `//${cidv1Address ?? address}.${namespace}.${request.hostname}${relativePath ?? ''}`
+    const finalUrl = `//${cidv1Address ?? address}.${namespace}.${request.hostname}/${relativePath ?? ''}`
+    // eslint-disable-next-line no-warning-comments
+    // TODO: enable support for query params
+    // if (typeof query === 'string' && query.length > 0) {
+    //   this.log('query: ', query)
+    //   // http://localhost:8090/ipfs/bafybeie72edlprgtlwwctzljf6gkn2wnlrddqjbkxo3jomh4n7omwblxly/dir?format=raw
+    //   finalUrl += encodeURIComponent(`?${new URLSearchParams(query).toString()}`)
+    // }
+    this.log('relativePath: ', relativePath)
     this.log('Redirecting to final URL:', finalUrl)
-    await reply.redirect(307, finalUrl)
+    await reply
+      .headers({
+        Location: finalUrl
+      })
+      .code(301)
+      .send()
   }
 
   /**
@@ -155,6 +169,7 @@ export class HeliaServer {
   }
 
   async fetchWithoutSubdomain ({ request, reply }: RouteHandler): Promise<void> {
+    this.log('Fetching without subdomain')
     const opController = new AbortController()
     request.raw.on('close', () => {
       if (request.raw.aborted) {
@@ -201,6 +216,7 @@ export class HeliaServer {
    * Fetches a content for a subdomain, which basically queries delegated routing API and then fetches the path from helia.
    */
   async fetch ({ request, reply }: RouteHandler): Promise<void> {
+    this.log('Fetching from Helia:', request.url)
     const opController = new AbortController()
     request.raw.on('close', () => {
       if (request.raw.aborted) {
@@ -211,7 +227,16 @@ export class HeliaServer {
     try {
       await this.isReady
       this.log('Requesting content from helia:', request.url)
-      const { address, namespace } = this.parseHostParts(request.hostname)
+      let address: string
+      let namespace: string
+      try {
+        const hostParts = this.parseHostParts(request.hostname)
+        address = hostParts.address
+        namespace = hostParts.namespace
+      } catch (e) {
+        // not a valid request, should have been caught prior to calling this method.
+        return await reply.code(200).send('try /ipfs/<cid> or /ipns/<name>')
+      }
       if (address.includes('wikipedia')) {
         await reply.code(500).send('Wikipedia is not yet supported. Follow https://github.com/ipfs/helia-http-gateway/issues/35 for more information.')
         return
diff --git a/src/index.ts b/src/index.ts
index 2278915..fc26d5c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,3 +1,4 @@
+import cors from '@fastify/cors'
 import debug from 'debug'
 import Fastify from 'fastify'
 import metricsPlugin from 'fastify-metrics'
@@ -25,6 +26,26 @@ if (METRICS === 'true') {
   await app.register(metricsPlugin.default, { endpoint: '/metrics' })
 }
 
+await app.register(cors, {
+  /**
+   * @see https://github.com/ipfs/gateway-conformance/issues/186
+   * @see https://github.com/ipfs/gateway-conformance/blob/d855ec4fb9dac4a5aaecf3776037b005cc74c566/tests/path_gateway_cors_test.go#L16-L56
+   */
+  allowedHeaders: ['Content-Type', 'Range', 'User-Agent', 'X-Requested-With'],
+  origin: '*',
+  exposedHeaders: [
+    'Content-Range',
+    'Content-Length',
+    'X-Ipfs-Path',
+    'X-Ipfs-Roots',
+    'X-Chunked-Output',
+    'X-Stream-Output'
+  ],
+  methods: ['GET', 'HEAD', 'OPTIONS'],
+  strictPreflight: false,
+  preflightContinue: true
+})
+
 heliaServer.routes.forEach(({ path, type, handler }: RouteEntry) => {
   app.route({
     method: type,
@@ -36,12 +57,23 @@ heliaServer.routes.forEach(({ path, type, handler }: RouteEntry) => {
 if ([ECHO_HEADERS].includes(true)) {
   app.addHook('onRequest', async (request, reply) => {
     if (ECHO_HEADERS) {
-      logger('fastify hook onRequest: echoing headers.')
+      logger('fastify hook onRequest: echoing headers:')
       Object.keys(request.headers).forEach((headerName) => {
         logger('\t %s: %s', headerName, request.headers[headerName])
       })
     }
   })
+
+  app.addHook('onSend', async (request, reply, payload) => {
+    if (ECHO_HEADERS) {
+      logger('fastify hook onSend: echoing headers:')
+      const responseHeaders = reply.getHeaders()
+      Object.keys(responseHeaders).forEach((headerName) => {
+        logger('\t %s: %s', headerName, responseHeaders[headerName])
+      })
+    }
+    return payload
+  })
 }
 
 await app.listen({ port: PORT, host: HOST })

From 0e81d2538027e9dadf9cffe50a30a78e9ca0d635 Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Tue, 5 Dec 2023 12:52:45 -0800
Subject: [PATCH 17/26] fix: webrtc errors

---
 package-lock.json  | 918 +++++++++++++++++++++++++++++++++++++--------
 src/heliaServer.ts |   8 +-
 2 files changed, 767 insertions(+), 159 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1181294..c3c0e66 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,8 +7,10 @@
     "": {
       "name": "helia-http-gateway",
       "version": "0.0.1",
+      "hasInstallScript": true,
       "license": "Apache-2.0 OR MIT",
       "dependencies": {
+        "@fastify/cors": "^8.4.2",
         "@helia/unixfs": "1.x",
         "@libp2p/interface": "^1.0.1",
         "blockstore-level": "^1.1.4",
@@ -32,6 +34,9 @@
         "concurrently": "^8.2.2",
         "cross-env": "^7.0.3",
         "debug": "4.3.4",
+        "execa": "^8.0.1",
+        "glob": "^10.3.10",
+        "patch-package": "^8.0.0",
         "typescript": "5.x",
         "wait-on": "^7.1.0"
       },
@@ -1668,6 +1673,48 @@
         "rimraf": "^3.0.2"
       }
     },
+    "node_modules/@clinic/flame/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/@clinic/flame/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@clinic/flame/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/@clinic/flame/node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -2372,6 +2419,15 @@
         "node": ">=14"
       }
     },
+    "node_modules/@fastify/cors": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/@fastify/cors/-/cors-8.4.2.tgz",
+      "integrity": "sha512-IVynbcPG9eWiJ0P/A1B+KynmiU/yTYbu3ooBUSIeHfca/N1XLb9nIJVCws+YTr2q63MA8Y6QLeXQczEv4npM9g==",
+      "dependencies": {
+        "fastify-plugin": "^4.0.0",
+        "mnemonist": "0.39.5"
+      }
+    },
     "node_modules/@fastify/deepmerge": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@fastify/deepmerge/-/deepmerge-1.3.0.tgz",
@@ -5337,15 +5393,6 @@
         "string-width": "^4.1.0"
       }
     },
-    "node_modules/ansi-colors": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-      "extraneous": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/ansi-escapes": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
@@ -6451,6 +6498,16 @@
         "pako": "~1.0.5"
       }
     },
+    "node_modules/browserify/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
     "node_modules/browserify/node_modules/buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
@@ -6476,6 +6533,38 @@
         "typedarray": "^0.0.6"
       }
     },
+    "node_modules/browserify/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/browserify/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/browserslist": {
       "version": "4.22.2",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
@@ -6623,6 +6712,48 @@
         "node": ">=12"
       }
     },
+    "node_modules/c8/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/c8/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/c8/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/c8/node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -7265,6 +7396,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/clinic/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
     "node_modules/clinic/node_modules/cacheable-request": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
@@ -7375,6 +7516,26 @@
         "node": ">=6"
       }
     },
+    "node_modules/clinic/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/clinic/node_modules/got": {
       "version": "9.6.0",
       "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
@@ -7469,6 +7630,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/clinic/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/clinic/node_modules/normalize-url": {
       "version": "4.5.1",
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
@@ -9022,6 +9195,36 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/del/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/del/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/del/node_modules/globby": {
       "version": "11.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
@@ -9042,6 +9245,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/del/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/del/node_modules/p-map": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
@@ -11654,6 +11869,48 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
+    "node_modules/flat-cache/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/flat-cache/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/flat-cache/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/flat-cache/node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -12055,22 +12312,64 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/gh-pages/node_modules/globby": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
+    "node_modules/gh-pages/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
       "dependencies": {
-        "array-union": "^1.0.1",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/gh-pages/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/gh-pages/node_modules/globby": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/gh-pages/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/git-log-parser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/git-log-parser/-/git-log-parser-1.2.0.tgz",
@@ -12100,20 +12399,22 @@
       "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
     },
     "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "version": "10.3.10",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
       "dev": true,
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.3.5",
+        "minimatch": "^9.0.1",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+        "path-scurry": "^1.10.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": "*"
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -12131,26 +12432,29 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/glob/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "node_modules/glob/node_modules/foreground-child": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
       "dev": true,
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/glob/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/glob/node_modules/minipass": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
+      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
       "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
       "engines": {
-        "node": "*"
+        "node": ">=16 || 14 >=14.17"
       }
     },
     "node_modules/global-agent": {
@@ -14353,6 +14657,48 @@
         "node": ">=8"
       }
     },
+    "node_modules/istanbul-lib-processinfo/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/istanbul-lib-processinfo/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/istanbul-lib-processinfo/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/istanbul-lib-processinfo/node_modules/p-map": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
@@ -14824,12 +15170,36 @@
       "integrity": "sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A==",
       "dev": true
     },
+    "node_modules/json-stable-stringify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.0.tgz",
+      "integrity": "sha512-zfA+5SuwYN2VWqN1/5HZaDzQKLJHaBVMZIIM+wuYjdptkaQsqzDdqjqf+lZZJUuJq1aanHiY8LhH8LmH+qBYJA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "isarray": "^2.0.5",
+        "jsonify": "^0.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
+    "node_modules/json-stable-stringify/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -14866,6 +15236,15 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/jsonify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
+      "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/jsonparse": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
@@ -17199,6 +17578,14 @@
       "integrity": "sha512-VoAYUqmPRmzKbbqRejjqceGFp3VF81Qe8XXFGU0UXLxB7Mf4GGvyGq5Qn3k4AiQgDEV6WzobqlPOd+j0+m6IrA==",
       "dev": true
     },
+    "node_modules/mnemonist": {
+      "version": "0.39.5",
+      "resolved": "https://registry.npmjs.org/mnemonist/-/mnemonist-0.39.5.tgz",
+      "integrity": "sha512-FPUtkhtJ0efmEFGpU14x7jGbTB+s18LrzRL2KgoWz9YvcY3cPomz8tih01GbHwnGk/OmkOKfqd/RAQoc8Lm7DQ==",
+      "dependencies": {
+        "obliterator": "^2.0.1"
+      }
+    },
     "node_modules/mocha": {
       "version": "10.2.0",
       "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz",
@@ -21720,6 +22107,16 @@
         "node": ">=8.9"
       }
     },
+    "node_modules/nyc/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
     "node_modules/nyc/node_modules/camelcase": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
@@ -21759,6 +22156,26 @@
         "node": ">=8"
       }
     },
+    "node_modules/nyc/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/nyc/node_modules/locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -21771,6 +22188,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/nyc/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/nyc/node_modules/p-limit": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -22002,6 +22431,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/obliterator": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/obliterator/-/obliterator-2.0.4.tgz",
+      "integrity": "sha512-lgHwxlxV1qIg1Eap7LgIeoBWIMFibOjbrYPIPJZcI1mmGAI2m3lNYpK12Y+GBdPQ0U1hRwSord7GIaawz962qQ=="
+    },
     "node_modules/observable-webworkers": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/observable-webworkers/-/observable-webworkers-2.0.1.tgz",
@@ -22778,48 +23212,58 @@
       }
     },
     "node_modules/patch-package": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.5.1.tgz",
-      "integrity": "sha512-I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz",
+      "integrity": "sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==",
       "dev": true,
       "dependencies": {
         "@yarnpkg/lockfile": "^1.1.0",
         "chalk": "^4.1.2",
-        "cross-spawn": "^6.0.5",
+        "ci-info": "^3.7.0",
+        "cross-spawn": "^7.0.3",
         "find-yarn-workspace-root": "^2.0.0",
         "fs-extra": "^9.0.0",
-        "is-ci": "^2.0.0",
+        "json-stable-stringify": "^1.0.2",
         "klaw-sync": "^6.0.0",
         "minimist": "^1.2.6",
         "open": "^7.4.2",
         "rimraf": "^2.6.3",
-        "semver": "^5.6.0",
+        "semver": "^7.5.3",
         "slash": "^2.0.0",
         "tmp": "^0.0.33",
-        "yaml": "^1.10.2"
+        "yaml": "^2.2.2"
       },
       "bin": {
         "patch-package": "index.js"
       },
       "engines": {
-        "node": ">=10",
+        "node": ">=14",
         "npm": ">5"
       }
     },
-    "node_modules/patch-package/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+    "node_modules/patch-package/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
       "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/patch-package/node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
       "engines": {
-        "node": ">=4.8"
+        "node": ">=8"
       }
     },
     "node_modules/patch-package/node_modules/fs-extra": {
@@ -22837,55 +23281,48 @@
         "node": ">=10"
       }
     },
-    "node_modules/patch-package/node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/patch-package/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+    "node_modules/patch-package/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "dev": true,
       "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/patch-package/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/patch-package/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+    "node_modules/patch-package/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "dependencies": {
-        "shebang-regex": "^1.0.0"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "*"
       }
     },
-    "node_modules/patch-package/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+    "node_modules/patch-package/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
       }
     },
     "node_modules/patch-package/node_modules/slash": {
@@ -22897,16 +23334,13 @@
         "node": ">=6"
       }
     },
-    "node_modules/patch-package/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+    "node_modules/patch-package/node_modules/yaml": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
+      "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==",
       "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
+      "engines": {
+        "node": ">= 14"
       }
     },
     "node_modules/path": {
@@ -24934,6 +25368,16 @@
       "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
       "dev": true
     },
+    "node_modules/react-native-test-runner/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
     "node_modules/react-native-test-runner/node_modules/crypto-random-string": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
@@ -24996,6 +25440,26 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/react-native-test-runner/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/react-native-test-runner/node_modules/globby": {
       "version": "11.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
@@ -25052,6 +25516,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/react-native-test-runner/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/react-native-test-runner/node_modules/normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -25113,6 +25589,78 @@
         "node": ">=8"
       }
     },
+    "node_modules/react-native-test-runner/node_modules/patch-package": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.5.1.tgz",
+      "integrity": "sha512-I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA==",
+      "dev": true,
+      "dependencies": {
+        "@yarnpkg/lockfile": "^1.1.0",
+        "chalk": "^4.1.2",
+        "cross-spawn": "^6.0.5",
+        "find-yarn-workspace-root": "^2.0.0",
+        "fs-extra": "^9.0.0",
+        "is-ci": "^2.0.0",
+        "klaw-sync": "^6.0.0",
+        "minimist": "^1.2.6",
+        "open": "^7.4.2",
+        "rimraf": "^2.6.3",
+        "semver": "^5.6.0",
+        "slash": "^2.0.0",
+        "tmp": "^0.0.33",
+        "yaml": "^1.10.2"
+      },
+      "bin": {
+        "patch-package": "index.js"
+      },
+      "engines": {
+        "node": ">=10",
+        "npm": ">5"
+      }
+    },
+    "node_modules/react-native-test-runner/node_modules/patch-package/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/react-native-test-runner/node_modules/patch-package/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/react-native-test-runner/node_modules/patch-package/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/react-native-test-runner/node_modules/patch-package/node_modules/slash": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/react-native-test-runner/node_modules/read-pkg": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
@@ -25128,6 +25676,39 @@
         "node": ">=8"
       }
     },
+    "node_modules/react-native-test-runner/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/react-native-test-runner/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-native-test-runner/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/react-native-test-runner/node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -25213,6 +25794,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/react-native-test-runner/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
     "node_modules/react-refresh": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz",
@@ -26013,53 +26606,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/rimraf/node_modules/foreground-child": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rimraf/node_modules/glob": {
-      "version": "10.3.10",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
-      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
-      "dev": true,
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^2.3.5",
-        "minimatch": "^9.0.1",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-        "path-scurry": "^1.10.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rimraf/node_modules/minipass": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
     "node_modules/ripemd160": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
@@ -27745,6 +28291,48 @@
         "node": ">=8"
       }
     },
+    "node_modules/spawn-wrap/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/spawn-wrap/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/spawn-wrap/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/spawn-wrap/node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -28510,6 +29098,26 @@
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/test-exclude/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/test-exclude/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
diff --git a/src/heliaServer.ts b/src/heliaServer.ts
index 2ae7638..972c86c 100644
--- a/src/heliaServer.ts
+++ b/src/heliaServer.ts
@@ -124,7 +124,7 @@ export class HeliaServer {
    * Redirects to the subdomain gateway.
    */
   private async handleEntry ({ request, reply }: RouteHandler): Promise<void> {
-    const { query, params } = request
+    const { params } = request
     const { ns: namespace, address, '*': relativePath } = params as EntryParams
     this.log('Handling entry: ', { address, namespace, relativePath })
     if (!USE_SUBDOMAINS) {
@@ -142,10 +142,10 @@ export class HeliaServer {
     const finalUrl = `//${cidv1Address ?? address}.${namespace}.${request.hostname}/${relativePath ?? ''}`
     // eslint-disable-next-line no-warning-comments
     // TODO: enable support for query params
-    // if (typeof query === 'string' && query.length > 0) {
-    //   this.log('query: ', query)
+    // if (typeof request.query === 'string' && request.query.length > 0) {
+    //   this.log('request.query: ', request.query)
     //   // http://localhost:8090/ipfs/bafybeie72edlprgtlwwctzljf6gkn2wnlrddqjbkxo3jomh4n7omwblxly/dir?format=raw
-    //   finalUrl += encodeURIComponent(`?${new URLSearchParams(query).toString()}`)
+    //   finalUrl += encodeURIComponent(`?${new URLSearchParams(request.query).toString()}`)
     // }
     this.log('relativePath: ', relativePath)
     this.log('Redirecting to final URL:', finalUrl)

From b047f52342862b1c105efdf512bca64886461fc2 Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Tue, 5 Dec 2023 15:26:38 -0800
Subject: [PATCH 18/26] feat: use custom libp2p node

---
 src/getCustomHelia.ts  |   5 +-
 src/getCustomLibp2p.ts | 136 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+), 3 deletions(-)
 create mode 100644 src/getCustomLibp2p.ts

diff --git a/src/getCustomHelia.ts b/src/getCustomHelia.ts
index dbc4451..b2cc499 100644
--- a/src/getCustomHelia.ts
+++ b/src/getCustomHelia.ts
@@ -3,6 +3,7 @@ import { LevelDatastore } from 'datastore-level'
 import { createHelia, type Helia, type HeliaInit } from 'helia'
 import { bitswap, trustlessGateway } from 'helia/block-brokers'
 import { USE_LIBP2P, FILE_BLOCKSTORE_PATH, FILE_DATASTORE_PATH, TRUSTLESS_GATEWAYS, USE_BITSWAP, USE_TRUSTLESS_GATEWAYS } from './constants.js'
+import { getCustomLibp2p } from './getCustomLibp2p.js'
 import type { Libp2p } from '@libp2p/interface'
 
 export async function getCustomHelia (): Promise<Helia> {
@@ -34,9 +35,7 @@ export async function getCustomHelia (): Promise<Helia> {
   }
 
   if (!USE_LIBP2P) {
-    config.libp2p = {
-      start: false
-    }
+    config.libp2p = await getCustomLibp2p({ datastore: config.datastore })
   }
 
   return createHelia(config)
diff --git a/src/getCustomLibp2p.ts b/src/getCustomLibp2p.ts
new file mode 100644
index 0000000..0e0f2e8
--- /dev/null
+++ b/src/getCustomLibp2p.ts
@@ -0,0 +1,136 @@
+import { gossipsub } from '@chainsafe/libp2p-gossipsub'
+import { noise } from '@chainsafe/libp2p-noise'
+import { yamux } from '@chainsafe/libp2p-yamux'
+import { createDelegatedRoutingV1HttpApiClient } from '@helia/delegated-routing-v1-http-api-client'
+import { autoNAT as autoNATService } from '@libp2p/autonat'
+import { bootstrap } from '@libp2p/bootstrap'
+import { circuitRelayTransport, circuitRelayServer, type CircuitRelayService } from '@libp2p/circuit-relay-v2'
+import { dcutr as dcutrService } from '@libp2p/dcutr'
+import { identify as identifyService, type Identify } from '@libp2p/identify'
+import { type DualKadDHT, kadDHT } from '@libp2p/kad-dht'
+// import { mdns } from '@libp2p/mdns'
+import { mplex } from '@libp2p/mplex'
+import { ping as pingService, type PingService } from '@libp2p/ping'
+import { tcp } from '@libp2p/tcp'
+import { uPnPNAT as uPnPNATService } from '@libp2p/upnp-nat'
+// import { webRTC, webRTCDirect } from '@libp2p/webrtc'
+import { webSockets } from '@libp2p/websockets'
+import { ipnsSelector } from 'ipns/selector'
+import { ipnsValidator } from 'ipns/validator'
+import { createLibp2p as create, type Libp2pOptions } from 'libp2p'
+import { USE_LIBP2P } from './constants.js'
+import type { Libp2p, PubSub } from '@libp2p/interface'
+import type { HeliaInit } from 'helia'
+// import { peerDiscovery, PeerDiscovery } from '@libp2p/peer-discovery'
+
+interface HeliaGatewayLibp2pServices extends Record<string, unknown> {
+  dht: DualKadDHT
+  delegatedRouting: unknown
+  pubsub: PubSub
+  relay: CircuitRelayService
+  identify: Identify
+  autoNAT: unknown
+  upnp: unknown
+  dcutr: unknown
+  ping: PingService
+}
+
+interface HeliaGatewayLibp2pOptions extends Pick<HeliaInit, 'datastore'> {
+
+}
+
+export async function getCustomLibp2p ({ datastore }: HeliaGatewayLibp2pOptions): Promise<Libp2p<HeliaGatewayLibp2pServices>> {
+  let options: Libp2pOptions<HeliaGatewayLibp2pServices> = {
+    datastore,
+    addresses: {
+      listen: [
+        // helia-http-gateway is not dialable, we're only retrieving data from IPFS network, and then providing that data via a web2 http interface.
+        // '/ip4/0.0.0.0/tcp/0',
+        // '/ip6/::/tcp/0',
+        // '/webrtc'
+      ]
+    },
+    connectionManager: {
+      /**
+       * disable auto-dial because we don't want to be doing a lot of work to keep connections alive.
+       */
+      minConnections: 0
+    },
+    transports: [
+      circuitRelayTransport({
+        discoverRelays: 1
+      }),
+      tcp(),
+      /**
+       * Temporarily disabling webrtc while waiting on release of:
+       * * https://github.com/libp2p/js-libp2p/pull/2299
+       * * https://github.com/libp2p/js-libp2p/pull/2302
+       *
+       * @see https://github.com/libp2p/js-libp2p/pull/2301
+       */
+      // webRTC(),
+      // webRTCDirect(),
+      webSockets()
+    ],
+    connectionEncryption: [
+      noise()
+    ],
+    streamMuxers: [
+      yamux(),
+      mplex()
+    ],
+    peerDiscovery: [
+      // (components): PeerDiscovery => ({
+      //   get [peerDiscovery] () {
+      //     components.services.
+      //   }
+      // }),
+      // mdns(), // disable mdns while optimizing for performance.
+      bootstrap({
+        list: [
+          '/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN',
+          '/dnsaddr/bootstrap.libp2p.io/p2p/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa',
+          '/dnsaddr/bootstrap.libp2p.io/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb',
+          '/dnsaddr/bootstrap.libp2p.io/p2p/QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt',
+          '/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ'
+        ]
+      })
+    ],
+    services: {
+      identify: identifyService(),
+      autoNAT: autoNATService(),
+      upnp: uPnPNATService(),
+      pubsub: gossipsub(),
+      dcutr: dcutrService(),
+      delegatedRouting: () => createDelegatedRoutingV1HttpApiClient('https://delegated-ipfs.dev'),
+      dht: kadDHT({
+        // don't do DHT server work.
+        clientMode: true,
+        validators: {
+          ipns: ipnsValidator
+        },
+        selectors: {
+          ipns: ipnsSelector
+        }
+      }),
+      relay: circuitRelayServer({
+        // don't advertise as a circuitRelay server because we have one job, and that is to:  listen for http requests, maybe fetch content, return http responses.
+        // advertise: true
+      }),
+      ping: pingService()
+    }
+  }
+
+  if (!USE_LIBP2P) {
+    // we should not be running libp2p things
+    options = {
+      ...options,
+      start: false,
+      addresses: {
+        listen: []
+      }
+    }
+  }
+
+  return create(options)
+}

From 1317adab8a7e0a884b5459b7ed5f52c25d12a445 Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Tue, 5 Dec 2023 16:27:42 -0800
Subject: [PATCH 19/26] fix: custom libp2p & playwright config

---
 e2e-tests/smoketest.spec.ts |  2 +-
 package-lock.json           |  2 +-
 package.json                |  2 +-
 playwright.config.ts        |  6 +++++-
 src/getCustomLibp2p.ts      | 20 ++++++--------------
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/e2e-tests/smoketest.spec.ts b/e2e-tests/smoketest.spec.ts
index 727f296..2363b8e 100644
--- a/e2e-tests/smoketest.spec.ts
+++ b/e2e-tests/smoketest.spec.ts
@@ -36,7 +36,7 @@ test.beforeEach(async ({ context }) => {
 })
 
 test.afterEach(async ({ page }) => {
-  test.setTimeout(30000)
+  test.setTimeout(2 * 60 * 1000) // 2 minutes
   const result = await page.request.post(`http://localhost:${PORT}/api/v0/repo/gc`)
   expect(result?.status()).toBe(200)
 
diff --git a/package-lock.json b/package-lock.json
index c3c0e66..b40ccd9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,7 @@
         "pino-pretty": "10.2.3"
       },
       "devDependencies": {
-        "@playwright/test": "^1.39.0",
+        "@playwright/test": "^1.40.1",
         "@types/mime-types": "2.x",
         "@types/node": "20.x",
         "aegir": "41.x",
diff --git a/package.json b/package.json
index 6eef1c5..b552fbc 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
   },
   "homepage": "https://github.com/ipfs/helia-http-gateway#readme",
   "devDependencies": {
-    "@playwright/test": "^1.39.0",
+    "@playwright/test": "^1.40.1",
     "@types/mime-types": "2.x",
     "@types/node": "20.x",
     "aegir": "41.x",
diff --git a/playwright.config.ts b/playwright.config.ts
index 69b6f75..62ca79a 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -1,3 +1,4 @@
+import { join } from 'node:path'
 import { defineConfig, devices } from '@playwright/test'
 import { PORT } from './src/constants.js'
 
@@ -55,7 +56,10 @@ export default defineConfig({
     // Tiros does not re-use the existing server.
     reuseExistingServer: process.env.CI == null,
     env: {
-      DEBUG: process.env.DEBUG ?? ' '
+      DEBUG: process.env.DEBUG ?? ' ',
+      USE_BITSWAP: 'false',
+      FILE_BLOCKSTORE_PATH: join(process.cwd(), 'test', 'fixtures', 'e2e', 'blockstore'),
+      FILE_DATASTORE_PATH: join(process.cwd(), 'test', 'fixtures', 'e2e', 'datastore')
     }
   }
 })
diff --git a/src/getCustomLibp2p.ts b/src/getCustomLibp2p.ts
index 0e0f2e8..41331ef 100644
--- a/src/getCustomLibp2p.ts
+++ b/src/getCustomLibp2p.ts
@@ -8,7 +8,6 @@ import { circuitRelayTransport, circuitRelayServer, type CircuitRelayService } f
 import { dcutr as dcutrService } from '@libp2p/dcutr'
 import { identify as identifyService, type Identify } from '@libp2p/identify'
 import { type DualKadDHT, kadDHT } from '@libp2p/kad-dht'
-// import { mdns } from '@libp2p/mdns'
 import { mplex } from '@libp2p/mplex'
 import { ping as pingService, type PingService } from '@libp2p/ping'
 import { tcp } from '@libp2p/tcp'
@@ -21,7 +20,6 @@ import { createLibp2p as create, type Libp2pOptions } from 'libp2p'
 import { USE_LIBP2P } from './constants.js'
 import type { Libp2p, PubSub } from '@libp2p/interface'
 import type { HeliaInit } from 'helia'
-// import { peerDiscovery, PeerDiscovery } from '@libp2p/peer-discovery'
 
 interface HeliaGatewayLibp2pServices extends Record<string, unknown> {
   dht: DualKadDHT
@@ -40,14 +38,11 @@ interface HeliaGatewayLibp2pOptions extends Pick<HeliaInit, 'datastore'> {
 }
 
 export async function getCustomLibp2p ({ datastore }: HeliaGatewayLibp2pOptions): Promise<Libp2p<HeliaGatewayLibp2pServices>> {
-  let options: Libp2pOptions<HeliaGatewayLibp2pServices> = {
+  const options: Libp2pOptions<HeliaGatewayLibp2pServices> = {
     datastore,
     addresses: {
       listen: [
         // helia-http-gateway is not dialable, we're only retrieving data from IPFS network, and then providing that data via a web2 http interface.
-        // '/ip4/0.0.0.0/tcp/0',
-        // '/ip6/::/tcp/0',
-        // '/webrtc'
       ]
     },
     connectionManager: {
@@ -58,7 +53,7 @@ export async function getCustomLibp2p ({ datastore }: HeliaGatewayLibp2pOptions)
     },
     transports: [
       circuitRelayTransport({
-        discoverRelays: 1
+        discoverRelays: USE_LIBP2P ? 1 : 0
       }),
       tcp(),
       /**
@@ -123,13 +118,10 @@ export async function getCustomLibp2p ({ datastore }: HeliaGatewayLibp2pOptions)
 
   if (!USE_LIBP2P) {
     // we should not be running libp2p things
-    options = {
-      ...options,
-      start: false,
-      addresses: {
-        listen: []
-      }
-    }
+    options.start = false
+    options.services = {}
+    options.peerDiscovery = []
+    options.transports = []
   }
 
   return create(options)

From a520039b29ad94e74b591b4b0a5e01bbb409f731 Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Tue, 5 Dec 2023 16:32:19 -0800
Subject: [PATCH 20/26] chore: add fastify/cors patch

---
 patches/@fastify+cors+8.4.2.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 patches/@fastify+cors+8.4.2.patch

diff --git a/patches/@fastify+cors+8.4.2.patch b/patches/@fastify+cors+8.4.2.patch
new file mode 100644
index 0000000..ce231a7
--- /dev/null
+++ b/patches/@fastify+cors+8.4.2.patch
@@ -0,0 +1,15 @@
+diff --git a/node_modules/@fastify/cors/index.js b/node_modules/@fastify/cors/index.js
+index f113e81..1b3f055 100644
+--- a/node_modules/@fastify/cors/index.js
++++ b/node_modules/@fastify/cors/index.js
+@@ -175,7 +175,9 @@ function addCorsHeadersHandler (fastify, options, req, reply, next) {
+ 
+     addCorsHeaders(req, reply, resolvedOriginOption, options)
+ 
+-    if (req.raw.method === 'OPTIONS' && options.preflight === true) {
++    // gateway conformance tests require preflight headers even for non OPTIONS requests
++    // if (req.raw.method === 'OPTIONS' && options.preflight === true) {
++    if (options.preflight === true) {
+       // Strict mode enforces the required headers for preflight
+       if (options.strictPreflight === true && (!req.headers.origin || !req.headers['access-control-request-method'])) {
+         reply.status(400).type('text/plain').send('Invalid Preflight Request')

From f3557a3de0faa5da223c56a56661a0e5727a8763 Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Tue, 5 Dec 2023 17:57:15 -0800
Subject: [PATCH 21/26] feat: use @helia/ipns

---
 package-lock.json     | 235 +++++++++++++++++++++++++++++++++++++++++-
 package.json          |   3 +-
 src/getCustomHelia.ts |   6 +-
 src/heliaFetch.ts     | 131 ++++++++++-------------
 src/heliaServer.ts    |   7 +-
 5 files changed, 289 insertions(+), 93 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b40ccd9..8ef36dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,16 +11,15 @@
       "license": "Apache-2.0 OR MIT",
       "dependencies": {
         "@fastify/cors": "^8.4.2",
+        "@helia/ipns": "^3.0.0",
         "@helia/unixfs": "1.x",
         "@libp2p/interface": "^1.0.1",
         "blockstore-level": "^1.1.4",
         "datastore-level": "^10.1.4",
-        "dns-over-http-resolver": "3.0.0",
         "fastify": "4.24.3",
         "fastify-metrics": "10.3.3",
         "file-type": "18.x",
         "helia": "next",
-        "lru-cache": "10.x",
         "mime-types": "2.x",
         "p-try-each": "1.x",
         "pino-pretty": "10.2.3"
@@ -2414,7 +2413,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.0.tgz",
       "integrity": "sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==",
-      "dev": true,
       "engines": {
         "node": ">=14"
       }
@@ -2536,6 +2534,139 @@
         "uint8arraylist": "^2.4.3"
       }
     },
+    "node_modules/@helia/ipns": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@helia/ipns/-/ipns-3.0.0.tgz",
+      "integrity": "sha512-t/65uiRYnRztbaU401n1BPyXsM8TzX++6LnfYOpjLYY7jb/YC8AdN6azSfVnWtn08/HRBXzusv1iQTD/QRmsbA==",
+      "dependencies": {
+        "@libp2p/kad-dht": "^10.0.11",
+        "@libp2p/logger": "^3.0.2",
+        "@libp2p/peer-id": "^3.0.2",
+        "dns-over-http-resolver": "^2.1.3",
+        "dns-packet": "^5.6.0",
+        "hashlru": "^2.3.0",
+        "interface-datastore": "^8.0.0",
+        "ipns": "^7.0.1",
+        "is-ipfs": "^8.0.1",
+        "multiformats": "^12.0.1",
+        "p-queue": "^7.3.0",
+        "progress-events": "^1.0.0",
+        "uint8arrays": "^4.0.3"
+      }
+    },
+    "node_modules/@helia/ipns/node_modules/@libp2p/crypto": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@libp2p/crypto/-/crypto-2.0.8.tgz",
+      "integrity": "sha512-8e5fh6bsJNpSjhrggtlm8QF+BERjelJswIjRS69aKgxp24R4z2kDM4pRYPkfQjXJDLNDtqWtKNmePgX23+QJsA==",
+      "dependencies": {
+        "@libp2p/interface": "^0.1.6",
+        "@noble/curves": "^1.1.0",
+        "@noble/hashes": "^1.3.1",
+        "multiformats": "^12.0.1",
+        "node-forge": "^1.1.0",
+        "protons-runtime": "^5.0.0",
+        "uint8arraylist": "^2.4.3",
+        "uint8arrays": "^4.0.6"
+      }
+    },
+    "node_modules/@helia/ipns/node_modules/@libp2p/interface": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-0.1.6.tgz",
+      "integrity": "sha512-Lzc5cS/hXuoXhuAbVIxJIHLCYmfPcbU0vVgrpMoiP1Qb2Q3ETU4A46GB8s8mWXgSU6tr9RcqerUqzFYD6+OAag==",
+      "dependencies": {
+        "@multiformats/multiaddr": "^12.1.5",
+        "abortable-iterator": "^5.0.1",
+        "it-pushable": "^3.2.0",
+        "it-stream-types": "^2.0.1",
+        "multiformats": "^12.0.1",
+        "p-defer": "^4.0.0",
+        "race-signal": "^1.0.0",
+        "uint8arraylist": "^2.4.3"
+      }
+    },
+    "node_modules/@helia/ipns/node_modules/@libp2p/interface-internal": {
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/@libp2p/interface-internal/-/interface-internal-0.1.12.tgz",
+      "integrity": "sha512-tUZ4hxU8fO4397p/GtXNvAANHiLA/Uxdil90TuNNCnlb+GZijDYEEJiqBfnk2zYAdwm7Q9iO0fVxZCpfoW8B7Q==",
+      "dependencies": {
+        "@libp2p/interface": "^0.1.6",
+        "@libp2p/peer-collections": "^4.0.8",
+        "@multiformats/multiaddr": "^12.1.5",
+        "uint8arraylist": "^2.4.3"
+      }
+    },
+    "node_modules/@helia/ipns/node_modules/@libp2p/kad-dht": {
+      "version": "10.0.15",
+      "resolved": "https://registry.npmjs.org/@libp2p/kad-dht/-/kad-dht-10.0.15.tgz",
+      "integrity": "sha512-S4pQY8t4lXBlicBREThtOHnLn79e07sVgKZPa9SmJ4hC1+i0HFD8XLzrHm3cnKSO/4RhoaF5YdlnZMMjbb7q0w==",
+      "dependencies": {
+        "@libp2p/crypto": "^2.0.8",
+        "@libp2p/interface": "^0.1.6",
+        "@libp2p/interface-internal": "^0.1.9",
+        "@libp2p/logger": "^3.1.0",
+        "@libp2p/peer-collections": "^4.0.8",
+        "@libp2p/peer-id": "^3.0.6",
+        "@multiformats/multiaddr": "^12.1.5",
+        "@types/sinon": "^17.0.0",
+        "abortable-iterator": "^5.0.1",
+        "any-signal": "^4.1.1",
+        "datastore-core": "^9.0.1",
+        "hashlru": "^2.3.0",
+        "interface-datastore": "^8.2.0",
+        "it-all": "^3.0.2",
+        "it-drain": "^3.0.2",
+        "it-first": "^3.0.1",
+        "it-length": "^3.0.1",
+        "it-length-prefixed": "^9.0.1",
+        "it-map": "^3.0.3",
+        "it-merge": "^3.0.0",
+        "it-parallel": "^3.0.0",
+        "it-pipe": "^3.0.1",
+        "it-pushable": "^3.2.1",
+        "it-stream-types": "^2.0.1",
+        "it-take": "^3.0.1",
+        "multiformats": "^12.0.1",
+        "p-defer": "^4.0.0",
+        "p-event": "^6.0.0",
+        "p-queue": "^7.3.4",
+        "private-ip": "^3.0.0",
+        "progress-events": "^1.0.0",
+        "protons-runtime": "^5.0.0",
+        "uint8-varint": "^2.0.0",
+        "uint8arraylist": "^2.4.3",
+        "uint8arrays": "^4.0.6"
+      }
+    },
+    "node_modules/@helia/ipns/node_modules/@libp2p/peer-collections": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/@libp2p/peer-collections/-/peer-collections-4.0.11.tgz",
+      "integrity": "sha512-4bHtIm3VfYMm2laRuebkswQukgQmWTUbExnu1sD5vcbI186aCZ7P56QjWyOIMn3XflIoZ0cx9AXX/WuDQSolDA==",
+      "dependencies": {
+        "@libp2p/interface": "^0.1.6",
+        "@libp2p/peer-id": "^3.0.6"
+      }
+    },
+    "node_modules/@helia/ipns/node_modules/@libp2p/peer-id": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@libp2p/peer-id/-/peer-id-3.0.6.tgz",
+      "integrity": "sha512-iN1Ia5gH2U1V/GOVRmLHmVY6fblxzrOPUoZrMYjHl/K4s+AiI7ym/527WDeQvhQpD7j3TfDwcAYforD2dLGpLw==",
+      "dependencies": {
+        "@libp2p/interface": "^0.1.6",
+        "multiformats": "^12.0.1",
+        "uint8arrays": "^4.0.6"
+      }
+    },
+    "node_modules/@helia/ipns/node_modules/dns-over-http-resolver": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/dns-over-http-resolver/-/dns-over-http-resolver-2.1.3.tgz",
+      "integrity": "sha512-zjRYFhq+CsxPAouQWzOsxNMvEN+SHisjzhX8EMxd2Y0EG3thvn6wXQgMJLnTDImkhe4jhLbOQpXtL10nALBOSA==",
+      "dependencies": {
+        "debug": "^4.3.1",
+        "native-fetch": "^4.0.2",
+        "receptacle": "^1.3.2",
+        "undici": "^5.12.0"
+      }
+    },
     "node_modules/@helia/unixfs": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/@helia/unixfs/-/unixfs-1.4.3.tgz",
@@ -14253,6 +14384,94 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-ipfs": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/is-ipfs/-/is-ipfs-8.0.1.tgz",
+      "integrity": "sha512-hoBSElmPath3aDdtaOpVZsuCh2SXTqvLML+H75S7iDgKdqNmENJ6tsRucP1HLfpqEyZ/uIlj/+ZBxIC/F8B5Eg==",
+      "dependencies": {
+        "@multiformats/mafmt": "^11.0.3",
+        "@multiformats/multiaddr": "^11.0.0",
+        "iso-url": "^1.1.3",
+        "multiformats": "^11.0.0",
+        "uint8arrays": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=16.0.0",
+        "npm": ">=7.0.0"
+      }
+    },
+    "node_modules/is-ipfs/node_modules/@multiformats/mafmt": {
+      "version": "11.1.2",
+      "resolved": "https://registry.npmjs.org/@multiformats/mafmt/-/mafmt-11.1.2.tgz",
+      "integrity": "sha512-3n1o5eLU7WzTAPLuz3AodV7Iql6NWf7Ws8fqVaGT7o5nDDabUPYGBm2cZuh3OrqmwyCY61LrNUIsjzivU6UdpQ==",
+      "dependencies": {
+        "@multiformats/multiaddr": "^12.0.0"
+      },
+      "engines": {
+        "node": ">=16.0.0",
+        "npm": ">=7.0.0"
+      }
+    },
+    "node_modules/is-ipfs/node_modules/@multiformats/mafmt/node_modules/@multiformats/multiaddr": {
+      "version": "12.1.11",
+      "resolved": "https://registry.npmjs.org/@multiformats/multiaddr/-/multiaddr-12.1.11.tgz",
+      "integrity": "sha512-CWG9kETEGTTMdr1T+/JEuMwFld3r3fHNP8LkLoUcLvHRy6yr8sWdotVGEDNEdDO/vrKhuD7bQBws3xMSMMyylg==",
+      "dependencies": {
+        "@chainsafe/is-ip": "^2.0.1",
+        "@chainsafe/netmask": "^2.0.0",
+        "@libp2p/interface": "^1.0.0",
+        "dns-over-http-resolver": "3.0.0",
+        "multiformats": "^12.0.1",
+        "uint8-varint": "^2.0.1",
+        "uint8arrays": "^4.0.2"
+      }
+    },
+    "node_modules/is-ipfs/node_modules/@multiformats/mafmt/node_modules/multiformats": {
+      "version": "12.1.3",
+      "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz",
+      "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==",
+      "engines": {
+        "node": ">=16.0.0",
+        "npm": ">=7.0.0"
+      }
+    },
+    "node_modules/is-ipfs/node_modules/@multiformats/multiaddr": {
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/@multiformats/multiaddr/-/multiaddr-11.6.1.tgz",
+      "integrity": "sha512-doST0+aB7/3dGK9+U5y3mtF3jq85KGbke1QiH0KE1F5mGQ9y56mFebTeu2D9FNOm+OT6UHb8Ss8vbSnpGjeLNw==",
+      "dependencies": {
+        "@chainsafe/is-ip": "^2.0.1",
+        "dns-over-http-resolver": "^2.1.0",
+        "err-code": "^3.0.1",
+        "multiformats": "^11.0.0",
+        "uint8arrays": "^4.0.2",
+        "varint": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=16.0.0",
+        "npm": ">=7.0.0"
+      }
+    },
+    "node_modules/is-ipfs/node_modules/@multiformats/multiaddr/node_modules/dns-over-http-resolver": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/dns-over-http-resolver/-/dns-over-http-resolver-2.1.3.tgz",
+      "integrity": "sha512-zjRYFhq+CsxPAouQWzOsxNMvEN+SHisjzhX8EMxd2Y0EG3thvn6wXQgMJLnTDImkhe4jhLbOQpXtL10nALBOSA==",
+      "dependencies": {
+        "debug": "^4.3.1",
+        "native-fetch": "^4.0.2",
+        "receptacle": "^1.3.2",
+        "undici": "^5.12.0"
+      }
+    },
+    "node_modules/is-ipfs/node_modules/multiformats": {
+      "version": "11.0.2",
+      "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz",
+      "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==",
+      "engines": {
+        "node": ">=16.0.0",
+        "npm": ">=7.0.0"
+      }
+    },
     "node_modules/is-loopback-addr": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/is-loopback-addr/-/is-loopback-addr-2.0.2.tgz",
@@ -16086,6 +16305,7 @@
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz",
       "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==",
+      "dev": true,
       "engines": {
         "node": "14 || >=16.14"
       }
@@ -18241,6 +18461,14 @@
       "resolved": "https://registry.npmjs.org/napi-macros/-/napi-macros-2.2.2.tgz",
       "integrity": "sha512-hmEVtAGYzVQpCKdbQea4skABsdXW4RUh5t5mJ2zzqowJS2OyXZTU1KhDVFhx+NlWZ4ap9mqR9TcDO3LTTttd+g=="
     },
+    "node_modules/native-fetch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/native-fetch/-/native-fetch-4.0.2.tgz",
+      "integrity": "sha512-4QcVlKFtv2EYVS5MBgsGX5+NWKtbDbIECdUXDBGDMAZXq3Jkv9zf+y8iS7Ub8fEdga3GpYeazp9gauNqXHJOCg==",
+      "peerDependencies": {
+        "undici": "*"
+      }
+    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -30032,7 +30260,6 @@
       "version": "5.28.2",
       "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.2.tgz",
       "integrity": "sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w==",
-      "dev": true,
       "dependencies": {
         "@fastify/busboy": "^2.0.0"
       },
diff --git a/package.json b/package.json
index b552fbc..94acbde 100644
--- a/package.json
+++ b/package.json
@@ -71,16 +71,15 @@
   },
   "dependencies": {
     "@fastify/cors": "^8.4.2",
+    "@helia/ipns": "^3.0.0",
     "@helia/unixfs": "1.x",
     "@libp2p/interface": "^1.0.1",
     "blockstore-level": "^1.1.4",
     "datastore-level": "^10.1.4",
-    "dns-over-http-resolver": "3.0.0",
     "fastify": "4.24.3",
     "fastify-metrics": "10.3.3",
     "file-type": "18.x",
     "helia": "next",
-    "lru-cache": "10.x",
     "mime-types": "2.x",
     "p-try-each": "1.x",
     "pino-pretty": "10.2.3"
diff --git a/src/getCustomHelia.ts b/src/getCustomHelia.ts
index b2cc499..a679185 100644
--- a/src/getCustomHelia.ts
+++ b/src/getCustomHelia.ts
@@ -2,7 +2,7 @@ import { LevelBlockstore } from 'blockstore-level'
 import { LevelDatastore } from 'datastore-level'
 import { createHelia, type Helia, type HeliaInit } from 'helia'
 import { bitswap, trustlessGateway } from 'helia/block-brokers'
-import { USE_LIBP2P, FILE_BLOCKSTORE_PATH, FILE_DATASTORE_PATH, TRUSTLESS_GATEWAYS, USE_BITSWAP, USE_TRUSTLESS_GATEWAYS } from './constants.js'
+import { FILE_BLOCKSTORE_PATH, FILE_DATASTORE_PATH, TRUSTLESS_GATEWAYS, USE_BITSWAP, USE_TRUSTLESS_GATEWAYS } from './constants.js'
 import { getCustomLibp2p } from './getCustomLibp2p.js'
 import type { Libp2p } from '@libp2p/interface'
 
@@ -34,9 +34,7 @@ export async function getCustomHelia (): Promise<Helia> {
     config.datastore = new LevelDatastore(FILE_DATASTORE_PATH)
   }
 
-  if (!USE_LIBP2P) {
-    config.libp2p = await getCustomLibp2p({ datastore: config.datastore })
-  }
+  config.libp2p = await getCustomLibp2p({ datastore: config.datastore })
 
   return createHelia(config)
 }
diff --git a/src/heliaFetch.ts b/src/heliaFetch.ts
index cbb0b52..1bf04e8 100644
--- a/src/heliaFetch.ts
+++ b/src/heliaFetch.ts
@@ -1,12 +1,13 @@
+import { ipns, type IPNS } from '@helia/ipns'
+import { dnsJsonOverHttps, dnsOverHttps } from '@helia/ipns/dns-resolvers'
+import { dht, pubsub, type IPNSRouting } from '@helia/ipns/routing'
 import { unixfs } from '@helia/unixfs'
-import { MemoryBlockstore } from 'blockstore-core'
-import { MemoryDatastore } from 'datastore-core'
+import { peerIdFromString } from '@libp2p/peer-id'
 import debug from 'debug'
-import DOHResolver from 'dns-over-http-resolver'
-import { createHelia, type Helia } from 'helia'
-import { LRUCache } from 'lru-cache'
 import { CID } from 'multiformats/cid'
+import { getCustomHelia } from './getCustomHelia.js'
 import type { UnixFS, UnixFSStats } from '@helia/unixfs'
+import type { PeerId } from '@libp2p/interface'
 
 const ROOT_FILE_PATTERNS = [
   'index.html',
@@ -24,37 +25,26 @@ interface HeliaFetchOptions extends HeliaPathParts {
   signal?: AbortSignal
 }
 
-interface HeliaFetchConfig {
-  resolveRedirects: boolean
-}
-
 /**
  * Fetches files from IPFS or IPNS
  */
 export class HeliaFetch {
-  private readonly dohResolver = new DOHResolver()
   private fs!: UnixFS
   private readonly log: debug.Debugger
   private readonly PARSE_PATH_REGEX = /^\/(?<namespace>ip[fn]s)\/(?<address>[^/$]+)(?<relativePath>[^$^?]*)/
   private readonly rootFilePatterns: string[]
-  public node!: Helia
+  public node!: Awaited<ReturnType<typeof getCustomHelia>>
   public ready: Promise<void>
-  private readonly config: HeliaFetchConfig
-  private readonly ipnsResolutionCache = new LRUCache<string, string>({
-    max: 10000,
-    ttl: 1000 * 60 * 60 * 24
-  })
+  private ipns!: IPNS
 
   constructor ({
     node,
     rootFilePatterns = ROOT_FILE_PATTERNS,
-    logger,
-    config = {}
+    logger
   }: {
-    node?: Helia
+    node?: Awaited<ReturnType<typeof getCustomHelia>>
     rootFilePatterns?: string[]
     logger?: debug.Debugger
-    config?: Partial<HeliaFetchConfig>
   } = {}) {
     // setup a logger
     if (logger !== undefined) {
@@ -66,24 +56,37 @@ export class HeliaFetch {
     if (node !== undefined) {
       this.node = node
     }
-    this.config = {
-      resolveRedirects: true,
-      ...config
-    }
     this.rootFilePatterns = rootFilePatterns
-    this.ready = this.init()
-    this.log('Initialized')
+    this.ready = this.init().then(() => { this.log('Initialized') })
   }
 
   /**
    * Initialize the HeliaFetch instance
    */
   async init (): Promise<void> {
-    this.node = this.node ?? await createHelia({
-      blockstore: new MemoryBlockstore(),
-      datastore: new MemoryDatastore()
-    })
+    this.node = this.node ?? await getCustomHelia()
+
     this.fs = unixfs(this.node)
+    const routers: IPNSRouting[] = []
+    if (this.node.libp2p.contentRouting != null) {
+      // @ts-expect-error - types are borked
+      routers.push(dht(this.node))
+    }
+    if (this.node.libp2p.services.pubsub != null) {
+      // @ts-expect-error - types are borked
+      routers.push(pubsub(this.node))
+    }
+    this.ipns = ipns(this.node, {
+      routers,
+      resolvers: [
+        dnsJsonOverHttps('https://mozilla.cloudflare-dns.com/dns-query'),
+        dnsOverHttps('https://mozilla.cloudflare-dns.com/dns-query'),
+        dnsOverHttps('https://cloudflare-dns.com/dns-query'),
+        dnsOverHttps('https://dns.google/dns-query'),
+        dnsOverHttps('https://dns.google/resolve'),
+        dnsOverHttps('dns.quad9.net/dns-query')
+      ]
+    })
     this.log('Helia Setup Complete!')
   }
 
@@ -165,60 +168,32 @@ export class HeliaFetch {
     }
   }
 
-  /**
-   * Checks if a redirect is needed and returns either the original address or the redirect address.
-   */
-  private async checkForRedirect (address: string, options?: Parameters<UnixFS['cat']>[1]): Promise<string> {
-    if (!this.config.resolveRedirects) {
-      return address
-    }
-    try {
-      this.log('Checking for redirect of:', address)
-      const redirectCheckResponse = await fetch(`http://${address}`, { method: 'HEAD', redirect: 'manual', ...options })
-      if ([301, 302, 307, 308].includes(redirectCheckResponse.status)) {
-        this.log('Redirect statuscode :', redirectCheckResponse.status)
-        const redirectText = redirectCheckResponse.headers.get('location')
-        if (redirectText == null) {
-          this.log('No location header')
-          return address
-        } else {
-          const redirectUrl = new URL(redirectText)
-          this.log('Redirect found:', redirectUrl.host)
-          return redirectUrl.host
-        }
-      }
-    } catch {
-      // ignore errors on redirect checks
-      this.log('Error checking for redirect for url')
-    }
-    return address
-  }
-
   /**
    * Fetch IPNS content.
    */
-  private async fetchIpns (address: string, options?: Parameters<UnixFS['cat']>[1]): Promise<AsyncIterable<Uint8Array>> {
-    if (!this.ipnsResolutionCache.has(address)) {
-      this.log('Fetching from DNS over HTTP:', address)
-      const redirectAddress = await this.checkForRedirect(address)
-      const txtRecords = await this.dohResolver.resolveTxt(`_dnslink.${redirectAddress}`)
-      const pathEntry = txtRecords.find(([record]) => record.startsWith('dnslink='))
-      const path = pathEntry?.[0].replace('dnslink=', '')
-      this.log('Got Path from DNS over HTTP:', path)
-      this.ipnsResolutionCache.set(address, path ?? 'not-found')
-      if (redirectAddress !== address) {
-        this.ipnsResolutionCache.set(redirectAddress, path ?? 'not-found')
+  private async fetchIpns (address: string | PeerId, { path = '', signal = undefined }: { path?: string, signal?: AbortSignal }): Promise<AsyncIterable<Uint8Array>> {
+    this.log('Fetching from IPNS:', address, path)
+
+    let peerId = null
+    let resolvedCid = null
+    if (typeof address === 'string') {
+      try {
+        peerId = peerIdFromString(address)
+      } catch {
+        // ignoring
       }
-      // we don't do anything with this, but want to fail if it is not a valid path
-      this.parsePath(path ?? '')
     }
-    if (this.ipnsResolutionCache.get(address) === 'not-found') {
-      this.log('No Path found:', address)
-      throw new Error(`Could not resolve IPNS address: ${address}`)
+
+    if (peerId != null) {
+      resolvedCid = await this.ipns.resolve(peerId, { signal })
+    } else if (peerId == null && typeof address === 'string') {
+      resolvedCid = await this.ipns.resolveDns(address, { signal })
+    } else {
+      throw new Error(`Not sure how to handle address input: ${address.toString()}`)
     }
-    const finalPath = `${this.ipnsResolutionCache.get(address)}${options?.path ?? ''}`
-    this.log('Final IPFS path:', finalPath)
-    return this.fetchPath(finalPath)
+
+    this.log('Final IPNS path:', `/ipfs/${resolvedCid.toString()}/${path}`)
+    return this.fetch({ namespace: 'ipfs', address: resolvedCid.toString(), relativePath: path, signal })
   }
 
   /**
diff --git a/src/heliaServer.ts b/src/heliaServer.ts
index 972c86c..297569e 100644
--- a/src/heliaServer.ts
+++ b/src/heliaServer.ts
@@ -1,7 +1,7 @@
 import { setMaxListeners } from 'node:events'
 import { type FastifyReply, type FastifyRequest, type RouteGenericInterface } from 'fastify'
 import { CID } from 'multiformats'
-import { USE_SUBDOMAINS, RESOLVE_REDIRECTS } from './constants.js'
+import { USE_SUBDOMAINS } from './constants.js'
 import { DEFAULT_MIME_TYPE, parseContentType } from './contentType.js'
 import { getCustomHelia } from './getCustomHelia.js'
 import { HeliaFetch } from './heliaFetch.js'
@@ -54,10 +54,7 @@ export class HeliaServer {
   async init (): Promise<void> {
     this.heliaFetch = new HeliaFetch({
       logger: this.log,
-      node: await getCustomHelia(),
-      config: {
-        resolveRedirects: RESOLVE_REDIRECTS
-      }
+      node: await getCustomHelia()
     })
     await this.heliaFetch.ready
     // eslint-disable-next-line no-console

From 2fe9ce37ee4f9fb7b539c58f3978aa8f13de7145 Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Tue, 5 Dec 2023 17:57:47 -0800
Subject: [PATCH 22/26] chore: remove RESOLVE_REDIRECTS

---
 README.md        | 1 -
 src/constants.ts | 2 --
 2 files changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 7733e9b..bcb3d6a 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,6 @@ $ docker run -it -p 8080:8080 -e DEBUG="helia-http-gateway*" helia-http-gateway:
 | `USE_TRUSTLESS_GATEWAYS` | Whether to fetch content from trustless-gateways or not | `true` |
 | `TRUSTLESS_GATEWAYS` | Comma separated list of trusted gateways to fetch content from | [Defined in Helia](https://github.com/ipfs/helia/blob/main/packages/helia/src/block-brokers/trustless-gateway/index.ts) |
 | `USE_LIBP2P` | Whether to use libp2p networking | `true` |
-| `RESOLVE_REDIRECTS` | Whether to resolve redirects before looking up dnslink entries | `true` |
 | `ECHO_HEADERS` | A debug flag to indicate whether you want to output request and response headers | `false` |
 
 <!--
diff --git a/src/constants.ts b/src/constants.ts
index 6dda6ea..97aa3cc 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -7,8 +7,6 @@ export const FASTIFY_DEBUG = process.env.FASTIFY_DEBUG ?? ''
 
 export const USE_SUBDOMAINS = process.env.USE_SUBDOMAINS !== 'false'
 
-export const RESOLVE_REDIRECTS = process.env.RESOLVE_REDIRECTS !== 'false'
-
 export const ECHO_HEADERS = process.env.ECHO_HEADERS === 'true'
 
 /**

From ad50a779bcd6cc5843f94d90f23150eb3b5c27b9 Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Tue, 5 Dec 2023 19:10:10 -0800
Subject: [PATCH 23/26] chore: various refactorings to support more gateway
 stuff

---
 .github/workflows/gateway-conformance.yml |  2 +-
 .github/workflows/playwright.yml          | 19 ++++++++
 README.md                                 |  1 +
 e2e-tests/smoketest.spec.ts               |  2 +-
 package.json                              |  2 +-
 src/constants.ts                          |  5 ++
 src/getCustomLibp2p.ts                    |  4 +-
 src/heliaFetch.ts                         | 22 ++++++---
 src/heliaServer.ts                        | 59 +++++++++++++----------
 src/ipns-address-utils.ts                 | 44 +++++++++++++++++
 10 files changed, 122 insertions(+), 38 deletions(-)
 create mode 100644 src/ipns-address-utils.ts

diff --git a/.github/workflows/gateway-conformance.yml b/.github/workflows/gateway-conformance.yml
index fcb4cb7..cf86548 100644
--- a/.github/workflows/gateway-conformance.yml
+++ b/.github/workflows/gateway-conformance.yml
@@ -101,7 +101,7 @@ jobs:
           #
           # only-if-cached: helia-ht does not guarantee local cache, we will adjust upstream test (which was Kubo-specific)
           # for now disabling these test cases
-          args: -skip '^.*(DirectoryListing|TestGatewayCache).*$'
+          args: -skip '^.*(DirectoryListing|TestGatewayCache|TestSubdomainGatewayDNSLinkInlining).*$'
 
       # 7. Upload the results
       - name: Upload MD summary
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index a3328cd..4c6bf16 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -19,6 +19,25 @@ jobs:
       run: npm ci
     - name: Install Playwright Browsers
       run: npx playwright install --with-deps
+
+    # Cache playwright binaries
+    - uses: actions/cache@v3
+      id: playwright-cache
+      with:
+        path: |
+          ~/.cache/ms-playwright
+        key: ${{ runner.os }}-playwright-${{ hashFiles('**/package-lock.json') }}
+    - run: npx playwright install --with-deps
+      if: steps.playwright-cache.outputs.cache-hit != 'true'
+
+    # Cache datastores
+    - uses: actions/cache@v3
+      id: e2e-datastore-and-blockstore
+      with:
+        path: |
+          ./test/fixtures/e2e
+        key: ${{ runner.os }}-e2e-stores-${{ hashFiles('**/package-lock.json') }}
+
     - name: Run Playwright tests
       run: npm run test:e2e
       env:
diff --git a/README.md b/README.md
index bcb3d6a..b2cc4da 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,7 @@ $ docker run -it -p 8080:8080 -e DEBUG="helia-http-gateway*" helia-http-gateway:
 | `TRUSTLESS_GATEWAYS` | Comma separated list of trusted gateways to fetch content from | [Defined in Helia](https://github.com/ipfs/helia/blob/main/packages/helia/src/block-brokers/trustless-gateway/index.ts) |
 | `USE_LIBP2P` | Whether to use libp2p networking | `true` |
 | `ECHO_HEADERS` | A debug flag to indicate whether you want to output request and response headers | `false` |
+| `DELEGATED_ROUTING_V1_HOST` | Hostname to use for delegated routing v1 | `https://delegated-ipfs.dev` |
 
 <!--
 TODO: currently broken when used in docker, but they work when running locally (you can cache datastore and blockstore locally to speed things up if you want)
diff --git a/e2e-tests/smoketest.spec.ts b/e2e-tests/smoketest.spec.ts
index 2363b8e..8086f2a 100644
--- a/e2e-tests/smoketest.spec.ts
+++ b/e2e-tests/smoketest.spec.ts
@@ -9,7 +9,7 @@ const pages = [
   'docs.ipfs.tech',
   'docs.libp2p.io',
   'drand.love',
-  'fil.org',
+  // 'fil.org', // timing out
   // 'filecoin.io', // timing out
   // 'green.filecoin.io', // timing out
   'ipfs.tech',
diff --git a/package.json b/package.json
index 94acbde..1de9ecc 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "test:e2e-flame": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-flame\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"",
     "test:e2e-doctor": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-doctor\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"",
     "test:gwc-kubo": "node ./scripts/kubo-init.js",
-    "test:gwc-helia": "npm run build && USE_LIBP2P=false USE_BITSWAP=false PORT=8090 TRUSTLESS_GATEWAYS='http://127.0.0.1:8080' FILE_DATASTORE_PATH=./data/datastore FILE_BLOCKSTORE_PATH=./data/blockstore DEBUG='helia-http-gateway*' ECHO_HEADERS='true' npm start",
+    "test:gwc-helia": "npm run build && USE_LIBP2P=false USE_BITSWAP=false PORT=8090 TRUSTLESS_GATEWAYS='http://127.0.0.1:8080' DELEGATED_ROUTING_V1_HOST='http://127.0.0.1:8080' FILE_DATASTORE_PATH=./data/datastore FILE_BLOCKSTORE_PATH=./data/blockstore DEBUG='helia-http-gateway*,*helia-fetch*,*delegated-routing-v1-http-api-client*' ECHO_HEADERS='true' npm start",
     "test:gwc-setup": "concurrently -k -s all -n \"kubo,helia\" -c \"magenta,blue\" \"npm run test:gwc-kubo\" \"wait-on 'tcp:8080' && npm run test:gwc-helia\"",
     "test:gwc-execute": "docker run --network host -v $PWD:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 test --gateway-url='http://127.0.0.1:8090' --subdomain-url='http://helia-http-gateway.localhost' --verbose --json gwc-report.json --specs subdomain-ipns-gateway,subdomain-ipfs-gateway -- -timeout 30m",
     "test:gwc": "concurrently -k -s all -n \"kubo&helia,gateway-conformance\" -c \"magenta,blue\" \"npm run test:gwc-setup\" \"wait-on 'tcp:8090' && npm run test:gwc-execute\"",
diff --git a/src/constants.ts b/src/constants.ts
index 97aa3cc..ddd7411 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -45,3 +45,8 @@ export const FILE_DATASTORE_PATH = process.env.FILE_DATASTORE_PATH ?? null
  * If not set, we will use a memory blockstore by default.
  */
 export const FILE_BLOCKSTORE_PATH = process.env.FILE_BLOCKSTORE_PATH ?? null
+
+/**
+ * If not set, we will default delegated routing to `https://delegated-ipfs.dev`
+ */
+export const DELEGATED_ROUTING_V1_HOST = process.env.DELEGATED_ROUTING_V1_HOST ?? 'https://delegated-ipfs.dev'
diff --git a/src/getCustomLibp2p.ts b/src/getCustomLibp2p.ts
index 41331ef..a7ce770 100644
--- a/src/getCustomLibp2p.ts
+++ b/src/getCustomLibp2p.ts
@@ -17,7 +17,7 @@ import { webSockets } from '@libp2p/websockets'
 import { ipnsSelector } from 'ipns/selector'
 import { ipnsValidator } from 'ipns/validator'
 import { createLibp2p as create, type Libp2pOptions } from 'libp2p'
-import { USE_LIBP2P } from './constants.js'
+import { DELEGATED_ROUTING_V1_HOST, USE_LIBP2P } from './constants.js'
 import type { Libp2p, PubSub } from '@libp2p/interface'
 import type { HeliaInit } from 'helia'
 
@@ -97,7 +97,7 @@ export async function getCustomLibp2p ({ datastore }: HeliaGatewayLibp2pOptions)
       upnp: uPnPNATService(),
       pubsub: gossipsub(),
       dcutr: dcutrService(),
-      delegatedRouting: () => createDelegatedRoutingV1HttpApiClient('https://delegated-ipfs.dev'),
+      delegatedRouting: () => createDelegatedRoutingV1HttpApiClient(DELEGATED_ROUTING_V1_HOST),
       dht: kadDHT({
         // don't do DHT server work.
         clientMode: true,
diff --git a/src/heliaFetch.ts b/src/heliaFetch.ts
index 1bf04e8..cc1dc3c 100644
--- a/src/heliaFetch.ts
+++ b/src/heliaFetch.ts
@@ -16,13 +16,15 @@ const ROOT_FILE_PATTERNS = [
 ]
 
 interface HeliaPathParts {
-  namespace: string
   address: string
+  namespace: string
   relativePath: string
 }
 
-interface HeliaFetchOptions extends HeliaPathParts {
+export interface HeliaFetchOptions extends HeliaPathParts {
   signal?: AbortSignal
+  cid?: CID | null
+  peerId?: PeerId | null
 }
 
 /**
@@ -117,15 +119,15 @@ export class HeliaFetch {
   /**
    * fetch a path from a given namespace and address.
    */
-  public async fetch ({ namespace, address, relativePath, signal }: HeliaFetchOptions): Promise<AsyncIterable<Uint8Array>> {
+  public async fetch ({ namespace, address, relativePath, signal, cid, peerId }: HeliaFetchOptions): Promise<AsyncIterable<Uint8Array>> {
     try {
       await this.ready
       this.log('Processing Fetch:', { namespace, address, relativePath })
       switch (namespace) {
         case 'ipfs':
-          return await this.fetchIpfs(CID.parse(address), { path: relativePath, signal })
+          return await this.fetchIpfs(cid ?? CID.parse(address), { path: relativePath, signal })
         case 'ipns':
-          return await this.fetchIpns(address, { path: relativePath, signal })
+          return await this.fetchIpns(address, { path: relativePath, signal, peerId })
         default:
           throw new Error('Namespace is not valid, provide path as /ipfs/<cid> or /ipns/<path>')
       }
@@ -170,15 +172,19 @@ export class HeliaFetch {
 
   /**
    * Fetch IPNS content.
+   *
+   * @todo - Support delegated IPNS resolution from Kubo when testing gateway-conformance
+   * @todo - Support ipns for peerIds: http://localhost:8090/ipns/12D3KooWLQzUv2FHWGVPXTXSZpdHs7oHbXub2G5WC8Tx4NQhyd2d
    */
-  private async fetchIpns (address: string | PeerId, { path = '', signal = undefined }: { path?: string, signal?: AbortSignal }): Promise<AsyncIterable<Uint8Array>> {
+  private async fetchIpns (address: string, { path = '', signal = undefined, peerId }: { path?: string, signal?: AbortSignal, peerId?: PeerId | null }): Promise<AsyncIterable<Uint8Array>> {
     this.log('Fetching from IPNS:', address, path)
 
-    let peerId = null
     let resolvedCid = null
-    if (typeof address === 'string') {
+    if (typeof address === 'string' && peerId == null) {
       try {
+        this.log('Attempting to parse peerId from address:', address)
         peerId = peerIdFromString(address)
+        this.log('peerId: ', peerId)
       } catch {
         // ignoring
       }
diff --git a/src/heliaServer.ts b/src/heliaServer.ts
index 297569e..56cd0a2 100644
--- a/src/heliaServer.ts
+++ b/src/heliaServer.ts
@@ -1,10 +1,10 @@
 import { setMaxListeners } from 'node:events'
 import { type FastifyReply, type FastifyRequest, type RouteGenericInterface } from 'fastify'
-import { CID } from 'multiformats'
 import { USE_SUBDOMAINS } from './constants.js'
 import { DEFAULT_MIME_TYPE, parseContentType } from './contentType.js'
 import { getCustomHelia } from './getCustomHelia.js'
-import { HeliaFetch } from './heliaFetch.js'
+import { HeliaFetch, type HeliaFetchOptions } from './heliaFetch.js'
+import { getIpnsAddressDetails } from './ipns-address-utils.js'
 import type debug from 'debug'
 
 const HELIA_RELEASE_INFO_API = (version: string): string => `https://api.github.com/repos/ipfs/helia/git/ref/tags/helia-v${version}`
@@ -26,17 +26,10 @@ interface EntryParams {
   '*': string
 }
 
-interface ParsedEntryParams {
-  address: string
-  namespace: string
-  relativePath: string
-}
-
 export class HeliaServer {
   private heliaFetch!: HeliaFetch
   private heliaVersionInfo!: { Version: string, Commit: string }
   private readonly HOST_PART_REGEX = /^(?<address>.+)\.(?<namespace>ip[fn]s)\..+$/
-  private readonly HAS_UPPERCASE_REGEX = /[A-Z]/
   private readonly log: debug.Debugger
   public isReady: Promise<void>
   public routes: RouteEntry[]
@@ -122,29 +115,45 @@ export class HeliaServer {
    */
   private async handleEntry ({ request, reply }: RouteHandler): Promise<void> {
     const { params } = request
-    const { ns: namespace, address, '*': relativePath } = params as EntryParams
+    const { ns: namespace, '*': relativePath } = params as EntryParams
+    const { address } = params as EntryParams
     this.log('Handling entry: ', { address, namespace, relativePath })
     if (!USE_SUBDOMAINS) {
       this.log('Subdomains are disabled, fetching without subdomain')
-      return this.fetchWithoutSubdomain({ request, reply })
+      return this.fetchWithoutSubdomain({ request, reply, address, namespace, relativePath })
+    } else {
+      this.log('Subdomains are enabled, redirecting to subdomain')
     }
     if (address.includes('wikipedia')) {
       await reply.code(500).send('Wikipedia is not yet supported. Follow https://github.com/ipfs/helia-http-gateway/issues/35 for more information.')
       return
     }
-    let cidv1Address: string | null = null
-    if (this.HAS_UPPERCASE_REGEX.test(address)) {
-      cidv1Address = CID.parse(address).toV1().toString()
+
+    const { peerId, cid } = getIpnsAddressDetails(address)
+    const cidv1Address = cid?.toString()
+    if (peerId != null) {
+      return this.fetchWithoutSubdomain({ request, reply, address, namespace, relativePath, peerId, cid })
     }
-    const finalUrl = `//${cidv1Address ?? address}.${namespace}.${request.hostname}/${relativePath ?? ''}`
+
+    const query = (request.query as Record<string, string>)
+    this.log('query: ', query)
     // eslint-disable-next-line no-warning-comments
     // TODO: enable support for query params
-    // if (typeof request.query === 'string' && request.query.length > 0) {
-    //   this.log('request.query: ', request.query)
-    //   // http://localhost:8090/ipfs/bafybeie72edlprgtlwwctzljf6gkn2wnlrddqjbkxo3jomh4n7omwblxly/dir?format=raw
-    //   finalUrl += encodeURIComponent(`?${new URLSearchParams(request.query).toString()}`)
-    // }
+    if (query != null) {
+      // http://localhost:8090/ipfs/bafybeie72edlprgtlwwctzljf6gkn2wnlrddqjbkxo3jomh4n7omwblxly/dir?format=raw
+      // eslint-disable-next-line no-warning-comments
+      // TODO: temporary ipfs gateway spec?
+      // if (query.uri != null) {
+      // // Test = http://localhost:8080/ipns/?uri=ipns%3A%2F%2Fdnslink-subdomain-gw-test.example.org
+      //   this.log('Got URI query parameter: ', query.uri)
+      //   const url = new URL(query.uri)
+      //   address = url.hostname
+      // }
+      // finalUrl += encodeURIComponent(`?${new URLSearchParams(request.query).toString()}`)
+    }
     this.log('relativePath: ', relativePath)
+
+    const finalUrl = `//${cidv1Address ?? address}.${namespace}.${request.hostname}/${relativePath ?? ''}`
     this.log('Redirecting to final URL:', finalUrl)
     await reply
       .headers({
@@ -166,7 +175,7 @@ export class HeliaServer {
     return result.groups as { address: string, namespace: string }
   }
 
-  async fetchWithoutSubdomain ({ request, reply }: RouteHandler): Promise<void> {
+  async fetchWithoutSubdomain ({ request, reply, peerId, cid, address, namespace, relativePath }: RouteHandler & HeliaFetchOptions): Promise<void> {
     this.log('Fetching without subdomain')
     const opController = new AbortController()
     setMaxListeners(Infinity, opController.signal)
@@ -176,22 +185,22 @@ export class HeliaServer {
         opController.abort()
       }
     })
-    const { ns: namespace, address, '*': relativePath } = request.params as EntryParams
+    // const { ns: namespace, address, '*': relativePath } = request.params as EntryParams
     try {
       await this.isReady
-      await this._fetch({ request, reply, address, namespace, relativePath, signal: opController.signal })
+      await this._fetch({ request, reply, address, namespace, relativePath, signal: opController.signal, peerId, cid })
     } catch (error) {
       this.log('Error requesting content from helia:', error)
       await reply.code(500).send(error)
     }
   }
 
-  async _fetch ({ reply, address, namespace, relativePath, signal }: RouteHandler & ParsedEntryParams & { signal: AbortSignal }): Promise<void> {
+  async _fetch ({ reply, address, namespace, relativePath, signal, cid, peerId }: RouteHandler & HeliaFetchOptions & { signal: AbortSignal }): Promise<void> {
     this.log('Fetching from Helia:', { address, namespace, relativePath })
     let type: string | undefined
     // raw response is needed to respond with the correct content type.
     try {
-      for await (const chunk of await this.heliaFetch.fetch({ address, namespace, relativePath, signal })) {
+      for await (const chunk of await this.heliaFetch.fetch({ address, namespace, relativePath, signal, cid, peerId })) {
         if (type === undefined) {
           type = await parseContentType({ bytes: chunk, path: relativePath })
           // this needs to happen first.
diff --git a/src/ipns-address-utils.ts b/src/ipns-address-utils.ts
new file mode 100644
index 0000000..652de84
--- /dev/null
+++ b/src/ipns-address-utils.ts
@@ -0,0 +1,44 @@
+import { peerIdFromString } from '@libp2p/peer-id'
+import { CID } from 'multiformats/cid'
+import type { PeerId } from '@libp2p/interface'
+
+const HAS_UPPERCASE_REGEX = /[A-Z]/
+
+interface IpnsAddressDetails {
+  peerId: PeerId | null
+  cid: CID | null
+}
+
+/**
+ * This method should be called with the key/address value of an IPNS route.
+ *
+ * It will return return an object with some useful properties about the address
+ *
+ * @example
+ *
+ * http://<key>.ipns.<host>/*
+ * http://<host>/ipns/<key>/*
+ */
+export function getIpnsAddressDetails (address: string): IpnsAddressDetails {
+  let cid: CID | null = null
+  let peerId: PeerId | null = null
+  if (HAS_UPPERCASE_REGEX.test(address)) {
+    try {
+      // could be CIDv0 or PeerId at this point.
+      cid = CID.parse(address).toV1()
+    } catch {
+      // ignore
+    }
+
+    try {
+      peerId = peerIdFromString(address)
+    } catch {
+      // ignore error
+    }
+  }
+
+  return {
+    peerId,
+    cid
+  }
+}

From 82a19d40629f6df02fc0ac73e4eb1ac10d18339a Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Tue, 5 Dec 2023 19:22:05 -0800
Subject: [PATCH 24/26] chore: some notes

---
 .github/workflows/gateway-conformance.yml | 2 +-
 DEVELOPER-NOTES.md                        | 5 ++++-
 package.json                              | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/gateway-conformance.yml b/.github/workflows/gateway-conformance.yml
index cf86548..203bcfa 100644
--- a/.github/workflows/gateway-conformance.yml
+++ b/.github/workflows/gateway-conformance.yml
@@ -101,7 +101,7 @@ jobs:
           #
           # only-if-cached: helia-ht does not guarantee local cache, we will adjust upstream test (which was Kubo-specific)
           # for now disabling these test cases
-          args: -skip '^.*(DirectoryListing|TestGatewayCache|TestSubdomainGatewayDNSLinkInlining).*$'
+          args: -skip '^.*(DirectoryListing|TestGatewayCache|TestSubdomainGatewayDNSLinkInlining|proxy).*$'
 
       # 7. Upload the results
       - name: Upload MD summary
diff --git a/DEVELOPER-NOTES.md b/DEVELOPER-NOTES.md
index 0792442..cd644b3 100644
--- a/DEVELOPER-NOTES.md
+++ b/DEVELOPER-NOTES.md
@@ -29,7 +29,9 @@ $ npm run test:gwc-kubo
 $ DEBUG="helia-http-gateway*" FILE_DATASTORE_PATH=./tmp/datastore npm run test:gwc-helia
 
 # terminal 3
-$ npm run test:gwc
+$ npm run test:gwc-execute
+# To skip some tests, run something like:
+# npm run test:gwc-execute -- -skip '^.*(DirectoryListing|TestGatewayCache|TestSubdomainGatewayDNSLinkInlining|TestGatewaySubdomainAndIPNS).*$'
 
 # OR from the gateway-conformance repo directly with something like:
 go run ./cmd/gateway-conformance/main.go test --gateway-url 'http://localhost:8090' --subdomain-url 'http://localhost:8090' --specs subdomain-ipfs-gateway,subdomain-ipns-gateway --json gwc-report.json -- -timeout 30m
@@ -40,6 +42,7 @@ go run ./cmd/gateway-conformance/main.go test --gateway-url 'http://localhost:80
 
 ### Some callouts
 
+1. You may want to set up an nginx proxy from `http://helia-http-gateway.localhost` to `http://localhost:8090`to help with the gateway-conformance tests. See [this issue](https://github.com/ipfs/gateway-conformance/issues/185)
 1. You may want to run the gateway-conformance tests directly from the repo if you're on a macOS M1 due to some issues with docker and the proxying that the gateway-conformance testing tool uses. If you do this, you'll need to run `make gateway-conformance` in the `gateway-conformance` repo root, and then run the tests with something like `go run ./cmd/gateway-conformance/main.go test --gateway-url 'http://localhost:8090' --subdomain-url 'http://localhost:8090' --specs subdomain-ipfs-gateway,subdomain-ipns-gateway --json gwc-report.json -- -timeout 30m`.
     - If you want to run a specific test, you can pass the `-run` gotest flag. e.g. `go run ./cmd/gateway-conformance/main.go test --gateway-url 'http://localhost:8090' --subdomain-url 'http://localhost:8090' --json gwc-report.json -- -timeout 30m -run 'TestGatewaySubdomains/request_for_example.com%2Fipfs%2F%7BCIDv1%7D_redirects_to_subdomain_%28HTTP_proxy_tunneling_via_CONNECT%29#01'`
 1. The file `./scripts/kubo-init.js` executes kubo using `execa` instead of `ipfsd-ctl` so there may be some gotchas, but it should be as cross-platform and stable as the `execa` library.
diff --git a/package.json b/package.json
index 1de9ecc..bc78461 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "test:gwc-kubo": "node ./scripts/kubo-init.js",
     "test:gwc-helia": "npm run build && USE_LIBP2P=false USE_BITSWAP=false PORT=8090 TRUSTLESS_GATEWAYS='http://127.0.0.1:8080' DELEGATED_ROUTING_V1_HOST='http://127.0.0.1:8080' FILE_DATASTORE_PATH=./data/datastore FILE_BLOCKSTORE_PATH=./data/blockstore DEBUG='helia-http-gateway*,*helia-fetch*,*delegated-routing-v1-http-api-client*' ECHO_HEADERS='true' npm start",
     "test:gwc-setup": "concurrently -k -s all -n \"kubo,helia\" -c \"magenta,blue\" \"npm run test:gwc-kubo\" \"wait-on 'tcp:8080' && npm run test:gwc-helia\"",
-    "test:gwc-execute": "docker run --network host -v $PWD:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 test --gateway-url='http://127.0.0.1:8090' --subdomain-url='http://helia-http-gateway.localhost' --verbose --json gwc-report.json --specs subdomain-ipns-gateway,subdomain-ipfs-gateway -- -timeout 30m",
+    "test:gwc-execute": "docker run --network host -v $PWD:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 test --gateway-url='http://helia-http-gateway.localhost' --subdomain-url='http://helia-http-gateway.localhost' --verbose --json gwc-report.json --specs subdomain-ipns-gateway,subdomain-ipfs-gateway -- -timeout 30m",
     "test:gwc": "concurrently -k -s all -n \"kubo&helia,gateway-conformance\" -c \"magenta,blue\" \"npm run test:gwc-setup\" \"wait-on 'tcp:8090' && npm run test:gwc-execute\"",
     "healthcheck": "node dist/src/healthcheck.js",
     "debug:until-death": "./debugging/until-death.sh",

From ce971eb7acb61d2d38db62ce571bce89613a4026 Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Tue, 5 Dec 2023 21:53:36 -0800
Subject: [PATCH 25/26] fix: minor fix to using delegated routing

---
 ...ted-routing-v1-http-api-client+1.1.2.patch | 13 +++++
 src/constants.ts                              |  5 ++
 src/getCustomLibp2p.ts                        | 58 ++++++++++---------
 3 files changed, 49 insertions(+), 27 deletions(-)
 create mode 100644 patches/@helia+delegated-routing-v1-http-api-client+1.1.2.patch

diff --git a/patches/@helia+delegated-routing-v1-http-api-client+1.1.2.patch b/patches/@helia+delegated-routing-v1-http-api-client+1.1.2.patch
new file mode 100644
index 0000000..ef925d0
--- /dev/null
+++ b/patches/@helia+delegated-routing-v1-http-api-client+1.1.2.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/@helia/delegated-routing-v1-http-api-client/dist/src/client.js b/node_modules/@helia/delegated-routing-v1-http-api-client/dist/src/client.js
+index 9461349..042b83e 100644
+--- a/node_modules/@helia/delegated-routing-v1-http-api-client/dist/src/client.js
++++ b/node_modules/@helia/delegated-routing-v1-http-api-client/dist/src/client.js
+@@ -208,7 +208,7 @@ export class DefaultDelegatedRoutingV1HttpApiClient {
+         if (record.Schema === 'peer') {
+             // Peer schema can have additional, user-defined, fields.
+             record.ID = peerIdFromString(record.ID);
+-            record.Addrs = record.Addrs.map(multiaddr);
++            record.Addrs = record.Addrs?.map(multiaddr) ?? [];
+             record.Protocols = record.Protocols ?? [];
+             return record;
+         }
diff --git a/src/constants.ts b/src/constants.ts
index ddd7411..0b2a69d 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -46,6 +46,11 @@ export const FILE_DATASTORE_PATH = process.env.FILE_DATASTORE_PATH ?? null
  */
 export const FILE_BLOCKSTORE_PATH = process.env.FILE_BLOCKSTORE_PATH ?? null
 
+/**
+ * Whether to use the delegated routing v1 API. Defaults to true.
+ */
+export const USE_DELEGATED_ROUTING = process.env.USE_DELEGATED_ROUTING !== 'false'
+
 /**
  * If not set, we will default delegated routing to `https://delegated-ipfs.dev`
  */
diff --git a/src/getCustomLibp2p.ts b/src/getCustomLibp2p.ts
index a7ce770..8d334e3 100644
--- a/src/getCustomLibp2p.ts
+++ b/src/getCustomLibp2p.ts
@@ -17,8 +17,8 @@ import { webSockets } from '@libp2p/websockets'
 import { ipnsSelector } from 'ipns/selector'
 import { ipnsValidator } from 'ipns/validator'
 import { createLibp2p as create, type Libp2pOptions } from 'libp2p'
-import { DELEGATED_ROUTING_V1_HOST, USE_LIBP2P } from './constants.js'
-import type { Libp2p, PubSub } from '@libp2p/interface'
+import { DELEGATED_ROUTING_V1_HOST, USE_DELEGATED_ROUTING, USE_LIBP2P } from './constants.js'
+import type { Libp2p, PubSub, ServiceMap } from '@libp2p/interface'
 import type { HeliaInit } from 'helia'
 
 interface HeliaGatewayLibp2pServices extends Record<string, unknown> {
@@ -38,6 +38,33 @@ interface HeliaGatewayLibp2pOptions extends Pick<HeliaInit, 'datastore'> {
 }
 
 export async function getCustomLibp2p ({ datastore }: HeliaGatewayLibp2pOptions): Promise<Libp2p<HeliaGatewayLibp2pServices>> {
+  const libp2pServices: ServiceMap = {
+    identify: identifyService(),
+    autoNAT: autoNATService(),
+    upnp: uPnPNATService(),
+    pubsub: gossipsub(),
+    dcutr: dcutrService(),
+    dht: kadDHT({
+      // don't do DHT server work.
+      clientMode: true,
+      validators: {
+        ipns: ipnsValidator
+      },
+      selectors: {
+        ipns: ipnsSelector
+      }
+    }),
+    relay: circuitRelayServer({
+      // don't advertise as a circuitRelay server because we have one job, and that is to:  listen for http requests, maybe fetch content, return http responses.
+      // advertise: true
+    }),
+    ping: pingService(),
+    delegatedRouting: undefined
+  }
+
+  if (USE_DELEGATED_ROUTING) {
+    libp2pServices.delegatedRouting = () => createDelegatedRoutingV1HttpApiClient(DELEGATED_ROUTING_V1_HOST)
+  }
   const options: Libp2pOptions<HeliaGatewayLibp2pServices> = {
     datastore,
     addresses: {
@@ -91,37 +118,14 @@ export async function getCustomLibp2p ({ datastore }: HeliaGatewayLibp2pOptions)
         ]
       })
     ],
-    services: {
-      identify: identifyService(),
-      autoNAT: autoNATService(),
-      upnp: uPnPNATService(),
-      pubsub: gossipsub(),
-      dcutr: dcutrService(),
-      delegatedRouting: () => createDelegatedRoutingV1HttpApiClient(DELEGATED_ROUTING_V1_HOST),
-      dht: kadDHT({
-        // don't do DHT server work.
-        clientMode: true,
-        validators: {
-          ipns: ipnsValidator
-        },
-        selectors: {
-          ipns: ipnsSelector
-        }
-      }),
-      relay: circuitRelayServer({
-        // don't advertise as a circuitRelay server because we have one job, and that is to:  listen for http requests, maybe fetch content, return http responses.
-        // advertise: true
-      }),
-      ping: pingService()
-    }
+    // @ts-expect-error - types are borked
+    services: libp2pServices
   }
 
   if (!USE_LIBP2P) {
     // we should not be running libp2p things
     options.start = false
-    options.services = {}
     options.peerDiscovery = []
-    options.transports = []
   }
 
   return create(options)

From a2bd0dc6b22d705a18c6046b9963cf0e33f0bfca Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Tue, 5 Dec 2023 23:43:15 -0800
Subject: [PATCH 26/26] chore: some env var setup, patches, and notes

NOTE: all gateway-conformance tests are currently disabled
---
 .env-all                                      | 18 +++++++++
 .env-delegated-routing                        | 16 ++++++++
 .env-gwc                                      | 16 ++++++++
 .env-trustless-only                           | 14 +++++++
 .github/workflows/gateway-conformance.yml     |  4 +-
 .gitignore                                    |  1 +
 README.md                                     |  7 ++++
 package-lock.json                             | 13 +++++++
 package.json                                  |  3 +-
 ...ted-routing-v1-http-api-client+1.1.2.patch | 39 ++++++++++++++++++-
 playwright.config.ts                          |  1 +
 src/getCustomLibp2p.ts                        | 11 ++----
 12 files changed, 130 insertions(+), 13 deletions(-)
 create mode 100644 .env-all
 create mode 100644 .env-delegated-routing
 create mode 100644 .env-gwc
 create mode 100644 .env-trustless-only

diff --git a/.env-all b/.env-all
new file mode 100644
index 0000000..4a3fe4f
--- /dev/null
+++ b/.env-all
@@ -0,0 +1,18 @@
+# ENV vars recommended for running with everything enabled:
+# * trustless gateways
+# * delegated routing
+# * libp2p
+# * bitswap
+USE_LIBP2P=true
+USE_BITSWAP=true
+DEBUG='helia-http-gateway*,*helia-fetch*'
+USE_TRUSTLESS_GATEWAYS=true
+USE_DELEGATED_ROUTING=true
+
+# Uncomment the two below to save blockstore and datastore to disk
+# FILE_DATASTORE_PATH=./data/datastore
+# FILE_BLOCKSTORE_PATH=./data/blockstore
+
+# If you want to run the gateway with a local trustless gateway, uncomment the below
+# PORT=8090 # or whatever port you want to run helia-http-gateway on
+# TRUSTLESS_GATEWAYS=http://127.0.0.1:8080
diff --git a/.env-delegated-routing b/.env-delegated-routing
new file mode 100644
index 0000000..160b7dd
--- /dev/null
+++ b/.env-delegated-routing
@@ -0,0 +1,16 @@
+# ENV vars recommended for running with only delegated-routing-v1-http
+USE_LIBP2P=false
+# needed to request blocks from peers we discover with delegated routing
+USE_BITSWAP=true
+# TRUSTLESS_GATEWAYS=http://127.0.0.1:8080
+DEBUG='helia-http-gateway*,*helia-fetch*,*delegated-routing-v1-http-api-client*'
+USE_TRUSTLESS_GATEWAYS=false
+USE_DELEGATED_ROUTING=true
+
+# IF you're delegating to kubo running locally you should uncomment the two below:
+# PORT=8090
+# DELEGATED_ROUTING_V1_HOST=http://127.0.0.1:8080
+
+# Uncomment the two below to save blockstore and datastore to disk
+# FILE_DATASTORE_PATH=./data/datastore
+# FILE_BLOCKSTORE_PATH=./data/blockstore
diff --git a/.env-gwc b/.env-gwc
new file mode 100644
index 0000000..f9a2c6b
--- /dev/null
+++ b/.env-gwc
@@ -0,0 +1,16 @@
+# ENV vars recommended for running gateway-conformance tests
+USE_LIBP2P=false
+USE_BITSWAP=true
+PORT=8090 # helia-http-gateway should be running here
+TRUSTLESS_GATEWAYS=http://127.0.0.1:8080 # Kubo should be running here
+DELEGATED_ROUTING_V1_HOST=http://127.0.0.1:8080 # Kubo should be running here
+DEBUG='helia-http-gateway*,*helia-fetch*,*helia:trustless-gateway-block-broker*'
+USE_TRUSTLESS_GATEWAYS=true
+USE_DELEGATED_ROUTING=true
+
+# Uncomment the two below to save blockstore and datastore to disk
+# FILE_DATASTORE_PATH=./data/datastore
+# FILE_BLOCKSTORE_PATH=./data/blockstore
+
+# Uncomment the below to see request & response headers in the logs
+# ECHO_HEADERS=true
diff --git a/.env-trustless-only b/.env-trustless-only
new file mode 100644
index 0000000..f8cac4f
--- /dev/null
+++ b/.env-trustless-only
@@ -0,0 +1,14 @@
+# ENV vars recommended for running with trustless gateways only
+USE_LIBP2P=false
+USE_BITSWAP=false
+DEBUG='helia-http-gateway*,*helia-fetch*,*helia:trustless-gateway-block-broker*'
+USE_TRUSTLESS_GATEWAYS=true
+USE_DELEGATED_ROUTING=false
+
+# Uncomment the two below to save blockstore and datastore to disk
+# FILE_DATASTORE_PATH=./data/datastore
+# FILE_BLOCKSTORE_PATH=./data/blockstore
+
+# If you want to run the gateway with a local trustless gateway, uncomment the below
+# PORT=8090 # or whatever port you want to run helia-http-gateway on
+# TRUSTLESS_GATEWAYS=http://127.0.0.1:8080
diff --git a/.github/workflows/gateway-conformance.yml b/.github/workflows/gateway-conformance.yml
index 203bcfa..615dfe9 100644
--- a/.github/workflows/gateway-conformance.yml
+++ b/.github/workflows/gateway-conformance.yml
@@ -95,13 +95,13 @@ jobs:
           xml: output.xml
           html: output.html
           markdown: output.md
-          specs: subdomain-ipfs-gateway,subdomain-ipns-gateway
+          # specs: subdomain-ipfs-gateway,subdomain-ipns-gateway
           # use below to skip specific test if needed
           # args: -skip 'TestFooBr/GET_response_for_something'
           #
           # only-if-cached: helia-ht does not guarantee local cache, we will adjust upstream test (which was Kubo-specific)
           # for now disabling these test cases
-          args: -skip '^.*(DirectoryListing|TestGatewayCache|TestSubdomainGatewayDNSLinkInlining|proxy).*$'
+          args: -skip '^.*(DirectoryListing|TestGatewayCache|TestSubdomainGatewayDNSLinkInlining|proxy|TestGatewaySubdomainAndIPNS|TestGatewaySubdomains|Trustless|TestGatewayIPNSRecord|RedirectsFile|TestGatewayUnixFSFileRanges|TestGatewayJSONCborAndIPNS|TestTar|Symlink|TestPathGatewayMiscellaneous|TestGatewayBlock|TestRedirectCanonicalIPNS|TestGatewayIPNSPath|TestNativeDag|TestPathing|TestPlainCodec|TestDagPbConversion|TestGatewayJsonCbor|TestCors).*$'
 
       # 7. Upload the results
       - name: Upload MD summary
diff --git a/.gitignore b/.gitignore
index 45168ce..a4979be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,3 +136,4 @@ screenshots
 .envrc
 scripts/tmp/fixtures
 scripts/tmp/kubo-path.txt
+test/fixtures/e2e
diff --git a/README.md b/README.md
index b2cc4da..8ddfab0 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,13 @@ TODO: currently broken when used in docker, but they work when running locally (
 
 See the source of truth for all `process.env.<name>` environment variables at [src/constants.ts](src/constants.ts).
 
+You can also see some recommended environment variable configurations at:
+
+- [./.env-all](./.env-all)
+- [./.env-delegated-routing](./.env-delegated-routing)
+- [./.env-gwc](./.env-gwc)
+- [./.env-trustless-only](./.env-trustless-only)
+
 ### Running with custom configurations
 
 Note that any of the following calls to docker can be replaced with something like `MY_ENV_VAR="MY_VALUE" npm run start`
diff --git a/package-lock.json b/package-lock.json
index 8ef36dd..4e8567a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,6 +33,7 @@
         "concurrently": "^8.2.2",
         "cross-env": "^7.0.3",
         "debug": "4.3.4",
+        "dotenv": "^16.3.1",
         "execa": "^8.0.1",
         "glob": "^10.3.10",
         "patch-package": "^8.0.0",
@@ -9768,6 +9769,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/dotenv": {
+      "version": "16.3.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
+      "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/motdotla/dotenv?sponsor=1"
+      }
+    },
     "node_modules/dup": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/dup/-/dup-1.0.0.tgz",
diff --git a/package.json b/package.json
index bc78461..4cd33de 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "test:e2e-flame": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-flame\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"",
     "test:e2e-doctor": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-doctor\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"",
     "test:gwc-kubo": "node ./scripts/kubo-init.js",
-    "test:gwc-helia": "npm run build && USE_LIBP2P=false USE_BITSWAP=false PORT=8090 TRUSTLESS_GATEWAYS='http://127.0.0.1:8080' DELEGATED_ROUTING_V1_HOST='http://127.0.0.1:8080' FILE_DATASTORE_PATH=./data/datastore FILE_BLOCKSTORE_PATH=./data/blockstore DEBUG='helia-http-gateway*,*helia-fetch*,*delegated-routing-v1-http-api-client*' ECHO_HEADERS='true' npm start",
+    "test:gwc-helia": "npm run build && node -r dotenv/config --trace-warnings dist/src/index.js dotenv_config_path=./.env-gwc",
     "test:gwc-setup": "concurrently -k -s all -n \"kubo,helia\" -c \"magenta,blue\" \"npm run test:gwc-kubo\" \"wait-on 'tcp:8080' && npm run test:gwc-helia\"",
     "test:gwc-execute": "docker run --network host -v $PWD:/workspace -w /workspace ghcr.io/ipfs/gateway-conformance:v0.4.2 test --gateway-url='http://helia-http-gateway.localhost' --subdomain-url='http://helia-http-gateway.localhost' --verbose --json gwc-report.json --specs subdomain-ipns-gateway,subdomain-ipfs-gateway -- -timeout 30m",
     "test:gwc": "concurrently -k -s all -n \"kubo&helia,gateway-conformance\" -c \"magenta,blue\" \"npm run test:gwc-setup\" \"wait-on 'tcp:8090' && npm run test:gwc-execute\"",
@@ -63,6 +63,7 @@
     "concurrently": "^8.2.2",
     "cross-env": "^7.0.3",
     "debug": "4.3.4",
+    "dotenv": "^16.3.1",
     "execa": "^8.0.1",
     "glob": "^10.3.10",
     "patch-package": "^8.0.0",
diff --git a/patches/@helia+delegated-routing-v1-http-api-client+1.1.2.patch b/patches/@helia+delegated-routing-v1-http-api-client+1.1.2.patch
index ef925d0..bdc4c16 100644
--- a/patches/@helia+delegated-routing-v1-http-api-client+1.1.2.patch
+++ b/patches/@helia+delegated-routing-v1-http-api-client+1.1.2.patch
@@ -1,8 +1,25 @@
 diff --git a/node_modules/@helia/delegated-routing-v1-http-api-client/dist/src/client.js b/node_modules/@helia/delegated-routing-v1-http-api-client/dist/src/client.js
-index 9461349..042b83e 100644
+index 9461349..b0caa7d 100644
 --- a/node_modules/@helia/delegated-routing-v1-http-api-client/dist/src/client.js
 +++ b/node_modules/@helia/delegated-routing-v1-http-api-client/dist/src/client.js
-@@ -208,7 +208,7 @@ export class DefaultDelegatedRoutingV1HttpApiClient {
+@@ -73,6 +73,16 @@ export class DefaultDelegatedRoutingV1HttpApiClient {
+             const resource = `${this.clientUrl}routing/v1/providers/${cid.toString()}`;
+             const getOptions = { headers: { Accept: 'application/x-ndjson' }, signal };
+             const res = await fetch(resource, getOptions);
++            if (res.status === 404) {
++              // https://specs.ipfs.tech/routing/http-routing-v1/#response-status-codes
++              // 404 (Not Found): must be returned if no matching records are found.
++              throw new CodeError('No matching records found.', 'ERR_NOT_FOUND')
++            }
++            if (res.status === 422) {
++              // https://specs.ipfs.tech/routing/http-routing-v1/#response-status-codes
++              // 422 (Unprocessable Entity): request does not conform to schema or semantic constraints.
++              throw new CodeError('Request does not conform to schema or semantic constraints.', 'ERR_INVALID_REQUEST')
++            }
+             if (res.body == null) {
+                 throw new CodeError('Routing response had no body', 'ERR_BAD_RESPONSE');
+             }
+@@ -208,7 +218,7 @@ export class DefaultDelegatedRoutingV1HttpApiClient {
          if (record.Schema === 'peer') {
              // Peer schema can have additional, user-defined, fields.
              record.ID = peerIdFromString(record.ID);
@@ -11,3 +28,21 @@ index 9461349..042b83e 100644
              record.Protocols = record.Protocols ?? [];
              return record;
          }
+@@ -219,7 +229,7 @@ export class DefaultDelegatedRoutingV1HttpApiClient {
+             return {
+                 Schema: 'peer',
+                 ID: peerIdFromString(record.ID),
+-                Addrs: record.Addrs.map(multiaddr),
++                Addrs: record.Addrs?.map(multiaddr) ?? [],
+                 Protocols: record.Protocol != null ? [record.Protocol] : []
+             };
+         }
+@@ -227,7 +237,7 @@ export class DefaultDelegatedRoutingV1HttpApiClient {
+             return {
+                 Schema: 'peer',
+                 ID: peerIdFromString(record.ID),
+-                Addrs: record.Addrs.map(multiaddr),
++                Addrs: record.Addrs?.map(multiaddr) ?? [],
+                 Protocols: Array.isArray(record.Protocols) ? record.Protocols : []
+             };
+         }
diff --git a/playwright.config.ts b/playwright.config.ts
index 62ca79a..6e49823 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -58,6 +58,7 @@ export default defineConfig({
     env: {
       DEBUG: process.env.DEBUG ?? ' ',
       USE_BITSWAP: 'false',
+      // we save to the filesystem so github CI can cache the data.
       FILE_BLOCKSTORE_PATH: join(process.cwd(), 'test', 'fixtures', 'e2e', 'blockstore'),
       FILE_DATASTORE_PATH: join(process.cwd(), 'test', 'fixtures', 'e2e', 'datastore')
     }
diff --git a/src/getCustomLibp2p.ts b/src/getCustomLibp2p.ts
index 8d334e3..255fb5f 100644
--- a/src/getCustomLibp2p.ts
+++ b/src/getCustomLibp2p.ts
@@ -58,13 +58,13 @@ export async function getCustomLibp2p ({ datastore }: HeliaGatewayLibp2pOptions)
       // don't advertise as a circuitRelay server because we have one job, and that is to:  listen for http requests, maybe fetch content, return http responses.
       // advertise: true
     }),
-    ping: pingService(),
-    delegatedRouting: undefined
+    ping: pingService()
   }
 
   if (USE_DELEGATED_ROUTING) {
     libp2pServices.delegatedRouting = () => createDelegatedRoutingV1HttpApiClient(DELEGATED_ROUTING_V1_HOST)
   }
+
   const options: Libp2pOptions<HeliaGatewayLibp2pServices> = {
     datastore,
     addresses: {
@@ -102,11 +102,6 @@ export async function getCustomLibp2p ({ datastore }: HeliaGatewayLibp2pOptions)
       mplex()
     ],
     peerDiscovery: [
-      // (components): PeerDiscovery => ({
-      //   get [peerDiscovery] () {
-      //     components.services.
-      //   }
-      // }),
       // mdns(), // disable mdns while optimizing for performance.
       bootstrap({
         list: [
@@ -125,7 +120,7 @@ export async function getCustomLibp2p ({ datastore }: HeliaGatewayLibp2pOptions)
   if (!USE_LIBP2P) {
     // we should not be running libp2p things
     options.start = false
-    options.peerDiscovery = []
+    // options.peerDiscovery = []
   }
 
   return create(options)