@hpcc-js/comms 2.99.4 → 2.101.0

package/dist/index.js

@@ -648,8 +648,8 @@
   }
 
   var PKG_NAME = "@hpcc-js/comms";
-  var PKG_VERSION = "2.99.4";
-  var BUILD_VERSION = "2.107.6";
+  var PKG_VERSION = "2.101.0";
+  var BUILD_VERSION = "2.108.0";
 
   /******************************************************************************
   Copyright (c) Microsoft Corporation.
@@ -746,7 +746,7 @@
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
   };
 
-  var logger$5 = util.scopedLogger("comms/connection.ts");
+  var logger$6 = util.scopedLogger("comms/connection.ts");
   function instanceOfIOptions(object) {
       return "baseUrl" in object;
   }
@@ -848,12 +848,12 @@
                   respondedTimeout -= respondedTick;
                   if (respondedTimeout <= 0) {
                       clearInterval(progress);
-                      logger$5.error("Request timeout:  " + script.src);
+                      logger$6.error("Request timeout:  " + script.src);
                       doCallback();
                       reject(Error("Request timeout:  " + script.src));
                   }
                   else {
-                      logger$5.debug("Request pending (" + respondedTimeout / 1000 + " sec):  " + script.src);
+                      logger$6.debug("Request pending (" + respondedTimeout / 1000 + " sec):  " + script.src);
                   }
               }
           }, respondedTick);
@@ -1545,17 +1545,67 @@
   var CloudServiceBase = /** @class */ (function (_super) {
       __extends(CloudServiceBase, _super);
       function CloudServiceBase(optsConnection) {
-          return _super.call(this, optsConnection, "WsCloud", "1") || this;
+          return _super.call(this, optsConnection, "WsCloud", "1.02") || this;
       }
       CloudServiceBase.prototype.GetPODs = function (request) {
-          return this._connection.send("GetPODs", request);
+          return this._connection.send("GetPODs", request, "json", false, undefined, "GetPODsResponse");
+      };
+      CloudServiceBase.prototype.GetServices = function (request) {
+          return this._connection.send("GetServices", request, "json", false, undefined, "GetServicesResponse");
       };
       CloudServiceBase.prototype.Ping = function (request) {
-          return this._connection.send("Ping", request);
+          return this._connection.send("Ping", request, "json", false, undefined, "WsCloudPingResponse");
       };
       return CloudServiceBase;
   }(Service));
 
