@hpcc-js/comms 2.82.2 → 2.83.0

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");
+    }
 }

package/src/services/wsLogaccess.ts

@@ -126,7 +126,9 @@ export class LogaccessService extends LogaccessServiceBase {
         return super.GetLogs(request);
     }
 
-    GetLogsEx(request: GetLogsExRequest): Promise<GetLogsExResponse> {
+    async GetLogsEx(request: GetLogsExRequest): Promise<GetLogsExResponse> {
+        const logInfo = await this.GetLogAccessInfo();
+
         const getLogsRequest: WsLogaccess.GetLogsRequest = {
             Filter: {
                 leftBinaryFilter: {
@@ -148,23 +150,35 @@ export class LogaccessService extends LogaccessServiceBase {
 
         const filters: WsLogaccess.leftFilter[] = [];
         for (const key in request) {
-            if (key in ElasticKnownColumns) {
+            let 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(value => {
                         filters.push({
                             LogCategory: WsLogaccess.LogAccessType.ByFieldName,
-                            SearchField: ElasticKnownColumns[key],
+                            SearchField: searchField,
                             SearchByValue: value
                         });
                     });
                 } else {
                     filters.push({
                         LogCategory: WsLogaccess.LogAccessType.ByFieldName,
-                        SearchField: ElasticKnownColumns[key],
+                        SearchField: searchField,
                         SearchByValue: request[key]
                     });
                 }
-
             }
         }
 
@@ -224,11 +238,11 @@ export class LogaccessService extends LogaccessServiceBase {
             getLogsRequest.Range.EndDate = request.EndDate.toISOString();
         }
 
-        return Promise.all([this.GetLogAccessInfo(), this.GetLogs(getLogsRequest)]).then(([info, response]) => {
+        return this.GetLogs(getLogsRequest).then(response => {
             try {
                 const logLines = JSON.parse(response.LogLines);
                 let lines = [];
-                switch (info.RemoteLogManagerType) {
+                switch (logInfo.RemoteLogManagerType) {
                     case "azureloganalyticscurl":
                         lines = logLines.lines?.map(azureToLogLine) ?? [];
                         break;
@@ -236,7 +250,7 @@ export class LogaccessService extends LogaccessServiceBase {
                         lines = logLines.lines?.map(elasticToLogLine) ?? [];
                         break;
                     default:
-                        logger.warning(`Unknown RemoteLogManagerType: ${info.RemoteLogManagerType}`);
+                        logger.warning(`Unknown RemoteLogManagerType: ${logInfo.RemoteLogManagerType}`);
                         lines = [];
                 }
                 return {