@hpcc-js/comms 2.84.3 → 2.84.4

package/dist/index.js

@@ -4,17 +4,20 @@
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@hpcc-js/comms"] = {}, global["@hpcc-js/util"]));
 })(this, (function (exports, util) { 'use strict';
 
-  var global =
+  /* eslint-disable no-prototype-builtins */
+  var g =
     (typeof globalThis !== 'undefined' && globalThis) ||
     (typeof self !== 'undefined' && self) ||
-    (typeof global !== 'undefined' && global);
+    // eslint-disable-next-line no-undef
+    (typeof global !== 'undefined' && global) ||
+    {};
 
   var support = {
-    searchParams: 'URLSearchParams' in global,
-    iterable: 'Symbol' in global && 'iterator' in Symbol,
+    searchParams: 'URLSearchParams' in g,
+    iterable: 'Symbol' in g && 'iterator' in Symbol,
     blob:
-      'FileReader' in global &&
-      'Blob' in global &&
+      'FileReader' in g &&
+      'Blob' in g &&
       (function() {
         try {
           new Blob();
@@ -23,8 +26,8 @@
           return false
         }
       })(),
-    formData: 'FormData' in global,
-    arrayBuffer: 'ArrayBuffer' in global
+    formData: 'FormData' in g,
+    arrayBuffer: 'ArrayBuffer' in g
   };
 
   function isDataView(obj) {
@@ -95,6 +98,9 @@
       }, this);
     } else if (Array.isArray(headers)) {
       headers.forEach(function(header) {
+        if (header.length != 2) {
+          throw new TypeError('Headers constructor: expected name/value pair to be length 2, found' + header.length)
+        }
         this.append(header[0], header[1]);
       }, this);
     } else if (headers) {
@@ -165,6 +171,7 @@
   }
 
   function consumed(body) {
+    if (body._noBody) return
     if (body.bodyUsed) {
       return Promise.reject(new TypeError('Already read'))
     }
@@ -192,7 +199,9 @@
   function readBlobAsText(blob) {
     var reader = new FileReader();
     var promise = fileReaderReady(reader);
-    reader.readAsText(blob);
+    var match = /charset=([A-Za-z0-9_-]+)/.exec(blob.type);
+    var encoding = match ? match[1] : 'utf-8';
+    reader.readAsText(blob, encoding);
     return promise
   }
 
@@ -230,9 +239,11 @@
         semantic of setting Request.bodyUsed in the constructor before
         _initBody is called.
       */
+      // eslint-disable-next-line no-self-assign
       this.bodyUsed = this.bodyUsed;
       this._bodyInit = body;
       if (!body) {
+        this._noBody = true;
         this._bodyText = '';
       } else if (typeof body === 'string') {
         this._bodyText = body;
@@ -280,28 +291,29 @@
           return Promise.resolve(new Blob([this._bodyText]))
         }
       };
+    }
 
-      this.arrayBuffer = function() {
-        if (this._bodyArrayBuffer) {
-          var isConsumed = consumed(this);
-          if (isConsumed) {
-            return isConsumed
-          }
-          if (ArrayBuffer.isView(this._bodyArrayBuffer)) {
-            return Promise.resolve(
-              this._bodyArrayBuffer.buffer.slice(
-                this._bodyArrayBuffer.byteOffset,
-                this._bodyArrayBuffer.byteOffset + this._bodyArrayBuffer.byteLength
-              )
+    this.arrayBuffer = function() {
+      if (this._bodyArrayBuffer) {
+        var isConsumed = consumed(this);
+        if (isConsumed) {
+          return isConsumed
+        } else if (ArrayBuffer.isView(this._bodyArrayBuffer)) {
+          return Promise.resolve(
+            this._bodyArrayBuffer.buffer.slice(
+              this._bodyArrayBuffer.byteOffset,
+              this._bodyArrayBuffer.byteOffset + this._bodyArrayBuffer.byteLength
             )
-          } else {
-            return Promise.resolve(this._bodyArrayBuffer)
-          }
+          )
         } else {
-          return this.blob().then(readBlobAsArrayBuffer)
+          return Promise.resolve(this._bodyArrayBuffer)
         }
-      };
-    }
+      } else if (support.blob) {
+        return this.blob().then(readBlobAsArrayBuffer)
+      } else {
+        throw new Error('could not read as ArrayBuffer')
+      }
+    };
 
     this.text = function() {
       var rejected = consumed(this);
@@ -334,7 +346,7 @@
   }
 
   // HTTP methods whose capitalization should be normalized
-  var methods = ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'POST', 'PUT'];
+  var methods = ['CONNECT', 'DELETE', 'GET', 'HEAD', 'OPTIONS', 'PATCH', 'POST', 'PUT', 'TRACE'];
 
   function normalizeMethod(method) {
     var upcased = method.toUpperCase();
@@ -375,7 +387,12 @@
     }
     this.method = normalizeMethod(options.method || this.method || 'GET');
     this.mode = options.mode || this.mode || null;
