@hpcc-js/comms 2.72.0 → 2.74.0

package/dist/index.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@hpcc-js/util')) :
   typeof define === 'function' && define.amd ? define(['exports', '@hpcc-js/util'], factory) :
-  (global = global || self, factory(global['@hpcc-js/comms'] = {}, global['@hpcc-js/util']));
-}(this, (function (exports, util) { 'use strict';
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@hpcc-js/comms"] = {}, global["@hpcc-js/util"]));
+})(this, (function (exports, util) { 'use strict';
 
   var global =
     (typeof globalThis !== 'undefined' && globalThis) ||
@@ -56,7 +56,7 @@
       name = String(name);
     }
     if (/[^a-z0-9\-#$%&'*+.^_`|~!]/i.test(name) || name === '') {
-      throw new TypeError('Invalid character in header field name')
+      throw new TypeError('Invalid character in header field name: "' + name + '"')
     }
     return name.toLowerCase()
   }
@@ -424,14 +424,22 @@
     // Replace instances of \r\n and \n followed by at least one space or horizontal tab with a space
     // https://tools.ietf.org/html/rfc7230#section-3.2
     var preProcessedHeaders = rawHeaders.replace(/\r?\n[\t ]+/g, ' ');
-    preProcessedHeaders.split(/\r?\n/).forEach(function(line) {
-      var parts = line.split(':');
-      var key = parts.shift().trim();
-      if (key) {
-        var value = parts.join(':').trim();
-        headers.append(key, value);
-      }
-    });
+    // Avoiding split via regex to work around a common IE11 bug with the core-js 3.6.0 regex polyfill
+    // https://github.com/github/fetch/issues/748
+    // https://github.com/zloirock/core-js/issues/751
+    preProcessedHeaders
+      .split('\r')
+      .map(function(header) {
+        return header.indexOf('\n') === 0 ? header.substr(1, header.length) : header
+      })
+      .forEach(function(line) {
+        var parts = line.split(':');
+        var key = parts.shift().trim();
+        if (key) {
+          var value = parts.join(':').trim();
+          headers.append(key, value);
+        }
+      });
     return headers
   }
 
@@ -448,7 +456,7 @@
     this.type = 'default';
     this.status = options.status === undefined ? 200 : options.status;
     this.ok = this.status >= 200 && this.status < 300;
-    this.statusText = 'statusText' in options ? options.statusText : '';
+    this.statusText = options.statusText === undefined ? '' : '' + options.statusText;
     this.headers = new Headers(options.headers);
     this.url = options.url || '';
     this._initBody(bodyInit);
@@ -603,8 +611,8 @@
   }
 
   var PKG_NAME = "@hpcc-js/comms";
-  var PKG_VERSION = "2.72.0";
-  var BUILD_VERSION = "2.101.2";
+  var PKG_VERSION = "2.74.0";
+  var BUILD_VERSION = "2.102.11";
 
   /*! *****************************************************************************
   Copyright (c) Microsoft Corporation.
@@ -693,10 +701,10 @@
               ar[i] = from[i];
           }
       }
-      return to.concat(ar || from);
+      return to.concat(ar || Array.prototype.slice.call(from));
   }
 
-  var logger = util.scopedLogger("comms/connection.ts");
+  var logger$1 = util.scopedLogger("comms/connection.ts");
   function instanceOfIOptions(object) {
       return "baseUrl" in object;
   }
@@ -735,20 +743,20 @@
                   obj[key].forEach(function (row, i) {
                       if (typeof row === "object") {
                           includeItemCount_1 = true;
-                          str.push(serializeRequest(row, encodeRequest, prefix + encode(key + "." + i, encodeRequest)));
+                          str.push(serializeRequest(row, encodeRequest, prefix + encode("".concat(key, ".").concat(i), encodeRequest)));
                       }
                       else {
-                          str.push(prefix + encode(key + "_i" + i, encodeRequest) + "=" + serializeRequest(row, encodeRequest));
+                          str.push(prefix + encode("".concat(key, "_i").concat(i), encodeRequest) + "=" + serializeRequest(row, encodeRequest));
                       }
                   });
                   if (includeItemCount_1) {
-                      str.push(prefix + encode(key + ".itemcount", encodeRequest) + "=" + obj[key].length);
+                      str.push(prefix + encode("".concat(key, ".itemcount"), encodeRequest) + "=" + obj[key].length);
                   }
               }
               else if (typeof obj[key] === "object") {
                   if (obj[key] && obj[key]["Item"] instanceof Array) { // Specific to ws_machine.GetTargetClusterInfo?
                       str.push(serializeRequest(obj[key]["Item"], encodeRequest, prefix + encode(key, encodeRequest)));
-                      str.push(prefix + encode(key + ".itemcount", encodeRequest) + "=" + obj[key]["Item"].length);
+                      str.push(prefix + encode("".concat(key, ".itemcount"), encodeRequest) + "=" + obj[key]["Item"].length);
                   }
                   else {
                       str.push(serializeRequest(obj[key], encodeRequest, prefix + encode(key, encodeRequest)));
@@ -798,12 +806,12 @@
                   respondedTimeout -= respondedTick;
                   if (respondedTimeout <= 0) {
                       clearInterval(progress);
-                      logger.error("Request timeout:  " + script.src);
+                      logger$1.error("Request timeout:  " + script.src);
                       doCallback();
                       reject(Error("Request timeout:  " + script.src));
                   }
                   else {
-                      logger.debug("Request pending (" + respondedTimeout / 1000 + " sec):  " + script.src);
+                      logger$1.debug("Request pending (" + respondedTimeout / 1000 + " sec):  " + script.src);
                   }
               }
           }, respondedTick);
@@ -814,7 +822,7 @@
       });
   }
   function authHeader(opts) {
-      return opts.userID ? { Authorization: "Basic " + btoa(opts.userID + ":" + opts.password) } : {};
+      return opts.userID ? { Authorization: "Basic ".concat(btoa("".concat(opts.userID, ":").concat(opts.password))) } : {};
   }
   //  _omitMap is a workaround for older HPCC-Platform instances without credentials ---
   var _omitMap = {};
@@ -873,7 +881,7 @@
           abortSignal = request.abortSignal_;
           delete request.abortSignal_;
       }
-      return doFetch(opts, action + "?" + serializeRequest(request, opts.encodeRequest), {
+      return doFetch(opts, "".concat(action, "?").concat(serializeRequest(request, opts.encodeRequest)), {
           method: "get",
           signal: abortSignal
       }, __assign({}, header), responseType);
@@ -952,7 +960,7 @@
           _this.Source = exceptions.Source;
           _this.Exception = exceptions.Exception;
           if (exceptions.Exception.length) {
-              _this.message = exceptions.Exception[0].Code + ":  " + exceptions.Exception[0].Message;
+              _this.message = "".concat(exceptions.Exception[0].Code, ":  ").concat(exceptions.Exception[0].Message);
           }
           else {
               _this.message = "";
@@ -1114,180 +1122,180 @@
   (function (ResourceSortBy) {
       ResourceSortBy["Name"] = "Name";
   })(ResourceSortBy || (ResourceSortBy = {}));
-  var AccessService = /** @class */ (function (_super) {
-      __extends(AccessService, _super);
-      function AccessService(optsConnection) {
+  var AccessServiceBase = /** @class */ (function (_super) {
+      __extends(AccessServiceBase, _super);
+      function AccessServiceBase(optsConnection) {
           return _super.call(this, optsConnection, "ws_access", "1.16") || this;
       }
-      AccessService.prototype.AccountPermissions = function (request) {
+      AccessServiceBase.prototype.AccountPermissions = function (request) {
           return this._connection.send("AccountPermissions", request);
       };
-      AccessService.prototype.AddUser = function (request) {
+      AccessServiceBase.prototype.AddUser = function (request) {
           return this._connection.send("AddUser", request);
       };
-      AccessService.prototype.AddView = function (request) {
+      AccessServiceBase.prototype.AddView = function (request) {
           return this._connection.send("AddView", request);
       };
-      AccessService.prototype.AddViewColumn = function (request) {
+      AccessServiceBase.prototype.AddViewColumn = function (request) {
           return this._connection.send("AddViewColumn", request);
       };
-      AccessService.prototype.AddViewMember = function (request) {
+      AccessServiceBase.prototype.AddViewMember = function (request) {
           return this._connection.send("AddViewMember", request);
       };
-      AccessService.prototype.ClearPermissionsCache = function (request) {
+      AccessServiceBase.prototype.ClearPermissionsCache = function (request) {
           return this._connection.send("ClearPermissionsCache", request);
       };
-      AccessService.prototype.DeleteView = function (request) {
+      AccessServiceBase.prototype.DeleteView = function (request) {
           return this._connection.send("DeleteView", request);
       };
-      AccessService.prototype.DeleteViewColumn = function (request) {
+      AccessServiceBase.prototype.DeleteViewColumn = function (request) {
           return this._connection.send("DeleteViewColumn", request);
       };
-      AccessService.prototype.DeleteViewMember = function (request) {
+      AccessServiceBase.prototype.DeleteViewMember = function (request) {
           return this._connection.send("DeleteViewMember", request);
       };
-      AccessService.prototype.DisableScopeScans = function (request) {
+      AccessServiceBase.prototype.DisableScopeScans = function (request) {
           return this._connection.send("DisableScopeScans", request);
       };
-      AccessService.prototype.EnableScopeScans = function (request) {
+      AccessServiceBase.prototype.EnableScopeScans = function (request) {
           return this._connection.send("EnableScopeScans", request);
       };
-      AccessService.prototype.FilePermission = function (request) {
+      AccessServiceBase.prototype.FilePermission = function (request) {
           return this._connection.send("FilePermission", request);
       };
-      AccessService.prototype.GroupAction = function (request) {
+      AccessServiceBase.prototype.GroupAction = function (request) {
           return this._connection.send("GroupAction", request);
       };
-      AccessService.prototype.GroupAdd = function (request) {
+      AccessServiceBase.prototype.GroupAdd = function (request) {
           return this._connection.send("GroupAdd", request);
       };
-      AccessService.prototype.GroupEdit = function (request) {
+      AccessServiceBase.prototype.GroupEdit = function (request) {
           return this._connection.send("GroupEdit", request);
       };
-      AccessService.prototype.GroupMemberEdit = function (request) {
+      AccessServiceBase.prototype.GroupMemberEdit = function (request) {
           return this._connection.send("GroupMemberEdit", request);
       };
-      AccessService.prototype.GroupMemberEditInput = function (request) {
+      AccessServiceBase.prototype.GroupMemberEditInput = function (request) {
           return this._connection.send("GroupMemberEditInput", request);
       };
-      AccessService.prototype.GroupMemberQuery = function (request) {
+      AccessServiceBase.prototype.GroupMemberQuery = function (request) {
           return this._connection.send("GroupMemberQuery", request);
       };
-      AccessService.prototype.GroupQuery = function (request) {
+      AccessServiceBase.prototype.GroupQuery = function (request) {
           return this._connection.send("GroupQuery", request);
       };
-      AccessService.prototype.Groups = function (request) {
+      AccessServiceBase.prototype.Groups = function (request) {
           return this._connection.send("Groups", request);
       };
-      AccessService.prototype.PermissionAction = function (request) {
+      AccessServiceBase.prototype.PermissionAction = function (request) {
           return this._connection.send("PermissionAction", request);
       };
-      AccessService.prototype.PermissionAddInput = function (request) {
+      AccessServiceBase.prototype.PermissionAddInput = function (request) {
           return this._connection.send("PermissionAddInput", request);
       };
-      AccessService.prototype.Permissions = function (request) {
+      AccessServiceBase.prototype.Permissions = function (request) {
           return this._connection.send("Permissions", request);
       };
-      AccessService.prototype.PermissionsReset = function (request) {
+      AccessServiceBase.prototype.PermissionsReset = function (request) {
           return this._connection.send("PermissionsReset", request);
       };
-      AccessService.prototype.PermissionsResetInput = function (request) {
+      AccessServiceBase.prototype.PermissionsResetInput = function (request) {
           return this._connection.send("PermissionsResetInput", request);
       };
-      AccessService.prototype.Ping = function (request) {
+      AccessServiceBase.prototype.Ping = function (request) {
           return this._connection.send("Ping", request);
       };
-      AccessService.prototype.QueryScopeScansEnabled = function (request) {
+      AccessServiceBase.prototype.QueryScopeScansEnabled = function (request) {
           return this._connection.send("QueryScopeScansEnabled", request);
       };
-      AccessService.prototype.QueryUserViewColumns = function (request) {
+      AccessServiceBase.prototype.QueryUserViewColumns = function (request) {
           return this._connection.send("QueryUserViewColumns", request);
       };
-      AccessService.prototype.QueryViewColumns = function (request) {
+      AccessServiceBase.prototype.QueryViewColumns = function (request) {
           return this._connection.send("QueryViewColumns", request);
       };
-      AccessService.prototype.QueryViewMembers = function (request) {
+      AccessServiceBase.prototype.QueryViewMembers = function (request) {
           return this._connection.send("QueryViewMembers", request);
       };
-      AccessService.prototype.QueryViews = function (request) {
+      AccessServiceBase.prototype.QueryViews = function (request) {
           return this._connection.send("QueryViews", request);
       };
-      AccessService.prototype.ResourceAdd = function (request) {
+      AccessServiceBase.prototype.ResourceAdd = function (request) {
           return this._connection.send("ResourceAdd", request);
       };
-      AccessService.prototype.ResourceAddInput = function (request) {
+      AccessServiceBase.prototype.ResourceAddInput = function (request) {
           return this._connection.send("ResourceAddInput", request);
       };
-      AccessService.prototype.ResourceDelete = function (request) {
+      AccessServiceBase.prototype.ResourceDelete = function (request) {
           return this._connection.send("ResourceDelete", request);
       };
-      AccessService.prototype.ResourcePermissionQuery = function (request) {
+      AccessServiceBase.prototype.ResourcePermissionQuery = function (request) {
           return this._connection.send("ResourcePermissionQuery", request);
       };
-      AccessService.prototype.ResourcePermissions = function (request) {
+      AccessServiceBase.prototype.ResourcePermissions = function (request) {
           return this._connection.send("ResourcePermissions", request);
       };
-      AccessService.prototype.ResourceQuery = function (request) {
+      AccessServiceBase.prototype.ResourceQuery = function (request) {
           return this._connection.send("ResourceQuery", request);
       };
-      AccessService.prototype.Resources = function (request) {
+      AccessServiceBase.prototype.Resources = function (request) {
           return this._connection.send("Resources", request);
       };
-      AccessService.prototype.UserAccountExport = function (request) {
+      AccessServiceBase.prototype.UserAccountExport = function (request) {
           return this._connection.send("UserAccountExport", request);
       };
-      AccessService.prototype.UserAction = function (request) {
+      AccessServiceBase.prototype.UserAction = function (request) {
           return this._connection.send("UserAction", request);
       };
-      AccessService.prototype.UserEdit = function (request) {
+      AccessServiceBase.prototype.UserEdit = function (request) {
           return this._connection.send("UserEdit", request);
       };
-      AccessService.prototype.UserGroupEdit = function (request) {
+      AccessServiceBase.prototype.UserGroupEdit = function (request) {
           return this._connection.send("UserGroupEdit", request);
       };
-      AccessService.prototype.UserGroupEditInput = function (request) {
+      AccessServiceBase.prototype.UserGroupEditInput = function (request) {
           return this._connection.send("UserGroupEditInput", request);
       };
-      AccessService.prototype.UserInfoEdit = function (request) {
+      AccessServiceBase.prototype.UserInfoEdit = function (request) {
           return this._connection.send("UserInfoEdit", request);
       };
-      AccessService.prototype.UserInfoEditInput = function (request) {
+      AccessServiceBase.prototype.UserInfoEditInput = function (request) {
           return this._connection.send("UserInfoEditInput", request);
       };
-      AccessService.prototype.UserPosix = function (request) {
+      AccessServiceBase.prototype.UserPosix = function (request) {
           return this._connection.send("UserPosix", request);
       };
-      AccessService.prototype.UserPosixInput = function (request) {
+      AccessServiceBase.prototype.UserPosixInput = function (request) {
           return this._connection.send("UserPosixInput", request);
       };
-      AccessService.prototype.UserQuery = function (request) {
+      AccessServiceBase.prototype.UserQuery = function (request) {
           return this._connection.send("UserQuery", request);
       };
-      AccessService.prototype.UserResetPass = function (request) {
+      AccessServiceBase.prototype.UserResetPass = function (request) {
           return this._connection.send("UserResetPass", request);
       };
-      AccessService.prototype.UserResetPassInput = function (request) {
+      AccessServiceBase.prototype.UserResetPassInput = function (request) {
           return this._connection.send("UserResetPassInput", request);
       };
-      AccessService.prototype.UserSudoers = function (request) {
+      AccessServiceBase.prototype.UserSudoers = function (request) {
           return this._connection.send("UserSudoers", request);
       };
-      AccessService.prototype.UserSudoersInput = function (request) {
+      AccessServiceBase.prototype.UserSudoersInput = function (request) {
           return this._connection.send("UserSudoersInput", request);
       };
-      AccessService.prototype.Users = function (request) {
+      AccessServiceBase.prototype.Users = function (request) {
           return this._connection.send("Users", request);
       };
-      return AccessService;
+      return AccessServiceBase;
   }(Service));
 
-  var AccessServiceEx = /** @class */ (function (_super) {
-      __extends(AccessServiceEx, _super);
-      function AccessServiceEx() {
+  var AccessService = /** @class */ (function (_super) {
+      __extends(AccessService, _super);
+      function AccessService() {
           return _super !== null && _super.apply(this, arguments) || this;
       }
-      return AccessServiceEx;
-  }(AccessService));
+      return AccessService;
+  }(AccessServiceBase));
 
   var AccountService = /** @class */ (function () {
       function AccountService(optsConnection) {
@@ -1480,7 +1488,7 @@
       };
       EclService.prototype.requestJson = function (querySet, queryId) {
           // http://192.168.3.22:8002/WsEcl/example/request/query/roxie/peopleaccounts/json?display
-          return this._connection.send("example/request/query/" + querySet + "/" + queryId + "/json", {}, "text").then(function (response) {
+          return this._connection.send("example/request/query/".concat(querySet, "/").concat(queryId, "/json"), {}, "text").then(function (response) {
               var requestSchema = JSON.parse(response);
               for (var key in requestSchema) {
                   return requestSchema[key];
@@ -1490,7 +1498,7 @@
       };
       EclService.prototype.responseJson = function (querySet, queryId) {
           // http://192.168.3.22:8002/WsEcl/example/response/query/roxie/peopleaccounts/json?display
-          return this._connection.send("example/response/query/" + querySet + "/" + queryId + "/json", {}, "text").then(function (response) {
+          return this._connection.send("example/response/query/".concat(querySet, "/").concat(queryId, "/json"), {}, "text").then(function (response) {
               var responseSchema = JSON.parse(response);
               for (var key in responseSchema) {
                   return responseSchema[key].Results;
@@ -1506,7 +1514,7 @@
       };
       EclService.prototype.submit = function (querySet, queryId, request) {
           // http://192.168.3.22:8002/WsEcl/submit/query/roxie/peopleaccounts.1/json
-          var action = "submit/query/" + querySet + "/" + queryId;
+          var action = "submit/query/".concat(querySet, "/").concat(queryId);
           return this._connection.send(action, request, "json2").then(function (response) {
               if (response.Results && response.Results.Exception) {
                   throw new ESPExceptions(action, request, {
@@ -1528,30 +1536,30 @@
       LogAccessType[LogAccessType["ByLogType"] = 3] = "ByLogType";
       LogAccessType[LogAccessType["ByTargetAudience"] = 4] = "ByTargetAudience";
   })(LogAccessType || (LogAccessType = {}));
-  var LogaccessService = /** @class */ (function (_super) {
-      __extends(LogaccessService, _super);
-      function LogaccessService(optsConnection) {
-          return _super.call(this, optsConnection, "WsLogaccess", "1") || this;
+  var LogaccessServiceBase = /** @class */ (function (_super) {
+      __extends(LogaccessServiceBase, _super);
+      function LogaccessServiceBase(optsConnection) {
+          return _super.call(this, optsConnection, "ws_logaccess", "1") || this;
       }
-      LogaccessService.prototype.GetLogAccessInfo = function (request) {
+      LogaccessServiceBase.prototype.GetLogAccessInfo = function (request) {
           return this._connection.send("GetLogAccessInfo", request);
       };
-      LogaccessService.prototype.GetLogs = function (request) {
+      LogaccessServiceBase.prototype.GetLogs = function (request) {
           return this._connection.send("GetLogs", request);
       };
-      LogaccessService.prototype.Ping = function (request) {
+      LogaccessServiceBase.prototype.Ping = function (request) {
           return this._connection.send("Ping", request);
       };
-      return LogaccessService;
+      return LogaccessServiceBase;
   }(Service));
 
-  var LogaccessServiceEx = /** @class */ (function (_super) {
-      __extends(LogaccessServiceEx, _super);
-      function LogaccessServiceEx() {
+  var LogaccessService = /** @class */ (function (_super) {
+      __extends(LogaccessService, _super);
+      function LogaccessService() {
           return _super !== null && _super.apply(this, arguments) || this;
       }
-      return LogaccessServiceEx;
-  }(LogaccessService));
+      return LogaccessService;
+  }(LogaccessServiceBase));
 
   function ascending(a, b) {
     return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
@@ -1589,7 +1597,7 @@
     };
   }
 
-  var ascendingBisect = bisector(ascending);
+  bisector(ascending);
 
   function number(x) {
     return x === null ? NaN : +x;
@@ -1654,51 +1662,55 @@
     if (m) return sum / m;
   }
 
-  var MachineService = /** @class */ (function (_super) {
-      __extends(MachineService, _super);
-      function MachineService(optsConnection) {
+  var MachineServiceBase = /** @class */ (function (_super) {
+      __extends(MachineServiceBase, _super);
+      function MachineServiceBase(optsConnection) {
           return _super.call(this, optsConnection, "ws_machine", "1.17") || this;
       }
-      MachineService.prototype.GetComponentStatus = function (request) {
+      MachineServiceBase.prototype.GetComponentStatus = function (request) {
           return this._connection.send("GetComponentStatus", request);
       };
-      MachineService.prototype.GetComponentUsage = function (request) {
+      MachineServiceBase.prototype.GetComponentUsage = function (request) {
           return this._connection.send("GetComponentUsage", request);
       };
-      MachineService.prototype.GetMachineInfo = function (request) {
+      MachineServiceBase.prototype.GetMachineInfo = function (request) {
           return this._connection.send("GetMachineInfo", request);
       };
-      MachineService.prototype.GetMachineInfoEx = function (request) {
+      MachineServiceBase.prototype.GetMachineInfoEx = function (request) {
           return this._connection.send("GetMachineInfoEx", request);
       };
-      MachineService.prototype.GetMetrics = function (request) {
+      MachineServiceBase.prototype.GetMetrics = function (request) {
           return this._connection.send("GetMetrics", request);
       };
-      MachineService.prototype.GetNodeGroupUsage = function (request) {
+      MachineServiceBase.prototype.GetNodeGroupUsage = function (request) {
           return this._connection.send("GetNodeGroupUsage", request);
       };
-      MachineService.prototype.GetTargetClusterInfo = function (request) {
+      MachineServiceBase.prototype.GetTargetClusterInfo = function (request) {
           return this._connection.send("GetTargetClusterInfo", request);
       };
-      MachineService.prototype.GetTargetClusterUsage = function (request) {
+      MachineServiceBase.prototype.GetTargetClusterUsage = function (request) {
           return this._connection.send("GetTargetClusterUsage", request);
       };
-      MachineService.prototype.Ping = function (request) {
+      MachineServiceBase.prototype.Ping = function (request) {
           return this._connection.send("Ping", request);
       };
-      MachineService.prototype.UpdateComponentStatus = function (request) {
+      MachineServiceBase.prototype.UpdateComponentStatus = function (request) {
           return this._connection.send("UpdateComponentStatus", request);
       };
-      return MachineService;
+      return MachineServiceBase;
   }(Service));
 
-  var MachineServiceEx = /** @class */ (function (_super) {
-      __extends(MachineServiceEx, _super);
-      function MachineServiceEx() {
+  var MachineService = /** @class */ (function (_super) {
+      __extends(MachineService, _super);
+      function MachineService() {
           return _super !== null && _super.apply(this, arguments) || this;
       }
-      MachineServiceEx.prototype.GetTargetClusterUsageEx = function (request) {
-          return this._connection.send("GetTargetClusterUsage", request).then(function (response) {
+      MachineService.prototype.GetTargetClusterUsageEx = function (targetClusters, bypassCachedResult) {
+          if (bypassCachedResult === void 0) { bypassCachedResult = false; }
+          return this._connection.send("GetTargetClusterUsage", {
+              TargetClusters: targetClusters ? { Item: targetClusters } : {},
+              BypassCachedResult: bypassCachedResult
+          }).then(function (response) {
               return util.exists("TargetClusterUsages.TargetClusterUsage", response) ? response.TargetClusterUsages.TargetClusterUsage : [];
           }).then(function (response) {
               return response.filter(function (tcu) { return !!tcu.ComponentUsages; }).map(function (tcu) {
@@ -1737,33 +1749,33 @@
               });
           });
       };
-      return MachineServiceEx;
-  }(MachineService));
+      return MachineService;
+  }(MachineServiceBase));
 
-  var ResourcesService = /** @class */ (function (_super) {
-      __extends(ResourcesService, _super);
-      function ResourcesService(optsConnection) {
+  var ResourcesServiceBase = /** @class */ (function (_super) {
+      __extends(ResourcesServiceBase, _super);
+      function ResourcesServiceBase(optsConnection) {
           return _super.call(this, optsConnection, "WsResources", "1.01") || this;
       }
-      ResourcesService.prototype.Ping = function (request) {
+      ResourcesServiceBase.prototype.Ping = function (request) {
           return this._connection.send("Ping", request);
       };
-      ResourcesService.prototype.ServiceQuery = function (request) {
+      ResourcesServiceBase.prototype.ServiceQuery = function (request) {
           return this._connection.send("ServiceQuery", request);
       };
-      ResourcesService.prototype.WebLinksQuery = function (request) {
+      ResourcesServiceBase.prototype.WebLinksQuery = function (request) {
           return this._connection.send("WebLinksQuery", request);
       };
-      return ResourcesService;
+      return ResourcesServiceBase;
   }(Service));
 
-  var ResourcesServiceEx = /** @class */ (function (_super) {
-      __extends(ResourcesServiceEx, _super);
-      function ResourcesServiceEx() {
+  var ResourcesService = /** @class */ (function (_super) {
+      __extends(ResourcesService, _super);
+      function ResourcesService() {
           return _super !== null && _super.apply(this, arguments) || this;
       }
-      return ResourcesServiceEx;
-  }(ResourcesService));
+      return ResourcesService;
+  }(ResourcesServiceBase));
 
   var SMCService = /** @class */ (function () {
       function SMCService(optsConnection) {
@@ -1862,13 +1874,18 @@
       return StoreService;
   }(Service));
 
+  /*
+      Response structures generated via:
+      * http://localhost:8010/WsTopology/TpLogicalClusterQuery?respjson_
+      * http://json2ts.com/
+  */
+  exports.TpLogicalClusterQuery = void 0;
   (function (TpLogicalClusterQuery) {
-      var RoxieQueueFilter;
       (function (RoxieQueueFilter) {
           RoxieQueueFilter["All"] = "All";
           RoxieQueueFilter["QueriesOnly"] = "QueriesOnly";
           RoxieQueueFilter["WorkunitsOnly"] = "WorkunitsOnly";
-      })(RoxieQueueFilter = TpLogicalClusterQuery.RoxieQueueFilter || (TpLogicalClusterQuery.RoxieQueueFilter = {}));
+      })(TpLogicalClusterQuery.RoxieQueueFilter || (TpLogicalClusterQuery.RoxieQueueFilter = {}));
   })(exports.TpLogicalClusterQuery || (exports.TpLogicalClusterQuery = {}));
   var TopologyService = /** @class */ (function (_super) {
       __extends(TopologyService, _super);
@@ -1924,6 +1941,13 @@
       return TopologyService;
   }(Service));
 
+  /*
+      Response structures generated via:
+      * http://localhost:8010/WsWorkunits/WUInfo?reqjson_
+      * http://localhost:8010/WsWorkunits/WUInfo?respjson_
+      * http://json2ts.com/
+  */
+  exports.WUStateID = void 0;
   (function (WUStateID) {
       WUStateID[WUStateID["Unknown"] = 0] = "Unknown";
       WUStateID[WUStateID["Compiled"] = 1] = "Compiled";
@@ -1948,8 +1972,8 @@
   function isECLResult(_) {
       return typeof _.Name === "string";
   }
+  exports.WUUpdate = void 0;
   (function (WUUpdate) {
-      var Action;
       (function (Action) {
           Action[Action["Unknown"] = 0] = "Unknown";
           Action[Action["Compile"] = 1] = "Compile";
@@ -1961,7 +1985,7 @@
           Action[Action["Resume"] = 7] = "Resume";
           Action[Action["Debug"] = 8] = "Debug";
           Action[Action["__size"] = 9] = "__size";
-      })(Action = WUUpdate.Action || (WUUpdate.Action = {}));
+      })(WUUpdate.Action || (WUUpdate.Action = {}));
   })(exports.WUUpdate || (exports.WUUpdate = {}));
   function isWUQueryECLWorkunit(_) {
       return _.TotalClusterTime !== undefined;
@@ -2163,6 +2187,8 @@
     return date.getDate() - 1;
   });
 
+  var timeDay = day;
+
   function weekday(i) {
     return newInterval(function(date) {
       date.setDate(date.getDate() - (date.getDay() + 7 - i) % 7);
@@ -2176,11 +2202,11 @@
 
   var sunday = weekday(0);
   var monday = weekday(1);
-  var tuesday = weekday(2);
-  var wednesday = weekday(3);
+  weekday(2);
+  weekday(3);
   var thursday = weekday(4);
-  var friday = weekday(5);
-  var saturday = weekday(6);
+  weekday(5);
+  weekday(6);
 
   var year = newInterval(function(date) {
     date.setMonth(0, 1);
@@ -2204,6 +2230,8 @@
     });
   };
 
+  var timeYear = year;
+
   var utcDay = newInterval(function(date) {
     date.setUTCHours(0, 0, 0, 0);
   }, function(date, step) {
@@ -2214,6 +2242,8 @@
     return date.getUTCDate() - 1;
   });
 
+  var utcDay$1 = utcDay;
+
   function utcWeekday(i) {
     return newInterval(function(date) {
       date.setUTCDate(date.getUTCDate() - (date.getUTCDay() + 7 - i) % 7);
@@ -2227,11 +2257,11 @@
 
   var utcSunday = utcWeekday(0);
   var utcMonday = utcWeekday(1);
-  var utcTuesday = utcWeekday(2);
-  var utcWednesday = utcWeekday(3);
+  utcWeekday(2);
+  utcWeekday(3);
   var utcThursday = utcWeekday(4);
-  var utcFriday = utcWeekday(5);
-  var utcSaturday = utcWeekday(6);
+  utcWeekday(5);
+  utcWeekday(6);
 
   var utcYear = newInterval(function(date) {
     date.setUTCMonth(0, 1);
@@ -2255,6 +2285,8 @@
     });
   };
 
+  var utcYear$1 = utcYear;
+
   function localDate(d) {
     if (0 <= d.y && d.y < 100) {
       var date = new Date(-1, d.m, d.d, d.H, d.M, d.S, d.L);
@@ -2443,7 +2475,7 @@
       return function(string) {
         var d = newDate(1900, undefined, 1),
             i = parseSpecifier(d, specifier, string += "", 0),
-            week, day$1;
+            week, day;
         if (i != string.length) return null;
 
         // If a UNIX timestamp is specified, return it.
@@ -2464,25 +2496,25 @@
           if (d.V < 1 || d.V > 53) return null;
           if (!("w" in d)) d.w = 1;
           if ("Z" in d) {
-            week = utcDate(newDate(d.y, 0, 1)), day$1 = week.getUTCDay();
-            week = day$1 > 4 || day$1 === 0 ? utcMonday.ceil(week) : utcMonday(week);
-            week = utcDay.offset(week, (d.V - 1) * 7);
+            week = utcDate(newDate(d.y, 0, 1)), day = week.getUTCDay();
+            week = day > 4 || day === 0 ? utcMonday.ceil(week) : utcMonday(week);
+            week = utcDay$1.offset(week, (d.V - 1) * 7);
             d.y = week.getUTCFullYear();
             d.m = week.getUTCMonth();
             d.d = week.getUTCDate() + (d.w + 6) % 7;
           } else {
-            week = localDate(newDate(d.y, 0, 1)), day$1 = week.getDay();
-            week = day$1 > 4 || day$1 === 0 ? monday.ceil(week) : monday(week);
-            week = day.offset(week, (d.V - 1) * 7);
+            week = localDate(newDate(d.y, 0, 1)), day = week.getDay();
+            week = day > 4 || day === 0 ? monday.ceil(week) : monday(week);
+            week = timeDay.offset(week, (d.V - 1) * 7);
             d.y = week.getFullYear();
             d.m = week.getMonth();
             d.d = week.getDate() + (d.w + 6) % 7;
           }
         } else if ("W" in d || "U" in d) {
           if (!("w" in d)) d.w = "u" in d ? d.u % 7 : "W" in d ? 1 : 0;
-          day$1 = "Z" in d ? utcDate(newDate(d.y, 0, 1)).getUTCDay() : localDate(newDate(d.y, 0, 1)).getDay();
+          day = "Z" in d ? utcDate(newDate(d.y, 0, 1)).getUTCDay() : localDate(newDate(d.y, 0, 1)).getDay();
           d.m = 0;
-          d.d = "W" in d ? (d.w + 6) % 7 + d.W * 7 - (day$1 + 5) % 7 : d.w + d.U * 7 - (day$1 + 6) % 7;
+          d.d = "W" in d ? (d.w + 6) % 7 + d.W * 7 - (day + 5) % 7 : d.w + d.U * 7 - (day + 6) % 7;
         }
 
         // If a time zone is specified, all fields are interpreted as UTC and then
@@ -2768,7 +2800,7 @@
   }
 
   function formatDayOfYear(d, p) {
-    return pad(1 + day.count(year(d), d), p, 3);
+    return pad(1 + timeDay.count(timeYear(d), d), p, 3);
   }
 
   function formatMilliseconds(d, p) {
@@ -2797,7 +2829,7 @@
   }
 
   function formatWeekNumberSunday(d, p) {
-    return pad(sunday.count(year(d) - 1, d), p, 2);
+    return pad(sunday.count(timeYear(d) - 1, d), p, 2);
   }
 
   function dISO(d) {
@@ -2807,7 +2839,7 @@
 
   function formatWeekNumberISO(d, p) {
     d = dISO(d);
-    return pad(thursday.count(year(d), d) + (year(d).getDay() === 4), p, 2);
+    return pad(thursday.count(timeYear(d), d) + (timeYear(d).getDay() === 4), p, 2);
   }
 
   function formatWeekdayNumberSunday(d) {
@@ -2815,7 +2847,7 @@
   }
 
   function formatWeekNumberMonday(d, p) {
-    return pad(monday.count(year(d) - 1, d), p, 2);
+    return pad(monday.count(timeYear(d) - 1, d), p, 2);
   }
 
   function formatYear(d, p) {
@@ -2857,7 +2889,7 @@
   }
 
   function formatUTCDayOfYear(d, p) {
-    return pad(1 + utcDay.count(utcYear(d), d), p, 3);
+    return pad(1 + utcDay$1.count(utcYear$1(d), d), p, 3);
   }
 
   function formatUTCMilliseconds(d, p) {
@@ -2886,7 +2918,7 @@
   }
 
   function formatUTCWeekNumberSunday(d, p) {
-    return pad(utcSunday.count(utcYear(d) - 1, d), p, 2);
+    return pad(utcSunday.count(utcYear$1(d) - 1, d), p, 2);
   }
 
   function UTCdISO(d) {
@@ -2896,7 +2928,7 @@
 
   function formatUTCWeekNumberISO(d, p) {
     d = UTCdISO(d);
-    return pad(utcThursday.count(utcYear(d), d) + (utcYear(d).getUTCDay() === 4), p, 2);
+    return pad(utcThursday.count(utcYear$1(d), d) + (utcYear$1(d).getUTCDay() === 4), p, 2);
   }
 
   function formatUTCWeekdayNumberSunday(d) {
@@ -2904,7 +2936,7 @@
   }
 
   function formatUTCWeekNumberMonday(d, p) {
-    return pad(utcMonday.count(utcYear(d) - 1, d), p, 2);
+    return pad(utcMonday.count(utcYear$1(d) - 1, d), p, 2);
   }
 
   function formatUTCYear(d, p) {
@@ -2943,8 +2975,6 @@
   }
 
   var locale;
-  var timeFormat;
-  var timeParse;
   var utcFormat;
   var utcParse;
 
@@ -2961,8 +2991,6 @@
 
   function defaultLocale(definition) {
     locale = formatLocale(definition);
-    timeFormat = locale.format;
-    timeParse = locale.parse;
     utcFormat = locale.utcFormat;
     utcParse = locale.utcParse;
     return locale;
@@ -3189,7 +3217,7 @@
                       scopeStack.pop();
                   }
                   if (!scopeParent1) {
-                      console.log("Missing SG:Parent (" + scope.Id + "): " + scope.parentScope());
+                      console.warn("Missing SG:Parent (".concat(scope.Id, "): ").concat(scope.parentScope()));
                   }
                   else {
                       var parent1 = scopeParent1;
@@ -3199,7 +3227,7 @@
               case "activity":
                   var scopeParent2 = subgraphs[scope.parentScope()];
                   if (!scopeParent2) {
-                      console.log("Missing A:Parent (" + scope.Id + "): " + scope.parentScope());
+                      console.warn("Missing A:Parent (".concat(scope.Id, "): ").concat(scope.parentScope()));
                   }
                   else {
                       vertices[scope.ScopeName] = scopeParent2.createVertex(scope);
@@ -3211,7 +3239,7 @@
               case "function":
                   var scopeParent3 = vertices[scope.parentScope()];
                   if (!scopeParent3) {
-                      console.log("Missing F:Parent (" + scope.Id + "): " + scope.parentScope());
+                      console.warn("Missing F:Parent (".concat(scope.Id, "): ").concat(scope.parentScope()));
                   }
                   else {
                       scopeParent3._.children().push(scope);
@@ -3223,7 +3251,7 @@
           var scope = edges[id];
           var scopeParent3 = subgraphs[scope.parentScope()];
           if (!scopeParent3) {
-              console.log("Missing E:Parent (" + scope.Id + "): " + scope.parentScope());
+              console.warn("Missing E:Parent (".concat(scope.Id, "): ").concat(scope.parentScope()));
           }
           else {
               var parent3 = scopeParent3;
@@ -3235,7 +3263,7 @@
               catch (e) {
                   // const sourceIndex = scope.attr("SourceIndex").RawValue;
                   // const targetIndex = scope.attr("TargetIndex").RawValue;
-                  console.log("Invalid Edge: " + id);
+                  console.warn("Invalid Edge: ".concat(id));
               }
           }
       }
@@ -3528,7 +3556,7 @@
       __extends(GlobalResultCache, _super);
       function GlobalResultCache() {
           return _super.call(this, function (obj) {
-              return obj.BaseUrl + "-" + obj.Wuid + "-" + obj.ResultName;
+              return "".concat(obj.BaseUrl, "-").concat(obj.Wuid, "-").concat(obj.ResultName);
           }) || this;
       }
       return GlobalResultCache;
@@ -3999,21 +4027,21 @@
           var label = "";
           var rows = [];
           label = this.Id;
-          rows.push("<tr><td class=\"key\">ID:</td><td class=\"value\">" + this.Id + "</td></tr>");
+          rows.push("<tr><td class=\"key\">ID:</td><td class=\"value\">".concat(this.Id, "</td></tr>"));
           if (parentScope) {
-              rows.push("<tr><td class=\"key\">Parent ID:</td><td class=\"value\">" + parentScope.Id + "</td></tr>");
+              rows.push("<tr><td class=\"key\">Parent ID:</td><td class=\"value\">".concat(parentScope.Id, "</td></tr>"));
           }
-          rows.push("<tr><td class=\"key\">Scope:</td><td class=\"value\">" + this.ScopeName + "</td></tr>");
+          rows.push("<tr><td class=\"key\">Scope:</td><td class=\"value\">".concat(this.ScopeName, "</td></tr>"));
           var attrs = this.formattedAttrs();
           for (var key in attrs) {
               if (key === "Label") {
                   label = attrs[key];
               }
               else {
-                  rows.push("<tr><td class=\"key\">" + key + "</td><td class=\"value\">" + attrs[key] + "</td></tr>");
+                  rows.push("<tr><td class=\"key\">".concat(key, "</td><td class=\"value\">").concat(attrs[key], "</td></tr>"));
               }
           }
-          return "<div class=\"eclwatch_WUGraph_Tooltip\" style=\"max-width:480px\">\n            <h4 align=\"center\">" + label + "</h4>\n            <table>\n                " + rows.join("") + "\n            </table>\n        </div>";
+          return "<div class=\"eclwatch_WUGraph_Tooltip\" style=\"max-width:480px\">\n            <h4 align=\"center\">".concat(label, "</h4>\n            <table>\n                ").concat(rows.join(""), "\n            </table>\n        </div>");
       };
       return BaseScope;
   }(util.StateObject));
@@ -4147,13 +4175,13 @@
 
   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 logger = util.scopedLogger("workunit.ts");
   var WUStateID = exports.WUStateID;
   var WorkunitCache = /** @class */ (function (_super) {
       __extends(WorkunitCache, _super);
       function WorkunitCache() {
           return _super.call(this, function (obj) {
-              return obj.BaseUrl + "-" + obj.Wuid;
+              return "".concat(obj.BaseUrl, "-").concat(obj.Wuid);
           }) || this;
       }
       return WorkunitCache;
@@ -5258,7 +5286,7 @@
                   return false;
               });
               if (!wuMissing) {
-                  logger$1.warning("Unexpected exception:  ");
+                  logger.warning("Unexpected exception:  ");
                   throw e;
               }
               return {};
@@ -5295,7 +5323,7 @@
                   return false;
               });
               if (!wuMissing) {
-                  logger$1.warning("Unexpected exception:  ");
+                  logger.warning("Unexpected exception:  ");
                   throw e;
               }
               return {};
@@ -5363,12 +5391,12 @@
           var optsStr = "";
           for (var key in opts) {
               if (opts.hasOwnProperty(key)) {
-                  optsStr += " " + key + "='" + opts[key] + "'";
+                  optsStr += " ".concat(key, "='").concat(opts[key], "'");
               }
           }
           return this.connection.WUCDebug({
               Wuid: this.Wuid,
-              Command: "<debug:" + command + " uid='" + this.Wuid + "'" + optsStr + "/>"
+              Command: "<debug:".concat(command, " uid='").concat(this.Wuid, "'").concat(optsStr, "/>")
           }).then(function (response) {
               return response;
           });
@@ -5384,7 +5412,7 @@
               }
               return new util.XMLNode(command);
           }).catch(function (_) {
-              logger$1.error(_);
+              logger.error(_);
               return Promise.resolve(new util.XMLNode(command));
           });
       };
@@ -5499,7 +5527,7 @@
               column: +_col
           };
       }
-      throw new Error("Bad definition:  " + vertex._[ATTR_DEFINITION]);
+      throw new Error("Bad definition:  ".concat(vertex._[ATTR_DEFINITION]));
   }
   function breakpointLocations(graph, path) {
       var retVal = [];
@@ -5688,12 +5716,12 @@
       __extends(LogicalFileCache, _super);
       function LogicalFileCache() {
           return _super.call(this, function (obj) {
-              return obj.BaseUrl + "-" + obj.Cluster + "-" + obj.Name;
+              return "".concat(obj.BaseUrl, "-").concat(obj.Cluster, "-").concat(obj.Name);
           }) || this;
       }
       return LogicalFileCache;
   }(util.Cache));
-  var _store = new LogicalFileCache();
+  var _store$1 = new LogicalFileCache();
   var LogicalFile = /** @class */ (function (_super) {
       __extends(LogicalFile, _super);
       function LogicalFile(optsConnection, Cluster, Name) {
@@ -5976,14 +6004,14 @@
           configurable: true
       });
       LogicalFile.attach = function (optsConnection, Cluster, Name) {
-          var retVal = _store.get({ BaseUrl: optsConnection.baseUrl, Cluster: Cluster, Name: Name }, function () {
+          var retVal = _store$1.get({ BaseUrl: optsConnection.baseUrl, Cluster: Cluster, Name: Name }, function () {
               return new LogicalFile(optsConnection, Cluster, Name);
           });
           return retVal;
       };
       LogicalFile.prototype.filePartsOnCluster = function () {
           var _a;
-          return __spreadArray([], (((_a = this.DFUFilePartsOnClusters) === null || _a === void 0 ? void 0 : _a.DFUFilePartsOnCluster) || []));
+          return __spreadArray([], (((_a = this.DFUFilePartsOnClusters) === null || _a === void 0 ? void 0 : _a.DFUFilePartsOnCluster) || []), true);
       };
       LogicalFile.prototype.fileParts = function () {
           var _a, _b;
@@ -6048,11 +6076,11 @@
       __extends(Machine, _super);
       function Machine(optsConnection) {
           var _this = _super.call(this) || this;
-          if (optsConnection instanceof MachineServiceEx) {
+          if (optsConnection instanceof MachineService) {
               _this.connection = optsConnection;
           }
           else {
-              _this.connection = new MachineServiceEx(optsConnection);
+              _this.connection = new MachineService(optsConnection);
           }
           return _this;
       }
@@ -6440,12 +6468,12 @@
       __extends(StoreCache, _super);
       function StoreCache() {
           return _super.call(this, function (obj) {
-              return obj.BaseUrl + "-" + obj.Name + ":" + obj.UserSpecific + "-" + obj.Namespace;
+              return "".concat(obj.BaseUrl, "-").concat(obj.Name, ":").concat(obj.UserSpecific, "-").concat(obj.Namespace);
           }) || this;
       }
       return StoreCache;
   }(util.Cache));
-  var _store$1 = new StoreCache();
+  var _store = new StoreCache();
   var ValueChangedMessage = /** @class */ (function (_super) {
       __extends(ValueChangedMessage, _super);
       function ValueChangedMessage(key, value, oldValue) {
@@ -6494,7 +6522,7 @@
       Store.attach = function (optsConnection, Name, Namespace, UserSpecific) {
           if (Name === void 0) { Name = "HPCCApps"; }
           if (UserSpecific === void 0) { UserSpecific = true; }
-          var retVal = _store$1.get({ BaseUrl: optsConnection.baseUrl, Name: Name, UserSpecific: UserSpecific, Namespace: Namespace }, function () {
+          var retVal = _store.get({ BaseUrl: optsConnection.baseUrl, Name: Name, UserSpecific: UserSpecific, Namespace: Namespace }, function () {
               return new Store(optsConnection, Name, Namespace, UserSpecific);
           });
           return retVal;
@@ -6518,7 +6546,7 @@
                   _this._dispatch.post(new ValueChangedMessage(key, value, oldValue));
               }
           }).catch(function (e) {
-              console.error("Store.set(\"" + key + "\", \"" + value + "\") failed:", e);
+              console.error("Store.set(\"".concat(key, "\", \"").concat(value, "\") failed:"), e);
           });
       };
       Store.prototype.get = function (key, broadcast) {
@@ -6537,7 +6565,7 @@
               }
               return response.Value;
           }).catch(function (e) {
-              console.error("Store.get(" + key + ") failed:", e);
+              console.error("Store.get(".concat(key, ") failed:"), e);
               return undefined;
           });
       };
@@ -6587,7 +6615,7 @@
                   _this._dispatch.post(new ValueChangedMessage(key, undefined, oldValue));
               }
           }).catch(function (e) {
-              console.error("Store.delete(" + key + ") failed:", e);
+              console.error("Store.delete(".concat(key, ") failed:"), e);
           });
       };
       Store.prototype.monitor = function (callback) {
@@ -6600,7 +6628,7 @@
       __extends(TargetClusterCache, _super);
       function TargetClusterCache() {
           return _super.call(this, function (obj) {
-              return obj.BaseUrl + "-" + obj.Name;
+              return "".concat(obj.BaseUrl, "-").concat(obj.Name);
           }) || this;
       }
       return TargetClusterCache;
@@ -6612,11 +6640,11 @@
           var _this = _super.call(this) || this;
           if (optsConnection instanceof TopologyService) {
               _this.connection = optsConnection;
-              _this.machineConnection = new MachineServiceEx(optsConnection.connectionOptions());
+              _this.machineConnection = new MachineService(optsConnection.connectionOptions());
           }
           else {
               _this.connection = new TopologyService(optsConnection);
-              _this.machineConnection = new MachineServiceEx(optsConnection);
+              _this.machineConnection = new MachineService(optsConnection);
           }
           _this.clear({
               Name: name
@@ -6699,7 +6727,7 @@
           var _this = this;
           if (request === void 0) { request = {}; }
           return this.machineConnection.GetTargetClusterInfo(__assign({ TargetClusters: {
-                  Item: [this.Type + ":" + this.Name]
+                  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++) {
@@ -6735,7 +6763,7 @@
           };
       };
       TargetCluster.prototype.fetchUsage = function () {
-          return this.machineConnection.GetTargetClusterUsageEx({ TargetClusters: { Item: [this.Name] } });
+          return this.machineConnection.GetTargetClusterUsageEx([this.Name]);
       };
       return TargetCluster;
   }(util.StateObject));
@@ -6865,7 +6893,7 @@
                       }
                   }
               }
-              return rootProtocol + "//" + ip + ":" + port + "/";
+              return "".concat(rootProtocol, "//").concat(ip, ":").concat(port, "/");
           });
       };
       Topology.prototype.fetchTargetClusters = function () {
@@ -6931,7 +6959,7 @@
       return Topology;
   }(util.StateObject));
 
-  exports.AccessServiceEx = AccessServiceEx;
+  exports.AccessService = AccessService;
   exports.AccountService = AccountService;
   exports.Activity = Activity;
   exports.Attribute = Attribute;
@@ -6947,17 +6975,17 @@
   exports.EclService = EclService;
   exports.GlobalResultCache = GlobalResultCache;
   exports.GraphCache = GraphCache;
-  exports.LogaccessServiceEx = LogaccessServiceEx;
+  exports.LogaccessService = LogaccessService;
   exports.LogicalFile = LogicalFile;
   exports.LogicalFileCache = LogicalFileCache;
   exports.Machine = Machine;
   exports.MachineCache = MachineCache;
-  exports.MachineServiceEx = MachineServiceEx;
+  exports.MachineService = MachineService;
   exports.PKG_NAME = PKG_NAME;
   exports.PKG_VERSION = PKG_VERSION;
   exports.Query = Query;
   exports.Resource = Resource;
-  exports.ResourcesServiceEx = ResourcesServiceEx;
+  exports.ResourcesService = ResourcesService;
   exports.Result = Result;
   exports.ResultCache = ResultCache;
   exports.SMCService = SMCService;
@@ -7013,5 +7041,5 @@
 
   Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
 //# sourceMappingURL=index.js.map