1 files changed, 12 insertions, 15 deletions

diff --git a/src/bin/server/tls.rs b/src/bin/server/tls.rs
index 420b5b4..eb94637 100644
--- a/src/bin/server/tls.rs
+++ b/src/bin/server/tls.rs
@@ -1,7 +1,7 @@
 use std::io::{Read, Write};
 use std::net::TcpStream;
 
-use zagan_bet::protocol::LineBuffer;
+use zagan_bet::protocol::{FrameBuffer, write_frame};
 
 #[derive(Clone)]
 pub struct TlsServer {
@@ -44,34 +44,31 @@ impl TlsServer {
 
 pub struct TlsStream {
     stream: native_tls::TlsStream<TcpStream>,
-    lines: LineBuffer,
+    frames: FrameBuffer,
 }
 
 impl TlsStream {
     pub fn new(stream: native_tls::TlsStream<TcpStream>) -> Self {
         Self {
             stream,
-            lines: LineBuffer::new(),
+            frames: FrameBuffer::new(),
         }
     }
 
-    pub fn read_line(&mut self, s: &mut String) -> std::io::Result<usize> {
-        match self.lines.read_line(&mut self.stream)? {
-            Some(line) => {
-                s.push_str(&line);
-                s.push('\n');
-                Ok(line.len() + 1)
+    /// Read one protocol frame. `Ok(0)` is EOF with no partial frame.
+    pub fn read_frame(&mut self, out: &mut String) -> std::io::Result<usize> {
+        match self.frames.read_frame(&mut self.stream)? {
+            Some(frame) => {
+                let length = frame.len();
+                out.push_str(&frame);
+                Ok(length)
             }
             None => Ok(0),
         }
     }
 
-    pub fn write_line(&mut self, msg: &str) -> std::io::Result<()> {
-        use std::io::Write;
-        self.stream.write_all(msg.as_bytes())?;
-        self.stream.write_all(b"\n")?;
-        self.stream.flush()?;
-        Ok(())
+    pub fn write_frame(&mut self, msg: &str) -> std::io::Result<()> {
+        write_frame(&mut self.stream, msg)
     }
 
     pub fn peer_addr(&self) -> std::io::Result<std::net::SocketAddr> {