-    this.signal = options.signal || this.signal;
+    this.signal = options.signal || this.signal || (function () {
+      if ('AbortController' in g) {
+        var ctrl = new AbortController();
+        return ctrl.signal;
+      }
+    }());
     this.referrer = null;
 
     if ((this.method === 'GET' || this.method === 'HEAD') && body) {
@@ -437,7 +454,11 @@
         var key = parts.shift().trim();
         if (key) {
           var value = parts.join(':').trim();
-          headers.append(key, value);
+          try {
+            headers.append(key, value);
+          } catch (error) {
+            console.warn('Response ' + error.message);
+          }
         }
       });
     return headers
@@ -455,6 +476,9 @@
 
     this.type = 'default';
     this.status = options.status === undefined ? 200 : options.status;
+    if (this.status < 200 || this.status > 599) {
+      throw new RangeError("Failed to construct 'Response': The status provided (0) is outside the range [200, 599].")
+    }
     this.ok = this.status >= 200 && this.status < 300;
     this.statusText = options.statusText === undefined ? '' : '' + options.statusText;
     this.headers = new Headers(options.headers);
@@ -474,7 +498,8 @@
   };
 
   Response.error = function() {
-    var response = new Response(null, {status: 0, statusText: ''});
+    var response = new Response(null, {status: 200, statusText: ''});
+    response.status = 0;
     response.type = 'error';
     return response
   };
@@ -489,7 +514,7 @@
     return new Response(null, {status: status, headers: {location: url}})
   };
 
