cleaner

cloudflare/socket.go

@@ -50,16 +50,16 @@ func (d *Dialer) Dial(ctx context.Context, network, addr string) (net.Conn, erro
 	sock := &TCPSocket{}
 	sock.socket = d.connect.Invoke(addr, optionsObj)
 	sock.options = d.opts
-	sock.ctx, sock.cn = context.WithCancel(ctx)
-	sock.SetDeadline(time.Now().Add(999999 * time.Hour))
 	sock.init(d.ctx)
 	return sock, nil
 }
 
 func (sock *TCPSocket) init(ctx context.Context) {
+	sock.SetDeadline(time.Now().Add(999999 * time.Hour))
 	sock.writer = sock.socket.Get("writable").Call("getWriter")
 	sock.reader = sock.socket.Get("readable").Call("getReader")
 	sock.rd = jsutil.ConvertReadableStreamToReader(sock.reader)
+	sock.ctx, sock.cn = context.WithCancel(ctx)
 	return
 }
 
@@ -128,9 +128,11 @@ func (t *TCPSocket) Write(b []byte) (n int, err error) {
 
 // StartTls will call startTls on the socket
 func (t *TCPSocket) StartTls() *TCPSocket {
-	t.socket = t.socket.Call("startTls")
+	sock := &TCPSocket{}
-	t.init(t.ctx)
+	sock.socket = t.socket.Call("startTls")
-	return t
+	sock.options = t.options
+	sock.init(t.ctx)
+	return sock
 }
 
 // Close closes the connection.