@hpcc-js/comms 2.86.0 → 2.87.0

package/dist/index.js

@@ -499,6 +499,7 @@
 
   Response.error = function() {
     var response = new Response(null, {status: 200, statusText: ''});
+    response.ok = false;
     response.status = 0;
     response.type = 'error';
     return response
@@ -549,7 +550,7 @@
         };
         // This check if specifically for when a user fetches a file locally from the file system
         // Only if the status is out of a normal range
-        if (request.url.startsWith('file://') && (xhr.status < 200 || xhr.status > 599)) {
+        if (request.url.indexOf('file://') === 0 && (xhr.status < 200 || xhr.status > 599)) {
           options.status = 200;
         } else {
           options.status = xhr.status;
@@ -647,8 +648,8 @@
   }
 
   var PKG_NAME = "@hpcc-js/comms";
-  var PKG_VERSION = "2.86.0";
-  var BUILD_VERSION = "2.104.34";
+  var PKG_VERSION = "2.87.0";
+  var BUILD_VERSION = "2.104.36";
 
   /******************************************************************************
   Copyright (c) Microsoft Corporation.
@@ -2501,49 +2502,117 @@
       return ResourcesService;
   }(ResourcesServiceBase));
 
-  var SMCService = /** @class */ (function () {
-      function SMCService(optsConnection) {
-          this._connection = new ESPConnection(optsConnection, "WsSMC", "1.24");
+  exports.WsSMC = void 0;
+  (function (WsSMC) {
+      (function (LockModes) {
+          LockModes["ALL"] = "ALL";
+          LockModes["READ"] = "READ";
+          LockModes["WRITE"] = "WRITE";
+          LockModes["HOLD"] = "HOLD";
+          LockModes["SUB"] = "SUB";
+      })(WsSMC.LockModes || (WsSMC.LockModes = {}));
+      (function (RoxieControlCmdType) {
+          RoxieControlCmdType["Attach"] = "Attach";
+          RoxieControlCmdType["Detach"] = "Detach";
+          RoxieControlCmdType["State"] = "State";
+          RoxieControlCmdType["Reload"] = "Reload";
+          RoxieControlCmdType["ReloadRetry"] = "ReloadRetry";
+          RoxieControlCmdType["MemLock"] = "MemLock";
+          RoxieControlCmdType["MemUnlock"] = "MemUnlock";
+          RoxieControlCmdType["GetMemLocked"] = "GetMemLocked";
+      })(WsSMC.RoxieControlCmdType || (WsSMC.RoxieControlCmdType = {}));
+  })(exports.WsSMC || (exports.WsSMC = {}));
+  var SMCServiceBase = /** @class */ (function (_super) {
+      __extends(SMCServiceBase, _super);
+      function SMCServiceBase(optsConnection) {
+          return _super.call(this, optsConnection, "WsSMC", "1.27") || this;
       }
-      SMCService.prototype.connectionOptions = function () {
-          return this._connection.opts();
+      SMCServiceBase.prototype.Activity = function (request) {
+          return this._connection.send("Activity", request, "json", false, undefined, "ActivityResponse");
       };
-      SMCService.prototype.Activity = function (request) {
-          return this._connection.send("Activity", request).then(function (response) {
-              return __assign({ Running: {
-                      ActiveWorkunit: []
-                  } }, response);
-          });
+      SMCServiceBase.prototype.BrowseResources = function (request) {
+          return this._connection.send("BrowseResources", request, "json", false, undefined, "BrowseResourcesResponse");
+      };
+      SMCServiceBase.prototype.ClearQueue = function (request) {
+          return this._connection.send("ClearQueue", request, "json", false, undefined, "SMCQueueResponse");
+      };
+      SMCServiceBase.prototype.GetBuildInfo = function (request) {
+          return this._connection.send("GetBuildInfo", request, "json", false, undefined, "GetBuildInfoResponse");
+      };
+      SMCServiceBase.prototype.GetStatusServerInfo = function (request) {
+          return this._connection.send("GetStatusServerInfo", request, "json", false, undefined, "GetStatusServerInfoResponse");
+      };
+      SMCServiceBase.prototype.GetThorQueueAvailability = function (request) {
+          return this._connection.send("GetThorQueueAvailability", request, "json", false, undefined, "GetThorQueueAvailabilityResponse");
+      };
+      SMCServiceBase.prototype.Index = function (request) {
+          return this._connection.send("Index", request, "json", false, undefined, "SMCIndexResponse");
+      };
+      SMCServiceBase.prototype.LockQuery = function (request) {
+          return this._connection.send("LockQuery", request, "json", false, undefined, "LockQueryResponse");
+      };
+      SMCServiceBase.prototype.MoveJobBack = function (request) {
+          return this._connection.send("MoveJobBack", request, "json", false, undefined, "SMCJobResponse");
+      };
+      SMCServiceBase.prototype.MoveJobDown = function (request) {
+          return this._connection.send("MoveJobDown", request, "json", false, undefined, "SMCJobResponse");
       };
-      SMCService.prototype.BrowseResources = function (request) {
-          return this._connection.send("BrowseResources", request);
+      SMCServiceBase.prototype.MoveJobFront = function (request) {
+          return this._connection.send("MoveJobFront", request, "json", false, undefined, "SMCJobResponse");
       };
-      SMCService.prototype.GetBuildInfo = function (request) {
-          return this._connection.send("GetBuildInfo", request);
+      SMCServiceBase.prototype.MoveJobUp = function (request) {
+          return this._connection.send("MoveJobUp", request, "json", false, undefined, "SMCJobResponse");
       };
-      SMCService.prototype.GetStatusServerInfo = function (request) {
-          return this._connection.send("GetStatusServerInfo", request);
+      SMCServiceBase.prototype.NotInCommunityEdition = function (request) {
+          return this._connection.send("NotInCommunityEdition", request, "json", false, undefined, "NotInCommunityEditionResponse");
       };
-      SMCService.prototype.GetThorQueueAvailability = function (request) {
-          return this._connection.send("GetThorQueueAvailability", request);
+      SMCServiceBase.prototype.PauseQueue = function (request) {
+          return this._connection.send("PauseQueue", request, "json", false, undefined, "SMCQueueResponse");
       };
-      SMCService.prototype.LockQuery = function (request) {
-          return this._connection.send("LockQuery", request);
+      SMCServiceBase.prototype.Ping = function (request) {
+          return this._connection.send("Ping", request, "json", false, undefined, "WsSMCPingResponse");
       };
-      SMCService.prototype.NotInCommunityEdition = function (request) {
-          return this._connection.send("NotInCommunityEdition", request);
+      SMCServiceBase.prototype.RemoveJob = function (request) {
+          return this._connection.send("RemoveJob", request, "json", false, undefined, "SMCJobResponse");
       };
-      SMCService.prototype.RoxieControlCmd = function (request) {
-          return this._connection.send("RoxieControlCmd", request);
+      SMCServiceBase.prototype.ResumeQueue = function (request) {
+          return this._connection.send("ResumeQueue", request, "json", false, undefined, "SMCQueueResponse");
       };
-      SMCService.prototype.SetBanner = function (request) {
-          return this._connection.send("SetBanner", request);
+      SMCServiceBase.prototype.RoxieControlCmd = function (request) {
+          return this._connection.send("RoxieControlCmd", request, "json", false, undefined, "RoxieControlCmdResponse");
       };
-      SMCService.prototype.SMCJob = function (request) {
-          return this._connection.send("SMCJob", request);
+      SMCServiceBase.prototype.RoxieXrefCmd = function (request) {
+          return this._connection.send("RoxieXrefCmd", request, "json", false, undefined, "RoxieXrefCmdResponse");
+      };
+      SMCServiceBase.prototype.SetBanner = function (request) {
+          return this._connection.send("SetBanner", request, "json", false, undefined, "SetBannerResponse");
+      };
+      SMCServiceBase.prototype.SetJobPriority = function (request) {
+          return this._connection.send("SetJobPriority", request, "json", false, undefined, "SMCPriorityResponse");
+      };
+      SMCServiceBase.prototype.StopQueue = function (request) {
+          return this._connection.send("StopQueue", request, "json", false, undefined, "SMCQueueResponse");
+      };
+      return SMCServiceBase;
+  }(Service));
+
+  var SMCService = /** @class */ (function (_super) {
+      __extends(SMCService, _super);
+      function SMCService() {
+          return _super !== null && _super.apply(this, arguments) || this;
+      }
+      SMCService.prototype.connectionOptions = function () {
+          return this._connection.opts();
+      };
+      SMCService.prototype.Activity = function (request) {
+          return _super.prototype.Activity.call(this, request).then(function (response) {
+              return __assign({ Running: {
+                      ActiveWorkunit: []
+                  } }, response);
+          });
       };
       return SMCService;
-  }());
+  }(SMCServiceBase));
 
   var StoreService = /** @class */ (function (_super) {
       __extends(StoreService, _super);
@@ -5645,6 +5714,76 @@
       }
       return num;
   }
+  var DEFINITION_LIST = "DefinitionList";
+  var definitionRegex = /([a-zA-Z]:)?(.*[\\\/])(.*)(\((\d+),(\d+)\))/;
+  var extendedProps = ["Avg", "Min", "Max", "Delta", "StdDev"];
+  var relatedProps = ["SkewMin", "SkewMax", "NodeMin", "NodeMax"];
+  var metricKeyRegex = /[A-Z][a-z]*/g;
+  function _splitLabel(fullLabel) {
+      // Related properties  ---
+      for (var _i = 0, relatedProps_1 = relatedProps; _i < relatedProps_1.length; _i++) {
+          var relProp = relatedProps_1[_i];
+          var index = fullLabel.indexOf(relProp);
+          if (index === 0) {
+              var measure = "";
+              var label = fullLabel.slice(index + relProp.length);
+              return { measure: measure, ext: relProp, label: label };
+          }
+      }
+      // Primary properties  ---
+      var labelParts = fullLabel.match(metricKeyRegex);
+      if (labelParts === null || labelParts === void 0 ? void 0 : labelParts.length) {
+          var measure = labelParts.shift();
+          var label = labelParts.join("");
+          for (var _a = 0, extendedProps_1 = extendedProps; _a < extendedProps_1.length; _a++) {
+              var ext = extendedProps_1[_a];
+              var index = label.indexOf(ext);
+              if (index === 0) {
+                  label = label.slice(index + ext.length);
+                  return { measure: measure, ext: ext, label: label };
+              }
+          }
+          // Not an aggregate property  ---
+          return { measure: measure, ext: "", label: label };
+      }
+      // No match found  ---
+      return { measure: "", ext: "", label: fullLabel };
+  }
+  var splitLabelCache = {};
+  function splitLabel(key) {
+      var retVal = splitLabelCache[key];
+      if (!retVal) {
+          retVal = _splitLabel(key);
+          splitLabelCache[key] = retVal;
+      }
+      return retVal;
+  }
+  function formatValue(item, key) {
+      var _a, _b, _c;
+      return (_c = (_b = (_a = item.__formattedProps) === null || _a === void 0 ? void 0 : _a[key]) !== null && _b !== void 0 ? _b : item[key]) !== null && _c !== void 0 ? _c : "";
+  }
+  function formatValues(item, key, dedup) {
+      var keyParts = splitLabel(key);
+      if (!dedup[keyParts.measure]) {
+          dedup[keyParts.label] = true;
+          return {
+              Key: "".concat(keyParts.measure).concat(keyParts.label),
+              Value: formatValue(item, "".concat(keyParts.measure).concat(keyParts.label)),
+              //  Extended properties  ---
+              Avg: formatValue(item, "".concat(keyParts.measure, "Avg").concat(keyParts.label)),
+              Min: formatValue(item, "".concat(keyParts.measure, "Min").concat(keyParts.label)),
+              Max: formatValue(item, "".concat(keyParts.measure, "Max").concat(keyParts.label)),
+              Delta: formatValue(item, "".concat(keyParts.measure, "Delta").concat(keyParts.label)),
+              StdDev: formatValue(item, "".concat(keyParts.measure, "StdDev").concat(keyParts.label)),
+              // Related properties  ---
+              SkewMin: formatValue(item, "SkewMin".concat(keyParts.label)),
+              SkewMax: formatValue(item, "SkewMax".concat(keyParts.label)),
+              NodeMin: formatValue(item, "NodeMin".concat(keyParts.label)),
+              NodeMax: formatValue(item, "NodeMax".concat(keyParts.label))
+          };
+      }
+      return null;
+  }
   var logger$2 = util.scopedLogger("workunit.ts");
   var WUStateID = exports.WUStateID;
   var WorkunitCache = /** @class */ (function (_super) {
@@ -6483,8 +6622,7 @@
                   }
               };
               var data = [];
-              for (var _i = 0, scopes_1 = scopes; _i < scopes_1.length; _i++) {
-                  var scope = scopes_1[_i];
+              var _loop_1 = function (scope) {
                   var props = {};
                   var formattedProps = {};
                   if (scope && scope.Id && scope.Properties && scope.Properties.Property) {
@@ -6533,8 +6671,42 @@
                           }
                           formattedProps[scopeProperty.Name] = formatNum((_a = scopeProperty.Formatted) !== null && _a !== void 0 ? _a : props[scopeProperty.Name]);
                       }
+                      //  Other properties  ---
+                  }
+                  var normalizedScope = __assign({ id: scope.Id, name: scope.ScopeName, type: scope.ScopeType, Kind: scope["Kind"], Label: scope["Label"], __formattedProps: formattedProps, __groupedProps: {} }, props);
+                  if (normalizedScope[DEFINITION_LIST]) {
+                      try {
+                          var definitionList = JSON.parse(normalizedScope[DEFINITION_LIST].split("\\").join("\\\\"));
+                          normalizedScope[DEFINITION_LIST] = [];
+                          definitionList.forEach(function (definition, idx) {
+                              var _a;
+                              var matches = definition.match(definitionRegex);
+                              if (matches) {
+                                  var filePath = ((_a = matches[1]) !== null && _a !== void 0 ? _a : "") + matches[2] + matches[3];
+                                  var line = parseInt(matches[5]);
+                                  var col = parseInt(matches[6]);
+                                  normalizedScope[DEFINITION_LIST].push({ filePath: filePath, line: line, col: col });
+                              }
+                          });
+                      }
+                      catch (e) {
+                          logger$2.error("Unexpected \"DefinitionList\":  ".concat(normalizedScope[DEFINITION_LIST]));
+                      }
+                  }
+                  var dedup = {};
+                  for (var key in normalizedScope) {
+                      if (key.indexOf("__") !== 0) {
+                          var row = formatValues(normalizedScope, key, dedup);
+                          if (row) {
+                              normalizedScope.__groupedProps[row.Key] = row;
+                          }
+                      }
                   }
-                  data.push(__assign({ id: scope.Id, name: scope.ScopeName, type: scope.ScopeType, __formattedProps: formattedProps }, props));
+                  data.push(normalizedScope);
+              };
+              for (var _i = 0, scopes_1 = scopes; _i < scopes_1.length; _i++) {
+                  var scope = scopes_1[_i];
+                  _loop_1(scope);
               }
               return {
                   meta: meta,