move the client_read methods to respective Channel classes

mojolicious · Jan 9, 2016 · ed1bcf9 · ed1bcf9
1 parent 9fa69c4
commit ed1bcf9
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 21 deletions.
diff --git a/lib/Mojo/Channel/HTTP/Client.pm b/lib/Mojo/Channel/HTTP/Client.pm
@@ -1,4 +1,21 @@
 package Mojo::Channel::HTTP::Client;
 use Mojo::Base 'Mojo::Channel::HTTP';
 
+sub read {
+  my ($self, $chunk) = @_;
+  my $tx = $self->{tx};
+
+  # Skip body for HEAD request
+  my $res = $tx->res;
+  $res->content->skip_body(1) if uc $tx->req->method eq 'HEAD';
+  return unless $res->parse($chunk)->is_finished;
+
+  # Unexpected 1xx response
+  return $tx->{state} = 'finished'
+    if !$res->is_status_class(100) || $res->headers->upgrade;
+  $tx->res($res->new)->emit(unexpected => $res);
+  return if (my $leftovers = $res->content->leftovers) eq '';
+  $self->read($leftovers);
+}
+
 1;
diff --git a/lib/Mojo/Channel/WebSocket.pm b/lib/Mojo/Channel/WebSocket.pm
@@ -1,4 +1,17 @@
 package Mojo::Channel::WebSocket;
 use Mojo::Base 'Mojo::Channel';
 
+sub read {
+  my ($self, $chunk) = @_;
+  my $tx = $self->{tx};
+
+  $self->{read} .= $chunk // '';
+  while (my $frame = $tx->parse_frame(\$self->{read})) {
+    $tx->finish(1009) and last unless ref $frame;
+    $tx->emit(frame => $frame);
+  }
+
+  $tx->emit('resume');
+}
+
 1;
diff --git a/lib/Mojo/Transaction/HTTP.pm b/lib/Mojo/Transaction/HTTP.pm
@@ -3,22 +3,6 @@ use Mojo::Base 'Mojo::Transaction';
 
 has [qw(next previous)];
 
-sub client_read {
-  my ($self, $chunk) = @_;
-
-  # Skip body for HEAD request
-  my $res = $self->res;
-  $res->content->skip_body(1) if uc $self->req->method eq 'HEAD';
-  return unless $res->parse($chunk)->is_finished;
-
-  # Unexpected 1xx response
-  return $self->{state} = 'finished'
-    if !$res->is_status_class(100) || $res->headers->upgrade;
-  $self->res($res->new)->emit(unexpected => $res);
-  return if (my $leftovers = $res->content->leftovers) eq '';
-  $self->client_read($leftovers);
-}
-
 sub client_write { shift->_write(0) }
 
 sub is_empty { !!(uc $_[0]->req->method eq 'HEAD' || $_[0]->res->is_empty) }

diff --git a/lib/Mojo/Transaction/WebSocket.pm b/lib/Mojo/Transaction/WebSocket.pm
@@ -123,7 +123,6 @@ sub client_handshake {
   $headers->sec_websocket_key($challenge) unless $headers->sec_websocket_key;
 }
 
-sub client_read  { shift->server_read(@_) }
 sub client_write { shift->server_write(@_) }
 
 sub connection { shift->handshake->connection }

diff --git a/lib/Mojo/UserAgent.pm b/lib/Mojo/UserAgent.pm
@@ -241,11 +241,11 @@ sub _finish {
   if (my $new = $self->transactor->upgrade($old)) {
     weaken $self;
     $new->on(resume => sub { $self->_write($id) });
-    $self->{connections}{$id}
+    my $ws = $self->{connections}{$id}
       = Mojo::Channel::WebSocket::Client->new(ioloop => $c->{ioloop},
       tx => $new);
     $c->{cb}($self, $c->{tx} = $new);
-    return $new->client_read($old->res->content->leftovers);
+    return $ws->read($old->res->content->leftovers);
   }
 
   # Finish normal connection and handle redirects
@@ -257,11 +257,12 @@ sub _read {
   my ($self, $id, $chunk) = @_;
 
   # Corrupted connection
-  return $self->_remove($id) unless my $tx = $self->{connections}{$id}{tx};
+  my $c = $self->{connections}{$id};
+  return $self->_remove($id) unless my $tx = $c->{tx};
 
   # Process incoming data
   warn term_escape "-- Client <<< Server (@{[_url($tx)]})\n$chunk\n" if DEBUG;
-  $tx->client_read($chunk);
+  $c->read($chunk);
   if    ($tx->is_finished) { $self->_finish($id) }
   elsif ($tx->is_writing)  { $self->_write($id) }
 }