@hpcc-js/comms 3.12.1 → 3.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/comms",
-    "version": "3.12.1",
+    "version": "3.14.0",
     "description": "hpcc-js - Communications",
     "type": "module",
     "main": "./dist/node/index.cjs",
@@ -74,15 +74,13 @@
         "wsdl-all": "npm-run-all --aggregate-output -c --serial build --parallel wsdl-*"
     },
     "dependencies": {
-        "@hpcc-js/util": "^3.4.3",
+        "@hpcc-js/util": "^3.4.4",
         "@xmldom/xmldom": "0.9.8",
-        "abort-controller": "3.0.0",
-        "node-fetch": "3.3.2",
-        "undici": "7.16.0"
+        "undici": "7.18.2"
     },
     "devDependencies": {
-        "@hpcc-js/ddl-shim": "^3.2.2",
-        "@hpcc-js/esbuild-plugins": "^1.7.0",
+        "@hpcc-js/ddl-shim": "^3.2.3",
+        "@hpcc-js/esbuild-plugins": "^1.8.0",
         "@kubernetes/client-node": "1.4.0",
         "@types/d3-request": "1.0.9",
         "@types/d3-time-format": "2.3.4",
@@ -112,5 +110,5 @@
         "esp",
         "HPCC-Platform"
     ],
-    "gitHead": "0289b8552e19395a8da9b70a154821cf70ce42e7"
+    "gitHead": "4b76aa36763923096cd3ff7afed75e054ea33197"
 }

package/src/ecl/workunit.ts

@@ -326,6 +326,7 @@ export class Workunit extends StateObject<UWorkunitState, IWorkunitState> implem
     get FileAccessCost(): number { return this.get("FileAccessCost"); }
     get NoAccess(): boolean { return this.get("NoAccess"); }
     get ECLWUProcessList(): WsWorkunits.ECLWUProcessList { return this.get("ECLWUProcessList"); }
+    get CostSavingPotential(): number { return this.get("CostSavingPotential"); }
 
     //  Factories  ---
     static create(optsConnection: IOptions | IConnection): Promise<Workunit> {

package/src/index.node.ts

@@ -3,38 +3,22 @@ import { root } from "@hpcc-js/util";
 import { DOMParser } from "@xmldom/xmldom";
 root.DOMParser = DOMParser;
 
-//  fetch polyfill  ---
-import fetch, { Headers, Request, Response, } from "node-fetch";
-
+//  fetch setup for Node.js ---
 import * as https from "node:https";
 import { Buffer } from "node:buffer";
 import { Agent, setGlobalDispatcher } from "undici";
 
-if (typeof root.fetch === "undefined") {
-    //  NodeJS < v18  ---
-    root.fetch = fetch;
-    root.Headers = Headers;
-    root.Request = Request;
-    root.Response = Response;
-    root.fetch.__rejectUnauthorizedAgent = new https.Agent({
-        rejectUnauthorized: false
-    });
-} else {
-    //  NodeJS >= v18  ---
-    root.fetch.__defaultAgent = new Agent();
-    root.fetch.__rejectUnauthorizedAgent = new Agent({
-        connect: {
-            rejectUnauthorized: false
-        }
-    });
-    root.fetch.__setGlobalDispatcher = setGlobalDispatcher;
-}
-
-//  AbortController polyfill  ---
-import AbortController from "abort-controller";
-if (typeof root.AbortController === "undefined") {
-    root.AbortController = AbortController;
+//  NodeJS >= v18 has native fetch  ---
+if (root.fetch === undefined) {
+    throw new Error("@hpcc-js/comms requires Node.js >= 18.0.0 for native fetch support");
 }
+root.fetch.__defaultAgent = new Agent();
+root.fetch.__rejectUnauthorizedAgent = new Agent({
+    connect: {
+        rejectUnauthorized: false
+    }
+});
+root.fetch.__setGlobalDispatcher = setGlobalDispatcher;
 
 import { trustwave } from "./pem/trustwave.ts";
 

package/src/services/wsSMC.ts

@@ -1,10 +1,25 @@
-import { SMCServiceBase, WsSMC } from "./wsdl/WsSMC/v1.28/WsSMC.ts";
+import { timeParse } from "d3-time-format";
+import { SMCServiceBase, WsSMC } from "./wsdl/WsSMC/v1.29/WsSMC.ts";
 import { IOptions } from "../connection.ts";
 
 export {
     WsSMC
 };
 
+const dateParser = timeParse("%Y%m%d%H");
+
+function isNumeric(value: any): boolean {
+    return typeof value === "number" || (typeof value === "string" && value.trim() !== "" && !isNaN(+value));
+}
+
+export interface NormalisedGlobalMetric {
+    Category: string;
+    Start: Date;
+    End: Date;
+    dimensions: { [key: string]: any };
+    stats: { [key: string]: any };
+}
+
 export class SMCService extends SMCServiceBase {
 
     connectionOptions(): IOptions {
@@ -21,4 +36,45 @@ export class SMCService extends SMCServiceBase {
             };
         });
     }
+
+    protected parseGlobalMetric(name: string, value: any): any {
+        // Known Prefixes:  Cost, Critical, Definition, Disk, Distribute, Ecl, Enum, Id, Interface, Is, Library, Load, Match, Meta, Num, Original, Output, Patch, Per, Persist, Predicted, Record, Section, Service, Signed, Size, Source, Spill, Target, Time, Updated, When
+        if (name.startsWith("Cost")) {
+            return +value / 1000000;
+        } else if (name.startsWith("Date")) {
+            return dateParser(value);
+        } else if (name.startsWith("Num")) {
+            return +value;
+        } else if (name.startsWith("Time")) {
+            return +value / 1000000000;
+        } else if (name.startsWith("When")) {
+            return new Date(+value / 1000).toISOString();
+        } else if (isNumeric(value)) {
+            return +value;
+        }
+        return value;
+    }
+
+    GetNormalisedGlobalMetrics(request: Partial<WsSMC.GetGlobalMetrics>): Promise<NormalisedGlobalMetric[]> {
+        return super.GetGlobalMetrics(request).then(response => {
+            const retVal: NormalisedGlobalMetric[] = [];
+            for (const metric of response?.GlobalMetrics?.GlobalMetric || []) {
+                const row: NormalisedGlobalMetric = {
+                    Category: metric.Category,
+                    Start: this.parseGlobalMetric("Date", metric.DateTimeRange?.Start),
+                    End: this.parseGlobalMetric("Date", metric.DateTimeRange?.End),
+                    dimensions: {},
+                    stats: {}
+                };
+                for (const dimension of metric.Dimensions?.Dimension || []) {
+                    row.dimensions[dimension.Name] = dimension.Value;
+                }
+                for (const stat of metric.Stats?.Stat || []) {
+                    row.stats[stat.Name] = this.parseGlobalMetric(stat.Name, stat.Value);
+                }
+                retVal.push(row);
+            }
+            return retVal;
+        });
+    }
 }

package/src/services/wsWorkunits.ts

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