@hpcc-js/comms 2.82.3 → 2.83.1

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":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAEpD,MAAM,KAAW,SAAS,CAw4BzB;AAx4BD,WAAiB,SAAS;IAQtB,IAAY,YAOX;IAPD,WAAY,YAAY;QACpB,iCAAiB,CAAA;QACjB,mCAAmB,CAAA;QACnB,uCAAuB,CAAA;QACvB,mCAAmB,CAAA;QACnB,2CAA2B,CAAA;QAC3B,mCAAmB,CAAA;IACvB,CAAC,EAPW,YAAY,GAAZ,sBAAY,KAAZ,sBAAY,QAOvB;AAy3BL,CAAC,EAx4BgB,SAAS,KAAT,SAAS,QAw4BzB;AAED;IAA0C,wCAAO;IAE7C,8BAAY,cAAsC;eAC9C,kBAAM,cAAc,EAAE,WAAW,EAAE,MAAM,CAAC;IAC9C,CAAC;IAED,+CAAgB,GAAhB,UAAiB,OAAmC;QAChD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,kBAAkB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,0BAA0B,CAAC,CAAC;IACpH,CAAC;IAED,mCAAI,GAAJ,UAAK,OAAuB;QACxB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;IAC5F,CAAC;IAED,yDAA0B,GAA1B,UAA2B,OAA6C;QACpE,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,4BAA4B,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,oCAAoC,CAAC,CAAC;IACxI,CAAC;IAED,gDAAiB,GAAjB,UAAkB,OAAoC;QAClD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,2BAA2B,CAAC,CAAC;IACtH,CAAC;IAED,wCAAS,GAAT,UAAU,OAAmC;QACzC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,mBAAmB,CAAC,CAAC;IACtG,CAAC;IAED,0CAAW,GAAX,UAAY,OAAqC;QAC7C,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,qBAAqB,CAAC,CAAC;IAC1G,CAAC;IAED,iDAAkB,GAAlB,UAAmB,OAA4C;QAC3D,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,oBAAoB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,4BAA4B,CAAC,CAAC;IACxH,CAAC;IAED,gDAAiB,GAAjB,UAAkB,OAAoC;QAClD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,2BAA2B,CAAC,CAAC;IACtH,CAAC;IAED,iDAAkB,GAAlB,UAAmB,OAAqC;QACpD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,oBAAoB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,4BAA4B,CAAC,CAAC;IACxH,CAAC;IAED,kDAAmB,GAAnB,UAAoB,OAA6C;QAC7D,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,4BAA4B,CAAC,CAAC;IACzH,CAAC;IAED,sCAAO,GAAP,UAAQ,OAA0B;QAC9B,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAClG,CAAC;IAED,yCAAU,GAAV,UAAW,OAAoC;QAC3C,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,oBAAoB,CAAC,CAAC;IACxG,CAAC;IAED,iDAAkB,GAAlB,UAAmB,OAA4C;QAC3D,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,oBAAoB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,4BAA4B,CAAC,CAAC;IACxH,CAAC;IAED,4CAAa,GAAb,UAAc,OAAuC;QACjD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,uBAAuB,CAAC,CAAC;IAC9G,CAAC;IAED,2CAAY,GAAZ,UAAa,OAA+B;QACxC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,sBAAsB,CAAC,CAAC;IAC5G,CAAC;IAED,uCAAQ,GAAR,UAAS,OAAkC;QACvC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,kBAAkB,CAAC,CAAC;IACpG,CAAC;IAED,+CAAgB,GAAhB,UAAiB,OAAmC;QAChD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,kBAAkB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,0BAA0B,CAAC,CAAC;IACpH,CAAC;IAED,6CAAc,GAAd,UAAe,OAAkC;QAC7C,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,kBAAkB,CAAC,CAAC;IAC1G,CAAC;IAED,iDAAkB,GAAlB,UAAmB,OAA4C;QAC3D,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,oBAAoB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,4BAA4B,CAAC,CAAC;IACxH,CAAC;IAED,6CAAc,GAAd,UAAe,OAAiC;QAC5C,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,wBAAwB,CAAC,CAAC;IAChH,CAAC;IAED,8CAAe,GAAf,UAAgB,OAAkC;QAC9C,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,yBAAyB,CAAC,CAAC;IAClH,CAAC;IAED,8CAAe,GAAf,UAAgB,OAAyC;QACrD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,yBAAyB,CAAC,CAAC;IAClH,CAAC;IAED,uCAAQ,GAAR,UAAS,OAAkC;QACvC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,kBAAkB,CAAC,CAAC;IACpG,CAAC;IAED,mCAAI,GAAJ,UAAK,OAAuC;QACxC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,uBAAuB,CAAC,CAAC;IACrG,CAAC;IAED,qCAAM,GAAN,UAAO,OAAyB;QAC5B,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;IAChG,CAAC;IAED,wCAAS,GAAT,UAAU,OAA4B;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,mBAAmB,CAAC,CAAC;IACtG,CAAC;IAED,yCAAU,GAAV,UAAW,OAAoC;QAC3C,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,oBAAoB,CAAC,CAAC;IACxG,CAAC;IAED,yCAAU,GAAV,UAAW,OAA6B;QACpC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,oBAAoB,CAAC,CAAC;IACxG,CAAC;IAED,4CAAa,GAAb,UAAc,OAAgC;QAC1C,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;IACtG,CAAC;IAED,gDAAiB,GAAjB,UAAkB,OAAoC;QAClD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,2BAA2B,CAAC,CAAC;IACtH,CAAC;IAED,gDAAiB,GAAjB,UAAkB,OAAoC;QAClD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,2BAA2B,CAAC,CAAC;IACtH,CAAC;IAEL,2BAAC;AAAD,CAAC,AAlID,CAA0C,OAAO,GAkIhD"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/comms",
-    "version": "2.82.3",
+    "version": "2.83.1",
     "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": "b7fc0219f8e29160d5aba7c8fac6826edc3569c5"
