@hpcc-js/comms 2.83.0 → 2.83.1

package/dist/index.js

@@ -611,8 +611,8 @@
   }
 
   var PKG_NAME = "@hpcc-js/comms";
-  var PKG_VERSION = "2.83.0";
-  var BUILD_VERSION = "2.104.22";
+  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);
@@ -1991,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";
@@ -2193,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 {
@@ -2202,7 +2202,7 @@
                                       };
                                   }
                                   catch (e) {
-                                      logger$2.error(e);
+                                      logger$3.error(e);
                                   }
                                   return {
                                       lines: [],
@@ -5590,7 +5590,7 @@
       }
       return num;
   }
-  var logger$1 = util.scopedLogger("workunit.ts");
+  var logger$2 = util.scopedLogger("workunit.ts");
   var WUStateID = exports.WUStateID;
   var WorkunitCache = /** @class */ (function (_super) {
       __extends(WorkunitCache, _super);
@@ -6706,7 +6706,7 @@
                   return false;
               });
               if (!wuMissing) {
-                  logger$1.warning("Unexpected exception:  ");
+                  logger$2.warning("Unexpected exception:  ");
                   throw e;
               }
               return {};
@@ -6743,7 +6743,7 @@
                   return false;
               });
               if (!wuMissing) {
-                  logger$1.warning("Unexpected exception:  ");
+                  logger$2.warning("Unexpected exception:  ");
                   throw e;
               }
               return {};
@@ -6832,7 +6832,7 @@
               }
               return new util.XMLNode(command);
           }).catch(function (_) {
-              logger$1.error(_);
+              logger$2.error(_);
               return Promise.resolve(new util.XMLNode(command));
           });
       };
@@ -7651,158 +7651,492 @@
       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"); },
