From e45e1dea40120b993f009f8fbb81a9737742196c Mon Sep 17 00:00:00 2001
From: Alex Potsides <alex@achingbrain.net>
Date: Mon, 13 Jan 2025 17:45:07 +0100
Subject: [PATCH] feat: add auto-tls support (#716)

Adds a WebSocket listener to libp2p and configures auto-tls to
automatically upgrade it to a secure WebSocket
---
 packages/helia/package.json                   | 1 +
 packages/helia/src/utils/libp2p-defaults.ts   | 6 ++++++
 packages/interop/src/fixtures/create-helia.ts | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/packages/helia/package.json b/packages/helia/package.json
index 9a8ac3ef..dfdd5c0e 100644
--- a/packages/helia/package.json
+++ b/packages/helia/package.json
@@ -62,6 +62,7 @@
     "@helia/interface": "^5.1.0",
     "@helia/routers": "^2.2.0",
     "@helia/utils": "^1.1.0",
+    "@libp2p/auto-tls": "^1.0.4",
     "@libp2p/autonat": "^2.0.12",
     "@libp2p/bootstrap": "^11.0.13",
     "@libp2p/circuit-relay-v2": "^3.1.3",
diff --git a/packages/helia/src/utils/libp2p-defaults.ts b/packages/helia/src/utils/libp2p-defaults.ts
index 41eaffc0..222353a6 100644
--- a/packages/helia/src/utils/libp2p-defaults.ts
+++ b/packages/helia/src/utils/libp2p-defaults.ts
@@ -2,6 +2,7 @@ import { noise } from '@chainsafe/libp2p-noise'
 import { yamux } from '@chainsafe/libp2p-yamux'
 import { createDelegatedRoutingV1HttpApiClient } from '@helia/delegated-routing-v1-http-api-client'
 import { delegatedHTTPRoutingDefaults } from '@helia/routers'
+import { autoTLS } from '@libp2p/auto-tls'
 import { autoNAT } from '@libp2p/autonat'
 import { bootstrap } from '@libp2p/bootstrap'
 import { circuitRelayTransport, circuitRelayServer, type CircuitRelayService } from '@libp2p/circuit-relay-v2'
@@ -23,10 +24,12 @@ 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 { AutoTLS } from '@libp2p/auto-tls'
 import type { Libp2pOptions } from 'libp2p'
 
 export interface DefaultLibp2pServices extends Record<string, unknown> {
   autoNAT: unknown
+  autoTLS: AutoTLS
   dcutr: unknown
   delegatedRouting: unknown
   dht: KadDHT
@@ -46,7 +49,9 @@ export function libp2pDefaults (options: Libp2pDefaultsOptions = {}): Libp2pOpti
     addresses: {
       listen: [
         '/ip4/0.0.0.0/tcp/0',
+        '/ip4/0.0.0.0/tcp/0/ws',
         '/ip6/::/tcp/0',
+        '/ip6/::/tcp/0/ws',
         '/p2p-circuit',
         '/webrtc'
       ]
@@ -72,6 +77,7 @@ export function libp2pDefaults (options: Libp2pDefaultsOptions = {}): Libp2pOpti
     ],
     services: {
       autoNAT: autoNAT(),
+      autoTLS: autoTLS(),
       dcutr: dcutr(),
       delegatedRouting: () => createDelegatedRoutingV1HttpApiClient('https://delegated-ipfs.dev', delegatedHTTPRoutingDefaults()),
       dht: kadDHT({
diff --git a/packages/interop/src/fixtures/create-helia.ts b/packages/interop/src/fixtures/create-helia.ts
index facab2c3..09353e90 100644
--- a/packages/interop/src/fixtures/create-helia.ts
+++ b/packages/interop/src/fixtures/create-helia.ts
@@ -44,6 +44,8 @@ export async function createHeliaNode (libp2pOptions?: Libp2pOptions): Promise<H
   delete defaults.services.dcutr
   // @ts-expect-error services.delegatedRouting is not optional
   delete defaults.services.delegatedRouting
+  // @ts-expect-error services.autoTLS is not optional
+  delete defaults.services.autoTLS
 
   return createHelia<Libp2p<DefaultLibp2pServices>>({
     blockBrokers: [