dependencies: update to latest wabac.js 2.13.14, replaywebpage 1.7.7

electron: catch loading errors to avoid hung responses
ipfs loading: perform ipfs check only once per session
bump to 0.9.2

Author: ikreymer

dist/embed/replay/sw.js

@@ -1,7 +1,7 @@
 {
   "name": "@webrecorder/archivewebpage",
   "productName": "ArchiveWeb.page",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "main": "index.js",
   "description": "Create Web Archives directly in your browser",
   "repository": "https://github.com/webrecorder/archiveweb.page",
@@ -11,8 +11,8 @@
     "@fortawesome/fontawesome-free": "^5.13.0",
     "@ipld/car": "^5.0.1",
     "@ipld/unixfs": "^2.0.0",
-    "@webrecorder/awp-sw": "^0.1.5",
-    "@webrecorder/wabac": "^2.13.12",
+    "@webrecorder/awp-sw": "^0.1.7",
+    "@webrecorder/wabac": "^2.13.14",
     "auto-js-ipfs": "^2.0.0",
     "browsertrix-behaviors": "^0.3.4",
     "btoa": "^1.2.1",
@@ -26,7 +26,7 @@
     "p-queue": "^7.3.0",
     "pretty-bytes": "^5.6.0",
     "querystring-es3": "^0.2.1",
-    "replaywebpage": "^1.7.6",
+    "replaywebpage": "^1.7.7",
     "stream-browserify": "^3.0.0",
     "unused-filename": "^4.0.1",
     "url": "^0.11.0",

dist/embed/ui.js

@@ -273,7 +273,14 @@ class ElectronRecorderApp extends ElectronReplayApp
 
     const body = uploadData ? Readable.from(readBody(uploadData, session.defaultSession)) : null;
 
-    const response = await fetch(url, {method, headers, body});
+    let response;
+    try {
+      respose = await fetch(url, {method, headers, body});
+    } catch (e) {
+      console.warn("fetch failed for: " + url);
+      callback({statusCode: 502, headers: {}, data: null});
+      return;
+    }
     const data = method === "HEAD" ? null : response.body;
     const statusCode = response.status;
 

package.json

@@ -669,25 +669,33 @@ class ArchiveWebApp extends ReplayWebApp
     // use auto-js-ipfs to get possible local daemon url (eg. for Brave)
     // if so, send it to the service worker
 
-    let ipfsDaemonUrl;
-    let ipfsMessage;
+    let ipfsDaemonUrl = sessionStorage.getItem("ipfsDaemonUrl");
+    let ipfsMessage = sessionStorage.getItem("ipfsMessage");
 
-    // eslint-disable-next-line no-undef
-    const autoipfs = await createAutoIpfs({web3StorageToken: __WEB3_STORAGE_TOKEN__});
-    if (autoipfs instanceof DaemonAPI) {
-      ipfsDaemonUrl = autoipfs.url;
-    }
-    if (autoipfs instanceof Web3StorageAPI) {
-      ipfsMessage = "Sharing via remote web3.storage";
-    } else if (!ipfsDaemonUrl) {
-      ipfsMessage = "IPFS Access Unknown - Sharing Not Available"; 
-    } else if (ipfsDaemonUrl.startsWith("http://localhost:45")) {
-      ipfsMessage = "Sharing via Brave IPFS node";
-    } else if (ipfsDaemonUrl.startsWith("http://localhost")) {
-      ipfsMessage = "Sharing via local IPFS node";
-    } else {
-      ipfsMessage = "";
+    if (ipfsDaemonUrl === null) {
+      // eslint-disable-next-line no-undef
+      const autoipfs = await createAutoIpfs({web3StorageToken: __WEB3_STORAGE_TOKEN__});
+
+      if (autoipfs instanceof DaemonAPI) {
+        ipfsDaemonUrl = autoipfs.url;
+      }
+
+      if (autoipfs instanceof Web3StorageAPI) {
+        ipfsMessage = "Sharing via remote web3.storage";
+      } else if (!ipfsDaemonUrl) {
+        ipfsMessage = "IPFS Access Unknown - Sharing Not Available"; 
+      } else if (ipfsDaemonUrl.startsWith("http://localhost:45")) {
+        ipfsMessage = "Sharing via Brave IPFS node";
+      } else if (ipfsDaemonUrl.startsWith("http://localhost")) {
+        ipfsMessage = "Sharing via local IPFS node";
+      } else {
+        ipfsMessage = "";
+      }
+
+      sessionStorage.setItem("ipfsDaemonUrl", ipfsDaemonUrl);
+      sessionStorage.setItem("ipfsMessage", ipfsMessage);
     }
+
     this.ipfsDaemonUrl = ipfsDaemonUrl;
     this.ipfsMessage = ipfsMessage;
   }

src/electron/electron-recorder-app.js

@@ -930,14 +930,14 @@
   resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.0.tgz#2c275aa05c895eccebbfc34cfb223c6e8bd591a2"
   integrity sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==
 
-"@webrecorder/awp-sw@^0.1.5":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@webrecorder/awp-sw/-/awp-sw-0.1.5.tgz#3a2ad1cc1f1ddea5b71826de08e34be1a1c0d5b2"
-  integrity sha512-lqtppThKWETwZVQvLl5Gg/t7fTswYAOjCwpdSnnHK8FCW840m0D8iKMlhf+J/4fmgISaunBWb9fbZuRE9N/R5A==
+"@webrecorder/awp-sw@^0.1.7":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@webrecorder/awp-sw/-/awp-sw-0.1.7.tgz#a6b7fd065082757d7ca3fa30195c2e80da6f3959"
+  integrity sha512-LnvjYm/kW7TKzt1yK/RDVPNFf5S8qEpFy1l2/SuT5BBGkgdaGcCEUjDZ1C+YUM3ZkaI0dscGOOTjNul6N4K5JQ==
   dependencies:
     "@ipld/car" "^5.0.1"
     "@ipld/unixfs" "^2.0.0"
-    "@webrecorder/wabac" "^2.13.10"
+    "@webrecorder/wabac" "^2.13.14"
     client-zip "^2.3.0"
     hash-wasm "^4.9.0"
     idb "^7.1.1"
@@ -947,39 +947,10 @@
     uuid "^9.0.0"
     warcio "^1.6.1"
 
-"@webrecorder/wabac@^2.13.10":
-  version "2.13.10"
-  resolved "https://registry.yarnpkg.com/@webrecorder/wabac/-/wabac-2.13.10.tgz#7319cf18ff9198d6d4760aed6d2ad271e2472bfc"
-  integrity sha512-tce4CmMZqPqZH1ZqLbKGb6+2QcdzwZbdMr94PtLcMvkCarXLs7oE2jnHQ3kDDXByDqp4JCS554WviwToACNOaQ==
-  dependencies:
-    "@peculiar/asn1-ecc" "^2.3.0"
-    "@peculiar/asn1-schema" "^2.3.0"
-    "@peculiar/x509" "^1.8.3"
-    "@webrecorder/wombat" "^3.3.11"
-    auto-js-ipfs "^2.0.0"
-    base64-js "^1.5.1"
-    brotli "^1.3.3"
-    buffer "^6.0.3"
-    fast-xml-parser "^3.19.0"
-    format-link-header "^3.1.1"
-    hash-wasm "^4.9.0"
-    http-status-codes "^2.1.4"
-    idb "^7.1.1"
-    js-levenshtein "^1.1.6"
-    js-yaml "^4.1.0"
-    pako "^2.0.4"
-    parse-link-header "^2.0.0"
-    parse5-html-rewriting-stream "^6.0.1"
-    parse5-sax-parser "^6.0.1"
-    path-parser "^6.1.0"
-    process "^0.11.10"
-    stream-browserify "^3.0.0"
-    warcio "^1.6.1"
-
-"@webrecorder/wabac@^2.13.12":
-  version "2.13.12"
-  resolved "https://registry.yarnpkg.com/@webrecorder/wabac/-/wabac-2.13.12.tgz#54932e0b71df434db3b643e0a502de5ba2af7648"
-  integrity sha512-dQxestvABL/yeJH/HTWlORYxBy2JPBn/XB5Gbb1EeI6SzXz9nLtJ4LasGR/qQojOXLzYwubGkzMX9eKEfDJlAg==
+"@webrecorder/wabac@^2.13.14":
+  version "2.13.14"
+  resolved "https://registry.yarnpkg.com/@webrecorder/wabac/-/wabac-2.13.14.tgz#b70eabc21d4398587894d6612765ac68e7974feb"
+  integrity sha512-GWsLKGzdi3XeFG/1nQGC25xvYNh8IrJVYmJ3Tn8/QoxivVjr12riBT1D2bVDmtelH4BempIQ9A8vy5Bge5Bxvw==
   dependencies:
     "@peculiar/asn1-ecc" "^2.3.0"
     "@peculiar/asn1-schema" "^2.3.0"
@@ -1005,13 +976,6 @@
     stream-browserify "^3.0.0"
     warcio "^1.6.1"
 
-"@webrecorder/wombat@^3.3.11":
-  version "3.3.11"
-  resolved "https://registry.yarnpkg.com/@webrecorder/wombat/-/wombat-3.3.11.tgz#15ec8ac3de8fb2b4c34396d6cc440b3263b560b6"
-  integrity sha512-Vc/EdEwBFNK7Y8CVZyKOP2YGM4zLD9chOJZFgFQsU0LI46tgnsn1I5GCn8iyH5QWTcU8xrDtN93PZDnvRVOgOw==
-  dependencies:
-    warcio "^1.5.1"
-
 "@webrecorder/wombat@^3.3.12":
   version "3.3.12"
   resolved "https://registry.yarnpkg.com/@webrecorder/wombat/-/wombat-3.3.12.tgz#a639aaf118f2c90e44dc680c8f6f29ae636e2377"
@@ -4980,13 +4944,13 @@ registry-url@^5.0.0:
   dependencies:
     rc "^1.2.8"
 
-replaywebpage@^1.7.6:
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/replaywebpage/-/replaywebpage-1.7.6.tgz#7ff2c956e2c1d58fabe52f62100b4197f13681b3"
-  integrity sha512-98a6xCB7JTwKWZuDDZL4UUYEfZQGATq9BM2IjXVeewbew2VSeL28WaL3AkQh559+31OcoE52kWyEEHoOu1wnLA==
+replaywebpage@^1.7.7:
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/replaywebpage/-/replaywebpage-1.7.7.tgz#be72584948ac31eff047621b5a4836feef5bdb4e"
+  integrity sha512-CeFBzFW0+fhHxWxUVcjavPvhG2YWQYoBP/d9T/U3kY4yG+puFDXydAYOfFRa1XzQX5Ds8OMWN4ISBhJxta/9kw==
   dependencies:
     "@fortawesome/fontawesome-free" "^5.15.4"
-    "@webrecorder/wabac" "^2.13.12"
+    "@webrecorder/wabac" "^2.13.14"
     auto-js-ipfs "^1.5.1"
     bulma "^0.9.3"
     electron-log "^4.4.1"