@eyepop.ai/eyepop 3.14.1 → 3.14.4

package/dist/eyepop.index.js

@@ -8681,7 +8681,6 @@ __export(index_exports, {
   InferenceType: () => InferenceType,
   LoadFromAssetUuidJob: () => LoadFromAssetUuidJob,
   LoadFromJob: () => LoadFromJob,
-  LoadLiveIngressJob: () => LoadLiveIngressJob,
   LoadMediaStreamJob: () => LoadMediaStreamJob,
   ModelExportStatus: () => ModelExportStatus,
   ModelFormat: () => ModelFormat,
@@ -9322,7 +9321,7 @@ var AbstractJob = class {
     this._responseStream = null;
     this._controller = new AbortController();
     this._getSession = getSession;
-    this._params = params ?? null;
+    this._params = params;
     this._client = client;
     this._requestLogger = requestLogger;
     this._version = version;
@@ -9367,7 +9366,7 @@ var AbstractJob = class {
                 reject(`response ${response.status}: ${response.statusText}`);
                 break;
               }
-            } else if (response.status != 200) {
+            } else if (!response.ok) {
               reject(`upload error ${response.status}: ${await response.text()}`);
               break;
             } else if (response.body) {
@@ -9429,15 +9428,38 @@ var UploadJob = class extends AbstractJob {
         return Promise.reject("session.baseUrl must not ne null");
       }
       let request;
-      const videoModeQuery = this._videoMode ? `&videoMode=${this._videoMode}` : "";
-      const versionQuery = this._version ? `&version=${this._version}` : "";
-      const postUrl = `${session.baseUrl.replace(/\/+$/, "")}/pipelines/${session.pipelineId}/source?mode=queue&processing=async&sourceId=${event.source_id}${videoModeQuery}${versionQuery}`;
-      if (this._params) {
-        const params = JSON.stringify(this._params);
-        const paramBlob = new Blob([params], { type: "application/json" });
+      const queryParams = new URLSearchParams({
+        mode: "queue",
+        processing: "async",
+        sourceId: event.source_id
+      });
+      if (this._videoMode !== void 0) {
+        queryParams.set("videoMode", this._videoMode);
+      }
+      if (this._version !== void 0) {
+        queryParams.set("version", this._version.toString());
+      }
+      if (this._params.motionDetect) {
+        for (const [key, value] of Object.entries(this._params.motionDetect)) {
+          queryParams.set(key, value);
+        }
+      }
+      const postUrl = `${session.baseUrl.replace(/\/+$/, "")}/pipelines/${session.pipelineId}/source?${queryParams.toString()}`;
+      if (this._params.componentParams || this._params.roi) {
         const formData = new FormData();
+        if (this._params.componentParams) {
+          const blob = new Blob([JSON.stringify(this._params.componentParams)], { type: "application/json" });
+          formData.append("params", blob);
+        }
+        if (this._params.roi) {
+          const blob = new Blob([JSON.stringify(this._params.roi)], { type: "application/json" });
+          formData.append("roi", blob);
+        }
+        if (this._params.fps) {
+          const blob = new Blob([JSON.stringify(this._params.fps)], { type: "application/json" });
+          formData.append("fps", blob);
+        }
         const fileBlob = await new Response(this._uploadStream).blob();
-        formData.append("params", paramBlob);
         formData.append("file", fileBlob);
         const headers = {
           ...session.authenticationHeaders(),
@@ -9502,15 +9524,37 @@ var UploadJob = class extends AbstractJob {
         eyepop: { responseStreaming: true }
       });
     } else {
-      const videoModeQuery = this._videoMode ? `&videoMode=${this._videoMode}` : "";
-      const versionQuery = this._version ? `&version=${this._version}` : "";
-      const postUrl = `${session.baseUrl.replace(/\/+$/, "")}/pipelines/${session.pipelineId}/source?mode=queue&processing=sync${videoModeQuery}${versionQuery}`;
-      if (this._params) {
-        const params = JSON.stringify(this._params);
-        const paramBlob = new Blob([params], { type: "application/json" });
+      const queryParams = new URLSearchParams({
+        mode: "queue",
+        processing: "sync"
+      });
+      if (this._videoMode !== void 0) {
+        queryParams.set("videoMode", this._videoMode);
+      }
+      if (this._version !== void 0) {
+        queryParams.set("version", this._version.toString());
+      }
+      if (this._params.motionDetect) {
+        for (const [key, value] of Object.entries(this._params.motionDetect)) {
+          queryParams.set(key, value);
+        }
+      }
+      const postUrl = `${session.baseUrl.replace(/\/+$/, "")}/pipelines/${session.pipelineId}/source?${queryParams.toString()}`;
+      if (this._params.componentParams || this._params.roi) {
         const formData = new FormData();
+        if (this._params.componentParams) {
+          const blob = new Blob([JSON.stringify(this._params.componentParams)], { type: "application/json" });
+          formData.append("params", blob);
+        }
+        if (this._params.roi) {
+          const blob = new Blob([JSON.stringify(this._params.roi)], { type: "application/json" });
+          formData.append("roi", blob);
+        }
+        if (this._params.fps) {
+          const blob = new Blob([JSON.stringify(this._params.fps)], { type: "application/json" });
+          formData.append("fps", blob);
+        }
         const fileBlob = await new Response(this._uploadStream).blob();
-        formData.append("params", paramBlob);
         formData.append("file", fileBlob);
         const headers = {
           ...session.authenticationHeaders(),
@@ -9563,9 +9607,14 @@ var LoadFromJob = class extends AbstractJob {
     const body = {
       sourceType: "URL",
       url: this._location,
-      params: this._params,
+      params: this._params.componentParams,
+      roi: this._params.roi,
+      fps: this._params.fps,
       version: this._version
     };
+    if (this._params.motionDetect) {
+      Object.assign(body, this._params.motionDetect);
+    }
     const headers = {
       ...session.authenticationHeaders(),
       Accept: "application/jsonl",
@@ -9598,50 +9647,20 @@ var LoadFromAssetUuidJob = class extends AbstractJob {
     const body = {
       sourceType: "ASSET_UUID",
       assetUuid: this._assetUuid,
-      params: this._params,
+      params: this._params.componentParams,
+      roi: this._params.roi,
+      fps: this._params.fps,
       version: this._version
     };
-    const headers = {
-      ...session.authenticationHeaders(),
-      Accept: "application/jsonl",
-      "Content-Type": "application/json"
-    };
-    const patchUrl = `${session.baseUrl.replace(/\/+$/, "")}/pipelines/${session.pipelineId}/source?mode=queue&processing=sync`;
-    return await this._client.fetch(patchUrl, {
-      headers,
-      method: "PATCH",
-      body: JSON.stringify(body),
-      signal: this._controller.signal,
-      // @ts-ignore
-      eyepop: { responseStreaming: true }
-    });
-  }
-};
-var LoadLiveIngressJob = class extends AbstractJob {
-  constructor(ingressId, params, getSession, client, requestLogger) {
-    super(params, getSession, client, requestLogger);
-    this._ingressId = ingressId;
-  }
-  get [Symbol.toStringTag]() {
-    return "loadLiveIngressJob";
-  }
-  async startJob() {
-    const session = await this._getSession();
-    if (!session.baseUrl) {
-      return Promise.reject("session.baseUrl must not ne null");
+    if (this._params.motionDetect) {
+      Object.assign(body, this._params.motionDetect);
     }
-    const body = {
-      sourceType: "LIVE_INGRESS",
-      liveIngressId: this._ingressId,
-      params: this._params,
-      version: this._version
-    };
     const headers = {
       ...session.authenticationHeaders(),
       Accept: "application/jsonl",
       "Content-Type": "application/json"
     };
-    const patchUrl = `${session.baseUrl.replace(/\/+$/, "")}/pipelines/${session.pipelineId}/source?mode=preempt&processing=sync`;
+    const patchUrl = `${session.baseUrl.replace(/\/+$/, "")}/pipelines/${session.pipelineId}/source?mode=queue&processing=sync`;
     return await this._client.fetch(patchUrl, {
       headers,
       method: "PATCH",
@@ -9682,9 +9701,14 @@ var LoadMediaStreamJob = class extends AbstractJob {
     const body = {
       sourceType: "WHIP",
       whipIngressId: whip.ingressId(),
-      params: this._params,
+      params: this._params.componentParams,
+      roi: this._params.roi,
+      fps: this._params.fps,
       version: this._version
     };
+    if (this._params.motionDetect) {
+      Object.assign(body, this._params.motionDetect);
+    }
     const headers = {
       ...session.authenticationHeaders(),
       Accept: "application/jsonl",
@@ -10322,19 +10346,43 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
   popId() {
     return this.options().popId || null;
   }
-  async process(source, params) {
+  async process(param1, param2) {
+    if (param1.source !== void 0) {
+      return await this.processV2(param1);
+    } else {
+      return await this.processV1(param1, param2);
+    }
+  }
+  async processV1(source, params) {
     if (source.file !== void 0) {
-      return this.uploadFile(source, params);
+      return this.uploadFile(source, { componentParams: params });
     } else if (source.stream !== void 0) {
-      return this.uploadStream(source, params);
+      return this.uploadStream(source, { componentParams: params });
     } else if (source.path !== void 0) {
-      return this.uploadPath(source, params);
+      return this.uploadPath(source, { componentParams: params });
     } else if (source.url !== void 0) {
-      return this.loadFrom(source, params);
+      return this.loadFrom(source, { componentParams: params });
     } else if (source.assetUuid !== void 0) {
-      return this.loadFromAssetUuid(source, params);
+      return this.loadFromAssetUuid(source, { componentParams: params });
     } else if (source.mediaStream !== void 0) {
-      return this.loadMediaStream(source, params);
+      return this.loadMediaStream(source, { componentParams: params });
+    } else {
+      return Promise.reject("unknown source type");
+    }
+  }
+  async processV2(request) {
+    if (request.source.file !== void 0) {
+      return this.uploadFile(request.source, request);
+    } else if (request.source.stream !== void 0) {
+      return this.uploadStream(request.source, request);
+    } else if (request.source.path !== void 0) {
+      return this.uploadPath(request.source, request);
+    } else if (request.source.url !== void 0) {
+      return this.loadFrom(request.source, request);
+    } else if (request.source.assetUuid !== void 0) {
+      return this.loadFromAssetUuid(request.source, request);
+    } else if (request.source.mediaStream !== void 0) {
+      return this.loadMediaStream(request.source, request);
     } else {
       return Promise.reject("unknown source type");
     }
@@ -10443,9 +10491,12 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
   }
   async loadFrom(source, params) {
     if (source.url.startsWith("file://")) {
-      return await this.uploadPath({
-        path: source.url.substring("file://".length)
-      }, params);
+      return await this.uploadPath(
+        {
+          path: source.url.substring("file://".length)
+        },
+        params
+      );
     }
     if (!this._baseUrl || !this._pipelineId || !this._client || !this._limit) {
       throw new Error("endpoint not connected, use connect()");
@@ -10666,6 +10717,7 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
       const response_content = await response.json();
       sessions = response_content;
     }
+    console.log(sessions);
     if (sessions.length > 0) {
       this._logger.debug(`User has ${sessions.length} sessions, inspecting for active session`);
       for (let s of sessions) {
@@ -10764,13 +10816,7 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
     return result["id"];
   }
 };
-_WorkerEndpoint.SESSION_DEAD = /* @__PURE__ */ new Set([
-  "error" /* ERROR */,
-  "failed" /* FAILED */,
-  "stopped" /* STOPPED */,
-  "pipeline_error" /* PIPELINE_ERROR */,
-  "unknown" /* UNKNOWN */
-]);
+_WorkerEndpoint.SESSION_DEAD = /* @__PURE__ */ new Set(["error" /* ERROR */, "failed" /* FAILED */, "stopped" /* STOPPED */, "pipeline_error" /* PIPELINE_ERROR */, "unknown" /* UNKNOWN */]);
 _WorkerEndpoint.WAIT_FOR_IS_READY = 60 * 1e3;
 _WorkerEndpoint.CHECK_FOR_IS_READY_INTERVAL = 250;
 var WorkerEndpoint = _WorkerEndpoint;
@@ -12234,7 +12280,6 @@ var index_default = EyePop;
   InferenceType,
   LoadFromAssetUuidJob,
   LoadFromJob,
-  LoadLiveIngressJob,
   LoadMediaStreamJob,
   ModelExportStatus,
   ModelFormat,