@@ -12,9 +12,10 @@ const { optionDefaults, storeMissingOptions, migrateOptions } = require('./optio
1212const { initState, offlinePeerCount } = require ( './state' )
1313const { createIpfsPathValidator } = require ( './ipfs-path' )
1414const createDnslinkResolver = require ( './dnslink' )
15- const { createRequestModifier, redirectOptOutHint } = require ( './ipfs-request' )
15+ const { createRequestModifier } = require ( './ipfs-request' )
1616const { initIpfsClient, destroyIpfsClient } = require ( './ipfs-client' )
1717const { createIpfsUrlProtocolHandler } = require ( './ipfs-protocol' )
18+ const createIpfsImportHandler = require ( './ipfs-import' )
1819const createNotifier = require ( './notifier' )
1920const createCopier = require ( './copier' )
2021const { createRuntimeChecks } = require ( './runtime-checks' )
@@ -38,6 +39,7 @@ module.exports = async function init () {
3839 var apiStatusUpdateInterval
3940 var ipfsProxy
4041 var ipfsProxyContentScript
42+ var ipfsImportHandler
4143 const idleInSecs = 5 * 60
4244 const browserActionPortName = 'browser-action-port'
4345
@@ -65,6 +67,7 @@ module.exports = async function init () {
6567
6668 dnslinkResolver = createDnslinkResolver ( getState )
6769 ipfsPathValidator = createIpfsPathValidator ( getState , getIpfs , dnslinkResolver )
70+ ipfsImportHandler = createIpfsImportHandler ( getState , getIpfs , ipfsPathValidator , runtime )
6871 copier = createCopier ( notify , ipfsPathValidator )
6972 contextMenus = createContextMenus ( getState , runtime , ipfsPathValidator , {
7073 onAddFromContext,
@@ -230,6 +233,8 @@ module.exports = async function init () {
230233 gwURLString : dropSlash ( state . gwURLString ) ,
231234 pubGwURLString : dropSlash ( state . pubGwURLString ) ,
232235 webuiRootUrl : state . webuiRootUrl ,
236+ importDir : state . importDir ,
237+ openViaWebUI : state . openViaWebUI ,
233238 apiURLString : dropSlash ( state . apiURLString ) ,
234239 redirect : state . redirect ,
235240 noRedirectHostnames : state . noRedirectHostnames ,
@@ -257,40 +262,16 @@ module.exports = async function init () {
257262 }
258263 }
259264
260- // GUI
261- // ===================================================================
262-
263- function preloadAtPublicGateway ( path ) {
264- if ( ! state . preloadAtPublicGateway ) return
265- // asynchronous HTTP HEAD request preloads triggers content without downloading it
266- return new Promise ( ( resolve , reject ) => {
267- const http = new XMLHttpRequest ( )
268- // Make sure preload request is excluded from global redirect
269- const preloadUrl = ipfsPathValidator . resolveToPublicUrl ( `${ path } ${ redirectOptOutHint } , state . pubGwURLString )
270- http . open ( 'HEAD' , preloadUrl )
271- http . onreadystatechange = function ( ) {
272- if ( this . readyState === this . DONE ) {
273- console . info ( `[ipfs-companion] preloadAtPublicGateway(${ path } , this . statusText )
274- if ( this . status === 200 ) {
275- resolve ( this . statusText )
276- } else {
277- reject ( new Error ( this . statusText ) )
278- }
279- }
280- }
281- http . send ( )
282- } )
283- }
284-
285265 // Context Menu Uploader
286266 // -------------------------------------------------------------------
287267
288268 async function onAddFromContext ( context , contextType , options ) {
269+ const importDir = ipfsImportHandler . formatImportDirectory ( state . importDir )
289270 let result
290271 try {
291272 const dataSrc = await findValueForContext ( context , contextType )
292273 if ( contextType === 'selection' ) {
293- result = await ipfs . add ( Buffer . from ( dataSrc ) , options )
274+ result = await ipfsImportHandler . importFiles ( Buffer . from ( dataSrc ) , options , importDir )
294275 } else {
295276 // Enchanced addFromURL
296277 // --------------------
@@ -319,7 +300,7 @@ module.exports = async function init () {
319300 path : decodeURIComponent ( filename ) ,
320301 content : buffer
321302 }
322- result = await ipfs . add ( data , options )
303+ result = await ipfsImportHandler . importFiles ( data , options , importDir )
323304 }
324305 } catch ( error ) {
325306 console . error ( 'Error in upload to IPFS context menu' , error )
@@ -334,37 +315,12 @@ module.exports = async function init () {
334315 }
335316 return
336317 }
337-
338- return uploadResultHandler ( { result, openRootInNewTab : true } )
339- }
340-
341- // TODO: feature detect and push to client type specific modules.
342- function getIpfsPathAndNativeAddress ( hash ) {
343- const path = `/ipfs/${ hash }
344- if ( runtime . hasNativeProtocolHandler ) {
345- return { path, url : `ipfs://${ hash } }
318+ ipfsImportHandler . preloadFilesAtPublicGateway ( result )
319+ if ( state . ipfsNodeType === 'embedded' || ! state . openViaWebUI ) {
320+ return ipfsImportHandler . openFilesAtGateway ( { result, openRootInNewTab : true } )
346321 } else {
347- // open at public GW (will be redirected to local elsewhere, if enabled)
348- const url = new URL ( path , state . pubGwURLString ) . toString ( )
349- return { path, url : url }
350- }
351- }
352-
353- async function uploadResultHandler ( { result, openRootInNewTab = false } ) {
354- for ( const file of result ) {
355- if ( file && file . hash ) {
356- const { path, url } = getIpfsPathAndNativeAddress ( file . hash )
357- preloadAtPublicGateway ( path )
358- console . info ( '[ipfs-companion] successfully stored' , file )
359- // open the wrapping directory (or the CID if wrapping was disabled)
360- if ( openRootInNewTab && ( result . length === 1 || file . path === '' || file . path === file . hash ) ) {
361- await browser . tabs . create ( {
362- url : url
363- } )
364- }
365- }
322+ return ipfsImportHandler . openFilesAtWebUI ( importDir )
366323 }
367- return result
368324 }
369325
370326 // Page-specific Actions
@@ -709,12 +665,16 @@ module.exports = async function init () {
709665 shouldReloadExtension = true
710666 state [ key ] = localStorage . debug = change . newValue
711667 break
668+ case 'importDir' :
669+ state [ key ] = change . newValue
670+ break
712671 case 'linkify' :
713672 case 'catchUnhandledProtocols' :
714673 case 'displayNotifications' :
715674 case 'automaticMode' :
716675 case 'detectIpfsPathHeader' :
717676 case 'preloadAtPublicGateway' :
677+ case 'openViaWebUI' :
718678 case 'noRedirectHostnames' :
719679 state [ key ] = change . newValue
720680 break
@@ -783,8 +743,8 @@ module.exports = async function init () {
783743 return notify
784744 } ,
785745
786- get uploadResultHandler ( ) {
787- return uploadResultHandler
746+ get ipfsImportHandler ( ) {
747+ return ipfsImportHandler
788748 } ,
789749
790750 destroy ( ) {
@@ -796,6 +756,7 @@ module.exports = async function init () {
796756 dnslinkResolver = null
797757 modifyRequest = null
798758 ipfsPathValidator = null
759+ ipfsImportHandler = null
799760 notify = null
800761 copier = null
801762 contextMenus = null
0 commit comments