@hpcc-js/comms 2.75.0 → 2.78.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/comms",
-    "version": "2.75.0",
+    "version": "2.78.0",
     "description": "hpcc-js - Communications",
     "main": "dist/index.node.js",
     "module": "dist/index.es6",
@@ -37,24 +37,32 @@
         "test": "mocha lib-umd/__tests__ --reporter spec",
         "docs": "typedoc --options tdoptions.json .",
         "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-dali": "node ./lib-cjs/index.js --url=http://localhost:8010/WsDali?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"
+        "wsdl-access": "node ./lib-cjs/index.js -k --url=http://localhost:8010/ws_access?wsdl --outDir=./src/services/wsdl",
+        "wsdl-account": "node ./lib-cjs/index.js -k --url=http://localhost:8010/Ws_Account?wsdl --outDir=./src/services/wsdl",
+        "wsdl-cloud": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsCloud?wsdl --outDir=./src/services/wsdl",
+        "wsdl-codesign": "node ./lib-cjs/index.js -k --url=http://localhost:8010/ws_codesign?wsdl --outDir=./src/services/wsdl",
+        "wsdl-dali": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsDali?wsdl --outDir=./src/services/wsdl",
+        "wsdl-dfu": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsDfu?wsdl --outDir=./src/services/wsdl",
+        "wsdl-dfuxref": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsDFUXRef?wsdl --outDir=./src/services/wsdl",
+        "wsdl-elk": "node ./lib-cjs/index.js -k --url=http://localhost:8010/ws_elk?wsdl --outDir=./src/services/wsdl",
+        "wsdl-esdlconfig": "node ./lib-cjs/index.js -k --url=http://localhost:8010/ws_esdlconfig?wsdl --outDir=./src/services/wsdl",
+        "wsdl-fileio": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsFileIO?wsdl --outDir=./src/services/wsdl",
+        "wsdl-filespray": "node ./lib-cjs/index.js -k --url=http://localhost:8010/FileSpray?wsdl --outDir=./src/services/wsdl",
+        "wsdl-logaccess": "node ./lib-cjs/index.js -k --url=http://localhost:8010/ws_logaccess?wsdl --outDir=./src/services/wsdl",
+        "wsdl-machine": "node ./lib-cjs/index.js -k --url=http://localhost:8010/ws_machine?wsdl --outDir=./src/services/wsdl",
+        "wsdl-packageprocess": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsPackageProcess?wsdl --outDir=./src/services/wsdl",
+        "wsdl-smc": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsSMC?wsdl --outDir=./src/services/wsdl",
+        "wsdl-resources": "node ./lib-cjs/index.js -k --url=http://localhost:8010/ws_resources?wsdl --outDir=./src/services/wsdl",
+        "wsdl-store": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsStore?wsdl --outDir=./src/services/wsdl",
+        "wsdl-topology": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsTopology?wsdl --outDir=./src/services/wsdl",
+        "wsdl-workunits": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsWorkunits?wsdl --outDir=./src/services/wsdl",
+        "wsdl-all": "npm-run-all --aggregate-output -c --serial compile-util --parallel wsdl-access wsdl-account wsdl-cloud wsdl-codesign wsdl-dali wsdl-dfu wsdl-dfuxref wsdl-elk wsdl-esdlconfig wsdl-fileio wsdl-filespray wsdl-logaccess wsdl-machine wsdl-packageprocess wsdl-smc wsdl-resources wsdl-store wsdl-topology wsdl-workunits",
+        "wsdl": "npm-run-all --aggregate-output -c --serial compile-util --parallel wsdl-access wsdl-account wsdl-cloud wsdl-codesign wsdl-dali wsdl-dfu wsdl-dfuxref wsdl-elk wsdl-fileio wsdl-filespray wsdl-logaccess wsdl-packageprocess wsdl-smc wsdl-store wsdl-topology wsdl-workunits"
     },
     "dependencies": {
         "@hpcc-js/ddl-shim": "^2.19.1",
-        "@hpcc-js/util": "^2.47.0",
-        "@xmldom/xmldom": "0.8.1",
+        "@hpcc-js/util": "^2.47.1",
+        "@xmldom/xmldom": "0.8.2",
         "abort-controller": "3.0.0",
         "node-fetch": "2.6.7",
         "safe-buffer": "5.2.1",
@@ -65,12 +73,12 @@
         "@types/d3-request": "1.0.6",
         "@types/d3-time-format": "2.3.1",
         "@types/node": "^10",
-        "@types/request": "0.0.47",
         "@types/xmldom": "0.1.31",
         "d3-array": "^1",
         "d3-time-format": "^2",
         "soap": "0.43.0",
         "tslib": "2.3.1",
+        "typescript-formatter": "^7.2.2",
         "whatwg-fetch": "3.6.2"
     },
     "repository": {
@@ -84,5 +92,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "33aa52bc641400d8fb3bfa51dcd4c94a9599fc90"
+    "gitHead": "74da8d8c2055c2df83cabab647f3a75449923ddb"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/comms";
-export const PKG_VERSION = "2.75.0";
-export const BUILD_VERSION = "2.103.0";
+export const PKG_VERSION = "2.78.0";
+export const BUILD_VERSION = "2.103.4";

package/src/index-common.ts

@@ -1,13 +1,18 @@
 export * from "./__package__";
 
+export * from "./services/fileSpray";
 export * from "./services/wsAccess";
 export * from "./services/wsAccount";
+export * from "./services/wsCloud";
 export * from "./services/wsCodesign";
+export * from "./services/wsDali";
 export * from "./services/wsDFU";
 export * from "./services/wsDFUXRef";
 export * from "./services/wsEcl";
+export * from "./services/wsElk";
 export * from "./services/wsLogaccess";
 export * from "./services/wsMachine";
+export * from "./services/wsPackageProcess";
 export * from "./services/wsResources";
 export * from "./services/wsSMC";
 export * from "./services/wsStore";

package/src/services/fileSpray.ts

@@ -0,0 +1,8 @@
+import { FileSprayServiceBase, FileSpray } from "./wsdl/FileSpray/v1.23/FileSpray";
+
+export {
+    FileSpray
+};
+
+export class FileSprayService extends FileSprayServiceBase {
+}

package/src/services/wsCloud.ts

@@ -0,0 +1,20 @@
+import { CloudServiceBase, WsCloud } from "./wsdl/WsCloud/v1/WsCloud";
+
+export {
+    WsCloud
+};
+
+export class CloudService extends CloudServiceBase {
+
+    getPODs(): Promise<object[]> {
+        return super.GetPODs({}).then((response) => {
+            try {
+                const obj = typeof response.Result === "string" ? JSON.parse(response.Result) : response.Result;
+                return obj?.items ?? [];
+
+            } catch (error) {
+                return [];
+            }
+        });
+    }
+}

package/src/services/wsDFU.ts

@@ -2,7 +2,7 @@ import {
     DfuServiceBase, WsDfu, DFUArrayActions, DFUChangeProtection, DFUChangeRestriction,
     DFUDefFileFormat, FileAccessRole, SecAccessType, DFUFileType,
     base64Binary
-} from "./wsdl/WsDfu/v1.62/WsDfu";
+} from "./wsdl/WsDfu/v1.63/WsDfu";
 
 export {
     WsDfu, DFUArrayActions, DFUChangeProtection, DFUChangeRestriction,

package/src/services/wsElk.ts

@@ -0,0 +1,8 @@
+import { ElkServiceBase, WsElk } from "./wsdl/ws_elk/v1/ws_elk";
+
+export {
+    WsElk
+};
+
+export class ElkService extends ElkServiceBase {
+}

package/src/services/wsLogaccess.ts

@@ -1,8 +1,150 @@
-import { LogaccessServiceBase, WsLogaccess } from "./wsdl/ws_logaccess/v1/ws_logaccess";
+import { scopedLogger } from "@hpcc-js/util";
+import { LogaccessServiceBase, WsLogaccess, LogAccessType, LogSelectColumnMode, LogAccessFilterOperator } from "./wsdl/ws_logaccess/v1.02/ws_logaccess";
+
+const logger = scopedLogger("@hpcc-js/comms/services/wsLogaccess.ts");
 
 export {
-    WsLogaccess
+    WsLogaccess, LogAccessType
+};
+
+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: LogAccessType.All,
+                        } as WsLogaccess.leftFilter,
+                    } as WsLogaccess.BinaryLogFilter]
+                }
+            },
+            Range: {
+                StartDate: new Date(0).toISOString(),
+            },
+            LogLineStartFrom: request.LogLineStartFrom ?? 0,
+            LogLineLimit: request.LogLineLimit ?? 100,
+            SelectColumnMode: LogSelectColumnMode.DEFAULT,
+            Format: "JSON"
+        };
+
+        const filters: WsLogaccess.leftFilter[] = [];
+        for (const key in request) {
+            if (key in KnownColumns) {
+                filters.push({
+                    LogCategory: 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 = LogAccessFilterOperator.AND;
+                binaryLogFilter.rightFilter = filter;
+            } else {
+                binaryLogFilter.Operator = 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/wsPackageProcess.ts

@@ -0,0 +1,8 @@
+import { PackageProcessServiceBase, WsPackageProcess } from "./wsdl/WsPackageProcess/v1.04/WsPackageProcess";
+
+export {
+    WsPackageProcess
+};
+
+export class PackageProcessService extends PackageProcessServiceBase {
+}