From 7ed1b19d94f93e4313af65358f37e3337dd19f27 Mon Sep 17 00:00:00 2001
From: Jarred Sumner <jarred@jarredsumner.com>
Date: Fri, 18 Jun 2021 20:48:07 -0700
Subject: CSS HMR!

Former-commit-id: 3f10c8790629ab157d9377759cc50a4b962cc6f4
---
 src/http/websocket.zig | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/http/websocket.zig')

diff --git a/src/http/websocket.zig b/src/http/websocket.zig
index be1645d49..2cfa3f620 100644
--- a/src/http/websocket.zig
+++ b/src/http/websocket.zig
@@ -100,7 +100,7 @@ pub const Websocket = struct {
         EndOfStream,
     } || std.fs.File.WriteError;
 
-    request: *RequestContext,
+    conn: *tcp.Connection,
 
     err: ?anyerror = null,
     buf: [4096]u8 = undefined,
@@ -108,7 +108,7 @@ pub const Websocket = struct {
     reader: ReadStream.Reader,
     flags: u32 = 0,
     pub fn create(
-        ctx: *RequestContext,
+        conn: *tcp.Connection,
         comptime flags: u32,
     ) Websocket {
         var stream = ReadStream{
@@ -118,7 +118,7 @@ pub const Websocket = struct {
         var socket = Websocket{
             .read_stream = undefined,
             .reader = undefined,
-            .request = ctx,
+            .conn = conn,
             .flags = flags,
         };
 
@@ -187,7 +187,7 @@ pub const Websocket = struct {
     }
 
     pub fn writeHeader(self: *Websocket, header: WebsocketHeader, n: usize) anyerror!void {
-        var stream = self.request.conn.client.writer(self.flags);
+        var stream = self.conn.client.writer(self.flags);
 
         try stream.writeIntBig(u16, @bitCast(u16, header));
 
@@ -203,7 +203,7 @@ pub const Websocket = struct {
     }
 
     pub fn writeIterator(self: *Websocket, header: WebsocketHeader, count: usize, comptime BodyIterator: type, body_iter: BodyIterator) anyerror!usize {
-        var stream = self.request.conn.client.writer(self.flags);
+        var stream = self.conn.client.writer(self.flags);
 
         if (!dataframe.isValid()) return error.InvalidMessage;
 
@@ -233,7 +233,7 @@ pub const Websocket = struct {
 
     // Write a raw data frame
     pub fn writeDataFrame(self: *Websocket, dataframe: WebsocketDataFrame) anyerror!usize {
-        var stream = self.request.conn.client.writer(self.flags);
+        var stream = self.conn.client.writer(self.flags);
 
         if (!dataframe.isValid()) return error.InvalidMessage;
 
@@ -271,7 +271,7 @@ pub const Websocket = struct {
         @memset(&self.buf, 0, self.buf.len);
 
         // Read and retry if we hit the end of the stream buffer
-        var start = try self.request.conn.client.read(&self.buf, self.flags);
+        var start = try self.conn.client.read(&self.buf, self.flags);
         if (start == 0) {
             return error.ConnectionClosed;
         }
@@ -329,7 +329,7 @@ pub const Websocket = struct {
         const end = start + length;
 
         if (end > self.read_stream.pos) {
-            var extend_length = try self.request.conn.client.read(self.buf[self.read_stream.pos..], self.flags);
+            var extend_length = try self.conn.client.read(self.buf[self.read_stream.pos..], self.flags);
             if (self.read_stream.pos + extend_length > self.buf.len) {
                 return error.MessageTooLarge;
             }
-- 
cgit v1.2.3