Merge branch 'master' of github.com:stackb/bzl-sdk-node

Author: Paul Johnston

.github/workflows/node.js.yml

@@ -0,0 +1,29 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [10.x, 12.x, 14.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm ci
+    - run: npm run build --if-present
+    - run: npm test

index.js

@@ -3,5 +3,5 @@ const pb = require('./build/stack/bzl/v1beta1/application_pb');
 const grpc_pb = require('./build/stack/bzl/v1beta1/application_grpc_pb');
 
 module.exports = {
-    v1beta1: Object.assign(pb, grpc_pb),
+    v1beta1: Object.assign({}, pb, grpc_pb),
 };

index.test.js

@@ -6,10 +6,6 @@ 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());
 }
@@ -21,21 +17,33 @@ test('require() dependencies are satisfied', () => {
 
 // this test is skipped as it currently requires a bzl instance to be running
 test.skip('connects', done => {
-    try {
-        const client = newApplicationClient('localhost:1080');
-        client.waitForReady(4000, () => {
-            client.getApplicationMetadata(
-                new v1beta1.GetApplicationMetadataRequest(),
-                (err, metadata) => {
-                    expect(err).toBeNull();
-                    expect(metadata).toBeDefined();
-                    expect(metadata.getName()).toBe('bzl');
-                    done();
-                }
-            )
-        });
-    } catch (err) {
-        done(err);
-    }
+    const client = newApplicationClient('localhost:1080');
+    client.waitForReady(withTimeoutSeconds(3), (err) => {
+        if (err) {
+            throw err;
+        }
+        console.log(`OK, seems ready`);
+        try {
+    
+            const request = new v1beta1.GetApplicationMetadataRequest();
+            client.getApplicationMetadata(request, (err, metadata) => {
+                expect(err).toBeNull();
+                expect(metadata).toBeDefined();
+                expect(metadata.getName()).toBe('bzl');
+                expect(metadata.getVersion()).toBe('snapshot');
+                done();
+            });
+        } catch (err) {
+            done(err);
+        } finally {
+            // client.close();
+        }
+    });
+
 });
 
+function withTimeoutSeconds(seconds) {
+    const deadline = new Date();
+    deadline.setSeconds(deadline.getSeconds() + seconds);
+    return deadline;
+}