Apply fixes from geldata#7963

mmastrac · Nov 19, 2024 · d9c953e · d9c953e
1 parent 7516477
commit d9c953e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/edb/server/http.py b/edb/server/http.py
@@ -483,6 +483,9 @@ class SSEEvent:
         data: str
         id: Optional[str] = None
 
+        def json(self):
+            return json_lib.loads(self.data)
+
     def close(self):
         if not self.closed():
             self._closed[0] = True

diff --git a/edb/server/http/src/python.rs b/edb/server/http/src/python.rs
@@ -180,9 +180,13 @@ async fn request_sse(
     let guard = guard((), |_| trace!("Exiting SSE due to cancellation"));
     let response = request(client, url, method, body, headers).await?;
 
-    if response.headers().get("content-type")
-        != Some(&HeaderValue::from_static("text/event-stream"))
-    {
+    let content_type = response.headers().get("content-type");
+    let is_event_stream = content_type
+        .and_then(|v| v.to_str().ok())
+        .map(|s| s.starts_with("text/event-stream"))
+        .unwrap_or(false);
+
+    if !is_event_stream {
         let headers = process_headers(response.headers());
         let status = response.status();
         let body = match response.bytes().await {