refactor(runtime/{webview,serviceworker,conduit}): improve service worker and conduit routing

Author: jwerle

api/service-worker/context.js

@@ -82,7 +82,6 @@ export class Context {
       return await clients.get(this.event.clientId)
     }
 
-    console.log('NO EVENT CLIENT ID')
     return null
   }
 }

src/runtime/bridge/bridge.cc

@@ -482,17 +482,7 @@ export * from '{{url}}'
 
           const auto app = App::sharedApplication();
           const auto options = serviceworker::Fetch::Options { request->client };
-          const auto fetched = serviceWorker->fetch(fetch, options, [
-            this,
-            applicationResources,
-            contentLocation,
-            serviceWorker,
-            resourcePath,
-            userConfig,
-            callback,
-            response,
-            request
-          ] (auto res) mutable {
+          const auto fetched = serviceWorker->fetch(fetch, options, [=, this, &request] (auto res) mutable {
             if (!request->isActive()) {
               return;
             }
@@ -602,12 +592,12 @@ export * from '{{url}}'
           });
 
           if (fetched) {
-            this->getRuntime()->services.timers.setTimeout(32000, [request] () mutable {
-              if (request->isActive()) {
-                auto response = SchemeHandlers::Response(request, 408);
-                response.fail("ServiceWorker request timed out.");
-              }
-            });
+             this->getRuntime()->services.timers.setTimeout(32000, [&request] () mutable {
+               if (request->isActive()) {
+                 auto response = SchemeHandlers::Response(request, 408);
+                 response.fail("ServiceWorker request timed out.");
+               }
+             });
             return;
           }
         }

src/runtime/core/services/conduit.cc

@@ -467,6 +467,7 @@ namespace ssc::runtime::core::services {
     }
 
     client->queue.clear();
+    client->frameBuffer.resize(0);
 
     const auto bytes = vectorToSharedPointer(buffer);
     const auto message = ipc::Message(uri);

src/runtime/core/services/permissions.cc

@@ -260,7 +260,11 @@ namespace ssc::runtime::core::services {
       }
 
       if (name == "geolocation") {
+      #if SOCKET_RUNTIME_PLATFORM_APPLE
         __block JSON::Object json;
+      #else
+        JSON::Object json;
+      #endif
 
       #if SOCKET_RUNTIME_PLATFORM_APPLE
         const auto performedActivation = [this->services.geolocation.locationObserver attemptActivationWithCompletion: ^(BOOL isAuthorized) {

src/runtime/http.hh

@@ -38,8 +38,8 @@ namespace ssc::runtime::http {
           Value (int64_t);
           Value (uint64_t);
           Value (double_t);
-          Value (size_t value);
         #if SOCKET_RUNTIME_PLATFORM_APPLE
+          Value (size_t value);
           Value (ssize_t value);
         #endif
 

src/runtime/http/headers.cc

@@ -234,11 +234,11 @@ namespace ssc::runtime::http {
     this->string = std::to_string(value);
   }
 
+#if SOCKET_RUNTIME_PLATFORM_APPLE
   Headers::Value::Value (size_t value) {
     this->string = std::to_string(value);
   }
 
-#if SOCKET_RUNTIME_PLATFORM_APPLE
   Headers::Value::Value (ssize_t value) {
     this->string = std::to_string(value);
   }

src/runtime/serviceworker/container.cc

@@ -239,11 +239,18 @@ namespace ssc::runtime::serviceworker {
         fetch->response.body = bytes::Buffer::from(html);
       }
 
-      fetch->callback(fetch->response);
-      reply(ipc::Result { message.seq, message });
+      do {
+        Lock lock(this->mutex);
+        this->fetches.erase(id);
+      } while (0);
+
+      this->bridge->dispatch([=](){
+        fetch->callback(fetch->response);
+      });
 
-      Lock lock(this->mutex);
-      this->fetches.erase(id);
+      this->bridge->dispatch([=](){
+        reply(ipc::Result { message.seq, message });
+      });
     });
   }
 

src/runtime/serviceworker/fetch.cc

@@ -27,7 +27,9 @@ namespace ssc::runtime::serviceworker {
       return false;
     }
 
-    this->callback = callback;
+    if (callback != nullptr) {
+      this->callback = std::move(callback);
+    }
 
     for (const auto& entry : this->container.registrations) {
       const auto& registration = entry.second;
@@ -69,10 +71,10 @@ namespace ssc::runtime::serviceworker {
         )
       ) {
         auto runtime = this->container.bridge->getRuntime();
-        runtime->dispatch([this, runtime, callback, &registration]() {
-          const auto interval = runtime->services.timers.setInterval(8, [this, runtime, callback, &registration] (auto cancel) {
+        runtime->dispatch([this, runtime, &registration]() {
+          const auto interval = runtime->services.timers.setInterval(8, [this, runtime, &registration] (auto cancel) {
             if (registration.state == Registration::State::Activated) {
-              if (!this->init(callback)) {
+              if (!this->init(this->callback)) {
                 debug(
                 #if SOCKET_RUNTIME_PLATFORM_APPLE
                   "ServiceWorkerContainer: Failed to dispatch fetch request '%s %s%s' for client '%llu'",
@@ -114,7 +116,7 @@ namespace ssc::runtime::serviceworker {
         {"host", request.url.hostname},
         {"scheme", request.url.scheme},
         {"pathname", pathname},
-        {"query", request.url.query},
+        {"query", request.url.searchParams.str()},
         {"headers", request.headers.json()},
         {"client", client}
       };

src/runtime/url/builder.cc

@@ -77,7 +77,7 @@ namespace ssc::runtime::url {
       }
 
       for (const auto& entry : params) {
-        this->search += entry.first + "=" + entry.second + "&";
+        this->search += encodeURIComponent(entry.first) + "=" + encodeURIComponent(entry.second) + "&";
       }
     }
 

src/runtime/url/url.cc

@@ -406,6 +406,7 @@ namespace ssc::runtime::url {
   }
 
   const JSON::Object URL::json () const {
+    const auto search = this->searchParams.str();
     return JSON::Object::Entries {
       {"href", this->href()},
       {"origin", this->origin},
@@ -414,7 +415,7 @@ namespace ssc::runtime::url {
       {"password", this->password},
       {"hostname", this->hostname},
       {"pathname", this->pathname},
-      {"search", this->search},
+      {"search", "?" + search},
       {"hash", this->hash}
     };
   }

src/runtime/webview.hh

@@ -265,6 +265,7 @@ namespace ssc::runtime::webview {
         int statusCode = 200;
         http::Headers headers;
         Client client;
+        mutable Mutex mutex;
 
         Atomic<bool> finished = false;
 

src/runtime/webview/navigator.cc

@@ -229,7 +229,7 @@ namespace ssc::runtime::webview {
         gpointer userData
       ) {
         const auto navigator = reinterpret_cast<Navigator*>(userData);
-        auto window = navigator->bridge->context.getRuntime()->windowManager.getWindowForWebView(webview);
+        auto window = navigator->bridge.context.getRuntime()->windowManager.getWindowForWebView(webview);
 
         if (!window) {
           webkit_policy_decision_ignore(decision);
@@ -412,15 +412,15 @@ namespace ssc::runtime::webview {
     for (const auto& entry : this->location.mounts) {
       const auto& path = entry.first;
       #if SOCKET_RUNTIME_PLATFORM_LINUX
-        auto webContext = this->bridge->webContext;
+        auto webContext = this->bridge.webContext;
         if (path != wellKnownPaths.home.string()) {
           webkit_web_context_add_path_to_sandbox(webContext, path.c_str(), false);
         }
       #endif
     }
 
   #if SOCKET_RUNTIME_PLATFORM_LINUX
-    auto webContext = this->bridge->webContext;
+    auto webContext = this->bridge.webContext;
     for (const auto& entry : wellKnownPaths.entries()) {
       if (filesystem::Resource::isDirectory(entry) && entry != wellKnownPaths.home) {
         webkit_web_context_add_path_to_sandbox(webContext, entry.c_str(), false);