+  var logger$5 = util.scopedLogger("@hpcc-js/comms/services/wsCloud.ts");
+  function isGetPODsResponse_v1_02(response) {
+      return (response === null || response === void 0 ? void 0 : response.Pods) !== undefined;
+  }
+  function mapPorts(pod) {
+      var _a, _b, _c;
+      return (_c = (_b = (_a = pod.spec) === null || _a === void 0 ? void 0 : _a.containers) === null || _b === void 0 ? void 0 : _b.reduce(function (prev, curr) {
+          var _a;
+          (_a = curr.ports) === null || _a === void 0 ? void 0 : _a.forEach(function (p) {
+              prev.push({
+                  ContainerPort: p.containerPort,
+                  Name: p.name,
+                  Protocol: p.protocol
+              });
+          });
+          return prev;
+      }, [])) !== null && _c !== void 0 ? _c : [];
+  }
+  function mapPods(pods) {
+      return pods
+          .filter(function (pod) {
+          var _a, _b;
+          var labels = (_b = (_a = pod === null || pod === void 0 ? void 0 : pod.metadata) === null || _a === void 0 ? void 0 : _a.labels) !== null && _b !== void 0 ? _b : {};
+          return labels.hasOwnProperty("app.kubernetes.io/part-of") && labels["app.kubernetes.io/part-of"] === "HPCC-Platform";
+      })
+          .map(function (pod) {
+          var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+          var started = new Date((_a = pod.metadata) === null || _a === void 0 ? void 0 : _a.creationTimestamp);
+          return {
+              Name: pod.metadata.name,
+              Status: (_b = pod.status) === null || _b === void 0 ? void 0 : _b.phase,
+              CreationTimestamp: started.toISOString(),
+              ContainerName: (_e = (_d = (_c = pod.status) === null || _c === void 0 ? void 0 : _c.containerStatuses) === null || _d === void 0 ? void 0 : _d.reduce(function (prev, curr) {
+                  if (curr.name) {
+                      prev.push(curr.name);
+                  }
+                  return prev;
+              }, []).join(", ")) !== null && _e !== void 0 ? _e : "",
+              ContainerCount: (_h = (_g = (_f = pod.spec) === null || _f === void 0 ? void 0 : _f.containers) === null || _g === void 0 ? void 0 : _g.length) !== null && _h !== void 0 ? _h : 0,
+              ContainerReadyCount: (_k = (_j = pod.status) === null || _j === void 0 ? void 0 : _j.containerStatuses) === null || _k === void 0 ? void 0 : _k.reduce(function (prev, curr) { return prev + (curr.ready ? 1 : 0); }, 0),
+              ContainerRestartCount: (_m = (_l = pod.status) === null || _l === void 0 ? void 0 : _l.containerStatuses) === null || _m === void 0 ? void 0 : _m.reduce(function (prev, curr) { return prev + curr.restartCount; }, 0),
+              Ports: {
+                  Port: mapPorts(pod)
+              },
+          };
+      });
+  }
   var CloudService = /** @class */ (function (_super) {
       __extends(CloudService, _super);
       function CloudService() {
@@ -1563,12 +1613,16 @@
       }
       CloudService.prototype.getPODs = function () {
           return _super.prototype.GetPODs.call(this, {}).then(function (response) {
-              var _a;
+              var _a, _b, _c;
+              if (isGetPODsResponse_v1_02(response)) {
+                  return (_b = (_a = response.Pods) === null || _a === void 0 ? void 0 : _a.Pod) !== null && _b !== void 0 ? _b : [];
+              }
               try {
                   var obj = typeof response.Result === "string" ? JSON.parse(response.Result) : response.Result;
-                  return (_a = obj === null || obj === void 0 ? void 0 : obj.items) !== null && _a !== void 0 ? _a : [];
+                  return mapPods((_c = obj === null || obj === void 0 ? void 0 : obj.items) !== null && _c !== void 0 ? _c : []);
               }
               catch (error) {
+                  logger$5.error("Error parsing V1Pods json '".concat(error.message, "'"));
                   return [];
               }
           });
@@ -1702,6 +1756,35 @@
       function DaliService() {
           return _super !== null && _super.apply(this, arguments) || this;
       }
+      DaliService.prototype.Export = function (request) {
+          return __awaiter(this, void 0, void 0, function () {
+              var exportUrl, reqParams, response, filename, content;
+              return __generator(this, function (_a) {
+                  switch (_a.label) {
+                      case 0:
+                          exportUrl = "/WsDali/Export";
+                          reqParams = new URLSearchParams();
+                          if (request.Path) {
+                              reqParams.append("Path", request.Path);
+                          }
+                          if (request.Safe !== undefined) {
+                              reqParams.append("Safe", String(request.Safe));
+                          }
+                          return [4 /*yield*/, fetch("".concat(exportUrl, "?").concat(reqParams.toString()))];
+                      case 1:
+                          response = _a.sent();
+                          filename = response.headers.get("Content-Disposition");
+                          return [4 /*yield*/, response.blob()];
+                      case 2:
+                          content = _a.sent();
+                          return [2 /*return*/, {
+                                  filename: filename ? filename.split("filename=")[1] : "WsDali_Export",
+                                  content: content
+                              }];
+                  }
+              });
+          });
+      };
       return DaliService;
   }(DaliServiceBase));
 
@@ -3041,7 +3124,7 @@
   var WorkunitsServiceBase = /** @class */ (function (_super) {
       __extends(WorkunitsServiceBase, _super);
       function WorkunitsServiceBase(optsConnection) {
-          return _super.call(this, optsConnection, "WsWorkunits", "2") || this;
+          return _super.call(this, optsConnection, "WsWorkunits", "2.02") || this;
       }
       WorkunitsServiceBase.prototype.GVCAjaxGraph = function (request) {
           return this._connection.send("GVCAjaxGraph", request, "json", false, undefined, "GVCAjaxGraphResponse");
@@ -6800,8 +6883,10 @@
                           case "node":
                               props[scopeProperty.Name] = +scopeProperty.RawValue;
                               break;
-                          case "cpu":
                           case "skw":
+                              props[scopeProperty.Name] = +scopeProperty.RawValue;
+                              break;
+                          case "cpu":
                           case "ppm":
                           case "ip":
                           case "cy":