From b7719f6d59fd04bc5cb24229e6c827e7be00d592 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Mon, 30 Aug 2021 11:04:46 +0200 Subject: [PATCH] increase timeouts --- apps/remix-ide/src/app/files/dgitProvider.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/remix-ide/src/app/files/dgitProvider.js b/apps/remix-ide/src/app/files/dgitProvider.js index 57d1b930f1..82e92b9925 100644 --- a/apps/remix-ide/src/app/files/dgitProvider.js +++ b/apps/remix-ide/src/app/files/dgitProvider.js @@ -34,7 +34,7 @@ class DGitProvider extends Plugin { ipfsurl: 'https://ipfs.remixproject.org/ipfs/' } this.globalIPFSConfig = { - host: 'ipfs.io', + host: 'ipfs2.io', port: 443, protocol: 'https', ipfsurl: 'https://ipfs.io/ipfs/' @@ -417,9 +417,12 @@ class DGitProvider extends Plugin { const ipfs = IpfsHttpClient(config) let result = false try { + console.log('try ', config) const data = ipfs.get(cid, { timeout: 60000 }) + console.log(config, cid, workspace, data) for await (const file of data) { if (file.path) result = true + console.log(file.path) file.path = file.path.replace(cid, '') if (!file.content) { continue @@ -431,12 +434,13 @@ class DGitProvider extends Plugin { const dir = path.dirname(file.path) try { this.createDirectories(`${workspace.absolutePath}/${dir}`) - } catch (e) { } + } catch (e) { console.log(e) } try { window.remixFileSystem.writeFileSync(`${workspace.absolutePath}/${file.path}`, Buffer.concat(content) || new Uint8Array()) - } catch (e) { } + } catch (e) { console.log(e) } } } catch (e) { + console.log(e) } return result } @@ -462,7 +466,7 @@ class DGitProvider extends Plugin { const cid = cmd.cid await this.call('filePanel', 'createWorkspace', `workspace_${Date.now()}`, false) const workspace = await this.call('filePanel', 'getCurrentWorkspace') - const result = await this.importIPFSFiles(this.remixIPFS, cid, workspace) || await this.importIPFSFiles(this.ipfsconfig, cid, workspace) || await this.importIPFSFiles(this.globalIPFSConfig, cid, workspace) + const result = await this.importIPFSFiles(this.globalIPFSConfig, cid, workspace) || await this.importIPFSFiles(this.ipfsconfig, cid, workspace) || await this.importIPFSFiles(this.remixIPFS, cid, workspace) await this.call('fileManager', 'refresh') if (!result) throw new Error(`Cannot pull files from IPFS at ${cid}`) }