Merge pull request 'Prevent bootstrap node connects on the same IPFS node' (#12) from feature/prevent_self_dials into master
Reviewed-on: #12
This commit is contained in:
		
						commit
						1401adbf0c
					
				
							
								
								
									
										13
									
								
								index.js
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								index.js
									
									
									
									
									
								
							@ -50,15 +50,22 @@ debug(`IPFS node:`, ipfsConfig);
 | 
			
		||||
 | 
			
		||||
  // TODO redesign IPFS wrapper API and do not use an internal attribute
 | 
			
		||||
  const ipfsApi = kredits.ipfs._ipfsAPI;
 | 
			
		||||
  let connectBootstrapNode = true;
 | 
			
		||||
 | 
			
		||||
  await ipfsApi.id().catch(e => {
 | 
			
		||||
  await ipfsApi.id().then(res => {
 | 
			
		||||
    if (res.id === argv.bootstrapNode.split('/')[argv.bootstrapNode.split('/').length-1]) {
 | 
			
		||||
      connectBootstrapNode = false;
 | 
			
		||||
    }
 | 
			
		||||
  }).catch(e => {
 | 
			
		||||
    console.log('Failed to initialize IPFS:');
 | 
			
		||||
    console.log(e.message);
 | 
			
		||||
    process.exit(1);
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  debug(`Connecting to known IPFS node ${argv.bootstrapNode}`);
 | 
			
		||||
  await ipfsApi.swarm.connect(argv.bootstrapNode);
 | 
			
		||||
  if (connectBootstrapNode) {
 | 
			
		||||
    debug(`Connecting to known IPFS node ${argv.bootstrapNode}`);
 | 
			
		||||
    await ipfsApi.swarm.connect(argv.bootstrapNode);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  const ipfsPinner = new IpfsPinner(kredits, {
 | 
			
		||||
    progress: argv.progress
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user