@eyepop.ai/eyepop 3.25.1 → 3.25.3

package/dist/eyepop.index.mjs

@@ -9214,7 +9214,7 @@ var PredictionVersion = /* @__PURE__ */ ((PredictionVersion3) => {
   PredictionVersion3[PredictionVersion3["V3"] = 3] = "V3";
   return PredictionVersion3;
 })(PredictionVersion || {});
-var DEFAULT_PREDICTION_VERSION = 2 /* V2 */;
+var DEFAULT_PREDICTION_VERSION = 3 /* V3 */;
 var VideoMode = /* @__PURE__ */ ((VideoMode2) => {
   VideoMode2["STREAM"] = "stream";
   VideoMode2["BUFFER"] = "buffer";
@@ -10925,14 +10925,6 @@ var _SessionBackend = class _SessionBackend {
     }
     return this.ctx.options.pop || null;
   }
-  /**
-   * A select forward's results come only at V3. Only a Pop that selects asks
-   * for it, so a worker too old to know V3 - which also rejects that Pop - is
-   * never sent a version it would not accept.
-   */
-  predictionVersion() {
-    return popSelects(this.pop()) ? 3 /* V3 */ : DEFAULT_PREDICTION_VERSION;
-  }
   async changePop(pop) {
     if (this.ctx.options.popId == "transient" /* Transient */) {
       await this.changeTransientPop(pop);
@@ -11033,7 +11025,7 @@ var _SessionBackend = class _SessionBackend {
           return { stream: streamSource.stream, mimeType: streamSource.mimeType };
         })
       );
-      return this.start(new UploadGroupJob(sources, params, async () => this.session(), client, this.ctx.requestLogger, this.predictionVersion()));
+      return this.start(new UploadGroupJob(sources, params, async () => this.session(), client, this.ctx.requestLogger, DEFAULT_PREDICTION_VERSION));
     } catch (e) {
       limit.release();
       throw e;
@@ -11052,7 +11044,7 @@ var _SessionBackend = class _SessionBackend {
         stream,
         mimeType: mimeTypes?.[i] ?? null
       }));
-      return this.start(new UploadGroupJob(sources, params, async () => this.session(), client, this.ctx.requestLogger, this.predictionVersion()));
+      return this.start(new UploadGroupJob(sources, params, async () => this.session(), client, this.ctx.requestLogger, DEFAULT_PREDICTION_VERSION));
     } catch (e) {
       limit.release();
       throw e;
@@ -11067,7 +11059,7 @@ var _SessionBackend = class _SessionBackend {
     await limit.acquire();
     try {
       this.ctx.updateState();
-      return this.start(new LoadFromGroupJob(urls, params, async () => this.session(), client, this.ctx.requestLogger, this.predictionVersion()));
+      return this.start(new LoadFromGroupJob(urls, params, async () => this.session(), client, this.ctx.requestLogger, DEFAULT_PREDICTION_VERSION));
     } catch (e) {
       limit.release();
       throw e;
@@ -11111,14 +11103,14 @@ var _SessionBackend = class _SessionBackend {
         client,
         this.ctx.requestLogger,
         void 0,
-        this.predictionVersion()
+        DEFAULT_PREDICTION_VERSION
       ),
       true
     );
   }
   async uploadStream(source, params) {
     return await this.startConnected(
-      async (client) => new UploadJob(source.stream, source.mimeType, source.size, source.videoMode, params, async () => this.session(), client, this.ctx.requestLogger, void 0, this.predictionVersion()),
+      async (client) => new UploadJob(source.stream, source.mimeType, source.size, source.videoMode, params, async () => this.session(), client, this.ctx.requestLogger, void 0, DEFAULT_PREDICTION_VERSION),
       true
     );
   }
@@ -11143,7 +11135,7 @@ var _SessionBackend = class _SessionBackend {
         client,
         this.ctx.requestLogger,
         uploadBodyFactory,
-        this.predictionVersion()
+        DEFAULT_PREDICTION_VERSION
       );
     });
   }
