@hpcc-js/comms 2.82.2 → 2.82.3

package/dist/index.js

@@ -611,8 +611,8 @@
   }
 
   var PKG_NAME = "@hpcc-js/comms";
-  var PKG_VERSION = "2.82.2";
-  var BUILD_VERSION = "2.104.20";
+  var PKG_VERSION = "2.82.3";
+  var BUILD_VERSION = "2.104.21";
 
   /******************************************************************************
   Copyright (c) Microsoft Corporation.
@@ -2053,134 +2053,156 @@
       };
       LogaccessService.prototype.GetLogsEx = function (request) {
           var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-          var getLogsRequest = {
-              Filter: {
-                  leftBinaryFilter: {
-                      BinaryLogFilter: [{
-                              leftFilter: {
-                                  LogCategory: exports.WsLogaccess.LogAccessType.All,
+          return __awaiter(this, void 0, void 0, function () {
+              var logInfo, getLogsRequest, filters, _loop_1, key, binaryLogFilter_1;
+              return __generator(this, function (_l) {
+                  switch (_l.label) {
+                      case 0: return [4 /*yield*/, this.GetLogAccessInfo()];
+                      case 1:
+                          logInfo = _l.sent();
+                          getLogsRequest = {
+                              Filter: {
+                                  leftBinaryFilter: {
+                                      BinaryLogFilter: [{
+                                              leftFilter: {
+                                                  LogCategory: exports.WsLogaccess.LogAccessType.All,
+                                              },
+                                          }]
+                                  }
                               },
-                          }]
-                  }
-              },
-              Range: {
-                  StartDate: new Date(0).toISOString(),
-              },
-              LogLineStartFrom: (_a = request.LogLineStartFrom) !== null && _a !== void 0 ? _a : 0,
-              LogLineLimit: (_b = request.LogLineLimit) !== null && _b !== void 0 ? _b : 100,
-              SelectColumnMode: exports.WsLogaccess.LogSelectColumnMode.DEFAULT,
-              Format: "JSON"
-          };
-          var filters = [];
-          var _loop_1 = function (key) {
-              if (key in ElasticKnownColumns) {
-                  if (Array.isArray(request[key])) {
-                      request[key].forEach(function (value) {
-                          filters.push({
-                              LogCategory: exports.WsLogaccess.LogAccessType.ByFieldName,
-                              SearchField: ElasticKnownColumns[key],
-                              SearchByValue: value
-                          });
-                      });
-                  }
-                  else {
-                      filters.push({
-                          LogCategory: exports.WsLogaccess.LogAccessType.ByFieldName,
-                          SearchField: ElasticKnownColumns[key],
-                          SearchByValue: request[key]
-                      });
-                  }
-              }
-          };
-          for (var key in request) {
-              _loop_1(key);
-          }
-          if (filters.length > 2) {
-              var binaryLogFilter_1 = getLogsRequest.Filter.leftBinaryFilter.BinaryLogFilter[0];
-              filters.forEach(function (filter, i) {
-                  var operator = exports.WsLogaccess.LogAccessFilterOperator.AND;
-                  if (i > 0) {
-                      if (filters[i - 1].SearchField === filter.SearchField) {
-                          operator = exports.WsLogaccess.LogAccessFilterOperator.OR;
-                      }
-                      if (i === filters.length - 1) {
-                          binaryLogFilter_1.Operator = operator;
-                          binaryLogFilter_1.rightFilter = filter;
-                      }
-                      else {
-                          binaryLogFilter_1.Operator = operator;
-                          binaryLogFilter_1.rightBinaryFilter = {
-                              BinaryLogFilter: [{
-                                      leftFilter: filter
-                                  }]
+                              Range: {
+                                  StartDate: new Date(0).toISOString(),
+                              },
+                              LogLineStartFrom: (_a = request.LogLineStartFrom) !== null && _a !== void 0 ? _a : 0,
+                              LogLineLimit: (_b = request.LogLineLimit) !== null && _b !== void 0 ? _b : 100,
+                              SelectColumnMode: exports.WsLogaccess.LogSelectColumnMode.DEFAULT,
+                              Format: "JSON"
                           };
-                          binaryLogFilter_1 = binaryLogFilter_1.rightBinaryFilter.BinaryLogFilter[0];
-                      }
-                  }
-                  else {
-                      binaryLogFilter_1.leftFilter = filter;
+                          filters = [];
+                          _loop_1 = function (key) {
+                              var searchField;
+                              switch (logInfo.RemoteLogManagerType) {
+                                  case "azureloganalyticscurl":
+                                      if (key in AzureKnownColumns) {
+                                          searchField = AzureKnownColumns[key];
+                                      }
+                                      break;
+                                  case "elasticstack":
+                                      if (key in ElasticKnownColumns) {
+                                          searchField = ElasticKnownColumns[key];
+                                      }
+                                      break;
+                              }
+                              if (searchField) {
+                                  if (Array.isArray(request[key])) {
+                                      request[key].forEach(function (value) {
+                                          filters.push({
+                                              LogCategory: exports.WsLogaccess.LogAccessType.ByFieldName,
+                                              SearchField: searchField,
+                                              SearchByValue: value
+                                          });
+                                      });
+                                  }
+                                  else {
+                                      filters.push({
+                                          LogCategory: exports.WsLogaccess.LogAccessType.ByFieldName,
+                                          SearchField: searchField,
+                                          SearchByValue: request[key]
+                                      });
+                                  }
+                              }
+                          };
+                          for (key in request) {
+                              _loop_1(key);
+                          }
+                          if (filters.length > 2) {
+                              binaryLogFilter_1 = getLogsRequest.Filter.leftBinaryFilter.BinaryLogFilter[0];
+                              filters.forEach(function (filter, i) {
+                                  var operator = exports.WsLogaccess.LogAccessFilterOperator.AND;
+                                  if (i > 0) {
+                                      if (filters[i - 1].SearchField === filter.SearchField) {
+                                          operator = exports.WsLogaccess.LogAccessFilterOperator.OR;
+                                      }
+                                      if (i === filters.length - 1) {
+                                          binaryLogFilter_1.Operator = operator;
+                                          binaryLogFilter_1.rightFilter = filter;
+                                      }
+                                      else {
+                                          binaryLogFilter_1.Operator = operator;
+                                          binaryLogFilter_1.rightBinaryFilter = {
+                                              BinaryLogFilter: [{
+                                                      leftFilter: filter
+                                                  }]
+                                          };
+                                          binaryLogFilter_1 = binaryLogFilter_1.rightBinaryFilter.BinaryLogFilter[0];
+                                      }
+                                  }
+                                  else {
+                                      binaryLogFilter_1.leftFilter = filter;
+                                  }
+                              });
+                          }
+                          else {
+                              delete getLogsRequest.Filter.leftBinaryFilter;
+                              getLogsRequest.Filter.leftFilter = {
+                                  LogCategory: exports.WsLogaccess.LogAccessType.All
+                              };
+                              if ((_c = filters[0]) === null || _c === void 0 ? void 0 : _c.SearchField) {
+                                  getLogsRequest.Filter.leftFilter = {
+                                      LogCategory: (_d = filters[0]) === null || _d === void 0 ? void 0 : _d.LogCategory,
+                                      SearchField: (_e = filters[0]) === null || _e === void 0 ? void 0 : _e.SearchField,
+                                      SearchByValue: (_f = filters[0]) === null || _f === void 0 ? void 0 : _f.SearchByValue
+                                  };
+                              }
+                              if ((_g = filters[1]) === null || _g === void 0 ? void 0 : _g.SearchField) {
+                                  getLogsRequest.Filter.Operator = exports.WsLogaccess.LogAccessFilterOperator.AND;
+                                  if (filters[0].SearchField === filters[1].SearchField) {
+                                      getLogsRequest.Filter.Operator = exports.WsLogaccess.LogAccessFilterOperator.OR;
+                                  }
+                                  getLogsRequest.Filter.rightFilter = {
+                                      LogCategory: (_h = filters[0]) === null || _h === void 0 ? void 0 : _h.LogCategory,
+                                      SearchField: (_j = filters[1]) === null || _j === void 0 ? void 0 : _j.SearchField,
+                                      SearchByValue: (_k = filters[1]) === null || _k === void 0 ? void 0 : _k.SearchByValue
+                                  };
+                              }
+                          }
+                          if (request.StartDate) {
+                              getLogsRequest.Range.StartDate = request.StartDate.toISOString();
+                          }
+                          if (request.EndDate) {
+                              getLogsRequest.Range.EndDate = request.EndDate.toISOString();
+                          }
+                          return [2 /*return*/, this.GetLogs(getLogsRequest).then(function (response) {
+                                  var _a, _b, _c, _d, _e;
+                                  try {
+                                      var logLines = JSON.parse(response.LogLines);
+                                      var lines = [];
+                                      switch (logInfo.RemoteLogManagerType) {
+                                          case "azureloganalyticscurl":
+                                              lines = (_b = (_a = logLines.lines) === null || _a === void 0 ? void 0 : _a.map(azureToLogLine)) !== null && _b !== void 0 ? _b : [];
+                                              break;
+                                          case "elasticstack":
+                                              lines = (_d = (_c = logLines.lines) === null || _c === void 0 ? void 0 : _c.map(elasticToLogLine)) !== null && _d !== void 0 ? _d : [];
+                                              break;
+                                          default:
+                                              logger$2.warning("Unknown RemoteLogManagerType: ".concat(logInfo.RemoteLogManagerType));
+                                              lines = [];
+                                      }
+                                      return {
+                                          lines: lines,
+                                          total: (_e = response.TotalLogLinesAvailable) !== null && _e !== void 0 ? _e : 10000
+                                      };
+                                  }
+                                  catch (e) {
+                                      logger$2.error(e);
+                                  }
+                                  return {
+                                      lines: [],
+                                      total: 0
+                                  };
+                              })];
                   }
               });
-          }
-          else {
-              delete getLogsRequest.Filter.leftBinaryFilter;
-              getLogsRequest.Filter.leftFilter = {
-                  LogCategory: exports.WsLogaccess.LogAccessType.All
-              };
-              if ((_c = filters[0]) === null || _c === void 0 ? void 0 : _c.SearchField) {
-                  getLogsRequest.Filter.leftFilter = {
-                      LogCategory: (_d = filters[0]) === null || _d === void 0 ? void 0 : _d.LogCategory,
-                      SearchField: (_e = filters[0]) === null || _e === void 0 ? void 0 : _e.SearchField,
-                      SearchByValue: (_f = filters[0]) === null || _f === void 0 ? void 0 : _f.SearchByValue
-                  };
-              }
-              if ((_g = filters[1]) === null || _g === void 0 ? void 0 : _g.SearchField) {
-                  getLogsRequest.Filter.Operator = exports.WsLogaccess.LogAccessFilterOperator.AND;
-                  if (filters[0].SearchField === filters[1].SearchField) {
-                      getLogsRequest.Filter.Operator = exports.WsLogaccess.LogAccessFilterOperator.OR;
-                  }
-                  getLogsRequest.Filter.rightFilter = {
-                      LogCategory: (_h = filters[0]) === null || _h === void 0 ? void 0 : _h.LogCategory,
-                      SearchField: (_j = filters[1]) === null || _j === void 0 ? void 0 : _j.SearchField,
-                      SearchByValue: (_k = filters[1]) === null || _k === void 0 ? void 0 : _k.SearchByValue
-                  };
-              }
-          }
-          if (request.StartDate) {
-              getLogsRequest.Range.StartDate = request.StartDate.toISOString();
-          }
-          if (request.EndDate) {
-              getLogsRequest.Range.EndDate = request.EndDate.toISOString();
-          }
-          return Promise.all([this.GetLogAccessInfo(), this.GetLogs(getLogsRequest)]).then(function (_a) {
-              var _b, _c, _d, _e, _f;
-              var info = _a[0], response = _a[1];
-              try {
-                  var logLines = JSON.parse(response.LogLines);
-                  var lines = [];
-                  switch (info.RemoteLogManagerType) {
-                      case "azureloganalyticscurl":
-                          lines = (_c = (_b = logLines.lines) === null || _b === void 0 ? void 0 : _b.map(azureToLogLine)) !== null && _c !== void 0 ? _c : [];
-                          break;
-                      case "elasticstack":
-                          lines = (_e = (_d = logLines.lines) === null || _d === void 0 ? void 0 : _d.map(elasticToLogLine)) !== null && _e !== void 0 ? _e : [];
-                          break;
-                      default:
-                          logger$2.warning("Unknown RemoteLogManagerType: ".concat(info.RemoteLogManagerType));
-                          lines = [];
-                  }
-                  return {
-                      lines: lines,
-                      total: (_f = response.TotalLogLinesAvailable) !== null && _f !== void 0 ? _f : 10000
-                  };
-              }
-              catch (e) {
-                  logger$2.error(e);
-              }
-              return {
-                  lines: [],
-                  total: 0
-              };
           });
       };
       return LogaccessService;
