Move to @grpc/grpc-js

Author: andrewosh

index.js

@@ -5,7 +5,7 @@ const mkdirp = require('mkdirp')
 const raf = require('random-access-file')
 const level = require('level')
 const sub = require('subleveldown')
-const grpc = require('grpc')
+const grpc = require('@grpc/grpc-js')
 
 const { rpc, loadMetadata } = require('hyperdrive-daemon-client')
 const corestore = require('corestore')
@@ -119,20 +119,30 @@ async function start (opts = {}) {
 
 
   const port = opts.port || argv.port
-  server.bind(`0.0.0.0:${port}`, grpc.ServerCredentials.createInsecure())
-  server.start()
-  log.info({ port: port }, 'server listening')
+  await new Promise((resolve, reject) => {
+    server.bindAsync(`0.0.0.0:${port}`, grpc.ServerCredentials.createInsecure(), (err, port) => {
+      if (err) return reject(err)
+      log.info({ port: port }, 'server listening')
+      server.start()
+      return resolve()
+    })
+  })
 
   const cleanupEvents = ['SIGINT', 'SIGTERM', 'unhandledRejection', 'uncaughtException']
   for (const event of cleanupEvents) {
-   process.once(event, cleanup)
+    process.once(event, cleanup)
   }
 
   return cleanup
 
   async function cleanup () {
     await daemon.close()
-    server.forceShutdown()
+    await new Promise((resolve, reject) => {
+      server.tryShutdown(err => {
+        if (err) return reject(err)
+        return resolve()
+      })
+    })
     for (const event of cleanupEvents) {
       process.removeListener(event, cleanup)
     }

lib/errors.js

@@ -1,4 +1,4 @@
-const grpc = require('grpc')
+const grpc = require('@grpc/grpc-js')
 
 function serverError (err) {
   return {

package.json

@@ -35,9 +35,8 @@
     "forever-monitor": "^1.7.1",
     "fs-extra": "^7.0.1",
     "google-protobuf": "^3.8.0",
-    "grpc": "^1.21.1",
     "hyperdrive": "^10.0.0-rc7",
-    "hyperdrive-daemon-client": "^0.9.4",
+    "hyperdrive-daemon-client": "^0.9.10",
     "hyperdrive-fuse": "^1.1.0",
     "level": "^4.0.0",
     "mkdirp": "^0.5.1",

test/util/create.js

@@ -49,6 +49,7 @@ async function createInstance (id, port, bootstrap) {
 
   const token = `test-token-${id}`
   const endpoint = `localhost:${port}`
+  var client
 
   const stop = await start({
     storage: path,
@@ -61,7 +62,8 @@ async function createInstance (id, port, bootstrap) {
   })
 
   return new Promise((resolve, reject) => {
-    return loadClient(endpoint, token, (err, client) => {
+    return loadClient(endpoint, token, (err, c) => {
+      client = c
       if (err) return reject(err)
       return resolve({
         client,