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)
       }

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

@@ -24,7 +24,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)) {
@@ -33,7 +33,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

@@ -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 {