@hpcc-js/comms 2.77.0 → 2.78.2

package/lib-es6/services/wsdl/ws_logaccess/v1.02/ws_logaccess.js

@@ -0,0 +1,47 @@
+import { __extends } from "tslib";
+import { Service } from "../../../../espConnection";
+export var WsLogaccess;
+(function (WsLogaccess) {
+    var LogAccessType;
+    (function (LogAccessType) {
+        LogAccessType[LogAccessType["All"] = 0] = "All";
+        LogAccessType[LogAccessType["ByJobIdID"] = 1] = "ByJobIdID";
+        LogAccessType[LogAccessType["ByComponent"] = 2] = "ByComponent";
+        LogAccessType[LogAccessType["ByLogType"] = 3] = "ByLogType";
+        LogAccessType[LogAccessType["ByTargetAudience"] = 4] = "ByTargetAudience";
+        LogAccessType[LogAccessType["BySourceInstance"] = 5] = "BySourceInstance";
+        LogAccessType[LogAccessType["BySourceNode"] = 6] = "BySourceNode";
+        LogAccessType[LogAccessType["ByFieldName"] = 7] = "ByFieldName";
+    })(LogAccessType = WsLogaccess.LogAccessType || (WsLogaccess.LogAccessType = {}));
+    var LogAccessFilterOperator;
+    (function (LogAccessFilterOperator) {
+        LogAccessFilterOperator[LogAccessFilterOperator["NONE"] = 0] = "NONE";
+        LogAccessFilterOperator[LogAccessFilterOperator["AND"] = 1] = "AND";
+        LogAccessFilterOperator[LogAccessFilterOperator["OR"] = 2] = "OR";
+    })(LogAccessFilterOperator = WsLogaccess.LogAccessFilterOperator || (WsLogaccess.LogAccessFilterOperator = {}));
+    var LogSelectColumnMode;
+    (function (LogSelectColumnMode) {
+        LogSelectColumnMode[LogSelectColumnMode["MIN"] = 0] = "MIN";
+        LogSelectColumnMode[LogSelectColumnMode["DEFAULT"] = 1] = "DEFAULT";
+        LogSelectColumnMode[LogSelectColumnMode["ALL"] = 2] = "ALL";
+        LogSelectColumnMode[LogSelectColumnMode["CUSTOM"] = 3] = "CUSTOM";
+    })(LogSelectColumnMode = WsLogaccess.LogSelectColumnMode || (WsLogaccess.LogSelectColumnMode = {}));
+})(WsLogaccess || (WsLogaccess = {}));
+var LogaccessServiceBase = /** @class */ (function (_super) {
+    __extends(LogaccessServiceBase, _super);
+    function LogaccessServiceBase(optsConnection) {
+        return _super.call(this, optsConnection, "ws_logaccess", "1.02") || this;
+    }
+    LogaccessServiceBase.prototype.GetLogAccessInfo = function (request) {
+        return this._connection.send("GetLogAccessInfo", request);
+    };
+    LogaccessServiceBase.prototype.GetLogs = function (request) {
+        return this._connection.send("GetLogs", request);
+    };
+    LogaccessServiceBase.prototype.Ping = function (request) {
+        return this._connection.send("Ping", request);
+    };
+    return LogaccessServiceBase;
+}(Service));
+export { LogaccessServiceBase };
+//# sourceMappingURL=ws_logaccess.js.map

