ipfs fix for apple m1:

- add arm64 prebuilds for leveldown (for now)
- ui: fix progress update for ipfs sharing for electron app
- store ipfs in <profile-dir>/js-ipfs
- update to replaywebpage 1.5.2

bump to 0.7.1

Author: ikreymer

build/extra_prebuilds/darwin-arm64/node.napi.node

@@ -1,6 +1,6 @@
 {
   "name": "archiveweb.page",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "main": "index.js",
   "description": "Create Web Archives directly in your browser",
   "repository": "https://github.com/webrecorder/archiveweb.page",
@@ -18,9 +18,9 @@
     "ipfs-http-client": "^52.0.3",
     "jszip": "^3.7.0",
     "keyword-mark-element": "^0.1.2",
-    "node-fetch": "^3.0.0",
+    "node-fetch": "2.6.2",
     "pretty-bytes": "^5.6.0",
-    "replaywebpage": "^1.5.1",
+    "replaywebpage": "^1.5.2",
     "uuid": "^8.3.2",
     "warcio": "^1.4.7"
   },

package.json

@@ -17,8 +17,8 @@ contextBridge.exposeInMainWorld("archivewebpage", {
     ipcRenderer.send("start-rec", opts);
   },
 
-  ipfsPin: (collId) => {
-    return handleIpfsPin(collId);
+  ipfsPin: (collId, callback) => {
+    return handleIpfsPin(collId, callback);
   },
 
   ipfsUnpin: (collId) => {
@@ -73,14 +73,23 @@ ipcRenderer.on("inc-sizes", async (event, totalSize, writtenSize, collId) => {
 
 
 // ===========================================================================
-async function handleIpfsPin(collId) {
+async function handleIpfsPin(collId, callback) {
   const reqId = "pin-" + collId + (100 * Math.random());
 
   const coll = await getColl(collId);
 
-  const dl = new Downloader({coll});
+  const filename = "webarchive.wacz";
 
-  const resp = await dl.download();
+  const dl = new Downloader({coll, filename});
+
+  let size = 0;
+
+  const resp = await dl.download((incSize) => {
+    size += incSize;
+    if (callback && size) {
+      callback({size});
+    }
+  });
 
   ipcRenderer.send("ipfs-pin", reqId, resp.filename);
 
@@ -112,7 +121,11 @@ async function handleIpfsPin(collId) {
 
   ipcRenderer.send(reqId, null);
 
-  return await getHash;
+  const result = await getHash;
+  if (callback) {
+    callback({});
+  }
+  return result;
 }
 
 // ===========================================================================

src/electron/electron-rec-preload.js

@@ -365,14 +365,23 @@ class WrRecCollInfo extends CollInfo
   }
 
   ipfsApi(collId, pin) {
+    this.dispatchEvent(new CustomEvent("ipfs-share", {detail: {pending: true}}));
+
     if (window.archivewebpage) {
+      const progressCallback = (message) => {
+        if (message.size) {
+          this.shareProgress = message.size;
+        } else {
+          this.shareProgress = 0;
+          this.dispatchEvent(new CustomEvent("ipfs-share", {detail: {pending: false}}));
+        }
+      };
+
       return (pin ? 
-        window.archivewebpage.ipfsPin(this.coll.id) : 
+        window.archivewebpage.ipfsPin(this.coll.id, progressCallback) : 
         window.archivewebpage.ipfsUnpin(this.coll.id));
     }
 
-    this.dispatchEvent(new CustomEvent("ipfs-share", {detail: {pending: true}}));
-
     return new Promise((resolve) => {
       const port = chrome.runtime.connect({name: "share-port"});
       port.onMessage.addListener((message) => {

src/ui/coll-info.js

@@ -56,7 +56,8 @@ const electronMainConfig = (/*env, argv*/) => {
       alias: {
         "abort-controller": "abort-controller/dist/abort-controller.js",
         "dlv": "dlv/dist/dlv.js",
-        "bignumber.js": "bignumber.js/bignumber.js"
+        "bignumber.js": "bignumber.js/bignumber.js",
+        "multiformats/hashes/sha2": "multiformats/cjs/src/hashes/sha2.js"
       }
     },
     output: {
@@ -75,8 +76,8 @@ const electronMainConfig = (/*env, argv*/) => {
           { from: "wr-ext/replay/", to: "replay/" },
           { from: "wr-ext/ruffle/", to: "ruffle/" },
           { from: "wr-ext/pdf/", to: "pdf/" },
-          { from: "node_modules/bcrypto/build/Release/bcrypto.node", to: "build" },
           { from: "node_modules/leveldown/prebuilds/", to: "prebuilds" },
+          { from: "build/extra_prebuilds/", to: "prebuilds" },
         ],
       }),
     ],

webpack.config.js

@@ -1,7 +1,7 @@
 {
   "name": "Webrecorder ArchiveWeb.page",
   "description": "Create high-fidelity web archives directly in your browser",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
   "permissions": [
     "debugger",