@hpcc-js/comms 2.69.0 → 2.73.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/comms",
-    "version": "2.69.0",
+    "version": "2.73.4",
     "description": "hpcc-js - Communications",
     "main": "dist/index.node.js",
     "module": "dist/index.es6",
@@ -22,6 +22,7 @@
         "compile-es6-watch": "npm run compile-es6 -- -w",
         "compile-umd": "tsc --module umd --outDir ./lib-umd",
         "compile-umd-watch": "npm run compile-umd -- -w",
+        "compile-util": "tsc --esModuleInterop --target es2019 --skipLibCheck --module commonjs --outDir ./lib-cjs ./utils/index.ts",
         "bundle": "rollup -c",
         "bundle-watch": "npm run bundle -- -w",
         "minimize-browser": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js",
@@ -30,52 +31,46 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node node_modules/@hpcc-js/bundle/src/stamp.js",
+        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint src/**/*.ts",
         "lint-fix": "eslint --fix src/**/*.ts",
-        "test": "./node_modules/.bin/mocha lib-umd/__tests__ --reporter spec",
+        "test": "mocha lib-umd/__tests__ --reporter spec",
         "docs": "typedoc --options tdoptions.json .",
-        "update": "npx npm-check-updates -u -t minor"
+        "update": "npx npm-check-updates -u -t minor",
+        "wsdl-access": "node ./lib-cjs/index.js --url=http://localhost:8010/ws_access?wsdl --outDir=./src/services/wsdl",
+        "wsdl-account": "node ./lib-cjs/index.js --url=http://localhost:8010/Ws_Account?wsdl --outDir=./src/services/wsdl",
+        "wsdl-codesign": "node ./lib-cjs/index.js --url=http://localhost:8010/ws_codesign?wsdl --outDir=./src/services/wsdl",
+        "wsdl-dfu": "node ./lib-cjs/index.js --url=http://localhost:8010/WsDfu?wsdl --outDir=./src/services/wsdl",
+        "wsdl-dfuxref": "node ./lib-cjs/index.js --url=http://localhost:8010/WsDFUXRef?wsdl --outDir=./src/services/wsdl",
+        "wsdl-logaccess": "node ./lib-cjs/index.js --url=http://localhost:8010/Ws_logaccess?wsdl --outDir=./src/services/wsdl",
+        "wsdl-machine": "node ./lib-cjs/index.js --url=http://localhost:8010/ws_machine?wsdl --outDir=./src/services/wsdl",
+        "wsdl-smc": "node ./lib-cjs/index.js --url=http://localhost:8010/WsSMC?wsdl --outDir=./src/services/wsdl",
+        "wsdl-store": "node ./lib-cjs/index.js --url=http://localhost:8010/WsStore?wsdl --outDir=./src/services/wsdl",
+        "wsdl-topology": "node ./lib-cjs/index.js --url=http://localhost:8010/WsTopology?wsdl --outDir=./src/services/wsdl",
+        "wsdl-workunits": "node ./lib-cjs/index.js --url=http://localhost:8010/WsWorkunits?wsdl --outDir=./src/services/wsdl",
+        "wsdl": "npm-run-all --serial compile-util --parallel wsdl-account wsdl-codesign wsdl-dfu wsdl-dfuxref wsdl-machine wsdl-smc wsdl-store wsdl-topology wsdl-workunits"
     },
     "dependencies": {
-        "@hpcc-js/ddl-shim": "^2.17.24",
-        "@hpcc-js/util": "^2.44.0",
-        "@xmldom/xmldom": "0.7.2",
+        "@hpcc-js/ddl-shim": "^2.19.0",
+        "@hpcc-js/util": "^2.46.1",
+        "@xmldom/xmldom": "0.8.1",
         "abort-controller": "3.0.0",
         "node-fetch": "2.6.7",
-        "safe-buffer": "5.1.2",
-        "tmp": "0.0.33"
+        "safe-buffer": "5.2.1",
+        "tmp": "0.2.1"
     },
     "devDependencies": {
-        "@hpcc-js/bundle": "^2.10.23",
-        "@rollup/plugin-alias": "3.1.0",
-        "@rollup/plugin-commonjs": "12.0.0",
-        "@rollup/plugin-node-resolve": "8.0.0",
-        "@types/chai": "4.1.7",
-        "@types/d3-request": "1.0.2",
-        "@types/d3-time-format": "2.1.1",
+        "@hpcc-js/bundle": "^2.11.1",
+        "@types/d3-request": "1.0.6",
+        "@types/d3-time-format": "2.3.1",
         "@types/node": "^10",
-        "@types/request": "0.0.41",
+        "@types/request": "0.0.47",
         "@types/xmldom": "0.1.31",
-        "@typescript-eslint/eslint-plugin": "4.31.0",
-        "@typescript-eslint/parser": "4.31.0",
-        "chai": "4.2.0",
         "d3-array": "^1",
         "d3-time-format": "^2",
-        "downlevel-dts": "0.6.0",
-        "eslint": "7.32.0",
-        "eslint-plugin-react-hooks": "^4.3.0",
-        "mocha": "5.2.0",
-        "npm-run-all": "4.1.5",
-        "rimraf": "2.6.3",
-        "rollup": "2.10.7",
-        "rollup-plugin-postcss": "3.1.1",
-        "rollup-plugin-sourcemaps": "0.6.2",
-        "terser": "4.0.0",
-        "tslib": "2.3.0",
-        "typedoc": "0.14.2",
-        "typescript": "4.3.4",
-        "whatwg-fetch": "3.4.1"
+        "soap": "0.43.0",
+        "tslib": "2.3.1",
+        "whatwg-fetch": "3.6.2"
     },
     "repository": {
         "type": "git",
@@ -88,5 +83,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "40fceb9190e3a89a95b289f7db0e7373878dc90f"
+    "gitHead": "cd0029695af339b4f316099b57ee0ada54e74910"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/comms";
-export const PKG_VERSION = "2.69.0";
-export const BUILD_VERSION = "2.100.0";
+export const PKG_VERSION = "2.73.4";
+export const BUILD_VERSION = "2.102.4";

package/src/ecl/machine.ts

@@ -1,6 +1,6 @@
 import { Cache, StateObject } from "@hpcc-js/util";
 import { IConnection, IOptions } from "../connection";
-import { GetTargetClusterInfo, MachineService } from "../services/wsMachine";
+import { WsMachine, MachineService } from "../services/wsMachine";
 
 export class MachineCache extends Cache<{ Address: string }, Machine> {
     constructor() {
@@ -11,7 +11,7 @@ export class MachineCache extends Cache<{ Address: string }, Machine> {
 }
 const _machines = new MachineCache();
 
-export interface MachineInfoEx extends GetTargetClusterInfo.MachineInfoEx {
+export interface MachineInfoEx extends WsMachine.MachineInfoEx {
 }
 
 export class Machine extends StateObject<MachineInfoEx, MachineInfoEx> implements MachineInfoEx {
@@ -33,14 +33,16 @@ export class Machine extends StateObject<MachineInfoEx, MachineInfoEx> implement
     get RoxieStateDetails(): string { return this.get("RoxieStateDetails"); }
     get OS(): number { return this.get("OS"); }
     get ProcessNumber(): number { return this.get("ProcessNumber"); }
-    get Processors(): GetTargetClusterInfo.Processors { return this.get("Processors"); }
-    get Storage(): GetTargetClusterInfo.Storage { return this.get("Storage"); }
-    get Running(): GetTargetClusterInfo.Running { return this.get("Running"); }
-    get PhysicalMemory(): GetTargetClusterInfo.PhysicalMemory { return this.get("PhysicalMemory"); }
-    get VirtualMemory(): GetTargetClusterInfo.VirtualMemory { return this.get("VirtualMemory"); }
-    get ComponentInfo(): GetTargetClusterInfo.ComponentInfo { return this.get("ComponentInfo"); }
+    get Channels(): number { return this.get("Channels"); }
+    get Processors(): WsMachine.Processors { return this.get("Processors"); }
+    get Storage(): WsMachine.Storage { return this.get("Storage"); }
+    get Running(): WsMachine.Running { return this.get("Running"); }
+    get PhysicalMemory(): WsMachine.PhysicalMemory { return this.get("PhysicalMemory"); }
+    get VirtualMemory(): WsMachine.VirtualMemory { return this.get("VirtualMemory"); }
+    get ComponentInfo(): WsMachine.ComponentInfo { return this.get("ComponentInfo"); }
+    get Exception(): string { return this.get("Exception"); }
 
-    static attach(optsConnection: IOptions | IConnection | MachineService, address: string, state?: GetTargetClusterInfo.MachineInfoEx): Machine {
+    static attach(optsConnection: IOptions | IConnection | MachineService, address: string, state?: WsMachine.MachineInfoEx): Machine {
         const retVal: Machine = _machines.get({ Address: address }, () => {
             return new Machine(optsConnection);
         });

package/src/ecl/targetCluster.ts

@@ -1,6 +1,6 @@
 import { Cache, StateObject } from "@hpcc-js/util";
 import { IConnection, IOptions } from "../connection";
-import { GetTargetClusterInfo, GetTargetClusterUsageEx, MachineService } from "../services/wsMachine";
+import { WsMachine, WsMachineEx, MachineService } from "../services/wsMachine";
 import { TopologyService, TpListTargetClusters, TpTargetClusterQuery } from "../services/wsTopology";
 import { Machine } from "./machine";
 
@@ -14,7 +14,7 @@ export class TargetClusterCache extends Cache<{ BaseUrl: string, Name: string },
 const _targetCluster = new TargetClusterCache();
 
 export interface TpTargetClusterEx {
-    MachineInfoEx: GetTargetClusterInfo.MachineInfoEx[];
+    MachineInfoEx: WsMachine.MachineInfoEx[];
 }
 
 export type UTargetClusterState = TpTargetClusterQuery.TpTargetCluster & TpListTargetClusters.TpClusterNameType & TpTargetClusterEx;
@@ -33,7 +33,7 @@ export class TargetCluster extends StateObject<UTargetClusterState, ITargetClust
     get TpEclServers(): TpTargetClusterQuery.TpEclServers { return this.get("TpEclServers"); }
     get TpEclAgents(): TpTargetClusterQuery.TpEclAgents { return this.get("TpEclAgents"); }
     get TpEclSchedulers(): TpTargetClusterQuery.TpEclSchedulers { return this.get("TpEclSchedulers"); }
-    get MachineInfoEx(): GetTargetClusterInfo.MachineInfoEx[] { return this.get("MachineInfoEx", []); }
+    get MachineInfoEx(): WsMachine.MachineInfoEx[] { return this.get("MachineInfoEx", []); }
     get CMachineInfoEx(): Machine[] {
         return this.MachineInfoEx.map(machineInfoEx => Machine.attach(this.machineConnection, machineInfoEx.Address, machineInfoEx));
     }
@@ -64,14 +64,14 @@ export class TargetCluster extends StateObject<UTargetClusterState, ITargetClust
         });
     }
 
-    fetchMachines(request: GetTargetClusterInfo.Request = {}): Promise<Machine[]> {
+    fetchMachines(request: WsMachine.GetTargetClusterInfoRequest = {}): Promise<Machine[]> {
         return this.machineConnection.GetTargetClusterInfo({
             TargetClusters: {
                 Item: [`${this.Type}:${this.Name}`]
             },
             ...request
         }).then(response => {
-            const retVal: GetTargetClusterInfo.MachineInfoEx[] = [];
+            const retVal: WsMachine.MachineInfoEx[] = [];
             for (const machineInfo of response.TargetClusterInfoList.TargetClusterInfo) {
                 for (const machineInfoEx of machineInfo.Processes.MachineInfoEx) {
                     retVal.push(machineInfoEx);
@@ -102,8 +102,8 @@ export class TargetCluster extends StateObject<UTargetClusterState, ITargetClust
         };
     }
 
-    fetchUsage(): Promise<GetTargetClusterUsageEx.TargetClusterUsage[]> {
-        return this.machineConnection.GetTargetClusterUsageEx([this.Name]);
+    fetchUsage(): Promise<WsMachineEx.TargetClusterUsage[]> {
+        return this.machineConnection.GetTargetClusterUsageEx({ TargetClusters: { Item: [this.Name] } });
     }
 }
 

package/src/ecl/topology.ts

@@ -93,7 +93,7 @@ export class Topology extends StateObject<TopologyStateEx, TopologyStateEx> impl
         });
     }
 
-    protected _prevRefresh
+    protected _prevRefresh;
     refresh(force: boolean = false): Promise<this> {
         if (!this._prevRefresh || force) {
             this._prevRefresh = Promise.all([this.fetchTargetClusters(), this.fetchLogicalClusters(), this.fetchServices()]).then(() => {

package/src/ecl/workunit.ts

@@ -550,6 +550,9 @@ export class Workunit extends StateObject<UWorkunitState, IWorkunitState> implem
                             case "cnt":
                                 props[scopeProperty.Name] = +scopeProperty.RawValue;
                                 break;
+                            case "cost":
+                                props[scopeProperty.Name] = +scopeProperty.RawValue / 1000000;
+                                break;
                             case "cpu":
                             case "skw":
                             case "node":

package/src/index-common.ts

@@ -1,11 +1,14 @@
 export * from "./__package__";
 
+export * from "./services/wsAccess";
 export * from "./services/wsAccount";
 export * from "./services/wsCodesign";
 export * from "./services/wsDFU";
 export * from "./services/wsDFUXRef";
 export * from "./services/wsEcl";
+export * from "./services/wsLogaccess";
 export * from "./services/wsMachine";
+export * from "./services/wsResources";
 export * from "./services/wsSMC";
 export * from "./services/wsStore";
 export * from "./services/wsTopology";

package/src/services/wsAccess.ts

@@ -0,0 +1,8 @@
+import { AccessServiceBase, WsAccess } from "./wsdl/ws_access/v1.16/ws_access";
+
+export {
+    WsAccess
+};
+
+export class AccessService extends AccessServiceBase {
+}

package/src/services/wsDFU.ts

@@ -1555,7 +1555,8 @@ export namespace WsDfu {
         KeyType: string;
         NumOfSubfiles: number;
         Accessed: string;
-        Cost?: number;
+        AtRestCost?: number;
+        AccessCost?: number;
     }
 
     export interface Superfiles {
@@ -2821,7 +2822,7 @@ export namespace WsDfu {
 export class DFUService extends Service {
 
     constructor(optsConnection: IOptions | IConnection) {
-        super(optsConnection, "WsDfu", "1.60");
+        super(optsConnection, "WsDfu", "1.62");
     }
 
     DFUQuery(request: WsDfu.DFUQueryRequest): Promise<WsDfu.DFUQueryResponse> {

package/src/services/wsLogaccess.ts

@@ -0,0 +1,8 @@
+import { LogaccessServiceBase, WsLogaccess } from "./wsdl/ws_logaccess/v1/ws_logaccess";
+
+export {
+    WsLogaccess
+};
+
+export class LogaccessService extends LogaccessServiceBase {
+}

package/src/services/wsMachine.ts

@@ -1,327 +1,51 @@
 import { exists } from "@hpcc-js/util";
 import { max as d3Max, mean as d3Mean } from "d3-array";
-import { IConnection, IOptions } from "../connection";
-import { ESPConnection } from "../espConnection";
 
-/*
-    Response structures generated via:
-    * http://192.168.3.22:8010/ws_machine/GetTargetClusterInfo?respjson_
-    * http://json2ts.com/
-*/
+import { MachineServiceBase, WsMachine } from "./wsdl/ws_machine/v1.17/ws_machine";
 
-export namespace GetTargetClusterInfo {
+export {
+    WsMachine
+};
 
-    export interface TargetClusters {
-        Item: string[];
-    }
-
-    export interface Request {
-        TargetClusters?: TargetClusters;
-        AddProcessesToFilter?: string;
-        ApplyProcessFilter?: boolean;
-        GetProcessorInfo?: boolean;
-        GetStorageInfo?: boolean;
-        LocalFileSystemsOnly?: boolean;
-        GetSoftwareInfo?: boolean;
-        MemThreshold?: number;
-        DiskThreshold?: number;
-        CpuThreshold?: number;
-        AutoRefresh?: number;
-        MemThresholdType?: string;
-        DiskThresholdType?: string;
-    }
-
-    export interface Exception {
-        Code: string;
-        Audience: string;
-        Source: string;
-        Message: string;
-    }
-
-    export interface Exceptions {
-        Source: string;
-        Exception: Exception[];
-    }
-
-    export interface Columns {
-        Item: string[];
-    }
-
-    export interface Addresses {
-        Item: string[];
-    }
-
-    export interface RequestInfo {
-        Addresses: Addresses;
-        ClusterType: string;
-        Cluster: string;
-        OldIP: string;
-        Path: string;
-        AddProcessesToFilter: string;
-        ApplyProcessFilter: boolean;
-        GetProcessorInfo: boolean;
-        GetStorageInfo: boolean;
-        LocalFileSystemsOnly: boolean;
-        GetSoftwareInfo: boolean;
-        MemThreshold: number;
-        DiskThreshold: number;
-        CpuThreshold: number;
-        AutoRefresh: number;
-        MemThresholdType: string;
-        DiskThresholdType: string;
-        SecurityString: string;
-        UserName: string;
-        Password: string;
-        EnableSNMP: boolean;
-    }
-
-    export interface ProcessorInfo {
-        Type: string;
-        Load: number;
-    }
-
-    export interface Processors {
-        ProcessorInfo: ProcessorInfo[];
-    }
-
-    export interface StorageInfo {
-        Description: string;
-        Type: string;
-        Available: number;
-        PercentAvail: number;
-        Total: number;
-        Failures: number;
-    }
-
-    export interface Storage {
-        StorageInfo: StorageInfo[];
-    }
-
-    export interface SWRunInfo {
-        Name: string;
-        Instances: number;
-        State: number;
-    }
-
-    export interface Running {
-        SWRunInfo: SWRunInfo[];
-    }
-
-    export interface PhysicalMemory {
-        Description: string;
-        Type: string;
-        Available: number;
-        PercentAvail: number;
-        Total: number;
-        Failures: number;
-    }
-
-    export interface VirtualMemory {
-        Description: string;
-        Type: string;
-        Available: number;
-        PercentAvail: number;
-        Total: number;
-        Failures: number;
-    }
-
-    export interface ComponentInfo {
-        Condition: number;
-        State: number;
-        UpTime: string;
-    }
-
-    export interface MachineInfoEx {
-        Address: string;
-        ConfigAddress: string;
-        Name: string;
-        ProcessType: string;
-        DisplayType: string;
-        Description: string;
-        AgentVersion: string;
-        Contact: string;
-        Location: string;
-        UpTime: string;
-        ComponentName: string;
-        ComponentPath: string;
-        RoxieState: string;
-        RoxieStateDetails: string;
-        OS: number;
-        ProcessNumber: number;
-        Processors: Processors;
-        Storage: Storage;
-        Running: Running;
-        PhysicalMemory: PhysicalMemory;
-        VirtualMemory: VirtualMemory;
-        ComponentInfo: ComponentInfo;
-    }
-
-    export interface Processes {
-        MachineInfoEx: MachineInfoEx[];
-    }
-
-    export interface TargetClusterInfo {
-        Name: string;
-        Type: string;
-        Processes: Processes;
-    }
-
-    export interface TargetClusterInfoList {
-        TargetClusterInfo: TargetClusterInfo[];
-    }
+export namespace WsMachineEx {
 
-    export interface Response {
-        Exceptions: Exceptions;
-        Columns: Columns;
-        RequestInfo: RequestInfo;
-        TargetClusterInfoList: TargetClusterInfoList;
-        TimeStamp: string;
-        AcceptLanguage: string;
-    }
-}
-
-export namespace GetTargetClusterUsage {
-
-    export interface TargetClusters {
-        Item: string[];
-    }
-
-    export interface Request {
-        TargetClusters?: TargetClusters;
-        BypassCachedResult: boolean;
-    }
-
-    export interface Exception {
-        Code: string;
-        Audience: string;
-        Source: string;
-        Message: string;
-    }
-
-    export interface Exceptions {
-        Source: string;
-        Exception: Exception[];
-    }
-
-    export interface DiskUsage {
-        Name: string;
-        Path: string;
-        Description: string;
-        InUse: number;
-        Available: number;
-        PercentAvailable: number;
-    }
-
-    export interface DiskUsages {
-        DiskUsage: DiskUsage[];
-    }
-
-    export interface MachineUsage {
-        Name: string;
-        NetAddress: string;
-        Description: string;
-        DiskUsages: DiskUsages;
-    }
-
-    export interface MachineUsages {
-        MachineUsage: MachineUsage[];
-    }
-
-    export interface ComponentUsage {
-        Type: string;
-        Name: string;
-        Description: string;
-        MachineUsages: MachineUsages;
-    }
-
-    export interface ComponentUsages {
-        ComponentUsage: ComponentUsage[];
-    }
-
-    export interface TargetClusterUsage {
-        Name: string;
-        Description: string;
-        ComponentUsages: ComponentUsages;
-    }
-
-    export interface TargetClusterUsages {
-        TargetClusterUsage: TargetClusterUsage[];
-    }
-
-    export interface Response {
-        Exceptions: Exceptions;
-        TargetClusterUsages: TargetClusterUsages;
-    }
-}
-
-export namespace GetTargetClusterUsageEx {
-
-    export interface DiskUsage {
-        Name: string;
-        Path: string;
-        Description: string;
-        InUse: number;
-        Available: number;
+    export interface DiskUsage extends WsMachine.DiskUsage {
         Total: number;
-        PercentAvailable: number;
         PercentUsed: number;
     }
 
-    export interface MachineUsage {
-        Name: string;
-        NetAddress: string;
-        Description: string;
+    export interface MachineUsage extends Omit<WsMachine.MachineUsage, "DiskUsages"> {
         DiskUsages: DiskUsage[];
         mean: number;
         max: number;
     }
 
-    export interface ComponentUsage {
-        Type: string;
-        Name: string;
-        Description: string;
+    export interface ComponentUsage extends Omit<WsMachine.ComponentUsage, "MachineUsages"> {
         MachineUsages: MachineUsage[];
         MachineUsagesDescription: string;
         mean: number;
         max: number;
     }
 
-    export interface TargetClusterUsage {
-        Name: string;
-        Description: string;
+    export interface TargetClusterUsage extends Omit<WsMachine.TargetClusterUsage, "ComponentUsages"> {
         ComponentUsages: ComponentUsage[];
         ComponentUsagesDescription: string;
         mean: number;
         max: number;
     }
-}
-
-export class MachineService {
-    private _connection: ESPConnection;
 
-    constructor(optsConnection: IOptions | IConnection) {
-        this._connection = new ESPConnection(optsConnection, "ws_machine", "1.13");
-    }
+}
 
-    GetTargetClusterInfo(request: GetTargetClusterInfo.Request = {}): Promise<GetTargetClusterInfo.Response> {
-        return this._connection.send("GetTargetClusterInfo", request);
-    }
+export class MachineService extends MachineServiceBase {
 
-    GetTargetClusterUsage(targetClusters?: string[], bypassCachedResult: boolean = false): Promise<GetTargetClusterUsage.TargetClusterUsage[]> {
-        return this._connection.send("GetTargetClusterUsage", {
-            TargetClusters: targetClusters ? { Item: targetClusters } : {},
-            BypassCachedResult: bypassCachedResult
-        }).then(response => {
+    GetTargetClusterUsageEx(request: WsMachine.GetTargetClusterUsageRequest): Promise<WsMachineEx.TargetClusterUsage[]> {
+        return this._connection.send("GetTargetClusterUsage", request).then(response => {
             return exists("TargetClusterUsages.TargetClusterUsage", response) ? response.TargetClusterUsages.TargetClusterUsage : [];
-        });
-    }
-
-    GetTargetClusterUsageEx(targetClusters?: string[], bypassCachedResult: boolean = false): Promise<GetTargetClusterUsageEx.TargetClusterUsage[]> {
-        return this.GetTargetClusterUsage(targetClusters, bypassCachedResult).then(response => {
+        }).then(response => {
             return response.filter(tcu => !!tcu.ComponentUsages).map(tcu => {
-                const ComponentUsages: GetTargetClusterUsageEx.ComponentUsage[] = tcu.ComponentUsages.ComponentUsage.map(cu => {
-                    const MachineUsages = (cu.MachineUsages && cu.MachineUsages.MachineUsage ? cu.MachineUsages.MachineUsage : []).map(mu => {
-                        const DiskUsages: GetTargetClusterUsageEx.DiskUsage[] = mu.DiskUsages && mu.DiskUsages.DiskUsage ? mu.DiskUsages.DiskUsage.map(du => {
+                const ComponentUsages: WsMachineEx.ComponentUsage[] = tcu.ComponentUsages.ComponentUsage.map(cu => {
+                    const MachineUsages: WsMachineEx.MachineUsage[] = (cu.MachineUsages && cu.MachineUsages.MachineUsage ? cu.MachineUsages.MachineUsage : []).map(mu => {
+                        const DiskUsages: WsMachineEx.DiskUsage[] = mu.DiskUsages && mu.DiskUsages.DiskUsage ? mu.DiskUsages.DiskUsage.map(du => {
                             return {
                                 ...du,
                                 Total: du.InUse + du.Available,

package/src/services/wsResources.ts

@@ -0,0 +1,8 @@
+import { ResourcesServiceBase, WsResources } from "./wsdl/WsResources/v1.01/WsResources";
+
+export {
+    WsResources
+};
+
+export class ResourcesService extends ResourcesServiceBase {
+}