@hpcc-js/comms 3.5.0 → 3.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/comms",
-    "version": "3.5.0",
+    "version": "3.5.2",
     "description": "hpcc-js - Communications",
     "type": "module",
     "main": "./dist/node/index.cjs",
@@ -25,7 +25,7 @@
         "./dist/*": "./dist/*",
         "./package.json": "./package.json"
     },
-    "types": "./types/index.browser.d.ts",
+    "types": "./types/index.node.d.ts",
     "files": [
         "dist/*",
         "src/*",
@@ -72,18 +72,18 @@
         "wsdl-all": "npm-run-all --aggregate-output -c --serial build --parallel wsdl-*"
     },
     "dependencies": {
-        "@hpcc-js/util": "^3.3.0",
-        "@xmldom/xmldom": "0.9.5",
+        "@hpcc-js/util": "^3.3.1",
+        "@xmldom/xmldom": "0.9.8",
         "abort-controller": "3.0.0",
         "data-uri-to-buffer": "6.0.2",
         "node-fetch": "3.3.2",
         "safe-buffer": "5.2.1",
         "tmp": "0.2.3",
-        "undici": "6.21.0"
+        "undici": "6.21.2"
     },
     "devDependencies": {
         "@hpcc-js/ddl-shim": "^3.0.0",
-        "@hpcc-js/esbuild-plugins": "^1.4.0",
+        "@hpcc-js/esbuild-plugins": "^1.4.1",
         "@types/d3-request": "1.0.9",
         "@types/d3-time-format": "2.3.4",
         "@types/node": "^18",
@@ -91,7 +91,7 @@
         "d3-array": "^1",
         "d3-format": "^1",
         "d3-time-format": "^2",
-        "soap": "1.1.5",
+        "soap": "1.1.10",
         "typescript-formatter": "^7.2.2"
     },
     "repository": {
@@ -111,5 +111,5 @@
         "esp",
         "HPCC-Platform"
     ],
-    "gitHead": "220704148d2a9cc72a4bfa5160107d6fdf37c914"
+    "gitHead": "c93b72a99c4a1f6db5d08a6c17b85d436c68da55"
 }

package/src/__package__.ts

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

package/src/clienttools/eclcc.ts

@@ -390,8 +390,12 @@ export class ClientTools {
             attachWorkspace(this.cwd),
             this.execFile(this.eclccPath, this.cwd, this.args(["-M", filePath]), "eclcc", `Cannot find ${this.eclccPath}`)
         ]).then(([metaWorkspace, execFileResponse]: [Workspace, IExecFile]) => {
-            if (execFileResponse && execFileResponse.stdout && execFileResponse.stdout.length) {
-                metaWorkspace.parseMetaXML(execFileResponse.stdout);
+            try {
+                if (execFileResponse && execFileResponse.stdout && execFileResponse.stdout.length) {
+                    metaWorkspace.parseMetaXML(execFileResponse.stdout);
+                }
+            } catch (e: any) {
+                logger.error(`fetchMeta:  Error parsing XML - ${e?.message ?? "unknown"}`);
             }
             return metaWorkspace;
         });
@@ -403,8 +407,12 @@ export class ClientTools {
             this.execFile(this.eclccPath, this.cwd, this.args([...args, "-M", filePath]), "eclcc", `Cannot find ${this.eclccPath}`)
         ]).then(([metaWorkspace, execFileResponse]: [Workspace, IExecFile]) => {
             let checked: string[] = [];
-            if (execFileResponse && execFileResponse.stdout && execFileResponse.stdout.length) {
-                checked = metaWorkspace.parseMetaXML(execFileResponse.stdout);
+            try {
+                if (execFileResponse && execFileResponse.stdout && execFileResponse.stdout.length) {
+                    checked = metaWorkspace.parseMetaXML(execFileResponse.stdout);
+                }
+            } catch (e: any) {
+                logger.error(`syntaxCheck:  Error parsing XML - ${e?.message ?? "unknown"}`);
             }
             return new EclccErrors(execFileResponse ? execFileResponse.stderr : "", checked);
         });

package/src/ecl/dfuWorkunit.ts

@@ -355,7 +355,7 @@ export class DFUWorkunit extends StateObject<UDFUWorkunitState, IDFUWorkunitStat
                 return false;
             });
             if (!wuMissing) {
-                logger.warning("Unexpected exception:  ");
+                logger.warning(`Unexpected ESP exception: ${e.message}`);
                 throw e;
             }
             return {} as FileSpray.GetDFUWorkunitResponse;

