Update gRPC library in dgraph-js to use gRPC-js

examples/simple/index.js

@@ -1,5 +1,4 @@
 const dgraph = require("dgraph-js");
-const grpc = require("grpc");
 
 // Create a client stub.
 function newClientStub() {
@@ -64,13 +63,13 @@ async function createData(dgraphClient) {
                 {
                     name: "Charlie",
                     age: 29,
-                }
+                },
             ],
             school: [
                 {
                     name: "Crown Public School",
-                }
-            ]
+                },
+            ],
         };
 
         // Run mutation.
@@ -84,10 +83,16 @@ async function createData(dgraphClient) {
         // Get uid of the outermost object (person named "Alice").
         // Response#getUidsMap() returns a map from blank node names to uids.
         // For a json mutation, blank node label is used for the name of the created nodes.
-        console.log(`Created person named "Alice" with uid = ${response.getUidsMap().get("alice")}\n`);
+        console.log(
+            `Created person named "Alice" with uid = ${response
+                .getUidsMap()
+                .get("alice")}\n`,
+        );
 
         console.log("All created nodes (map from blank node names to uids):");
-        response.getUidsMap().forEach((uid, key) => console.log(`${key} => ${uid}`));
+        response
+            .getUidsMap()
+            .forEach((uid, key) => console.log(`${key} => ${uid}`));
         console.log();
     } finally {
         // Clean up. Calling this after txn.commit() is a no-op
@@ -117,7 +122,9 @@ async function queryData(dgraphClient) {
         }
     }`;
     const vars = { $a: "Alice" };
-    const res = await dgraphClient.newTxn({ readOnly: true }).queryWithVars(query, vars);
+    const res = await dgraphClient
+        .newTxn({ readOnly: true })
+        .queryWithVars(query, vars);
     const ppl = res.getJson();
 
     // Print results.
@@ -141,8 +148,10 @@ async function main() {
     dgraphClientStub.close();
 }
 
-main().then(() => {
-    console.log("\nDONE!");
-}).catch((e) => {
-    console.log("ERROR: ", e);
-});
+main()
+    .then(() => {
+        console.log("\nDONE!");
+    })
+    .catch((e) => {
+        console.log("ERROR: ", e);
+    });

examples/tls/index.js

@@ -2,20 +2,25 @@ const fs = require('fs');
 const path = require('path');
 
 const dgraph = require("dgraph-js");
-const grpc = require("grpc");
 
 // Create a client stub.
 function newClientStub() {
     // First create the appropriate TLS certs with dgraph cert:
     //     $ dgraph cert
     //     $ dgraph cert -n localhost
     //     $ dgraph cert -c user
-    const rootCaCert = fs.readFileSync(path.join(__dirname, 'tls', 'ca.crt'));
-    const clientCertKey = fs.readFileSync(path.join(__dirname, 'tls', 'client.user.key'));
-    const clientCert = fs.readFileSync(path.join(__dirname, 'tls', 'client.user.crt'));
+    console.log(path.join(__dirname, "tls", "ca.crt"));
+    const rootCaCert = fs.readFileSync(path.join(__dirname, "tls", "ca.crt"));
+    const clientCertKey = fs.readFileSync(
+        path.join(__dirname, "tls", "client.user.key")
+    );
+    const clientCert = fs.readFileSync(
+        path.join(__dirname, "tls", "client.user.crt")
+    );
     return new dgraph.DgraphClientStub(
         "localhost:9080",
-        grpc.credentials.createSsl(rootCaCert, clientCertKey, clientCert));
+        dgraph.grpc.credentials.createSsl(rootCaCert, clientCertKey, clientCert)
+    );
 }
 
 // Create a client.
@@ -69,13 +74,13 @@ async function createData(dgraphClient) {
                 {
                     name: "Charlie",
                     age: 29,
-                }
+                },
             ],
             school: [
                 {
                     name: "Crown Public School",
-                }
-            ]
+                },
+            ],
         };
 
         // Run mutation.
@@ -89,10 +94,16 @@ async function createData(dgraphClient) {
         // Get uid of the outermost object (person named "Alice").
         // Response#getUidsMap() returns a map from blank node names to uids.
         // For a json mutation, blank node label is used for the name of the created nodes.
-        console.log(`Created person named "Alice" with uid = ${response.getUidsMap().get("alice")}\n`);
+        console.log(
+            `Created person named "Alice" with uid = ${response
+                .getUidsMap()
+                .get("alice")}\n`
+        );
 
         console.log("All created nodes (map from blank node names to uids):");
-        response.getUidsMap().forEach((uid, key) => console.log(`${key} => ${uid}`));
+        response
+            .getUidsMap()
+            .forEach((uid, key) => console.log(`${key} => ${uid}`));
         console.log();
     } finally {
         // Clean up. Calling this after txn.commit() is a no-op
@@ -122,7 +133,9 @@ async function queryData(dgraphClient) {
         }
     }`;
     const vars = { $a: "Alice" };
