@hpcc-js/comms 2.73.5 → 2.76.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/comms",
-    "version": "2.73.5",
+    "version": "2.76.0",
     "description": "hpcc-js - Communications",
     "main": "dist/index.node.js",
     "module": "dist/index.es6",
@@ -32,28 +32,37 @@
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
         "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
-        "lint": "eslint src/**/*.ts",
+        "lint": "eslint ./src",
         "lint-fix": "eslint --fix src/**/*.ts",
         "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-cloud": "node ./lib-cjs/index.js --url=http://localhost:8010/WsCloud?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-elk": "node ./lib-cjs/index.js --url=http://localhost:8010/ws_elk?wsdl --outDir=./src/services/wsdl",
+        "wsdl-esdlconfig": "node ./lib-cjs/index.js --url=http://localhost:8010/ws_esdlconfig?wsdl --outDir=./src/services/wsdl",
+        "wsdl-fileio": "node ./lib-cjs/index.js --url=http://localhost:8010/WsFileIO?wsdl --outDir=./src/services/wsdl",
+        "wsdl-filespray": "node ./lib-cjs/index.js --url=http://localhost:8010/FileSpray?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-packageprocess": "node ./lib-cjs/index.js --url=http://localhost:8010/WsPackageProcess?wsdl --outDir=./src/services/wsdl",
         "wsdl-smc": "node ./lib-cjs/index.js --url=http://localhost:8010/WsSMC?wsdl --outDir=./src/services/wsdl",
+        "wsdl-resources": "node ./lib-cjs/index.js --url=http://localhost:8010/ws_resources?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-all": "npm-run-all --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 --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.0",
-        "@hpcc-js/util": "^2.46.1",
-        "@xmldom/xmldom": "0.8.1",
+        "@hpcc-js/ddl-shim": "^2.19.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",
@@ -64,7 +73,6 @@
         "@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",
@@ -83,5 +91,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "3b3ce2f997c7798f94d88bd5dcfb79697ca51496"
+    "gitHead": "b7c5d9a853196b53078d665df4368629a1a87903"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/comms";
-export const PKG_VERSION = "2.73.5";
-export const BUILD_VERSION = "2.102.7";
+export const PKG_VERSION = "2.76.0";
+export const BUILD_VERSION = "2.103.1";

package/src/__tests__/https.ts

@@ -44,9 +44,9 @@ describe("https", () => {
         return fetch("https://jsonplaceholder.typicode.com/todos/1").then(response => {
             return response.json();
         }).then(json => {
-            console.log(json);
+            console.info(json);
         }).catch(e => {
-            console.log(e.message);
+            console.info(e.message);
             throw e;
         });
 

package/src/__tests__/workunit.ts

@@ -30,6 +30,6 @@ describe("Workunit", () => {
         expect(wus).to.have.length;
         expect(wus.length).to.be.greaterThan(0);
         const names = await wus[0].fetchServiceNames();
-        console.log(names);
+        console.info(names);
     });
 });

package/src/clienttools/eclcc.ts

