@hpcc-js/comms 2.82.3 → 2.83.1

package/dist/index.js

@@ -611,8 +611,8 @@
   }
 
   var PKG_NAME = "@hpcc-js/comms";
-  var PKG_VERSION = "2.82.3";
-  var BUILD_VERSION = "2.104.21";
+  var PKG_VERSION = "2.83.1";
+  var BUILD_VERSION = "2.104.23";
 
   /******************************************************************************
   Copyright (c) Microsoft Corporation.
@@ -704,7 +704,7 @@
       return to.concat(ar || Array.prototype.slice.call(from));
   }
 
-  var logger$3 = util.scopedLogger("comms/connection.ts");
+  var logger$4 = util.scopedLogger("comms/connection.ts");
   function instanceOfIOptions(object) {
       return "baseUrl" in object;
   }
@@ -806,12 +806,12 @@
                   respondedTimeout -= respondedTick;
                   if (respondedTimeout <= 0) {
                       clearInterval(progress);
-                      logger$3.error("Request timeout:  " + script.src);
+                      logger$4.error("Request timeout:  " + script.src);
                       doCallback();
                       reject(Error("Request timeout:  " + script.src));
                   }
                   else {
-                      logger$3.debug("Request pending (" + respondedTimeout / 1000 + " sec):  " + script.src);
+                      logger$4.debug("Request pending (" + respondedTimeout / 1000 + " sec):  " + script.src);
                   }
               }
           }, respondedTick);
@@ -1089,109 +1089,114 @@
       return Service;
   }());
 
-  var DFUWUActions;
-  (function (DFUWUActions) {
-      DFUWUActions["Delete"] = "Delete";
-      DFUWUActions["Protect"] = "Protect";
-      DFUWUActions["Unprotect"] = "Unprotect";
-      DFUWUActions["Restore"] = "Restore";
-      DFUWUActions["SetToFailed"] = "SetToFailed";
-      DFUWUActions["Archive"] = "Archive";
-  })(DFUWUActions || (DFUWUActions = {}));
+  exports.FileSpray = void 0;
+  (function (FileSpray) {
+      (function (DFUWUActions) {
+          DFUWUActions["Delete"] = "Delete";
+          DFUWUActions["Protect"] = "Protect";
+          DFUWUActions["Unprotect"] = "Unprotect";
+          DFUWUActions["Restore"] = "Restore";
+          DFUWUActions["SetToFailed"] = "SetToFailed";
+          DFUWUActions["Archive"] = "Archive";
+      })(FileSpray.DFUWUActions || (FileSpray.DFUWUActions = {}));
+  })(exports.FileSpray || (exports.FileSpray = {}));
   var FileSprayServiceBase = /** @class */ (function (_super) {
       __extends(FileSprayServiceBase, _super);
       function FileSprayServiceBase(optsConnection) {
-          return _super.call(this, optsConnection, "FileSpray", "1.23") || this;
+          return _super.call(this, optsConnection, "FileSpray", "1.25") || this;
       }
       FileSprayServiceBase.prototype.AbortDFUWorkunit = function (request) {
-          return this._connection.send("AbortDFUWorkunit", request);
+          return this._connection.send("AbortDFUWorkunit", request, "json", false, undefined, "AbortDFUWorkunitResponse");
       };
       FileSprayServiceBase.prototype.Copy = function (request) {
-          return this._connection.send("Copy", request);
+          return this._connection.send("Copy", request, "json", false, undefined, "CopyResponse");
+      };
+      FileSprayServiceBase.prototype.CreateDFUPublisherWorkunit = function (request) {
+          return this._connection.send("CreateDFUPublisherWorkunit", request, "json", false, undefined, "CreateDFUPublisherWorkunitResponse");
       };
       FileSprayServiceBase.prototype.CreateDFUWorkunit = function (request) {
-          return this._connection.send("CreateDFUWorkunit", request);
+          return this._connection.send("CreateDFUWorkunit", request, "json", false, undefined, "CreateDFUWorkunitResponse");
       };
       FileSprayServiceBase.prototype.DFUWUFile = function (request) {
-          return this._connection.send("DFUWUFile", request);
+          return this._connection.send("DFUWUFile", request, "json", false, undefined, "DFUWUFileResponse");
       };
       FileSprayServiceBase.prototype.DFUWUSearch = function (request) {
-          return this._connection.send("DFUWUSearch", request);
+          return this._connection.send("DFUWUSearch", request, "json", false, undefined, "DFUWUSearchResponse");
       };
       FileSprayServiceBase.prototype.DFUWorkunitsAction = function (request) {
-          return this._connection.send("DFUWorkunitsAction", request);
+          return this._connection.send("DFUWorkunitsAction", request, "json", false, undefined, "DFUWorkunitsActionResponse");
       };
       FileSprayServiceBase.prototype.DeleteDFUWorkunit = function (request) {
-          return this._connection.send("DeleteDFUWorkunit", request);
+          return this._connection.send("DeleteDFUWorkunit", request, "json", false, undefined, "DeleteDFUWorkunitResponse");
       };
       FileSprayServiceBase.prototype.DeleteDFUWorkunits = function (request) {
-          return this._connection.send("DeleteDFUWorkunits", request);
+          return this._connection.send("DeleteDFUWorkunits", request, "json", false, undefined, "DeleteDFUWorkunitsResponse");
       };
       FileSprayServiceBase.prototype.DeleteDropZoneFiles = function (request) {
-          return this._connection.send("DeleteDropZoneFiles", request);
+          return this._connection.send("DeleteDropZoneFiles", request, "json", false, undefined, "DFUWorkunitsActionResponse");
       };
       FileSprayServiceBase.prototype.Despray = function (request) {
-          return this._connection.send("Despray", request);
+          return this._connection.send("Despray", request, "json", false, undefined, "DesprayResponse");
       };
       FileSprayServiceBase.prototype.DfuMonitor = function (request) {
-          return this._connection.send("DfuMonitor", request);
+          return this._connection.send("DfuMonitor", request, "json", false, undefined, "DfuMonitorResponse");
       };
       FileSprayServiceBase.prototype.DropZoneFileSearch = function (request) {
-          return this._connection.send("DropZoneFileSearch", request);
+          return this._connection.send("DropZoneFileSearch", request, "json", false, undefined, "DropZoneFileSearchResponse");
       };
       FileSprayServiceBase.prototype.DropZoneFiles = function (request) {
-          return this._connection.send("DropZoneFiles", request);
+          return this._connection.send("DropZoneFiles", request, "json", false, undefined, "DropZoneFilesResponse");
       };
       FileSprayServiceBase.prototype.EchoDateTime = function (request) {
-          return this._connection.send("EchoDateTime", request);
+          return this._connection.send("EchoDateTime", request, "json", false, undefined, "EchoDateTimeResponse");
       };
       FileSprayServiceBase.prototype.FileList = function (request) {
-          return this._connection.send("FileList", request);
+          return this._connection.send("FileList", request, "json", false, undefined, "FileListResponse");
       };
       FileSprayServiceBase.prototype.GetDFUExceptions = function (request) {
-          return this._connection.send("GetDFUExceptions", request);
+          return this._connection.send("GetDFUExceptions", request, "json", false, undefined, "GetDFUExceptionsResponse");
       };
       FileSprayServiceBase.prototype.GetDFUProgress = function (request) {
-          return this._connection.send("GetDFUProgress", request);
+          return this._connection.send("GetDFUProgress", request, "json", false, undefined, "ProgressResponse");
       };
       FileSprayServiceBase.prototype.GetDFUServerQueues = function (request) {
-          return this._connection.send("GetDFUServerQueues", request);
+          return this._connection.send("GetDFUServerQueues", request, "json", false, undefined, "GetDFUServerQueuesResponse");
       };
       FileSprayServiceBase.prototype.GetDFUWorkunit = function (request) {
-          return this._connection.send("GetDFUWorkunit", request);
+          return this._connection.send("GetDFUWorkunit", request, "json", false, undefined, "GetDFUWorkunitResponse");
       };
       FileSprayServiceBase.prototype.GetDFUWorkunits = function (request) {
-          return this._connection.send("GetDFUWorkunits", request);
+          return this._connection.send("GetDFUWorkunits", request, "json", false, undefined, "GetDFUWorkunitsResponse");
       };
       FileSprayServiceBase.prototype.GetSprayTargets = function (request) {
-          return this._connection.send("GetSprayTargets", request);
+          return this._connection.send("GetSprayTargets", request, "json", false, undefined, "GetSprayTargetsResponse");
       };
       FileSprayServiceBase.prototype.OpenSave = function (request) {
-          return this._connection.send("OpenSave", request);
+          return this._connection.send("OpenSave", request, "json", false, undefined, "OpenSaveResponse");
       };
       FileSprayServiceBase.prototype.Ping = function (request) {
-          return this._connection.send("Ping", request);
+          return this._connection.send("Ping", request, "json", false, undefined, "FileSprayPingResponse");
       };
       FileSprayServiceBase.prototype.Rename = function (request) {
-          return this._connection.send("Rename", request);
+          return this._connection.send("Rename", request, "json", false, undefined, "RenameResponse");
       };
       FileSprayServiceBase.prototype.Replicate = function (request) {
-          return this._connection.send("Replicate", request);
+          return this._connection.send("Replicate", request, "json", false, undefined, "ReplicateResponse");
       };
       FileSprayServiceBase.prototype.ShowResult = function (request) {
-          return this._connection.send("ShowResult", request);
+          return this._connection.send("ShowResult", request, "json", false, undefined, "ShowResultResponse");
       };
       FileSprayServiceBase.prototype.SprayFixed = function (request) {
-          return this._connection.send("SprayFixed", request);
+          return this._connection.send("SprayFixed", request, "json", false, undefined, "SprayFixedResponse");
       };
       FileSprayServiceBase.prototype.SprayVariable = function (request) {
-          return this._connection.send("SprayVariable", request);
+          return this._connection.send("SprayVariable", request, "json", false, undefined, "SprayResponse");
       };
       FileSprayServiceBase.prototype.SubmitDFUWorkunit = function (request) {
-          return this._connection.send("SubmitDFUWorkunit", request);
+          return this._connection.send("SubmitDFUWorkunit", request, "json", false, undefined, "SubmitDFUWorkunitResponse");
       };
       FileSprayServiceBase.prototype.UpdateDFUWorkunit = function (request) {
-          return this._connection.send("UpdateDFUWorkunit", request);
+          return this._connection.send("UpdateDFUWorkunit", request, "json", false, undefined, "UpdateDFUWorkunitResponse");
       };
       return FileSprayServiceBase;
   }(Service));
