cancellation of interpreter execution (#40238)

ppisljar · lukasolson · commit 3ccc9a90e169 · 2019-07-30T16:51:57.000-07:00
* add AbortSignal to interpreter

* adding AbortSignal to visualize_loader

* adding AbortSignal to embeddables and dashboard

* passing AbortSignal to courier request handler

* Remove abort signal from dashboard and move to handler, and abort fetches when necessary

* Remove the rest of the references to abort signal in dashboard

* Revert changes to dashboard_app

* Remove code related to canceling visualize requests and only keep stuff for canceling interpreter

* Use createError
diff --git a/src/legacy/core_plugins/data/public/expressions/expressions_service.ts b/src/legacy/core_plugins/data/public/expressions/expressions_service.ts
@@ -41,6 +41,7 @@ export type getInitialContextFunction = () => InitialContextObject;
 export interface Handlers {
   getInitialContext: getInitialContextFunction;
   inspectorAdapters?: Adapters;
+  abortSignal?: AbortSignal;
 }
 
 type Context = object;
diff --git a/src/legacy/ui/public/vis/request_handlers/courier.js b/src/legacy/ui/public/vis/request_handlers/courier.js
@@ -42,7 +42,6 @@ const CourierRequestHandlerProvider = function () {
       inspectorAdapters,
       queryFilter
     }) {
-
       // Create a new search source that inherits the original search source
       // but has the appropriate timeRange applied via a filter.
       // This is a temporary solution until we properly pass down all required
diff --git a/src/plugins/data/common/expressions/create_error.ts b/src/plugins/data/common/expressions/create_error.ts
@@ -22,5 +22,6 @@ export const createError = (err: any) => ({
   error: {
     stack: process.env.NODE_ENV === 'production' ? undefined : err.stack,
     message: typeof err === 'string' ? err : err.message,
+    name: (err && err.name) || 'Error',
   },
 });
diff --git a/src/plugins/data/common/expressions/interpreter_provider.ts b/src/plugins/data/common/expressions/interpreter_provider.ts
@@ -71,8 +71,16 @@ export function interpreterProvider(config: any) {
       // if something failed, just return the failure
       if (getType(newContext) === 'error') return newContext;
 
+      // if execution was aborted return error
+      if (handlers.abortSignal && handlers.abortSignal.aborted) {
+        return createError({
+          message: 'The expression was aborted.',
+          name: 'AbortError',
+        });
+      }
+
       // Continue re-invoking chain until it's empty
-      return await invokeChain(chain, newContext);
+      return invokeChain(chain, newContext);
     } catch (e) {
       // Everything that throws from a function will hit this
       // The interpreter should *never* fail. It should always return a `{type: error}` on failure

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ export type getInitialContextFunction = () => InitialContextObject;`
`41`	`41`	`export interface Handlers {`
`42`	`42`	`getInitialContext: getInitialContextFunction;`
`43`	`43`	`inspectorAdapters?: Adapters;`
	`44`	`+ abortSignal?: AbortSignal;`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`type Context = object;`