refactor: wire up hints for copy actions

This wires up hints to show copied value + adds 30s cache for async
lookup function used by this as a small optimization.

Author: lidel

add-on/src/lib/ipfs-companion.js

@@ -242,6 +242,7 @@ module.exports = async function init () {
   async function sendStatusUpdateToBrowserAction () {
     if (!browserActionPort) return
     const dropSlash = url => url.replace(/\/$/, '')
+    const currentTab = await browser.tabs.query({ active: true, currentWindow: true }).then(tabs => tabs[0])
     const info = {
       active: state.active,
       ipfsNodeType: state.ipfsNodeType,
@@ -254,7 +255,7 @@ module.exports = async function init () {
       apiURLString: dropSlash(state.apiURLString),
       redirect: state.redirect,
       noIntegrationsHostnames: state.noIntegrationsHostnames,
-      currentTab: await browser.tabs.query({ active: true, currentWindow: true }).then(tabs => tabs[0])
+      currentTab
     }
     try {
       const v = await ipfs.version()
@@ -267,6 +268,11 @@ module.exports = async function init () {
     if (state.active && info.currentTab) {
       const url = info.currentTab.url
       info.isIpfsContext = ipfsPathValidator.isIpfsPageActionsContext(url)
+      if (info.isIpfsContext) {
+        info.currentTabPublicUrl = ipfsPathValidator.resolveToPublicUrl(url)
+        info.currentTabContentPath = ipfsPathValidator.resolveToIpfsPath(url)
+        info.currentTabCid = await ipfsPathValidator.resolveToCid(url)
+      }
       info.currentDnslinkFqdn = dnslinkResolver.findDNSLinkHostname(url)
       info.currentFqdn = info.currentDnslinkFqdn || new URL(url).hostname
       info.currentTabIntegrationsOptOut = info.noIntegrationsHostnames && info.noIntegrationsHostnames.includes(info.currentFqdn)

add-on/src/lib/ipfs-path.js

@@ -1,9 +1,13 @@
 'use strict'
 /* eslint-env browser */
 
+const pMemoize = require('p-memoize')
 const isIPFS = require('is-ipfs')
 const isFQDN = require('is-fqdn')
 
+// For how long more expensive lookups (DAG traversal etc) should be cached
+const RESULT_TTL_MS = 30 * 1000
+
 // Turns URL or URIencoded path into a content path
 function ipfsContentPath (urlOrPath, opts) {
   opts = opts || {}
@@ -279,7 +283,7 @@ function createIpfsPathValidator (getState, getIpfs, dnslinkResolver) {
     // - Returns null if no valid path can be produced
     // The purpose of this resolver is to return immutable /ipfs/ address
     // even if /ipns/ is present in its input.
-    async resolveToImmutableIpfsPath (urlOrPath) {
+    resolveToImmutableIpfsPath: pMemoize(async function (urlOrPath) {
       const path = ipfsPathValidator.resolveToIpfsPath(urlOrPath)
       // Fail fast if no IPFS Path
       if (!path) return null
@@ -322,14 +326,14 @@ function createIpfsPathValidator (getState, getIpfs, dnslinkResolver) {
       }
       // Return /ipfs/ path
       return path
-    },
+    }, { maxAge: RESULT_TTL_MS }),
 
     // Resolve URL or path to a raw CID:
     // - Result is the direct CID
     // - Ignores ?search and #hash from original URL
     // - Returns null if no CID can be produced
     // The purpose of this resolver is to return direct CID without anything else.
-    async resolveToCid (urlOrPath) {
+    resolveToCid: pMemoize(async function (urlOrPath) {
       const path = ipfsPathValidator.resolveToIpfsPath(urlOrPath)
       // Fail fast if no IPFS Path
       if (!path) return null
@@ -366,7 +370,7 @@ function createIpfsPathValidator (getState, getIpfs, dnslinkResolver) {
 
       const directCid = isIPFS.ipfsPath(result) ? result.split('/')[2] : result
       return directCid
-    }
+    }, { maxAge: RESULT_TTL_MS })
   }
 
   return ipfsPathValidator

add-on/src/popup/browser-action/context-actions.js

@@ -24,6 +24,9 @@ function contextActions ({
   currentFqdn,
   currentDnslinkFqdn,
   currentTabIntegrationsOptOut,
+  currentTabContentPath,
+  currentTabCid,
+  currentTabPublicUrl,
   ipfsNodeType,
   isIpfsContext,
   isPinning,
@@ -54,17 +57,17 @@ function contextActions ({
   }) : null}
   ${navItem({
     text: browser.i18n.getMessage(contextMenuCopyAddressAtPublicGw),
-    helperText: 'PublicGw',
+    helperText: currentTabPublicUrl,
     onClick: () => onCopy(contextMenuCopyAddressAtPublicGw)
   })}
   ${navItem({
     text: browser.i18n.getMessage(contextMenuCopyCanonicalAddress),
-    helperText: 'ipfsPath',
+    helperText: currentTabContentPath,
     onClick: () => onCopy(contextMenuCopyCanonicalAddress)
   })}
   ${navItem({
     text: browser.i18n.getMessage(contextMenuCopyRawCid),
-    helperText: 'cid',
+    helperText: currentTabCid,
     disabled: !activeCidResolver,
     onClick: () => onCopy(contextMenuCopyRawCid)
   })}

package.json

@@ -149,7 +149,7 @@
     "mime-types": "2.1.25",
     "multiaddr": "7.2.1",
     "multiaddr-to-uri": "5.0.0",
-    "p-memoize": "3.1.0",
+    "p-memoize": "4.0.0",
     "p-queue": "6.2.1",
     "path-browserify": "1.0.0",
     "piggybacker": "2.0.0",

yarn.lock

@@ -10013,7 +10013,7 @@ mem@^1.1.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-mem@^4.0.0, mem@^4.3.0:
+mem@^4.0.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
   integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
@@ -10031,6 +10031,14 @@ mem@^5.0.0:
     mimic-fn "^2.1.0"
     p-is-promise "^2.1.0"
 
+mem@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-6.1.0.tgz#846eca0bd4708a8f04b9c3f3cd769e194ae63c5c"
+  integrity sha512-RlbnLQgRHk5lwqTtpEkBTQ2ll/CG/iB+J4Hy2Wh97PjgZgXgWJWrFF+XXujh3UUVLvR4OOTgZzcWMMwnehlEUg==
+  dependencies:
+    map-age-cleaner "^0.1.3"
+    mimic-fn "^3.0.0"
+
 memdown@^1.0.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/memdown/-/memdown-1.4.1.tgz#b4e4e192174664ffbae41361aa500f3119efe215"
@@ -10245,6 +10253,11 @@ mimic-fn@^2.0.0, mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
+mimic-fn@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.0.0.tgz#76044cfa8818bbf6999c5c9acadf2d3649b14b4b"
+  integrity sha512-PiVO95TKvhiwgSwg1IdLYlCTdul38yZxZMIcnDSFIBUm4BNZha2qpQ4GpJ++15bHoKDtrW2D69lMfFwdFYtNZQ==
+
 mimic-response@^1.0.0, mimic-response@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
@@ -11662,13 +11675,13 @@ p-map@^3.0.0:
   dependencies:
     aggregate-error "^3.0.0"
 
-p-memoize@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-memoize/-/p-memoize-3.1.0.tgz#ac7587983c9e530139f969ca7b41ef40e93659aa"
-  integrity sha512-e5tIvrsr7ydUUnxb534iQWtXxWgk/86IsH+H+nV4FHouIggBt4coXboKBt26o4lTu7JbEnGSeXdEsYR8BhAHFA==
+p-memoize@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-memoize/-/p-memoize-4.0.0.tgz#1f955b6c38aaa4b74d243e354eae51a7ecb48e94"
+  integrity sha512-oMxCJKVS75Bf2RWtXJNQNaX2K1G0FYpllOh2iTsPXZqnf9dWMcis3BL+pRdLeQY8lIdwwL01k/UV5LBdcVhZzg==
   dependencies:
-    mem "^4.3.0"
-    mimic-fn "^2.1.0"
+    mem "^6.0.1"
+    mimic-fn "^3.0.0"
 
 [email protected]:
   version "6.2.1"