fix infinite token retries and datastore health check memoization (#3844

)

frontend/javascripts/admin/admin_rest_api.js

@@ -98,7 +98,7 @@ export function getSharingToken(): ?string {
 }
 
 let tokenPromise;
-export function doWithToken<T>(fn: (token: string) => Promise<T>): Promise<*> {
+export function doWithToken<T>(fn: (token: string) => Promise<T>, tries: number = 1): Promise<*> {
   const sharingToken = getSharingToken();
   if (sharingToken != null) {
     return fn(sharingToken);
@@ -108,7 +108,10 @@ export function doWithToken<T>(fn: (token: string) => Promise<T>): Promise<*> {
     if (error.status === 403) {
       console.warn("Token expired. Requesting new token...");
       tokenPromise = requestUserToken();
-      return doWithToken(fn);
+      // If three new tokens did not fix the 403, abort, otherwise we'll get into an endless loop here
+      if (tries < 3) {
+        return doWithToken(fn, tries + 1);
+      }
     }
     throw error;
   });

frontend/javascripts/admin/datastore_health_check.js

@@ -17,9 +17,10 @@ const memoizedThrottle = (func, wait = 0, options = {}): Function => {
   };
 };
 
-export const pingDataStoreIfAppropriate = memoizedThrottle(async (requestedUrl: string): Promise<
-  *,
-> => {
+// Do not call this function directly, but call pingMentionedDataStores instead
+// which will take care of extracting the hostnames.
+// Otherwise, the memoization will not work correctly if the path and query-string are part of the URL
+const pingDataStoreIfAppropriate = memoizedThrottle(async (requestedUrl: string): Promise<*> => {
   const [datastores, tracingstore, isInMaintenance] = await Promise.all([
     RestAPI.getDataStoresCached(),
     RestAPI.getTracingStoreCached(),
@@ -93,3 +94,5 @@ const extractUrls = (str: string): Array<string> => {
 export const pingMentionedDataStores = (str: string): void => {
   extractUrls(str).map(pingDataStoreIfAppropriate);
 };
+
+export default {};

frontend/javascripts/libs/request.js

@@ -3,7 +3,7 @@ import _ from "lodash";
 import urljoin from "url-join";
 
 import { createWorker } from "oxalis/workers/comlink_wrapper";
-import { pingDataStoreIfAppropriate, pingMentionedDataStores } from "admin/datastore_health_check";
+import { pingMentionedDataStores } from "admin/datastore_health_check";
 import CompressWorker from "oxalis/workers/compress.worker";
 import FetchBufferWithHeadersWorker from "oxalis/workers/fetch_buffer_with_headers.worker";
 import FetchBufferWorker from "oxalis/workers/fetch_buffer.worker";
@@ -279,7 +279,7 @@ class Request {
   ): Promise<void> => {
     if (doInvestigate) {
       // Check whether this request failed due to a problematic datastore
-      pingDataStoreIfAppropriate(requestedUrl);
+      pingMentionedDataStores(requestedUrl);
       if (error instanceof Response) {
         return error.text().then(
           text => {