fix(runtime/serviceworker): fix 'unregister'

Author: jwerle

src/runtime/ipc/routes.cc

@@ -2605,14 +2605,15 @@ static void mapIPCRoutes (Router *router) {
    * @param scope
    */
   router->map("serviceWorker.unregister", [=](auto message, auto router, auto reply) {
-    auto err = validateMessageParameters(message, {"scope"});
+    auto err = validateMessageParameters(message, {"id"});
 
     if (err.type != JSON::Type::Null) {
       return reply(Result { message.seq, message, err });
     }
 
-    const auto scope = message.get("scope");
-    router->bridge.navigator.serviceWorkerServer->container.unregisterServiceWorker(scope);
+    uint64_t id;
+    REQUIRE_AND_GET_MESSAGE_VALUE(id, "id", std::stoull);
+    router->bridge.navigator.serviceWorkerServer->container.unregisterServiceWorker(id);
 
     return reply(Result::Data { message, JSON::Object {} });
   });
@@ -3562,6 +3563,7 @@ static void mapIPCRoutes (Router *router) {
       options.index = targetWindowIndex;
       options.RUNTIME_PRIMORDIAL_OVERRIDES = message.get("__runtime_primordial_overrides__");
       options.userConfig = INI::parse(message.get("config"));
+      options.userScript = message.get("userScript");
       options.resourcesDirectory = message.get("resourcesDirectory");
       options.shouldPreferServiceWorker = message.get("shouldPreferServiceWorker", "false") == "true";
 
@@ -3580,9 +3582,7 @@ static void mapIPCRoutes (Router *router) {
           createdWindow->navigate(message.get("url"));
         }
 
-        if (!options.headless) {
-          createdWindow->show();
-        }
+        createdWindow->show();
 
         reply(Result::Data { message, createdWindow->json() });
       } else {

src/runtime/serviceworker/container.cc

@@ -290,6 +290,17 @@ namespace ssc::runtime::serviceworker {
       return registration;
     }
 
+    for (const auto& entry : this->registrations) {
+      const auto& registration = entry.second;
+      if (registration.options.scriptURL == scriptURL) {
+        if (this->bridge != nullptr) {
+          this->bridge->emit("serviceWorker.register", registration.json(true).str());
+        }
+
+        return registration;
+      }
+    }
+
     const auto id = options.id > 0 ? options.id : rand64();
     this->registrations.insert_or_assign(key, Registration(
       id,
@@ -301,7 +312,7 @@ namespace ssc::runtime::serviceworker {
         scope,
         options.scheme,
         options.serializedWorkerArgs,
-        Registration::Priority::Default,
+        options.priority,
         id
       }
     ));
@@ -323,7 +334,7 @@ namespace ssc::runtime::serviceworker {
     const auto key = Registration::key(scope, this->origin);
 
     if (this->registrations.contains(key)) {
-      const auto& registration = this->registrations.at(scope);
+      const auto& registration = this->registrations.at(key);
       if (this->bridge != nullptr) {
         return this->bridge->emit("serviceWorker.unregister", registration.json());
       }
@@ -334,13 +345,14 @@ namespace ssc::runtime::serviceworker {
 
     for (const auto& entry : this->registrations) {
       if (entry.second.options.scriptURL == scriptURL) {
-        const auto& registration = this->registrations.at(entry.first);
+        const auto& registration = entry.second;
 
         if (this->bridge != nullptr) {
           return this->bridge->emit("serviceWorker.unregister", registration.json().str());
         }
 
         this->registrations.erase(entry.first);
+        return true;
       }
     }
 
@@ -352,7 +364,14 @@ namespace ssc::runtime::serviceworker {
 
     for (const auto& entry : this->registrations) {
       if (entry.second.id == id) {
-        return this->unregisterServiceWorker(entry.first);
+        const auto& registration = entry.second;
+
+        if (this->bridge != nullptr) {
+          return this->bridge->emit("serviceWorker.unregister", registration.json().str());
+        }
+
+        this->registrations.erase(entry.first);
+        return true;
       }
     }
 

src/runtime/webview/scheme_handlers.cc

@@ -462,7 +462,6 @@ namespace ssc::runtime::webview {
 
     auto span = request->tracer.span("handler");
 
-    this->bridge.dispatch([this, id, span, handler, callback, request] () mutable {
       if (request != nullptr && request->isActive() && !request->isCancelled()) {
         handler(request, this->bridge, &request->callbacks, [this, id, span, callback](auto& response) mutable {
           // make sure the response was finished before
@@ -486,7 +485,6 @@ namespace ssc::runtime::webview {
           } while (0);
         });
       }
-    });
 
     return true;
   }

src/runtime/window/apple.mm

@@ -778,6 +778,7 @@ - (void) scrollViewDidScroll: (UIScrollView*) scrollView {
       [this->webview removeFromSuperview];
       this->webview.navigationDelegate = nullptr;
       this->webview.UIDelegate = nullptr;
+      this->webview = nullptr;
     }
 
     if (this->window != nullptr) {
@@ -794,7 +795,6 @@ - (void) scrollViewDidScroll: (UIScrollView*) scrollView {
       }
 
       [this->window performClose: nullptr];
-      this->window = nullptr;
       this->window.webview = nullptr;
       this->window.delegate = nullptr;
       this->window.contentView = nullptr;
@@ -807,6 +807,7 @@ - (void) scrollViewDidScroll: (UIScrollView*) scrollView {
       }
 
       this->window.titleBarView = nullptr;
+      this->window = nullptr;
     #endif
     }
   }