fix: respect trustless gateway options for sessions

packages/block-brokers/src/trustless-gateway/broker.ts

@@ -90,6 +90,10 @@ export class TrustlessGatewayBlockBroker implements BlockBroker<TrustlessGateway
     return createTrustlessGatewaySession({
       logger: this.logger,
       routing: this.routing
-    }, options)
+    }, {
+      ...options,
+      allowLocal: this.allowLocal,
+      allowInsecure: this.allowInsecure
+    })
   }
 }

packages/block-brokers/test/trustless-gateway-utils.spec.ts

@@ -0,0 +1,30 @@
+import { uriToMultiaddr } from '@multiformats/uri-to-multiaddr'
+import { expect } from 'aegir/chai'
+import { filterNonHTTPMultiaddrs } from '../src/trustless-gateway/utils.js'
+
+describe('trustless-gateway-block-broker-utils', () => {
+  it('filterNonHTTPMultiaddrs respects allowInsecure multiaddrs correctly', async function () {
+    const nonSecureMaddr = uriToMultiaddr('http://mygw.com')
+    const secureMaddr = uriToMultiaddr('https://mygw.com')
+
+    const filtered = filterNonHTTPMultiaddrs([nonSecureMaddr, secureMaddr], true, true)
+
+    expect(filtered.length).to.deep.equal(2)
+  })
+
+  it('filterNonHTTPMultiaddrs filters local multiaddrs correctly', async function () {
+    const localMaddr = uriToMultiaddr('http://localhost')
+
+    const filtered = filterNonHTTPMultiaddrs([localMaddr], true, true)
+
+    expect(filtered.length).to.deep.equal(1)
+  })
+
+  it('filterNonHTTPMultiaddrs filters multiaddrs correctly', async function () {
+    const localMaddr = uriToMultiaddr('http://localhost')
+
+    const filtered = filterNonHTTPMultiaddrs([localMaddr], false, false)
+
+    expect(filtered.length).to.deep.equal(0)
+  })
+})

packages/helia/src/utils/libp2p-defaults.browser.ts

@@ -19,9 +19,10 @@ import * as libp2pInfo from 'libp2p/version'
 import { name, version } from '../version.js'
 import { bootstrapConfig } from './bootstrappers.js'
 import type { Libp2pDefaultsOptions } from './libp2p.js'
+import type { ServiceMap } from '@libp2p/interface'
 import type { Libp2pOptions } from 'libp2p'
 
-export interface DefaultLibp2pServices extends Record<string, unknown> {
+export interface DefaultLibp2pServices extends ServiceMap {
   autoNAT: unknown
   dcutr: unknown
   delegatedRouting: unknown

packages/helia/src/utils/libp2p-defaults.ts

@@ -21,9 +21,10 @@ import * as libp2pInfo from 'libp2p/version'
 import { name, version } from '../version.js'
 import { bootstrapConfig } from './bootstrappers.js'
 import type { Libp2pDefaultsOptions } from './libp2p.js'
+import type { ServiceMap } from '@libp2p/interface'
 import type { Libp2pOptions } from 'libp2p'
 
-export interface DefaultLibp2pServices extends Record<string, unknown> {
+export interface DefaultLibp2pServices extends ServiceMap {
   autoNAT: unknown
   dcutr: unknown
   delegatedRouting: unknown

packages/helia/src/utils/libp2p.ts

@@ -4,13 +4,13 @@ import { Key } from 'interface-datastore'
 import { createLibp2p as create } from 'libp2p'
 import { libp2pDefaults } from './libp2p-defaults.js'
 import type { DefaultLibp2pServices } from './libp2p-defaults.js'
-import type { ComponentLogger, Libp2p, PeerId } from '@libp2p/interface'
+import type { ComponentLogger, Libp2p, PeerId, ServiceMap } from '@libp2p/interface'
 import type { Keychain, KeychainInit } from '@libp2p/keychain'
 import type { DNS } from '@multiformats/dns'
 import type { Datastore } from 'interface-datastore'
 import type { Libp2pOptions } from 'libp2p'
 
-export interface CreateLibp2pOptions<T extends Record<string, unknown>> {
+export interface CreateLibp2pOptions<T extends ServiceMap> {
   datastore: Datastore
   libp2p?: Libp2pOptions<T>
   logger?: ComponentLogger
@@ -24,7 +24,7 @@ export interface Libp2pDefaultsOptions {
   dns?: DNS
 }
 
-export async function createLibp2p <T extends Record<string, unknown> = DefaultLibp2pServices> (options: CreateLibp2pOptions<T>): Promise<Libp2p<T>> {
+export async function createLibp2p <T extends ServiceMap = DefaultLibp2pServices> (options: CreateLibp2pOptions<T>): Promise<Libp2p<T>> {
   const peerId = options.libp2p?.peerId
   const logger = options.logger ?? defaultLogger()
   const selfKey = new Key('/pkcs8/self')