@gradio/client 2.2.0 → 2.2.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @gradio/client
 
+## 2.2.1
+
+### Fixes
+
+- [#13403](https://github.com/gradio-app/gradio/pull/13403) [`df56862`](https://github.com/gradio-app/gradio/commit/df56862a1531fc372a3248716dc4bd07e6db1c52) - [js-client] close submit iterator on next/close race.  Thanks @hysts!
+
 ## 2.2.0
 
 ### Features

package/dist/browser.js

@@ -1,5 +1,5 @@
-const Ke = "host", Ae = "queue/data", Ve = "queue/join", we = "upload", Ye = "login", K = "config", Qe = "info", Xe = "runtime", et = "sleeptime", tt = "heartbeat", st = "component_server", nt = "reset", ot = "cancel", it = "app_id", xe = "This application is currently busy. Please try again. ", L = "Connection errored out. ", C = "Could not resolve app config. ", rt = "Could not get space status. ", at = "Could not get API info. ", ue = "Space metadata could not be loaded. ", ct = "Invalid URL. A full URL path is required.", ut = "Not authorized to access this space. ", De = "Invalid credentials. Could not login. ", lt = "Login credentials are required to access this space.", pt = "File system access is only available in Node.js environments", Ce = "Root URL not found in client config", dt = "Error uploading file";
-async function ye(e, s, t) {
+const Ke = "host", xe = "queue/data", Ve = "queue/join", ye = "upload", Ye = "login", K = "config", Qe = "info", Xe = "runtime", et = "sleeptime", tt = "heartbeat", st = "component_server", nt = "reset", ot = "cancel", it = "app_id", De = "This application is currently busy. Please try again. ", L = "Connection errored out. ", C = "Could not resolve app config. ", rt = "Could not get space status. ", at = "Could not get API info. ", ue = "Space metadata could not be loaded. ", ct = "Invalid URL. A full URL path is required.", ut = "Not authorized to access this space. ", Ce = "Invalid credentials. Could not login. ", lt = "Login credentials are required to access this space.", pt = "File system access is only available in Node.js environments", Le = "Root URL not found in client config", dt = "Error uploading file";
+async function be(e, s, t) {
   try {
     return (await (await fetch(`https://huggingface.co/api/spaces/${e}/jwt`, {
       headers: {
@@ -28,7 +28,7 @@ async function ft(e) {
       const n = await this.fetch(t, {
         headers: s,
         credentials: "include"
-      }), o = await be(n, !!this.options.auth);
+      }), o = await ve(n, !!this.options.auth);
       o.root = e || o.root, window.gradio_config = {
         ...o,
         current_page: window.gradio_config.current_page
@@ -43,17 +43,17 @@ async function ft(e) {
     const n = await this.fetch(t, {
       headers: s,
       credentials: "include"
-    }), o = await be(n, !!this.options.auth);
+    }), o = await ve(n, !!this.options.auth);
     return o.root || (o.root = e), o;
   }
   throw new Error(C);
 }
-async function be(e, s) {
+async function ve(e, s) {
   if (e?.status === 401 && !s) {
     const n = (await e.json())?.detail?.auth_message;
     throw new Error(n || lt);
   } else if (e?.status === 401 && s)
-    throw new Error(De);
+    throw new Error(Ce);
   if (e?.status === 200) {
     let t = await e.json();
     return t.dependencies?.forEach((n, o) => {
@@ -70,7 +70,7 @@ async function _t() {
   );
   try {
     if (this.options.auth) {
-      const t = await Le(
+      const t = await Ne(
         e,
         s,
         this.options.auth,
@@ -83,7 +83,7 @@ async function _t() {
     throw Error(t.message);
   }
 }
-async function Le(e, s, t, n, o) {
+async function Ne(e, s, t, n, o) {
   const r = new FormData();
   r.append("username", t?.[0]), r.append("password", t?.[1]);
   let i = {};
@@ -96,7 +96,7 @@ async function Le(e, s, t, n, o) {
   });
   if (a.status === 200)
     return a.headers.get("set-cookie");
-  throw a.status === 401 ? new Error(De) : new Error(ue);
+  throw a.status === 401 ? new Error(Ce) : new Error(ue);
 }
 function re(e) {
   if (e.startsWith("http")) {
@@ -113,7 +113,7 @@ function re(e) {
     host: new URL(e).host
   };
 }
-const Ne = (e) => {
+const Pe = (e) => {
   let s = [];
   return e.split(/,(?=\s*[^\s=;]+=[^\s=;]+)/).forEach((n) => {
     const [o, r] = n.split(";")[0].split("=");
@@ -233,7 +233,7 @@ function wt(e, s, t, n) {
 function yt(e, s) {
   return s === "GallerySerializable" ? "array of [file, label] tuples" : s === "ListStringSerializable" ? "array of strings" : s === "FileSerializable" ? "array of files or single file" : e?.description;
 }
-function ve(e, s) {
+function Ee(e, s) {
   switch (e.msg) {
     case "send_data":
       return { type: "data" };
@@ -244,7 +244,7 @@ function ve(e, s) {
         type: "update",
         status: {
           queue: !0,
-          message: xe,
+          message: De,
           stage: "error",
           code: e.code,
           success: e.success
@@ -433,7 +433,7 @@ async function Et(e, s, t) {
       l.append("files", c);
     });
     try {
-      const c = t ? `${e}${this.api_prefix}/${we}?upload_id=${t}` : `${e}${this.api_prefix}/${we}`;
+      const c = t ? `${e}${this.api_prefix}/${ye}?upload_id=${t}` : `${e}${this.api_prefix}/${ye}`;
       i = await this.fetch(c, {
         method: "POST",
         body: l,
@@ -461,14 +461,14 @@ const St = {
 }, kt = {
   radix: 1024,
   unit: ["b", "Kb", "Mb", "Gb", "Tb", "Pb", "Eb", "Zb", "Yb"]
-}, Ee = {
+}, Se = {
   si: St,
   iec: $t,
   jedec: kt
 };
 function Rt(e, s = 1, t = "jedec") {
   e = Math.abs(e);
-  const { radix: n, unit: o } = Ee[t] || Ee.jedec;
+  const { radix: n, unit: o } = Se[t] || Se.jedec;
   let r = 0;
   for (; e >= n; )
     e /= n, ++r;
@@ -536,7 +536,7 @@ class Q {
     this.path = s, this.url = t, this.orig_name = n, this.size = o, this.blob = t ? void 0 : r, this.is_stream = i, this.mime_type = a, this.alt_text = u, this.b64 = l;
   }
 }
-class Pe {
+class je {
   type;
   command;
   meta;
@@ -546,7 +546,7 @@ class Pe {
   }
 }
 const Tt = typeof process < "u" && process.versions && process.versions.node;
-function Se(e, s, t) {
+function $e(e, s, t) {
   for (; t.length > 1; ) {
     const o = t.shift();
     if (typeof o == "string" || typeof o == "number")
@@ -627,7 +627,7 @@ function os(e) {
         meta: { _type: "gradio.FileData" }
       };
     if (Tt)
-      return new Pe("upload_file", {
+      return new je("upload_file", {
         path: e,
         name: e,
         orig_path: e
@@ -695,27 +695,27 @@ async function Dt(e, s, t) {
     })
   )).forEach(({ path: i, file_url: a, type: u, name: l }) => {
     if (u === "Gallery")
-      Se(s, a, i);
+      $e(s, a, i);
     else if (a) {
       const p = new Q({ path: a, orig_name: l });
-      Se(s, p, i);
+      $e(s, p, i);
     }
   }), s;
 }
 async function Ct(e, s) {
   if (!(e.config?.root || e.config?.root_url))
-    throw new Error(Ce);
-  await je(e, s);
+    throw new Error(Le);
+  await Ie(e, s);
 }
-async function je(e, s, t = []) {
+async function Ie(e, s, t = []) {
   for (const n in s)
-    s[n] instanceof Pe ? await Lt(e, s, n) : typeof s[n] == "object" && s[n] !== null && await je(e, s[n], [...t, n]);
+    s[n] instanceof je ? await Lt(e, s, n) : typeof s[n] == "object" && s[n] !== null && await Ie(e, s[n], [...t, n]);
 }
 async function Lt(e, s, t) {
   let n = s[t];
   const o = e.config?.root || e.config?.root_url;
   if (!o)
-    throw new Error(Ce);
+    throw new Error(Le);
   try {
     let r, i;
     if (typeof process < "u" && process.versions && process.versions.node) {
@@ -815,7 +815,7 @@ async function F(e, s, t) {
         load_status: "error",
         message: "This space has been paused by the author. If you would like to try this demo, consider duplicating the space.",
         detail: i,
-        discussions_enabled: await $e(a)
+        discussions_enabled: await ke(a)
       });
       break;
     case "RUNNING":
@@ -853,12 +853,12 @@ async function F(e, s, t) {
         load_status: "error",
         message: "This space is experiencing an issue.",
         detail: i,
-        discussions_enabled: await $e(a)
+        discussions_enabled: await ke(a)
       });
       break;
   }
 }
-const Ie = async (e, s) => {
+const Ue = async (e, s) => {
   let t = 0;
   const n = 12, o = 5e3;
   return new Promise((r) => {
@@ -867,13 +867,13 @@ const Ie = async (e, s) => {
       le.test(e) ? "space_name" : "subdomain",
       (i) => {
         s(i), i.status === "running" || i.status === "error" || i.status === "paused" || i.status === "space_error" ? r() : (i.status === "sleeping" || i.status === "building") && (t < n ? (t++, setTimeout(() => {
-          Ie(e, s).then(r);
+          Ue(e, s).then(r);
         }, o)) : r());
       }
     );
   });
 }, jt = /^(?=[^]*\b[dD]iscussions{0,1}\b)(?=[^]*\b[dD]isabled\b)[^]*$/;
-async function $e(e) {
+async function ke(e) {
   try {
     const s = await fetch(
       `https://huggingface.co/api/spaces/${e}/discussions`,
@@ -926,7 +926,7 @@ async function Ut(e, s, t) {
     throw new Error(r.message);
   }
 }
-const ke = [
+const Re = [
   "cpu-basic",
   "cpu-upgrade",
   "cpu-xl",
@@ -943,20 +943,20 @@ const ke = [
 ];
 async function qt(e, s) {
   const { token: t, private: n, hardware: o, timeout: r, auth: i } = s;
-  if (o && !ke.includes(o))
+  if (o && !Re.includes(o))
     throw new Error(
-      `Invalid hardware type provided. Valid types are: ${ke.map((m) => `"${m}"`).join(",")}.`
+      `Invalid hardware type provided. Valid types are: ${Re.map((m) => `"${m}"`).join(",")}.`
     );
   const { http_protocol: a, host: u } = await pe(e, t);
   let l = null;
   if (i) {
-    const m = await Le(
+    const m = await Ne(
       a,
       u,
       i,
       fetch
     );
-    m && (l = Ne(m));
+    m && (l = Pe(m));
   }
   const p = {
     Authorization: `Bearer ${t}`,
@@ -1007,22 +1007,22 @@ function zt(e) {
   if (t)
     return t[1];
 }
-const Re = "supports-zerogpu-headers";
-let Oe = !1;
+const Oe = "supports-zerogpu-headers";
+let Te = !1;
 function Bt() {
   return typeof window < "u" && typeof document < "u" && typeof window.addEventListener == "function";
 }
-function Ue(e) {
+function qe(e) {
   return e.includes(".dev.") ? `https://moon-${e.split(".")[1]}.dev.spaces.huggingface.tech` : e.endsWith(".hf.space") ? "https://huggingface.co" : null;
 }
 function Gt() {
-  if (!Bt() || Oe)
+  if (!Bt() || Te)
     return;
   window.addEventListener("message", (s) => {
-    s.data === Re && (window.supports_zerogpu_headers = !0);
-  }), Oe = !0;
-  const e = Ue(window.location.hostname);
-  e && window.parent !== window && window.parent.postMessage(Re, e);
+    s.data === Oe && (window.supports_zerogpu_headers = !0);
+  }), Te = !0;
+  const e = qe(window.location.hostname);
+  e && window.parent !== window && window.parent.postMessage(Oe, e);
 }
 class Mt extends TransformStream {
   #e = "";
@@ -1065,7 +1065,7 @@ function Ht(e) {
       e.substring(n + t[0].length)
     ];
 }
-function Te(e, s, t) {
+function Ae(e, s, t) {
   e.get(s) || e.set(s, t);
 }
 async function* Jt(e, s) {
@@ -1088,7 +1088,7 @@ async function* Jt(e, s) {
 }
 async function Wt(e, s) {
   let t = new Request(e, s);
-  Te(t.headers, "Accept", "text/event-stream"), Te(t.headers, "Content-Type", "application/json");
+  Ae(t.headers, "Accept", "text/event-stream"), Ae(t.headers, "Content-Type", "application/json");
   let n = await fetch(t);
   if (!n.ok)
     throw n;
@@ -1109,7 +1109,7 @@ async function Zt() {
   n.open = !0;
   let a = null, u = new URLSearchParams({
     session_hash: this.session_hash
-  }).toString(), l = new URL(`${o.root}${this.api_prefix}/${Ae}?${u}`);
+  }).toString(), l = new URL(`${o.root}${this.api_prefix}/${xe}?${u}`);
   if (r && l.searchParams.set("__sign", r), a = this.stream(l), !a) {
     console.warn("Cannot connect to SSE endpoint: " + l.toString());
     return;
@@ -1232,9 +1232,9 @@ function Qt(e, s = {}) {
 function Xt(e, s = {}, t, n, o, r) {
   try {
     let i = function(h) {
-      (o || Ge[h.type]) && p(h);
+      (o || Me[h.type]) && p(h);
     }, a = function() {
-      for (Je = !0; M.length > 0; )
+      for (me = !0; M.length > 0; )
         M.shift()({
           value: void 0,
           done: !0
@@ -1246,7 +1246,7 @@ function Xt(e, s = {}, t, n, o, r) {
     }, p = function(h) {
       u({ value: h, done: !1 });
     }, c = function() {
-      return oe.length > 0 ? Promise.resolve(oe.shift()) : new Promise((h) => M.push(h));
+      return oe.length > 0 ? Promise.resolve(oe.shift()) : me ? Promise.resolve({ value: void 0, done: !0 }) : new Promise((h) => M.push(h));
     };
     const { token: g } = this.options, {
       fetch: w,
@@ -1259,11 +1259,11 @@ function Xt(e, s = {}, t, n, o, r) {
       pending_stream_messages: ee,
       pending_diff_streams: te,
       event_callbacks: se,
-      unclosed_events: qe,
+      unclosed_events: ze,
       post_data: ne,
       options: J,
       api_prefix: T
-    } = this, he = r || { "x-gradio-user": "api" }, ze = this;
+    } = this, he = r || { "x-gradio-user": "api" }, Be = this;
     if (!H) throw new Error("No API found");
     if (!f) throw new Error("Could not resolve app config");
     let { fn_index: d, endpoint_info: fe, dependency: B } = ts(
@@ -1271,17 +1271,17 @@ function Xt(e, s = {}, t, n, o, r) {
       e,
       z,
       f
-    ), Be = bt(s, fe), j, A = f.protocol ?? "ws";
+    ), Ge = bt(s, fe), j, A = f.protocol ?? "ws";
     if (A === "ws")
       throw new Error("WebSocket protocol is not supported in this version");
     let I = "", ss = () => I;
     const _ = typeof e == "number" ? "/predict" : e;
     let W, v = null, x = !1, _e = {}, G = typeof window < "u" && typeof document < "u" ? new URLSearchParams(window.location.search).toString() : "";
-    const Ge = J?.events?.reduce(
+    const Me = J?.events?.reduce(
       (h, R) => (h[R] = !0, h),
       {}
     ) || {};
-    async function Me() {
+    async function Fe() {
       let h = {}, R = {};
       h = { event_id: v }, R = { event_id: v, session_hash: m, fn_index: d };
       try {
@@ -1302,7 +1302,7 @@ function Xt(e, s = {}, t, n, o, r) {
         );
       }
     }
-    const Fe = async (h) => {
+    const He = async (h) => {
       await this._resolve_heartbeat(h);
     };
     async function ge(h) {
@@ -1318,16 +1318,16 @@ function Xt(e, s = {}, t, n, o, r) {
       const Z = f.components.some((E) => E.type === "state"), y = f.dependencies.some(
         (E) => E.targets.some((U) => U[1] === "unload")
       );
-      f.connect_heartbeat = Z || y, await Fe(f), i({
+      f.connect_heartbeat = Z || y, await He(f), i({
         type: "render",
         data: h,
         endpoint: _,
         fn_index: d
       });
     }
-    const He = this.handle_blob(
+    const Je = this.handle_blob(
       f.root,
-      Be,
+      Ge,
       fe
     ).then(async (h) => {
       if (W = {
@@ -1420,14 +1420,14 @@ function Xt(e, s = {}, t, n, o, r) {
           session_hash: m
         }).toString();
         let y = new URL(
-          `${f.root}${T}/${Ae}?${G ? G + "&" : ""}${Z}`
+          `${f.root}${T}/${xe}?${G ? G + "&" : ""}${Z}`
         );
         if (this.jwt && y.searchParams.set("__sign", this.jwt), j = this.stream(y), !j)
           return Promise.reject(
             new Error("Cannot connect to SSE endpoint: " + y.toString())
           );
         j.onmessage = async function(E) {
-          const U = JSON.parse(E.data), { type: O, status: D, data: b } = ve(
+          const U = JSON.parse(E.data), { type: O, status: D, data: b } = Ee(
             U,
             _e[d]
           );
@@ -1510,7 +1510,7 @@ function Xt(e, s = {}, t, n, o, r) {
         });
         let y = "";
         typeof window < "u" && typeof document < "u" && (y = window?.location?.hostname);
-        const E = Ue(y);
+        const E = qe(y);
         return (typeof window < "u" && typeof document < "u" && window.parent != window && !!E && window.supports_zerogpu_headers ? xt("zerogpu-headers", E) : Promise.resolve(null)).then((b) => {
           const q = { ...he, ...b || {} };
           return ne(
@@ -1526,7 +1526,7 @@ function Xt(e, s = {}, t, n, o, r) {
             i({
               type: "status",
               stage: "error",
-              message: xe,
+              message: De,
               queue: !0,
               endpoint: _,
               fn_index: d,
@@ -1562,7 +1562,7 @@ function Xt(e, s = {}, t, n, o, r) {
             v = b.event_id, I = v;
             let P = async function(ie) {
               try {
-                const { type: S, status: $, data: k, original_msg: We } = ve(
+                const { type: S, status: $, data: k, original_msg: We } = Ee(
                   ie,
                   _e[d]
                 );
@@ -1644,21 +1644,21 @@ function Xt(e, s = {}, t, n, o, r) {
                   endpoint: _,
                   fn_index: d,
                   time: /* @__PURE__ */ new Date()
-                }), ["sse_v2", "sse_v2.1", "sse_v3"].includes(A) && (de(X, ze.abort_controller), X.open = !1, a());
+                }), ["sse_v2", "sse_v2.1", "sse_v3"].includes(A) && (de(X, Be.abort_controller), X.open = !1, a());
               }
             };
-            v in ee && (ee[v].forEach((ie) => P(ie)), delete ee[v]), se[v] = P, qe.add(v), X.open || await this.open_stream();
+            v in ee && (ee[v].forEach((ie) => P(ie)), delete ee[v]), se[v] = P, ze.add(v), X.open || await this.open_stream();
           }
         });
       }
     });
-    let Je = !1;
-    const oe = [], M = [], me = {
-      [Symbol.asyncIterator]: () => me,
+    let me = !1;
+    const oe = [], M = [], we = {
+      [Symbol.asyncIterator]: () => we,
       next: c,
       throw: async (h) => (l(h), c()),
       return: async () => (a(), { value: void 0, done: !0 }),
-      cancel: Me,
+      cancel: Fe,
       send_chunk: (h) => {
         this.post_data(`${f.root}${T}/stream/${I}`, {
           ...h,
@@ -1672,9 +1672,9 @@ function Xt(e, s = {}, t, n, o, r) {
         ), a();
       },
       event_id: () => I,
-      wait_for_id: async () => (await He, v)
+      wait_for_id: async () => (await Je, v)
     };
-    return me;
+    return we;
   } catch (i) {
     throw console.error("Submit function encountered an error:", i), i;
   }
@@ -1782,11 +1782,11 @@ class Y {
     ), this.api_info = await this.view_api(), this.api_map = ht(this.config?.dependencies || []);
   }
   async _resolve_heartbeat(s) {
-    if (s && (this.config = s, this.api_prefix = s.api_prefix || "", this.config && this.config.connect_heartbeat && this.config.space_id && this.options.token && (this.jwt = await ye(
+    if (s && (this.config = s, this.api_prefix = s.api_prefix || "", this.config && this.config.connect_heartbeat && this.config.space_id && this.options.token && (this.jwt = await be(
       this.config.space_id,
       this.options.token,
       this.cookies
-    ))), s.space_id && this.options.token && (this.jwt = await ye(s.space_id, this.options.token)), this.config && this.config.connect_heartbeat) {
+    ))), s.space_id && this.options.token && (this.jwt = await be(s.space_id, this.options.token)), this.config && this.config.connect_heartbeat) {
       const t = new URL(
         `${this.config.root}${this.api_prefix}/${tt}/${this.session_hash}`
       );
@@ -1830,7 +1830,7 @@ class Y {
       this.app_reference,
       this.options.token
     ), { status_callback: o } = this.options;
-    n && o && await Ie(n, o);
+    n && o && await Ue(n, o);
     let r;
     try {
       let i = `${s}//${t}`;
@@ -1925,7 +1925,7 @@ class Y {
     }
   }
   set_cookies(s) {
-    this.cookies = Ne(s).join("; ");
+    this.cookies = Pe(s).join("; ");
   }
   prepare_return_obj() {
     return {

package/dist/index.js

@@ -1583,6 +1583,9 @@ function submit(endpoint, data = {}, event_data, trigger_id, all_events, additio
       if (values.length > 0) {
         return Promise.resolve(values.shift());
       }
+      if (done) {
+        return Promise.resolve({ value: void 0, done: true });
+      }
       return new Promise((resolve) => resolvers.push(resolve));
     };
     const { token } = this.options;

package/dist/utils/submit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"submit.d.ts","sourceRoot":"","sources":["../../src/utils/submit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGX,WAAW,EAMX,cAAc,EACd,MAAM,UAAU,CAAC;AAkBlB,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,wBAAgB,MAAM,CACrB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,IAAI,GAAE,OAAO,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EAC9C,UAAU,CAAC,EAAE,OAAO,EACpB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,EAC1B,UAAU,CAAC,EAAE,OAAO,EACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACzC,cAAc,CAAC,WAAW,CAAC,CA8pB7B"}
+{"version":3,"file":"submit.d.ts","sourceRoot":"","sources":["../../src/utils/submit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGX,WAAW,EAMX,cAAc,EACd,MAAM,UAAU,CAAC;AAkBlB,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,wBAAgB,MAAM,CACrB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,IAAI,GAAE,OAAO,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EAC9C,UAAU,CAAC,EAAE,OAAO,EACpB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,EAC1B,UAAU,CAAC,EAAE,OAAO,EACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACzC,cAAc,CAAC,WAAW,CAAC,CAiqB7B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradio/client",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Gradio API client",
   "type": "module",
   "main": "dist/index.js",

package/src/test/submit.test.ts

@@ -0,0 +1,92 @@
+import { describe, beforeAll, afterEach, afterAll, test, expect } from "vitest";
+
+import { Client } from "../client";
+import { initialise_server } from "./server";
+
+let server: Awaited<ReturnType<typeof initialise_server>>;
+
+beforeAll(async () => {
+	server = await initialise_server();
+	await server.start({ quiet: true });
+});
+afterEach(() => server.resetHandlers());
+afterAll(() => server.stop());
+
+async function race_with_timeout<T>(
+	promise: Promise<T>,
+	ms: number,
+	message: string
+): Promise<T> {
+	let timer: ReturnType<typeof setTimeout> | undefined;
+	const timeout = new Promise<never>((_, reject) => {
+		timer = setTimeout(() => reject(new Error(message)), ms);
+	});
+	try {
+		return await Promise.race([promise, timeout]);
+	} finally {
+		if (timer !== undefined) clearTimeout(timer);
+	}
+}
+
+describe("submit iterator", () => {
+	test("next() after the iterator is closed resolves to {done: true}", async () => {
+		const app = await Client.connect("hmb/hello_world");
+		// Avoid opening a real SSE stream — the test does not need one.
+		app.stream_status.open = true;
+
+		const iterator = app.submit("/predict", ["hi"]);
+		await iterator.return();
+
+		const result = await race_with_timeout(
+			iterator.next(),
+			1000,
+			"next() did not resolve after the iterator was closed"
+		);
+		expect(result).toEqual({ value: undefined, done: true });
+	});
+
+	test("for-await loop terminates when data and complete arrive in the same SSE callback", async () => {
+		const app = await Client.connect("hmb/hello_world", {
+			events: ["data", "status"]
+		});
+		app.stream_status.open = true;
+
+		const iterator = app.submit("/predict", ["hi"]);
+		const event_id = await iterator.wait_for_id();
+		expect(event_id).toBeTruthy();
+
+		const callback = app.event_callbacks[event_id as string];
+		expect(callback).toBeDefined();
+
+		const events: { type: string }[] = [];
+		const consumer = (async () => {
+			for await (const event of iterator) {
+				events.push(event as { type: string });
+			}
+		})();
+
+		// Let the consumer drain the pending status event pushed by submit()
+		// and suspend on a fresh next() call, so a resolver is queued before
+		// the SSE callback fires.
+		await new Promise((r) => setTimeout(r, 0));
+
+		// process_completed in the same tick fires a data event (resolving the
+		// pending resolver), a status complete event (queued to values because
+		// no resolver is registered at that instant), and then close().
+		await callback({
+			msg: "process_completed",
+			output: { data: ["done"] },
+			success: true
+		});
+
+		await race_with_timeout(
+			consumer,
+			1000,
+			"submit iterator did not terminate after process_completed"
+		);
+
+		const types = events.map((e) => e.type);
+		expect(types).toContain("data");
+		expect(types).toContain("status");
+	});
+});

package/src/utils/submit.ts

@@ -666,6 +666,9 @@ export function submit(
 			if (values.length > 0) {
 				return Promise.resolve(values.shift() as (typeof values)[0]);
 			}
+			if (done) {
+				return Promise.resolve({ value: undefined, done: true });
+			}
 			return new Promise((resolve) => resolvers.push(resolve));
 		}