@@ -7461,6 +7483,27 @@
           });
           return retVal;
       };
+      Query.prototype.fetchDetails = function () {
+          return __awaiter(this, void 0, void 0, function () {
+              var queryDetails;
+              return __generator(this, function (_a) {
+                  switch (_a.label) {
+                      case 0: return [4 /*yield*/, this._wsWorkunits.WUQueryDetails({
+                              QuerySet: this.QuerySet,
+                              QueryId: this.QueryId,
+                              IncludeStateOnClusters: false,
+                              IncludeSuperFiles: false,
+                              IncludeWsEclAddresses: false,
+                              CheckAllNodes: false
+                          })];
+                      case 1:
+                          queryDetails = _a.sent();
+                          this.set(__assign({}, queryDetails));
+                          return [2 /*return*/];
+                  }
+              });
+          });
+      };
       Query.prototype.fetchRequestSchema = function () {
           return __awaiter(this, void 0, void 0, function () {
               var _a;
@@ -7516,9 +7559,16 @@
       };
       Query.prototype.refresh = function () {
           return __awaiter(this, void 0, void 0, function () {
-              var _this = this;
               return __generator(this, function (_a) {
-                  return [2 /*return*/, this.fetchSchema().then(function (schema) { return _this; })];
+                  switch (_a.label) {
+                      case 0: return [4 /*yield*/, Promise.all([
+                              this.fetchDetails(),
+                              this.fetchSchema()
+                          ])];
+                      case 1:
+                          _a.sent();
+                          return [2 /*return*/, this];
+                  }
               });
           });
       };