@hpcc-js/comms 2.102.1 → 2.102.2

package/src/espConnection.ts

@@ -1,172 +1,172 @@
-import { join } from "@hpcc-js/util";
-import { createConnection, IConnection, IOptions, ResponseType } from "./connection";
-
-export type ESPResponseType = ResponseType | "json2" | "xsd";
-
-export function isArray(arg: any) {
-    return Object.prototype.toString.call(arg) === "[object Array]";
-}
-
-export interface Exception {
-    Code: number;
-    Message: string;
-}
-
-export interface Exceptions {
-    Source: string;
-    Exception: Exception[];
-}
-
-export class ESPExceptions extends Error implements Exceptions {
-    isESPExceptions = true;
-    action: string;
-    request: string;
-    Source: string;
-    Exception: Exception[];
-
-    constructor(action: string, request: any, exceptions: Exceptions) {
-        super("ESPException:  " + exceptions.Source);
-        this.action = action;
-        this.request = request;
-        this.Source = exceptions.Source;
-        this.Exception = exceptions.Exception;
-        if (exceptions.Exception.length) {
-            this.message = `${exceptions.Exception[0].Code}:  ${exceptions.Exception[0].Message}`;
-        } else {
-            this.message = "";
-        }
-    }
-}
-
-export function isExceptions(err: any): err is Exceptions {
-    return err instanceof ESPExceptions || (err.isESPExceptions && Array.isArray(err.Exception));
-}
-
-function isConnection(optsConnection: IOptions | IConnection): optsConnection is IConnection {
-    return (optsConnection as IConnection).send !== undefined;
-}
-
-export class ESPConnection implements IConnection {
-    private _connection: IConnection;
-    get baseUrl() { return this._connection.opts().baseUrl; }
-    private _service: string;
-    private _version: string;
-
-    constructor(optsConnection: IOptions | IConnection, service: string, version: string) {
-        this._connection = isConnection(optsConnection) ? optsConnection : createConnection(optsConnection);
-        this._service = service;
-        this._version = version;
-    }
-
-    service(): string;
-    service(_: string): ESPConnection;
-    service(_?: string): string | ESPConnection {
-        if (_ === void 0) return this._service;
-        this._service = _;
-        return this;
-    }
-
-    version(): string;
-    version(_: string): ESPConnection;
-    version(_?: string): string | ESPConnection {
-        if (_ === void 0) return this._version;
-        this._version = _;
-        return this;
-    }
-
-    toESPStringArray(target: any, arrayName: string): any {
-        if (isArray(target[arrayName])) {
-            for (let i = 0; i < target[arrayName].length; ++i) {
-                target[arrayName + "_i" + i] = target[arrayName][i];
-            }
-            delete target[arrayName];
-        }
-        return target;
-    }
-
-    //  IConnection  ---
-    opts(_: Partial<IOptions>): this;
-    opts(): IOptions;
-    opts(_?: Partial<IOptions>): this | IOptions {
-        if (_ === void 0) return this._connection.opts();
-        this._connection.opts(_);
-        return this;
-    }
-
-    send(action: string, _request: any = {}, espResponseType: ESPResponseType = "json", largeUpload: boolean = false, abortSignal?: AbortSignal, espResponseField?: string): Promise<any> {
-        const request = { ..._request, ...{ ver_: this._version } };
-        if (largeUpload) {
-            request["upload_"] = true;
-        }
-        if (abortSignal) {
-            request["abortSignal_"] = abortSignal;
-        }
-        let serviceAction: string;
-        let responseType: ResponseType = "json";
-        switch (espResponseType) {
-            case "text":
-                serviceAction = join(this._service, action);
-                responseType = "text";
-                break;
-            case "xsd":
-                serviceAction = join(this._service, action + ".xsd");
-                responseType = "text";
-                break;
-            case "json2":
-                serviceAction = join(this._service, action + "/json");
-                espResponseType = "json";
-                const actionParts = action.split("/");
-                action = actionParts.pop()!;
-                break;
-            default:
-                serviceAction = join(this._service, action + ".json");
-        }
-        return this._connection.send(serviceAction, request, responseType).then((response) => {
-            if (espResponseType === "json") {
-                let retVal;
-                if (response && response.Exceptions) {
-                    throw new ESPExceptions(action, request, response.Exceptions);
-                } else if (response) {
-                    retVal = response[espResponseField || (action + "Response")];
-                }
-                if (!retVal) {
-                    throw new ESPExceptions(action, request, {
-                        Source: "ESPConnection.send",
-                        Exception: [{ Code: 0, Message: "Missing Response" }]
-                    });
-                }
-                return retVal;
-            }
-            return response;
-        }).catch(e => {
-            if (e.isESPExceptions) {
-                throw e;
-            }
-            throw new ESPExceptions(action, request, {
-                Source: "ESPConnection.send",
-                Exception: [{ Code: 0, Message: e.message }]
-            });
-        });
-    }
-
-    clone() {
-        return new ESPConnection(this._connection.clone(), this._service, this._version);
-    }
-}
-
-export class Service {
-    protected _connection: ESPConnection;
-    get baseUrl() { return this._connection.opts().baseUrl; }
-
-    constructor(optsConnection: IOptions | IConnection, service: string, version: string) {
-        this._connection = new ESPConnection(optsConnection, service, version);
-    }
-
-    opts() {
-        return this._connection.opts();
-    }
-
-    connection(): ESPConnection {
-        return this._connection.clone();
-    }
-}
+import { join } from "@hpcc-js/util";
+import { createConnection, IConnection, IOptions, ResponseType } from "./connection";
+
+export type ESPResponseType = ResponseType | "json2" | "xsd";
+
+export function isArray(arg: any) {
+    return Object.prototype.toString.call(arg) === "[object Array]";
+}
+
+export interface Exception {
+    Code: number;
+    Message: string;
+}
+
+export interface Exceptions {
+    Source: string;
+    Exception: Exception[];
+}
+
+export class ESPExceptions extends Error implements Exceptions {
+    isESPExceptions = true;
+    action: string;
+    request: string;
+    Source: string;
+    Exception: Exception[];
+
+    constructor(action: string, request: any, exceptions: Exceptions) {
+        super("ESPException:  " + exceptions.Source);
+        this.action = action;
+        this.request = request;
+        this.Source = exceptions.Source;
+        this.Exception = exceptions.Exception;
+        if (exceptions.Exception.length) {
+            this.message = `${exceptions.Exception[0].Code}:  ${exceptions.Exception[0].Message}`;
+        } else {
+            this.message = "";
+        }
+    }
+}
+
+export function isExceptions(err: any): err is Exceptions {
+    return err instanceof ESPExceptions || (err.isESPExceptions && Array.isArray(err.Exception));
+}
+
+function isConnection(optsConnection: IOptions | IConnection): optsConnection is IConnection {
+    return (optsConnection as IConnection).send !== undefined;
+}
+
+export class ESPConnection implements IConnection {
+    private _connection: IConnection;
+    get baseUrl() { return this._connection.opts().baseUrl; }
+    private _service: string;
+    private _version: string;
+
+    constructor(optsConnection: IOptions | IConnection, service: string, version: string) {
+        this._connection = isConnection(optsConnection) ? optsConnection : createConnection(optsConnection);
+        this._service = service;
+        this._version = version;
+    }
+
+    service(): string;
+    service(_: string): ESPConnection;
+    service(_?: string): string | ESPConnection {
+        if (_ === void 0) return this._service;
+        this._service = _;
+        return this;
+    }
+
+    version(): string;
+    version(_: string): ESPConnection;
+    version(_?: string): string | ESPConnection {
+        if (_ === void 0) return this._version;
+        this._version = _;
+        return this;
+    }
+
+    toESPStringArray(target: any, arrayName: string): any {
+        if (isArray(target[arrayName])) {
+            for (let i = 0; i < target[arrayName].length; ++i) {
+                target[arrayName + "_i" + i] = target[arrayName][i];
+            }
+            delete target[arrayName];
+        }
+        return target;
+    }
+
+    //  IConnection  ---
+    opts(_: Partial<IOptions>): this;
+    opts(): IOptions;
+    opts(_?: Partial<IOptions>): this | IOptions {
+        if (_ === void 0) return this._connection.opts();
+        this._connection.opts(_);
+        return this;
+    }
+
+    send(action: string, _request: any = {}, espResponseType: ESPResponseType = "json", largeUpload: boolean = false, abortSignal?: AbortSignal, espResponseField?: string): Promise<any> {
+        const request = { ..._request, ...{ ver_: this._version } };
+        if (largeUpload) {
+            request["upload_"] = true;
+        }
+        if (abortSignal) {
+            request["abortSignal_"] = abortSignal;
+        }
+        let serviceAction: string;
+        let responseType: ResponseType = "json";
+        switch (espResponseType) {
+            case "text":
+                serviceAction = join(this._service, action);
+                responseType = "text";
+                break;
+            case "xsd":
+                serviceAction = join(this._service, action + ".xsd");
+                responseType = "text";
+                break;
+            case "json2":
+                serviceAction = join(this._service, action + "/json");
+                espResponseType = "json";
+                const actionParts = action.split("/");
+                action = actionParts.pop()!;
+                break;
+            default:
+                serviceAction = join(this._service, action + ".json");
+        }
+        return this._connection.send(serviceAction, request, responseType).then((response) => {
+            if (espResponseType === "json") {
+                let retVal;
+                if (response && response.Exceptions) {
+                    throw new ESPExceptions(action, request, response.Exceptions);
+                } else if (response) {
+                    retVal = response[espResponseField || (action + "Response")];
+                }
+                if (!retVal) {
+                    throw new ESPExceptions(action, request, {
+                        Source: "ESPConnection.send",
+                        Exception: [{ Code: 0, Message: "Missing Response" }]
+                    });
+                }
+                return retVal;
+            }
+            return response;
+        }).catch(e => {
+            if (e.isESPExceptions) {
+                throw e;
+            }
+            throw new ESPExceptions(action, request, {
+                Source: "ESPConnection.send",
+                Exception: [{ Code: 0, Message: e.message }]
+            });
+        });
+    }
+
+    clone() {
+        return new ESPConnection(this._connection.clone(), this._service, this._version);
+    }
+}
+
+export class Service {
+    protected _connection: ESPConnection;
+    get baseUrl() { return this._connection.opts().baseUrl; }
+
+    constructor(optsConnection: IOptions | IConnection, service: string, version: string) {
+        this._connection = new ESPConnection(optsConnection, service, version);
+    }
+
+    opts() {
+        return this._connection.opts();
+    }
+
+    connection(): ESPConnection {
+        return this._connection.clone();
+    }
+}

