@hpcc-js/comms 3.12.0 → 3.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/comms",
-    "version": "3.12.0",
+    "version": "3.13.0",
     "description": "hpcc-js - Communications",
     "type": "module",
     "main": "./dist/node/index.cjs",
@@ -74,15 +74,15 @@
         "wsdl-all": "npm-run-all --aggregate-output -c --serial build --parallel wsdl-*"
     },
     "dependencies": {
-        "@hpcc-js/util": "^3.4.2",
+        "@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"
     },
     "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 +112,5 @@
         "esp",
         "HPCC-Platform"
     ],
-    "gitHead": "5e5fc8d746e6a42c58da2ec4f55f2f7cbaeff611"
+    "gitHead": "70194f16ed27ea1167af126b35cbf4af5f181be9"
 }

package/src/connection.ts

@@ -1,4 +1,4 @@
-import { join, promiseTimeout, scopedLogger } from "@hpcc-js/util";
+import { join, promiseTimeout, scopedLogger, utf8ToBase64 } from "@hpcc-js/util";
 
 const logger = scopedLogger("comms/connection.ts");
 
@@ -137,7 +137,7 @@ export function jsonp(opts: IOptions, action: string, request: any = {}, respons
 }
 
 function authHeader(opts: IOptions): object {
-    return opts.userID ? { Authorization: `Basic ${btoa(`${opts.userID}:${opts.password}`)}` } : {};
+    return opts.userID ? { Authorization: `Basic ${utf8ToBase64(`${opts.userID}:${opts.password}`)}` } : {};
 }
 
 //  _omitMap is a workaround for older HPCC-Platform instances without credentials ---

package/src/index.common.ts

@@ -1,5 +1,4 @@
 export * from "./__package__.ts";
-
 export * from "./services/fileSpray.ts";
 export * from "./services/wsAccess.ts";
 export * from "./services/wsAccount.ts";

package/src/index.node.ts

@@ -7,6 +7,7 @@ root.DOMParser = DOMParser;
 import fetch, { Headers, Request, Response, } from "node-fetch";
 
 import * as https from "node:https";
+import { Buffer } from "node:buffer";
 import { Agent, setGlobalDispatcher } from "undici";
 
 if (typeof root.fetch === "undefined") {
@@ -57,14 +58,6 @@ root.fetch.__trustwaveAgent = new https.Agent({
     ca: globalCA + trustwave
 });
 
-//  btoa polyfill  ---
-import { Buffer } from "node:buffer";
-if (typeof root.btoa === "undefined") {
-    root.btoa = function (str: string) {
-        return Buffer.from(str || "", "utf8").toString("base64");
-    };
-}
-
 export * from "./index.common.ts";
 
 //  Client Tools  ---

package/src/services/wsSMC.ts

@@ -1,3 +1,4 @@
+import { timeParse } from "d3-time-format";
 import { SMCServiceBase, WsSMC } from "./wsdl/WsSMC/v1.28/WsSMC.ts";
 import { IOptions } from "../connection.ts";
 
@@ -5,6 +6,20 @@ 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/types/services/wsSMC.d.ts

@@ -1,7 +1,20 @@
 import { SMCServiceBase, WsSMC } from "./wsdl/WsSMC/v1.28/WsSMC.ts";
 import { IOptions } from "../connection.ts";
 export { WsSMC };
+export interface NormalisedGlobalMetric {
+    Category: string;
+    Start: Date;
+    End: Date;
+    dimensions: {
+        [key: string]: any;
+    };
+    stats: {
+        [key: string]: any;
+    };
+}
 export declare class SMCService extends SMCServiceBase {
     connectionOptions(): IOptions;
     Activity(request: WsSMC.Activity): Promise<WsSMC.ActivityResponse>;
+    protected parseGlobalMetric(name: string, value: any): any;
+    GetNormalisedGlobalMetrics(request: Partial<WsSMC.GetGlobalMetrics>): Promise<NormalisedGlobalMetric[]>;
 }