Auto merge of #12682 - creativcoder:fire-fetch, r=jdm

Dispatch lifecycle events to service worker object and refactor html tests

<!-- Please describe your changes on the following line: -->

Changes introduced to dispatch `controllerchange`, `activate` and `fetch` simple events to Service Worker interfaces. The html tests under `tests/html/service-workers` was also updated to demo the changes.
r? @jdm

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [X] These changes do not require tests because refactor.
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12682)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-08-04 01:25:23 -05:00 committed by GitHub
commit 20b9ce6cff
11 changed files with 55 additions and 21 deletions

View file

@ -6,6 +6,7 @@ use dom::bindings::codegen::Bindings::ServiceWorkerContainerBinding::Registratio
use dom::bindings::codegen::Bindings::ServiceWorkerContainerBinding::{ServiceWorkerContainerMethods, Wrap};
use dom::bindings::error::{Error, Fallible};
use dom::bindings::global::GlobalRef;
use dom::bindings::inheritance::Castable;
use dom::bindings::js::{JS, MutNullableHeap, Root};
use dom::bindings::reflector::{Reflectable, reflect_dom_object};
use dom::bindings::str::USVString;
@ -41,7 +42,8 @@ pub trait Controllable {
impl Controllable for ServiceWorkerContainer {
fn set_controller(&self, active_worker: &ServiceWorker) {
self.controller.set(Some(active_worker))
self.controller.set(Some(active_worker));
self.upcast::<EventTarget>().fire_simple_event("controllerchange");
}
}

View file

@ -15,6 +15,7 @@ use dom::bindings::js::{Root, RootCollection};
use dom::bindings::refcounted::LiveDOMReferences;
use dom::bindings::reflector::Reflectable;
use dom::bindings::str::DOMString;
use dom::eventtarget::EventTarget;
use dom::messageevent::MessageEvent;
use dom::serviceworker::TrustedServiceWorkerAddress;
use dom::workerglobalscope::WorkerGlobalScope;
@ -161,11 +162,9 @@ impl ServiceWorkerGlobalScope {
let (devtools_mpsc_chan, devtools_mpsc_port) = channel();
ROUTER.route_ipc_receiver_to_mpsc_sender(devtools_receiver, devtools_mpsc_chan);
// TODO XXXcreativcoder use this timer_ipc_port, when we have a service worker instance here
let (timer_ipc_chan, _timer_ipc_port) = ipc::channel().unwrap();
let (timer_chan, timer_port) = channel();
let global = ServiceWorkerGlobalScope::new(
init, url, pipeline_id, devtools_mpsc_port, runtime,
own_sender, receiver,
@ -178,7 +177,6 @@ impl ServiceWorkerGlobalScope {
}
scope.execute_script(DOMString::from(source));
// Service workers are time limited
spawn_named("SWTimeoutThread".to_owned(), move || {
let sw_lifetime_timeout = PREFS.get("dom.serviceworker.timeout_seconds").as_u64().unwrap();
@ -186,6 +184,7 @@ impl ServiceWorkerGlobalScope {
let _ = timer_chan.send(());
});
scope.upcast::<EventTarget>().fire_simple_event("activate");
let reporter_name = format!("service-worker-reporter-{}", random::<u64>());
scope.mem_profiler_chan().run_with_memory_reporting(|| {
while let Ok(event) = global.receive_event() {
@ -250,6 +249,10 @@ impl ServiceWorkerGlobalScope {
reports_chan.send(reports);
},
Response(mediator) => {
// TODO XXXcreativcoder This will eventually use a FetchEvent interface to fire event
// when we have the Request and Response dom api's implemented
// https://slightlyoff.github.io/ServiceWorker/spec/service_worker_1/index.html#fetch-event-section
self.upcast::<EventTarget>().fire_simple_event("fetch");
let _ = mediator.response_chan.send(None);
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

View file

@ -0,0 +1,3 @@
function status_from_dashboard() {
console.log("Dashboard Service worker is active");
}

View file

@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>An iframe</title>
<title>Servo Browser Engine</title>
</head>
<body>
<div>

View file

@ -1 +0,0 @@
console.log("dummy test file");

View file

@ -1 +1,7 @@
console.log("iframe service worker active");
self.addEventListener('activate', function(e) {
console.log("iframe service worker active");
});
self.addEventListener('fetch', function(e) {
console.log("A fetch event detected by /iframe service worker");
});

View file

@ -6,38 +6,46 @@
</head>
<body>
<p>This page tests the registration and initialization of Service Workers in Servo.</p>
<div id="registration">
<a href="/dashboard-page.html">Go to Dashboard</a>
<a href="/profile.html">Go to Profile</a>
<div id="sw_demo">
<iframe id="iframe_sw" width="" height="200"></iframe>
<br>
<button onclick="register_zero()">Register for Root</button>
<button onclick="register_one()">Register for Dashboard</button>
<button onclick="register_two()">Register for Profile</button>
<a href="/dashboard-page.html">Go to Dashboard</a>
<a href="/profile.html">Go to Profile</a>
<br>
<button onclick="register_zero()">Register for Root (/)</button>
<button onclick="register_one()">Register for Dashboard (/dashboard)</button>
<button onclick="register_two()">Register for Profile (/profile)</button>
</div>
<script>
var reg = navigator.serviceWorker.register('iframe_sw.js', { 'scope': '/demo_iframe.html' });
console.log("From client worker registered: ", navigator.serviceWorker.controller);
console.log("Registered script source: ", navigator.serviceWorker.controller.scriptURL);
console.log("Registered script source: "+ navigator.serviceWorker.controller.scriptURL);
document.getElementById('iframe_sw').src = 'demo_iframe.html';
function register_zero() {
var reg = navigator.serviceWorker.register('sw.js', { 'scope': './' });
console.log("From client worker registered: ", navigator.serviceWorker.controller);
console.log("Registered script source: ", navigator.serviceWorker.controller.scriptURL);
console.log("Registered script source: "+ navigator.serviceWorker.controller.scriptURL);
}
function register_one() {
var reg = navigator.serviceWorker.register('sw_dashboard.js', { 'scope': '/dashboard' });
console.log("From client worker registered: ", navigator.serviceWorker.controller);
console.log("Registered script source: ", navigator.serviceWorker.controller.scriptURL);
console.log("Registered script source: "+ navigator.serviceWorker.controller.scriptURL);
}
function register_two() {
var reg = navigator.serviceWorker.register('sw_profile.js', { 'scope': '/profile' });
console.log("From client worker registered: ", navigator.serviceWorker.controller);
console.log("Registered script source: ", navigator.serviceWorker.controller.scriptURL);
console.log("Registered script source: "+ navigator.serviceWorker.controller.scriptURL);
}
navigator.serviceWorker.addEventListener('controllerchange', function(e) {
console.log("active Service Worker changed");
});
</script>
</body>
</html>

View file

@ -1 +0,0 @@
console.log("root service worker: active");

View file

@ -1,2 +1,9 @@
importScripts('dummy.js');
console.log("dashboard service worker: active");
importScripts('dashboard_helper.js');
self.addEventListener('activate', function(e) {
status_from_dashboard();
});
self.addEventListener('fetch', function(e) {
console.log("A fetch event detected by /dashboard service worker");
});

View file

@ -1 +1,8 @@
console.log("profile service worker: active");
self.addEventListener('activate', function(e) {
console.log("profile service worker active");
});
self.addEventListener('fetch', function(e) {
console.log("A fetch event detected by /profile service worker");
});