@hpcc-js/comms 3.5.2 → 3.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/comms",
-    "version": "3.5.2",
+    "version": "3.6.1",
     "description": "hpcc-js - Communications",
     "type": "module",
     "main": "./dist/node/index.cjs",
@@ -84,6 +84,7 @@
     "devDependencies": {
         "@hpcc-js/ddl-shim": "^3.0.0",
         "@hpcc-js/esbuild-plugins": "^1.4.1",
+        "@kubernetes/client-node": "1.0.0",
         "@types/d3-request": "1.0.9",
         "@types/d3-time-format": "2.3.4",
         "@types/node": "^18",
@@ -111,5 +112,5 @@
         "esp",
         "HPCC-Platform"
     ],
-    "gitHead": "c93b72a99c4a1f6db5d08a6c17b85d436c68da55"
+    "gitHead": "75ee30be2da61c7fb5281d4b1d7f99f7016a4314"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/comms";
-export const PKG_VERSION = "3.5.2";
-export const BUILD_VERSION = "3.6.2";
+export const PKG_VERSION = "3.6.1";
+export const BUILD_VERSION = "3.7.1";

package/src/ecl/workunit.ts

@@ -714,9 +714,13 @@ export class Workunit extends StateObject<UWorkunitState, IWorkunitState> implem
                         case "cost":
                             props[scopeProperty.Name] = +scopeProperty.RawValue / 1000000;
                             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":

package/src/services/wsCloud.ts

@@ -1,18 +1,71 @@
-import { CloudServiceBase, WsCloud } from "./wsdl/WsCloud/v1/WsCloud.ts";
+import { scopedLogger } from "@hpcc-js/util";
+import type { V1Pod } from "@kubernetes/client-node";
+import type { WsCloud as WsCloudV1 } from "./wsdl/WsCloud/v1/WsCloud.ts";
+import { CloudServiceBase, WsCloud } from "./wsdl/WsCloud/v1.02/WsCloud.ts";
+
+const logger = scopedLogger("@hpcc-js/comms/services/wsCloud.ts");
 
 export {
     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 instanceof Error ? error.message : String(error))}'`);
                 return [];
             }
         });

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.ts";
+import { LogaccessServiceBase, WsLogaccess } from "./wsdl/ws_logaccess/v1.08/ws_logaccess.ts";
 
 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.ts";
+import { WsWorkunits, WorkunitsServiceBase } from "./wsdl/WsWorkunits/v2.02/WsWorkunits.ts";
 import { IConnection, IOptions } from "../connection.ts";
 import { ESPConnection } from "../espConnection.ts";
 

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

@@ -0,0 +1,77 @@
+import { IConnection, IOptions } from "../../../../connection.ts";
+import { Service } from "../../../../espConnection.ts";
+
+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");
+    }
+
+}