Update service worker fallback (#149)

Signed-off-by: Nik Nasr <[email protected]>
restatedev · Jan 18, 2025 · 07fdac8 · 07fdac8
1 parent 9510243
commit 07fdac8
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 13 deletions.
diff --git a/@types/global-env.d.ts b/@types/global-env.d.ts
@@ -5,4 +5,10 @@ interface Env {
 
 declare module globalThis {
   var env: Env;
+  var queryFetch:
+    | undefined
+    | ((
+        input: string | URL | globalThis.Request,
+        init?: RequestInit
+      ) => Promise<Response>);
 }
diff --git a/libs/data-access/admin-api/src/lib/api/client.ts b/libs/data-access/admin-api/src/lib/api/client.ts
@@ -8,7 +8,8 @@ import createClient from 'openapi-fetch';
 
 const client = createClient<paths>({
   fetch: (...args) => {
-    return globalThis.fetch(...args);
+    const fetcher = globalThis.queryFetch ?? globalThis.fetch;
+    return fetcher(...args);
   },
 });
 const errorMiddleware: Middleware = {
@@ -30,7 +31,9 @@ const errorMiddleware: Middleware = {
       if (typeof body === 'object') {
         throw new RestateError(body.message, body.restate_code ?? '');
       }
-      throw new Error(body);
+      throw new Error(
+        body || 'An unexpected error occurred. Please try again later.'
+      );
     }
     if (response.ok && request.url.endsWith('health')) {
       return new Response(JSON.stringify({}), {

diff --git a/libs/data-access/middleware-service-worker/src/lib/register.ts b/libs/data-access/middleware-service-worker/src/lib/register.ts
@@ -21,9 +21,12 @@ export async function register() {
       });
 
       await navigator.serviceWorker.ready;
+      return;
     } catch (error) {
-      console.error(`Registration failed with ${error}`);
-      globalThis.fetch = queryFetcher;
+      console.warn(`Registration failed with ${error}`);
     }
+  } else {
+    console.warn('Service Worker not available');
   }
+  globalThis.queryFetch = queryFetcher;
 }
diff --git a/libs/data-access/middleware-service-worker/tsconfig.lib.json b/libs/data-access/middleware-service-worker/tsconfig.lib.json
@@ -5,7 +5,8 @@
     "types": [
       "node",
       "@nx/react/typings/cssmodule.d.ts",
-      "@nx/react/typings/image.d.ts"
+      "@nx/react/typings/image.d.ts",
+      "../../../@types/global-env.d.ts"
     ]
   },
   "exclude": [

diff --git a/libs/features/explainers/tsconfig.lib.json b/libs/features/explainers/tsconfig.lib.json
@@ -5,7 +5,8 @@
     "types": [
       "node",
       "@nx/react/typings/cssmodule.d.ts",
-      "@nx/react/typings/image.d.ts"
+      "@nx/react/typings/image.d.ts",
+      "../../../@types/global-env.d.ts"
     ]
   },
   "exclude": [

diff --git a/libs/features/health/tsconfig.lib.json b/libs/features/health/tsconfig.lib.json
@@ -5,7 +5,8 @@
     "types": [
       "node",
       "@nx/react/typings/cssmodule.d.ts",
-      "@nx/react/typings/image.d.ts"
+      "@nx/react/typings/image.d.ts",
+      "../../../@types/global-env.d.ts"
     ]
   },
   "exclude": [

diff --git a/libs/features/invocation-route/tsconfig.lib.json b/libs/features/invocation-route/tsconfig.lib.json
@@ -5,7 +5,8 @@
     "types": [
       "node",
       "@nx/react/typings/cssmodule.d.ts",
-      "@nx/react/typings/image.d.ts"
+      "@nx/react/typings/image.d.ts",
+      "../../../@types/global-env.d.ts"
     ]
   },
   "exclude": [

diff --git a/libs/features/invocations-route/tsconfig.lib.json b/libs/features/invocations-route/tsconfig.lib.json
@@ -5,7 +5,8 @@
     "types": [
       "node",
       "@nx/react/typings/cssmodule.d.ts",
-      "@nx/react/typings/image.d.ts"
+      "@nx/react/typings/image.d.ts",
+      "../../../@types/global-env.d.ts"
     ]
   },
   "exclude": [

diff --git a/libs/features/overview-route/tsconfig.lib.json b/libs/features/overview-route/tsconfig.lib.json
@@ -6,7 +6,8 @@
       "node",
 
       "@nx/react/typings/cssmodule.d.ts",
-      "@nx/react/typings/image.d.ts"
+      "@nx/react/typings/image.d.ts",
+      "../../../@types/global-env.d.ts"
     ]
   },
   "exclude": [

diff --git a/libs/features/restate-context/tsconfig.lib.json b/libs/features/restate-context/tsconfig.lib.json
@@ -5,7 +5,8 @@
     "types": [
       "node",
       "@nx/react/typings/cssmodule.d.ts",
-      "@nx/react/typings/image.d.ts"
+      "@nx/react/typings/image.d.ts",
+      "../../../@types/global-env.d.ts"
     ]
   },
   "exclude": [

diff --git a/libs/features/version/tsconfig.lib.json b/libs/features/version/tsconfig.lib.json
@@ -5,7 +5,8 @@
     "types": [
       "node",
       "@nx/react/typings/cssmodule.d.ts",
-      "@nx/react/typings/image.d.ts"
+      "@nx/react/typings/image.d.ts",
+      "../../../@types/global-env.d.ts"
     ]
   },
   "exclude": [

diff --git a/package.json b/package.json
@@ -136,5 +136,5 @@
       }
     }
   },
-  "packageManager": "[email protected].0"
+  "packageManager": "[email protected].4"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -136,5 +136,5 @@ @@
           }
         }
       },
-      "packageManager": "[email protected].0"
+      "packageManager": "[email protected].4"
     }