update fastboot.js to v1.0.5

This commit is contained in:
Daniel Micay 2021-02-17 12:33:27 -05:00
parent fe077b7dd8
commit 393121b700
4 changed files with 9 additions and 10 deletions

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/{!(dist),dist/!(fastboot.min.mjs|vendor)} rm -rf static_tmp/js/fastboot/{!(dist),dist/!(fastboot.min.mjs|fastboot.min.mjs.map|vendor)}
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"

View File

@ -27,8 +27,8 @@
<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 type="module" src="/js/redirect.js?9"></script> <script type="module" src="/js/redirect.js?9"></script>
<script type="module" src="/js/fastboot/dist/fastboot.min.mjs?6"></script> <script type="module" src="/js/fastboot/dist/fastboot.min.mjs?7"></script>
<script type="module" src="/js/web-install.js?11"></script> <script type="module" src="/js/web-install.js?12"></script>
</head> </head>
<body> <body>
<header> <header>

@ -1 +1 @@
Subproject commit 9762e7777b07dcef9c0076c73476cfe69295fe72 Subproject commit 7a60c4f4b7a3ea059a338ada2dcfec8988835414

View File

@ -1,6 +1,6 @@
// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT
import * as fastboot from "./fastboot/dist/fastboot.min.mjs?6"; import * as fastboot from "./fastboot/dist/fastboot.min.mjs?7";
const RELEASES_URL = "https://releases.grapheneos.org"; const RELEASES_URL = "https://releases.grapheneos.org";
@ -196,10 +196,9 @@ async function flashRelease(setProgress) {
} }
setProgress("Flashing release..."); setProgress("Flashing release...");
await fastboot.FactoryImages.flashZip( await device.flashFactoryZip(blob, true, reconnectCallback,
device, blob, true, reconnectCallback,
(action, item, progress) => { (action, item, progress) => {
let userAction = fastboot.FactoryImages.USER_ACTION_MAP[action]; let userAction = fastboot.USER_ACTION_MAP[action];
let userItem = item === "avb_custom_key" ? "verified boot key" : item; let userItem = item === "avb_custom_key" ? "verified boot key" : item;
setProgress(`${userAction} ${userItem}...`, progress); setProgress(`${userAction} ${userItem}...`, progress);
} }
@ -267,9 +266,9 @@ function addButtonHook(id, callback) {
// This doesn't really hurt, and because this page is exclusively for web install, // This doesn't really hurt, and because this page is exclusively for web install,
// we can tolerate extra logging in the console in case something goes wrong. // we can tolerate extra logging in the console in case something goes wrong.
fastboot.setDebugMode(true); fastboot.setDebugLevel(2);
fastboot.FactoryImages.configureZip({ fastboot.configureZip({
workerScripts: { workerScripts: {
inflate: ["/js/fastboot/dist/vendor/z-worker-pako.js", "pako_inflate.min.js"], inflate: ["/js/fastboot/dist/vendor/z-worker-pako.js", "pako_inflate.min.js"],
}, },