@@ -1210,6 +1215,9 @@
       FileSprayService.prototype.DesprayEx = function (request) {
           return this._connection.send("Despray", request);
       };
+      FileSprayService.prototype.UpdateDFUWorkunitEx = function (request) {
+          return this._connection.send("UpdateDFUWorkunit", request, "json", false, undefined, "UpdateDFUWorkunitResponse");
+      };
       return FileSprayService;
   }(FileSprayServiceBase));
 
@@ -1983,7 +1991,7 @@
       return LogaccessServiceBase;
   }(Service));
 
-  var logger$2 = util.scopedLogger("@hpcc-js/comms/services/wsLogaccess.ts");
+  var logger$3 = util.scopedLogger("@hpcc-js/comms/services/wsLogaccess.ts");
   var ElasticKnownColumns;
   (function (ElasticKnownColumns) {
       ElasticKnownColumns["audience"] = "hpcc.log.audience";
@@ -2185,7 +2193,7 @@
                                               lines = (_d = (_c = logLines.lines) === null || _c === void 0 ? void 0 : _c.map(elasticToLogLine)) !== null && _d !== void 0 ? _d : [];
                                               break;
                                           default:
-                                              logger$2.warning("Unknown RemoteLogManagerType: ".concat(logInfo.RemoteLogManagerType));
+                                              logger$3.warning("Unknown RemoteLogManagerType: ".concat(logInfo.RemoteLogManagerType));
                                               lines = [];
                                       }
                                       return {
@@ -2194,7 +2202,7 @@
                                       };
                                   }
                                   catch (e) {
-                                      logger$2.error(e);
+                                      logger$3.error(e);
                                   }
                                   return {
                                       lines: [],
@@ -3164,6 +3172,321 @@
       return WorkunitsServiceEx;
   }(WorkunitsServiceBase));
 
+  function formatDecimal(x) {
+    return Math.abs(x = Math.round(x)) >= 1e21
+        ? x.toLocaleString("en").replace(/,/g, "")
+        : x.toString(10);
+  }
+
+  // Computes the decimal coefficient and exponent of the specified number x with
+  // significant digits p, where x is positive and p is in [1, 21] or undefined.
+  // For example, formatDecimalParts(1.23) returns ["123", 0].
+  function formatDecimalParts(x, p) {
+    if ((i = (x = p ? x.toExponential(p - 1) : x.toExponential()).indexOf("e")) < 0) return null; // NaN, ±Infinity
+    var i, coefficient = x.slice(0, i);
+
+    // The string returned by toExponential either has the form \d\.\d+e[-+]\d+
+    // (e.g., 1.2e+3) or the form \de[-+]\d+ (e.g., 1e+3).
+    return [
+      coefficient.length > 1 ? coefficient[0] + coefficient.slice(2) : coefficient,
+      +x.slice(i + 1)
+    ];
+  }
+
+  function exponent(x) {
+    return x = formatDecimalParts(Math.abs(x)), x ? x[1] : NaN;
+  }
+
+  function formatGroup(grouping, thousands) {
+    return function(value, width) {
+      var i = value.length,
+          t = [],
+          j = 0,
+          g = grouping[0],
+          length = 0;
+
+      while (i > 0 && g > 0) {
+        if (length + g + 1 > width) g = Math.max(1, width - length);
+        t.push(value.substring(i -= g, i + g));
+        if ((length += g + 1) > width) break;
+        g = grouping[j = (j + 1) % grouping.length];
+      }
+
+      return t.reverse().join(thousands);
+    };
+  }
+
+  function formatNumerals(numerals) {
+    return function(value) {
+      return value.replace(/[0-9]/g, function(i) {
+        return numerals[+i];
+      });
+    };
+  }
+
+  // [[fill]align][sign][symbol][0][width][,][.precision][~][type]
+  var re = /^(?:(.)?([<>=^]))?([+\-( ])?([$#])?(0)?(\d+)?(,)?(\.\d+)?(~)?([a-z%])?$/i;
+
+  function formatSpecifier(specifier) {
+    if (!(match = re.exec(specifier))) throw new Error("invalid format: " + specifier);
+    var match;
+    return new FormatSpecifier({
+      fill: match[1],
+      align: match[2],
+      sign: match[3],
+      symbol: match[4],
+      zero: match[5],
+      width: match[6],
+      comma: match[7],
+      precision: match[8] && match[8].slice(1),
+      trim: match[9],
+      type: match[10]
+    });
+  }
+
+  formatSpecifier.prototype = FormatSpecifier.prototype; // instanceof
+
+  function FormatSpecifier(specifier) {
+    this.fill = specifier.fill === undefined ? " " : specifier.fill + "";
+    this.align = specifier.align === undefined ? ">" : specifier.align + "";
+    this.sign = specifier.sign === undefined ? "-" : specifier.sign + "";
+    this.symbol = specifier.symbol === undefined ? "" : specifier.symbol + "";
+    this.zero = !!specifier.zero;
+    this.width = specifier.width === undefined ? undefined : +specifier.width;
+    this.comma = !!specifier.comma;
+    this.precision = specifier.precision === undefined ? undefined : +specifier.precision;
+    this.trim = !!specifier.trim;
+    this.type = specifier.type === undefined ? "" : specifier.type + "";
+  }
+
+  FormatSpecifier.prototype.toString = function() {
+    return this.fill
+        + this.align
+        + this.sign
+        + this.symbol
+        + (this.zero ? "0" : "")
+        + (this.width === undefined ? "" : Math.max(1, this.width | 0))
+        + (this.comma ? "," : "")
+        + (this.precision === undefined ? "" : "." + Math.max(0, this.precision | 0))
+        + (this.trim ? "~" : "")
+        + this.type;
+  };
+
+  // Trims insignificant zeros, e.g., replaces 1.2000k with 1.2k.
+  function formatTrim(s) {
+    out: for (var n = s.length, i = 1, i0 = -1, i1; i < n; ++i) {
+      switch (s[i]) {
+        case ".": i0 = i1 = i; break;
+        case "0": if (i0 === 0) i0 = i; i1 = i; break;
+        default: if (!+s[i]) break out; if (i0 > 0) i0 = 0; break;
+      }
+    }
+    return i0 > 0 ? s.slice(0, i0) + s.slice(i1 + 1) : s;
+  }
+
+  var prefixExponent;
+
+  function formatPrefixAuto(x, p) {
+    var d = formatDecimalParts(x, p);
+    if (!d) return x + "";
+    var coefficient = d[0],
+        exponent = d[1],
+        i = exponent - (prefixExponent = Math.max(-8, Math.min(8, Math.floor(exponent / 3))) * 3) + 1,
+        n = coefficient.length;
+    return i === n ? coefficient
+        : i > n ? coefficient + new Array(i - n + 1).join("0")
+        : i > 0 ? coefficient.slice(0, i) + "." + coefficient.slice(i)
+        : "0." + new Array(1 - i).join("0") + formatDecimalParts(x, Math.max(0, p + i - 1))[0]; // less than 1y!
+  }
+
+  function formatRounded(x, p) {
+    var d = formatDecimalParts(x, p);
+    if (!d) return x + "";
+    var coefficient = d[0],
+        exponent = d[1];
+    return exponent < 0 ? "0." + new Array(-exponent).join("0") + coefficient
+        : coefficient.length > exponent + 1 ? coefficient.slice(0, exponent + 1) + "." + coefficient.slice(exponent + 1)
+        : coefficient + new Array(exponent - coefficient.length + 2).join("0");
+  }
+
+  var formatTypes = {
+    "%": function(x, p) { return (x * 100).toFixed(p); },
+    "b": function(x) { return Math.round(x).toString(2); },
+    "c": function(x) { return x + ""; },
+    "d": formatDecimal,
+    "e": function(x, p) { return x.toExponential(p); },
+    "f": function(x, p) { return x.toFixed(p); },
+    "g": function(x, p) { return x.toPrecision(p); },
+    "o": function(x) { return Math.round(x).toString(8); },
+    "p": function(x, p) { return formatRounded(x * 100, p); },
+    "r": formatRounded,
+    "s": formatPrefixAuto,
+    "X": function(x) { return Math.round(x).toString(16).toUpperCase(); },
+    "x": function(x) { return Math.round(x).toString(16); }
+  };
+
+  function identity(x) {
+    return x;
+  }
+
+  var map = Array.prototype.map,
+      prefixes = ["y","z","a","f","p","n","µ","m","","k","M","G","T","P","E","Z","Y"];
+
+  function formatLocale$1(locale) {
+    var group = locale.grouping === undefined || locale.thousands === undefined ? identity : formatGroup(map.call(locale.grouping, Number), locale.thousands + ""),
+        currencyPrefix = locale.currency === undefined ? "" : locale.currency[0] + "",
+        currencySuffix = locale.currency === undefined ? "" : locale.currency[1] + "",
+        decimal = locale.decimal === undefined ? "." : locale.decimal + "",
+        numerals = locale.numerals === undefined ? identity : formatNumerals(map.call(locale.numerals, String)),
+        percent = locale.percent === undefined ? "%" : locale.percent + "",
+        minus = locale.minus === undefined ? "-" : locale.minus + "",
+        nan = locale.nan === undefined ? "NaN" : locale.nan + "";
+
+    function newFormat(specifier) {
+      specifier = formatSpecifier(specifier);
+
+      var fill = specifier.fill,
+          align = specifier.align,
+          sign = specifier.sign,
+          symbol = specifier.symbol,
+          zero = specifier.zero,
+          width = specifier.width,
+          comma = specifier.comma,
+          precision = specifier.precision,
+          trim = specifier.trim,
+          type = specifier.type;
+
+      // The "n" type is an alias for ",g".
+      if (type === "n") comma = true, type = "g";
+
+      // The "" type, and any invalid type, is an alias for ".12~g".
+      else if (!formatTypes[type]) precision === undefined && (precision = 12), trim = true, type = "g";
+
+      // If zero fill is specified, padding goes after sign and before digits.
+      if (zero || (fill === "0" && align === "=")) zero = true, fill = "0", align = "=";
+
+      // Compute the prefix and suffix.
+      // For SI-prefix, the suffix is lazily computed.
+      var prefix = symbol === "$" ? currencyPrefix : symbol === "#" && /[boxX]/.test(type) ? "0" + type.toLowerCase() : "",
+          suffix = symbol === "$" ? currencySuffix : /[%p]/.test(type) ? percent : "";
+
+      // What format function should we use?
+      // Is this an integer type?
+      // Can this type generate exponential notation?
+      var formatType = formatTypes[type],
+          maybeSuffix = /[defgprs%]/.test(type);
+
+      // Set the default precision if not specified,
+      // or clamp the specified precision to the supported range.
+      // For significant precision, it must be in [1, 21].
+      // For fixed precision, it must be in [0, 20].
+      precision = precision === undefined ? 6
+          : /[gprs]/.test(type) ? Math.max(1, Math.min(21, precision))
+          : Math.max(0, Math.min(20, precision));
+
+      function format(value) {
+        var valuePrefix = prefix,
+            valueSuffix = suffix,
+            i, n, c;
+
+        if (type === "c") {
+          valueSuffix = formatType(value) + valueSuffix;
+          value = "";
+        } else {
+          value = +value;
+
+          // Determine the sign. -0 is not less than 0, but 1 / -0 is!
+          var valueNegative = value < 0 || 1 / value < 0;
+
+          // Perform the initial formatting.
+          value = isNaN(value) ? nan : formatType(Math.abs(value), precision);
+
+          // Trim insignificant zeros.
+          if (trim) value = formatTrim(value);
+
+          // If a negative value rounds to zero after formatting, and no explicit positive sign is requested, hide the sign.
+          if (valueNegative && +value === 0 && sign !== "+") valueNegative = false;
+
+          // Compute the prefix and suffix.
+          valuePrefix = (valueNegative ? (sign === "(" ? sign : minus) : sign === "-" || sign === "(" ? "" : sign) + valuePrefix;
+          valueSuffix = (type === "s" ? prefixes[8 + prefixExponent / 3] : "") + valueSuffix + (valueNegative && sign === "(" ? ")" : "");
+
+          // Break the formatted value into the integer “value” part that can be
+          // grouped, and fractional or exponential “suffix” part that is not.
+          if (maybeSuffix) {
+            i = -1, n = value.length;
+            while (++i < n) {
+              if (c = value.charCodeAt(i), 48 > c || c > 57) {
+                valueSuffix = (c === 46 ? decimal + value.slice(i + 1) : value.slice(i)) + valueSuffix;
+                value = value.slice(0, i);
+                break;
+              }
+            }
+          }
+        }
+
+        // If the fill character is not "0", grouping is applied before padding.
+        if (comma && !zero) value = group(value, Infinity);
+
+        // Compute the padding.
+        var length = valuePrefix.length + value.length + valueSuffix.length,
+            padding = length < width ? new Array(width - length + 1).join(fill) : "";
+
+        // If the fill character is "0", grouping is applied after padding.
+        if (comma && zero) value = group(padding + value, padding.length ? width - valueSuffix.length : Infinity), padding = "";
+
+        // Reconstruct the final output based on the desired alignment.
+        switch (align) {
+          case "<": value = valuePrefix + value + valueSuffix + padding; break;
+          case "=": value = valuePrefix + padding + value + valueSuffix; break;
+          case "^": value = padding.slice(0, length = padding.length >> 1) + valuePrefix + value + valueSuffix + padding.slice(length); break;
+          default: value = padding + valuePrefix + value + valueSuffix; break;
+        }
+
+        return numerals(value);
+      }
+
+      format.toString = function() {
+        return specifier + "";
+      };
+
+      return format;
+    }
+
+    function formatPrefix(specifier, value) {
+      var f = newFormat((specifier = formatSpecifier(specifier), specifier.type = "f", specifier)),
+          e = Math.max(-8, Math.min(8, Math.floor(exponent(value) / 3))) * 3,
+          k = Math.pow(10, -e),
+          prefix = prefixes[8 + e / 3];
+      return function(value) {
+        return f(k * value) + prefix;
+      };
+    }
+
+    return {
+      format: newFormat,
+      formatPrefix: formatPrefix
+    };
+  }
+
+  var locale$1;
+  var format;
+
+  defaultLocale$1({
+    decimal: ".",
+    thousands: ",",
+    grouping: [3],
+    currency: ["$", ""],
+    minus: "-"
+  });
+
+  function defaultLocale$1(definition) {
+    locale$1 = formatLocale$1(definition);
+    format = locale$1.format;
+    locale$1.formatPrefix;
+    return locale$1;
+  }
+
   var t0 = new Date,
       t1 = new Date;
 
@@ -5260,7 +5583,14 @@
 
   var formatter = utcFormat("%Y-%m-%dT%H:%M:%S.%LZ");
   var parser = utcParse("%Y-%m-%dT%H:%M:%S.%LZ");
-  var logger$1 = util.scopedLogger("workunit.ts");
+  var d3FormatNum = format(",");
+  function formatNum(num) {
+      if (num && !isNaN(+num)) {
+          return d3FormatNum(+num);
+      }
+      return num;
+  }
+  var logger$2 = util.scopedLogger("workunit.ts");
   var WUStateID = exports.WUStateID;
   var WorkunitCache = /** @class */ (function (_super) {
       __extends(WorkunitCache, _super);
@@ -6135,7 +6465,7 @@
                               default:
                                   props[scopeProperty.Name] = scopeProperty.RawValue;
                           }
-                          formattedProps[scopeProperty.Name] = (_a = scopeProperty.Formatted) !== null && _a !== void 0 ? _a : props[scopeProperty.Name];
+                          formattedProps[scopeProperty.Name] = formatNum((_a = scopeProperty.Formatted) !== null && _a !== void 0 ? _a : props[scopeProperty.Name]);
                       }
                   }
                   data.push(__assign({ id: scope.Id, name: scope.ScopeName, type: scope.ScopeType, __formattedProps: formattedProps }, props));
@@ -6376,7 +6706,7 @@
                   return false;
               });
               if (!wuMissing) {
-                  logger$1.warning("Unexpected exception:  ");
+                  logger$2.warning("Unexpected exception:  ");
                   throw e;
               }
               return {};
