@hpcc-js/comms 2.77.0 → 2.78.0

package/dist/index.js

@@ -611,8 +611,8 @@
   }
 
   var PKG_NAME = "@hpcc-js/comms";
-  var PKG_VERSION = "2.77.0";
-  var BUILD_VERSION = "2.103.3";
+  var PKG_VERSION = "2.78.0";
+  var BUILD_VERSION = "2.103.4";
 
   /*! *****************************************************************************
   Copyright (c) Microsoft Corporation.
@@ -704,7 +704,7 @@
       return to.concat(ar || Array.prototype.slice.call(from));
   }
 
-  var logger$1 = util.scopedLogger("comms/connection.ts");
+  var logger$2 = util.scopedLogger("comms/connection.ts");
   function instanceOfIOptions(object) {
       return "baseUrl" in object;
   }
@@ -806,12 +806,12 @@
                   respondedTimeout -= respondedTick;
                   if (respondedTimeout <= 0) {
                       clearInterval(progress);
-                      logger$1.error("Request timeout:  " + script.src);
+                      logger$2.error("Request timeout:  " + script.src);
                       doCallback();
                       reject(Error("Request timeout:  " + script.src));
                   }
                   else {
-                      logger$1.debug("Request pending (" + respondedTimeout / 1000 + " sec):  " + script.src);
+                      logger$2.debug("Request pending (" + respondedTimeout / 1000 + " sec):  " + script.src);
                   }
               }
           }, respondedTick);
@@ -1906,11 +1906,27 @@
       LogAccessType[LogAccessType["ByComponent"] = 2] = "ByComponent";
       LogAccessType[LogAccessType["ByLogType"] = 3] = "ByLogType";
       LogAccessType[LogAccessType["ByTargetAudience"] = 4] = "ByTargetAudience";
+      LogAccessType[LogAccessType["BySourceInstance"] = 5] = "BySourceInstance";
+      LogAccessType[LogAccessType["BySourceNode"] = 6] = "BySourceNode";
+      LogAccessType[LogAccessType["ByFieldName"] = 7] = "ByFieldName";
   })(exports.LogAccessType || (exports.LogAccessType = {}));
+  var LogAccessFilterOperator;
+  (function (LogAccessFilterOperator) {
+      LogAccessFilterOperator[LogAccessFilterOperator["NONE"] = 0] = "NONE";
+      LogAccessFilterOperator[LogAccessFilterOperator["AND"] = 1] = "AND";
+      LogAccessFilterOperator[LogAccessFilterOperator["OR"] = 2] = "OR";
+  })(LogAccessFilterOperator || (LogAccessFilterOperator = {}));
+  var LogSelectColumnMode;
+  (function (LogSelectColumnMode) {
+      LogSelectColumnMode[LogSelectColumnMode["MIN"] = 0] = "MIN";
+      LogSelectColumnMode[LogSelectColumnMode["DEFAULT"] = 1] = "DEFAULT";
+      LogSelectColumnMode[LogSelectColumnMode["ALL"] = 2] = "ALL";
+      LogSelectColumnMode[LogSelectColumnMode["CUSTOM"] = 3] = "CUSTOM";
+  })(LogSelectColumnMode || (LogSelectColumnMode = {}));
   var LogaccessServiceBase = /** @class */ (function (_super) {
       __extends(LogaccessServiceBase, _super);
       function LogaccessServiceBase(optsConnection) {
-          return _super.call(this, optsConnection, "ws_logaccess", "1") || this;
+          return _super.call(this, optsConnection, "ws_logaccess", "1.02") || this;
       }
       LogaccessServiceBase.prototype.GetLogAccessInfo = function (request) {
           return this._connection.send("GetLogAccessInfo", request);
@@ -1924,11 +1940,114 @@
       return LogaccessServiceBase;
   }(Service));
 
+  var logger$1 = util.scopedLogger("@hpcc-js/comms/services/wsLogaccess.ts");
+  exports.KnownColumns = void 0;
+  (function (KnownColumns) {
+      KnownColumns["audience"] = "hpcc.log.audience";
+      KnownColumns["class"] = "hpcc.log.class";
+      KnownColumns["jobId"] = "hpcc.log.jobid";
+      KnownColumns["message"] = "hpcc.log.message";
+      KnownColumns["procId"] = "hpcc.log.procid";
+      KnownColumns["sequence"] = "hpcc.log.sequence";
+      KnownColumns["threadId"] = "hpcc.log.threadid";
+      KnownColumns["timestamp"] = "hpcc.log.timestamp";
+      KnownColumns["containerName"] = "kubernetes.container.name";
+  })(exports.KnownColumns || (exports.KnownColumns = {}));
+  var RKnownColumns = {};
+  for (var key in exports.KnownColumns) {
+      if (exports.KnownColumns.hasOwnProperty(key)) {
+          RKnownColumns[exports.KnownColumns[key]] = key;
+      }
+  }
+  var defaultToLogLine = function (line) {
+      var retVal = {};
+      for (var key in RKnownColumns) {
+          retVal[RKnownColumns[key]] = line === null || line === void 0 ? void 0 : line.fields[0][key];
+      }
+      return retVal;
+  };
   var LogaccessService = /** @class */ (function (_super) {
       __extends(LogaccessService, _super);
       function LogaccessService() {
           return _super !== null && _super.apply(this, arguments) || this;
       }
+      LogaccessService.prototype.GetLogAccessInfo = function (request) {
+          return _super.prototype.GetLogAccessInfo.call(this, request);
+      };
+      LogaccessService.prototype.GetLogs = function (request) {
+          return _super.prototype.GetLogs.call(this, request);
+      };
+      LogaccessService.prototype.GetLogsEx = function (request) {
+          var _a, _b;
+          var getLogsRequest = {
+              Filter: {
+                  leftBinaryFilter: {
+                      BinaryLogFilter: [{
+                              leftFilter: {
+                                  LogCategory: exports.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: LogSelectColumnMode.DEFAULT,
+              Format: "JSON"
+          };
+          var filters = [];
+          for (var key in request) {
+              if (key in exports.KnownColumns) {
+                  filters.push({
+                      LogCategory: exports.LogAccessType.ByFieldName,
+                      SearchField: exports.KnownColumns[key],
+                      SearchByValue: request[key]
+                  });
+              }
+          }
+          var binaryLogFilter = getLogsRequest.Filter.leftBinaryFilter.BinaryLogFilter[0];
+          filters.forEach(function (filter, i) {
+              if (i === 0) {
+                  binaryLogFilter.leftFilter = filter;
+              }
+              else if (i === filters.length - 1) {
+                  binaryLogFilter.Operator = LogAccessFilterOperator.AND;
+                  binaryLogFilter.rightFilter = filter;
+              }
+              else {
+                  binaryLogFilter.Operator = LogAccessFilterOperator.AND;
+                  binaryLogFilter.rightBinaryFilter = {
+                      BinaryLogFilter: [{
+                              leftFilter: filter
+                          }]
+                  };
+                  binaryLogFilter = binaryLogFilter.rightBinaryFilter.BinaryLogFilter[0];
+              }
+          });
+          if (request.StartDate && request.EndDate) {
+              getLogsRequest.Range.StartDate = request.StartDate.toISOString();
+              getLogsRequest.Range.EndDate = request.EndDate.toISOString();
+          }
+          return this.GetLogs(getLogsRequest).then(function (response) {
+              var _a, _b, _c;
+              try {
+                  var logLines = JSON.parse(response.LogLines);
+                  return {
+                      lines: (_b = (_a = logLines.lines) === null || _a === void 0 ? void 0 : _a.map(defaultToLogLine)) !== null && _b !== void 0 ? _b : [],
+                      total: (_c = response.TotalLogLinesAvailable) !== null && _c !== void 0 ? _c : 10000
+                  };
+              }
+              catch (e) {
+                  logger$1.error(e);
+              }
+              return {
+                  lines: [],
+                  total: 0
+              };
+          });
+      };
       return LogaccessService;
   }(LogaccessServiceBase));
 
@@ -2500,6 +2619,9 @@
       WorkunitsService.prototype.WUPublishWorkunit = function (request) {
           return this._connection.send("WUPublishWorkunit", request);
       };
+      WorkunitsService.prototype.WUQueryFiles = function (request) {
+          return this._connection.send("WUQueryFiles", request);
+      };
       WorkunitsService.prototype.WUGetGraph = function (request) {
           return this._connection.send("WUGetGraph", request);
       };