-    const res = await dgraphClient.newTxn({ readOnly: true }).queryWithVars(query, vars);
+    const res = await dgraphClient
+        .newTxn({ readOnly: true })
+        .queryWithVars(query, vars);
     const ppl = res.getJson();
 
     // Print results.
@@ -142,8 +155,10 @@ async function main() {
     dgraphClientStub.close();
 }
 
-main().then(() => {
-    console.log("\nDONE!");
-}).catch((e) => {
-    console.log("ERROR: ", e);
-});
+main()
+    .then(() => {
+        console.log("\nDONE!");
+    })
+    .catch((e) => {
+        console.log("ERROR: ", e);
+    });

examples/tls/package.json

@@ -1,7 +1,6 @@
 {
   "name": "tls",
   "dependencies": {
-    "dgraph-js": "^20.3.0",
-    "grpc": "^1.24.2"
+    "dgraph-js": "^20.3.0"
   }
 }

generated/api_grpc_pb.d.ts

@@ -1,49 +1,49 @@
 // package: api
 // file: api.proto
 
-import * as grpc from "grpc";
+import * as grpc from "@grpc/grpc-js";
 import * as api_pb from "./api_pb";
 
 export class DgraphClient extends grpc.Client {
     public login(
         request: api_pb.LoginRequest,
         metadata: grpc.Metadata | null,
         options: grpc.CallOptions | null,
-        callback: (err?: Error | null, res?: api_pb.Response) => void,
+        callback: (err?: Error | null, res?: api_pb.Response) => void
     ): void;
 
     public alter(
         operation: api_pb.Operation,
         metadata: grpc.Metadata | null,
         options: grpc.CallOptions | null,
-        callback: (err?: Error | null, res?: api_pb.Payload) => void,
+        callback: (err?: Error | null, res?: api_pb.Payload) => void
     ): void;
 
     public query(
         request: api_pb.Request,
         metadata: grpc.Metadata | null,
         options: grpc.CallOptions | null,
-        callback: (err?: Error | null, res?: api_pb.Response) => void,
+        callback: (err?: Error | null, res?: api_pb.Response) => void
     ): void;
 
     public mutate(
         request: api_pb.Mutation,
         metadata: grpc.Metadata | null,
         options: grpc.CallOptions | null,
-        callback: (err?: Error | null, res?: api_pb.Response) => void,
+        callback: (err?: Error | null, res?: api_pb.Response) => void
     ): void;
 
     public commitOrAbort(
         request: api_pb.TxnContext,
         metadata: grpc.Metadata | null,
         options: grpc.CallOptions | null,
-        callback: (err?: Error | null, res?: api_pb.TxnContext) => void,
+        callback: (err?: Error | null, res?: api_pb.TxnContext) => void
     ): void;
 
     public checkVersion(
         request: api_pb.Check,
         metadata: grpc.Metadata | null,
         options: grpc.CallOptions | null,
-        callback: (err?: Error | null, res?: api_pb.Version) => void,
+        callback: (err?: Error | null, res?: api_pb.Version) => void
     ): void;
 }