fix: Only use AbortController when needed

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
hpcc-systems · Oct 3, 2021 · 066e2ae · 066e2ae
1 parent 9d843cc
commit 066e2ae
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/ecl/eclWatchPanelView.ts b/src/ecl/eclWatchPanelView.ts
@@ -1,6 +1,6 @@
 import * as vscode from "vscode";
 import { send } from "@hpcc-js/comms";
-import { hashSum, join } from "@hpcc-js/util";
+import { hashSum } from "@hpcc-js/util";
 import { LaunchProtocol } from "../debugger/launchRequestArguments";
 import { wuDetailsUrl, wuResultUrl } from "../hpccplatform/launchConfig";
 import { sessionManager } from "../hpccplatform/session";
@@ -99,8 +99,10 @@ export class ECLWatchPanelView implements vscode.WebviewViewProvider {
                     }
                     break;
                 case "proxySend":
-                    abortControllers[message.id] = new AbortController();
-                    message.params.request.abortSignal_ = abortControllers[message.id].signal;
+                    if (message.canAbort) {
+                        abortControllers[message.id] = new AbortController();
+                        message.params.request.abortSignal_ = abortControllers[message.id].signal;
+                    }
                     send(message.params.opts, message.params.action, message.params.request, message.params.responseType, message.params.header).then(response => {
                         this._webviewView.webview.postMessage({
                             command: "proxyResponse",

diff --git a/src/eclwatch.tsx b/src/eclwatch.tsx
@@ -27,7 +27,9 @@ let proxyID = 0;
 
 const origSend = hookSend((opts, action, request, responseType, header) => {
     const id = ++proxyID;
+    let canAbort = false;
     if (request.abortSignal_) {
+        canAbort = true;
         request.abortSignal_.onabort = function () {
             vscode.postMessage<ProxyCancelMessage>({
                 command: "proxyCancel",
@@ -40,6 +42,7 @@ const origSend = hookSend((opts, action, request, responseType, header) => {
     vscode.postMessage<ProxySendMessage>({
         command: "proxySend",
         id,
+        canAbort,
         params: {
             opts,
             action,

diff --git a/src/eclwatch/messages.ts b/src/eclwatch/messages.ts
@@ -30,6 +30,7 @@ export interface LoadedMessage extends Message {
 export interface ProxySendMessage extends Message {
     command: "proxySend";
     id: number;
+    canAbort: boolean;
     params: {
         opts: any;
         action: any;