misc fixes: (#176)

ikreymer · web-flow · commit e084b41169c8 · 2024-06-09T13:06:50.000-07:00
- escape URL on not found page, partial fix for webrecorder/replayweb.page#323 - hashiterator: more efficient use of createSHA256(), init on first use, unreference when done, catch error on init
diff --git a/dist/sw.js b/dist/sw.js
diff --git a/src/collection.js b/src/collection.js
@@ -123,7 +123,7 @@ class Collection {
       <body style="font-family: sans-serif">
       <h2>Archived Page Not Found</h2>
       <p>Sorry, this page was not found in this archive:</p>
-      <p><code style="word-break: break-all; font-size: larger">${requestURL}</code></p>
+      <p><code id="url" style="word-break: break-all; font-size: larger"></code></p>
       ${this.liveRedirectOnNotFound && request.mode === "navigate" ? `
       <p>Redirecting to live page now... (If this URL is a file download, the download should have started).</p>
       <script>
@@ -138,6 +138,7 @@ class Collection {
       </p>
 
       <script>
+      document.querySelector("#url").innerText = "${requestURL}";
       let isTop = true;
       try {
         if (window.parent._WB_wombat_location) {
diff --git a/src/wacz/ziprangereader.js b/src/wacz/ziprangereader.js
@@ -21,22 +21,39 @@ export class HashingAsyncIterReader extends AsyncIterReader
 {
   constructor(source, compressed = "gzip", dechunk = false) {
     super(source, compressed, dechunk);
+    this.hasher = null;
+    this.hashInited = false;
+    this.hash = "";
   }
 
   async initHasher() {
-    this.hasher = await createSHA256();
+    try {
+      this.hasher = await createSHA256();
+    } catch (e) {
+      console.warn("Hasher init failed, not hashing", e);
+    } finally {
+      this.hashInited = true;
+    }
   }
 
   async _loadNext()  {
     const value = await super._loadNext();
     if (value) {
-      this.hasher.update(value);
+      if (!this.hashInited) {
+        await this.initHasher();
+      }
+      if (this.hasher) {
+        this.hasher.update(value);
+      }
+    } else if (this.hasher) {
+      this.hash = "sha256:" + this.hasher.digest("hex");
+      this.hasher = null;
     }
     return value;
   }
 
   getHash() {
-    return "sha256:" + this.hasher.digest("hex");
+    return this.hash;
   }
 }
 
@@ -288,10 +305,6 @@ export class ZipRangeReader
       reader = wrapHasher(reader);
     }
 
-    if (hasher) {
-      await hasher.initHasher();
-    }
-
     return {reader, hasher};
   }
 

Original file line number	Diff line number	Diff line change
`@@ -21,22 +21,39 @@ export class HashingAsyncIterReader extends AsyncIterReader`
`21`	`21`	`{`
`22`	`22`	`constructor(source, compressed = "gzip", dechunk = false) {`
`23`	`23`	`super(source, compressed, dechunk);`
	`24`	`+ this.hasher = null;`
	`25`	`+ this.hashInited = false;`
	`26`	`+ this.hash = "";`
`24`	`27`	`}`
`25`	`28`
`26`	`29`	`async initHasher() {`
`27`		`- this.hasher = await createSHA256();`
	`30`	`+ try {`
	`31`	`+ this.hasher = await createSHA256();`
	`32`	`+ } catch (e) {`
	`33`	`+ console.warn("Hasher init failed, not hashing", e);`
	`34`	`+ } finally {`
	`35`	`+ this.hashInited = true;`
	`36`	`+ }`
`28`	`37`	`}`
`29`	`38`
`30`	`39`	`async _loadNext() {`
`31`	`40`	`const value = await super._loadNext();`
`32`	`41`	`if (value) {`
`33`		`- this.hasher.update(value);`
	`42`	`+ if (!this.hashInited) {`
	`43`	`+ await this.initHasher();`
	`44`	`+ }`
	`45`	`+ if (this.hasher) {`
	`46`	`+ this.hasher.update(value);`
	`47`	`+ }`
	`48`	`+ } else if (this.hasher) {`
	`49`	`+ this.hash = "sha256:" + this.hasher.digest("hex");`
	`50`	`+ this.hasher = null;`
`34`	`51`	`}`
`35`	`52`	`return value;`
`36`	`53`	`}`
`37`	`54`
`38`	`55`	`getHash() {`
`39`		`- return "sha256:" + this.hasher.digest("hex");`
	`56`	`+ return this.hash;`
`40`	`57`	`}`
`41`	`58`	`}`
`42`	`59`
`@@ -288,10 +305,6 @@ export class ZipRangeReader`
`288`	`305`	`reader = wrapHasher(reader);`
`289`	`306`	`}`
`290`	`307`
`291`		`- if (hasher) {`
`292`		`- await hasher.initHasher();`
`293`		`- }`
`294`		`-`
`295`	`308`	`return {reader, hasher};`
`296`	`309`	`}`
`297`	`310`