@hpcc-js/comms 3.7.6 → 3.7.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/comms",
-    "version": "3.7.6",
+    "version": "3.7.7",
     "description": "hpcc-js - Communications",
     "type": "module",
     "main": "./dist/node/index.cjs",
@@ -72,16 +72,16 @@
         "wsdl-all": "npm-run-all --aggregate-output -c --serial build --parallel wsdl-*"
     },
     "dependencies": {
-        "@hpcc-js/util": "^3.3.8",
+        "@hpcc-js/util": "^3.3.9",
         "@xmldom/xmldom": "0.9.8",
         "abort-controller": "3.0.0",
         "node-fetch": "3.3.2",
-        "undici": "6.21.2"
+        "undici": "7.12.0"
     },
     "devDependencies": {
         "@hpcc-js/ddl-shim": "^3.0.0",
-        "@hpcc-js/esbuild-plugins": "^1.4.8",
-        "@kubernetes/client-node": "1.0.0",
+        "@hpcc-js/esbuild-plugins": "^1.4.9",
+        "@kubernetes/client-node": "1.3.0",
         "@types/d3-request": "1.0.9",
         "@types/d3-time-format": "2.3.4",
         "@types/node": "^18",
@@ -91,7 +91,7 @@
         "d3-time-format": "^2",
         "data-uri-to-buffer": "6.0.2",
         "safe-buffer": "5.2.1",
-        "soap": "1.1.10",
+        "soap": "1.2.0",
         "tmp": "0.2.3",
         "typescript-formatter": "^7.2.2"
     },
@@ -112,5 +112,5 @@
         "esp",
         "HPCC-Platform"
     ],
-    "gitHead": "b9d780528833411369cabaca067703d94a3d6b3a"
+    "gitHead": "92489547b0e57f479a691236b1a47e977b43cf2e"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/comms";
-export const PKG_VERSION = "3.7.6";
-export const BUILD_VERSION = "3.8.6";
+export const PKG_VERSION = "3.7.7";
+export const BUILD_VERSION = "3.9.1";

package/src/ecl/query.ts

