Merge da8207f into 9030fdd

add-on/manifest.json

@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "IPFS Companion",
     "short_name": "IPFS Companion",
-    "version" : "2.0.13",
+    "version" : "2.0.14",
 
     "description": "Browser extension that simplifies access to IPFS resources",
     "homepage_url": "https://github.com/ipfs/ipfs-companion",
@@ -29,6 +29,7 @@
         "storage",
         "contextMenus",
         "clipboardWrite",
+        "webNavigation",
         "webRequest",
         "webRequestBlocking"
     ],

add-on/src/lib/common.js

@@ -50,7 +50,9 @@ function registerListeners () {
   browser.webRequest.onBeforeSendHeaders.addListener(onBeforeSendHeaders, {urls: ['<all_urls>']}, ['blocking', 'requestHeaders'])
   browser.webRequest.onBeforeRequest.addListener(onBeforeRequest, {urls: ['<all_urls>']}, ['blocking'])
   browser.storage.onChanged.addListener(onStorageChange)
+  browser.webNavigation.onCommitted.addListener(onNavigationCommitted)
   browser.tabs.onUpdated.addListener(onUpdatedTab)
+  browser.tabs.onActivated.addListener(onActivatedTab)
   browser.runtime.onMessage.addListener(onRuntimeMessage)
   browser.runtime.onConnect.addListener(onRuntimeConnect)
 }
@@ -386,13 +388,30 @@ function notify (titleKey, messageKey, messageParam) {
 // contextMenus
 // -------------------------------------------------------------------
 const contextMenuUploadToIpfs = 'contextMenu_UploadToIpfs'
+const contextMenuCopyIpfsAddress = 'panelCopy_currentIpfsAddress'
+const contextMenuCopyPublicGwUrl = 'panel_copyCurrentPublicGwUrl'
 
 browser.contextMenus.create({
   id: contextMenuUploadToIpfs,
   title: browser.i18n.getMessage(contextMenuUploadToIpfs),
   contexts: ['image', 'video', 'audio'],
+  enabled: false,
   onclick: addFromURL
 })
+browser.contextMenus.create({
+  id: contextMenuCopyIpfsAddress,
+  title: browser.i18n.getMessage(contextMenuCopyIpfsAddress),
+  contexts: ['page', 'image', 'video', 'audio', 'link'],
+  documentUrlPatterns: ['*://*/ipfs/*', '*://*/ipns/*'],
+  onclick: copyCanonicalAddress
+})
+browser.contextMenus.create({
+  id: contextMenuCopyPublicGwUrl,
+  title: browser.i18n.getMessage(contextMenuCopyPublicGwUrl),
+  contexts: ['page', 'image', 'video', 'audio', 'link'],
+  documentUrlPatterns: ['*://*/ipfs/*', '*://*/ipns/*'],
+  onclick: copyAddressAtPublicGw
+})
 
 function inFirefox () {
   return !!navigator.userAgent.match('Firefox')
@@ -448,11 +467,85 @@ function uploadResultHandler (err, result) {
   })
 }
 
