ui: ipfs sharing fixes: (#162)

- show dialog if ipfs sharing fails, don't get stuck on spinner
- also show dialog if unsharing fails, don't just remove sharing
- bump awp-sw to 0.3.2

Author: ikreymer

dist/embed/replay/sw.js

@@ -9,7 +9,7 @@
   "license": "AGPL-3.0-or-later",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.13.0",
-    "@webrecorder/awp-sw": "^0.3.1",
+    "@webrecorder/awp-sw": "^0.3.2",
     "@webrecorder/wabac": "^2.16.3",
     "auto-js-ipfs": "^2.3.0",
     "browsertrix-behaviors": "^0.5.0",

dist/embed/ui.js

@@ -82,7 +82,9 @@ class ArchiveWebApp extends ReplayWebApp
 
       ipfsOpts: { type: Object },
 
-      showSettings: {type: Boolean }
+      showSettings: {type: Boolean },
+
+      showIpfsShareFailed: { type: Boolean }
     };
   }
 
@@ -326,6 +328,7 @@ class ArchiveWebApp extends ReplayWebApp
        @show-start=${this.onShowStart}
        @show-import=${this.onShowImport}
        @colls-updated=${this.onCollsLoaded}
+       @ipfs-share-failed=${(e) => this.showIpfsShareFailed = true}
        style="overflow: visible"
        >
       </wr-rec-coll-index>
@@ -339,6 +342,7 @@ class ArchiveWebApp extends ReplayWebApp
     ${this.showImport ? this.renderImportModal() : ""}
     ${this.showDownloadProgress && this.download ? this.renderDownloadModal() : ""}
     ${this.showSettings ? this.renderSettingsModal() : ""}
+    ${this.showIpfsShareFailed ? this.renderIPFSShareFailedModal() : ""}
     ${super.render()}`;
   }
 
@@ -453,6 +457,16 @@ class ArchiveWebApp extends ReplayWebApp
     </wr-modal`;
   }
 
+  renderIPFSShareFailedModal() {
+    return html`
+    <wr-modal @modal-closed="${() => this.showIpfsShareFailed = false}" title="IPFS Connection Failed">
+      <div>
+        <p>Sorry, IPFS sharing / unsharing failed as IPFS could not be reached.</p>
+        <p>(Check the IPFS settings and try again.)</p>
+      </div>
+    </wr-modal`;
+  }
+
   renderDownloadModal() {
     const renderDLStatus = () => {
       switch (this.download.state) {

package.json

@@ -312,11 +312,18 @@ class WrRecCollInfo extends CollInfo
     this.shareWarn = false;
 
     this.shareWait = true;
-    const { ipfsURL } = await this.ipfsAdd();
 
-    this.ipfsURL = ipfsURL;
+    try {
+      const { ipfsURL } = await this.ipfsAdd();
+
+      this.ipfsURL = ipfsURL;
+
+      this.onCopyGatewayLink();
+    } catch (e) {
+      console.log("ipfs share failed");
+      this.dispatchEvent(new CustomEvent("ipfs-share-failed", {bubbles: true, composed: true}));
+    }
 
-    this.onCopyGatewayLink();
     this.shareWait = false;
   }
 
@@ -326,6 +333,8 @@ class WrRecCollInfo extends CollInfo
 
     if (removed) {
       this.ipfsURL = null;
+    } else {
+      this.dispatchEvent(new CustomEvent("ipfs-share-failed", {bubbles: true, composed: true}));
     }
     this.shareWait = false;
   }
@@ -375,6 +384,10 @@ class WrRecCollInfo extends CollInfo
         gzip: false,
         customSplits: true,
       })
+    }).then((res) => {
+      if (!res.ok) {
+        pc.reject();
+      }
     });
 
     return p;
@@ -383,7 +396,9 @@ class WrRecCollInfo extends CollInfo
   async ipfsRemove() {
     const resp = await fetch(`${apiPrefix}/c/${this.coll.id}/ipfs`, {
       method: "DELETE",
-      body: JSON.stringify({ipfsDaemonUrl: this.ipfsOpts.daemonUrl})
+      body: JSON.stringify({
+        ipfsDaemonUrl: this.ipfsOpts.daemonUrl
+      })
     });
 
     return await resp.json();

src/ui/app.js

@@ -954,10 +954,10 @@
   resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.0.tgz#2c275aa05c895eccebbfc34cfb223c6e8bd591a2"
   integrity sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==
 
-"@webrecorder/awp-sw@^0.3.1":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@webrecorder/awp-sw/-/awp-sw-0.3.1.tgz#8c9bcff465422af66e5ffb2ecea3a3886c544b6f"
-  integrity sha512-YtgWDuwxWCkdSDH4TI9hene23KEIIKVsTjmQzmK2HiU+3kvvb/DUiHaL7t8wLKD3JZLKCoHZqoKzuMm7jm+udA==
+"@webrecorder/awp-sw@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@webrecorder/awp-sw/-/awp-sw-0.3.2.tgz#63da7b101f3d4e3c904abcb95eb7821d5f5fafb5"
+  integrity sha512-e+7Oeu8tg7TbraHxr8dVdqreUtfKu9QpwCz/+KE8wM3uGrqc4wNIecUUxQcMI39V8n6i80LI/o7udji/PNQUFg==
   dependencies:
     "@ipld/car" "^5.1.1"
     "@ipld/unixfs" "^2.1.1"