Faster gateway usage

.nvmrc

@@ -1 +1 @@
-v16.13.2
+v16.16.0

gatsby-node.js

@@ -23,6 +23,18 @@ exports.onCreateWebpackConfig = ({
       fallback: { canvas: false },
     }
   })
+  if (stage === "build-html" || stage === "develop-html") {
+    actions.setWebpackConfig({
+      module: {
+        rules: [
+          {
+            test: /ipfs-utils|ipfs-http-client/,
+            use: loaders.null(),
+          },
+        ],
+      },
+    })
+  }
 }
 
 function isSuperset(set, subset) {

package.json

@@ -30,7 +30,7 @@
     "gatsby-transformer-sharp": "^4.6.0",
     "html-react-parser": "^1.4.5",
     "idb-keyval": "^6.1.0",
-    "ipfs-http-client": "^56.0.0",
+    "ipfs-http-client": "^57.0.3",
     "js-base64": "^3.6.0",
     "jszip": "^3.6.0",
     "material-design-icons": "^3.0.1",

src/ipfs/ipfsClient.js

@@ -1,6 +1,6 @@
 import { create as createIpfsClient } from 'ipfs-http-client';
 
 const ipfsAPIUrl = 'https://dweb.link/api/v0'
-const ipfsClient = createIpfsClient({ url: ipfsAPIUrl })
+const ipfsClient = typeof window !== "undefined" ? createIpfsClient({ url: ipfsAPIUrl }) : null
 
-export default ipfsClient
+export default ipfsClient

src/siteMetadata/insightJournal.json

@@ -1,4 +1,5 @@
 {
+  "articlesCid": "bafybeialgmdqikskc56dhy2xrnio2te23xdzqdm77wtqxpxybr3ys5cpli",
   "targetJournal": 3,
   "title": "The Insight Journal",
   "copyrightHolder": "NumFOCUS, Inc. for the Insight Software Consortium",

src/siteMetadata/midasJournal.json

@@ -1,4 +1,5 @@
 {
+  "articlesCid": "bafybeialgmdqikskc56dhy2xrnio2te23xdzqdm77wtqxpxybr3ys5cpli",
   "targetJournal": 31,
   "title": "The MIDAS Journal",
   "copyrightHolder": "Kitware, Inc.",

src/siteMetadata/vtkJournal.json

@@ -1,4 +1,5 @@
 {
+  "articlesCid": "bafybeialgmdqikskc56dhy2xrnio2te23xdzqdm77wtqxpxybr3ys5cpli",
   "targetJournal": 35,
   "title": "The VTK Journal",
   "copyrightHolder": "Kitware, Inc.",

src/templates/publication.js

@@ -1,3 +1,4 @@
+import axios from "axios";
 import React, { Suspense } from "react";
 import { graphql } from "gatsby";
 import { ThemeProvider, makeStyles } from '@mui/styles';
@@ -176,24 +177,19 @@ async function sourceCodeTreeRows(sourceCodeCid, treePath) {
   return treeRows
 }
 
-async function loadArticle(publication, revision, setArticleContent) {
+async function loadArticle(articlesCid, publication, revision, setArticleContent) {
   const articleCid = publication.revisions[revision].article
   if (!articleCid) {
     setArticleContent(<><Typography m={2}>Article not found.</Typography></>)
   } else {
-    const response = await fetch(`https://gateway.pinata.cloud/ipfs/${articleCid}`, { mode: 'cors', headers: { 'Content-Type': 'application/octet-stream' } })
-    const reader = response.body.getReader();
-
-    const chunks = []
-    while (true) {
-      const { value, done } = await reader.read();
-      if (done) break;
-      chunks.push(value)
-      const chunkNum = `${chunks.length}`
-      setArticleContent(<><LinearProgressWithLabel variant="indeterminate" color="secondary" label={`loading chunk ${chunkNum}`} /></>)
-    }
+    setArticleContent(<><LinearProgressWithLabel variant="indeterminate" color="secondary" label={`loading article`} /></>)
+    const pinataArticleUrl = `https://itk.mypinata.cloud/ipfs/${articlesCid}/ij-articles/${publication.publication_id}/${revision+1}/article.pdf`
+    const getPinata = axios.get(pinataArticleUrl, { responseType: 'arraybuffer' })
+    const dwebArticleUrl = `https://${articlesCid}.ipfs.dweb.link/ij-articles/${publication.publication_id}/${revision+1}/article.pdf`
+    const getDweb = axios.get(dwebArticleUrl, { responseType: 'arraybuffer' })
+    const response = await Promise.race([getPinata, getDweb])
     setArticleContent(<><LinearProgressWithLabel color="primary" variant="determinate" value={100} label={`loading complete`} /></>)
-    const pdf = uint8arrays.concat(chunks)
+    const pdf = new Uint8Array(response.data)
     const pdfBlob = new Blob([pdf.buffer])
     const pdfBase64 = Base64.fromUint8Array(pdf)
     const titleForFile = publication.title.split(' ').join('_')
@@ -420,7 +416,7 @@ const Render = ({ data, pageContext }) => {
       setFileContent(<></>)
       break
     case '2':
-      loadArticle(publication, revision, setArticleContent)
+      loadArticle(data.site.siteMetadata.articlesCid, publication, revision, setArticleContent)
       setFileContent(<></>)
       break
     case '3':
@@ -528,6 +524,7 @@ export const query = graphql`
     }
     site {
       siteMetadata {
+        articlesCid,
         targetJournal,
         title,
       }