package/lib-es6/services/wsdl/ws_logaccess/v1.02/ws_logaccess.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ws_logaccess.js","sourceRoot":"","sources":["../../../../../src/services/wsdl/ws_logaccess/v1.02/ws_logaccess.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAEpD,MAAM,KAAW,WAAW,CAyI3B;AAzID,WAAiB,WAAW;IAMxB,IAAY,aASX;IATD,WAAY,aAAa;QACrB,+CAAO,CAAA;QACP,2DAAa,CAAA;QACb,+DAAe,CAAA;QACf,2DAAa,CAAA;QACb,yEAAoB,CAAA;QACpB,yEAAoB,CAAA;QACpB,iEAAgB,CAAA;QAChB,+DAAe,CAAA;IACnB,CAAC,EATW,aAAa,GAAb,yBAAa,KAAb,yBAAa,QASxB;IAED,IAAY,uBAIX;IAJD,WAAY,uBAAuB;QAC/B,qEAAQ,CAAA;QACR,mEAAO,CAAA;QACP,iEAAM,CAAA;IACV,CAAC,EAJW,uBAAuB,GAAvB,mCAAuB,KAAvB,mCAAuB,QAIlC;IAED,IAAY,mBAKX;IALD,WAAY,mBAAmB;QAC3B,2DAAO,CAAA;QACP,mEAAW,CAAA;QACX,2DAAO,CAAA;QACP,iEAAU,CAAA;IACd,CAAC,EALW,mBAAmB,GAAnB,+BAAmB,KAAnB,+BAAmB,QAK9B;AA6GL,CAAC,EAzIgB,WAAW,KAAX,WAAW,QAyI3B;AAED;IAA0C,wCAAO;IAE7C,8BAAY,cAAsC;eAC9C,kBAAM,cAAc,EAAE,cAAc,EAAE,MAAM,CAAC;IACjD,CAAC;IAED,+CAAgB,GAAhB,UAAiB,OAA4C;QACzD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAED,sCAAO,GAAP,UAAQ,OAAmC;QACvC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,mCAAI,GAAJ,UAAK,OAA4C;QAC7C,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAEL,2BAAC;AAAD,CAAC,AAlBD,CAA0C,OAAO,GAkBhD"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/comms",
-    "version": "2.77.0",
+    "version": "2.78.2",
     "description": "hpcc-js - Communications",
     "main": "dist/index.node.js",
     "module": "dist/index.es6",
@@ -61,7 +61,7 @@
     },
     "dependencies": {
         "@hpcc-js/ddl-shim": "^2.19.1",
-        "@hpcc-js/util": "^2.47.1",
+        "@hpcc-js/util": "^2.48.0",
         "@xmldom/xmldom": "0.8.2",
         "abort-controller": "3.0.0",
         "node-fetch": "2.6.7",
@@ -92,5 +92,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "f0688c1ec5caf09f8b18dd57539cf91b86265770"
+    "gitHead": "8d068b051ff1c18a57fd38fec3fa3517c77780ee"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/comms";
-export const PKG_VERSION = "2.77.0";
-export const BUILD_VERSION = "2.103.3";
+export const PKG_VERSION = "2.78.2";
+export const BUILD_VERSION = "2.103.6";

package/src/ecl/logicalFile.ts

@@ -1,6 +1,6 @@
 import { Cache, StateObject } from "@hpcc-js/util";
 import { IConnection, IOptions } from "../connection";
-import { DFUService, WsDfu, DFUDefFileFormat, base64Binary } from "../services/wsDFU";
+import { DFUService, WsDfu } from "../services/wsDFU";
 
 export class LogicalFileCache extends Cache<{ BaseUrl: string, Cluster: string, Name: string }, LogicalFile> {
     constructor() {
@@ -72,7 +72,7 @@ export class LogicalFile extends StateObject<FileDetailEx, FileDetailEx> impleme
     get IsCompressed(): boolean { return this.get("IsCompressed"); }
     get BrowseData(): boolean { return this.get("BrowseData"); }
     get jsonInfo(): string { return this.get("jsonInfo"); }
-    get binInfo(): base64Binary { return this.get("binInfo"); }
+    get binInfo(): WsDfu.base64Binary { return this.get("binInfo"); }
     get PackageID(): string { return this.get("PackageID"); }
     get Partition(): WsDfu.Partition { return this.get("Partition"); }
     get Blooms(): WsDfu.Blooms { return this.get("Blooms"); }
@@ -81,6 +81,7 @@ export class LogicalFile extends StateObject<FileDetailEx, FileDetailEx> impleme
     get IsRestricted(): boolean { return this.get("IsRestricted"); }
     get AtRestCost(): number { return this.get("AtRestCost"); }
     get AccessCost(): number { return this.get("AccessCost"); }
+    get ExpirationDate(): string { return this.get("ExpirationDate"); }
 
     get properties(): FileDetailEx { return this.get(); }
 
@@ -147,7 +148,7 @@ export class LogicalFile extends StateObject<FileDetailEx, FileDetailEx> impleme
         });
     }
 
