_

evan-brass · evan-brass · commit 82c16112925e · 2025-03-18T08:23:40.000-07:00
diff --git a/index.html b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script type="module">
 import { cert, Cert } from '/src/cert.js';
-import { Conn } from '/src/conn.js';
+import { Addr } from '/src/addr.js';
 
 // Log everything.
 function log_everything(conn, label = conn.pid) {
@@ -18,12 +18,10 @@
 const certa = await Cert.load('peera');
 const certb = await Cert.load('peerb');
 
-const a = new Conn(BigInt(certb), {cert: certa});
-const b = new Conn(BigInt(certa), {cert: certb});
+const a = new Addr(`turn+tcp:${certb}@localhost?setup`).connect({cert: certa});
+const b = new Addr(`turn+tcp:${certa}@localhost?setup`).connect({cert: certb});
 log_everything(a, 'a');
 log_everything(b, 'b');
-
-a.dc.addEventListener('open', () => a.restartIce()); // Trigger an ICE restart once the connection is open.
 </script>
 <script type="_module">
 import { state } from '/src/util.js';
diff --git a/src/addr.js b/src/addr.js
@@ -60,7 +60,7 @@ export class Addr extends URL {
 		return {
 			/**
 			 * HACK: If iceTransportPolicy=='relay' then Firefox will kill local relay candidates if they become prflx candidates.
-			 * Chrome doesn't do this.
+			 * Chrome will mark the local candidate as prflx but that doesn't stop it from utilizing it.
 			 * - https://www.rfc-editor.org/rfc/rfc9429#section-4.1.1
 			 * - https://www.rfc-editor.org/rfc/rfc9429#sec.ice-candidate-policy
 			 *
@@ -106,7 +106,7 @@ export class Addr extends URL {
 		} else if (/^(turns?)(?:\+(tcp|udp))?:/i.test(this.protocol)) {
 			yield {
 				address: '::ffff:ffff:ffff',
-				port: 3478,
+				port: 65535,
 				usernameFragment,
 			};
 		}
diff --git a/src/conn.js b/src/conn.js
@@ -48,7 +48,6 @@ export class Conn extends RTCPeerConnection {
 		ice_pwd,
 		mung = true,
 		timeout = 10_000,
-		starter = ['::ffff:255.255.255.255', 65535],
 		...config
 	} = {}) {
 		const cert = config?.cert ?? default_cert;
@@ -84,7 +83,6 @@ export class Conn extends RTCPeerConnection {
 			console.error(e);
 			this.close();
 		});
-		if (starter) this.addIceCandidate(starter);
 	}
 
 	async addIceCandidate(candidate) {
@@ -163,7 +161,7 @@ export class Conn extends RTCPeerConnection {
 				'a=group:BUNDLE dc',
 				`a=fingerprint:${to_fingerprint(this.pid)}`,
 				`a=ice-ufrag:${to_string(this.pid)}`,
-				// TODO: ice-pwd needs to be different per connection I want to prefix it with to_string(this.#cert) but that means need_cert would need to be called before setRemoteDescription and thus mung must always be true and manual certs must always be provided...
+				// TODO: ice-pwd would need to be unique if you do broadcasting.  One option: ice_pwd + to_string(this.cert) for theirs and ice_pwd + to_string(this.pid) for ours.
 				`a=ice-pwd:${ice_pwd || default_ice_pwd}`,
 				'a=ice-options:trickle',
 				...(ice_lite != undefined ? ['a=ice-lite'] : []),