-function updateContextMenus () {
-  browser.contextMenus.update(contextMenuUploadToIpfs, {enabled: state.peerCount > 0})
+async function findUrlForContext (context) {
+  if (context) {
+    console.log(context)
+    if (context.linkUrl) {
+      // present when clicked on a link
+      return context.linkUrl
+    }
+    if (context.srcUrl) {
+      // present when clicked on page element such as image or video
+      return context.srcUrl
+    }
+    if (context.pageUrl) {
+      // pageUrl is the root frame
+      return context.pageUrl
+    }
+  }
+  // falback to the url of current tab
+  const currentTab = await browser.tabs.query({active: true, currentWindow: true}).then(tabs => tabs[0])
+  return currentTab.url
+}
+
+async function copyCanonicalAddress (context) {
+  const url = await findUrlForContext(context)
+  const rawIpfsAddress = url.replace(/^.+(\/ip(f|n)s\/.+)/, '$1')
+  copyTextToClipboard(rawIpfsAddress)
+  notify('notify_copiedCanonicalAddressTitle', rawIpfsAddress)
+}
+
+async function copyAddressAtPublicGw (context) {
+  const url = await findUrlForContext(context)
+  const urlAtPubGw = url.replace(state.gwURLString, state.pubGwURLString)
+  copyTextToClipboard(urlAtPubGw)
+  notify('notify_copiedPublicURLTitle', urlAtPubGw)
+}
+
+async function copyTextToClipboard (copyText) {
+  const currentTab = await browser.tabs.query({active: true, currentWindow: true}).then(tabs => tabs[0])
+  const tabId = currentTab.id
+  // Lets take a moment and ponder on the state of copying a string in 2017:
+  const copyToClipboardIn2017 = `function copyToClipboardIn2017(text) {
+      function oncopy(event) {
+          document.removeEventListener('copy', oncopy, true);
+          event.stopImmediatePropagation();
+          event.preventDefault();
+          event.clipboardData.setData('text/plain', text);
+      }
+      document.addEventListener('copy', oncopy, true);
+      document.execCommand('copy');
+    }`
+
+  // In Firefox you can't select text or focus an input field in background pages,
+  // so you can't write to the clipboard from a background page.
+  // We work around this limitation by injecting content scropt into a tab and copying there.
+  // Yes, this is 2017.
+  try {
+    const copyHelperPresent = (await browser.tabs.executeScript(tabId, { runAt: 'document_start', code: "typeof copyToClipboardIn2017 === 'function';" }))[0]
+    if (!copyHelperPresent) {
+      await browser.tabs.executeScript(tabId, { runAt: 'document_start', code: copyToClipboardIn2017 })
+    }
+    await browser.tabs.executeScript(tabId, { runAt: 'document_start', code: 'copyToClipboardIn2017(' + JSON.stringify(copyText) + ');' })
+  } catch (error) {
+    console.error('Failed to copy text: ' + error)
+  }
+}
+
+async function updateContextMenus (changedTabId) {
+  await browser.contextMenus.update(contextMenuUploadToIpfs, {enabled: state.peerCount > 0})
+  if (changedTabId) {
+    // recalculate tab-dependant menu items
+    const currentTab = await browser.tabs.query({active: true, currentWindow: true}).then(tabs => tabs[0])
+    if (currentTab.id === changedTabId) {
+      const ipfsContext = isIpfsPageActionsContext(currentTab.url)
+      browser.contextMenus.update(contextMenuCopyIpfsAddress, {enabled: ipfsContext})
+      browser.contextMenus.update(contextMenuCopyPublicGwUrl, {enabled: ipfsContext})
+    }
+  }
 }
 
-// Page Actions
+// Page-specific Actions
 // -------------------------------------------------------------------
 
 // used in browser-action popup
@@ -461,17 +554,28 @@ function isIpfsPageActionsContext (url) {
   return window.IsIpfs.url(url) && !url.startsWith(state.apiURLString)
 }
 
+async function onActivatedTab (activeInfo) {
+  await updateContextMenus(activeInfo.tabId)
+}
+
+async function onNavigationCommitted (details) {
+  await updateContextMenus(details.tabId)
+}
+
 async function onUpdatedTab (tabId, changeInfo, tab) {
-  if (changeInfo.status === 'complete' && tab.url && tab.url.startsWith('http')) {
+  if (changeInfo.status && changeInfo.status === 'complete' && tab.url && tab.url.startsWith('http')) {
     if (state.linkify) {
       console.log(`[ipfs-companion] Running linkfyDOM for ${tab.url}`)
       try {
-        await browser.tabs.executeScript(tabId, {
-          file: '/src/lib/npm/browser-polyfill.min.js',
-          matchAboutBlank: false,
-          allFrames: true,
-          runAt: 'document_start'
-        })
+        const browserApiPresent = (await browser.tabs.executeScript(tabId, { runAt: 'document_start', code: "typeof browser !== 'undefined'" }))[0]
+        if (!browserApiPresent) {
+          await browser.tabs.executeScript(tabId, {
+            file: '/src/lib/npm/browser-polyfill.min.js',
+            matchAboutBlank: false,
+            allFrames: true,
+            runAt: 'document_start'
+          })
+        }
         await browser.tabs.executeScript(tabId, {
           file: '/src/lib/linkifyDOM.js',
           matchAboutBlank: false,

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

@@ -60,30 +60,17 @@ function notify (title, message) {
 // ===================================================================
 
 async function copyCurrentPublicGwAddress () {
-  const publicGwAddress = new URL(state.currentTab.url.replace(state.gwURLString, state.pubGwURLString)).toString()
-  copyTextToClipboard(publicGwAddress)
-  notify('notify_copiedPublicURLTitle', publicGwAddress)
+  const bg = await getBackgroundPage()
+  await bg.copyAddressAtPublicGw()
   window.close()
 }
 
 async function copyCurrentCanonicalAddress () {
-  const rawIpfsAddress = state.currentTab.url.replace(/^.+(\/ip(f|n)s\/.+)/, '$1')
-  copyTextToClipboard(rawIpfsAddress)
-  notify('notify_copiedCanonicalAddressTitle', rawIpfsAddress)
+  const bg = await getBackgroundPage()
+  await bg.copyCanonicalAddress()
   window.close()
 }
 
-function copyTextToClipboard (copyText) {
-  // lets take a moment and ponder on the state of copying a string in 2017
-  const copyFrom = document.createElement('textarea')
-  copyFrom.textContent = copyText
-  const body = document.getElementsByTagName('body')[0]
-  body.appendChild(copyFrom) // oh god why
-  copyFrom.select()
-  document.execCommand('copy') // srsly
-  body.removeChild(copyFrom)
-}
-
 async function pinCurrentResource () {
   deactivatePinButton()
   try {