security/hakurei.app
security/hakurei.app
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Switch to new bundled fastboot.js

Browse Source 
This simplifies cache busting greatly without needing to do further
processing on any fastboot.js code before deploying. It also removes the
need for a non-module script with global scope.
This commit is contained in:
Danny Lin 2021-01-23 19:47:37 -08:00 committed by Daniel Micay
parent 94ec5e0440
commit dff5a750d1
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
process_static
View File

@ -7,7 +7,7 @@ export PATH="$PWD/node_modules/.bin:$PATH"
rm -rf static_tmp rm -rf static_tmp
cp -a static static_tmp cp -a static static_tmp
rm -rf static_tmp/js/fastboot/{.git,demo,README.md} rm -rf static_tmp/js/fastboot/{!(dist),dist/!(fastboot.min.js|libs)}
for file in static_tmp/**/*.@(json|webmanifest); do for file in static_tmp/**/*.@(json|webmanifest); do
json_reformat -m < "$file" | sponge "$file" json_reformat -m < "$file" | sponge "$file"

13
static/js/web-install.js
View File

@ -1,7 +1,6 @@
// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT
import { FastbootDevice } from "./fastboot/fastboot.js"; import { FastbootDevice, FactoryImages } from "./fastboot/dist/fastboot.min.js?0";
import * as Factory from "./fastboot/factory.js";
const RELEASES_URL = "https://releases.grapheneos.org"; const RELEASES_URL = "https://releases.grapheneos.org";
@ -37,7 +36,7 @@ async function downloadRelease(setProgress) {
// Download and cache the zip as a blob // Download and cache the zip as a blob
setProgress(`Downloading ${releaseId} release for ${product}...`); setProgress(`Downloading ${releaseId} release for ${product}...`);
lastReleaseZip = `${product}-factory-${releaseId}.zip`; lastReleaseZip = `${product}-factory-${releaseId}.zip`;
await Factory.downloadZip(`${RELEASES_URL}/${lastReleaseZip}`); await FactoryImages.downloadZip(`${RELEASES_URL}/${lastReleaseZip}`);
return `Downloaded ${releaseId} release for ${product}.`; return `Downloaded ${releaseId} release for ${product}.`;
} }
@ -45,7 +44,7 @@ async function flashRelease(setProgress) {
await ensureConnected(setProgress); await ensureConnected(setProgress);
setProgress("Flashing release..."); setProgress("Flashing release...");
await Factory.flashZip(device, lastReleaseZip, (action, partition) => { await FactoryImages.flashZip(device, lastReleaseZip, (action, partition) => {
let userPartition = partition == "avb_custom_key" ? "verified boot key" : partition; let userPartition = partition == "avb_custom_key" ? "verified boot key" : partition;
if (action == "unpack") { if (action == "unpack") {
setProgress(`Unpacking image: ${userPartition}`); setProgress(`Unpacking image: ${userPartition}`);
@ -84,11 +83,9 @@ function addButtonHook(id, callback) {
}; };
} }
// zip.js is loaded separately. FactoryImages.configureZip({
// eslint-disable-next-line no-undef
zip.configure({
workerScripts: { workerScripts: {
inflate: ["/js/fastboot/libs/z-worker-pako.js", "pako_inflate.min.js"], inflate: ["/js/fastboot/dist/libs/z-worker-pako.js", "pako_inflate.min.js"],
}, },
}); });

8
static/web-install.html
View File

@ -26,12 +26,8 @@
<link rel="stylesheet" href="/grapheneos.css?29"/> <link rel="stylesheet" href="/grapheneos.css?29"/>
<link rel="manifest" href="/manifest.webmanifest"/> <link rel="manifest" href="/manifest.webmanifest"/>
<link rel="license" href="/LICENSE.txt"/> <link rel="license" href="/LICENSE.txt"/>
<script defer="defer" src="/js/fastboot/libs/zip-inflate.min.js?0"></script> <script type="module" src="/js/fastboot/dist/fastboot.min.js?0"></script>
<script type="module" src="/js/fastboot/common.js?1"></script> <script type="module" src="/js/web-install.js?4"></script>
<script type="module" src="/js/fastboot/factory.js?1"></script>
<script type="module" src="/js/fastboot/sparse.js?1"></script>
<script type="module" src="/js/fastboot/fastboot.js?1"></script>
<script type="module" src="/js/web-install.js?3"></script>
</head> </head>
<body> <body>
<header> <header>

2
validate_static
View File

@ -14,6 +14,6 @@ for file in static_tmp/**/*.@(json|webmanifest); do
done done
xmllint --noout static_tmp/**/*.@(html|svg|xml) xmllint --noout static_tmp/**/*.@(html|svg|xml)
eslint static_tmp/**/!(zip-inflate.min|z-worker-pako|pako_inflate.min).js eslint static_tmp/**/!(fastboot.min|z-worker-pako|pako_inflate.min).js
stylelint static_tmp/**/*.css stylelint static_tmp/**/*.css
validatornu --Werror --also-check-css --also-check-svg static_tmp/**/*.@(css|html|svg) validatornu --Werror --also-check-css --also-check-svg static_tmp/**/*.@(css|html|svg)