Update bp public methods to async/await

foreseaz · foreseaz · commit 7ec468287f2b · 2019-01-13T17:50:40.000+08:00
diff --git a/src/__tests__/integrate.ts b/src/__tests__/integrate.ts
@@ -14,14 +14,14 @@ import CQL from '../index'
   // console.log(status)
   // let list = await cql.bp.getBlockList(1, 10)
   // console.log(list)
-  let txList = await cql.bp.getTransactionList(1, 30)
-  console.log(txList)
   // let block = await cql.bp.getBlockByHeight(52170)
   // console.log(block)
   // let blockh = await cql.bp.getBlockByHash('5c075d620dd63cba04b1e887ddb805840e03b6732f81e03d058a82a15ab739f9')
   // console.log(blockh)
+  // let txList = await cql.bp.getTransactionList(1, 30)
+  // console.log(txList)
   // let txList = await cql.bp.getTransactionListOfBlock(52170, 0, 10)
   // console.log(txList)
-  // let txH = await cql.bp.getTransactionByHash('fooo')
-  // console.log(txH)
+  let txH = await cql.bp.getTransactionByHash('fooo')
+  console.log(txH)
 })()
diff --git a/src/client/listeners.ts b/src/client/listeners.ts
@@ -21,7 +21,7 @@ export default class Listeners {
       }
 
       this.debug(
-        'Found matching listener for request id [%s], forwarding message method of [%s]',
+        'Found matching listener for request id [%s]',
         message.id,
         message.method
       )
diff --git a/src/client/socket.ts b/src/client/socket.ts
@@ -53,7 +53,7 @@ export default class WebSocketClient implements CqlWebSocket {
           resolve()
         }
       } catch (error) {
-        reject(error)
+        reject(JSON.stringify(error, null, 2))
       }
     })
 