package/src/index-common.ts

@@ -1,41 +1,41 @@
-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/wsSasha";
-export * from "./services/wsSMC";
-export * from "./services/wsStore";
-export * from "./services/wsTopology";
-export * from "./services/wsWorkunits";
-
-export * from "./ecl/activity";
-export * from "./ecl/graph";
-export * from "./ecl/logicalFile";
-export * from "./ecl/machine";
-export * from "./ecl/query";
-export * from "./ecl/resource";
-export * from "./ecl/result";
-export * from "./ecl/scope";
-export * from "./ecl/sourceFile";
-export * from "./ecl/store";
-export * from "./ecl/timer";
-export * from "./ecl/topology";
-export * from "./ecl/targetCluster";
-export * from "./ecl/dfuWorkunit";
-export * from "./ecl/workunit";
-export * from "./ecl/xsdParser";
-
-export * from "./connection";
-export * from "./espConnection";
+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/wsSasha";
+export * from "./services/wsSMC";
+export * from "./services/wsStore";
+export * from "./services/wsTopology";
+export * from "./services/wsWorkunits";
+
+export * from "./ecl/activity";
+export * from "./ecl/graph";
+export * from "./ecl/logicalFile";
+export * from "./ecl/machine";
+export * from "./ecl/query";
+export * from "./ecl/resource";
+export * from "./ecl/result";
+export * from "./ecl/scope";
+export * from "./ecl/sourceFile";
+export * from "./ecl/store";
+export * from "./ecl/timer";
+export * from "./ecl/topology";
+export * from "./ecl/targetCluster";
+export * from "./ecl/dfuWorkunit";
+export * from "./ecl/workunit";
+export * from "./ecl/xsdParser";
+
+export * from "./connection";
+export * from "./espConnection";

