Merge pull request #92 from dirtbags/neale-asi

We use ASI
This commit is contained in:
int00h5525 2019-11-06 12:18:22 -06:00 committed by GitHub
commit f057da87fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 116 additions and 116 deletions

View File

@ -2,15 +2,15 @@ function pwa_init() {
if ('serviceWorker' in navigator) { if ('serviceWorker' in navigator) {
navigator.serviceWorker.register("./sw.js").then(function(reg) { navigator.serviceWorker.register("./sw.js").then(function(reg) {
}).catch(function(err) { }).catch(function(err) {
console.warn("Error while registering service worker", err); console.warn("Error while registering service worker", err)
}); })
} else { } else {
console.log("Service workers not supported. Some offline functionality may not work"); console.log("Service workers not supported. Some offline functionality may not work")
} }
} }
if (document.readyState === "loading") { if (document.readyState === "loading") {
document.addEventListener("DOMContentLoaded", pwa_init); document.addEventListener("DOMContentLoaded", pwa_init)
} else { } else {
pwa_init(); pwa_init()
} }

View File

@ -109,68 +109,68 @@ function showPuzzles(teamId) {
} }
function drawCacheButton(teamId) { function drawCacheButton(teamId) {
let cacher = document.createElement("li"); let cacher = document.createElement("li")
let cache_button = document.createElement("a"); let cache_button = document.createElement("a")
cache_button.innerText = "Cache"; cache_button.innerText = "Cache"
cache_button.title = "Cache an offine copy of current content"; cache_button.title = "Cache an offine copy of current content"
cache_button.href = "#"; cache_button.href = "#"
cache_button.addEventListener("click", async function() { cache_button.addEventListener("click", async function() {
toast("Caching all currently-open content"); toast("Caching all currently-open content")
await fetchAll(teamId); await fetchAll(teamId)
toast("Done caching content"); toast("Done caching content")
}); })
cacher.appendChild(cache_button); cacher.appendChild(cache_button)
document.getElementsByTagName("nav")[0].getElementsByTagName("ul")[0].appendChild(cacher); document.getElementsByTagName("nav")[0].getElementsByTagName("ul")[0].appendChild(cacher)
function updateCacheButton() { function updateCacheButton() {
let headers = new Headers(); let headers = new Headers()
headers.append("pragma", "no-cache"); headers.append("pragma", "no-cache")
headers.append("cache-control", "no-cache"); headers.append("cache-control", "no-cache")
fetch("current_manifest.json?id=" + teamId, {method: "HEAD", headers: headers}) fetch("current_manifest.json?id=" + teamId, {method: "HEAD", headers: headers})
.then( resp => { .then( resp => {
if (resp.ok) { if (resp.ok) {
cacher.style.disply = "initial"; cacher.style.disply = "initial"
} else { } else {
cacher.style.display = "none"; cacher.style.display = "none"
} }
}).catch( ex => { }).catch( ex => {
cacher.style.display = "none"; cacher.style.display = "none"
}) })
} }
setInterval ( updateCacheButton , 30000); setInterval ( updateCacheButton , 30000)
updateCacheButton(); updateCacheButton()
} }
async function fetchAll(teamId) { async function fetchAll(teamId) {
let headers = new Headers(); let headers = new Headers()
headers.append("pragma", "no-cache"); headers.append("pragma", "no-cache")
headers.append("cache-control", "no-cache"); headers.append("cache-control", "no-cache")
requests = []; requests = []
requests.push( fetch("current_manifest.json?id=" + teamId, {headers: headers}) requests.push( fetch("current_manifest.json?id=" + teamId, {headers: headers})
.then( resp => { .then( resp => {
if (resp.ok) { if (resp.ok) {
resp.json() resp.json()
.then( contents => { .then( contents => {
console.log("Processing manifest"); console.log("Processing manifest")
for (let resource of contents) { for (let resource of contents) {
if (resource == "puzzles.json") { if (resource == "puzzles.json") {
continue; continue
} }
fetch(resource) fetch(resource)
.then( e => { .then( e => {
console.log("Fetched " + resource); console.log("Fetched " + resource)
}) })
} }
}) })
} }
})); }))
let resp = await fetch("puzzles.json?id=" + teamId, {headers: headers}); let resp = await fetch("puzzles.json?id=" + teamId, {headers: headers})
if (resp.ok) { if (resp.ok) {
let categories = await resp.json(); let categories = await resp.json()
let cat_names = Object.keys(categories) let cat_names = Object.keys(categories)
cat_names.sort() cat_names.sort()
for (let cat_name of cat_names) { for (let cat_name of cat_names) {
@ -178,17 +178,17 @@ async function fetchAll(teamId) {
// Skip metadata // Skip metadata
continue continue
} }
let puzzles = categories[cat_name]; let puzzles = categories[cat_name]
for (let puzzle of puzzles) { for (let puzzle of puzzles) {
let url = "puzzle.html?cat=" + cat_name + "&points=" + puzzle[0] + "&pid=" + puzzle[1]; let url = "puzzle.html?cat=" + cat_name + "&points=" + puzzle[0] + "&pid=" + puzzle[1]
requests.push( fetch(url) requests.push( fetch(url)
.then( e => { .then( e => {
console.log("Fetched " + url); console.log("Fetched " + url)
})); }))
} }
} }
} }
return Promise.all(requests); return Promise.all(requests)
} }
function login(e) { function login(e) {
@ -240,8 +240,8 @@ function init() {
} }
if (document.readyState === "loading") { if (document.readyState === "loading") {
document.addEventListener("DOMContentLoaded", init); document.addEventListener("DOMContentLoaded", init)
} else { } else {
init(); init()
} }

View File

@ -7,121 +7,121 @@
<script src="moth-pwa.js" type="text/javascript"></script> <script src="moth-pwa.js" type="text/javascript"></script>
<script> <script>
function update(state) { function update(state) {
let element = document.getElementById("scoreboard"); let element = document.getElementById("scoreboard")
let teamnames = state["teams"]; let teamnames = state["teams"]
let pointslog = state["points"]; let pointslog = state["points"]
let highscore = {}; let highscore = {}
let teams = {}; let teams = {}
// Every machine that's displaying the scoreboard helpfully stores the last 20 values of // Every machine that's displaying the scoreboard helpfully stores the last 20 values of
// points.json for us, in case of catastrophe. Thanks, y'all! // points.json for us, in case of catastrophe. Thanks, y'all!
// //
// We have been doing some letiation on this "everybody backs up the server state" trick since 2009. // We have been doing some letiation on this "everybody backs up the server state" trick since 2009.
// We have needed it 0 times. // We have needed it 0 times.
let pointshistory = JSON.parse(localStorage.getItem("pointshistory")) || []; let pointshistory = JSON.parse(localStorage.getItem("pointshistory")) || []
if (pointshistory.length >= 20){ if (pointshistory.length >= 20){
pointshistory.shift(); pointshistory.shift()
} }
pointshistory.push(pointslog); pointshistory.push(pointslog)
localStorage.setItem("pointshistory", JSON.stringify(pointshistory)); localStorage.setItem("pointshistory", JSON.stringify(pointshistory))
// Dole out points // Dole out points
for (let i in pointslog) { for (let i in pointslog) {
let entry = pointslog[i]; let entry = pointslog[i]
let timestamp = entry[0]; let timestamp = entry[0]
let teamhash = entry[1]; let teamhash = entry[1]
let category = entry[2]; let category = entry[2]
let points = entry[3]; let points = entry[3]
let team = teams[teamhash] || {__hash__: teamhash}; let team = teams[teamhash] || {__hash__: teamhash}
// Add points to team's points for that category // Add points to team's points for that category
team[category] = (team[category] || 0) + points; team[category] = (team[category] || 0) + points
// Record highest score in a category // Record highest score in a category
highscore[category] = Math.max(highscore[category] || 0, team[category]); highscore[category] = Math.max(highscore[category] || 0, team[category])
teams[teamhash] = team; teams[teamhash] = team
} }
// Sort by team score // Sort by team score
function teamScore(t) { function teamScore(t) {
let score = 0; let score = 0
for (let category in highscore) { for (let category in highscore) {
score += (t[category] || 0) / highscore[category]; score += (t[category] || 0) / highscore[category]
} }
return score; return score
} }
function teamCompare(a, b) { function teamCompare(a, b) {
return teamScore(a) - teamScore(b); return teamScore(a) - teamScore(b)
} }
// Figure out how to order each team on the scoreboard // Figure out how to order each team on the scoreboard
let winners = []; let winners = []
for (let i in teams) { for (let i in teams) {
winners.push(teams[i]); winners.push(teams[i])
} }
winners.sort(teamCompare); winners.sort(teamCompare)
winners.reverse(); winners.reverse()
// Clear out the element we're about to populate // Clear out the element we're about to populate
Array.from(element.childNodes).map(e => e.remove()); Array.from(element.childNodes).map(e => e.remove())
let maxWidth = 100 / Object.keys(highscore).length; let maxWidth = 100 / Object.keys(highscore).length
for (let i in winners) { for (let i in winners) {
let team = winners[i]; let team = winners[i]
let row = document.createElement("div"); let row = document.createElement("div")
let ncat = 0; let ncat = 0
for (let category in highscore) { for (let category in highscore) {
let catHigh = highscore[category]; let catHigh = highscore[category]
let catTeam = team[category] || 0; let catTeam = team[category] || 0
let catPct = catTeam / catHigh; let catPct = catTeam / catHigh
let width = maxWidth * catPct; let width = maxWidth * catPct
let bar = document.createElement("span"); let bar = document.createElement("span")
bar.classList.add("category"); bar.classList.add("category")
bar.classList.add("cat" + ncat); bar.classList.add("cat" + ncat)
bar.style.width = width + "%"; bar.style.width = width + "%"
bar.textContent = category + ": " + catTeam; bar.textContent = category + ": " + catTeam
bar.title = bar.textContent; bar.title = bar.textContent
row.appendChild(bar); row.appendChild(bar)
ncat += 1; ncat += 1
} }
let te = document.createElement("span"); let te = document.createElement("span")
te.classList.add("teamname"); te.classList.add("teamname")
te.textContent = teamnames[team.__hash__]; te.textContent = teamnames[team.__hash__]
row.appendChild(te); row.appendChild(te)
element.appendChild(row); element.appendChild(row)
} }
} }
function once() { function once() {
fetch("points.json") fetch("points.json")
.then(resp => { .then(resp => {
return resp.json(); return resp.json()
}) })
.then(obj => { .then(obj => {
update(obj); update(obj)
}) })
.catch(err => { .catch(err => {
console.log(err); console.log(err)
}); })
} }
function init() { function init() {
let base = window.location.href.replace("scoreboard.html", ""); let base = window.location.href.replace("scoreboard.html", "")
document.querySelector("#location").textContent = base; document.querySelector("#location").textContent = base
setInterval(once, 60000); setInterval(once, 60000)
once(); once()
} }
if (document.readyState === "loading") { if (document.readyState === "loading") {
document.addEventListener("DOMContentLoaded", init); document.addEventListener("DOMContentLoaded", init)
} else { } else {
init(); init()
} }
</script> </script>
</head> </head>

View File

@ -8,42 +8,42 @@ var content = [
"moth.js", "moth.js",
"sw.js", "sw.js",
"points.json", "points.json",
]; ]
self.addEventListener("install", function(e) { self.addEventListener("install", function(e) {
e.waitUntil( e.waitUntil(
caches.open(cacheName).then(function(cache) { caches.open(cacheName).then(function(cache) {
return cache.addAll(content).then( return cache.addAll(content).then(
function() { function() {
self.skipWaiting(); self.skipWaiting()
}); })
})
)
}) })
);
});
/* Attempt to fetch live resources, first, then fall back to cache */ /* Attempt to fetch live resources, first, then fall back to cache */
self.addEventListener('fetch', function(event) { self.addEventListener('fetch', function(event) {
let cache_used = false; let cache_used = false
event.respondWith( event.respondWith(
fetch(event.request) fetch(event.request)
.catch(function(evt) { .catch(function(evt) {
//console.log("Falling back to cache for " + event.request.url); //console.log("Falling back to cache for " + event.request.url)
cache_used = true; cache_used = true
return caches.match(event.request, {ignoreSearch: true}); return caches.match(event.request, {ignoreSearch: true})
}).then(function(res) { }).then(function(res) {
if (res && res.ok) { if (res && res.ok) {
let res_clone = res.clone(); let res_clone = res.clone()
if (! cache_used && event.request.method == "GET" ) { if (! cache_used && event.request.method == "GET" ) {
caches.open(cacheName).then(function(cache) { caches.open(cacheName).then(function(cache) {
cache.put(event.request, res_clone); cache.put(event.request, res_clone)
//console.log("Storing " + event.request.url + " in cache"); //console.log("Storing " + event.request.url + " in cache")
}); })
} }
return res; return res
} else { } else {
console.log("Failed to retrieve resource"); console.log("Failed to retrieve resource")
} }
}) })
); )
}); })