@@ -109,11 +109,13 @@ export default class WebSocketClient implements CqlWebSocket {
   ): Promise<any> {
     this.debugRpc('Send RPC message', req)
 
-    this.send(req, (res) => {
-      this.debugRpc('Got RPC response', res)
-      return new Promise((resolve, reject) => {
+    // wait until got response
+    return new Promise((resolve, reject) => {
+      this.send(req, (res) => {
+        this.debugRpc('Got RPC response', res)
+
         if (res.error) {
-          reject(res.error)
+          reject(JSON.stringify(res.error, null, 2))
         } else {
           resolve(res.result)
         }
@@ -125,6 +127,7 @@ export default class WebSocketClient implements CqlWebSocket {
     event: MessageEvent
   ) => {
     let payload: any
+    this.debug('Got socket %s', event.type)
 
     try {
       payload = JSON.parse(event.data) as { [key: string]: any }
diff --git a/src/libs/bp.ts b/src/libs/bp.ts
@@ -38,73 +38,65 @@ export default class Bp implements BpInterface {
     this.debug = debugFactory('cql:bp')
   }
 
-  public getProtocolVersion(): Promise<string> {
+  public async getProtocolVersion(): Promise<string> {
     let req: RPCObject = constructRPCObj(BpMethodType.GET_PROTOCOL_VERSION)
     this.debug('Send getProtocolVersion request', req)
-    return new Promise(resolve => {
-      this.client.send(req, res => {
-        this.debug('Got getProtocolVersion response', res)
-        resolve(res.result)
-      })
-    })
+
+    let result = await this.client.sendRpc(req)
+    this.debug('Got getProtocolVersion response', result)
+
+    return result
   }
 
-  public getRunningStatus(): Promise<object> {
+  public async getRunningStatus(): Promise<object> {
     let req: RPCObject = constructRPCObj(BpMethodType.GET_RUNNING_STATUS)
     this.debug('Send getRunningStatus request', req)
-    return new Promise(resolve => {
-      this.client.send(req, res => {
-        this.debug('Got getRunningStatus response', res)
-        resolve(res.result)
-      })
-    })
+
+    let result = await this.client.sendRpc(req)
+    this.debug('Got getRunningStatus response', result)
+
+    return result
   }
 
-  public getBlockList(
+  public async getBlockList(
     page: number,
     size: number,
     since: number = 0
   ): Promise<object> {
     let params = [since, page, size]
     let req: RPCObject = constructRPCObj(BpMethodType.GET_BLOCK_LIST, params)
-
     this.debug('Send getBlockList request', req)
-    return new Promise((resolve) => {
-      this.client.send(req, (res) => {
-        this.debug('Got getBlockList response', res)
-        resolve(res.result)
-      })
-    })
+
+    let result = await this.client.sendRpc(req)
+    this.debug('Got getBlockList response', result)
+
+    return result
   }
 
-  public getBlockByHeight(
+  public async getBlockByHeight(
     height: number
   ): Promise<object> {
     let params = [height]
     let req: RPCObject = constructRPCObj(BpMethodType.GET_BLOCK_BY_HEIGHT, params)
-
     this.debug('Send getBlockByHeight request', req)
-    return new Promise((resolve) => {
-      this.client.send(req, (res) => {
-        this.debug('Got getBlockByHeight response', res)
-        resolve(res.result)
-      })
-    })
+
+    let result = await this.client.sendRpc(req)
+    this.debug('Got getBlockByHeight response', result)
+
+    return result
   }
 
-  public getBlockByHash(
+  public async getBlockByHash(
     hash: string
   ): Promise<object> {
     let params = [hash]
     let req: RPCObject = constructRPCObj(BpMethodType.GET_BLOCK_BY_HASH, params)
-
     this.debug('Send getBlockByHash request', req)
-    return new Promise((resolve) => {
-      this.client.send(req, (res) => {
-        this.debug('Got getBlockByHash response', res)
-        resolve(res.result)
-      })
-    })
+
+    let result = await this.client.sendRpc(req)
+    this.debug('Got getBlockByHash response', result)
+
+    return result
   }
 
   public async getTransactionList(
@@ -114,43 +106,39 @@ export default class Bp implements BpInterface {
   ): Promise<object> {
     let params = [since, page, size]
     let req: RPCObject = constructRPCObj(BpMethodType.GET_TRANSACTION_LIST, params)
-
     this.debug('Send getTransactionList request', req)
+
     let result = await this.client.sendRpc(req)
     this.debug('Got getTransactionList response', result)
 
     return result
   }
 
-  public getTransactionListOfBlock(
+  public async getTransactionListOfBlock(
     height: number,
     from: number,
     to: number
   ): Promise<Array<object>> {
     let params = [height, from, to]
     let req: RPCObject = constructRPCObj(BpMethodType.GET_TRANSACTION_LIST_OF_BLOCK, params)
-
     this.debug('Send getTransactionListOfBlock request', req)
-    return new Promise((resolve) => {
-      this.client.send(req, (res) => {
-        this.debug('Got getTransactionListOfBlock response', res)
-        resolve(res.result)
-      })
-    })
+
+    let result = await this.client.sendRpc(req)
+    this.debug('Got getTransactionListOfBlock response', result)
+
+    return result
   }
 
-  public getTransactionByHash(
+  public async getTransactionByHash(
     hash: string
   ): Promise<object> {
     let params = [hash]
     let req: RPCObject = constructRPCObj(BpMethodType.GET_TRANSACTION_BY_HASH, params)
-
     this.debug('Send getTransactionByHash request', req)
-    return new Promise((resolve) => {
-      this.client.send(req, (res) => {
-        this.debug('Got getTransactionByHash response', res)
-        resolve(res.result)
-      })
-    })
+
+    let result = await this.client.sendRpc(req)
+    this.debug('Got getTransactionByHash response', result)
+
+    return result
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ export default class Listeners {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`this.debug(`
`24`		`- 'Found matching listener for request id [%s], forwarding message method of [%s]',`
	`24`	`+ 'Found matching listener for request id [%s]',`
`25`	`25`	`message.id,`
`26`	`26`	`message.method`
`27`	`27`	`)`