ENS registration almost working

Author: dOrgJelli

Diff for: packages/cli/package.json

@@ -14,6 +14,7 @@
     "@graphprotocol/graph-ts": "0.18.1",
     "@textile/hub": "^0.3.3",
     "@web3api/client-test-env": "0.0.1-alpha.1",
+    "axios": "0.19.2",
     "assemblyscript": "0.14.7",
     "chalk": "^4.1.0",
     "fs-extra": "9.0.1",

Diff for: packages/cli/src/commands/build.ts

@@ -1,7 +1,10 @@
 import { Compiler } from "../lib/Compiler";
+import { Publisher } from "../lib/Publisher";
 import { fixParameters } from "../lib/helpers/parameters";
+
 import { GluegunToolbox } from "gluegun";
 import chalk from "chalk";
+import axios from "axios";
 
 const HELP = `
 ${chalk.bold('w3 build')} [options] ${chalk.bold('[<web3api-manifest>]')}
@@ -10,8 +13,9 @@ Options:
   -h, --help                    Show usage information
   -i, --ipfs <node>             Upload build results to an IPFS node
   -o, --output-dir <path>       Output directory for build results (default: build/)
-  -t, --output-format <format>  Output format for WASM modules (wasm, wast) (default: wasm)
+  -f, --output-format <format>  Output format for WASM modules (wasm, wast) (default: wasm)
   -w, --watch                   Regenerate types when web3api files change (default: false)
+  -e, --test-ens <domain>       Publish the package to a test ENS domain locally
 `
 
 export default {
@@ -24,15 +28,17 @@ export default {
       i, ipfs,
       h, help,
       o, outputDir,
-      t, outputFormat,
-      w, watch
+      f, outputFormat,
+      w, watch,
+      e, testEns
     } = parameters.options;
 
     ipfs = ipfs || i;
     help = help || h;
     outputDir = outputDir || o;
-    outputFormat = outputFormat || t;
+    outputFormat = outputFormat || f;
     watch = watch || w;
+    testEns = testEns || e;
 
     let manifestPath;
     try {
@@ -83,7 +89,6 @@ export default {
 
     const compiler = new Compiler({
       manifestPath,
-      ipfs: ipfs ? ipfs : undefined,
       outputDir,
       outputFormat
     });
@@ -95,7 +100,37 @@ export default {
       const result = await compiler.compile();
       if (result === false) {
         process.exitCode = 1;
+        return;
       }
+
+      // publish to IPFS
+      if (ipfs !== undefined) {
+        const publisher = new Publisher({
+          buildPath: outputDir,
+          ipfs
+        });
+
+        const cid = await publisher.publishToIPFS();
+        console.log(`IPFS { ${cid} }`);
+
+        if (testEns) {
+          // ask the dev server to publish the CID to ENS
+          const { data } = await axios.get(
+            "http://localhost:4040/register-ens",
+            {
+              params: {
+                domain: testEns,
+                cid
+              }
+            }
+          );
+
+          console.log("HERERERERE")
+          console.log(data.success)
+        }
+      }
+
+      process.exitCode = 0;
     }
   }
 }

Diff for: packages/cli/src/lib/Compiler.ts

@@ -11,7 +11,6 @@ import * as asc from "assemblyscript/cli/asc";
 const fsExtra = require("fs-extra");
 const spawn = require("spawn-command");
 const toolbox = require("gluegun/toolbox");
-const IPFSClient = require("ipfs-http-client");
 
 // We cannot `require.resolve('@graphprotocol/graph-cli')`, because it's not a require-able package
 const graphCli = path.resolve(
@@ -20,29 +19,14 @@ const graphCli = path.resolve(
 
 export interface ICompilerConfig {
   manifestPath: string;
-  ipfs?: string;
   outputDir: string;
   outputFormat: string;
 }
 
 export class Compiler {
-  // @ts-ignore
-  private _ipfs: IPFSClient | undefined;
-
   private _manifestDir: string;
 
   constructor(private _config: ICompilerConfig) {
-    if (_config.ipfs) {
-      let url;
-      try {
-        url = new URL(_config.ipfs);
-      } catch (e) {
-        throw Error(`IPFS URL Malformed: ${_config.ipfs}\n${e}`)
-      }
-
-      this._ipfs = new IPFSClient(_config.ipfs);
-    }
-
     this._manifestDir = path.dirname(_config.manifestPath);
   }
 
@@ -105,9 +89,15 @@ export class Compiler {
       const { mutation, query, subgraph } = manifest;
       const { outputDir, manifestPath } = this._config;
 
+      const appendPath = (root: string, subPath: string) => {
+        return path.join(path.dirname(root), subPath)
+      }
+
       let schema = "";
       const loadSchema = (schemaPath: string) => {
-        schema += `${fs.readFileSync(schemaPath, "utf-8")}\n`;
+        schema += `${fs.readFileSync(
+          appendPath(manifestPath, schemaPath), "utf-8"
+        )}\n`;
       }
 
       if (mutation) {
@@ -135,16 +125,14 @@ export class Compiler {
       }
 
       if (subgraph) {
-        const subgraphFile = path.join(
-          path.dirname(manifestPath), subgraph.file
-        );
+        const subgraphFile = appendPath(manifestPath, subgraph.file);
         const str: any = fs.readFileSync(
           subgraphFile, "utf-8"
         );
         const subgraphManifest: any = YAML.safeLoad(str);
-        loadSchema(path.join(
-          path.dirname(subgraphFile), subgraphManifest.schema.file
-        ));
+        loadSchema(
+          appendPath(subgraphFile, subgraphManifest.schema.file)
+        );
         const id = await this._compileSubgraph(
           subgraph.file,
           `${outputDir}/subgraph`,

Diff for: packages/cli/src/lib/Publisher.ts

@@ -0,0 +1,47 @@
+import fs from "fs";
+
+const IPFSClient = require("ipfs-http-client");
+const { globSource } = IPFSClient;
+
+export interface IPublisherConfig {
+  buildPath: string;
+  ipfs: string;
+}
+
+export class Publisher {
+  // @ts-ignore
+  private _ipfs: IPFSClient;
+
+  constructor(private _config: IPublisherConfig) {
+    let url;
+    try {
+      url = new URL(_config.ipfs);
+    } catch (e) {
+      throw Error(`IPFS URL Malformed: ${_config.ipfs}\n${e}`)
+    }
+
+    this._ipfs = new IPFSClient(_config.ipfs);
+  }
+
+  public async publishToIPFS(): Promise<string> {
+    const globOptions = {
+      recursive: true
+    };
+
+    const addOptions = {
+      wrapWithDirectory: false
+    };
+
+    let rootCID = '';
+
+    for await (const file of this._ipfs.addAll(globSource(
+      this._config.buildPath, globOptions
+    ), addOptions)) {
+      if (file.path.indexOf('/') === -1) {
+        rootCID = file.cid.toString();
+      }
+    }
+
+    return rootCID;
+  }
+}