@@ -6413,7 +6743,7 @@
                   return false;
               });
               if (!wuMissing) {
-                  logger$1.warning("Unexpected exception:  ");
+                  logger$2.warning("Unexpected exception:  ");
                   throw e;
               }
               return {};
@@ -6502,7 +6832,7 @@
               }
               return new util.XMLNode(command);
           }).catch(function (_) {
-              logger$1.error(_);
+              logger$2.error(_);
               return Promise.resolve(new util.XMLNode(command));
           });
       };
@@ -7321,776 +7651,843 @@
       return Machine;
   }(util.StateObject));
 
-  var QueryCache = /** @class */ (function (_super) {
-      __extends(QueryCache, _super);
-      function QueryCache() {
+  var TargetClusterCache = /** @class */ (function (_super) {
+      __extends(TargetClusterCache, _super);
+      function TargetClusterCache() {
           return _super.call(this, function (obj) {
-              return util.Cache.hash([obj.QueryId, obj.QuerySet]);
+              return "".concat(obj.BaseUrl, "-").concat(obj.Name);
           }) || this;
       }
-      return QueryCache;
+      return TargetClusterCache;
   }(util.Cache));
-  var _queries = new QueryCache();
-  var Query = /** @class */ (function (_super) {
-      __extends(Query, _super);
-      function Query(optsConnection, querySet, queryID, queryDetails) {
+  var _targetCluster = new TargetClusterCache();
+  var TargetCluster = /** @class */ (function (_super) {
+      __extends(TargetCluster, _super);
+      function TargetCluster(optsConnection, name) {
           var _this = _super.call(this) || this;
-          if (optsConnection instanceof EclService) {
+          if (optsConnection instanceof TopologyService) {
               _this.connection = optsConnection;
-              // this._topology = new Topology(this.connection.opts());
+              _this.machineConnection = new MachineService(optsConnection.connectionOptions());
           }
           else {
-              _this.connection = new EclService(optsConnection);
-              // this._topology = new Topology(optsConnection);
+              _this.connection = new TopologyService(optsConnection);
+              _this.machineConnection = new MachineService(optsConnection);
           }
-          _this._wsWorkunits = new WorkunitsService(optsConnection);
-          _this.set(__assign({ QuerySet: querySet, QueryId: queryID }, queryDetails));
+          _this.clear({
+              Name: name
+          });
           return _this;
       }
-      Object.defineProperty(Query.prototype, "BaseUrl", {
+      Object.defineProperty(TargetCluster.prototype, "BaseUrl", {
           get: function () { return this.connection.baseUrl; },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "properties", {
-          get: function () { return this.get(); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Query.prototype, "Exceptions", {
-          get: function () { return this.get("Exceptions"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Query.prototype, "QueryId", {
-          get: function () { return this.get("QueryId"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Query.prototype, "QuerySet", {
-          get: function () { return this.get("QuerySet"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Query.prototype, "QueryName", {
-          get: function () { return this.get("QueryName"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Query.prototype, "Wuid", {
-          get: function () { return this.get("Wuid"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Query.prototype, "Dll", {
-          get: function () { return this.get("Dll"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Query.prototype, "Suspended", {
-          get: function () { return this.get("Suspended"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Query.prototype, "Activated", {
-          get: function () { return this.get("Activated"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Query.prototype, "SuspendedBy", {
-          get: function () { return this.get("SuspendedBy"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Query.prototype, "Clusters", {
-          get: function () { return this.get("Clusters"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Query.prototype, "PublishedBy", {
-          get: function () { return this.get("PublishedBy"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Query.prototype, "Comment", {
-          get: function () { return this.get("Comment"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Query.prototype, "LogicalFiles", {
-          get: function () { return this.get("LogicalFiles"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Query.prototype, "SuperFiles", {
-          get: function () { return this.get("SuperFiles"); },
+      Object.defineProperty(TargetCluster.prototype, "Name", {
+          get: function () { return this.get("Name"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "IsLibrary", {
-          get: function () { return this.get("IsLibrary"); },
+      Object.defineProperty(TargetCluster.prototype, "Prefix", {
+          get: function () { return this.get("Prefix"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "Priority", {
-          get: function () { return this.get("Priority"); },
+      Object.defineProperty(TargetCluster.prototype, "Type", {
+          get: function () { return this.get("Type"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "WUSnapShot", {
-          get: function () { return this.get("WUSnapShot"); },
+      Object.defineProperty(TargetCluster.prototype, "IsDefault", {
+          get: function () { return this.get("IsDefault"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "CompileTime", {
-          get: function () { return this.get("CompileTime"); },
+      Object.defineProperty(TargetCluster.prototype, "TpClusters", {
+          get: function () { return this.get("TpClusters"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "LibrariesUsed", {
-          get: function () { return this.get("LibrariesUsed"); },
+      Object.defineProperty(TargetCluster.prototype, "TpEclCCServers", {
+          get: function () { return this.get("TpEclCCServers"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "CountGraphs", {
-          get: function () { return this.get("CountGraphs"); },
+      Object.defineProperty(TargetCluster.prototype, "TpEclServers", {
+          get: function () { return this.get("TpEclServers"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "ResourceURLCount", {
-          get: function () { return this.get("ResourceURLCount"); },
+      Object.defineProperty(TargetCluster.prototype, "TpEclAgents", {
+          get: function () { return this.get("TpEclAgents"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "WsEclAddresses", {
-          get: function () { return this.get("WsEclAddresses"); },
+      Object.defineProperty(TargetCluster.prototype, "TpEclSchedulers", {
+          get: function () { return this.get("TpEclSchedulers"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "WUGraphs", {
-          get: function () { return this.get("WUGraphs"); },
+      Object.defineProperty(TargetCluster.prototype, "MachineInfoEx", {
+          get: function () { return this.get("MachineInfoEx", []); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "WUTimers", {
-          get: function () { return this.get("WUTimers"); },
+      Object.defineProperty(TargetCluster.prototype, "CMachineInfoEx", {
+          get: function () {
+              var _this = this;
+              return this.MachineInfoEx.map(function (machineInfoEx) { return Machine.attach(_this.machineConnection, machineInfoEx.Address, machineInfoEx); });
+          },
           enumerable: false,
           configurable: true
       });
-      Query.attach = function (optsConnection, querySet, queryId) {
-          var retVal = _queries.get({ BaseUrl: optsConnection.baseUrl, QuerySet: querySet, QueryId: queryId }, function () {
-              return new Query(optsConnection, querySet, queryId);
+      TargetCluster.attach = function (optsConnection, name, state) {
+          var retVal = _targetCluster.get({ BaseUrl: optsConnection.baseUrl, Name: name }, function () {
+              return new TargetCluster(optsConnection, name);
           });
+          if (state) {
+              retVal.set(__assign({}, state));
+          }
           return retVal;
       };
-      Query.prototype.fetchDetails = function () {
-          return __awaiter(this, void 0, void 0, function () {
-              var queryDetails;
-              return __generator(this, function (_a) {
-                  switch (_a.label) {
-                      case 0: return [4 /*yield*/, this._wsWorkunits.WUQueryDetails({
-                              QuerySet: this.QuerySet,
-                              QueryId: this.QueryId,
-                              IncludeStateOnClusters: false,
-                              IncludeSuperFiles: false,
-                              IncludeWsEclAddresses: false,
-                              CheckAllNodes: false
-                          })];
-                      case 1:
-                          queryDetails = _a.sent();
-                          this.set(__assign({}, queryDetails));
-                          return [2 /*return*/];
+      TargetCluster.prototype.fetchMachines = function (request) {
+          var _this = this;
+          if (request === void 0) { request = {}; }
+          return this.machineConnection.GetTargetClusterInfo(__assign({ TargetClusters: {
+                  Item: ["".concat(this.Type, ":").concat(this.Name)]
+              } }, request)).then(function (response) {
+              var retVal = [];
+              for (var _i = 0, _a = response.TargetClusterInfoList.TargetClusterInfo; _i < _a.length; _i++) {
+                  var machineInfo = _a[_i];
+                  for (var _b = 0, _c = machineInfo.Processes.MachineInfoEx; _b < _c.length; _b++) {
+                      var machineInfoEx = _c[_b];
+                      retVal.push(machineInfoEx);
                   }
-              });
+              }
+              _this.set("MachineInfoEx", retVal);
+              return _this.CMachineInfoEx;
           });
       };
-      Query.prototype.fetchRequestSchema = function () {
-          return __awaiter(this, void 0, void 0, function () {
-              var _a;
-              return __generator(this, function (_b) {
-                  switch (_b.label) {
-                      case 0:
-                          _a = this;
-                          return [4 /*yield*/, this.connection.requestJson(this.QuerySet, this.QueryId)];
-                      case 1:
-                          _a._requestSchema = _b.sent();
-                          return [2 /*return*/];
+      TargetCluster.prototype.machineStats = function () {
+          var maxDisk = 0;
+          var totalFree = 0;
+          var total = 0;
+          for (var _i = 0, _a = this.CMachineInfoEx; _i < _a.length; _i++) {
+              var machine = _a[_i];
+              for (var _b = 0, _c = machine.Storage.StorageInfo; _b < _c.length; _b++) {
+                  var storageInfo = _c[_b];
+                  totalFree += storageInfo.Available;
+                  total += storageInfo.Total;
+                  var usage = 1 - storageInfo.Available / storageInfo.Total;
+                  if (usage > maxDisk) {
+                      maxDisk = usage;
                   }
-              });
-          });
+              }
+          }
+          return {
+              maxDisk: maxDisk,
+              meanDisk: 1 - (total ? totalFree / total : 1)
+          };
       };
-      Query.prototype.fetchResponseSchema = function () {
-          return __awaiter(this, void 0, void 0, function () {
-              var _a;
-              return __generator(this, function (_b) {
-                  switch (_b.label) {
-                      case 0:
-                          _a = this;
-                          return [4 /*yield*/, this.connection.responseJson(this.QuerySet, this.QueryId)];
-                      case 1:
-                          _a._responseSchema = _b.sent();
-                          return [2 /*return*/];
-                  }
-              });
-          });
+      TargetCluster.prototype.fetchUsage = function () {
+          return this.machineConnection.GetTargetClusterUsageEx([this.Name]);
       };
-      Query.prototype.fetchSchema = function () {
-          return __awaiter(this, void 0, void 0, function () {
-              return __generator(this, function (_a) {
-                  switch (_a.label) {
-                      case 0: return [4 /*yield*/, Promise.all([this.fetchRequestSchema(), this.fetchResponseSchema()])];
-                      case 1:
-                          _a.sent();
-                          return [2 /*return*/];
+      return TargetCluster;
+  }(util.StateObject));
+  function targetClusters(optsConnection) {
+      var connection;
+      if (optsConnection instanceof TopologyService) {
+          connection = optsConnection;
+      }
+      else {
+          connection = new TopologyService(optsConnection);
+      }
+      return connection.TpListTargetClusters({}).then(function (response) {
+          return response.TargetClusters.TpClusterNameType.map(function (item) { return TargetCluster.attach(optsConnection, item.Name, item); });
+      });
+  }
+  var _defaultTargetCluster = {};
+  function defaultTargetCluster(optsConnection) {
+      if (!_defaultTargetCluster[optsConnection.baseUrl]) {
+          var connection = void 0;
+          if (optsConnection instanceof TopologyService) {
+              connection = optsConnection;
+          }
+          else {
+              connection = new TopologyService(optsConnection);
+          }
+          _defaultTargetCluster[optsConnection.baseUrl] = connection.TpListTargetClusters({}).then(function (response) {
+              var firstItem;
+              var defaultItem;
+              var hthorItem;
+              response.TargetClusters.TpClusterNameType.forEach(function (item) {
+                  if (!firstItem) {
+                      firstItem = item;
                   }
-              });
-          });
-      };
-      Query.prototype.fetchSummaryStats = function () {
-          return this._wsWorkunits.WUQueryGetSummaryStats({ Target: this.QuerySet, QueryId: this.QueryId });
-      };
-      Query.prototype.submit = function (request) {
-          return this.connection.submit(this.QuerySet, this.QueryId, request).then(function (results) {
-              for (var key in results) {
-                  results[key] = results[key].Row;
-              }
-              return results;
-          });
-      };
-      Query.prototype.refresh = function () {
-          return __awaiter(this, void 0, void 0, function () {
-              return __generator(this, function (_a) {
-                  switch (_a.label) {
-                      case 0: return [4 /*yield*/, Promise.all([
-                              this.fetchDetails(),
-                              this.fetchSchema()
-                          ])];
-                      case 1:
-                          _a.sent();
-                          return [2 /*return*/, this];
+                  if (!defaultItem && item.IsDefault === true) {
+                      defaultItem = item;
+                  }
+                  if (!hthorItem && item.Type === "hthor") {
+                      hthorItem = item;
                   }
               });
+              var defItem = defaultItem || hthorItem || firstItem;
+              return TargetCluster.attach(optsConnection, defItem.Name, defItem);
           });
-      };
-      Query.prototype.requestFields = function () {
-          if (!this._requestSchema)
-              return [];
-          return this._requestSchema;
-      };
-      Query.prototype.responseFields = function () {
-          if (!this._responseSchema)
-              return {};
-          return this._responseSchema;
-      };
-      Query.prototype.resultNames = function () {
-          var retVal = [];
-          for (var key in this.responseFields()) {
-              retVal.push(key);
-          }
-          return retVal;
-      };
-      Query.prototype.resultFields = function (resultName) {
-          if (!this._responseSchema[resultName])
-              return [];
-          return this._responseSchema[resultName];
-      };
-      return Query;
-  }(util.StateObject));
+      }
+      return _defaultTargetCluster[optsConnection.baseUrl];
+  }
 
-  var StoreCache = /** @class */ (function (_super) {
-      __extends(StoreCache, _super);
-      function StoreCache() {
+  var TopologyCache = /** @class */ (function (_super) {
+      __extends(TopologyCache, _super);
+      function TopologyCache() {
           return _super.call(this, function (obj) {
-              return "".concat(obj.BaseUrl, "-").concat(obj.Name, ":").concat(obj.UserSpecific, "-").concat(obj.Namespace);
+              return obj.BaseUrl;
           }) || this;
       }
-      return StoreCache;
+      return TopologyCache;
   }(util.Cache));
-  var _store = new StoreCache();
-  var ValueChangedMessage = /** @class */ (function (_super) {
-      __extends(ValueChangedMessage, _super);
-      function ValueChangedMessage(key, value, oldValue) {
+  var _topology = new TopologyCache();
+  var Topology = /** @class */ (function (_super) {
+      __extends(Topology, _super);
+      function Topology(optsConnection) {
           var _this = _super.call(this) || this;
-          _this.key = key;
-          _this.value = value;
-          _this.oldValue = oldValue;
-          return _this;
-      }
-      Object.defineProperty(ValueChangedMessage.prototype, "canConflate", {
-          get: function () { return true; },
-          enumerable: false,
-          configurable: true
-      });
-      ValueChangedMessage.prototype.conflate = function (other) {
-          if (this.key === other.key) {
-              this.value = other.value;
-              return true;
-          }
-          return false;
-      };
-      ValueChangedMessage.prototype.void = function () {
-          return this.value === this.oldValue;
-      };
-      return ValueChangedMessage;
-  }(util.Message));
-  var Store = /** @class */ (function () {
-      function Store(optsConnection, Name, Namespace, UserSpecific) {
-          this._dispatch = new util.Dispatch();
-          this._knownValues = {};
-          if (optsConnection instanceof StoreService) {
-              this.connection = optsConnection;
+          if (optsConnection instanceof TopologyService) {
+              _this.connection = optsConnection;
           }
           else {
-              this.connection = new StoreService(optsConnection);
+              _this.connection = new TopologyService(optsConnection);
           }
-          this.Name = Name;
-          this.UserSpecific = UserSpecific;
-          this.Namespace = Namespace;
+          return _this;
       }
-      Object.defineProperty(Store.prototype, "BaseUrl", {
+      Object.defineProperty(Topology.prototype, "BaseUrl", {
           get: function () { return this.connection.baseUrl; },
           enumerable: false,
           configurable: true
       });
-      Store.attach = function (optsConnection, Name, Namespace, UserSpecific) {
-          if (Name === void 0) { Name = "HPCCApps"; }
-          if (UserSpecific === void 0) { UserSpecific = true; }
-          var retVal = _store.get({ BaseUrl: optsConnection.baseUrl, Name: Name, UserSpecific: UserSpecific, Namespace: Namespace }, function () {
-              return new Store(optsConnection, Name, Namespace, UserSpecific);
+      Object.defineProperty(Topology.prototype, "properties", {
+          //  Accessors  ---
+          get: function () { return this.get(); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Topology.prototype, "TargetClusters", {
+          get: function () { return this.get("TargetClusters"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Topology.prototype, "CTargetClusters", {
+          get: function () {
+              var _this = this;
+              return this.TargetClusters.map(function (tc) { return TargetCluster.attach(_this.connection, tc.Name, tc); });
+          },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Topology.prototype, "LogicalClusters", {
+          get: function () { return this.get("LogicalClusters"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Topology.prototype, "Services", {
+          get: function () { return this.get("Services"); },
+          enumerable: false,
+          configurable: true
+      });
+      Topology.attach = function (optsConnection) {
+          var retVal = _topology.get({ BaseUrl: optsConnection.baseUrl }, function () {
+              return new Topology(optsConnection);
           });
           return retVal;
       };
-      Store.prototype.create = function () {
-          this.connection.CreateStore({ Name: this.Name, UserSpecific: this.UserSpecific, Type: "", Description: "" });
-      };
-      Store.prototype.set = function (key, value, broadcast) {
+      Topology.prototype.GetESPServiceBaseURL = function (type) {
           var _this = this;
-          if (broadcast === void 0) { broadcast = true; }
-          return this.connection.Set({
-              StoreName: this.Name,
-              UserSpecific: this.UserSpecific,
-              Namespace: this.Namespace,
-              Key: key,
-              Value: value
-          }).then(function (response) {
-              var oldValue = _this._knownValues[key];
-              _this._knownValues[key] = value;
-              if (broadcast) {
-                  _this._dispatch.post(new ValueChangedMessage(key, value, oldValue));
+          if (type === void 0) { type = ""; }
+          return this.connection.TpServiceQuery({}).then(function (response) {
+              var rootProtocol = _this.connection.protocol();
+              var ip = _this.connection.ip();
+              var port = rootProtocol === "https:" ? "18002" : "8002";
+              if (util.exists("ServiceList.TpEspServers.TpEspServer", response)) {
+                  for (var _i = 0, _a = response.ServiceList.TpEspServers.TpEspServer; _i < _a.length; _i++) {
+                      var item = _a[_i];
+                      if (util.exists("TpBindings.TpBinding", item)) {
+                          for (var _b = 0, _c = item.TpBindings.TpBinding; _b < _c.length; _b++) {
+                              var binding = _c[_b];
+                              if (binding.Service === type && binding.Protocol + ":" === rootProtocol) {
+                                  port = binding.Port;
+                              }
+                          }
+                      }
+                  }
               }
-          }).catch(function (e) {
-              console.error("Store.set(\"".concat(key, "\", \"").concat(value, "\") failed:"), e);
+              return "".concat(rootProtocol, "//").concat(ip, ":").concat(port, "/");
           });
       };
-      Store.prototype.get = function (key, broadcast) {
+      Topology.prototype.fetchTargetClusters = function () {
           var _this = this;
-          if (broadcast === void 0) { broadcast = true; }
-          return this.connection.Fetch({
-              StoreName: this.Name,
-              UserSpecific: this.UserSpecific,
-              Namespace: this.Namespace,
-              Key: key
-          }).then(function (response) {
-              var oldValue = _this._knownValues[key];
-              _this._knownValues[key] = response.Value;
-              if (broadcast) {
-                  _this._dispatch.post(new ValueChangedMessage(key, response.Value, oldValue));
-              }
-              return response.Value;
-          }).catch(function (e) {
-              console.error("Store.get(".concat(key, ") failed:"), e);
-              return undefined;
+          return this.connection.TpTargetClusterQuery({ Type: "ROOT" }).then(function (response) {
+              var _a, _b;
+              _this.set({
+                  TargetClusters: (_b = (_a = response.TpTargetClusters) === null || _a === void 0 ? void 0 : _a.TpTargetCluster) !== null && _b !== void 0 ? _b : []
+              });
+              return _this.CTargetClusters;
           });
       };
-      Store.prototype.getAll = function (broadcast) {
+      Topology.prototype.fetchLogicalClusters = function (request) {
           var _this = this;
-          if (broadcast === void 0) { broadcast = true; }
-          return this.connection.FetchAll({
-              StoreName: this.Name,
-              UserSpecific: this.UserSpecific,
-              Namespace: this.Namespace
-          }).then(function (response) {
-              var retVal = {};
-              var deletedValues = _this._knownValues;
-              _this._knownValues = {};
-              response.Pairs.Pair.forEach(function (pair) {
-                  var oldValue = _this._knownValues[pair.Key];
-                  _this._knownValues[pair.Key] = pair.Value;
-                  delete deletedValues[pair.Key];
-                  retVal[pair.Key] = pair.Value;
-                  if (broadcast) {
-                      _this._dispatch.post(new ValueChangedMessage(pair.Key, pair.Value, oldValue));
-                  }
+          if (request === void 0) { request = {}; }
+          return this.connection.TpLogicalClusterQuery(request).then(function (response) {
+              _this.set({
+                  LogicalClusters: response.TpLogicalClusters.TpLogicalCluster
               });
-              if (broadcast) {
-                  for (var key in deletedValues) {
-                      _this._dispatch.post(new ValueChangedMessage(key, undefined, deletedValues[key]));
-                  }
-              }
-              return retVal;
-          }).catch(function (e) {
-              console.error("Store.getAll failed:", e);
-              return {};
+              return _this.LogicalClusters;
           });
       };
-      Store.prototype.delete = function (key, broadcast) {
+      Topology.prototype.fetchServices = function (request) {
           var _this = this;
-          if (broadcast === void 0) { broadcast = true; }
-          return this.connection.Delete({
-              StoreName: this.Name,
-              UserSpecific: this.UserSpecific,
-              Namespace: this.Namespace,
-              Key: key
-          }).then(function (response) {
-              var oldValue = _this._knownValues[key];
-              delete _this._knownValues[key];
-              if (broadcast) {
-                  _this._dispatch.post(new ValueChangedMessage(key, undefined, oldValue));
-              }
-          }).catch(function (e) {
-              console.error("Store.delete(".concat(key, ") failed:"), e);
+          if (request === void 0) { request = {}; }
+          return this.connection.TpServiceQuery(request).then(function (response) {
+              _this.set({
+                  Services: response.ServiceList
+              });
+              return _this.Services;
           });
       };
-      Store.prototype.monitor = function (callback) {
-          return this._dispatch.attach(callback);
+      Topology.prototype.refresh = function (force) {
+          var _this = this;
+          if (force === void 0) { force = false; }
+          if (!this._prevRefresh || force) {
+              this._prevRefresh = Promise.all([this.fetchTargetClusters(), this.fetchLogicalClusters(), this.fetchServices()]).then(function () {
+                  return _this;
+              });
+          }
+          return this._prevRefresh;
       };
-      return Store;
-  }());
+      //  Monitoring  ---
+      //  Events  ---
+      Topology.prototype.on = function (eventID, propIDorCallback, callback) {
+          if (this.isCallback(propIDorCallback)) {
+              switch (eventID) {
+                  case "changed":
+                      _super.prototype.on.call(this, eventID, propIDorCallback);
+                      break;
+              }
+          }
+          else {
+              switch (eventID) {
+                  case "changed":
+                      _super.prototype.on.call(this, eventID, propIDorCallback, callback);
+                      break;
+              }
+          }
+          this._monitor();
+          return this;
+      };
+      return Topology;
+  }(util.StateObject));
 
-  var TargetClusterCache = /** @class */ (function (_super) {
-      __extends(TargetClusterCache, _super);
-      function TargetClusterCache() {
+  var logger$1 = util.scopedLogger("@hpcc-js/comms/ecl/query.ts");
+  var QueryCache = /** @class */ (function (_super) {
+      __extends(QueryCache, _super);
+      function QueryCache() {
           return _super.call(this, function (obj) {
-              return "".concat(obj.BaseUrl, "-").concat(obj.Name);
+              return util.Cache.hash([obj.QueryId, obj.QuerySet]);
           }) || this;
       }
-      return TargetClusterCache;
+      return QueryCache;
   }(util.Cache));
-  var _targetCluster = new TargetClusterCache();
-  var TargetCluster = /** @class */ (function (_super) {
-      __extends(TargetCluster, _super);
-      function TargetCluster(optsConnection, name) {
+  var _queries = new QueryCache();
+  var Query = /** @class */ (function (_super) {
+      __extends(Query, _super);
+      function Query(optsConnection, querySet, queryID, queryDetails) {
           var _this = _super.call(this) || this;
-          if (optsConnection instanceof TopologyService) {
-              _this.connection = optsConnection;
-              _this.machineConnection = new MachineService(optsConnection.connectionOptions());
+          if (optsConnection instanceof WorkunitsService) {
+              _this.wsWorkunitsService = optsConnection;
           }
           else {
-              _this.connection = new TopologyService(optsConnection);
-              _this.machineConnection = new MachineService(optsConnection);
+              _this.wsWorkunitsService = new WorkunitsService(optsConnection);
           }
-          _this.clear({
-              Name: name
-          });
+          _this.topology = Topology.attach(_this.wsWorkunitsService.opts());
+          _this.set(__assign({ QuerySet: querySet, QueryId: queryID }, queryDetails));
           return _this;
       }
-      Object.defineProperty(TargetCluster.prototype, "BaseUrl", {
-          get: function () { return this.connection.baseUrl; },
+      Object.defineProperty(Query.prototype, "BaseUrl", {
+          get: function () { return this.wsWorkunitsService.baseUrl; },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "properties", {
+          get: function () { return this.get(); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "Exceptions", {
+          get: function () { return this.get("Exceptions"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "QueryId", {
+          get: function () { return this.get("QueryId"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "QuerySet", {
+          get: function () { return this.get("QuerySet"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "QueryName", {
+          get: function () { return this.get("QueryName"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "Wuid", {
+          get: function () { return this.get("Wuid"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "Dll", {
+          get: function () { return this.get("Dll"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "Suspended", {
+          get: function () { return this.get("Suspended"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "Activated", {
+          get: function () { return this.get("Activated"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "SuspendedBy", {
+          get: function () { return this.get("SuspendedBy"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "Clusters", {
+          get: function () { return this.get("Clusters"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "PublishedBy", {
+          get: function () { return this.get("PublishedBy"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "Comment", {
+          get: function () { return this.get("Comment"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(TargetCluster.prototype, "Name", {
-          get: function () { return this.get("Name"); },
+      Object.defineProperty(Query.prototype, "LogicalFiles", {
+          get: function () { return this.get("LogicalFiles"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(TargetCluster.prototype, "Prefix", {
-          get: function () { return this.get("Prefix"); },
+      Object.defineProperty(Query.prototype, "SuperFiles", {
+          get: function () { return this.get("SuperFiles"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(TargetCluster.prototype, "Type", {
-          get: function () { return this.get("Type"); },
+      Object.defineProperty(Query.prototype, "IsLibrary", {
+          get: function () { return this.get("IsLibrary"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(TargetCluster.prototype, "IsDefault", {
-          get: function () { return this.get("IsDefault"); },
+      Object.defineProperty(Query.prototype, "Priority", {
+          get: function () { return this.get("Priority"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(TargetCluster.prototype, "TpClusters", {
-          get: function () { return this.get("TpClusters"); },
+      Object.defineProperty(Query.prototype, "WUSnapShot", {
+          get: function () { return this.get("WUSnapShot"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(TargetCluster.prototype, "TpEclCCServers", {
-          get: function () { return this.get("TpEclCCServers"); },
+      Object.defineProperty(Query.prototype, "CompileTime", {
+          get: function () { return this.get("CompileTime"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(TargetCluster.prototype, "TpEclServers", {
-          get: function () { return this.get("TpEclServers"); },
+      Object.defineProperty(Query.prototype, "LibrariesUsed", {
+          get: function () { return this.get("LibrariesUsed"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(TargetCluster.prototype, "TpEclAgents", {
-          get: function () { return this.get("TpEclAgents"); },
+      Object.defineProperty(Query.prototype, "CountGraphs", {
+          get: function () { return this.get("CountGraphs"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(TargetCluster.prototype, "TpEclSchedulers", {
-          get: function () { return this.get("TpEclSchedulers"); },
+      Object.defineProperty(Query.prototype, "ResourceURLCount", {
+          get: function () { return this.get("ResourceURLCount"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(TargetCluster.prototype, "MachineInfoEx", {
-          get: function () { return this.get("MachineInfoEx", []); },
+      Object.defineProperty(Query.prototype, "WsEclAddresses", {
+          get: function () { return this.get("WsEclAddresses"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(TargetCluster.prototype, "CMachineInfoEx", {
-          get: function () {
-              var _this = this;
-              return this.MachineInfoEx.map(function (machineInfoEx) { return Machine.attach(_this.machineConnection, machineInfoEx.Address, machineInfoEx); });
-          },
+      Object.defineProperty(Query.prototype, "WUGraphs", {
+          get: function () { return this.get("WUGraphs"); },
           enumerable: false,
           configurable: true
       });
-      TargetCluster.attach = function (optsConnection, name, state) {
-          var retVal = _targetCluster.get({ BaseUrl: optsConnection.baseUrl, Name: name }, function () {
-              return new TargetCluster(optsConnection, name);
+      Object.defineProperty(Query.prototype, "WUTimers", {
+          get: function () { return this.get("WUTimers"); },
+          enumerable: false,
+          configurable: true
+      });
+      Query.attach = function (optsConnection, querySet, queryId) {
+          var retVal = _queries.get({ BaseUrl: optsConnection.baseUrl, QuerySet: querySet, QueryId: queryId }, function () {
+              return new Query(optsConnection, querySet, queryId);
           });
-          if (state) {
-              retVal.set(__assign({}, state));
-          }
           return retVal;
       };
-      TargetCluster.prototype.fetchMachines = function (request) {
-          var _this = this;
-          if (request === void 0) { request = {}; }
-          return this.machineConnection.GetTargetClusterInfo(__assign({ TargetClusters: {
-                  Item: ["".concat(this.Type, ":").concat(this.Name)]
-              } }, request)).then(function (response) {
-              var retVal = [];
-              for (var _i = 0, _a = response.TargetClusterInfoList.TargetClusterInfo; _i < _a.length; _i++) {
-                  var machineInfo = _a[_i];
-                  for (var _b = 0, _c = machineInfo.Processes.MachineInfoEx; _b < _c.length; _b++) {
-                      var machineInfoEx = _c[_b];
-                      retVal.push(machineInfoEx);
+      Query.prototype.wsEclService = function () {
+          return __awaiter(this, void 0, void 0, function () {
+              return __generator(this, function (_a) {
+                  if (!this._eclService) {
+                      this._eclService = this.topology.fetchServices({}).then(function (services) {
+                          var _a, _b, _c, _d;
+                          for (var _i = 0, _e = (_b = (_a = services === null || services === void 0 ? void 0 : services.TpEspServers) === null || _a === void 0 ? void 0 : _a.TpEspServer) !== null && _b !== void 0 ? _b : []; _i < _e.length; _i++) {
+                              var espServer = _e[_i];
+                              for (var _f = 0, _g = (_d = (_c = espServer === null || espServer === void 0 ? void 0 : espServer.TpBindings) === null || _c === void 0 ? void 0 : _c.TpBinding) !== null && _d !== void 0 ? _d : []; _f < _g.length; _f++) {
+                                  var binding = _g[_f];
+                                  if ((binding === null || binding === void 0 ? void 0 : binding.Service) === "ws_ecl") {
+                                      var baseUrl = "".concat(binding.Protocol, "://").concat(globalThis.location.hostname, ":").concat(binding.Port);
+                                      return new EclService({ baseUrl: baseUrl });
+                                  }
+                              }
+                          }
+                          return undefined;
+                      });
                   }
-              }
-              _this.set("MachineInfoEx", retVal);
-              return _this.CMachineInfoEx;
+                  return [2 /*return*/, this._eclService];
+              });
           });
       };
-      TargetCluster.prototype.machineStats = function () {
-          var maxDisk = 0;
-          var totalFree = 0;
-          var total = 0;
-          for (var _i = 0, _a = this.CMachineInfoEx; _i < _a.length; _i++) {
-              var machine = _a[_i];
-              for (var _b = 0, _c = machine.Storage.StorageInfo; _b < _c.length; _b++) {
-                  var storageInfo = _c[_b];
-                  totalFree += storageInfo.Available;
-                  total += storageInfo.Total;
-                  var usage = 1 - storageInfo.Available / storageInfo.Total;
-                  if (usage > maxDisk) {
-                      maxDisk = usage;
+      Query.prototype.fetchDetails = function () {
+          return __awaiter(this, void 0, void 0, function () {
+              var queryDetails;
+              return __generator(this, function (_a) {
+                  switch (_a.label) {
+                      case 0: return [4 /*yield*/, this.wsWorkunitsService.WUQueryDetails({
+                              QuerySet: this.QuerySet,
+                              QueryId: this.QueryId,
+                              IncludeStateOnClusters: true,
+                              IncludeSuperFiles: true,
+                              IncludeWsEclAddresses: true,
+                              CheckAllNodes: false
+                          })];
+                      case 1:
+                          queryDetails = _a.sent();
+                          this.set(__assign({}, queryDetails));
+                          return [2 /*return*/];
                   }
-              }
-          }
-          return {
-              maxDisk: maxDisk,
-              meanDisk: 1 - (total ? totalFree / total : 1)
-          };
+              });
+          });
       };
-      TargetCluster.prototype.fetchUsage = function () {
-          return this.machineConnection.GetTargetClusterUsageEx([this.Name]);
+      Query.prototype.fetchRequestSchema = function () {
+          var _a;
+          return __awaiter(this, void 0, void 0, function () {
+              var wsEclService, _b, e_1;
+              return __generator(this, function (_c) {
+                  switch (_c.label) {
+                      case 0: return [4 /*yield*/, this.wsEclService()];
+                      case 1:
+                          wsEclService = _c.sent();
+                          _c.label = 2;
+                      case 2:
+                          _c.trys.push([2, 4, , 5]);
+                          _b = this;
+                          return [4 /*yield*/, (wsEclService === null || wsEclService === void 0 ? void 0 : wsEclService.requestJson(this.QuerySet, this.QueryId))];
+                      case 3:
+                          _b._requestSchema = (_a = _c.sent()) !== null && _a !== void 0 ? _a : [];
+                          return [3 /*break*/, 5];
+                      case 4:
+                          e_1 = _c.sent();
+                          //  See:  https://track.hpccsystems.com/browse/HPCC-29827
+                          logger$1.debug(e_1);
+                          this._requestSchema = [];
+                          return [3 /*break*/, 5];
+                      case 5: return [2 /*return*/];
+                  }
+              });
+          });
       };
-      return TargetCluster;
-  }(util.StateObject));
-  function targetClusters(optsConnection) {
-      var connection;
-      if (optsConnection instanceof TopologyService) {
-          connection = optsConnection;
-      }
-      else {
-          connection = new TopologyService(optsConnection);
-      }
-      return connection.TpListTargetClusters({}).then(function (response) {
-          return response.TargetClusters.TpClusterNameType.map(function (item) { return TargetCluster.attach(optsConnection, item.Name, item); });
-      });
-  }
-  var _defaultTargetCluster = {};
-  function defaultTargetCluster(optsConnection) {
-      if (!_defaultTargetCluster[optsConnection.baseUrl]) {
-          var connection = void 0;
-          if (optsConnection instanceof TopologyService) {
-              connection = optsConnection;
-          }
-          else {
-              connection = new TopologyService(optsConnection);
-          }
-          _defaultTargetCluster[optsConnection.baseUrl] = connection.TpListTargetClusters({}).then(function (response) {
-              var firstItem;
-              var defaultItem;
-              var hthorItem;
-              response.TargetClusters.TpClusterNameType.forEach(function (item) {
-                  if (!firstItem) {
-                      firstItem = item;
+      Query.prototype.fetchResponseSchema = function () {
+          var _a;
+          return __awaiter(this, void 0, void 0, function () {
+              var wsEclService, _b, e_2;
+              return __generator(this, function (_c) {
+                  switch (_c.label) {
+                      case 0: return [4 /*yield*/, this.wsEclService()];
+                      case 1:
+                          wsEclService = _c.sent();
+                          _c.label = 2;
+                      case 2:
+                          _c.trys.push([2, 4, , 5]);
+                          _b = this;
+                          return [4 /*yield*/, (wsEclService === null || wsEclService === void 0 ? void 0 : wsEclService.responseJson(this.QuerySet, this.QueryId))];
+                      case 3:
+                          _b._responseSchema = (_a = _c.sent()) !== null && _a !== void 0 ? _a : {};
+                          return [3 /*break*/, 5];
+                      case 4:
+                          e_2 = _c.sent();
+                          //  See:  https://track.hpccsystems.com/browse/HPCC-29827
+                          logger$1.debug(e_2);
+                          this._responseSchema = {};
+                          return [3 /*break*/, 5];
+                      case 5: return [2 /*return*/];
                   }
-                  if (!defaultItem && item.IsDefault === true) {
-                      defaultItem = item;
+              });
+          });
+      };
+      Query.prototype.fetchSchema = function () {
+          return __awaiter(this, void 0, void 0, function () {
+              return __generator(this, function (_a) {
+                  switch (_a.label) {
+                      case 0: return [4 /*yield*/, Promise.all([this.fetchRequestSchema(), this.fetchResponseSchema()])];
+                      case 1:
+                          _a.sent();
+                          return [2 /*return*/];
                   }
-                  if (!hthorItem && item.Type === "hthor") {
-                      hthorItem = item;
+              });
+          });
+      };
+      Query.prototype.fetchSummaryStats = function () {
+          return this.wsWorkunitsService.WUQueryGetSummaryStats({ Target: this.QuerySet, QueryId: this.QueryId });
+      };
+      Query.prototype.submit = function (request) {
+          var _a;
+          return __awaiter(this, void 0, void 0, function () {
+              var wsEclService;
+              return __generator(this, function (_b) {
+                  switch (_b.label) {
+                      case 0: return [4 /*yield*/, this.wsEclService()];
+                      case 1:
+                          wsEclService = _b.sent();
+                          try {
+                              return [2 /*return*/, (_a = wsEclService === null || wsEclService === void 0 ? void 0 : wsEclService.submit(this.QuerySet, this.QueryId, request).then(function (results) {
+                                      for (var key in results) {
+                                          results[key] = results[key].Row;
+                                      }
+                                      return results;
+                                  })) !== null && _a !== void 0 ? _a : []];
+                          }
+                          catch (e) {
+                              //  See:  https://track.hpccsystems.com/browse/HPCC-29827
+                              logger$1.debug(e);
+                              return [2 /*return*/, []];
+                          }
+                          return [2 /*return*/];
                   }
               });
-              var defItem = defaultItem || hthorItem || firstItem;
-              return TargetCluster.attach(optsConnection, defItem.Name, defItem);
           });
-      }
-      return _defaultTargetCluster[optsConnection.baseUrl];
-  }
+      };
+      Query.prototype.refresh = function () {
+          return __awaiter(this, void 0, void 0, function () {
+              return __generator(this, function (_a) {
+                  switch (_a.label) {
+                      case 0: return [4 /*yield*/, Promise.all([
+                              this.fetchDetails(),
+                              this.fetchSchema()
+                          ])];
+                      case 1:
+                          _a.sent();
+                          return [2 /*return*/, this];
+                  }
+              });
+          });
+      };
+      Query.prototype.requestFields = function () {
+          if (!this._requestSchema)
+              return [];
+          return this._requestSchema;
+      };
+      Query.prototype.responseFields = function () {
+          if (!this._responseSchema)
+              return {};
+          return this._responseSchema;
+      };
+      Query.prototype.resultNames = function () {
+          var retVal = [];
+          for (var key in this.responseFields()) {
+              retVal.push(key);
+          }
+          return retVal;
+      };
+      Query.prototype.resultFields = function (resultName) {
+          if (!this._responseSchema[resultName])
+              return [];
+          return this._responseSchema[resultName];
+      };
+      return Query;
+  }(util.StateObject));
 
-  var TopologyCache = /** @class */ (function (_super) {
-      __extends(TopologyCache, _super);
-      function TopologyCache() {
+  var StoreCache = /** @class */ (function (_super) {
+      __extends(StoreCache, _super);
+      function StoreCache() {
           return _super.call(this, function (obj) {
-              return obj.BaseUrl;
+              return "".concat(obj.BaseUrl, "-").concat(obj.Name, ":").concat(obj.UserSpecific, "-").concat(obj.Namespace);
           }) || this;
       }
-      return TopologyCache;
+      return StoreCache;
   }(util.Cache));
-  var _topology = new TopologyCache();
-  var Topology = /** @class */ (function (_super) {
-      __extends(Topology, _super);
-      function Topology(optsConnection) {
+  var _store = new StoreCache();
+  var ValueChangedMessage = /** @class */ (function (_super) {
+      __extends(ValueChangedMessage, _super);
+      function ValueChangedMessage(key, value, oldValue) {
           var _this = _super.call(this) || this;
-          if (optsConnection instanceof TopologyService) {
-              _this.connection = optsConnection;
-          }
-          else {
-              _this.connection = new TopologyService(optsConnection);
-          }
+          _this.key = key;
+          _this.value = value;
+          _this.oldValue = oldValue;
           return _this;
       }
-      Object.defineProperty(Topology.prototype, "BaseUrl", {
-          get: function () { return this.connection.baseUrl; },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Topology.prototype, "properties", {
-          //  Accessors  ---
-          get: function () { return this.get(); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Topology.prototype, "TargetClusters", {
-          get: function () { return this.get("TargetClusters"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Topology.prototype, "CTargetClusters", {
-          get: function () {
-              var _this = this;
-              return this.TargetClusters.map(function (tc) { return TargetCluster.attach(_this.connection, tc.Name, tc); });
-          },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(Topology.prototype, "LogicalClusters", {
-          get: function () { return this.get("LogicalClusters"); },
+      Object.defineProperty(ValueChangedMessage.prototype, "canConflate", {
+          get: function () { return true; },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Topology.prototype, "Services", {
-          get: function () { return this.get("Services"); },
+      ValueChangedMessage.prototype.conflate = function (other) {
+          if (this.key === other.key) {
+              this.value = other.value;
+              return true;
+          }
+          return false;
+      };
+      ValueChangedMessage.prototype.void = function () {
+          return this.value === this.oldValue;
+      };
+      return ValueChangedMessage;
+  }(util.Message));
+  var Store = /** @class */ (function () {
+      function Store(optsConnection, Name, Namespace, UserSpecific) {
+          this._dispatch = new util.Dispatch();
+          this._knownValues = {};
+          if (optsConnection instanceof StoreService) {
+              this.connection = optsConnection;
+          }
+          else {
+              this.connection = new StoreService(optsConnection);
+          }
+          this.Name = Name;
+          this.UserSpecific = UserSpecific;
+          this.Namespace = Namespace;
+      }
+      Object.defineProperty(Store.prototype, "BaseUrl", {
+          get: function () { return this.connection.baseUrl; },
           enumerable: false,
           configurable: true
       });
-      Topology.attach = function (optsConnection) {
-          var retVal = _topology.get({ BaseUrl: optsConnection.baseUrl }, function () {
-              return new Topology(optsConnection);
+      Store.attach = function (optsConnection, Name, Namespace, UserSpecific) {
+          if (Name === void 0) { Name = "HPCCApps"; }
+          if (UserSpecific === void 0) { UserSpecific = true; }
+          var retVal = _store.get({ BaseUrl: optsConnection.baseUrl, Name: Name, UserSpecific: UserSpecific, Namespace: Namespace }, function () {
+              return new Store(optsConnection, Name, Namespace, UserSpecific);
           });
           return retVal;
       };
-      Topology.prototype.GetESPServiceBaseURL = function (type) {
+      Store.prototype.create = function () {
+          this.connection.CreateStore({ Name: this.Name, UserSpecific: this.UserSpecific, Type: "", Description: "" });
+      };
+      Store.prototype.set = function (key, value, broadcast) {
           var _this = this;
-          if (type === void 0) { type = ""; }
-          return this.connection.TpServiceQuery({}).then(function (response) {
-              var rootProtocol = _this.connection.protocol();
-              var ip = _this.connection.ip();
-              var port = rootProtocol === "https:" ? "18002" : "8002";
-              if (util.exists("ServiceList.TpEspServers.TpEspServer", response)) {
-                  for (var _i = 0, _a = response.ServiceList.TpEspServers.TpEspServer; _i < _a.length; _i++) {
-                      var item = _a[_i];
-                      if (util.exists("TpBindings.TpBinding", item)) {
-                          for (var _b = 0, _c = item.TpBindings.TpBinding; _b < _c.length; _b++) {
-                              var binding = _c[_b];
-                              if (binding.Service === type && binding.Protocol + ":" === rootProtocol) {
-                                  port = binding.Port;
-                              }
-                          }
-                      }
-                  }
+          if (broadcast === void 0) { broadcast = true; }
+          return this.connection.Set({
+              StoreName: this.Name,
+              UserSpecific: this.UserSpecific,
+              Namespace: this.Namespace,
+              Key: key,
+              Value: value
+          }).then(function (response) {
+              var oldValue = _this._knownValues[key];
+              _this._knownValues[key] = value;
+              if (broadcast) {
+                  _this._dispatch.post(new ValueChangedMessage(key, value, oldValue));
               }
-              return "".concat(rootProtocol, "//").concat(ip, ":").concat(port, "/");
+          }).catch(function (e) {
+              console.error("Store.set(\"".concat(key, "\", \"").concat(value, "\") failed:"), e);
           });
       };
-      Topology.prototype.fetchTargetClusters = function () {
+      Store.prototype.get = function (key, broadcast) {
           var _this = this;
-          return this.connection.TpTargetClusterQuery({ Type: "ROOT" }).then(function (response) {
-              var _a, _b;
-              _this.set({
-                  TargetClusters: (_b = (_a = response.TpTargetClusters) === null || _a === void 0 ? void 0 : _a.TpTargetCluster) !== null && _b !== void 0 ? _b : []
-              });
-              return _this.CTargetClusters;
+          if (broadcast === void 0) { broadcast = true; }
+          return this.connection.Fetch({
+              StoreName: this.Name,
+              UserSpecific: this.UserSpecific,
+              Namespace: this.Namespace,
+              Key: key
+          }).then(function (response) {
+              var oldValue = _this._knownValues[key];
+              _this._knownValues[key] = response.Value;
+              if (broadcast) {
+                  _this._dispatch.post(new ValueChangedMessage(key, response.Value, oldValue));
+              }
+              return response.Value;
+          }).catch(function (e) {
+              console.error("Store.get(".concat(key, ") failed:"), e);
+              return undefined;
           });
       };
-      Topology.prototype.fetchLogicalClusters = function (request) {
+      Store.prototype.getAll = function (broadcast) {
           var _this = this;
-          if (request === void 0) { request = {}; }
-          return this.connection.TpLogicalClusterQuery(request).then(function (response) {
-              _this.set({
-                  LogicalClusters: response.TpLogicalClusters.TpLogicalCluster
+          if (broadcast === void 0) { broadcast = true; }
+          return this.connection.FetchAll({
+              StoreName: this.Name,
+              UserSpecific: this.UserSpecific,
+              Namespace: this.Namespace
+          }).then(function (response) {
+              var retVal = {};
+              var deletedValues = _this._knownValues;
+              _this._knownValues = {};
+              response.Pairs.Pair.forEach(function (pair) {
+                  var oldValue = _this._knownValues[pair.Key];
+                  _this._knownValues[pair.Key] = pair.Value;
+                  delete deletedValues[pair.Key];
+                  retVal[pair.Key] = pair.Value;
+                  if (broadcast) {
+                      _this._dispatch.post(new ValueChangedMessage(pair.Key, pair.Value, oldValue));
+                  }
               });
-              return _this.LogicalClusters;
+              if (broadcast) {
+                  for (var key in deletedValues) {
+                      _this._dispatch.post(new ValueChangedMessage(key, undefined, deletedValues[key]));
+                  }
+              }
+              return retVal;
+          }).catch(function (e) {
+              console.error("Store.getAll failed:", e);
+              return {};
           });
       };
-      Topology.prototype.fetchServices = function (request) {
+      Store.prototype.delete = function (key, broadcast) {
           var _this = this;
-          if (request === void 0) { request = {}; }
-          return this.connection.TpServiceQuery(request).then(function (response) {
-              _this.set({
-                  Services: response.ServiceList
-              });
-              return _this.Services;
+          if (broadcast === void 0) { broadcast = true; }
+          return this.connection.Delete({
+              StoreName: this.Name,
+              UserSpecific: this.UserSpecific,
+              Namespace: this.Namespace,
+              Key: key
+          }).then(function (response) {
+              var oldValue = _this._knownValues[key];
+              delete _this._knownValues[key];
+              if (broadcast) {
+                  _this._dispatch.post(new ValueChangedMessage(key, undefined, oldValue));
+              }
+          }).catch(function (e) {
+              console.error("Store.delete(".concat(key, ") failed:"), e);
           });
       };
-      Topology.prototype.refresh = function (force) {
-          var _this = this;
-          if (force === void 0) { force = false; }
-          if (!this._prevRefresh || force) {
-              this._prevRefresh = Promise.all([this.fetchTargetClusters(), this.fetchLogicalClusters(), this.fetchServices()]).then(function () {
-                  return _this;
-              });
-          }
-          return this._prevRefresh;
-      };
-      //  Monitoring  ---
-      //  Events  ---
-      Topology.prototype.on = function (eventID, propIDorCallback, callback) {
-          if (this.isCallback(propIDorCallback)) {
-              switch (eventID) {
-                  case "changed":
-                      _super.prototype.on.call(this, eventID, propIDorCallback);
-                      break;
-              }
-          }
-          else {
-              switch (eventID) {
-                  case "changed":
-                      _super.prototype.on.call(this, eventID, propIDorCallback, callback);
-                      break;
-              }
-          }
-          this._monitor();
-          return this;
+      Store.prototype.monitor = function (callback) {
+          return this._dispatch.attach(callback);
       };
-      return Topology;
-  }(util.StateObject));
+      return Store;
+  }());
 
   var logger = util.scopedLogger("@hpcc-js/comms/dfuWorkunit.ts");
   var States;
@@ -8417,6 +8814,16 @@
           enumerable: false,
           configurable: true
       });
+      Object.defineProperty(DFUWorkunit.prototype, "KbPerSecAve", {
+          get: function () { return this.get("KbPerSecAve"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(DFUWorkunit.prototype, "KbPerSec", {
+          get: function () { return this.get("KbPerSec"); },
+          enumerable: false,
+          configurable: true
+      });
       //  Factories  ---
       DFUWorkunit.create = function (optsConnection, dfuServerQueue) {
           var retVal = new DFUWorkunit(optsConnection);
@@ -8462,6 +8869,21 @@
               });
           });
       };
+      DFUWorkunit.prototype.update = function (request) {
+          var _a, _b, _c, _d;
+          return this.connection.UpdateDFUWorkunitEx({
+              wu: {
+                  JobName: (_b = (_a = request === null || request === void 0 ? void 0 : request.wu) === null || _a === void 0 ? void 0 : _a.JobName) !== null && _b !== void 0 ? _b : this.JobName,
+                  isProtected: (_d = (_c = request === null || request === void 0 ? void 0 : request.wu) === null || _c === void 0 ? void 0 : _c.isProtected) !== null && _d !== void 0 ? _d : this.isProtected,
+                  ID: this.ID,
+                  State: this.State
+              },
+              ClusterOrig: this.ClusterName,
+              JobNameOrig: this.JobName,
+              isProtectedOrig: this.isProtected,
+              StateOrig: this.State
+          });
+      };
       DFUWorkunit.prototype.isComplete = function () {
           switch (this.State) {
               case States.Finished:
@@ -8488,6 +8910,12 @@
       DFUWorkunit.prototype.isRunning = function () {
           return !this.isComplete();
       };
+      DFUWorkunit.prototype.abort = function () {
+          return this.connection.AbortDFUWorkunit({ wuid: this.ID });
+      };
+      DFUWorkunit.prototype.delete = function () {
+          return this.DFUWUAction(exports.FileSpray.DFUWUActions.Delete);
+      };
       DFUWorkunit.prototype.refresh = function (full) {
           return __awaiter(this, void 0, void 0, function () {
               return __generator(this, function (_a) {
@@ -8500,6 +8928,9 @@
               });
           });
       };
+      DFUWorkunit.prototype.fetchXML = function (callback) {
+          return this.DFUWUFile();
+      };
       //  Monitoring  ---
       DFUWorkunit.prototype._monitor = function () {
           if (this.isComplete()) {
@@ -8521,6 +8952,29 @@
           }
           return retVal;
       };
+      DFUWorkunit.prototype.DFUWUFile = function (_request) {
+          if (_request === void 0) { _request = {}; }
+          return this.connection.DFUWUFile(__assign(__assign({}, _request), { Wuid: this.ID })).then(function (response) {
+              //TODO: additional processing?
+              return response;
+          }).catch(function (e) {
+              return {};
+          });
+      };
+      DFUWorkunit.prototype.DFUWUAction = function (actionType) {
+          var _this = this;
+          return this.connection.DFUWorkunitsAction({
+              wuids: { Item: [this.ID] },
+              Type: actionType
+          }).then(function (response) {
+              if (actionType === exports.FileSpray.DFUWUActions.Delete)
+                  return response;
+              return _this.refresh().then(function () {
+                  _this._monitor();
+                  return response;
+              });
+          });
+      };
       //  Events  ---
       DFUWorkunit.prototype.on = function (eventID, propIDorCallback, callback) {
           var _this = this;