@@ -172,20 +172,31 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
                 const meta = promises[1];
                 const metrics: WsWorkunits.Scope[] = promises[2];
                 const data = metrics.map(metric => {
-                    if (metric.Id[0] === "a" || metric.Id[0] === "e") {
+                    const firstChar = metric.Id[0];
+                    if (firstChar === "a" || firstChar === "e") {
                         const item = graph.idx[metric.Id.substring(1)];
+                        if (!item) {
+                            logger.debug(`Missing graph data for metric ID: ${metric.Id}`);
+                            return metric;
+                        }
+                        const existingProperties = new Set(metric.Properties.Property.map(prop => prop.Name));
+                        const newProperties: WsWorkunits.Property[] = [];
                         for (const key in item) {
-                            if (key.charAt(0) !== "_" && key.charAt(0) === key.charAt(0).toUpperCase() && (typeof item[key] === "string" || typeof item[key] === "number" || typeof item[key] === "boolean")) {
-
-                                if (!metric.Properties.Property.some(row => row.Name === key)) {
-                                    const isNum = isNumber(item[key]);
-                                    let rawValue = isNum ? parseFloat(item[key] as string) : item[key];
-                                    let formatted = item[key];
+                            const firstCharOfKey = key.charAt(0);
+                            if (firstCharOfKey !== "_" &&
+                                firstCharOfKey === firstCharOfKey.toUpperCase() &&
+                                !existingProperties.has(key)) {
+                                const value = item[key];
+                                const valueType = typeof value;
+                                if (valueType === "string" || valueType === "number" || valueType === "boolean") {
+                                    const isNum = isNumber(value);
+                                    let rawValue = isNum ? parseFloat(value as string) : value;
+                                    let formatted = value;
                                     if (key.indexOf("Time") >= 0) {
-                                        rawValue = rawValue as number / 1000000000;
+                                        rawValue = (rawValue as number) / 1000000000;
                                         formatted = siFormatter(rawValue) + "s";
                                     }
-                                    metric.Properties.Property.push({
+                                    newProperties.push({
                                         Name: key,
                                         RawValue: rawValue as any,
                                         Formatted: formatted
@@ -193,10 +204,12 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
                                 }
                             }
                         }
+                        if (newProperties.length > 0) {
+                            metric.Properties.Property.push(...newProperties);
+                        }
                     }
                     return metric;
                 });
-
                 return wu.normalizeDetails(meta, data);
             });
         }

package/src/ecl/workunit.ts

@@ -675,50 +675,60 @@ export class Workunit extends StateObject<UWorkunitState, IWorkunitState> implem
                 Measure: "label"
             }
         };
-        const data: IScope[] = [];
-        for (const scope of scopes) {
-            const props = {};
-            const formattedProps = {};
-            if (scope && scope.Id && scope.Properties && scope.Properties.Property) {
-                for (const key in scope.Properties.Property) {
-                    const scopeProperty = scope.Properties.Property[key];
-                    if (scopeProperty.Measure === "ns") {
+        const activityMap = new Map<number, string>();
+        for (const activity of meta.Activities?.Activity ?? []) {
+            activityMap.set(activity.Kind, activity.Name);
+        }
+        const data: IScope[] = new Array(scopes.length);
+        for (let i = 0; i < scopes.length; i++) {
+            const scope = scopes[i];
+            const props: { [key: string]: any } = {};
+            const formattedProps: { [key: string]: any } = {};
+            if (scope.Id && scope.Properties?.Property) {
+                for (const scopeProperty of scope.Properties.Property) {
+                    const measure = scopeProperty.Measure;
+                    const name = scopeProperty.Name;
+                    const rawValue = scopeProperty.RawValue;
+                    if (measure === "ns") {
                         scopeProperty.Measure = "s";
                     }
-                    if (scopeProperty.Name === "Kind") {
-                        const rawValue = parseInt(scopeProperty.RawValue, 10);
-                        scopeProperty.Formatted = meta.Activities.Activity.filter(a => a.Kind === rawValue)[0].Name ?? scopeProperty.RawValue;
+                    if (name === "Kind") {
+                        const rawValueInt = parseInt(rawValue, 10);
+                        scopeProperty.Formatted = activityMap.get(rawValueInt) ?? rawValue;
                     }
-                    columns[scopeProperty.Name] = { ...scopeProperty };
-                    safeDelete(columns, scopeProperty.Name, "RawValue");
-                    safeDelete(columns, scopeProperty.Name, "Formatted");
+                    columns[name] = {
+                        Name: scopeProperty.Name,
+                        Measure: scopeProperty.Measure,
+                        Creator: scopeProperty.Creator,
+                        CreatorType: scopeProperty.CreatorType
+                    };
                     switch (scopeProperty.Measure) {
                         case "bool":
-                            props[scopeProperty.Name] = !!+scopeProperty.RawValue;
+                            props[name] = !!+rawValue;
                             break;
                         case "sz":
-                            props[scopeProperty.Name] = +scopeProperty.RawValue;
+                            props[name] = +rawValue;
                             break;
                         case "s":
-                            props[scopeProperty.Name] = +scopeProperty.RawValue / 1000000000;
+                            props[name] = +rawValue / 1000000000;
                             break;
                         case "ns":
-                            props[scopeProperty.Name] = +scopeProperty.RawValue;
+                            props[name] = +rawValue;
                             break;
                         case "ts":
-                            props[scopeProperty.Name] = new Date(+scopeProperty.RawValue / 1000).toISOString();
+                            props[name] = new Date(+rawValue / 1000).toISOString();
                             break;
                         case "cnt":
-                            props[scopeProperty.Name] = +scopeProperty.RawValue;
+                            props[name] = +rawValue;
                             break;
                         case "cost":
-                            props[scopeProperty.Name] = +scopeProperty.RawValue / 1000000;
+                            props[name] = +rawValue / 1000000;
                             break;
                         case "node":
-                            props[scopeProperty.Name] = +scopeProperty.RawValue;
+                            props[name] = +rawValue;
                             break;
                         case "skw":
-                            props[scopeProperty.Name] = +scopeProperty.RawValue;
+                            props[name] = +rawValue;
                             break;
                         case "cpu":
                         case "ppm":
@@ -729,11 +739,10 @@ export class Workunit extends StateObject<UWorkunitState, IWorkunitState> implem
                         case "id":
                         case "fname":
                         default:
-                            props[scopeProperty.Name] = scopeProperty.RawValue;
+                            props[name] = rawValue;
                     }
-                    formattedProps[scopeProperty.Name] = formatNum(scopeProperty.Formatted ?? props[scopeProperty.Name]);
+                    formattedProps[name] = formatNum(scopeProperty.Formatted ?? props[name]);
                 }
-                //  Other properties  ---
             }
             const normalizedScope: IScope = {
                 id: scope.Id,
@@ -748,37 +757,47 @@ export class Workunit extends StateObject<UWorkunitState, IWorkunitState> implem
                 __StdDevsSource: "",
                 ...props
             };
-            if (normalizedScope[DEFINITION_LIST]) {
+            const definitionList = normalizedScope[DEFINITION_LIST];
+            if (definitionList) {
                 try {
-                    const definitionList = JSON.parse(normalizedScope[DEFINITION_LIST].split("\\").join("\\\\"));
-                    normalizedScope[DEFINITION_LIST] = [];
-                    definitionList.forEach((definition, idx) => {
-                        const matches = definition.match(definitionRegex);
+                    const parsedList = JSON.parse(definitionList.split("\\").join("\\\\"));
+                    const processedDefinitions: Array<{ filePath: string, line: number, col: number }> = [];
+
+                    for (let k = 0; k < parsedList.length; k++) {
+                        const matches = parsedList[k].match(definitionRegex);
                         if (matches) {
-                            const filePath = (matches[1] ?? "") + matches[2] + matches[3];
-                            const line = parseInt(matches[5]);
-                            const col = parseInt(matches[6]);
-                            normalizedScope[DEFINITION_LIST].push({ filePath, line, col });
+                            processedDefinitions.push({
+                                filePath: (matches[1] ?? "") + matches[2] + matches[3],
+                                line: parseInt(matches[5], 10),
+                                col: parseInt(matches[6], 10)
+                            });
                         }
-                    });
+                    }
+                    normalizedScope[DEFINITION_LIST] = processedDefinitions;
                 } catch (e) {
-                    logger.error(`Unexpected "DefinitionList":  ${normalizedScope[DEFINITION_LIST]}`);
+                    logger.error(`Unexpected "DefinitionList": ${definitionList}`);
                 }
             }
+
             const dedup: DedupProperties = {};
+            let maxStdDevs = 0;
+            let maxStdDevsSource = "";
             for (const key in normalizedScope) {
-                if (key.indexOf("__") !== 0) {
+                if (!key.startsWith("__")) {
                     const row = formatValues(normalizedScope, key, dedup);
                     if (row) {
                         normalizedScope.__groupedProps[row.Key] = row;
-                        if (!isNaN(row.StdDevs) && normalizedScope.__StdDevs < row.StdDevs) {
-                            normalizedScope.__StdDevs = row.StdDevs;
-                            normalizedScope.__StdDevsSource = row.Key;
+                        if (!isNaN(row.StdDevs) && row.StdDevs > maxStdDevs) {
+                            maxStdDevs = row.StdDevs;
+                            maxStdDevsSource = row.Key;
                         }
                     }
                 }
             }
-            data.push(normalizedScope);
+            normalizedScope.__StdDevs = maxStdDevs;
+            normalizedScope.__StdDevsSource = maxStdDevsSource;
+
+            data[i] = normalizedScope;
         }
         return {
             meta,

package/types/__package__.d.ts

@@ -1,3 +1,3 @@
 export declare const PKG_NAME = "@hpcc-js/comms";
-export declare const PKG_VERSION = "3.7.5";
-export declare const BUILD_VERSION = "3.8.5";
+export declare const PKG_VERSION = "3.7.6";
+export declare const BUILD_VERSION = "3.9.0";