Move HTTPClient outside of JS compilation

kylecarbs · kylecarbs · commit d5c68bae5667 · 2023-03-01T18:03:00.000Z
diff --git a/derp/derphttp/websocket.go b/derp/derphttp/websocket.go
@@ -1,7 +1,4 @@
-// Copyright (c) Tailscale Inc & AUTHORS
-// SPDX-License-Identifier: BSD-3-Clause
-
-//go:build linux || js || darwin || windows
+//go:build !js
 
 package derphttp
 
diff --git a/derp/derphttp/websocket_js.go b/derp/derphttp/websocket_js.go
@@ -0,0 +1,33 @@
+// Copyright (c) Tailscale Inc & AUTHORS
+// SPDX-License-Identifier: BSD-3-Clause
+
+//go:build js
+
+package derphttp
+
+import (
+	"context"
+	"crypto/tls"
+	"log"
+	"net"
+
+	"nhooyr.io/websocket"
+	"tailscale.com/net/wsconn"
+)
+
+func init() {
+	dialWebsocketFunc = dialWebsocket
+}
+
+func dialWebsocket(ctx context.Context, urlStr string, _ *tls.Config) (net.Conn, error) {
+	c, res, err := websocket.Dial(ctx, urlStr, &websocket.DialOptions{
+		Subprotocols: []string{"derp"},
+	})
+	if err != nil {
+		log.Printf("websocket Dial: %v, %+v", err, res)
+		return nil, err
+	}
+	log.Printf("websocket: connected to %v", urlStr)
+	netConn := wsconn.NetConn(context.Background(), c, websocket.MessageBinary)
+	return netConn, nil
+}
