@hpcc-js/comms 2.93.0 → 2.94.1

package/dist/index.js

@@ -648,8 +648,8 @@
   }
 
   var PKG_NAME = "@hpcc-js/comms";
-  var PKG_VERSION = "2.93.0";
-  var BUILD_VERSION = "2.105.13";
+  var PKG_VERSION = "2.94.1";
+  var BUILD_VERSION = "2.106.2";
 
   /******************************************************************************
   Copyright (c) Microsoft Corporation.
@@ -1489,22 +1489,34 @@
       return AccessService;
   }(AccessServiceBase));
 
-  var AccountService = /** @class */ (function () {
-      function AccountService(optsConnection) {
-          this._connection = new ESPConnection(optsConnection, "Ws_Account", "1.05");
+  var AccountServiceBase = /** @class */ (function (_super) {
+      __extends(AccountServiceBase, _super);
+      function AccountServiceBase(optsConnection) {
+          return _super.call(this, optsConnection, "ws_account", "1.06") || this;
       }
-      AccountService.prototype.connectionOptions = function () {
-          return this._connection.opts();
+      AccountServiceBase.prototype.MyAccount = function (request) {
+          return this._connection.send("MyAccount", request, "json", false, undefined, "MyAccountResponse");
+      };
+      AccountServiceBase.prototype.Ping = function (request) {
+          return this._connection.send("Ping", request, "json", false, undefined, "ws_accountPingResponse");
       };
-      AccountService.prototype.MyAccount = function (request) {
-          return this._connection.send("MyAccount", request);
+      AccountServiceBase.prototype.UpdateUser = function (request) {
+          return this._connection.send("UpdateUser", request, "json", false, undefined, "UpdateUserResponse");
       };
-      AccountService.prototype.UpdateUser = function (request) {
-          return this._connection.send("UpdateUser", request);
+      AccountServiceBase.prototype.UpdateUserInput = function (request) {
+          return this._connection.send("UpdateUserInput", request, "json", false, undefined, "UpdateUserInputResponse");
       };
-      AccountService.prototype.UpdateUserInput = function (request) {
-          return this._connection.send("UpdateUserInput", request);
+      AccountServiceBase.prototype.VerifyUser = function (request) {
+          return this._connection.send("VerifyUser", request, "json", false, undefined, "VerifyUserResponse");
       };
+      return AccountServiceBase;
+  }(Service));
+
+  var AccountService = /** @class */ (function (_super) {
+      __extends(AccountService, _super);
+      function AccountService() {
+          return _super !== null && _super.apply(this, arguments) || this;
+      }
       AccountService.prototype.VerifyUser = function (request) {
           return this._connection.send("VerifyUser", request)
               .catch(function (e) {
@@ -1522,7 +1534,7 @@
           });
       };
       return AccountService;
-  }());
+  }(AccountServiceBase));
 
   var CloudServiceBase = /** @class */ (function (_super) {
       __extends(CloudServiceBase, _super);
@@ -2118,17 +2130,41 @@
                           _loop_1 = function (key) {
                               var searchField;
                               if (key in columnMap) {
-                                  searchField = columnMap[key];
+                                  if (Object.values(exports.WsLogaccess.LogColumnType).includes(key)) {
+                                      searchField = key;
+                                  }
+                                  else {
+                                      searchField = columnMap[key];
+                                  }
                               }
-                              var logCategory = exports.WsLogaccess.LogAccessType.ByFieldName;
+                              var logCategory;
                               if (searchField) {
                                   switch (searchField) {
+                                      case exports.WsLogaccess.LogColumnType.workunits:
+                                      case "hpcc.log.jobid":
+                                          logCategory = exports.WsLogaccess.LogAccessType.ByJobID;
+                                          break;
+                                      case exports.WsLogaccess.LogColumnType.audience:
                                       case "hpcc.log.audience":
                                           logCategory = exports.WsLogaccess.LogAccessType.ByTargetAudience;
                                           break;
+                                      case exports.WsLogaccess.LogColumnType.class:
+                                      case "hpcc.log.class":
+                                          logCategory = exports.WsLogaccess.LogAccessType.ByLogType;
+                                          break;
+                                      case exports.WsLogaccess.LogColumnType.components:
+                                      case "kubernetes.container.name":
+                                          logCategory = exports.WsLogaccess.LogAccessType.ByComponent;
+                                          break;
+                                      default:
+                                          logCategory = exports.WsLogaccess.LogAccessType.ByFieldName;
+                                          searchField = columnMap[key];
                                   }
                                   if (Array.isArray(request[key])) {
                                       request[key].forEach(function (value) {
+                                          if (logCategory === exports.WsLogaccess.LogAccessType.ByComponent) {
+                                              value += "*";
+                                          }
                                           filters.push({
                                               LogCategory: logCategory,
                                               SearchField: searchField,
@@ -2137,10 +2173,16 @@
                                       });
                                   }
                                   else {
+                                      var value = request[key];
+                                      if (logCategory === exports.WsLogaccess.LogAccessType.ByComponent) {
+                                          // append wildcard to end of search value to include ephemeral
+                                          // containers that aren't listed in ECL Watch's filters
+                                          value += "*";
+                                      }
                                       filters.push({
                                           LogCategory: logCategory,
                                           SearchField: searchField,
-                                          SearchByValue: request[key]
+                                          SearchByValue: value
                                       });
                                   }
                               }