@@ -197,7 +197,6 @@ export class EnvchkErrors extends Errors {
             for (const line of this._lines) {
                 const testStr = "<" + pathParts[0];
                 if (line.indexOf(testStr + " ") >= 0 || line.indexOf(testStr + ">") >= 0) {
-                    console.log(lineIdx, testStr);
                     pathParts.shift();
                     if (pathParts.length === 0) {
                         return [lineIdx + 1, line.indexOf(testStr) + 1];

package/src/ecl/graph.ts

@@ -147,7 +147,7 @@ export function createGraph(scopes: BaseScope[]): ScopeGraph {
                     scopeStack.pop();
                 }
                 if (!scopeParent1) {
-                    console.log(`Missing SG:Parent (${scope.Id}): ${scope.parentScope()}`);
+                    console.warn(`Missing SG:Parent (${scope.Id}): ${scope.parentScope()}`);
                 } else {
                     const parent1: ScopeSubgraph = scopeParent1;
                     subgraphs[scope.ScopeName] = parent1.createSubgraph(scope);
@@ -156,7 +156,7 @@ export function createGraph(scopes: BaseScope[]): ScopeGraph {
             case "activity":
                 const scopeParent2 = subgraphs[scope.parentScope()];
                 if (!scopeParent2) {
-                    console.log(`Missing A:Parent (${scope.Id}): ${scope.parentScope()}`);
+                    console.warn(`Missing A:Parent (${scope.Id}): ${scope.parentScope()}`);
                 } else {
                     vertices[scope.ScopeName] = scopeParent2.createVertex(scope);
                 }
@@ -167,7 +167,7 @@ export function createGraph(scopes: BaseScope[]): ScopeGraph {
             case "function":
                 const scopeParent3 = vertices[scope.parentScope()];
                 if (!scopeParent3) {
-                    console.log(`Missing F:Parent (${scope.Id}): ${scope.parentScope()}`);
+                    console.warn(`Missing F:Parent (${scope.Id}): ${scope.parentScope()}`);
                 } else {
                     scopeParent3._.children().push(scope);
                 }
@@ -178,7 +178,7 @@ export function createGraph(scopes: BaseScope[]): ScopeGraph {
         const scope = edges[id];
         const scopeParent3 = subgraphs[scope.parentScope()];
         if (!scopeParent3) {
-            console.log(`Missing E:Parent (${scope.Id}): ${scope.parentScope()}`);
+            console.warn(`Missing E:Parent (${scope.Id}): ${scope.parentScope()}`);
         } else {
             const parent3: ScopeSubgraph = scopeParent3;
             try {
@@ -188,7 +188,7 @@ export function createGraph(scopes: BaseScope[]): ScopeGraph {
             } catch (e) {
                 // const sourceIndex = scope.attr("SourceIndex").RawValue;
                 // const targetIndex = scope.attr("TargetIndex").RawValue;
-                console.log(`Invalid Edge: ${id}`);
+                console.warn(`Invalid Edge: ${id}`);
             }
         }
     }

package/src/ecl/logicalFile.ts

@@ -1,6 +1,6 @@
 import { Cache, StateObject } from "@hpcc-js/util";
 import { IConnection, IOptions } from "../connection";
-import { DFUService, WsDfu } from "../services/wsDFU";
+import { DFUService, WsDfu, DFUDefFileFormat, base64Binary } from "../services/wsDFU";
 
 export class LogicalFileCache extends Cache<{ BaseUrl: string, Cluster: string, Name: string }, LogicalFile> {
     constructor() {
@@ -60,7 +60,7 @@ export class LogicalFile extends StateObject<FileDetailEx, FileDetailEx> impleme
     get DFUFilePartsOnClusters(): WsDfu.DFUFilePartsOnClusters { return this.get("DFUFilePartsOnClusters"); }
     get isSuperfile(): boolean { return this.get("isSuperfile"); }
     get ShowFileContent(): boolean { return this.get("ShowFileContent"); }
-    get subfiles(): WsDfu.Subfiles { return this.get("subfiles"); }
+    get subfiles(): WsDfu.subfiles { return this.get("subfiles"); }
     get Superfiles(): WsDfu.Superfiles { return this.get("Superfiles"); }
     get ProtectList(): WsDfu.ProtectList { return this.get("ProtectList"); }
     get FromRoxieCluster(): boolean { return this.get("FromRoxieCluster"); }
@@ -72,14 +72,15 @@ 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(): string { return this.get("binInfo"); }
+    get binInfo(): 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"); }
     get ExpireDays(): number { return this.get("ExpireDays"); }
     get KeyType(): string { return this.get("KeyType"); }
     get IsRestricted(): boolean { return this.get("IsRestricted"); }
-    get Cost(): number { return this.get("Cost"); }
+    get AtRestCost(): number { return this.get("AtRestCost"); }
+    get AccessCost(): number { return this.get("AccessCost"); }
 
     get properties(): FileDetailEx { return this.get(); }
 
@@ -146,11 +147,11 @@ export class LogicalFile extends StateObject<FileDetailEx, FileDetailEx> impleme
         });
     }
 
-    fetchDefFile(format: "def" | "xml"): Promise<string> {
+    fetchDefFile(format: DFUDefFileFormat): Promise<string> {
         return this.connection.DFUFile({ Name: this.Name, Format: format });
     }
 
-    fetchListHistory(): Promise<WsDfu.Origin2[]> {
+    fetchListHistory(): Promise<WsDfu.Origin[]> {
         return this.connection.ListHistory({ Name: this.Name }).then(response => {
             return response?.History?.Origin || [];
         });

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<any[]> {
+        return super.GetPODs({}).then((response) => {
+            try {
+                const obj = typeof response.Result === "string" ? JSON.parse(response.Result) : response.Result;
+                return obj?.items ?? [];
+
+            } catch (error) {
+                return [];
+            }
+        });
+    }
+}