package/src/index.node.ts

@@ -1,68 +1,68 @@
-// DOM Parser polyfill  ---
-import { root } from "@hpcc-js/util";
-import { DOMParser } from "@xmldom/xmldom";
-root.DOMParser = DOMParser;
-
-//  fetch polyfill  ---
-import fetch from "node-fetch";
-import * as https from "https";
-import { Agent, setGlobalDispatcher } from "undici";
-
-if (typeof root.fetch === "undefined") {
-    //  NodeJS < v18  ---
-    root.fetch = fetch;
-    root.fetch.__rejectUnauthorizedAgent = new https.Agent({
-        rejectUnauthorized: false
-    });
-} else {
-    //  NodeJS >= v18  ---
-    root.fetch.__defaultAgent = new Agent();
-    root.fetch.__rejectUnauthorizedAgent = new Agent({
-        connect: {
-            rejectUnauthorized: false
-        }
-    });
-    root.fetch.__setGlobalDispatcher = setGlobalDispatcher;
-}
-
-//  AbortController polyfill  ---
-import AbortController from "abort-controller";
-if (typeof root.AbortController === "undefined") {
-    root.AbortController = AbortController;
-}
-
-import { trustwave } from "./pem/trustwave";
-
-let globalCA = "";
-if (https.globalAgent.options.ca !== undefined) {
-    if (Array.isArray(https.globalAgent.options.ca) && https.globalAgent.options.ca.length) {
-        if (typeof https.globalAgent.options.ca[0] === "string") {
-            globalCA = https.globalAgent.options.ca.join("\n");
-        } else if (https.globalAgent.options.ca[0] instanceof Buffer) {
-            globalCA = https.globalAgent.options.ca.map(row => row.toString()).join("\n");
-        }
-    } else if (typeof https.globalAgent.options.ca === "string") {
-        globalCA = https.globalAgent.options.ca;
-    } else if (https.globalAgent.options.ca instanceof Buffer) {
-        globalCA = https.globalAgent.options.ca.toString();
-    }
-    globalCA += "\n";
-}
-
-root.fetch.__trustwaveAgent = new https.Agent({
-    ca: globalCA + trustwave
-});
-
-//  btoa polyfill  ---
-import { Buffer } from "safe-buffer";
-if (typeof root.btoa === "undefined") {
-    root.btoa = function (str: string) {
-        return Buffer.from(str || "", "utf8").toString("base64");
-    };
-}
-
-export * from "./index-common";
-
-//  Client Tools  ---
-export * from "./clienttools/eclcc";
-export * from "./clienttools/eclMeta";
+// DOM Parser polyfill  ---
+import { root } from "@hpcc-js/util";
+import { DOMParser } from "@xmldom/xmldom";
+root.DOMParser = DOMParser;
+
+//  fetch polyfill  ---
+import fetch from "node-fetch";
+import * as https from "https";
+import { Agent, setGlobalDispatcher } from "undici";
+
+if (typeof root.fetch === "undefined") {
+    //  NodeJS < v18  ---
+    root.fetch = fetch;
+    root.fetch.__rejectUnauthorizedAgent = new https.Agent({
+        rejectUnauthorized: false
+    });
+} else {
+    //  NodeJS >= v18  ---
+    root.fetch.__defaultAgent = new Agent();
+    root.fetch.__rejectUnauthorizedAgent = new Agent({
+        connect: {
+            rejectUnauthorized: false
+        }
+    });
+    root.fetch.__setGlobalDispatcher = setGlobalDispatcher;
+}
+
+//  AbortController polyfill  ---
+import AbortController from "abort-controller";
+if (typeof root.AbortController === "undefined") {
+    root.AbortController = AbortController;
+}
+
+import { trustwave } from "./pem/trustwave";
+
+let globalCA = "";
+if (https.globalAgent.options.ca !== undefined) {
+    if (Array.isArray(https.globalAgent.options.ca) && https.globalAgent.options.ca.length) {
+        if (typeof https.globalAgent.options.ca[0] === "string") {
+            globalCA = https.globalAgent.options.ca.join("\n");
+        } else if (https.globalAgent.options.ca[0] instanceof Buffer) {
+            globalCA = https.globalAgent.options.ca.map(row => row.toString()).join("\n");
+        }
+    } else if (typeof https.globalAgent.options.ca === "string") {
+        globalCA = https.globalAgent.options.ca;
+    } else if (https.globalAgent.options.ca instanceof Buffer) {
+        globalCA = https.globalAgent.options.ca.toString();
+    }
+    globalCA += "\n";
+}
+
+root.fetch.__trustwaveAgent = new https.Agent({
+    ca: globalCA + trustwave
+});
+
+//  btoa polyfill  ---
+import { Buffer } from "safe-buffer";
+if (typeof root.btoa === "undefined") {
+    root.btoa = function (str: string) {
+        return Buffer.from(str || "", "utf8").toString("base64");
+    };
+}
+
+export * from "./index-common";
+
+//  Client Tools  ---
+export * from "./clienttools/eclcc";
+export * from "./clienttools/eclMeta";

package/src/index.ts

@@ -1,3 +1,3 @@
-import "whatwg-fetch";
-
-export * from "./index-common";
+import "whatwg-fetch";
+
+export * from "./index-common";