@hpcc-js/comms 2.70.0 → 2.72.0

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, MachineServiceEx } from "../services/wsMachine";
 import { TopologyService, TpListTargetClusters, TpTargetClusterQuery } from "../services/wsTopology";
 import { Machine } from "./machine";
 
@@ -14,14 +14,14 @@ 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;
 export type ITargetClusterState = TpTargetClusterQuery.TpTargetCluster | TpListTargetClusters.TpClusterNameType | TpTargetClusterEx;
 export class TargetCluster extends StateObject<UTargetClusterState, ITargetClusterState> implements UTargetClusterState {
     protected connection: TopologyService;
-    protected machineConnection: MachineService;
+    protected machineConnection: MachineServiceEx;
     get BaseUrl() { return this.connection.baseUrl; }
 
     get Name(): string { return this.get("Name"); }
@@ -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));
     }
@@ -54,24 +54,24 @@ export class TargetCluster extends StateObject<UTargetClusterState, ITargetClust
         super();
         if (optsConnection instanceof TopologyService) {
             this.connection = optsConnection;
-            this.machineConnection = new MachineService(optsConnection.connectionOptions());
+            this.machineConnection = new MachineServiceEx(optsConnection.connectionOptions());
         } else {
             this.connection = new TopologyService(optsConnection);
-            this.machineConnection = new MachineService(optsConnection);
+            this.machineConnection = new MachineServiceEx(optsConnection);
         }
         this.clear({
             Name: name
         });
     }
 
-    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/index-common.ts

@@ -1,5 +1,6 @@
 export * from "./__package__";
 
+export * from "./services/wsAccess";
 export * from "./services/wsAccount";
 export * from "./services/wsCodesign";
 export * from "./services/wsDFU";

package/src/services/wsAccess.ts

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

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 { MachineService, 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 MachineServiceEx extends MachineService {
 
-    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,