-    fetchDefFile(format: DFUDefFileFormat): Promise<string> {
+    fetchDefFile(format: WsDfu.DFUDefFileFormat): Promise<string> {
         return this.connection.DFUFile({ Name: this.Name, Format: format });
     }
 

package/src/services/wsCloud.ts

@@ -6,7 +6,7 @@ export {
 
 export class CloudService extends CloudServiceBase {
 
-    getPODs(): Promise<any[]> {
+    getPODs(): Promise<object[]> {
         return super.GetPODs({}).then((response) => {
             try {
                 const obj = typeof response.Result === "string" ? JSON.parse(response.Result) : response.Result;

package/src/services/wsDFU.ts

@@ -1,14 +1,13 @@
-import {
-    DfuServiceBase, WsDfu, DFUArrayActions, DFUChangeProtection, DFUChangeRestriction,
-    DFUDefFileFormat, FileAccessRole, SecAccessType, DFUFileType,
-    base64Binary
-} from "./wsdl/WsDfu/v1.63/WsDfu";
+import { DfuServiceBase, WsDfu } from "./wsdl/WsDfu/v1.63/WsDfu";
 
-export {
-    WsDfu, DFUArrayActions, DFUChangeProtection, DFUChangeRestriction,
-    DFUDefFileFormat, FileAccessRole, SecAccessType, DFUFileType,
-    base64Binary
-};
+export { WsDfu };
+
+export const DFUArrayActions = WsDfu.DFUArrayActions;
+export const DFUDefFileFormat = WsDfu.DFUDefFileFormat;
+export const DFUChangeProtection = WsDfu.DFUChangeProtection;
+export const DFUChangeRestriction = WsDfu.DFUChangeRestriction;
+
+export type base64Binary = WsDfu.base64Binary;
 
 export class DFUService extends DfuServiceBase {
 

package/src/services/wsLogaccess.ts

@@ -1,8 +1,150 @@
-import { LogaccessServiceBase, WsLogaccess, LogAccessType } from "./wsdl/ws_logaccess/v1/ws_logaccess";
+import { scopedLogger } from "@hpcc-js/util";
+import { LogaccessServiceBase, WsLogaccess } from "./wsdl/ws_logaccess/v1.02/ws_logaccess";
+
+const logger = scopedLogger("@hpcc-js/comms/services/wsLogaccess.ts");
 
 export {
-    WsLogaccess, LogAccessType
+    WsLogaccess
+};
+
+export enum KnownColumns {
+    audience = "hpcc.log.audience",
+    class = "hpcc.log.class",
+    jobId = "hpcc.log.jobid",
+    message = "hpcc.log.message",
+    procId = "hpcc.log.procid",
+    sequence = "hpcc.log.sequence",
+    threadId = "hpcc.log.threadid",
+    timestamp = "hpcc.log.timestamp",
+    containerName = "kubernetes.container.name"
+}
+
+const RKnownColumns: { [key: string]: string } = {};
+for (const key in KnownColumns) {
+    if (KnownColumns.hasOwnProperty(key)) {
+        RKnownColumns[KnownColumns[key]] = key;
+    }
+}
+
+export interface GetLogsExRequest {
+    audience?: string;
+    class?: string;
+    jobId?: string;
+    message?: string;
+    procId?: string;
+    sequence?: string;
+    threadId?: string;
+    timestamp?: string;
+    containerName?: string;
+    StartDate?: Date;
+    EndDate?: Date;
+    LogLineStartFrom: number,
+    LogLineLimit: number
+}
+
+export interface LogLine {
+    audience?: string;
+    class?: string;
+    jobId?: string;
+    message?: string;
+    procId?: number;
+    sequence?: string;
+    threadId?: number;
+    timestamp?: string;
+    containerName?: string;
+}
+
+const defaultToLogLine = (line?: any): LogLine => {
+    const retVal: LogLine = {};
+    for (const key in RKnownColumns) {
+        retVal[RKnownColumns[key]] = line?.fields[0][key];
+    }
+    return retVal;
 };
 
+export interface GetLogsExResponse {
+    lines: LogLine[],
+    total: number,
+}
+
 export class LogaccessService extends LogaccessServiceBase {
-}
+
+    GetLogAccessInfo(request: WsLogaccess.GetLogAccessInfoRequest): Promise<WsLogaccess.GetLogAccessInfoResponse> {
+        return super.GetLogAccessInfo(request);
+    }
+
+    GetLogs(request: WsLogaccess.GetLogsRequest): Promise<WsLogaccess.GetLogsResponse> {
+        return super.GetLogs(request);
+    }
+
+    GetLogsEx(request: GetLogsExRequest): Promise<GetLogsExResponse> {
+        const getLogsRequest: WsLogaccess.GetLogsRequest = {
+            Filter: {
+                leftBinaryFilter: {
+                    BinaryLogFilter: [{
+                        leftFilter: {
+                            LogCategory: WsLogaccess.LogAccessType.All,
+                        } as WsLogaccess.leftFilter,
+                    } as WsLogaccess.BinaryLogFilter]
+                }
+            },
+            Range: {
+                StartDate: new Date(0).toISOString(),
+            },
+            LogLineStartFrom: request.LogLineStartFrom ?? 0,
+            LogLineLimit: request.LogLineLimit ?? 100,
+            SelectColumnMode: WsLogaccess.LogSelectColumnMode.DEFAULT,
+            Format: "JSON"
+        };
+
+        const filters: WsLogaccess.leftFilter[] = [];
+        for (const key in request) {
+            if (key in KnownColumns) {
+                filters.push({
+                    LogCategory: WsLogaccess.LogAccessType.ByFieldName,
+                    SearchField: KnownColumns[key],
+                    SearchByValue: request[key]
+                });
+            }
+        }
+
+        let binaryLogFilter = getLogsRequest.Filter.leftBinaryFilter.BinaryLogFilter[0];
+        filters.forEach((filter, i) => {
+            if (i === 0) {
+                binaryLogFilter.leftFilter = filter;
+            } else if (i === filters.length - 1) {
+                binaryLogFilter.Operator = WsLogaccess.LogAccessFilterOperator.AND;
+                binaryLogFilter.rightFilter = filter;
+            } else {
+                binaryLogFilter.Operator = WsLogaccess.LogAccessFilterOperator.AND;
+                binaryLogFilter.rightBinaryFilter = {
+                    BinaryLogFilter: [{
+                        leftFilter: filter
+                    } as WsLogaccess.BinaryLogFilter]
+                };
+                binaryLogFilter = binaryLogFilter.rightBinaryFilter.BinaryLogFilter[0];
+            }
+        });
+
+        if (request.StartDate && request.EndDate) {
+            getLogsRequest.Range.StartDate = request.StartDate.toISOString();
+            getLogsRequest.Range.EndDate = request.EndDate.toISOString();
+        }
+
+        return this.GetLogs(getLogsRequest).then(response => {
+            try {
+                const logLines = JSON.parse(response.LogLines);
+                return {
+                    lines: logLines.lines?.map(defaultToLogLine) ?? [],
+                    total: response.TotalLogLinesAvailable ?? 10000
+                };
+            } catch (e) {
+                logger.error(e);
+            }
+            return {
+                lines: [],
+                total: 0
+            };
+        });
+    }
+}

package/src/services/wsWorkunits.ts

@@ -1854,6 +1854,64 @@ export namespace WUQuerySetAliasAction {
     }
 }
 
+export namespace WUQueryFiles {
+    export interface Request {
+        Target: string;
+        QueryId: string;
+    }
+
+    export interface Exception {
+        Code: string;
+        Audience: string;
+        Source: string;
+        Message: string;
+    }
+
+    export interface Exceptions {
+        Source: string;
+        Exception: Exception[];
+    }
+
+    export interface File {
+        Error: string;
+        LogicalName: string;
+    }
+
+    export interface Files {
+        File: File[];
+    }
+
+    export interface SubFiles {
+        File: string[];
+    }
+
+    export interface SuperFile {
+        Name: string;
+        SubFiles: SubFiles;
+        SuperFiles: SuperFiles;
+    }
+
+    export interface SuperFiles {
+        SuperFile: SuperFile[];
+    }
+
+    export interface QueryUsingFile {
+        Id: string;
+        Package: string;
+    }
+
+    export interface Queries {
+        QueryUsingFile: QueryUsingFile[];
+    }
+
+    export interface Response {
+        Exceptions: Exceptions;
+        Files: Files;
+        SuperFiles: SuperFiles;
+        Queries: Queries;
+    }
+}
+
 export namespace WUPublishWorkunit {
     export interface Request {
         Wuid: string;
@@ -2663,6 +2721,10 @@ export class WorkunitsService extends Service {
         return this._connection.send("WUPublishWorkunit", request);
     }
 
+    WUQueryFiles(request: WUQueryFiles.Request): Promise<WUQueryFiles.Response> {
+        return this._connection.send("WUQueryFiles", request);
+    }
+
     WUGetGraph(request: WUGetGraph.Request): Promise<WUGetGraph.Response> {
         return this._connection.send("WUGetGraph", request);
     }