Merge pull request #1 from stackb/grpc-js

Migrate to @grpc-grpc.js

Author: pcj

README.md

@@ -2,7 +2,7 @@
 
 [![NPM version](https://img.shields.io/npm/v/@stackb/bzl-sdk-node.svg)](https://www.npmjs.com/package/@stackb/bzl-sdk-node)
 
-This repository contains the generated protobuf definitions for the
+This repository contains the generated protobuf/grpc-js definitions for the
 [Bzl](https://build.bzl.io) gRPC API as well as a more developer-friendly
 index.js entrypoint.
 
@@ -17,18 +17,23 @@ npm install @stackb/bzl-sdk-node
 Given a running process (e.g. `bzl serve`), connect to the server and retrieve metadata:
 
 ```js
+const grpc = require('@grpc/grpc-js');
 const v1beta1 = require('@stackb/bzl-sdk-node').v1beta;
 
-// Create a grpc client to the Application service
-const appClient = v1beta1.newApplicationClient('localhost:1080');
+const client = new v1beta1.ApplicationClient(
+        'localhost:1080', 
+        grpc.credentials.createInsecure());
 
-// Wait for the connection to be ready and perform a call to the unary GetApplicationMetata rpc endpoint. 
-appClient.waitForReady(4000, () => {
-    appClient.getApplicationMetadata(
-        new v1beta1.pb.ApplicationMetadataRequest(),
-        (err, metadata) => {
+client.waitForReady(4000, () => printMetadata);
+
+function printMetadata() {
+    const request = new v1beta1.GetApplicationMetadataRequest();
+    client.getApplicationMetadata(request, (err, metadata) => {
+        if (err) {
+            console.warn('could not get metadata', err);
+        } else {
             console.log(`Connected to Bzl ${metadata.getVersion()}`);
         }
-    )
-});
+    });
+}
 ```

build/stack/bzl/v1beta1/application_grpc_pb.js

@@ -1,7 +1,7 @@
 // GENERATED CODE -- DO NOT EDIT!
 
 'use strict';
-var grpc = require('grpc');
+var grpc = require('@grpc/grpc-js');
 var build_stack_bzl_v1beta1_application_pb = require('../../../../build/stack/bzl/v1beta1/application_pb.js');
 var google_protobuf_timestamp_pb = require('google-protobuf/google/protobuf/timestamp_pb.js');
 

index.js

@@ -1,14 +1,7 @@
-const grpc = require('grpc');
+const grpc = require('@grpc/grpc-js');
 const pb = require('./build/stack/bzl/v1beta1/application_pb');
 const grpc_pb = require('./build/stack/bzl/v1beta1/application_grpc_pb');
 
-module.exports.v1beta = {
-    pb: pb,
-    grpc_pb: grpc_pb,
-    newApplicationClient: function(addr, creds) {
-        if (!creds) {
-            creds = grpc.credentials.createInsecure();
-        }
-        return new grpc_pb.ApplicationClient(addr, creds);
-    }
+module.exports = {
+    v1beta1: Object.assign(pb, grpc_pb),
 };

index.test.js

@@ -1,17 +1,31 @@
-const v1beta1 = require('./index').v1beta;
+const grpc = require('@grpc/grpc-js');
+const bzl = require('./index');
+// console.log('bzl', bzl);
+
+const v1beta1 = bzl.v1beta1;
+// console.log('v1beta1', v1beta1);
+
+
+function newInsecureClient(address) {
+    return new grpc.Client(address, grpc.credentials.createInsecure());
+}
+
+function newApplicationClient(address) {
+    return new v1beta1.ApplicationClient(address, grpc.credentials.createInsecure());
+}
 
 test('require() dependencies are satisfied', () => {
-    const client = v1beta1.newApplicationClient('localhost:1080');
+    const client = newApplicationClient('localhost:1080');
     expect(client).toBeDefined();
 });
 
 // this test is skipped as it currently requires a bzl instance to be running
 test.skip('connects', done => {
     try {
-        const client = v1beta1.newApplicationClient('localhost:1080');
+        const client = newApplicationClient('localhost:1080');
         client.waitForReady(4000, () => {
             client.getApplicationMetadata(
-                new v1beta1.pb.GetApplicationMetadataRequest(),
+                new v1beta1.GetApplicationMetadataRequest(),
                 (err, metadata) => {
                     expect(err).toBeNull();
                     expect(metadata).toBeDefined();

package.json

@@ -2,7 +2,7 @@
   "name": "@stackb/bzl-sdk-node",
   "displayName": "Bzl SDK for Node",
   "description": "SDK for the Bzl API (nodejs)",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "categories": [
     "Other"
   ],
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "google-protobuf": "^4.0.0-rc.1",
-    "grpc": "^1.24.3"
+    "@grpc/grpc-js": "1.1.2"
   },
   "devDependencies": {
     "jest": "^26.1.0"