Checking if return the promise helps with the timeouts

Author: bigmontz

packages/testkit-backend/src/backend.js

@@ -21,9 +21,9 @@ export default class Backend {
     this._channel.on('contextOpen', ({ contextId }) => this._controller.openContext(contextId))
     this._channel.on('contextClose', ({ contextId }) => this._controller.closeContext(contextId))
 
-    this._channel.on('request', ({ contextId, request }) => {
+    this._channel.on('request', async ({ contextId, request }) => {
       try {
-        this._controller.handle(contextId, request)
+        await this._controller.handle(contextId, request)
       } catch (e) {
         this._channel.writeBackendError(contextId, e.message)
       }

packages/testkit-backend/src/controller/interface.js

@@ -24,7 +24,7 @@ export default class Controller extends EventEmitter {
     throw new Error('not implemented')
   }
 
-  handle(contextId, request) {
+  async handle(contextId, request) {
     throw new Error('not implemented')
   }
 }

packages/testkit-backend/src/controller/local.js

@@ -25,7 +25,7 @@ export default class LocalController extends Controller {
     this._contexts.delete(contextId)
   }
 
-  handle (contextId, { name, data }) {
+  async handle (contextId, { name, data }) {
     if (!this._contexts.has(contextId)) {
       throw new Error(`Context ${contextId} does not exist`)
     } else if (!(name in this._requestHandlers)) {
@@ -34,7 +34,7 @@ export default class LocalController extends Controller {
       throw new Error(`Unknown request: ${name}`)
     }
 
-    this._requestHandlers[name](this._contexts.get(contextId), data, {
+    return await this._requestHandlers[name](this._contexts.get(contextId), data, {
       writeResponse: (name, data) => this._writeResponse(contextId, name, data),
       writeError: (e) => this._writeError(contextId, e),
       writeBackendError: (msg) => this._writeBackendError(contextId, msg)

packages/testkit-backend/src/controller/remote.js

@@ -66,7 +66,7 @@ export default class RemoteController extends Controller {
     this._forwardToConnectedClient('contextClose', contextId, { contextId })
   }
 
-  handle (contextId, request) {
+  async handle (contextId, request) {
     this._forwardToConnectedClient('request', contextId, request)
   }
 

packages/testkit-backend/src/request-handlers.js

@@ -93,13 +93,13 @@ export function NewDriver (context, data, wire) {
 export function DriverClose (context, data, wire) {
   const { driverId } = data
   const driver = context.getDriver(driverId)
-  driver
+  return driver
     .close()
     .then(() => {
       wire.writeResponse('Driver', { id: driverId })
     })
-    .catch(err => wire.writeError(err))
-  context.removeDriver(driverId)
+    .catch(err => wire.writeError(err)) 
+    .finally(() => context.removeDriver(driverId))
 }
 
 export function NewSession (context, data, wire) {
@@ -130,7 +130,7 @@ export function NewSession (context, data, wire) {
 export function SessionClose (context, data, wire) {
   const { sessionId } = data
   const session = context.getSession(sessionId)
-  session
+  return session
     .close()
     .then(() => {
       wire.writeResponse('Session', { id: sessionId })
@@ -167,7 +167,7 @@ export function ResultNext (context, data, wire) {
   if (!("recordIt" in result)) {
     result.recordIt = result[Symbol.asyncIterator]()
   }
-  result.recordIt.next().then(({ value, done }) => {
+  return result.recordIt.next().then(({ value, done }) => {
     if (done) {
       wire.writeResponse('NullRecord', null)
     } else {
@@ -185,7 +185,7 @@ export function ResultNext (context, data, wire) {
 export function ResultConsume (context, data, wire) {
   const { resultId } = data
   const result = context.getResult(resultId)
-  result.summary().then(summary => {
+  return result.summary().then(summary => {
     wire.writeResponse('Summary', {
       ...summary,
       serverInfo: {
@@ -201,7 +201,7 @@ export function ResultList (context, data, wire) {
 
   const result = context.getResult(resultId)
 
-  result
+  return result
     .then(({ records }) => {
       const cypherRecords = records.map(rec => {
         return { values: Array.from(rec.values()).map(nativeToCypher) }
@@ -214,7 +214,7 @@ export function ResultList (context, data, wire) {
 export function SessionReadTransaction (context, data, wire) {
   const { sessionId, txMeta: metadata } = data
   const session = context.getSession(sessionId)
-  session
+  return session
     .readTransaction(
       tx =>
         new Promise((resolve, reject) => {
@@ -273,7 +273,7 @@ export function SessionBeginTransaction (context, data, wire) {
 export function TransactionCommit (context, data, wire) {
   const { txId: id } = data
   const { tx } = context.getTx(id)
-  tx.commit()
+  return tx.commit()
     .then(() => wire.writeResponse('Transaction', { id }))
     .catch(e => {
       console.log('got some err: ' + JSON.stringify(e))
@@ -284,7 +284,7 @@ export function TransactionCommit (context, data, wire) {
 export function TransactionRollback (context, data, wire) {
   const { txId: id } = data
   const { tx } = context.getTx(id)
-  tx.rollback()
+  return tx.rollback()
     .then(() => wire.writeResponse('Transaction', { id }))
     .catch(e => wire.writeError(e))
 }
@@ -299,7 +299,7 @@ export function SessionLastBookmarks (context, data, wire) {
 export function SessionWriteTransaction (context, data, wire) {
   const { sessionId, txMeta: metadata } = data
   const session = context.getSession(sessionId)
-  session
+  return session
     .writeTransaction(
       tx =>
         new Promise((resolve, reject) => {
@@ -345,15 +345,15 @@ export function GetFeatures (_context, _params, wire) {
 
 export function VerifyConnectivity (context, { driverId }, wire) {
   const driver = context.getDriver(driverId)
-  driver
+  return driver
     .verifyConnectivity()
     .then(() => wire.writeResponse('Driver', { id: driverId }))
     .catch(error => wire.writeError(error))
 }
 
 export function CheckMultiDBSupport (context, { driverId }, wire) {
   const driver = context.getDriver(driverId)
-  driver
+  return driver
     .supportsMultiDb()
     .then(available =>
       wire.writeResponse('MultiDBSupport', { id: driverId, available })
@@ -407,7 +407,7 @@ export function ForcedRoutingTableUpdate (context, { driverId, database, bookmar
   if (provider._freshRoutingTable) {
     // Removing database from the routing table registry
     provider._routingTableRegistry._remove(database)
-    provider._freshRoutingTable ({
+    return provider._freshRoutingTable ({
         accessMode: 'READ',
         database,
         bookmark: bookmarks,