clean up worker code

src/worker/index.ts

@@ -17,7 +17,14 @@ self.ScramjetServiceWorker = class ScramjetServiceWorker {
         this.client = new BareClient();
     }
 
+    route(event: Event | any) {
+        const { request } = event;
+        if (request.url.startsWith(location.origin + self.__scramjet$config.prefix)) return true;
+        else return false;
+    }
+
     async fetch(event: FetchEvent) {
+        try {
             const url = new URL(self.__scramjet$bundle.rewriters.url.decodeUrl(event.request.url));
 
             // implement header rewriting later
@@ -30,12 +37,10 @@ self.ScramjetServiceWorker = class ScramjetServiceWorker {
             
             let responseBody;
             const responseHeaders = self.__scramjet$bundle.rewriters.rewriteHeaders(response.rawHeaders, origin);
-
+            if (response.body) {
                 switch (event.request.destination) {
-            case "document":
-                responseBody = self.__scramjet$bundle.rewriters.rewriteHtml(await response.text(), url.origin);
-                break;
                     case "iframe":
+                    case "document":
                         responseBody = self.__scramjet$bundle.rewriters.rewriteHtml(await response.text(), url.origin);
                         break;
                     case "script":
@@ -52,7 +57,11 @@ self.ScramjetServiceWorker = class ScramjetServiceWorker {
                         responseBody = response.body;
                         break;
                 }
+            }
             
+            if (responseHeaders.accept === 'text/event-stream') {
+                responseHeaders.headers['content-type'] = 'text/event-stream';
+            }
             if (crossOriginIsolated) {
                 responseHeaders["Cross-Origin-Embedder-Policy"] = "require-corp";
             }
@@ -62,5 +71,11 @@ self.ScramjetServiceWorker = class ScramjetServiceWorker {
                 status: response.status,
                 statusText: response.statusText
             })
+        } catch (err) {
+            if (!['document', 'iframe'].includes(event.request.destination))
+                return new Response(undefined, { status: 500 });
+
+            console.error(err);
+        }
     }
 }

static/sw.js

@@ -7,7 +7,7 @@ const scramjet = new ScramjetServiceWorker();
 
 self.addEventListener("fetch", async (event) => {
     event.respondWith((async() => {
-        if (event.request.url.startsWith(location.origin + __scramjet$config.prefix)) {
+        if (scramjet.route(event)) {
             return await scramjet.fetch(event);
         } else {
             return await fetch(event.request);