@hpcc-js/comms 2.82.2 → 2.83.0

package/lib-es6/services/wsLogaccess.js

@@ -1,4 +1,4 @@
-import { __extends } from "tslib";
+import { __awaiter, __extends, __generator } from "tslib";
 import { scopedLogger } from "@hpcc-js/util";
 import { LogaccessServiceBase, WsLogaccess } from "./wsdl/ws_logaccess/v1.04/ws_logaccess";
 var logger = scopedLogger("@hpcc-js/comms/services/wsLogaccess.ts");
@@ -72,134 +72,156 @@ var LogaccessService = /** @class */ (function (_super) {
     };
     LogaccessService.prototype.GetLogsEx = function (request) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        var getLogsRequest = {
-            Filter: {
-                leftBinaryFilter: {
-                    BinaryLogFilter: [{
-                            leftFilter: {
-                                LogCategory: WsLogaccess.LogAccessType.All,
+        return __awaiter(this, void 0, void 0, function () {
+            var logInfo, getLogsRequest, filters, _loop_1, key, binaryLogFilter_1;
+            return __generator(this, function (_l) {
+                switch (_l.label) {
+                    case 0: return [4 /*yield*/, this.GetLogAccessInfo()];
+                    case 1:
+                        logInfo = _l.sent();
+                        getLogsRequest = {
+                            Filter: {
+                                leftBinaryFilter: {
+                                    BinaryLogFilter: [{
+                                            leftFilter: {
+                                                LogCategory: WsLogaccess.LogAccessType.All,
+                                            },
+                                        }]
+                                }
                             },
-                        }]
-                }
-            },
-            Range: {
-                StartDate: new Date(0).toISOString(),
-            },
-            LogLineStartFrom: (_a = request.LogLineStartFrom) !== null && _a !== void 0 ? _a : 0,
-            LogLineLimit: (_b = request.LogLineLimit) !== null && _b !== void 0 ? _b : 100,
-            SelectColumnMode: WsLogaccess.LogSelectColumnMode.DEFAULT,
-            Format: "JSON"
-        };
-        var filters = [];
-        var _loop_1 = function (key) {
-            if (key in ElasticKnownColumns) {
-                if (Array.isArray(request[key])) {
-                    request[key].forEach(function (value) {
-                        filters.push({
-                            LogCategory: WsLogaccess.LogAccessType.ByFieldName,
-                            SearchField: ElasticKnownColumns[key],
-                            SearchByValue: value
-                        });
-                    });
-                }
-                else {
-                    filters.push({
-                        LogCategory: WsLogaccess.LogAccessType.ByFieldName,
-                        SearchField: ElasticKnownColumns[key],
-                        SearchByValue: request[key]
-                    });
-                }
-            }
-        };
-        for (var key in request) {
-            _loop_1(key);
-        }
-        if (filters.length > 2) {
-            var binaryLogFilter_1 = getLogsRequest.Filter.leftBinaryFilter.BinaryLogFilter[0];
-            filters.forEach(function (filter, i) {
-                var operator = WsLogaccess.LogAccessFilterOperator.AND;
-                if (i > 0) {
-                    if (filters[i - 1].SearchField === filter.SearchField) {
-                        operator = WsLogaccess.LogAccessFilterOperator.OR;
-                    }
-                    if (i === filters.length - 1) {
-                        binaryLogFilter_1.Operator = operator;
-                        binaryLogFilter_1.rightFilter = filter;
-                    }
-                    else {
-                        binaryLogFilter_1.Operator = operator;
-                        binaryLogFilter_1.rightBinaryFilter = {
-                            BinaryLogFilter: [{
-                                    leftFilter: filter
-                                }]
+                            Range: {
+                                StartDate: new Date(0).toISOString(),
+                            },
+                            LogLineStartFrom: (_a = request.LogLineStartFrom) !== null && _a !== void 0 ? _a : 0,
+                            LogLineLimit: (_b = request.LogLineLimit) !== null && _b !== void 0 ? _b : 100,
+                            SelectColumnMode: WsLogaccess.LogSelectColumnMode.DEFAULT,
+                            Format: "JSON"
                         };
-                        binaryLogFilter_1 = binaryLogFilter_1.rightBinaryFilter.BinaryLogFilter[0];
-                    }
-                }
-                else {
-                    binaryLogFilter_1.leftFilter = filter;
+                        filters = [];
+                        _loop_1 = function (key) {
+                            var searchField;
+                            switch (logInfo.RemoteLogManagerType) {
+                                case "azureloganalyticscurl":
+                                    if (key in AzureKnownColumns) {
+                                        searchField = AzureKnownColumns[key];
+                                    }
+                                    break;
+                                case "elasticstack":
+                                    if (key in ElasticKnownColumns) {
+                                        searchField = ElasticKnownColumns[key];
+                                    }
+                                    break;
+                            }
+                            if (searchField) {
+                                if (Array.isArray(request[key])) {
+                                    request[key].forEach(function (value) {
+                                        filters.push({
+                                            LogCategory: WsLogaccess.LogAccessType.ByFieldName,
+                                            SearchField: searchField,
+                                            SearchByValue: value
+                                        });
+                                    });
+                                }
+                                else {
+                                    filters.push({
+                                        LogCategory: WsLogaccess.LogAccessType.ByFieldName,
+                                        SearchField: searchField,
+                                        SearchByValue: request[key]
+                                    });
+                                }
+                            }
+                        };
+                        for (key in request) {
+                            _loop_1(key);
+                        }
+                        if (filters.length > 2) {
+                            binaryLogFilter_1 = getLogsRequest.Filter.leftBinaryFilter.BinaryLogFilter[0];
+                            filters.forEach(function (filter, i) {
+                                var operator = WsLogaccess.LogAccessFilterOperator.AND;
+                                if (i > 0) {
+                                    if (filters[i - 1].SearchField === filter.SearchField) {
+                                        operator = WsLogaccess.LogAccessFilterOperator.OR;
+                                    }
+                                    if (i === filters.length - 1) {
+                                        binaryLogFilter_1.Operator = operator;
+                                        binaryLogFilter_1.rightFilter = filter;
+                                    }
+                                    else {
+                                        binaryLogFilter_1.Operator = operator;
+                                        binaryLogFilter_1.rightBinaryFilter = {
+                                            BinaryLogFilter: [{
+                                                    leftFilter: filter
+                                                }]
+                                        };
+                                        binaryLogFilter_1 = binaryLogFilter_1.rightBinaryFilter.BinaryLogFilter[0];
+                                    }
+                                }
+                                else {
+                                    binaryLogFilter_1.leftFilter = filter;
+                                }
+                            });
+                        }
+                        else {
+                            delete getLogsRequest.Filter.leftBinaryFilter;
+                            getLogsRequest.Filter.leftFilter = {
+                                LogCategory: WsLogaccess.LogAccessType.All
+                            };
+                            if ((_c = filters[0]) === null || _c === void 0 ? void 0 : _c.SearchField) {
+                                getLogsRequest.Filter.leftFilter = {
+                                    LogCategory: (_d = filters[0]) === null || _d === void 0 ? void 0 : _d.LogCategory,
+                                    SearchField: (_e = filters[0]) === null || _e === void 0 ? void 0 : _e.SearchField,
+                                    SearchByValue: (_f = filters[0]) === null || _f === void 0 ? void 0 : _f.SearchByValue
+                                };
+                            }
+                            if ((_g = filters[1]) === null || _g === void 0 ? void 0 : _g.SearchField) {
+                                getLogsRequest.Filter.Operator = WsLogaccess.LogAccessFilterOperator.AND;
+                                if (filters[0].SearchField === filters[1].SearchField) {
+                                    getLogsRequest.Filter.Operator = WsLogaccess.LogAccessFilterOperator.OR;
+                                }
+                                getLogsRequest.Filter.rightFilter = {
+                                    LogCategory: (_h = filters[0]) === null || _h === void 0 ? void 0 : _h.LogCategory,
+                                    SearchField: (_j = filters[1]) === null || _j === void 0 ? void 0 : _j.SearchField,
+                                    SearchByValue: (_k = filters[1]) === null || _k === void 0 ? void 0 : _k.SearchByValue
+                                };
+                            }
+                        }
+                        if (request.StartDate) {
+                            getLogsRequest.Range.StartDate = request.StartDate.toISOString();
+                        }
+                        if (request.EndDate) {
+                            getLogsRequest.Range.EndDate = request.EndDate.toISOString();
+                        }
+                        return [2 /*return*/, this.GetLogs(getLogsRequest).then(function (response) {
+                                var _a, _b, _c, _d, _e;
+                                try {
+                                    var logLines = JSON.parse(response.LogLines);
+                                    var lines = [];
+                                    switch (logInfo.RemoteLogManagerType) {
+                                        case "azureloganalyticscurl":
+                                            lines = (_b = (_a = logLines.lines) === null || _a === void 0 ? void 0 : _a.map(azureToLogLine)) !== null && _b !== void 0 ? _b : [];
+                                            break;
+                                        case "elasticstack":
+                                            lines = (_d = (_c = logLines.lines) === null || _c === void 0 ? void 0 : _c.map(elasticToLogLine)) !== null && _d !== void 0 ? _d : [];
+                                            break;
+                                        default:
+                                            logger.warning("Unknown RemoteLogManagerType: ".concat(logInfo.RemoteLogManagerType));
+                                            lines = [];
+                                    }
+                                    return {
+                                        lines: lines,
+                                        total: (_e = response.TotalLogLinesAvailable) !== null && _e !== void 0 ? _e : 10000
+                                    };
+                                }
+                                catch (e) {
+                                    logger.error(e);
+                                }
+                                return {
+                                    lines: [],
+                                    total: 0
+                                };
+                            })];
                 }
             });
-        }
-        else {
-            delete getLogsRequest.Filter.leftBinaryFilter;
-            getLogsRequest.Filter.leftFilter = {
-                LogCategory: WsLogaccess.LogAccessType.All
-            };
-            if ((_c = filters[0]) === null || _c === void 0 ? void 0 : _c.SearchField) {
-                getLogsRequest.Filter.leftFilter = {
-                    LogCategory: (_d = filters[0]) === null || _d === void 0 ? void 0 : _d.LogCategory,
-                    SearchField: (_e = filters[0]) === null || _e === void 0 ? void 0 : _e.SearchField,
-                    SearchByValue: (_f = filters[0]) === null || _f === void 0 ? void 0 : _f.SearchByValue
-                };
-            }
-            if ((_g = filters[1]) === null || _g === void 0 ? void 0 : _g.SearchField) {
-                getLogsRequest.Filter.Operator = WsLogaccess.LogAccessFilterOperator.AND;
-                if (filters[0].SearchField === filters[1].SearchField) {
-                    getLogsRequest.Filter.Operator = WsLogaccess.LogAccessFilterOperator.OR;
-                }
-                getLogsRequest.Filter.rightFilter = {
-                    LogCategory: (_h = filters[0]) === null || _h === void 0 ? void 0 : _h.LogCategory,
-                    SearchField: (_j = filters[1]) === null || _j === void 0 ? void 0 : _j.SearchField,
-                    SearchByValue: (_k = filters[1]) === null || _k === void 0 ? void 0 : _k.SearchByValue
-                };
-            }
-        }
-        if (request.StartDate) {
-            getLogsRequest.Range.StartDate = request.StartDate.toISOString();
-        }
-        if (request.EndDate) {
-            getLogsRequest.Range.EndDate = request.EndDate.toISOString();
-        }
-        return Promise.all([this.GetLogAccessInfo(), this.GetLogs(getLogsRequest)]).then(function (_a) {
-            var _b, _c, _d, _e, _f;
-            var info = _a[0], response = _a[1];
-            try {
-                var logLines = JSON.parse(response.LogLines);
-                var lines = [];
-                switch (info.RemoteLogManagerType) {
-                    case "azureloganalyticscurl":
-                        lines = (_c = (_b = logLines.lines) === null || _b === void 0 ? void 0 : _b.map(azureToLogLine)) !== null && _c !== void 0 ? _c : [];
-                        break;
-                    case "elasticstack":
-                        lines = (_e = (_d = logLines.lines) === null || _d === void 0 ? void 0 : _d.map(elasticToLogLine)) !== null && _e !== void 0 ? _e : [];
-                        break;
-                    default:
-                        logger.warning("Unknown RemoteLogManagerType: ".concat(info.RemoteLogManagerType));
-                        lines = [];
-                }
-                return {
-                    lines: lines,
-                    total: (_f = response.TotalLogLinesAvailable) !== null && _f !== void 0 ? _f : 10000
-                };
-            }
-            catch (e) {
-                logger.error(e);
-            }
-            return {
-                lines: [],
-                total: 0
-            };
         });
     };
     return LogaccessService;

package/lib-es6/services/wsLogaccess.js.map

@@ -1 +1 @@
-{"version":3,"file":"wsLogaccess.js","sourceRoot":"","sources":["../../src/services/wsLogaccess.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wsLogaccess.js","sourceRoot":"","sources":["../../src/services/wsLogaccess.ts"],"names":[],"mappings":"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"}

package/lib-es6/services/wsdl/FileSpray/v1.25/FileSpray.js

@@ -0,0 +1,116 @@
+import { __extends } from "tslib";
+import { Service } from "../../../../espConnection";
+export var FileSpray;
+(function (FileSpray) {
+    var DFUWUActions;
+    (function (DFUWUActions) {
+        DFUWUActions["Delete"] = "Delete";
+        DFUWUActions["Protect"] = "Protect";
+        DFUWUActions["Unprotect"] = "Unprotect";
+        DFUWUActions["Restore"] = "Restore";
+        DFUWUActions["SetToFailed"] = "SetToFailed";
+        DFUWUActions["Archive"] = "Archive";
+    })(DFUWUActions = FileSpray.DFUWUActions || (FileSpray.DFUWUActions = {}));
+})(FileSpray || (FileSpray = {}));
+var FileSprayServiceBase = /** @class */ (function (_super) {
+    __extends(FileSprayServiceBase, _super);
+    function FileSprayServiceBase(optsConnection) {
+        return _super.call(this, optsConnection, "FileSpray", "1.25") || this;
+    }
+    FileSprayServiceBase.prototype.AbortDFUWorkunit = function (request) {
+        return this._connection.send("AbortDFUWorkunit", request, "json", false, undefined, "AbortDFUWorkunitResponse");
+    };
+    FileSprayServiceBase.prototype.Copy = function (request) {
+        return this._connection.send("Copy", request, "json", false, undefined, "CopyResponse");
+    };
+    FileSprayServiceBase.prototype.CreateDFUPublisherWorkunit = function (request) {
+        return this._connection.send("CreateDFUPublisherWorkunit", request, "json", false, undefined, "CreateDFUPublisherWorkunitResponse");
+    };
+    FileSprayServiceBase.prototype.CreateDFUWorkunit = function (request) {
+        return this._connection.send("CreateDFUWorkunit", request, "json", false, undefined, "CreateDFUWorkunitResponse");
+    };
+    FileSprayServiceBase.prototype.DFUWUFile = function (request) {
+        return this._connection.send("DFUWUFile", request, "json", false, undefined, "DFUWUFileResponse");
+    };
+    FileSprayServiceBase.prototype.DFUWUSearch = function (request) {
+        return this._connection.send("DFUWUSearch", request, "json", false, undefined, "DFUWUSearchResponse");
+    };
+    FileSprayServiceBase.prototype.DFUWorkunitsAction = function (request) {
+        return this._connection.send("DFUWorkunitsAction", request, "json", false, undefined, "DFUWorkunitsActionResponse");
+    };
+    FileSprayServiceBase.prototype.DeleteDFUWorkunit = function (request) {
+        return this._connection.send("DeleteDFUWorkunit", request, "json", false, undefined, "DeleteDFUWorkunitResponse");
+    };
+    FileSprayServiceBase.prototype.DeleteDFUWorkunits = function (request) {
+        return this._connection.send("DeleteDFUWorkunits", request, "json", false, undefined, "DeleteDFUWorkunitsResponse");
+    };
+    FileSprayServiceBase.prototype.DeleteDropZoneFiles = function (request) {
+        return this._connection.send("DeleteDropZoneFiles", request, "json", false, undefined, "DFUWorkunitsActionResponse");
+    };
+    FileSprayServiceBase.prototype.Despray = function (request) {
+        return this._connection.send("Despray", request, "json", false, undefined, "DesprayResponse");
+    };
+    FileSprayServiceBase.prototype.DfuMonitor = function (request) {
+        return this._connection.send("DfuMonitor", request, "json", false, undefined, "DfuMonitorResponse");
+    };
+    FileSprayServiceBase.prototype.DropZoneFileSearch = function (request) {
+        return this._connection.send("DropZoneFileSearch", request, "json", false, undefined, "DropZoneFileSearchResponse");
+    };
+    FileSprayServiceBase.prototype.DropZoneFiles = function (request) {
+        return this._connection.send("DropZoneFiles", request, "json", false, undefined, "DropZoneFilesResponse");
+    };
+    FileSprayServiceBase.prototype.EchoDateTime = function (request) {
+        return this._connection.send("EchoDateTime", request, "json", false, undefined, "EchoDateTimeResponse");
+    };
+    FileSprayServiceBase.prototype.FileList = function (request) {
+        return this._connection.send("FileList", request, "json", false, undefined, "FileListResponse");
+    };
+    FileSprayServiceBase.prototype.GetDFUExceptions = function (request) {
+        return this._connection.send("GetDFUExceptions", request, "json", false, undefined, "GetDFUExceptionsResponse");
+    };
+    FileSprayServiceBase.prototype.GetDFUProgress = function (request) {
+        return this._connection.send("GetDFUProgress", request, "json", false, undefined, "ProgressResponse");
+    };
+    FileSprayServiceBase.prototype.GetDFUServerQueues = function (request) {
+        return this._connection.send("GetDFUServerQueues", request, "json", false, undefined, "GetDFUServerQueuesResponse");
+    };
+    FileSprayServiceBase.prototype.GetDFUWorkunit = function (request) {
+        return this._connection.send("GetDFUWorkunit", request, "json", false, undefined, "GetDFUWorkunitResponse");
+    };
+    FileSprayServiceBase.prototype.GetDFUWorkunits = function (request) {
+        return this._connection.send("GetDFUWorkunits", request, "json", false, undefined, "GetDFUWorkunitsResponse");
+    };
+    FileSprayServiceBase.prototype.GetSprayTargets = function (request) {
+        return this._connection.send("GetSprayTargets", request, "json", false, undefined, "GetSprayTargetsResponse");
+    };
+    FileSprayServiceBase.prototype.OpenSave = function (request) {
+        return this._connection.send("OpenSave", request, "json", false, undefined, "OpenSaveResponse");
+    };
+    FileSprayServiceBase.prototype.Ping = function (request) {
+        return this._connection.send("Ping", request, "json", false, undefined, "FileSprayPingResponse");
+    };
+    FileSprayServiceBase.prototype.Rename = function (request) {
+        return this._connection.send("Rename", request, "json", false, undefined, "RenameResponse");
+    };
+    FileSprayServiceBase.prototype.Replicate = function (request) {
+        return this._connection.send("Replicate", request, "json", false, undefined, "ReplicateResponse");
+    };
+    FileSprayServiceBase.prototype.ShowResult = function (request) {
+        return this._connection.send("ShowResult", request, "json", false, undefined, "ShowResultResponse");
+    };
+    FileSprayServiceBase.prototype.SprayFixed = function (request) {
+        return this._connection.send("SprayFixed", request, "json", false, undefined, "SprayFixedResponse");
+    };
+    FileSprayServiceBase.prototype.SprayVariable = function (request) {
+        return this._connection.send("SprayVariable", request, "json", false, undefined, "SprayResponse");
+    };
+    FileSprayServiceBase.prototype.SubmitDFUWorkunit = function (request) {
+        return this._connection.send("SubmitDFUWorkunit", request, "json", false, undefined, "SubmitDFUWorkunitResponse");
+    };
+    FileSprayServiceBase.prototype.UpdateDFUWorkunit = function (request) {
+        return this._connection.send("UpdateDFUWorkunit", request, "json", false, undefined, "UpdateDFUWorkunitResponse");
+    };
+    return FileSprayServiceBase;
+}(Service));
+export { FileSprayServiceBase };
+//# sourceMappingURL=FileSpray.js.map

package/lib-es6/services/wsdl/FileSpray/v1.25/FileSpray.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FileSpray.js","sourceRoot":"","sources":["../../../../../src/services/wsdl/FileSpray/v1.25/FileSpray.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/comms",
-    "version": "2.82.2",
+    "version": "2.83.0",
     "description": "hpcc-js - Communications",
     "main": "dist/index.node.js",
     "module": "dist/index.es6",
@@ -92,5 +92,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "1047cde078892c7bdab933df61fb8862f8dff597"
+    "gitHead": "d68d7fd168a295186ec649d44ea524fdf1ade7c0"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/comms";
-export const PKG_VERSION = "2.82.2";
-export const BUILD_VERSION = "2.104.20";
+export const PKG_VERSION = "2.83.0";
+export const BUILD_VERSION = "2.104.22";

package/src/ecl/dfuWorkunit.ts

@@ -2,7 +2,7 @@ import { Cache, IEvent, scopedLogger, StateCallback, StateEvents, StateObject, S
 import { IConnection, IOptions } from "../connection";
 import { ESPExceptions } from "../espConnection";
 import { WsSMC } from "../services/wsSMC";
-import { FileSpray, SprayFixedEx, FileSprayService, SprayVariableEx } from "../services/fileSpray";
+import { FileSpray, FileSprayService, UpdateDFUWorkunitEx } from "../services/fileSpray";
 import * as WsTopology from "../services/wsTopology";
 
 const logger = scopedLogger("@hpcc-js/comms/dfuWorkunit.ts");
@@ -95,6 +95,8 @@ export class DFUWorkunit extends StateObject<UDFUWorkunitState, IDFUWorkunitStat
     get expireDays(): number { return this.get("expireDays"); }
     get PreserveFileParts(): boolean { return this.get("PreserveFileParts"); }
     get FileAccessCost(): number { return this.get("FileAccessCost"); }
+    get KbPerSecAve(): number { return this.get("KbPerSecAve"); }
+    get KbPerSec(): number { return this.get("KbPerSec"); }
 
     //  Factories  ---
     static create(optsConnection: IOptions | IConnection, dfuServerQueue: string): Promise<DFUWorkunit> {
@@ -116,7 +118,7 @@ export class DFUWorkunit extends StateObject<UDFUWorkunitState, IDFUWorkunitStat
         return retVal;
     }
 
-    static sprayFixed(server: IOptions | IConnection, request: Partial<SprayFixedEx>): Promise<DFUWorkunit> {
+    static sprayFixed(server: IOptions | IConnection, request: Partial<FileSpray.SprayFixed>): Promise<DFUWorkunit> {
         const service = new FileSprayService(server);
         return service.SprayFixedEx({
             ...request
@@ -128,7 +130,7 @@ export class DFUWorkunit extends StateObject<UDFUWorkunitState, IDFUWorkunitStat
         });
     }
 
-    static sprayVariable(server: IOptions | IConnection, request: Partial<SprayVariableEx>): Promise<DFUWorkunit> {
+    static sprayVariable(server: IOptions | IConnection, request: Partial<FileSpray.SprayVariable>): Promise<DFUWorkunit> {
         const service = new FileSprayService(server);
         return service.SprayVariableEx({
             ...request
@@ -152,6 +154,21 @@ export class DFUWorkunit extends StateObject<UDFUWorkunitState, IDFUWorkunitStat
         });
     }
 
+    update(request: Partial<UpdateDFUWorkunitEx>): Promise<FileSpray.UpdateDFUWorkunitResponse> {
+        return this.connection.UpdateDFUWorkunitEx({
+            wu: {
+                JobName: request?.wu?.JobName ?? this.JobName,
+                isProtected: request?.wu?.isProtected ?? this.isProtected,
+                ID: this.ID,
+                State: this.State
+            },
+            ClusterOrig: this.ClusterName,
+            JobNameOrig: this.JobName,
+            isProtectedOrig: this.isProtected,
+            StateOrig: this.State
+        });
+    }
+
     isComplete(): boolean {
         switch (this.State) {
             case States.Finished:
@@ -184,11 +201,23 @@ export class DFUWorkunit extends StateObject<UDFUWorkunitState, IDFUWorkunitStat
         return !this.isComplete();
     }
 
+    abort(): Promise<FileSpray.AbortDFUWorkunitResponse> {
+        return this.connection.AbortDFUWorkunit({ wuid: this.ID });
+    }
+
+    delete() {
+        return this.DFUWUAction(FileSpray.DFUWUActions.Delete);
+    }
+
     async refresh(full: boolean = false): Promise<this> {
         await this.GetDFUWorkunit();
         return this;
     }
 
+    fetchXML(callback?: void): Promise<FileSpray.DFUWUFileResponse> {
+        return this.DFUWUFile();
+    }
+
     //  Monitoring  ---
     protected _monitor(): void {
         if (this.isComplete()) {
@@ -210,6 +239,30 @@ export class DFUWorkunit extends StateObject<UDFUWorkunitState, IDFUWorkunitStat
         return retVal;
     }
 
+    protected DFUWUFile(_request: Partial<FileSpray.DFUWUFileRequest> = {}): Promise<FileSpray.DFUWUFileResponse> {
+        return this.connection.DFUWUFile({
+            ..._request, Wuid: this.ID
+        }).then(response => {
+            //TODO: additional processing?
+            return response;
+        }).catch((e: ESPExceptions) => {
+            return {} as FileSpray.DFUWUFileResponse;
+        });
+    }
+
+    protected DFUWUAction(actionType: FileSpray.DFUWUActions): Promise<FileSpray.DFUWorkunitsActionResponse> {
+        return this.connection.DFUWorkunitsAction({
+            wuids: { Item: [this.ID] },
+            Type: actionType
+        }).then((response) => {
+            if (actionType === FileSpray.DFUWUActions.Delete) return response;
+            return this.refresh().then(() => {
+                this._monitor();
+                return response;
+            });
+        });
+    }
+
     //  Events  ---
     on(eventID: DFUWorkunitEvents, propIDorCallback: StateCallback | keyof UDFUWorkunitState, callback?: StatePropCallback): this {
         if (this.isCallback(propIDorCallback)) {

package/src/ecl/query.ts

@@ -76,6 +76,18 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
         return retVal;
     }
 
+    private async fetchDetails(): Promise<void> {
+        const queryDetails = await this._wsWorkunits.WUQueryDetails({
+            QuerySet: this.QuerySet,
+            QueryId: this.QueryId,
+            IncludeStateOnClusters: false,
+            IncludeSuperFiles: false,
+            IncludeWsEclAddresses: false,
+            CheckAllNodes: false
+        });
+        this.set({ ...queryDetails } as QueryEx);
+    }
+
     private async fetchRequestSchema(): Promise<void> {
         this._requestSchema = await this.connection.requestJson(this.QuerySet, this.QueryId);
     }
@@ -102,7 +114,11 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
     }
 
     async refresh(): Promise<this> {
-        return this.fetchSchema().then(schema => this);
+        await Promise.all([
+            this.fetchDetails(),
+            this.fetchSchema()
+        ]);
+        return this;
     }
 
     requestFields(): IWsEclRequest {

package/src/ecl/workunit.ts

@@ -1,4 +1,5 @@
 import { Cache, deepMixinT, IEvent, scopedLogger, StateCallback, StateEvents, StateObject, StatePropCallback, StringAnyMap, XMLNode } from "@hpcc-js/util";
+import { format as d3Format } from "d3-format";
 import { utcFormat, utcParse } from "d3-time-format";
 import { IConnection, IOptions } from "../connection";
 import { ESPExceptions } from "../espConnection";
@@ -14,6 +15,14 @@ import { Timer } from "./timer";
 
 const formatter = utcFormat("%Y-%m-%dT%H:%M:%S.%LZ");
 const parser = utcParse("%Y-%m-%dT%H:%M:%S.%LZ");
+const d3FormatNum = d3Format(",");
+function formatNum(num: number | string): string {
+    if (num && !isNaN(+num)) {
+        return d3FormatNum(+num);
+    }
+    return num as string;
+}
+
 const logger = scopedLogger("workunit.ts");
 
 const WUStateID = WsWorkunits.WUStateID;
@@ -567,7 +576,7 @@ export class Workunit extends StateObject<UWorkunitState, IWorkunitState> implem
                             default:
                                 props[scopeProperty.Name] = scopeProperty.RawValue;
                         }
-                        formattedProps[scopeProperty.Name] = scopeProperty.Formatted ?? props[scopeProperty.Name];
+                        formattedProps[scopeProperty.Name] = formatNum(scopeProperty.Formatted ?? props[scopeProperty.Name]);
 
                     }
                 }