Handle EOF in the reader thread

Author: afilini

src/raw_client.rs

@@ -477,21 +477,23 @@ impl<S: Read + Write> RawClient<S> {
 
                 // Loop over every message
                 loop {
-                    raw_resp.clear();
-
-                    if let Err(e) = reader.read_line(&mut raw_resp) {
+                    let send_err = |e: std::io::Error| {
                         let error = Arc::new(e);
                         for (_, s) in self.waiting_map.lock().unwrap().drain() {
                             s.send(ChannelMessage::Error(error.clone()))?;
                         }
-                        return Err(Error::SharedIOError(error));
-                    }
-                    trace!("<== {:?}", raw_resp);
 
-                    if raw_resp.is_empty() {
-                        continue;
+                        Err(Error::SharedIOError(error))
+                    };
+
+                    match reader.read_line(&mut raw_resp) {
+                        Err(e) => return send_err(e),
+                        Ok(0) => return send_err(std::io::ErrorKind::UnexpectedEof.into()),
+                        _ => {}
                     }
 
+                    trace!("<== {:?}", raw_resp);
+
                     let resp: serde_json::Value = serde_json::from_str(&raw_resp)?;
 
                     // Normally there is and id, but it's missing for spontaneous notifications