chore: update IPFS HTTP client (#1268)

* chore: update IPFS HTTP client

* prettier

* remove

* chore(dependencies): updated changesets for modified dependencies

* fixxx?

* prettier

* use latest ipfs image

* trying

* prettier

* validate if exists

* refactor

* prettier

* we want the hash

* make it work

* prettier

* chore(dependencies): updated changesets for modified dependencies

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: saihaj

.changeset/@graphprotocol_graph-cli-1268-dependencies.md

@@ -0,0 +1,6 @@
+---
+"@graphprotocol/graph-cli": patch
+---
+dependencies updates:
+  - Updated dependency [`[email protected]` ↗︎](https://www.npmjs.com/package/ipfs-http-client/v/55.0.0) (from `34.0.0`, in `dependencies`)
+  - Updated dependency [`[email protected]` ↗︎](https://www.npmjs.com/package/jayson/v/4.0.0) (from `3.7.0`, in `dependencies`)

package.json

@@ -35,10 +35,5 @@
     "eslint": "^8.31.0",
     "jest": "26.6.3",
     "prettier": "^2.8.2"
-  },
-  "pnpm": {
-    "overrides": {
-      "[email protected]>concat-stream": "github:mihirgupta0900/concat-stream#master"
-    }
   }
 }

packages/cli/package.json

@@ -40,8 +40,8 @@
     "gluegun": "https://github.com/edgeandnode/gluegun#v4.3.1-pin-colors-dep",
     "graphql": "15.5.0",
     "immutable": "4.2.1",
-    "ipfs-http-client": "34.0.0",
-    "jayson": "3.7.0",
+    "ipfs-http-client": "55.0.0",
+    "jayson": "4.0.0",
     "js-yaml": "3.14.1",
     "prettier": "1.19.1",
     "request": "2.88.2",

packages/cli/src/command-helpers/compiler.ts

@@ -1,6 +1,6 @@
 import { URL } from 'url';
 import * as toolbox from 'gluegun';
-import ipfsHttpClient from 'ipfs-http-client';
+import { create } from 'ipfs-http-client';
 import Compiler from '../compiler';
 import Protocol from '../protocols';
 
@@ -27,26 +27,17 @@ export function createCompiler(
     protocol,
   }: CreateCompilerOptions,
 ) {
-  // Parse the IPFS URL
-  let url;
+  // Validate the IPFS URL (if a node address was provided)
   try {
-    url = ipfs ? new URL(ipfs) : undefined;
+    if (ipfs) new URL(ipfs);
   } catch (e) {
     toolbox.print.error(`Invalid IPFS URL: ${ipfs}
 The IPFS URL must be of the following format: http(s)://host[:port]/[path]`);
     return null;
   }
 
   // Connect to the IPFS node (if a node address was provided)
-  ipfs = ipfs
-    ? ipfsHttpClient({
-        protocol: url?.protocol.replace(/[:]+$/, ''),
-        host: url?.hostname,
-        port: url?.port,
-        'api-path': url?.pathname.replace(/\/$/, '') + '/api/v0/',
-        headers,
-      })
-    : undefined;
+  ipfs = ipfs ? create({ url: ipfs, headers }) : undefined;
 
   return new Compiler({
     ipfs,

packages/cli/src/command-helpers/ipfs-http-client.d.ts

@@ -12,6 +12,7 @@ import Protocol from '../protocols';
 import Subgraph from '../subgraph';
 import Watcher from '../watcher';
 import * as asc from './asc';
+import type { IPFSHTTPClient } from 'ipfs-http-client';
 
 const compilerDebug = debug('graph-cli:compiler');
 
@@ -26,7 +27,7 @@ interface CompilerOptions {
 }
 
 export default class Compiler {
-  private ipfs: any;
+  private ipfs: IPFSHTTPClient;
   private sourceDir: string;
   private blockIpfsMethods?: RegExpMatchArray;
   private libsDirs: string[];
@@ -678,9 +679,18 @@ export default class Compiler {
 
   async _uploadToIPFS(file: { path: string; content: Buffer }) {
     try {
-      const hash = (await this.ipfs.add([file]))[0].hash;
-      await this.ipfs.pin.add(hash);
-      return hash;
+      const files = this.ipfs.addAll([file]);
+
+      // We get back async iterable
+      const filesIterator = files[Symbol.asyncIterator]();
+      // We only care about the first item, since that is the file, rest could be directories
+      const { value } = await filesIterator.next();
+
+      // we grab the file and pin it
+      const uploadedFile = value as Awaited<ReturnType<typeof this.ipfs.add>>;
+      await this.ipfs.pin.add(uploadedFile.cid);
+
+      return uploadedFile.cid.toString();
     } catch (e) {
       throw Error(`Failed to upload file to IPFS: ${e.message}`);
     }