@hpcc-js/comms 2.68.0 → 2.72.0

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,

package/src/services/wsResources.ts

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

package/src/services/wsdl/WsLogaccess/v1/WsLogaccess.ts

@@ -0,0 +1,78 @@
+import { IConnection, IOptions } from "../../../../connection";
+import { Service } from "../../../../espConnection";
+
+type dateTime = string;
+type unsignedInt = number;
+type long = number;
+
+export enum LogAccessType {
+    All = 0,
+    ByJobIdID = 1,
+    ByComponent = 2,
+    ByLogType = 3,
+    ByTargetAudience = 4
+}
+
+export namespace WsLogaccess {
+
+    export interface GetLogAccessInfoRequest {
+
+    }
+
+    export interface GetLogAccessInfoResponse {
+        RemoteLogManagerType: string;
+        RemoteLogManagerConnectionString: string;
+    }
+
+    export interface Range {
+        StartDate?: dateTime;
+        EndDate?: dateTime;
+    }
+
+    export interface Columns {
+        Item: string[];
+    }
+
+    export interface GetLogsRequest {
+        LogCategory?: LogAccessType;
+        SearchByValue?: string;
+        Range?: Range;
+        LogLineLimit?: unsignedInt;
+        LogLineStartFrom?: long;
+        Columns?: Columns;
+        Format?: string;
+    }
+
+    export interface GetLogsResponse {
+        LogLines: string;
+    }
+
+    export interface ws_logaccessPingRequest {
+
+    }
+
+    export interface ws_logaccessPingResponse {
+
+    }
+
+}
+
+export class LogaccessService extends Service {
+
+    constructor(optsConnection: IOptions | IConnection) {
+        super(optsConnection, "WsLogaccess", "1");
+    }
+
+    GetLogAccessInfo(request: WsLogaccess.GetLogAccessInfoRequest): Promise<WsLogaccess.GetLogAccessInfoResponse> {
+        return this._connection.send("GetLogAccessInfo", request);
+    }
+
+    GetLogs(request: WsLogaccess.GetLogsRequest): Promise<WsLogaccess.GetLogsResponse> {
+        return this._connection.send("GetLogs", request);
+    }
+
+    Ping(request: WsLogaccess.ws_logaccessPingRequest): Promise<WsLogaccess.ws_logaccessPingResponse> {
+        return this._connection.send("Ping", request);
+    }
+
+}

package/src/services/wsdl/WsResources/v1.01/WsResources.ts

@@ -0,0 +1,119 @@
+import { IConnection, IOptions } from "../../../../connection";
+import { Service } from "../../../../espConnection";
+
+type unsignedInt = number;
+
+export namespace WsResources {
+
+    export interface WsResourcesPingRequest {
+
+    }
+
+    export interface WsResourcesPingResponse {
+
+    }
+
+    export interface ServiceQueryRequest {
+        Type?: string;
+        Name?: string;
+    }
+
+    export interface Exception {
+        Code: string;
+        Audience: string;
+        Source: string;
+        Message: string;
+    }
+
+    export interface Exceptions {
+        Source: string;
+        Exception: Exception[];
+    }
+
+    export interface Service {
+        Name: string;
+        Type: string;
+        Port: unsignedInt;
+        TLSSecure: boolean;
+    }
+
+    export interface Services {
+        Service: Service[];
+    }
+
+    export interface ServiceQueryResponse {
+        Exceptions: {
+            Source: string;
+            Exception: Exception[];
+        };
+        Services: {
+            Service: Service[];
+        };
+    }
+
+    export interface WebLinksQueryRequest {
+
+    }
+
+    export interface NamedValue {
+        Name: string;
+        Value: string;
+    }
+
+    export interface Annotations {
+        NamedValue: NamedValue[];
+    }
+
+    export interface DiscoveredWebLink {
+        ServiceName: string;
+        NameSpace: string;
+        Annotations: {
+            NamedValue: NamedValue[];
+        };
+    }
+
+    export interface DiscoveredWebLinks {
+        DiscoveredWebLink: DiscoveredWebLink[];
+    }
+
+    export interface ConfiguredWebLink {
+        Name: string;
+        Description: string;
+        URL: string;
+    }
+
+    export interface ConfiguredWebLinks {
+        ConfiguredWebLink: ConfiguredWebLink[];
+    }
+
+    export interface WebLinksQueryResponse {
+        Exceptions: Exceptions;
+        DiscoveredWebLinks: {
+            DiscoveredWebLink: DiscoveredWebLink[];
+        };
+        ConfiguredWebLinks: {
+            ConfiguredWebLink: ConfiguredWebLink[];
+        };
+    }
+
+}
+
+export class ResourcesService extends Service {
+
+    constructor(optsConnection: IOptions | IConnection) {
+        super(optsConnection, "WsResources", "1.01");
+    }
+
+    Ping(request: WsResources.WsResourcesPingRequest): Promise<WsResources.WsResourcesPingResponse> {
+        return this._connection.send("Ping", request);
+    }
+
+    ServiceQuery(request: WsResources.ServiceQueryRequest): Promise<WsResources.ServiceQueryResponse> {
+        return this._connection.send("ServiceQuery", request);
+    }
+
+    WebLinksQuery(request: WsResources.WebLinksQueryRequest): Promise<WsResources.WebLinksQueryResponse> {
+        return this._connection.send("WebLinksQuery", request);
+    }
+
+}