+      Object.defineProperty(TargetCluster.prototype, "Name", {
+          get: function () { return this.get("Name"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "Suspended", {
-          get: function () { return this.get("Suspended"); },
+      Object.defineProperty(TargetCluster.prototype, "Prefix", {
+          get: function () { return this.get("Prefix"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "Activated", {
-          get: function () { return this.get("Activated"); },
+      Object.defineProperty(TargetCluster.prototype, "Type", {
+          get: function () { return this.get("Type"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "SuspendedBy", {
-          get: function () { return this.get("SuspendedBy"); },
+      Object.defineProperty(TargetCluster.prototype, "IsDefault", {
+          get: function () { return this.get("IsDefault"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "Clusters", {
-          get: function () { return this.get("Clusters"); },
+      Object.defineProperty(TargetCluster.prototype, "TpClusters", {
+          get: function () { return this.get("TpClusters"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "PublishedBy", {
-          get: function () { return this.get("PublishedBy"); },
+      Object.defineProperty(TargetCluster.prototype, "TpEclCCServers", {
+          get: function () { return this.get("TpEclCCServers"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "Comment", {
-          get: function () { return this.get("Comment"); },
+      Object.defineProperty(TargetCluster.prototype, "TpEclServers", {
+          get: function () { return this.get("TpEclServers"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "LogicalFiles", {
-          get: function () { return this.get("LogicalFiles"); },
+      Object.defineProperty(TargetCluster.prototype, "TpEclAgents", {
+          get: function () { return this.get("TpEclAgents"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "SuperFiles", {
-          get: function () { return this.get("SuperFiles"); },
+      Object.defineProperty(TargetCluster.prototype, "TpEclSchedulers", {
+          get: function () { return this.get("TpEclSchedulers"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "IsLibrary", {
-          get: function () { return this.get("IsLibrary"); },
+      Object.defineProperty(TargetCluster.prototype, "MachineInfoEx", {
+          get: function () { return this.get("MachineInfoEx", []); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "Priority", {
-          get: function () { return this.get("Priority"); },
+      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
       });
-      Object.defineProperty(Query.prototype, "WUSnapShot", {
-          get: function () { return this.get("WUSnapShot"); },
-          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);
+          });
+          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);
+                  }
+              }
+              _this.set("MachineInfoEx", retVal);
+              return _this.CMachineInfoEx;
+          });
+      };
+      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)
+          };
+      };
+      TargetCluster.prototype.fetchUsage = function () {
+          return this.machineConnection.GetTargetClusterUsageEx([this.Name]);
+      };
+      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); });
       });
-      Object.defineProperty(Query.prototype, "CompileTime", {
-          get: function () { return this.get("CompileTime"); },
+  }
+  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;
+                  }
+                  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);
+          });
+      }
+      return _defaultTargetCluster[optsConnection.baseUrl];
+  }
+
+  var TopologyCache = /** @class */ (function (_super) {
+      __extends(TopologyCache, _super);
+      function TopologyCache() {
+          return _super.call(this, function (obj) {
+              return obj.BaseUrl;
+          }) || this;
+      }
+      return TopologyCache;
+  }(util.Cache));
+  var _topology = new TopologyCache();
+  var Topology = /** @class */ (function (_super) {
+      __extends(Topology, _super);
+      function Topology(optsConnection) {
+          var _this = _super.call(this) || this;
+          if (optsConnection instanceof TopologyService) {
+              _this.connection = optsConnection;
+          }
+          else {
+              _this.connection = new TopologyService(optsConnection);
+          }
+          return _this;
+      }
+      Object.defineProperty(Topology.prototype, "BaseUrl", {
+          get: function () { return this.connection.baseUrl; },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "LibrariesUsed", {
-          get: function () { return this.get("LibrariesUsed"); },
+      Object.defineProperty(Topology.prototype, "properties", {
+          //  Accessors  ---
+          get: function () { return this.get(); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "CountGraphs", {
-          get: function () { return this.get("CountGraphs"); },
+      Object.defineProperty(Topology.prototype, "TargetClusters", {
+          get: function () { return this.get("TargetClusters"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "ResourceURLCount", {
-          get: function () { return this.get("ResourceURLCount"); },
+      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(Query.prototype, "WsEclAddresses", {
-          get: function () { return this.get("WsEclAddresses"); },
+      Object.defineProperty(Topology.prototype, "LogicalClusters", {
+          get: function () { return this.get("LogicalClusters"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "WUGraphs", {
-          get: function () { return this.get("WUGraphs"); },
+      Object.defineProperty(Topology.prototype, "Services", {
+          get: function () { return this.get("Services"); },
           enumerable: false,
           configurable: true
       });
-      Object.defineProperty(Query.prototype, "WUTimers", {
+      Topology.attach = function (optsConnection) {
+          var retVal = _topology.get({ BaseUrl: optsConnection.baseUrl }, function () {
+              return new Topology(optsConnection);
+          });
+          return retVal;
+      };
+      Topology.prototype.GetESPServiceBaseURL = function (type) {
+          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;
+                              }
+                          }
+                      }
+                  }
+              }
+              return "".concat(rootProtocol, "//").concat(ip, ":").concat(port, "/");
+          });
+      };
+      Topology.prototype.fetchTargetClusters = function () {
+          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;
+          });
+      };
+      Topology.prototype.fetchLogicalClusters = function (request) {
+          var _this = this;
+          if (request === void 0) { request = {}; }
+          return this.connection.TpLogicalClusterQuery(request).then(function (response) {
+              _this.set({
+                  LogicalClusters: response.TpLogicalClusters.TpLogicalCluster
+              });
+              return _this.LogicalClusters;
+          });
+      };
+      Topology.prototype.fetchServices = function (request) {
+          var _this = this;
+          if (request === void 0) { request = {}; }
+          return this.connection.TpServiceQuery(request).then(function (response) {
+              _this.set({
+                  Services: response.ServiceList
+              });
+              return _this.Services;
+          });
+      };
+      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;
+      };
+      return Topology;
+  }(util.StateObject));
+
+  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 util.Cache.hash([obj.QueryId, obj.QuerySet]);
+          }) || this;
+      }
+      return QueryCache;
+  }(util.Cache));
+  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 WorkunitsService) {
+              _this.wsWorkunitsService = optsConnection;
+          }
+          else {
+              _this.wsWorkunitsService = new WorkunitsService(optsConnection);
+          }
+          _this.topology = Topology.attach(_this.wsWorkunitsService.opts());
+          _this.set(__assign({ QuerySet: querySet, QueryId: queryID }, queryDetails));
+          return _this;
+      }
+      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(Query.prototype, "LogicalFiles", {
+          get: function () { return this.get("LogicalFiles"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "SuperFiles", {
+          get: function () { return this.get("SuperFiles"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "IsLibrary", {
+          get: function () { return this.get("IsLibrary"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "Priority", {
+          get: function () { return this.get("Priority"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "WUSnapShot", {
+          get: function () { return this.get("WUSnapShot"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "CompileTime", {
+          get: function () { return this.get("CompileTime"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "LibrariesUsed", {
+          get: function () { return this.get("LibrariesUsed"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "CountGraphs", {
+          get: function () { return this.get("CountGraphs"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "ResourceURLCount", {
+          get: function () { return this.get("ResourceURLCount"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "WsEclAddresses", {
+          get: function () { return this.get("WsEclAddresses"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "WUGraphs", {
+          get: function () { return this.get("WUGraphs"); },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(Query.prototype, "WUTimers", {
           get: function () { return this.get("WUTimers"); },
           enumerable: false,
           configurable: true
@@ -7813,17 +8147,40 @@
           });
           return retVal;
       };
+      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;
+                      });
+                  }
+                  return [2 /*return*/, this._eclService];
+              });
+          });
+      };
       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({
+                      case 0: return [4 /*yield*/, this.wsWorkunitsService.WUQueryDetails({
                               QuerySet: this.QuerySet,
                               QueryId: this.QueryId,
-                              IncludeStateOnClusters: false,
-                              IncludeSuperFiles: false,
-                              IncludeWsEclAddresses: false,
+                              IncludeStateOnClusters: true,
+                              IncludeSuperFiles: true,
+                              IncludeWsEclAddresses: true,
                               CheckAllNodes: false
                           })];
                       case 1:
@@ -7835,31 +8192,57 @@
           });
       };
       Query.prototype.fetchRequestSchema = function () {
+          var _a;
           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)];
+              var wsEclService, _b, e_1;
+              return __generator(this, function (_c) {
+                  switch (_c.label) {
+                      case 0: return [4 /*yield*/, this.wsEclService()];
                       case 1:
-                          _a._requestSchema = _b.sent();
-                          return [2 /*return*/];
+                          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*/];
                   }
               });
           });
       };
       Query.prototype.fetchResponseSchema = function () {
+          var _a;
           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)];
+              var wsEclService, _b, e_2;
+              return __generator(this, function (_c) {
+                  switch (_c.label) {
+                      case 0: return [4 /*yield*/, this.wsEclService()];
                       case 1:
-                          _a._responseSchema = _b.sent();
-                          return [2 /*return*/];
+                          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*/];
                   }
               });
           });
@@ -7877,14 +8260,33 @@
           });
       };
       Query.prototype.fetchSummaryStats = function () {
-          return this._wsWorkunits.WUQueryGetSummaryStats({ Target: this.QuerySet, QueryId: this.QueryId });
+          return this.wsWorkunitsService.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;
+          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*/];
+                  }
+              });
           });
       };
       Query.prototype.refresh = function () {
@@ -8087,341 +8489,6 @@
       return Store;
   }());
 
-  var TargetClusterCache = /** @class */ (function (_super) {
-      __extends(TargetClusterCache, _super);
-      function TargetClusterCache() {
-          return _super.call(this, function (obj) {
-              return "".concat(obj.BaseUrl, "-").concat(obj.Name);
-          }) || this;
-      }
-      return TargetClusterCache;
-  }(util.Cache));
-  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 TopologyService) {
-              _this.connection = optsConnection;
-              _this.machineConnection = new MachineService(optsConnection.connectionOptions());
-          }
-          else {
-              _this.connection = new TopologyService(optsConnection);
-              _this.machineConnection = new MachineService(optsConnection);
-          }
-          _this.clear({
-              Name: name
-          });
-          return _this;
-      }
-      Object.defineProperty(TargetCluster.prototype, "BaseUrl", {
-          get: function () { return this.connection.baseUrl; },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(TargetCluster.prototype, "Name", {
-          get: function () { return this.get("Name"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(TargetCluster.prototype, "Prefix", {
-          get: function () { return this.get("Prefix"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(TargetCluster.prototype, "Type", {
-          get: function () { return this.get("Type"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(TargetCluster.prototype, "IsDefault", {
-          get: function () { return this.get("IsDefault"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(TargetCluster.prototype, "TpClusters", {
-          get: function () { return this.get("TpClusters"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(TargetCluster.prototype, "TpEclCCServers", {
-          get: function () { return this.get("TpEclCCServers"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(TargetCluster.prototype, "TpEclServers", {
-          get: function () { return this.get("TpEclServers"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(TargetCluster.prototype, "TpEclAgents", {
-          get: function () { return this.get("TpEclAgents"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(TargetCluster.prototype, "TpEclSchedulers", {
-          get: function () { return this.get("TpEclSchedulers"); },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(TargetCluster.prototype, "MachineInfoEx", {
-          get: function () { return this.get("MachineInfoEx", []); },
-          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); });
-          },
-          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);
-          });
-          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);
-                  }
-              }
-              _this.set("MachineInfoEx", retVal);
-              return _this.CMachineInfoEx;
-          });
-      };
-      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)
-          };
-      };
-      TargetCluster.prototype.fetchUsage = function () {
-          return this.machineConnection.GetTargetClusterUsageEx([this.Name]);
-      };
-      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;
-                  }
-                  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);
-          });
-      }
-      return _defaultTargetCluster[optsConnection.baseUrl];
-  }
-
-  var TopologyCache = /** @class */ (function (_super) {
-      __extends(TopologyCache, _super);
-      function TopologyCache() {
-          return _super.call(this, function (obj) {
-              return obj.BaseUrl;
-          }) || this;
-      }
-      return TopologyCache;
-  }(util.Cache));
-  var _topology = new TopologyCache();
-  var Topology = /** @class */ (function (_super) {
-      __extends(Topology, _super);
-      function Topology(optsConnection) {
-          var _this = _super.call(this) || this;
-          if (optsConnection instanceof TopologyService) {
-              _this.connection = optsConnection;
-          }
-          else {
-              _this.connection = new TopologyService(optsConnection);
-          }
-          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"); },
-          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;
-      };
-      Topology.prototype.GetESPServiceBaseURL = function (type) {
-          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;
-                              }
-                          }
-                      }
-                  }
-              }
-              return "".concat(rootProtocol, "//").concat(ip, ":").concat(port, "/");
-          });
-      };
-      Topology.prototype.fetchTargetClusters = function () {
-          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;
-          });
-      };
-      Topology.prototype.fetchLogicalClusters = function (request) {
-          var _this = this;
-          if (request === void 0) { request = {}; }
-          return this.connection.TpLogicalClusterQuery(request).then(function (response) {
-              _this.set({
-                  LogicalClusters: response.TpLogicalClusters.TpLogicalCluster
-              });
-              return _this.LogicalClusters;
-          });
-      };
-      Topology.prototype.fetchServices = function (request) {
-          var _this = this;
-          if (request === void 0) { request = {}; }
-          return this.connection.TpServiceQuery(request).then(function (response) {
-              _this.set({
-                  Services: response.ServiceList
-              });
-              return _this.Services;
-          });
-      };
-      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;
-      };
-      return Topology;
-  }(util.StateObject));
-
   var logger = util.scopedLogger("@hpcc-js/comms/dfuWorkunit.ts");
   var States;
   (function (States) {