From 3c600d6222ac9c5eaa92c066763fabc38943ff00 Mon Sep 17 00:00:00 2001
From: Nestor Qin <imba.qxy@gmail.com>
Date: Wed, 22 May 2024 20:01:40 -0400
Subject: [PATCH] [ServiceWorker] Refine error message and fix lint warning

---
 src/message.ts        |  1 +
 src/service_worker.ts | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/message.ts b/src/message.ts
index b3e50e65..70d07649 100644
--- a/src/message.ts
+++ b/src/message.ts
@@ -29,6 +29,7 @@ type RequestKind =
   | "keepAlive"
   | "heartbeat";
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 type ResponseKind =
   | "return"
   | "throw"
diff --git a/src/service_worker.ts b/src/service_worker.ts
index e09f0cc7..3417fa87 100644
--- a/src/service_worker.ts
+++ b/src/service_worker.ts
@@ -188,13 +188,21 @@ export async function CreateServiceWorkerMLCEngine(
   engineConfig?: MLCEngineConfig,
 ): Promise<ServiceWorkerMLCEngine> {
   if (!("serviceWorker" in navigator)) {
-    throw new Error("Service worker API is not available");
+    throw new Error(
+      "Service worker API is not available in your browser. Please ensure that your browser supports service workers and that you are using a secure context (HTTPS). " +
+        "Check the browser compatibility and ensure that service workers are not disabled in your browser settings.",
+    );
   }
-  const registration = await (navigator.serviceWorker as ServiceWorkerContainer)
-    .ready;
-  const serviceWorkerMLCEngine = new ServiceWorkerMLCEngine(
-    registration.active!,
-  );
+  const serviceWorkerAPI = navigator.serviceWorker as ServiceWorkerContainer;
+  const registration = await serviceWorkerAPI.ready;
+  const serviceWorker = registration.active || serviceWorkerAPI.controller;
+  if (!serviceWorker) {
+    throw new Error(
+      "Service worker failed to initialize. This could be due to a failure in the service worker registration process or because the service worker is not active. " +
+        "Please refresh the page to retry initializing the service worker.",
+    );
+  }
+  const serviceWorkerMLCEngine = new ServiceWorkerMLCEngine(serviceWorker);
   serviceWorkerMLCEngine.setInitProgressCallback(
     engineConfig?.initProgressCallback,
   );