From 36dbd27ba524d4b74923b61694b6b844ba27b2d3 Mon Sep 17 00:00:00 2001 From: Rahul Sharma Date: Mon, 25 Jul 2016 14:31:07 +0530 Subject: [PATCH] Make the service worker send custom response --- components/script/dom/abstractworker.rs | 2 +- .../script/dom/dedicatedworkerglobalscope.rs | 2 +- .../script/dom/serviceworkerglobalscope.rs | 47 ++++++++++++------- components/script/serviceworker_manager.rs | 30 ++++++++---- 4 files changed, 52 insertions(+), 29 deletions(-) diff --git a/components/script/dom/abstractworker.rs b/components/script/dom/abstractworker.rs index 4f2f029800b..28c755d4f03 100644 --- a/components/script/dom/abstractworker.rs +++ b/components/script/dom/abstractworker.rs @@ -15,7 +15,7 @@ pub enum WorkerScriptMsg { /// Common variants associated with the script messages Common(CommonScriptMsg), /// Message sent through Worker.postMessage - DOMMessage(StructuredCloneData), + DOMMessage(StructuredCloneData) } pub struct SimpleWorkerErrorHandler { diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index b65fd72ab62..3b9f08c879a 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -307,7 +307,7 @@ impl DedicatedWorkerGlobalScope { let path_seg = format!("url({})", scope.get_url()); let reports = get_reports(cx, path_seg); reports_chan.send(reports); - }, + } } } diff --git a/components/script/dom/serviceworkerglobalscope.rs b/components/script/dom/serviceworkerglobalscope.rs index 4841e0ff08a..4208754f91d 100644 --- a/components/script/dom/serviceworkerglobalscope.rs +++ b/components/script/dom/serviceworkerglobalscope.rs @@ -24,7 +24,7 @@ use js::jsapi::{JS_SetInterruptCallback, JSAutoCompartment, JSContext}; use js::jsval::UndefinedValue; use js::rust::Runtime; use msg::constellation_msg::PipelineId; -use net_traits::{LoadContext, load_whole_resource, IpcSend}; +use net_traits::{LoadContext, load_whole_resource, IpcSend, CustomResponseMediator}; use script_runtime::{CommonScriptMsg, StackRootTLS, get_reports, new_rt_and_cx}; use script_traits::{TimerEvent, WorkerGlobalScopeInit, ScopeThings, ServiceWorkerMsg}; use std::sync::mpsc::{Receiver, RecvError, Select, Sender, channel}; @@ -36,8 +36,16 @@ use util::thread::spawn_named; use util::thread_state; use util::thread_state::{IN_WORKER, SCRIPT}; +/// Messages used to control service worker event loop +pub enum ServiceWorkerScriptMsg { + /// Message common to all workers + CommonWorker(WorkerScriptMsg), + // Message to request a custom response by the service worker + Response(CustomResponseMediator) +} + pub enum MixedMessage { - FromServiceWorker((TrustedServiceWorkerAddress, WorkerScriptMsg)), + FromServiceWorker(ServiceWorkerScriptMsg), FromDevtools(DevtoolScriptControlMsg), FromTimeoutThread(()), } @@ -47,9 +55,9 @@ pub struct ServiceWorkerGlobalScope { workerglobalscope: WorkerGlobalScope, id: PipelineId, #[ignore_heap_size_of = "Defined in std"] - receiver: Receiver<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, + receiver: Receiver, #[ignore_heap_size_of = "Defined in std"] - own_sender: Sender<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, + own_sender: Sender, #[ignore_heap_size_of = "Defined in std"] timer_event_port: Receiver<()>, #[ignore_heap_size_of = "Trusted has unclear ownership like JS"] @@ -66,8 +74,8 @@ impl ServiceWorkerGlobalScope { id: PipelineId, from_devtools_receiver: Receiver, runtime: Runtime, - own_sender: Sender<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, - receiver: Receiver<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, + own_sender: Sender, + receiver: Receiver, timer_event_chan: IpcSender, timer_event_port: Receiver<()>, swmanager_sender: IpcSender, @@ -95,8 +103,8 @@ impl ServiceWorkerGlobalScope { id: PipelineId, from_devtools_receiver: Receiver, runtime: Runtime, - own_sender: Sender<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, - receiver: Receiver<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, + own_sender: Sender, + receiver: Receiver, timer_event_chan: IpcSender, timer_event_port: Receiver<()>, swmanager_sender: IpcSender, @@ -119,8 +127,8 @@ impl ServiceWorkerGlobalScope { #[allow(unsafe_code)] pub fn run_serviceworker_scope(scope_things: ScopeThings, - own_sender: Sender<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, - receiver: Receiver<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, + own_sender: Sender, + receiver: Receiver, devtools_receiver: IpcReceiver, swmanager_sender: IpcSender, scope_url: Url) { @@ -201,7 +209,7 @@ impl ServiceWorkerGlobalScope { } true } - MixedMessage::FromServiceWorker((_, msg)) => { + MixedMessage::FromServiceWorker(msg) => { self.handle_script_event(msg); true } @@ -212,9 +220,11 @@ impl ServiceWorkerGlobalScope { } } - fn handle_script_event(&self, msg: WorkerScriptMsg) { + fn handle_script_event(&self, msg: ServiceWorkerScriptMsg) { + use self::ServiceWorkerScriptMsg::*; + match msg { - WorkerScriptMsg::DOMMessage(data) => { + CommonWorker(WorkerScriptMsg::DOMMessage(data)) => { let scope = self.upcast::(); let target = self.upcast(); let _ac = JSAutoCompartment::new(scope.get_cx(), @@ -223,19 +233,22 @@ impl ServiceWorkerGlobalScope { data.read(GlobalRef::Worker(scope), message.handle_mut()); MessageEvent::dispatch_jsval(target, GlobalRef::Worker(scope), message.handle()); }, - WorkerScriptMsg::Common(CommonScriptMsg::RunnableMsg(_, runnable)) => { + CommonWorker(WorkerScriptMsg::Common(CommonScriptMsg::RunnableMsg(_, runnable))) => { runnable.handler() }, - WorkerScriptMsg::Common(CommonScriptMsg::RefcountCleanup(addr)) => { + CommonWorker(WorkerScriptMsg::Common(CommonScriptMsg::RefcountCleanup(addr))) => { LiveDOMReferences::cleanup(addr); }, - WorkerScriptMsg::Common(CommonScriptMsg::CollectReports(reports_chan)) => { + CommonWorker(WorkerScriptMsg::Common(CommonScriptMsg::CollectReports(reports_chan))) => { let scope = self.upcast::(); let cx = scope.get_cx(); let path_seg = format!("url({})", scope.get_url()); let reports = get_reports(cx, path_seg); reports_chan.send(reports); }, + Response(mediator) => { + let _ = mediator.response_chan.send(None); + } } } @@ -275,7 +288,7 @@ impl ServiceWorkerGlobalScope { } pub fn process_event(&self, msg: CommonScriptMsg) { - self.handle_script_event(WorkerScriptMsg::Common(msg)); + self.handle_script_event(ServiceWorkerScriptMsg::CommonWorker(WorkerScriptMsg::Common(msg))); } } diff --git a/components/script/serviceworker_manager.rs b/components/script/serviceworker_manager.rs index 85f76faadd1..1c24c6fef3f 100644 --- a/components/script/serviceworker_manager.rs +++ b/components/script/serviceworker_manager.rs @@ -8,15 +8,16 @@ //! active_workers map use devtools_traits::{DevtoolsPageInfo, ScriptToDevtoolsControlMsg}; -use dom::serviceworkerglobalscope::ServiceWorkerGlobalScope; +use dom::serviceworkerglobalscope::{ServiceWorkerGlobalScope, ServiceWorkerScriptMsg}; use dom::serviceworkerregistration::longest_prefix_match; use ipc_channel::ipc::{self, IpcSender}; use ipc_channel::router::ROUTER; use net_traits::{CustomResponseMediator, CoreResourceMsg}; use script_traits::{ServiceWorkerMsg, ScopeThings, SWManagerMsg, SWManagerSenders}; use std::collections::HashMap; -use std::sync::mpsc::{channel, Receiver, RecvError}; +use std::sync::mpsc::{channel, Sender, Receiver, RecvError}; use url::Url; +use util::prefs::PREFS; use util::thread::spawn_named; enum Message { @@ -62,7 +63,7 @@ impl ServiceWorkerManager { }); } - pub fn prepare_activation(&mut self, load_url: &Url) { + pub fn prepare_activation(&mut self, load_url: &Url) -> Option> { let mut scope_url = None; for scope in self.registered_workers.keys() { if longest_prefix_match(&scope, load_url) { @@ -75,7 +76,7 @@ impl ServiceWorkerManager { if self.active_workers.contains_key(&scope_url) { // do not run the same worker if already active. warn!("Service worker for {:?} already active", scope_url); - return; + return None; } let scope_things = self.registered_workers.get(&scope_url); if let Some(scope_things) = scope_things { @@ -93,17 +94,19 @@ impl ServiceWorkerManager { page_info)); }; ServiceWorkerGlobalScope::run_serviceworker_scope(scope_things.clone(), - sender, + sender.clone(), receiver, devtools_receiver, self.own_sender.clone(), scope_url.clone()); // We store the activated worker self.active_workers.insert(scope_url.clone(), scope_things.clone()); + return Some(sender); } else { warn!("Unable to activate service worker"); } } + None } fn handle_message(&mut self) { @@ -146,11 +149,14 @@ impl ServiceWorkerManager { #[inline] fn handle_message_from_resource(&mut self, mediator: CustomResponseMediator) -> bool { - self.prepare_activation(&mediator.load_url); - // TODO XXXcreativcoder This mediator will need to be send to the appropriate service worker - // so that it may do the sending of custom responses. - // For now we just send a None from here itself - let _ = mediator.response_chan.send(None); + if serviceworker_enabled() { + let worker_sender = self.prepare_activation(&mediator.load_url); + if let Some(ref sender) = worker_sender { + let _ = sender.send(ServiceWorkerScriptMsg::Response(mediator)); + } + } else { + let _ = mediator.response_chan.send(None); + } true } @@ -164,3 +170,7 @@ impl ServiceWorkerManager { } } } + +pub fn serviceworker_enabled() -> bool { + PREFS.get("dom.serviceworker.enabled").as_boolean().unwrap_or(false) +}