@hpcc-js/comms 3.5.2 → 3.6.1

package/dist/browser/index.js

@@ -2,7 +2,7 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
 import { scopedLogger, join, promiseTimeout, exists, deepMixin, xml2json, StateObject, Cache, Graph, Subgraph as Subgraph$1, Vertex as Vertex$1, Edge as Edge$1, SAXStackParser, Stack, espTime2Seconds as espTime2Seconds$1, deepMixinT, XMLNode, debounce, Message, Dispatch } from "@hpcc-js/util";
-const PKG_NAME = "@hpcc-js/comms", PKG_VERSION = "3.5.1", BUILD_VERSION = "3.6.1", logger$5 = scopedLogger("comms/connection.ts");
+const PKG_NAME = "@hpcc-js/comms", PKG_VERSION = "3.6.0", BUILD_VERSION = "3.7.0", logger$6 = scopedLogger("comms/connection.ts");
 function instanceOfIOptions(object) {
   return "baseUrl" in object;
 }
@@ -48,7 +48,7 @@ function jsonp(opts, action, request = {}, responseType = "json", header) {
     let url = join(opts.baseUrl, action);
     url += url.indexOf("?") >= 0 ? "&" : "?", script.src = url + "jsonp=" + callbackName + "&" + serializeRequest(request, opts.encodeRequest), document.body.appendChild(script);
     const progress = setInterval(function() {
-      respondedTimeout <= 0 ? clearInterval(progress) : (respondedTimeout -= respondedTick, respondedTimeout <= 0 ? (clearInterval(progress), logger$5.error("Request timeout:  " + script.src), doCallback(), reject(Error("Request timeout:  " + script.src))) : logger$5.debug("Request pending (" + respondedTimeout / 1e3 + " sec):  " + script.src));
+      respondedTimeout <= 0 ? clearInterval(progress) : (respondedTimeout -= respondedTick, respondedTimeout <= 0 ? (clearInterval(progress), logger$6.error("Request timeout:  " + script.src), doCallback(), reject(Error("Request timeout:  " + script.src))) : logger$6.debug("Request pending (" + respondedTimeout / 1e3 + " sec):  " + script.src));
     }, respondedTick);
     function doCallback() {
       delete window[callbackName], document.body.removeChild(script);
@@ -581,23 +581,68 @@ class AccountService extends AccountServiceBase {
 }
 class CloudServiceBase extends Service {
   constructor(optsConnection) {
-    super(optsConnection, "WsCloud", "1");
+    super(optsConnection, "WsCloud", "1.02");
   }
   GetPODs(request) {
-    return this._connection.send("GetPODs", request);
+    return this._connection.send("GetPODs", request, "json", !1, void 0, "GetPODsResponse");
   }
-  Ping(request) {
-    return this._connection.send("Ping", request);
+  GetServices(request) {
+    return this._connection.send("GetServices", request, "json", !1, void 0, "GetServicesResponse");
   }
+  Ping(request) {
+    return this._connection.send("Ping", request, "json", !1, void 0, "WsCloudPingResponse");
+  }
+}
+const logger$5 = scopedLogger("@hpcc-js/comms/services/wsCloud.ts");
+function isGetPODsResponse_v1_02(response) {
+  return (response == null ? void 0 : response.Pods) !== void 0;
+}
+function mapPorts(pod) {
+  var _a, _b;
+  return ((_b = (_a = pod.spec) == null ? void 0 : _a.containers) == null ? void 0 : _b.reduce((prev, curr) => {
+    var _a2;
+    return (_a2 = curr.ports) == null || _a2.forEach((p) => {
+      prev.push({
+        ContainerPort: p.containerPort,
+        Name: p.name,
+        Protocol: p.protocol
+      });
+    }), prev;
+  }, [])) ?? [];
+}
+function mapPods(pods) {
+  return pods.filter((pod) => {
+    var _a;
+    const labels = ((_a = pod == null ? void 0 : pod.metadata) == null ? void 0 : _a.labels) ?? {};
+    return labels.hasOwnProperty("app.kubernetes.io/part-of") && labels["app.kubernetes.io/part-of"] === "HPCC-Platform";
+  }).map((pod) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    const started = new Date((_a = pod.metadata) == null ? void 0 : _a.creationTimestamp);
+    return {
+      Name: pod.metadata.name,
+      Status: (_b = pod.status) == null ? void 0 : _b.phase,
+      CreationTimestamp: started.toISOString(),
+      ContainerName: ((_d = (_c = pod.status) == null ? void 0 : _c.containerStatuses) == null ? void 0 : _d.reduce((prev, curr) => (curr.name && prev.push(curr.name), prev), []).join(", ")) ?? "",
+      ContainerCount: ((_f = (_e = pod.spec) == null ? void 0 : _e.containers) == null ? void 0 : _f.length) ?? 0,
+      ContainerReadyCount: (_h = (_g = pod.status) == null ? void 0 : _g.containerStatuses) == null ? void 0 : _h.reduce((prev, curr) => prev + (curr.ready ? 1 : 0), 0),
+      ContainerRestartCount: (_j = (_i = pod.status) == null ? void 0 : _i.containerStatuses) == null ? void 0 : _j.reduce((prev, curr) => prev + curr.restartCount, 0),
+      Ports: {
+        Port: mapPorts(pod)
+      }
+    };
+  });
 }
 class CloudService extends CloudServiceBase {
   getPODs() {
     return super.GetPODs({}).then((response) => {
+      var _a;
+      if (isGetPODsResponse_v1_02(response))
+        return ((_a = response.Pods) == null ? void 0 : _a.Pod) ?? [];
       try {
         const obj = typeof response.Result == "string" ? JSON.parse(response.Result) : response.Result;
-        return (obj == null ? void 0 : obj.items) ?? [];
-      } catch {
-        return [];
+        return mapPods((obj == null ? void 0 : obj.items) ?? []);
+      } catch (error) {
+        return logger$5.error(`Error parsing V1Pods json '${error instanceof Error ? error.message : String(error)}'`), [];
       }
     });
   }
@@ -970,24 +1015,29 @@ class ElkService extends ElkServiceBase {
 var WsLogaccess;
 ((WsLogaccess2) => {
   ((LogColumnType2) => {
-    LogColumnType2.global = "global", LogColumnType2.workunits = "workunits", LogColumnType2.components = "components", LogColumnType2.audience = "audience", LogColumnType2.class = "class", LogColumnType2.instance = "instance", LogColumnType2.node = "node", LogColumnType2.message = "message", LogColumnType2.logid = "logid", LogColumnType2.processid = "processid", LogColumnType2.threadid = "threadid", LogColumnType2.timestamp = "timestamp", LogColumnType2.pod = "pod";
+    LogColumnType2.global = "global", LogColumnType2.workunits = "workunits", LogColumnType2.components = "components", LogColumnType2.audience = "audience", LogColumnType2.class = "class", LogColumnType2.instance = "instance", LogColumnType2.node = "node", LogColumnType2.message = "message", LogColumnType2.logid = "logid", LogColumnType2.processid = "processid", LogColumnType2.threadid = "threadid", LogColumnType2.timestamp = "timestamp", LogColumnType2.pod = "pod", LogColumnType2.traceid = "traceid", LogColumnType2.spanid = "spanid";
   })(WsLogaccess2.LogColumnType || (WsLogaccess2.LogColumnType = {})), ((LogColumnValueType2) => {
-    LogColumnValueType2.string = "string", LogColumnValueType2.numeric = "numeric", LogColumnValueType2.datetime = "datetime", LogColumnValueType2.enum = "enum";
+    LogColumnValueType2.string = "string", LogColumnValueType2.numeric = "numeric", LogColumnValueType2.datetime = "datetime", LogColumnValueType2.enum = "enum", LogColumnValueType2.epoch = "epoch";
   })(WsLogaccess2.LogColumnValueType || (WsLogaccess2.LogColumnValueType = {})), ((LogAccessType2) => {
-    LogAccessType2[LogAccessType2.All = 0] = "All", LogAccessType2[LogAccessType2.ByJobID = 1] = "ByJobID", LogAccessType2[LogAccessType2.ByComponent = 2] = "ByComponent", LogAccessType2[LogAccessType2.ByLogType = 3] = "ByLogType", LogAccessType2[LogAccessType2.ByTargetAudience = 4] = "ByTargetAudience", LogAccessType2[LogAccessType2.BySourceInstance = 5] = "BySourceInstance", LogAccessType2[LogAccessType2.BySourceNode = 6] = "BySourceNode", LogAccessType2[LogAccessType2.ByFieldName = 7] = "ByFieldName", LogAccessType2[LogAccessType2.ByPod = 8] = "ByPod";
-  })(WsLogaccess2.LogAccessType || (WsLogaccess2.LogAccessType = {})), ((LogAccessFilterOperator2) => {
+    LogAccessType2[LogAccessType2.All = 0] = "All", LogAccessType2[LogAccessType2.ByJobID = 1] = "ByJobID", LogAccessType2[LogAccessType2.ByComponent = 2] = "ByComponent", LogAccessType2[LogAccessType2.ByLogType = 3] = "ByLogType", LogAccessType2[LogAccessType2.ByTargetAudience = 4] = "ByTargetAudience", LogAccessType2[LogAccessType2.BySourceInstance = 5] = "BySourceInstance", LogAccessType2[LogAccessType2.BySourceNode = 6] = "BySourceNode", LogAccessType2[LogAccessType2.ByFieldName = 7] = "ByFieldName", LogAccessType2[LogAccessType2.ByPod = 8] = "ByPod", LogAccessType2[LogAccessType2.ByTraceID = 9] = "ByTraceID", LogAccessType2[LogAccessType2.BySpanID = 10] = "BySpanID";
+  })(WsLogaccess2.LogAccessType || (WsLogaccess2.LogAccessType = {})), ((LogAccessStatusCode2) => {
+    LogAccessStatusCode2[LogAccessStatusCode2.Success = 0] = "Success", LogAccessStatusCode2[LogAccessStatusCode2.Warning = 1] = "Warning", LogAccessStatusCode2[LogAccessStatusCode2.Fail = 2] = "Fail";
+  })(WsLogaccess2.LogAccessStatusCode || (WsLogaccess2.LogAccessStatusCode = {})), ((LogAccessFilterOperator2) => {
     LogAccessFilterOperator2[LogAccessFilterOperator2.NONE = 0] = "NONE", LogAccessFilterOperator2[LogAccessFilterOperator2.AND = 1] = "AND", LogAccessFilterOperator2[LogAccessFilterOperator2.OR = 2] = "OR";
   })(WsLogaccess2.LogAccessFilterOperator || (WsLogaccess2.LogAccessFilterOperator = {})), ((LogSelectColumnMode2) => {
     LogSelectColumnMode2[LogSelectColumnMode2.MIN = 0] = "MIN", LogSelectColumnMode2[LogSelectColumnMode2.DEFAULT = 1] = "DEFAULT", LogSelectColumnMode2[LogSelectColumnMode2.ALL = 2] = "ALL", LogSelectColumnMode2[LogSelectColumnMode2.CUSTOM = 3] = "CUSTOM";
   })(WsLogaccess2.LogSelectColumnMode || (WsLogaccess2.LogSelectColumnMode = {})), ((SortColumType2) => {
-    SortColumType2[SortColumType2.ByDate = 0] = "ByDate", SortColumType2[SortColumType2.ByJobID = 1] = "ByJobID", SortColumType2[SortColumType2.ByComponent = 2] = "ByComponent", SortColumType2[SortColumType2.ByLogType = 3] = "ByLogType", SortColumType2[SortColumType2.ByTargetAudience = 4] = "ByTargetAudience", SortColumType2[SortColumType2.BySourceInstance = 5] = "BySourceInstance", SortColumType2[SortColumType2.BySourceNode = 6] = "BySourceNode", SortColumType2[SortColumType2.ByFieldName = 7] = "ByFieldName", SortColumType2[SortColumType2.ByPod = 8] = "ByPod";
+    SortColumType2[SortColumType2.ByDate = 0] = "ByDate", SortColumType2[SortColumType2.ByJobID = 1] = "ByJobID", SortColumType2[SortColumType2.ByComponent = 2] = "ByComponent", SortColumType2[SortColumType2.ByLogType = 3] = "ByLogType", SortColumType2[SortColumType2.ByTargetAudience = 4] = "ByTargetAudience", SortColumType2[SortColumType2.BySourceInstance = 5] = "BySourceInstance", SortColumType2[SortColumType2.BySourceNode = 6] = "BySourceNode", SortColumType2[SortColumType2.ByFieldName = 7] = "ByFieldName", SortColumType2[SortColumType2.ByPod = 8] = "ByPod", SortColumType2[SortColumType2.ByTraceID = 9] = "ByTraceID", SortColumType2[SortColumType2.BySpanID = 10] = "BySpanID";
   })(WsLogaccess2.SortColumType || (WsLogaccess2.SortColumType = {})), ((SortDirection2) => {
     SortDirection2[SortDirection2.ASC = 0] = "ASC", SortDirection2[SortDirection2.DSC = 1] = "DSC";
   })(WsLogaccess2.SortDirection || (WsLogaccess2.SortDirection = {}));
 })(WsLogaccess || (WsLogaccess = {}));
 class LogaccessServiceBase extends Service {
   constructor(optsConnection) {
-    super(optsConnection, "ws_logaccess", "1.05");
+    super(optsConnection, "ws_logaccess", "1.08");
+  }
+  GetHealthReport(request) {
+    return this._connection.send("GetHealthReport", request, "json", !1, void 0, "GetHealthReportResponse");
   }
   GetLogAccessInfo(request) {
     return this._connection.send("GetLogAccessInfo", request, "json", !1, void 0, "GetLogAccessInfoResponse");
@@ -1643,7 +1693,7 @@ var WsWorkunits;
 })(WsWorkunits || (WsWorkunits = {}));
 class WorkunitsServiceBase extends Service {
   constructor(optsConnection) {
-    super(optsConnection, "WsWorkunits", "2");
+    super(optsConnection, "WsWorkunits", "2.02");
   }
   GVCAjaxGraph(request) {
     return this._connection.send("GVCAjaxGraph", request, "json", !1, void 0, "GVCAjaxGraphResponse");
@@ -4097,9 +4147,13 @@ class Workunit extends StateObject {
             case "cost":
               props[scopeProperty.Name] = +scopeProperty.RawValue / 1e6;
               break;
-            case "cpu":
-            case "skw":
             case "node":
+              props[scopeProperty.Name] = +scopeProperty.RawValue;
+              break;
+            case "skw":
+              props[scopeProperty.Name] = +scopeProperty.RawValue;
+              break;
+            case "cpu":
             case "ppm":
             case "ip":
             case "cy":