@@ -11151,13 +11143,13 @@ var _SessionBackend = class _SessionBackend {
     if (source.url.startsWith("file://")) {
       return await this.uploadPath({ path: source.url.substring("file://".length) }, params);
     }
-    return await this.startConnected(async (client) => new LoadFromJob(source.url, params, async () => this.session(), client, this.ctx.requestLogger, this.predictionVersion()));
+    return await this.startConnected(async (client) => new LoadFromJob(source.url, params, async () => this.session(), client, this.ctx.requestLogger, DEFAULT_PREDICTION_VERSION));
   }
   async loadFromAssetUuid(source, params) {
-    return await this.startConnected(async (client) => new LoadFromAssetUuidJob(source.assetUuid, params, async () => this.session(), client, this.ctx.requestLogger, this.predictionVersion()));
+    return await this.startConnected(async (client) => new LoadFromAssetUuidJob(source.assetUuid, params, async () => this.session(), client, this.ctx.requestLogger, DEFAULT_PREDICTION_VERSION));
   }
   async loadMediaStream(source, params) {
-    return await this.startConnected(async (client) => new LoadMediaStreamJob(source.mediaStream, params, async () => this.session(), client, this.ctx.requestLogger, this.predictionVersion()));
+    return await this.startConnected(async (client) => new LoadMediaStreamJob(source.mediaStream, params, async () => this.session(), client, this.ctx.requestLogger, DEFAULT_PREDICTION_VERSION));
   }
   async reconnect() {
     if (this.ctx.options.popId == "transient" /* Transient */) {
@@ -11607,6 +11599,8 @@ var OpenSource = class {
     this.id = id;
     this.inbox = new Inbox();
     this.uploads = /* @__PURE__ */ new Map();
+    // The socket's ended count when the setSource went out.
+    this.endedBefore = 0;
   }
   close(error) {
     this.uploads.forEach((upload) => upload.end());
@@ -11619,14 +11613,53 @@ var PipelineSocket = class {
     this.sources = /* @__PURE__ */ new Map();
     this.commands = /* @__PURE__ */ new Map();
     this._closed = false;
+    // The ids of sources sent on this socket that have neither ended nor been refused, as the
+    // pipeline API counts them, cancelled ones included.
+    this.held = /* @__PURE__ */ new Set();
+    // The held sources the pipeline API took: only these end, so only these make room.
+    this.accepted = /* @__PURE__ */ new Set();
+    // The ends on this socket so far.
+    this.ended = 0;
+    // How many sources the socket had taken when it last refused queue_full: while as many are held,
+    // the next send waits. Null once none is held.
+    this.cap = null;
+    this._roomWaiters = [];
     this.closed = new Promise((resolve) => this._markClosed = resolve);
   }
+  /** A source ended or the socket closed: wake the send waiting for room. */
+  freed() {
+    this.ended += 1;
+    this.wake();
+  }
+  /** A held source ended or was refused: wake the send waiting for room. */
+  wake() {
+    if (this.held.size === 0) {
+      this.cap = null;
+    }
+    const waiters = this._roomWaiters;
+    this._roomWaiters = [];
+    waiters.forEach((wake) => wake());
+  }
+  get hasRoom() {
+    return this.cap === null || this.held.size < this.cap;
+  }
+  /**
+   * Wait, while the socket is full, until a source ends, it closes or the job is cancelled. The
+   * caller sends in order, so one send waits here and each end lets one go, instead of every
+   * refused source sending its media again at once.
+   */
+  async room(job) {
+    while (!this.hasRoom && this.open && !job.cancelled) {
+      await Promise.race([new Promise((resolve) => this._roomWaiters.push(resolve)), job.whenCancelled]);
+    }
+  }
   get open() {
     return !this._closed && this.ws.readyState === 1;
   }
   markClosed() {
     this._closed = true;
     this._markClosed();
+    this.freed();
   }
   sendJson(message) {
     this.ws.send(JSON.stringify(message));
@@ -11645,6 +11678,8 @@ var PipelineJob = class {
     this._results = new Inbox();
     this._consumed = false;
     this._cancelled = false;
+    // Settles when the job is cancelled, so that a send waiting for room ends at once.
+    this.whenCancelled = new Promise((resolve) => this._markCancelled = resolve);
     this.openSource = null;
     // Stops the job's source on the pipeline, once it was sent.
     this.stopOnPipeline = null;
@@ -11684,6 +11719,7 @@ var PipelineJob = class {
       return;
     }
     this._cancelled = true;
+    this._markCancelled();
     this._results.push(null);
     this.openSource?.inbox.push(CANCELLED);
     this.stopOnPipeline?.();
@@ -11898,6 +11934,16 @@ var PipelineBackend = class {
     const type = message["type"];
     const id = message["id"];
     const source = typeof id === "string" ? socket.sources.get(id) : void 0;
+    if (type === "end") {
+      socket.held.delete(id);
+      socket.accepted.delete(id);
+      socket.freed();
+    } else if (type === "result" && socket.held.has(id)) {
+      socket.accepted.add(id);
+    } else if (type === "error" && message["error"] !== "unknown_command") {
+      socket.held.delete(id);
+      socket.wake();
+    }
     if (type === "send" || type === "credit") {
       const upload = source?.uploads.get(message["member"] ?? null);
       upload?.grant(Number(type === "send" ? message["credit"] : message["bytes"]));
@@ -12056,7 +12102,12 @@ var PipelineBackend = class {
       }
     };
   }
-  /** Run the job's source to its end; a live source refused overloaded goes once more on a new socket. */
+  /**
+   * Run the job's source to its end. A live source refused overloaded goes once more on a new socket.
+   * A source refused queue_full goes again once another source on the socket ended, so it may go after
+   * jobs submitted later; with none of the endpoint's other sources open there, or with an upload from
+   * the caller's own stream, which cannot be read twice, the refusal stands.
+   */
   async run(job) {
     let retried = false;
     while (true) {
@@ -12067,9 +12118,9 @@ var PipelineBackend = class {
       const { socket, source } = sent;
       const uploading = source.uploads.size > 0 ? this.upload(socket, source, job) : Promise.resolve();
       let whip = null;
-      let overloaded;
+      let refused;
       try {
-        overloaded = await this.follow(job, source, () => {
+        refused = await this.follow(job, source, () => {
           if (job.mediaStream !== void 0) {
             const fail = (error) => {
               job.stopOnPipeline?.();
@@ -12087,9 +12138,19 @@ var PipelineBackend = class {
         await uploading;
         await whip?.close();
       }
-      if (!overloaded) {
+      if (refused === null) {
         return;
       }
+      if (refused === "queue_full") {
+        if (socket.accepted.size === 0 && socket.ended === source.endedBefore) {
+          throw new PipelineCommandError("queue_full", "the socket refused the source with none of its own open");
+        }
+        if (job.media.some((media) => media.once)) {
+          throw new PipelineCommandError("queue_full", "the socket refused an upload from a stream, which cannot be sent again");
+        }
+        socket.cap = Math.min(socket.accepted.size, socket.cap ?? socket.accepted.size) || null;
+        continue;
+      }
       if (retried || !job.live) {
         throw new PipelineCommandError("overloaded", "the pipeline API has no capacity for another live source");
       }
@@ -12099,16 +12160,23 @@ var PipelineBackend = class {
   }
   /** Send the job's setSource; the caller runs it in submission order. */
   async setSource(job) {
+    if (job.cancelled) {
+      return null;
+    }
+    let socket = await this.ensureSocket();
+    await socket.room(job);
     if (job.cancelled) {
       return null;
     }
     const combined = await combinedMedia(job);
-    const socket = await this.ensureSocket();
+    socket = await this.ensureSocket();
     const source = new OpenSource(this.newId("source"));
     if (combined === null) {
       uploadKeys(job).forEach((key) => source.uploads.set(key, new Credit()));
     }
     socket.sources.set(source.id, source);
+    socket.held.add(source.id);
+    source.endedBefore = socket.ended;
     job.openSource = source;
     job.stopOnPipeline = () => {
       if (socket.open) {
@@ -12123,15 +12191,15 @@ var PipelineBackend = class {
     }
     return { socket, source };
   }
-  /** Hand the source's predictions to the job until it ends; true when the pipeline API was overloaded. */
+  /** Hand the source's predictions to the job until it ends; the refusal to retry on, overloaded or queue_full. */
   async follow(job, source, onResult) {
     while (true) {
       if (job.cancelled) {
-        return false;
+        return null;
       }
       const message = await source.inbox.next();
       if (message === CANCELLED) {
-        return false;
+        return null;
       }
       if (message instanceof Error) {
         throw message;
@@ -12145,12 +12213,12 @@ var PipelineBackend = class {
           break;
         case "end":
           if (message["reason"] === "eos") {
-            return false;
+            return null;
           }
           throw new PipelineSourceError(source.id, message["reason"] ?? "", message["message"] ?? "");
         case "error":
-          if (message["error"] === "overloaded") {
-            return true;
+          if (message["error"] === "overloaded" || message["error"] === "queue_full") {
+            return message["error"];
           }
           throw new PipelineCommandError(message["error"] ?? "", message["message"] ?? "");
         case "dropped":
@@ -12294,7 +12362,8 @@ function knownSize(body) {
   return void 0;
 }
 function bodyMedia(body, contentType, size) {
-  return { open: async () => body, contentType, size: size ?? knownSize(body) };
+  const once = !(typeof Blob !== "undefined" && body instanceof Blob) && !(body instanceof ArrayBuffer) && !ArrayBuffer.isView(body);
+  return { open: async () => body, contentType, size: size ?? knownSize(body), once };
 }
 function uploadGroup(media) {
   return { group: media.map((m) => ({ upload: { contentType: m.contentType } })) };