@eyepop.ai/eyepop 0.18.0 → 0.18.2

package/dist/eyepop.index.d.mts

@@ -214,6 +214,7 @@ declare class Endpoint {
     private jobDone;
     private updateState;
     private jobStatus;
+    private fetchWithRetry;
     private reconnect;
     private authorizationHeader;
     private currentAccessToken;

package/dist/eyepop.index.d.ts

@@ -214,6 +214,7 @@ declare class Endpoint {
     private jobDone;
     private updateState;
     private jobStatus;
+    private fetchWithRetry;
     private reconnect;
     private authorizationHeader;
     private currentAccessToken;

package/dist/eyepop.index.js

@@ -9859,28 +9859,31 @@ var Endpoint = class {
     }
   }
   async changePopComp(popComp) {
-    if (!this._baseUrl || !this._client) {
+    const client = this._client;
+    const baseUrl = this._baseUrl;
+    if (!baseUrl || !client) {
       return Promise.reject("endpoint not connected, use connect() before changePopComp()");
     }
-    const patch_url = `${this._baseUrl}/pipelines/${this._pipelineId}/inferencePipeline`;
-    const headers = {
-      "Authorization": await this.authorizationHeader(),
-      "Content-Type": "application/json"
-    };
     const body = {
       "pipeline": popComp
     };
-    this._requestLogger.debug("before PATCH %s", patch_url);
-    let response = await this._client.fetch(patch_url, {
-      method: "PATCH",
-      body: JSON.stringify(body),
-      headers
+    let response = await this.fetchWithRetry(async () => {
+      const session = await this.session();
+      let headers = {
+        "Authorization": session.accessToken,
+        "Content-Type": "application/json"
+      };
+      const patch_url = `${session.baseUrl}/pipelines/${session.pipelineId}/inferencePipeline`;
+      return client.fetch(patch_url, {
+        method: "PATCH",
+        body: JSON.stringify(body),
+        headers
+      });
     });
     if (response.status != 204) {
       const message = await response.text();
       return Promise.reject(`Unexpected status ${response.status}: ${message}`);
     }
-    this._requestLogger.debug("after PATCH %s", patch_url);
     if (this._pipeline) {
       this._pipeline.inferPipeline = popComp;
     }
@@ -9923,25 +9926,27 @@ var Endpoint = class {
       return Promise.reject("option secretKey or environment variable EYEPOP_SECRET_KEY is required");
     }
     this._client = await createHttpClient();
+    const client = this._client;
     let result = await this.reconnect();
     if (this._baseUrl && this._options.stopJobs) {
-      const stop_url = `${this._baseUrl}/pipelines/${this._pipelineId}/source?mode=preempt&processing=sync`;
       const body = { "sourceType": "NONE" };
-      const headers = {
-        "Authorization": await this.authorizationHeader(),
-        "Content-Type": "application/json"
-      };
-      this._requestLogger.debug("before PATCH %s", stop_url);
-      let response = await this._client.fetch(stop_url, {
-        method: "PATCH",
-        headers,
-        body: JSON.stringify(body)
+      let response = await this.fetchWithRetry(async () => {
+        const session = await this.session();
+        const headers = {
+          "Authorization": session.accessToken,
+          "Content-Type": "application/json"
+        };
+        const stop_url = `${session.baseUrl}/pipelines/${session.pipelineId}/source?mode=preempt&processing=sync`;
+        return client.fetch(stop_url, {
+          method: "PATCH",
+          headers,
+          body: JSON.stringify(body)
+        });
       });
       if (response.status >= 300) {
         const message = await response.text();
         return Promise.reject(`Unexpected status ${response.status}: ${message}`);
       }
-      this._requestLogger.debug("after PATCH %s", stop_url);
     }
     if (!this._ingressEventWs && this._ingressEventHandler) {
       await this.startIngressWs();
@@ -10016,25 +10021,19 @@ var Endpoint = class {
     }
   }
   async startIngressWs() {
-    if (this._ingressEventWs || !this._baseUrl || !this._client) {
+    const client = this._client;
+    if (this._ingressEventWs || !this._baseUrl || !client) {
       return;
     }
     try {
-      const getTokenUrl = `${this._baseUrl}/liveIngress/events/token`;
-      const headers = {
-        "Authorization": await this.authorizationHeader()
-      };
-      this._requestLogger.debug("before GET %s", getTokenUrl);
-      let response = await this._client.fetch(getTokenUrl, { headers });
-      if (response.status == 401) {
-        this._requestLogger.debug("after GET %s: 401, about to retry with fresh access token", getTokenUrl);
-        this._token = null;
-        const headers2 = {
-          "Authorization": await this.authorizationHeader()
+      const session = await this.session();
+      let response = await this.fetchWithRetry(async () => {
+        const headers = {
+          "Authorization": session.accessToken
         };
-        this.updateState("FetchConfig" /* FetchConfig */);
-        response = await this._client.fetch(getTokenUrl, { headers: headers2 });
-      }
+        const getTokenUrl = `${session.baseUrl}/liveIngress/events/token`;
+        return client.fetch(getTokenUrl, { headers });
+      });
       if (response.status != 200) {
         const message = await response.text();
         return Promise.reject(`Unexpected status ${response.status}: ${message}`);
@@ -10180,6 +10179,39 @@ var Endpoint = class {
       this._expire_token_time = null;
     }
   }
+  async fetchWithRetry(fetcher, retries = 1) {
+    while (true) {
+      try {
+        const response = await fetcher();
+        if (response.status == 401) {
+          this._token = null;
+          this._expire_token_time = null;
+          if (retries--) {
+            this._requestLogger.info("received 401 response, attempt to reauthorize and retry");
+          } else {
+            return Promise.reject(`response ${response.status}: ${response.statusText}`);
+          }
+        } else if (response.status == 404) {
+          this._pipelineId = null;
+          this._baseUrl = null;
+          if (retries--) {
+            this._requestLogger.info("received 404 response, attempt to restart pop and retry");
+          } else {
+            return Promise.reject(`response ${response.status}: ${response.statusText}`);
+          }
+        } else {
+          return response;
+        }
+      } catch (error) {
+        this._pipelineId = null;
+        this._baseUrl = null;
+        if (retries--) {
+          this._requestLogger.info("unknown, attempt to restart pop (as if we received 404)", error);
+          return Promise.reject(error);
+        }
+      }
+    }
+  }
   async reconnect() {
     if (!this._client) {
       return Promise.reject("endpoint not initialized");
@@ -10205,7 +10237,6 @@ var Endpoint = class {
       this.updateState("FetchConfig" /* FetchConfig */);
       response = await this._client.fetch(config_url, {
         headers: headers2
-        // @ts-ignore
       });
     }
     if (response.status != 200) {
@@ -10223,7 +10254,6 @@ var Endpoint = class {
         this.updateState("StartingPop" /* StartingPop */);
         response = await this._client.fetch(auto_start_config_url, {
           headers: headers2
-          // @ts-ignore
         });
         if (response.status != 200) {
           this.updateState("Error" /* Error */);