Merge pull request #4686 from easyops-cn/steve/v3-sse

Steve/v3-sse

Author: weareoutman

packages/brick-container/serve/getProxy.js

@@ -116,19 +116,16 @@ export default function getProxy(env, getRawIndexHtml) {
               req.path === "/next/api/auth/login/v2" &&
               Array.isArray(setCookies)
             ) {
-              // - If the server is https, but the local is http, clear the secure cookie flags;
-              // - Otherwise, if the local is localhost and cookieSameSiteNone is enabled (default),
+              // - If the local is localhost and cookieSameSiteNone is enabled (default),
               //   add the secure cookie flags;
               // - Otherwise, if the local is https, do nothing;
               // - Otherwise, clear the secure cookie flags;
               const strategy =
-                env.server.startsWith("https:") && !env.https
-                  ? "clear"
-                  : env.cookieSameSiteNone && env.host === "localhost"
-                    ? "add"
-                    : env.https
-                      ? null
-                      : "clear";
+                env.cookieSameSiteNone && env.host === "localhost"
+                  ? "add"
+                  : env.https
+                    ? null
+                    : "clear";
               if (strategy) {
                 // Note: it seems that now Chrome (v107) requires `SameSite=None` even for localhost.
                 // However, `Secure` can use used with non-http for localhost.

packages/utils/src/general/createSSEStream.spec.ts

@@ -139,6 +139,53 @@ describe("createSSEStream", () => {
     expect(consoleError).toHaveBeenCalledWith("open error", "Internal Error");
   });
 
+  test("open error with json error", async () => {
+    mockFetchEventSource.mockImplementation(async (_url, options) => {
+      const { onopen, onerror } = options;
+      await Promise.resolve();
+      try {
+        await onopen?.({
+          ok: false,
+          statusText: "Internal Error",
+          text: () =>
+            Promise.resolve(
+              JSON.stringify({
+                error: "Something went wrong",
+              })
+            ),
+        } as Response);
+      } catch (e) {
+        await onerror?.(e);
+      }
+    });
+    await expect(createSSEStream(url)).rejects.toMatchInlineSnapshot(
+      `[Error: Something went wrong]`
+    );
+    expect(consoleError).toHaveBeenCalledTimes(1);
+    expect(consoleError).toHaveBeenCalledWith("open error", "Internal Error");
+  });
+
+  test("open error with non-json error", async () => {
+    mockFetchEventSource.mockImplementation(async (_url, options) => {
+      const { onopen, onerror } = options;
+      await Promise.resolve();
+      try {
+        await onopen?.({
+          ok: false,
+          statusText: "Internal Error",
+          text: () => Promise.resolve("Oops"),
+        } as Response);
+      } catch (e) {
+        await onerror?.(e);
+      }
+    });
+    await expect(createSSEStream(url)).rejects.toMatchInlineSnapshot(
+      `[Error: Oops]`
+    );
+    expect(consoleError).toHaveBeenCalledTimes(1);
+    expect(consoleError).toHaveBeenCalledWith("open error", "Internal Error");
+  });
+
   test("message error", async () => {
     mockFetchEventSource.mockImplementation(async (_url, options) => {
       const { onopen, onmessage } = options;

packages/utils/src/general/createSSEStream.ts

@@ -62,7 +62,24 @@ export async function createSSEStream<T = unknown>(
         } else {
           // eslint-disable-next-line no-console
           console.error("open error", response.statusText);
-          throw new Error(response.statusText);
+          let text: string;
+          try {
+            text = await response.text();
+          } catch {
+            throw new Error(response.statusText);
+          }
+
+          let json: any;
+          try {
+            json = JSON.parse(text);
+          } catch {
+            // Do nothing
+          }
+
+          if (typeof json?.error === "string") {
+            throw new Error(json.error);
+          }
+          throw new Error(text);
         }
       },
       onmessage(msg) {