@hpcc-js/comms 2.99.5 → 2.101.1

package/lib-es6/services/wsdl/ws_logaccess/v1.08/ws_logaccess.js

@@ -0,0 +1,104 @@
+import { __extends } from "tslib";
+import { Service } from "../../../../espConnection";
+export var WsLogaccess;
+(function (WsLogaccess) {
+    var LogColumnType;
+    (function (LogColumnType) {
+        LogColumnType["global"] = "global";
+        LogColumnType["workunits"] = "workunits";
+        LogColumnType["components"] = "components";
+        LogColumnType["audience"] = "audience";
+        LogColumnType["class"] = "class";
+        LogColumnType["instance"] = "instance";
+        LogColumnType["node"] = "node";
+        LogColumnType["message"] = "message";
+        LogColumnType["logid"] = "logid";
+        LogColumnType["processid"] = "processid";
+        LogColumnType["threadid"] = "threadid";
+        LogColumnType["timestamp"] = "timestamp";
+        LogColumnType["pod"] = "pod";
+        LogColumnType["traceid"] = "traceid";
+        LogColumnType["spanid"] = "spanid";
+    })(LogColumnType = WsLogaccess.LogColumnType || (WsLogaccess.LogColumnType = {}));
+    var LogColumnValueType;
+    (function (LogColumnValueType) {
+        LogColumnValueType["string"] = "string";
+        LogColumnValueType["numeric"] = "numeric";
+        LogColumnValueType["datetime"] = "datetime";
+        LogColumnValueType["enum"] = "enum";
+        LogColumnValueType["epoch"] = "epoch";
+    })(LogColumnValueType = WsLogaccess.LogColumnValueType || (WsLogaccess.LogColumnValueType = {}));
+    var LogAccessType;
+    (function (LogAccessType) {
+        LogAccessType[LogAccessType["All"] = 0] = "All";
+        LogAccessType[LogAccessType["ByJobID"] = 1] = "ByJobID";
+        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";
+        LogAccessType[LogAccessType["ByPod"] = 8] = "ByPod";
+        LogAccessType[LogAccessType["ByTraceID"] = 9] = "ByTraceID";
+        LogAccessType[LogAccessType["BySpanID"] = 10] = "BySpanID";
+    })(LogAccessType = WsLogaccess.LogAccessType || (WsLogaccess.LogAccessType = {}));
+    var LogAccessStatusCode;
+    (function (LogAccessStatusCode) {
+        LogAccessStatusCode[LogAccessStatusCode["Success"] = 0] = "Success";
+        LogAccessStatusCode[LogAccessStatusCode["Warning"] = 1] = "Warning";
+        LogAccessStatusCode[LogAccessStatusCode["Fail"] = 2] = "Fail";
+    })(LogAccessStatusCode = WsLogaccess.LogAccessStatusCode || (WsLogaccess.LogAccessStatusCode = {}));
+    var LogAccessFilterOperator;
+    (function (LogAccessFilterOperator) {
+        LogAccessFilterOperator[LogAccessFilterOperator["NONE"] = 0] = "NONE";
+        LogAccessFilterOperator[LogAccessFilterOperator["AND"] = 1] = "AND";
+        LogAccessFilterOperator[LogAccessFilterOperator["OR"] = 2] = "OR";
+    })(LogAccessFilterOperator = WsLogaccess.LogAccessFilterOperator || (WsLogaccess.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 = WsLogaccess.LogSelectColumnMode || (WsLogaccess.LogSelectColumnMode = {}));
+    var SortColumType;
+    (function (SortColumType) {
+        SortColumType[SortColumType["ByDate"] = 0] = "ByDate";
+        SortColumType[SortColumType["ByJobID"] = 1] = "ByJobID";
+        SortColumType[SortColumType["ByComponent"] = 2] = "ByComponent";
+        SortColumType[SortColumType["ByLogType"] = 3] = "ByLogType";
+        SortColumType[SortColumType["ByTargetAudience"] = 4] = "ByTargetAudience";
+        SortColumType[SortColumType["BySourceInstance"] = 5] = "BySourceInstance";
+        SortColumType[SortColumType["BySourceNode"] = 6] = "BySourceNode";
+        SortColumType[SortColumType["ByFieldName"] = 7] = "ByFieldName";
+        SortColumType[SortColumType["ByPod"] = 8] = "ByPod";
+        SortColumType[SortColumType["ByTraceID"] = 9] = "ByTraceID";
+        SortColumType[SortColumType["BySpanID"] = 10] = "BySpanID";
+    })(SortColumType = WsLogaccess.SortColumType || (WsLogaccess.SortColumType = {}));
+    var SortDirection;
+    (function (SortDirection) {
+        SortDirection[SortDirection["ASC"] = 0] = "ASC";
+        SortDirection[SortDirection["DSC"] = 1] = "DSC";
+    })(SortDirection = WsLogaccess.SortDirection || (WsLogaccess.SortDirection = {}));
+})(WsLogaccess || (WsLogaccess = {}));
+var LogaccessServiceBase = /** @class */ (function (_super) {
+    __extends(LogaccessServiceBase, _super);
+    function LogaccessServiceBase(optsConnection) {
+        return _super.call(this, optsConnection, "ws_logaccess", "1.08") || this;
+    }
+    LogaccessServiceBase.prototype.GetHealthReport = function (request) {
+        return this._connection.send("GetHealthReport", request, "json", false, undefined, "GetHealthReportResponse");
+    };
+    LogaccessServiceBase.prototype.GetLogAccessInfo = function (request) {
+        return this._connection.send("GetLogAccessInfo", request, "json", false, undefined, "GetLogAccessInfoResponse");
+    };
+    LogaccessServiceBase.prototype.GetLogs = function (request) {
+        return this._connection.send("GetLogs", request, "json", false, undefined, "GetLogsResponse");
+    };
+    LogaccessServiceBase.prototype.Ping = function (request) {
+        return this._connection.send("Ping", request, "json", false, undefined, "ws_logaccessPingResponse");
+    };
+    return LogaccessServiceBase;
+}(Service));
+export { LogaccessServiceBase };
+//# sourceMappingURL=ws_logaccess.js.map

package/lib-es6/services/wsdl/ws_logaccess/v1.08/ws_logaccess.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ws_logaccess.js","sourceRoot":"","sources":["../../../../../src/services/wsdl/ws_logaccess/v1.08/ws_logaccess.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/comms",
-    "version": "2.99.5",
+    "version": "2.101.1",
     "description": "hpcc-js - Communications",
     "main": "dist/index.node.js",
     "module": "dist/index.es6",
@@ -63,7 +63,7 @@
     },
     "dependencies": {
         "@hpcc-js/ddl-shim": "^2.22.0",
-        "@hpcc-js/util": "^2.53.0",
+        "@hpcc-js/util": "^2.53.1",
         "@xmldom/xmldom": "0.9.8",
         "abort-controller": "3.0.0",
         "node-fetch": "2.7.0",
@@ -73,6 +73,7 @@
     },
     "devDependencies": {
         "@hpcc-js/bundle": "^2.12.0",
+        "@kubernetes/client-node": "1.0.0",
         "@types/d3-request": "1.0.9",
         "@types/d3-time-format": "2.3.4",
         "@types/node": "^18",
@@ -95,5 +96,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "6dce1c7db9d6aa2e390259d21cdcabe1e557e68c"
+    "gitHead": "9f7febd34d32c62d1785e7863334773e1967d738"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/comms";
-export const PKG_VERSION = "2.99.5";
-export const BUILD_VERSION = "2.107.7";
+export const PKG_VERSION = "2.101.1";
+export const BUILD_VERSION = "2.108.2";

package/src/services/wsCloud.ts

@@ -1,18 +1,71 @@
-import { CloudServiceBase, WsCloud } from "./wsdl/WsCloud/v1/WsCloud";
+import { scopedLogger } from "@hpcc-js/util";
+import type { WsCloud as WsCloudV1 } from "./wsdl/WsCloud/v1/WsCloud";
+import { CloudServiceBase, WsCloud } from "./wsdl/WsCloud/v1.02/WsCloud";
+import type { V1Pod } from "@kubernetes/client-node";
+
+const logger = scopedLogger("@hpcc-js/comms/services/wsCloud.ts");
 
 export {
-    WsCloud
+    type WsCloud
 };
 
+function isGetPODsResponse_v1_02(response: any): response is WsCloud.GetPODsResponse {
+    return response?.Pods !== undefined;
+}
+
+function mapPorts(pod: V1Pod): WsCloud.Port[] {
+    return pod.spec?.containers?.reduce((prev, curr) => {
+        curr.ports?.forEach(p => {
+            prev.push({
+                ContainerPort: p.containerPort,
+                Name: p.name,
+                Protocol: p.protocol
+            });
+        });
+        return prev;
+    }, [] as WsCloud.Port[]) ?? [];
+}
+
+function mapPods(pods: V1Pod[]): WsCloud.Pod[] {
+    return pods
+        .filter(pod => {
+            const labels = pod?.metadata?.labels ?? {};
+            return labels.hasOwnProperty("app.kubernetes.io/part-of") && labels["app.kubernetes.io/part-of"] === "HPCC-Platform";
+        })
+        .map((pod: V1Pod): WsCloud.Pod => {
+            const started = new Date(pod.metadata?.creationTimestamp);
+            return {
+                Name: pod.metadata.name,
+                Status: pod.status?.phase,
+                CreationTimestamp: started.toISOString(),
+                ContainerName: pod.status?.containerStatuses?.reduce((prev, curr) => {
+                    if (curr.name) {
+                        prev.push(curr.name);
+                    } return prev;
+                }, [] as string[]).join(", ") ?? "",
+                ContainerCount: pod.spec?.containers?.length ?? 0,
+                ContainerReadyCount: pod.status?.containerStatuses?.reduce((prev, curr) => prev + (curr.ready ? 1 : 0), 0),
+                ContainerRestartCount: pod.status?.containerStatuses?.reduce((prev, curr) => prev + curr.restartCount, 0),
+                Ports: {
+                    Port: mapPorts(pod)
+                },
+            };
+        })
+        ;
+}
+
 export class CloudService extends CloudServiceBase {
 
-    getPODs(): Promise<object[]> {
-        return super.GetPODs({}).then((response) => {
+    getPODs(): Promise<WsCloud.Pod[]> {
+        return super.GetPODs({}).then((response: WsCloud.GetPODsResponse | WsCloudV1.GetPODsResponse) => {
+            if (isGetPODsResponse_v1_02(response)) {
+                return response.Pods?.Pod ?? [];
+            }
             try {
                 const obj = typeof response.Result === "string" ? JSON.parse(response.Result) : response.Result;
-                return obj?.items ?? [];
-
+                return mapPods(obj?.items ?? []);
             } catch (error) {
+                logger.error(`Error parsing V1Pods json '${error.message}'`);
                 return [];
             }
         });

package/src/services/wsDali.ts

@@ -4,5 +4,37 @@ export {
     WsDali
 };
 
+export interface ExportRequest {
+    Path: string;
+    Safe: boolean;
+}
+
+export interface ExportResponse {
+    filename: string;
+    content: Blob;
+}
+
 export class DaliService extends DaliServiceBase {
+
+    async Export(request: ExportRequest): Promise<ExportResponse> {
+        const exportUrl = "/WsDali/Export";
+
+        const reqParams = new URLSearchParams();
+        if (request.Path) {
+            reqParams.append("Path", request.Path);
+        }
+        if (request.Safe !== undefined) {
+            reqParams.append("Safe", String(request.Safe));
+        }
+
+        const response = await fetch(`${exportUrl}?${reqParams.toString()}`);
+        const filename = response.headers.get("Content-Disposition");
+        const content = await response.blob();
+
+        return {
+            filename: filename ? filename.split("filename=")[1] : "WsDali_Export",
+            content
+        };
+    }
+
 }

package/src/services/wsLogaccess.ts

@@ -1,5 +1,5 @@
 import { scopedLogger } from "@hpcc-js/util";
-import { LogaccessServiceBase, WsLogaccess } from "./wsdl/ws_logaccess/v1.05/ws_logaccess";
+import { LogaccessServiceBase, WsLogaccess } from "./wsdl/ws_logaccess/v1.08/ws_logaccess";
 
 const logger = scopedLogger("@hpcc-js/comms/services/wsLogaccess.ts");
 

package/src/services/wsWorkunits.ts

@@ -1,5 +1,5 @@
 import { deepMixin, xml2json, XMLNode } from "@hpcc-js/util";
-import { WsWorkunits, WorkunitsServiceBase } from "./wsdl/WsWorkunits/v2/WsWorkunits";
+import { WsWorkunits, WorkunitsServiceBase } from "./wsdl/WsWorkunits/v2.02/WsWorkunits";
 import { IConnection, IOptions } from "../connection";
 
 /*

package/src/services/wsdl/WsCloud/v1.02/WsCloud.ts

@@ -0,0 +1,77 @@
+import { IConnection, IOptions } from "../../../../connection";
+import { Service } from "../../../../espConnection";
+
+export namespace WsCloud {
+
+    export type int = number;
+
+    export interface GetPODsRequest {
+
+    }
+
+    export interface Port {
+        ContainerPort: int;
+        Name: string;
+        Protocol: string;
+    }
+
+    export interface Ports {
+        Port: Port[];
+    }
+
+    export interface Pod {
+        Name: string;
+        Status: string;
+        CreationTimestamp: string;
+        ContainerName: string;
+        ContainerCount: int;
+        ContainerReadyCount: int;
+        ContainerRestartCount: int;
+        Ports: Ports;
+    }
+
+    export interface Pods {
+        Pod: Pod[];
+    }
+
+    export interface GetPODsResponse {
+        Pods: Pods;
+    }
+
+    export interface GetServicesRequest {
+
+    }
+
+    export interface GetServicesResponse {
+        Result: string;
+    }
+
+    export interface WsCloudPingRequest {
+
+    }
+
+    export interface WsCloudPingResponse {
+
+    }
+
+}
+
+export class CloudServiceBase extends Service {
+
+    constructor(optsConnection: IOptions | IConnection) {
+        super(optsConnection, "WsCloud", "1.02");
+    }
+
+    GetPODs(request: Partial<WsCloud.GetPODsRequest>): Promise<WsCloud.GetPODsResponse> {
+        return this._connection.send("GetPODs", request, "json", false, undefined, "GetPODsResponse");
+    }
+
+    GetServices(request: Partial<WsCloud.GetServicesRequest>): Promise<WsCloud.GetServicesResponse> {
+        return this._connection.send("GetServices", request, "json", false, undefined, "GetServicesResponse");
+    }
+
+    Ping(request: Partial<WsCloud.WsCloudPingRequest>): Promise<WsCloud.WsCloudPingResponse> {
+        return this._connection.send("Ping", request, "json", false, undefined, "WsCloudPingResponse");
+    }
+
+}