package/src/ecl/logicalFile.ts

@@ -165,7 +165,7 @@ export class LogicalFile extends StateObject<FileDetailEx, FileDetailEx> impleme
                 return false;
             });
             if (!fileMissing) {
-                logger.warning("Unexpected exception:  ");
+                logger.warning(`Unexpected ESP exception: ${e.message}`);
                 throw e;
             }
             return {} as FileDetailEx;

package/src/ecl/queryGraph.ts

@@ -753,9 +753,13 @@ export class QueryGraph {
                             } else if (edge._sourceActivity || edge._targetActivity) {
                                 edge._isSpill = true;
                                 const source = edge.getSource();
-                                source._isSpill = true;
+                                if (source) {
+                                    source._isSpill = true;
+                                }
                                 const target = edge.getTarget();
-                                target._isSpill = true;
+                                if (target) {
+                                    target._isSpill = true;
+                                }
                             }
                             retVal.addEdge(edge);
                             break;

package/src/ecl/workunit.ts

@@ -685,6 +685,10 @@ export class Workunit extends StateObject<UWorkunitState, IWorkunitState> implem
                     if (scopeProperty.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;
+                    }
                     columns[scopeProperty.Name] = { ...scopeProperty };
                     safeDelete(columns, scopeProperty.Name, "RawValue");
                     safeDelete(columns, scopeProperty.Name, "Formatted");
@@ -995,7 +999,13 @@ export class Workunit extends StateObject<UWorkunitState, IWorkunitState> implem
     //  WsWorkunits passthroughs  ---
     protected WUQuery(_request: Partial<WsWorkunits.WUQuery> = {}): Promise<WsWorkunits.WUQueryResponse> {
         return this.connection.WUQuery({ ..._request, Wuid: this.Wuid }).then((response) => {
-            this.set(response.Workunits.ECLWorkunit[0]);
+            if (response.Workunits.ECLWorkunit.length === 0) {
+                //  deleted  ---
+                this.clearState(this.Wuid);
+                this.set("StateID", WUStateID.NotFound);
+            } else {
+                this.set(response.Workunits.ECLWorkunit[0]);
+            }
             return response;
         }).catch((e: ESPExceptions) => {
             //  deleted  ---
@@ -1008,7 +1018,7 @@ export class Workunit extends StateObject<UWorkunitState, IWorkunitState> implem
                 return false;
             });
             if (!wuMissing) {
-                logger.warning("Unexpected exception:  ");
+                logger.warning(`Unexpected ESP exception: ${e.message}`);
                 throw e;
             }
             return {} as WsWorkunits.WUQueryResponse;
@@ -1050,7 +1060,7 @@ export class Workunit extends StateObject<UWorkunitState, IWorkunitState> implem
                 return false;
             });
             if (!wuMissing) {
-                logger.warning("Unexpected exception:  ");
+                logger.warning(`Unexpected ESP exception: ${e.message}`);
                 throw e;
             }
             return {} as WsWorkunits.WUInfoResponse;

package/types/__package__.d.ts

@@ -1,3 +1,3 @@
 export declare const PKG_NAME = "@hpcc-js/comms";
-export declare const PKG_VERSION = "3.4.0";
-export declare const BUILD_VERSION = "3.4.0";
+export declare const PKG_VERSION = "3.5.1";
+export declare const BUILD_VERSION = "3.6.1";