@eyepop.ai/eyepop 1.11.5 → 1.11.7

package/dist/eyepop.index.d.mts

@@ -18,11 +18,11 @@ interface Box {
     readonly bottomRight: Point2d;
 }
 interface Roi {
-    readonly points: Point2d[] | undefined;
-    readonly boxes: Box[] | undefined;
+    readonly points?: Point2d[];
+    readonly boxes?: Box[];
 }
 interface SourceParams {
-    readonly roi: Roi | undefined;
+    readonly roi?: Roi;
 }
 interface StreamTime {
     timestamp?: number;
@@ -455,7 +455,7 @@ declare class WorkerEndpoint extends Endpoint<WorkerEndpoint> {
     onIngressEvent(handler: (event: IngressEvent) => void): WorkerEndpoint;
     liveIngress(stream: MediaStream): Promise<LiveMedia>;
     liveEgress(ingressId: string): Promise<LiveMedia>;
-    process(source: Source, params?: SourceParams | undefined): Promise<ResultStream>;
+    process(source: Source, params?: SourceParams): Promise<ResultStream>;
     private startIngressWs;
     private uploadFile;
     private uploadStream;
@@ -825,7 +825,7 @@ declare class UploadJob extends AbstractJob {
     private readonly _mimeType;
     private readonly _needsFullDuplex;
     get [Symbol.toStringTag](): string;
-    constructor(stream: any, mimeType: string, params: SourceParams | undefined, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
+    constructor(stream: ReadableStream<Uint8Array>, mimeType: string, params: SourceParams | undefined, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
     protected onEvent(event: StreamEvent): Promise<void>;
     protected startJob(): Promise<Response>;
 }
@@ -861,6 +861,7 @@ declare abstract class WebrtcBase {
     constructor(getSession: () => Promise<WorkerSession>, client: HttpClient, ingressId: string, urlBasePath: string, requestLogger: Logger);
     close(): Promise<void>;
     ingressId(): string;
+    protected gresUrl(session: WorkerSession, location?: string | null): URL;
     protected onLocalOffer(offer: RTCSessionDescriptionInit): Promise<WebrtcBase>;
     protected abstract onRemoteAnswer(answer: RTCSessionDescription): Promise<WebrtcBase>;
     protected sendLocalCandidates(candidates: RTCIceCandidate[]): Promise<WebrtcBase>;

package/dist/eyepop.index.d.ts

@@ -18,11 +18,11 @@ interface Box {
     readonly bottomRight: Point2d;
 }
 interface Roi {
-    readonly points: Point2d[] | undefined;
-    readonly boxes: Box[] | undefined;
+    readonly points?: Point2d[];
+    readonly boxes?: Box[];
 }
 interface SourceParams {
-    readonly roi: Roi | undefined;
+    readonly roi?: Roi;
 }
 interface StreamTime {
     timestamp?: number;
@@ -455,7 +455,7 @@ declare class WorkerEndpoint extends Endpoint<WorkerEndpoint> {
     onIngressEvent(handler: (event: IngressEvent) => void): WorkerEndpoint;
     liveIngress(stream: MediaStream): Promise<LiveMedia>;
     liveEgress(ingressId: string): Promise<LiveMedia>;
-    process(source: Source, params?: SourceParams | undefined): Promise<ResultStream>;
+    process(source: Source, params?: SourceParams): Promise<ResultStream>;
     private startIngressWs;
     private uploadFile;
     private uploadStream;
@@ -825,7 +825,7 @@ declare class UploadJob extends AbstractJob {
     private readonly _mimeType;
     private readonly _needsFullDuplex;
     get [Symbol.toStringTag](): string;
-    constructor(stream: any, mimeType: string, params: SourceParams | undefined, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
+    constructor(stream: ReadableStream<Uint8Array>, mimeType: string, params: SourceParams | undefined, getSession: () => Promise<WorkerSession>, client: HttpClient, requestLogger: Logger);
     protected onEvent(event: StreamEvent): Promise<void>;
     protected startJob(): Promise<Response>;
 }
@@ -861,6 +861,7 @@ declare abstract class WebrtcBase {
     constructor(getSession: () => Promise<WorkerSession>, client: HttpClient, ingressId: string, urlBasePath: string, requestLogger: Logger);
     close(): Promise<void>;
     ingressId(): string;
+    protected gresUrl(session: WorkerSession, location?: string | null): URL;
     protected onLocalOffer(offer: RTCSessionDescriptionInit): Promise<WebrtcBase>;
     protected abstract onRemoteAnswer(answer: RTCSessionDescription): Promise<WebrtcBase>;
     protected sendLocalCandidates(candidates: RTCIceCandidate[]): Promise<WebrtcBase>;

package/dist/eyepop.index.js

@@ -8987,8 +8987,9 @@ var UploadJob = class extends AbstractJob {
         const params = JSON.stringify(this._params);
         const paramBlob = new Blob([params], { type: "application/json" });
         const formData = new FormData();
+        const fileBlob = await new Response(this._uploadStream).blob();
         formData.append("params", paramBlob);
-        formData.append("file", this._uploadStream);
+        formData.append("file", fileBlob);
         const headers = {
           ...session.authenticationHeaders(),
           Accept: "application/jsonl"
@@ -9057,8 +9058,9 @@ var UploadJob = class extends AbstractJob {
         const params = JSON.stringify(this._params);
         const paramBlob = new Blob([params], { type: "application/json" });
         const formData = new FormData();
+        const fileBlob = await new Response(this._uploadStream).blob();
         formData.append("params", paramBlob);
-        formData.append("file", this._uploadStream);
+        formData.append("file", fileBlob);
         const headers = {
           ...session.authenticationHeaders(),
           Accept: "application/jsonl"
@@ -9192,6 +9194,21 @@ var WebrtcBase = class _WebrtcBase {
   ingressId() {
     return this._ingressId;
   }
+  gresUrl(session, location = null) {
+    let urlPath;
+    if (location) {
+      urlPath = import_path.default.join(this._urlPath, location);
+    } else {
+      urlPath = this._urlPath;
+    }
+    let baseUrl;
+    if (session.baseUrl?.endsWith("/")) {
+      baseUrl = session.baseUrl;
+    } else {
+      baseUrl = session.baseUrl + "/";
+    }
+    return new URL(urlPath, baseUrl);
+  }
   async onLocalOffer(offer) {
     if (!this._pc) {
       throw new Error("onLocalOffer no peer connection");
@@ -9202,7 +9219,7 @@ var WebrtcBase = class _WebrtcBase {
     this._offerData = _WebrtcBase.parseOffer(offer.sdp);
     await this._pc.setLocalDescription(offer);
     const session = await this._getSession();
-    const ingressUrl = new URL(this._urlPath, session.baseUrl);
+    const ingressUrl = this.gresUrl(session);
     this._requestLogger.debug("before POST: %s", ingressUrl);
     const headers = {
       ...session.authenticationHeaders(),
@@ -9231,12 +9248,7 @@ var WebrtcBase = class _WebrtcBase {
     }
     let urlPath = void 0;
     const session = await this._getSession();
-    if (this._location) {
-      urlPath = import_path.default.join(this._urlPath, this._location);
-    } else {
-      urlPath = this._urlPath;
-    }
-    const ingressUrl = new URL(urlPath, session.baseUrl);
+    const ingressUrl = this.gresUrl(session, this._location);
     this._requestLogger.debug("before PATCH: %s", ingressUrl);
     const headers = {
       ...session.authenticationHeaders(),
@@ -9418,7 +9430,7 @@ var WebrtcWhip = class extends WebrtcBase {
   }
   async start() {
     const session = await this._getSession();
-    const ingressUrl = new URL(this._urlPath, session.baseUrl);
+    const ingressUrl = this.gresUrl(session);
     this._requestLogger.debug("before GET: %s", ingressUrl);
     const response = await this._client.fetch(ingressUrl, {
       headers: session.authenticationHeaders(),
@@ -9519,7 +9531,7 @@ var WebrtcWhep = class extends WebrtcBase {
   }
   async start() {
     const session = await this._getSession();
-    const egressUrl = new URL(this._urlPath, session.baseUrl);
+    const egressUrl = this.gresUrl(session);
     this._requestLogger.debug("before GET: %s", egressUrl);
     const response = await this._client.fetch(egressUrl, {
       headers: session.authenticationHeaders(),
@@ -9630,7 +9642,6 @@ if ("document" in globalThis && "implementation" in globalThis.document) {
     }
   }
   createHttpClient = async () => {
-    console.debug("EyePop: creating HttpClient in browser");
     return new BrowserHttpClient();
   };
 } else if (typeof navigator !== "undefined" && navigator.product === "ReactNative") {
@@ -9646,7 +9657,6 @@ if ("document" in globalThis && "implementation" in globalThis.document) {
     }
   }
   createHttpClient = async () => {
-    console.debug("EyePop: creating HttpClient in ReactNative");
     return new ReactNativeHttpClient();
   };
 } else {
@@ -9664,7 +9674,6 @@ if ("document" in globalThis && "implementation" in globalThis.document) {
     }
   }
   createHttpClient = async () => {
-    console.debug("EyePop: creating HttpClient with undici agent in Node");
     const undici = require("undici");
     const agent = new undici.Agent({
       keepAliveTimeout: 1e4,
@@ -10319,7 +10328,7 @@ var WorkerEndpoint = class extends Endpoint {
     );
     return whep.start();
   }
-  async process(source, params = void 0) {
+  async process(source, params) {
     if (source.file !== void 0) {
       return this.uploadFile(source, params);
     } else if (source.stream !== void 0) {
@@ -10373,7 +10382,7 @@ var WorkerEndpoint = class extends Endpoint {
     try {
       this.updateState();
       const job = new UploadJob(
-        source.file,
+        source.file.stream(),
         source.file.type,
         params,
         async () => {