chore: move types around

packages/ipfs-grpc-client/src/core-api/id.js

@@ -9,9 +9,7 @@ module.exports = function grpcId (grpc, service, opts = {}) {
   opts = opts || {}
 
   async function id (options = {}) {
-    const request = {
-      peerId: options.peerId
-    }
+    const request = {}
 
     const res = await unaryToPromise(grpc, service, request, {
       host: opts.url,

packages/ipfs-grpc-client/tsconfig.json

@@ -8,6 +8,9 @@
     "package.json"
   ],
   "references": [
+    {
+      "path": "../ipfs-core"
+    },
     {
       "path": "../ipfs-core-utils"
     },

packages/ipfs-grpc-server/src/index.js

@@ -28,7 +28,9 @@ module.exports = async function createServer (ipfs, options = {}) {
 
   const socket = options.socket || await webSocketServer(ipfs, options)
 
-  socket.on('message', async ({ path, metadata, channel }) => {
+  socket.on('error', (error) => debug(error))
+
+  socket.on('data', async ({ path, metadata, channel }) => {
     // @ts-ignore
     const handler = server.handlers.get(path)
 

packages/ipfs-grpc-server/src/utils/web-socket-server.js

@@ -8,8 +8,8 @@ const coerce = require('coercer')
 const { camelCase } = require('change-case')
 
 /**
- * @param {Buffer} buf - e.g. 'fooBar'
- * @returns {object} - e.g. 'foo-bar'
+ * @param {Buffer} buf - e.g. `Buffer.from('foo-bar: baz\r\n')`
+ * @returns {object} - e.g. `{ foorBar: 'baz' }`
  **/
 const fromHeaders = (buf) => {
   const headers = buf.toString('utf8')
@@ -27,20 +27,35 @@ const fromHeaders = (buf) => {
   return coerce(headers)
 }
 
+class Messages extends EventEmitter {
+  constructor (wss) {
+    super()
+
+    this._wss = wss
+    this.multiaddr = ''
+  }
+
+  async stop () {
+    return new Promise((resolve) => {
+      this._wss.close(() => resolve())
+    })
+  }
+}
+
 module.exports = async (ipfs, options = {}) => {
   const config = await ipfs.config.getAll()
   const grpcAddr = config.Addresses.RPC
   const [,, host, , port] = grpcAddr.split('/')
 
   debug(`starting ws server on ${host}:${port}`)
 
-  const emitter = new EventEmitter()
-
   const wss = new WebSocketServer({
     host,
     port
   })
 
+  const messages = new Messages(wss)
+
   wss.on('connection', function connection (ws, request) {
     ws.on('error', error => debug(`WebSocket Error: ${error.stack}`))
 
@@ -49,28 +64,21 @@ module.exports = async (ipfs, options = {}) => {
       const metadata = fromHeaders(buf)
       const channel = new WebSocketMessageChannel(ws)
 
-      emitter.emit('message', {
+      messages.emit('data', {
         path,
         metadata,
         channel
       })
     })
   })
 
-  wss.on('error', error => debug(`WebSocket Server Error: ${error.stack}`))
+  wss.on('error', error => messages.emit('error', error))
 
   return new Promise((resolve) => {
     wss.on('listening', () => {
-      // @ts-ignore
-      emitter.stop = () => {
-        return new Promise((resolve) => {
-          wss.close(() => resolve())
-        })
-      }
-      // @ts-ignore
-      emitter.multiaddr = `/ip4/${wss.address().address}/tcp/${wss.address().port}/ws`
+      messages.multiaddr = `/ip4/${wss.address().address}/tcp/${wss.address().port}/ws`
 
-      resolve(emitter)
+      resolve(messages)
     })
   })
 }

packages/ipfs-grpc-server/test/utils/server.js

@@ -15,7 +15,7 @@ module.exports = ({ ipfs, options }) => {
     send: (path, metadata) => {
       const channel = createChannel()
 
-      socket.emit('message', { path, metadata, channel })
+      socket.emit('data', { path, metadata, channel })
 
       return channel
     }