+    "gitHead": "21788a9e79b571818151a2b78a1a660de5572b2d"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/comms";
-export const PKG_VERSION = "2.82.3";
-export const BUILD_VERSION = "2.104.21";
+export const PKG_VERSION = "2.83.1";
+export const BUILD_VERSION = "2.104.23";

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

@@ -1,7 +1,10 @@
-import { Cache, StateObject } from "@hpcc-js/util";
+import { Cache, StateObject, scopedLogger } from "@hpcc-js/util";
 import { IConnection, IOptions } from "../connection";
 import { EclService, IWsEclRequest, IWsEclResponse, IWsEclResult } from "../services/wsEcl";
 import { WorkunitsService, WUQueryDetails } from "../services/wsWorkunits";
+import { Topology } from "./topology";
+
+const logger = scopedLogger("@hpcc-js/comms/ecl/query.ts");
 
 export interface QueryEx extends WUQueryDetails.Response {
     BaseUrl: string;
@@ -17,11 +20,9 @@ class QueryCache extends Cache<QueryEx, Query> {
 const _queries = new QueryCache();
 
 export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
-    protected connection: EclService;
-    get BaseUrl() { return this.connection.baseUrl; }
-    // protected _topology: Topology;
-    protected _wsWorkunits: WorkunitsService;
-    // protected _wu: Workunit;
+    protected wsWorkunitsService: WorkunitsService;
+    get BaseUrl() { return this.wsWorkunitsService.baseUrl; }
+    protected topology: Topology;
     protected _requestSchema: IWsEclRequest;
     protected _responseSchema: IWsEclResponse;
 
@@ -51,17 +52,14 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
     get WUGraphs(): WUQueryDetails.WUGraphs { return this.get("WUGraphs"); }
     get WUTimers(): WUQueryDetails.WUTimers { return this.get("WUTimers"); }
 
-    private constructor(optsConnection: IOptions | IConnection | EclService, querySet: string, queryID: string, queryDetails?: WUQueryDetails.Response) {
+    private constructor(optsConnection: IOptions | IConnection | WorkunitsService, querySet: string, queryID: string, queryDetails?: WUQueryDetails.Response) {
         super();
-        if (optsConnection instanceof EclService) {
-            this.connection = optsConnection;
-
-            // this._topology = new Topology(this.connection.opts());
+        if (optsConnection instanceof WorkunitsService) {
+            this.wsWorkunitsService = optsConnection;
         } else {
-            this.connection = new EclService(optsConnection);
-            // this._topology = new Topology(optsConnection);
+            this.wsWorkunitsService = new WorkunitsService(optsConnection);
         }
-        this._wsWorkunits = new WorkunitsService(optsConnection);
+        this.topology = Topology.attach(this.wsWorkunitsService.opts());
         this.set({
             QuerySet: querySet,
             QueryId: queryID,
@@ -76,24 +74,56 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
         return retVal;
     }
 
+    private _eclService: Promise<EclService>;
+    protected async wsEclService(): Promise<EclService | undefined> {
+        if (!this._eclService) {
+            this._eclService = this.topology.fetchServices({}).then(services => {
+                for (const espServer of services?.TpEspServers?.TpEspServer ?? []) {
+                    for (const binding of espServer?.TpBindings?.TpBinding ?? []) {
+                        if (binding?.Service === "ws_ecl") {
+                            const baseUrl = `${binding.Protocol}://${globalThis.location.hostname}:${binding.Port}`;
+                            return new EclService({ baseUrl });
+                        }
+                    }
+                }
+                return undefined;
+            });
+        }
+        return this._eclService;
+    }
+
     private async fetchDetails(): Promise<void> {
-        const queryDetails = await this._wsWorkunits.WUQueryDetails({
+        const queryDetails = await this.wsWorkunitsService.WUQueryDetails({
             QuerySet: this.QuerySet,
             QueryId: this.QueryId,
-            IncludeStateOnClusters: false,
-            IncludeSuperFiles: false,
-            IncludeWsEclAddresses: false,
+            IncludeStateOnClusters: true,
+            IncludeSuperFiles: true,
+            IncludeWsEclAddresses: true,
             CheckAllNodes: false
         });
         this.set({ ...queryDetails } as QueryEx);
     }
 
     private async fetchRequestSchema(): Promise<void> {
-        this._requestSchema = await this.connection.requestJson(this.QuerySet, this.QueryId);
+        const wsEclService = await this.wsEclService();
+        try {
+            this._requestSchema = await wsEclService?.requestJson(this.QuerySet, this.QueryId) ?? [];
+        } catch (e) {
+            //  See:  https://track.hpccsystems.com/browse/HPCC-29827
+            logger.debug(e);
+            this._requestSchema = [];
+        }
     }
 
     private async fetchResponseSchema(): Promise<void> {
-        this._responseSchema = await this.connection.responseJson(this.QuerySet, this.QueryId);
+        const wsEclService = await this.wsEclService();
+        try {
+            this._responseSchema = await wsEclService?.responseJson(this.QuerySet, this.QueryId) ?? {};
+        } catch (e) {
+            //  See:  https://track.hpccsystems.com/browse/HPCC-29827
+            logger.debug(e);
+            this._responseSchema = {};
+        }
     }
 
     private async fetchSchema(): Promise<void> {
@@ -101,16 +131,23 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
     }
 
     fetchSummaryStats() {
-        return this._wsWorkunits.WUQueryGetSummaryStats({ Target: this.QuerySet, QueryId: this.QueryId });
+        return this.wsWorkunitsService.WUQueryGetSummaryStats({ Target: this.QuerySet, QueryId: this.QueryId });
     }
 
-    submit(request: object): Promise<Array<{ [key: string]: object[] }>> {
-        return this.connection.submit(this.QuerySet, this.QueryId, request).then(results => {
-            for (const key in results) {
-                results[key] = results[key].Row;
-            }
-            return results;
-        });
+    async submit(request: object): Promise<Array<{ [key: string]: object[] }>> {
+        const wsEclService = await this.wsEclService();
+        try {
+            return wsEclService?.submit(this.QuerySet, this.QueryId, request).then(results => {
+                for (const key in results) {
+                    results[key] = results[key].Row;
+                }
+                return results;
+            }) ?? [];
+        } catch (e) {
+            //  See:  https://track.hpccsystems.com/browse/HPCC-29827
+            logger.debug(e);
+            return [];
+        }
     }
 
     async refresh(): Promise<this> {
@@ -143,18 +180,4 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
         if (!this._responseSchema[resultName]) return [];
         return this._responseSchema[resultName];
     }
-
-    /*
-    protected WUQueryDetails(): Promise<WUQueryDetails.Response> {
-        const request: WUQueryDetails.Request = {} as WUQueryDetails.Request;
-        request.QueryId = this.QueryId;
-        request.QuerySet = this.QuerySet;
-        request.IncludeSuperFiles = true;
-        request.IncludeStateOnClusters = true;
-        return this.connection.WUQueryDetails(request).then((response) => {
-            this.set(response);
-            return response;
-        });
-    }
-    */
 }

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]);
 
                     }
                 }

package/src/services/fileSpray.ts

@@ -1,116 +1,31 @@
-import { FileSprayServiceBase, FileSpray } from "./wsdl/FileSpray/v1.23/FileSpray";
+import { FileSprayServiceBase, FileSpray } from "./wsdl/FileSpray/v1.25/FileSpray";
 
 export {
     FileSpray
 };
 
-export interface SprayFixedEx {
-    sourceIP?: string;
-    sourcePlane?: string;
-    sourcePath?: string;
-    srcxml?: string;
-    sourceFormat?: string;
-    sourceRecordSize?: number;
-    destGroup?: string;
-    destLogicalName?: string;
-    overwrite?: boolean;
-    replicate?: boolean;
-    ReplicateOffset?: number;
-    maxConnections?: number;
-    throttle?: number;
-    transferBufferSize?: number;
-    prefix?: string;
-    nosplit?: boolean;
-    norecover?: boolean;
-    compress?: boolean;
-    push?: boolean;
-    pull?: boolean;
-    noCommon?: boolean;
-    encrypt?: string;
-    decrypt?: string;
-    wrap?: boolean;
-    failIfNoSourceFile?: boolean;
-    recordStructurePresent?: boolean;
-    quotedTerminator?: boolean;
-    expireDays?: number;
-    DFUServerQueue?: string;
-}
-
-export interface SprayVariableEx {
-    sourceIP?: string;
-    sourcePlane?: string;
-    sourcePath?: string;
-    srcxml?: string;
-    sourceMaxRecordSize?: number;
-    sourceFormat?: number;
-    NoSourceCsvSeparator?: boolean;
-    sourceCsvSeparate?: string;
-    sourceCsvTerminate?: string;
-    sourceCsvQuote?: string;
-    sourceCsvEscape?: string;
-    sourceRowTag?: string;
-    destGroup?: string;
-    destLogicalName?: string;
-    overwrite?: boolean;
-    replicate?: boolean;
-    ReplicateOffset?: number;
-    maxConnections?: number;
-    throttle?: number;
-    transferBufferSize?: number;
-    prefix?: string;
-    nosplit?: boolean;
-    norecover?: boolean;
-    compress?: boolean;
-    push?: boolean;
-    pull?: boolean;
-    noCommon?: boolean;
-    encrypt?: string;
-    decrypt?: string;
-    failIfNoSourceFile?: boolean;
-    recordStructurePresent?: boolean;
-    quotedTerminator?: boolean;
-    sourceRowPath?: string;
-    isJSON?: boolean;
-    expireDays?: number;
-    DFUServerQueue?: string;
-    srcUsername?: string;
-    srcPassword?: string;
-}
+type UpdateDFUWorkunitMinusWU = Omit<FileSpray.UpdateDFUWorkunit, "wu">;
+type UpdateDFUWorkunitWU = FileSpray.UpdateDFUWorkunit["wu"];
 
-export interface DesprayEx {
-    destGroup?: string;
-    sourceLogicalName?: string;
-    destIP?: string;
-    destPath?: string;
-    destPlane?: string;
-    dstxml?: string;
-    overwrite?: boolean;
-    maxConnections?: number;
-    throttle?: number;
-    transferBufferSize?: number;
-    splitprefix?: string;
-    norecover?: boolean;
-    wrap?: boolean;
-    multiCopy?: boolean;
-    SingleConnection?: boolean;
-    DFUServerQueue?: string;
-    compress?: boolean;
-    encrypt?: string;
-    decrypt?: string;
+export interface UpdateDFUWorkunitEx extends UpdateDFUWorkunitMinusWU {
+    wu?: Partial<UpdateDFUWorkunitWU>
 }
 
 export class FileSprayService extends FileSprayServiceBase {
 
-    SprayFixedEx(request: SprayFixedEx): Promise<FileSpray.SprayFixedResponse> {
+    SprayFixedEx(request: Partial<FileSpray.SprayFixed>): Promise<FileSpray.SprayFixedResponse> {
         return this._connection.send("SprayFixed", request);
     }
 
-    SprayVariableEx(request: SprayVariableEx): Promise<FileSpray.SprayResponse> {
+    SprayVariableEx(request: Partial<FileSpray.SprayVariable>): Promise<FileSpray.SprayResponse> {
         return this._connection.send("SprayVariable", request, "json", false, null, "SprayResponse");
     }
 
-    DesprayEx(request: DesprayEx): Promise<FileSpray.DesprayResponse> {
+    DesprayEx(request: Partial<FileSpray.Despray>): Promise<FileSpray.DesprayResponse> {
         return this._connection.send("Despray", request);
     }
 
+    UpdateDFUWorkunitEx(request: Partial<UpdateDFUWorkunitEx>): Promise<FileSpray.UpdateDFUWorkunitResponse> {
+        return this._connection.send("UpdateDFUWorkunit", request, "json", false, undefined, "UpdateDFUWorkunitResponse");
+    }
 }