This repository has been archived by the owner on Aug 31, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 331
Separate pure and side-effecting code #195
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
/* | ||
Copyright 2014 Google Inc. All Rights Reserved. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
'use strict'; | ||
|
||
// For cache.addAll. | ||
require('serviceworker-cache-polyfill'); | ||
|
||
var helpers = require('./helpers'); | ||
var router = require('./router'); | ||
var options = require('./options'); | ||
|
||
// Event listeners | ||
|
||
function fetchListener(event) { | ||
var handler = router.match(event.request); | ||
|
||
if (handler) { | ||
event.respondWith(handler(event.request)); | ||
} else if (router.default && | ||
event.request.method === 'GET' && | ||
// Ensure that chrome-extension:// requests don't trigger the default route. | ||
event.request.url.indexOf('http') === 0) { | ||
event.respondWith(router.default(event.request)); | ||
} | ||
} | ||
|
||
function activateListener(event) { | ||
helpers.debug('activate event fired'); | ||
var inactiveCache = options.cache.name + '$$$inactive$$$'; | ||
event.waitUntil(helpers.renameCache(inactiveCache, options.cache.name)); | ||
} | ||
|
||
function flatten(items) { | ||
return items.reduce(function(a, b) { | ||
return a.concat(b); | ||
}, []); | ||
} | ||
|
||
function installListener(event) { | ||
var inactiveCache = options.cache.name + '$$$inactive$$$'; | ||
helpers.debug('install event fired'); | ||
helpers.debug('creating cache [' + inactiveCache + ']'); | ||
event.waitUntil( | ||
helpers.openCache({cache: {name: inactiveCache}}) | ||
.then(function(cache) { | ||
return Promise.all(options.preCacheItems) | ||
.then(flatten) | ||
.then(helpers.validatePrecacheInput) | ||
.then(function(preCacheItems) { | ||
helpers.debug('preCache list: ' + | ||
(preCacheItems.join(', ') || '(none)')); | ||
return cache.addAll(preCacheItems); | ||
}); | ||
}) | ||
); | ||
} | ||
|
||
module.exports = { | ||
fetchListener: fetchListener, | ||
activateListener: activateListener, | ||
installListener: installListener | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This cleans up the main sw-toolbox entry quite a bit while making it easier to just pull in the helpers. It's also passing our current CI tests. I'm personally fine with this change, but let's see what @jeffposnick and @gauntface think.