-  var DOMException = global.DOMException;
+  var DOMException = g.DOMException;
   try {
     new DOMException();
   } catch (err) {
@@ -519,10 +544,16 @@
 
       xhr.onload = function() {
         var options = {
-          status: xhr.status,
           statusText: xhr.statusText,
           headers: parseHeaders(xhr.getAllResponseHeaders() || '')
         };
+        // This check if specifically for when a user fetches a file locally from the file system
+        // Only if the status is out of a normal range
+        if (request.url.startsWith('file://') && (xhr.status < 200 || xhr.status > 599)) {
+          options.status = 200;
+        } else {
+          options.status = xhr.status;
+        }
         options.url = 'responseURL' in xhr ? xhr.responseURL : options.headers.get('X-Request-URL');
         var body = 'response' in xhr ? xhr.response : xhr.responseText;
         setTimeout(function() {
@@ -538,7 +569,7 @@
 
       xhr.ontimeout = function() {
         setTimeout(function() {
-          reject(new TypeError('Network request failed'));
+          reject(new TypeError('Network request timed out'));
         }, 0);
       };
 
@@ -550,7 +581,7 @@
 
       function fixUrl(url) {
         try {
-          return url === '' && global.location.href ? global.location.href : url
+          return url === '' && g.location.href ? g.location.href : url
         } catch (e) {
           return url
         }
@@ -568,18 +599,23 @@
         if (support.blob) {
           xhr.responseType = 'blob';
         } else if (
-          support.arrayBuffer &&
-          request.headers.get('Content-Type') &&
-          request.headers.get('Content-Type').indexOf('application/octet-stream') !== -1
+          support.arrayBuffer
         ) {
           xhr.responseType = 'arraybuffer';
         }
       }
 
-      if (init && typeof init.headers === 'object' && !(init.headers instanceof Headers)) {
+      if (init && typeof init.headers === 'object' && !(init.headers instanceof Headers || (g.Headers && init.headers instanceof g.Headers))) {
+        var names = [];
         Object.getOwnPropertyNames(init.headers).forEach(function(name) {
+          names.push(normalizeName(name));
           xhr.setRequestHeader(name, normalizeValue(init.headers[name]));
         });
+        request.headers.forEach(function(value, name) {
+          if (names.indexOf(name) === -1) {
+            xhr.setRequestHeader(name, value);
+          }
+        });
       } else {
         request.headers.forEach(function(value, name) {
           xhr.setRequestHeader(name, value);
@@ -603,107 +639,112 @@
 
   fetch$1.polyfill = true;
 
-  if (!global.fetch) {
-    global.fetch = fetch$1;
-    global.Headers = Headers;
-    global.Request = Request;
-    global.Response = Response;
+  if (!g.fetch) {
+    g.fetch = fetch$1;
+    g.Headers = Headers;
+    g.Request = Request;
+    g.Response = Response;
   }
 
   var PKG_NAME = "@hpcc-js/comms";
-  var PKG_VERSION = "2.84.3";
-  var BUILD_VERSION = "2.104.29";
-
-  /******************************************************************************
-  Copyright (c) Microsoft Corporation.
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted.
-
-  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  PERFORMANCE OF THIS SOFTWARE.
-  ***************************************************************************** */
-  /* global Reflect, Promise */
-
-  var extendStatics = function(d, b) {
-      extendStatics = Object.setPrototypeOf ||
-          ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-          function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-      return extendStatics(d, b);
-  };
-
-  function __extends(d, b) {
-      if (typeof b !== "function" && b !== null)
-          throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-      extendStatics(d, b);
-      function __() { this.constructor = d; }
-      d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-  }
-
-  var __assign = function() {
-      __assign = Object.assign || function __assign(t) {
-          for (var s, i = 1, n = arguments.length; i < n; i++) {
-              s = arguments[i];
-              for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-          }
-          return t;
-      };
-      return __assign.apply(this, arguments);
-  };
-
-  function __awaiter(thisArg, _arguments, P, generator) {
-      function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-      return new (P || (P = Promise))(function (resolve, reject) {
-          function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-          function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-          function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-          step((generator = generator.apply(thisArg, _arguments || [])).next());
-      });
-  }
-
-  function __generator(thisArg, body) {
-      var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-      return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-      function verb(n) { return function (v) { return step([n, v]); }; }
-      function step(op) {
-          if (f) throw new TypeError("Generator is already executing.");
-          while (g && (g = 0, op[0] && (_ = 0)), _) try {
-              if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-              if (y = 0, t) op = [op[0] & 2, t.value];
-              switch (op[0]) {
-                  case 0: case 1: t = op; break;
-                  case 4: _.label++; return { value: op[1], done: false };
-                  case 5: _.label++; y = op[1]; op = [0]; continue;
-                  case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                  default:
-                      if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                      if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                      if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                      if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                      if (t[2]) _.ops.pop();
-                      _.trys.pop(); continue;
-              }
-              op = body.call(thisArg, _);
-          } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-          if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-      }
-  }
-
-  function __spreadArray(to, from, pack) {
-      if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-          if (ar || !(i in from)) {
-              if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-              ar[i] = from[i];
-          }
-      }
-      return to.concat(ar || Array.prototype.slice.call(from));
+  var PKG_VERSION = "2.84.4";
+  var BUILD_VERSION = "2.104.30";
+
+  /******************************************************************************
+  Copyright (c) Microsoft Corporation.
+
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted.
+
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
+  ***************************************************************************** */
+  /* global Reflect, Promise, SuppressedError, Symbol */
+
+  var extendStatics = function(d, b) {
+    extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+    return extendStatics(d, b);
+  };
+
+  function __extends(d, b) {
+    if (typeof b !== "function" && b !== null)
+        throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+    extendStatics(d, b);
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  }
+
+  var __assign = function() {
+    __assign = Object.assign || function __assign(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+  };
+
+  function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
   }
 
+  function __generator(thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+  }
+
+  function __spreadArray(to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+  }
+
+  typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+  };
+
   var logger$4 = util.scopedLogger("comms/connection.ts");
   function instanceOfIOptions(object) {
       return "baseUrl" in object;
@@ -1214,6 +1255,9 @@
       function FileSprayService() {
           return _super !== null && _super.apply(this, arguments) || this;
       }
+      FileSprayService.prototype.DFUWUFileEx = function (request) {
+          return this._connection.send("DFUWUFile", request, "text");
+      };
       FileSprayService.prototype.SprayFixedEx = function (request) {
           return this._connection.send("SprayFixed", request);
       };
@@ -2000,58 +2044,6 @@
   }(Service));
 
   var logger$3 = util.scopedLogger("@hpcc-js/comms/services/wsLogaccess.ts");
-  var ElasticKnownColumns;
-  (function (ElasticKnownColumns) {
-      ElasticKnownColumns["audience"] = "hpcc.log.audience";
-      ElasticKnownColumns["class"] = "hpcc.log.class";
-      ElasticKnownColumns["containerName"] = "kubernetes.container.name";
-      ElasticKnownColumns["jobId"] = "hpcc.log.jobid";
-      ElasticKnownColumns["message"] = "hpcc.log.message";
-      ElasticKnownColumns["procId"] = "hpcc.log.procid";
-      ElasticKnownColumns["sequence"] = "hpcc.log.sequence";
-      ElasticKnownColumns["threadId"] = "hpcc.log.threadid";
-      ElasticKnownColumns["timestamp"] = "hpcc.log.timestamp";
-  })(ElasticKnownColumns || (ElasticKnownColumns = {}));
-  var RElasticKnownColumns = {};
-  for (var key in ElasticKnownColumns) {
-      if (ElasticKnownColumns.hasOwnProperty(key)) {
-          RElasticKnownColumns[ElasticKnownColumns[key]] = key;
-      }
-  }
-  var elasticToLogLine = function (line) {
-      var retVal = {};
-      for (var key in RElasticKnownColumns) {
-          retVal[RElasticKnownColumns[key]] = line === null || line === void 0 ? void 0 : line.fields[0][key];
-      }
-      return retVal;
-  };
-  var AzureKnownColumns;
-  (function (AzureKnownColumns) {
-      AzureKnownColumns["audience"] = "hpcc_log_audience";
-      AzureKnownColumns["class"] = "hpcc_log_class";
-      AzureKnownColumns["containerID"] = "ContainerID";
-      AzureKnownColumns["containerName"] = "ContainerID";
-      AzureKnownColumns["jobId"] = "hpcc_log_jobid";
-      AzureKnownColumns["message"] = "hpcc_log_message";
-      AzureKnownColumns["procId"] = "";
-      AzureKnownColumns["sequence"] = "hpcc_log_sequence";
-      AzureKnownColumns["threadId"] = "hpcc_log_threadid";
-      AzureKnownColumns["timestamp"] = "hpcc_log_timestamp";
-  })(AzureKnownColumns || (AzureKnownColumns = {}));
-  var RAzureKnownColumns = {};
-  for (var key in AzureKnownColumns) {
-      if (AzureKnownColumns.hasOwnProperty(key)) {
-          RAzureKnownColumns[AzureKnownColumns[key]] = key;
-      }
-  }
-  var azureToLogLine = function (line) {
-      var _a;
-      var retVal = {};
-      for (var key in RAzureKnownColumns) {
-          retVal[RAzureKnownColumns[key]] = (_a = line === null || line === void 0 ? void 0 : line.fields[0][key]) !== null && _a !== void 0 ? _a : "";
-      }
-      return retVal;
-  };
   var LogaccessService = /** @class */ (function (_super) {
       __extends(LogaccessService, _super);
       function LogaccessService() {
@@ -2070,12 +2062,22 @@
       LogaccessService.prototype.GetLogsEx = function (request) {
           var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
           return __awaiter(this, void 0, void 0, function () {
-              var logInfo, getLogsRequest, filters, _loop_1, key, binaryLogFilter_1;
+              var logInfo, columnMap, convertLogLine, getLogsRequest, filters, _loop_1, key, binaryLogFilter_1;
               return __generator(this, function (_l) {
                   switch (_l.label) {
                       case 0: return [4 /*yield*/, this.GetLogAccessInfo()];
                       case 1:
                           logInfo = _l.sent();
+                          columnMap = {};
+                          logInfo.Columns.Column.forEach(function (column) { return columnMap[column.LogType] = column.Name; });
+                          convertLogLine = function (line) {
+                              var _a;
+                              var retVal = {};
+                              for (var key in columnMap) {
+                                  retVal[key] = (_a = line === null || line === void 0 ? void 0 : line.fields[0][columnMap[key]]) !== null && _a !== void 0 ? _a : "";
+                              }
+                              return retVal;
+                          };
                           getLogsRequest = {
                               Filter: {
                                   leftBinaryFilter: {
@@ -2097,17 +2099,8 @@
                           filters = [];
                           _loop_1 = function (key) {
                               var searchField;
-                              switch (logInfo.RemoteLogManagerType) {
-                                  case "azureloganalyticscurl":
-                                      if (key in AzureKnownColumns) {
-                                          searchField = AzureKnownColumns[key];
-                                      }
-                                      break;
-                                  case "elasticstack":
-                                      if (key in ElasticKnownColumns) {
-                                          searchField = ElasticKnownColumns[key];
-                                      }
-                                      break;
+                              if (key in columnMap) {
+                                  searchField = columnMap[key];
                               }
                               if (searchField) {
                                   if (Array.isArray(request[key])) {
@@ -2189,16 +2182,14 @@
                               getLogsRequest.Range.EndDate = request.EndDate.toISOString();
                           }
                           return [2 /*return*/, this.GetLogs(getLogsRequest).then(function (response) {
-                                  var _a, _b, _c, _d, _e;
+                                  var _a, _b, _c;
                                   try {
                                       var logLines = JSON.parse(response.LogLines);
                                       var lines = [];
                                       switch (logInfo.RemoteLogManagerType) {
                                           case "azureloganalyticscurl":
-                                              lines = (_b = (_a = logLines.lines) === null || _a === void 0 ? void 0 : _a.map(azureToLogLine)) !== null && _b !== void 0 ? _b : [];
-                                              break;
                                           case "elasticstack":
-                                              lines = (_d = (_c = logLines.lines) === null || _c === void 0 ? void 0 : _c.map(elasticToLogLine)) !== null && _d !== void 0 ? _d : [];
+                                              lines = (_b = (_a = logLines.lines) === null || _a === void 0 ? void 0 : _a.map(convertLogLine)) !== null && _b !== void 0 ? _b : [];
                                               break;
                                           default:
                                               logger$3.warning("Unknown RemoteLogManagerType: ".concat(logInfo.RemoteLogManagerType));
@@ -2206,7 +2197,7 @@
                                       }
                                       return {
                                           lines: lines,
-                                          total: (_e = response.TotalLogLinesAvailable) !== null && _e !== void 0 ? _e : 10000
+                                          total: (_c = response.TotalLogLinesAvailable) !== null && _c !== void 0 ? _c : 10000
                                       };
                                   }
                                   catch (e) {
@@ -6343,7 +6334,12 @@
                       case 0: return [4 /*yield*/, this.WUQuery()];
                       case 1:
                           _a.sent();
-                          return [2 /*return*/, this];
+                          if (!(this.StateID === WUStateID.Compiled && !this.ActionEx && !this._submitAction)) return [3 /*break*/, 3];
+                          return [4 /*yield*/, this.refreshInfo()];
+                      case 2:
+                          _a.sent();
+                          _a.label = 3;
+                      case 3: return [2 /*return*/, this];
                   }
               });
           });
@@ -9015,11 +9011,11 @@
       };
       DFUWorkunit.prototype.DFUWUFile = function (_request) {
           if (_request === void 0) { _request = {}; }
-          return this.connection.DFUWUFile(__assign(__assign({}, _request), { Wuid: this.ID })).then(function (response) {
+          return this.connection.DFUWUFileEx(__assign(__assign({}, _request), { Wuid: this.ID })).then(function (response) {
               //TODO: additional processing?
               return response;
           }).catch(function (e) {
-              return {};
+              return "";
           });
       };
       DFUWorkunit.prototype.DFUWUAction = function (actionType) {