@hpcc-js/comms 3.1.0 → 3.3.0

package/package.json

@@ -1,18 +1,21 @@
 {
     "name": "@hpcc-js/comms",
-    "version": "3.1.0",
+    "version": "3.3.0",
     "description": "hpcc-js - Communications",
     "type": "module",
+    "main": "./dist/index.node.js",
+    "module": "./dist/index.browser.js",
     "exports": {
         ".": {
-            "types": "./types/index.node.d.ts",
+            "types": "./types/index.browser.d.ts",
             "node": "./dist/index.node.js",
-            "default": "./dist/index.js"
-        }
+            "import": "./dist/index.browser.js",
+            "require": "./dist/index.browser.umd.cjs"
+        },
+        "./dist/*": "./dist/*"
     },
-    "module": "./dist/index.node.js",
-    "browser": "./dist/index.js",
-    "types": "./types/index.node.d.ts",
+    "browser": "./dist/index.browser.umd.cjs",
+    "types": "./types/index.browser.d.ts",
     "files": [
         "dist/*",
         "src/*",
@@ -20,12 +23,13 @@
     ],
     "scripts": {
         "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
-        "bundle": "node esbuild.js",
-        "bundle-watch": "npm run bundle -- --development --watch",
+        "bundle-node": "node ./esbuild.js",
+        "bundle-browser": "vite build",
+        "bundle": "run-s bundle-browser bundle-node",
+        "bundle-watch": "vite",
         "gen-types": "tsc --project tsconfig.json",
         "gen-types-watch": "npm run gen-types -- --watch",
         "build": "run-p gen-types bundle",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "lint-fix": "eslint --fix src/**/*.ts",
         "docs": "typedoc --options tdoptions.json .",
@@ -33,8 +37,8 @@
         "test-node": "vitest run --project node",
         "test": "vitest run",
         "coverage": "vitest run --coverage",
-        "update": "npx -y npm-check-updates -u -t minor",
-        "update-major": "npx -y npm-check-updates -u",
+        "update": "npx --yes npm-check-updates -u -t minor",
+        "update-major": "npx --yes npm-check-updates -u",
         "wsdl-access": "node ./lib-esm/index.js -k --url=http://localhost:8010/ws_access?wsdl --outDir=./src/services/wsdl",
         "wsdl-account": "node ./lib-esm/index.js -k --url=http://localhost:8010/Ws_Account?wsdl --outDir=./src/services/wsdl",
         "wsdl-cloud": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsCloud?wsdl --outDir=./src/services/wsdl",
@@ -58,17 +62,18 @@
         "wsdl-all": "npm-run-all --aggregate-output -c --serial build --parallel wsdl-*"
     },
     "dependencies": {
-        "@hpcc-js/ddl-shim": "^2.22.0",
-        "@hpcc-js/util": "^3.1.0",
-        "@xmldom/xmldom": "0.9.4",
+        "@hpcc-js/util": "^3.3.0",
+        "@xmldom/xmldom": "0.9.5",
         "abort-controller": "3.0.0",
+        "data-uri-to-buffer": "6.0.2",
         "node-fetch": "3.3.2",
         "safe-buffer": "5.2.1",
         "tmp": "0.2.3",
-        "undici": "5.28.4"
+        "undici": "6.21.0"
     },
     "devDependencies": {
-        "@hpcc-js/esbuild-plugins": "^1.2.0",
+        "@hpcc-js/ddl-shim": "^3.0.0",
+        "@hpcc-js/esbuild-plugins": "^1.4.0",
         "@types/d3-request": "1.0.9",
         "@types/d3-time-format": "2.3.4",
         "@types/node": "^18",
@@ -90,5 +95,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "3f6146539f487dca08a35cdd5f94ca29609b4343"
+    "gitHead": "145a4d4c8189c70f08e9804e63959d6dd398bd9f"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/comms";
-export const PKG_VERSION = "3.1.0";
-export const BUILD_VERSION = "2.107.0";
+export const PKG_VERSION = "3.3.0";
+export const BUILD_VERSION = "3.3.0";

package/src/ecl/activity.ts

@@ -41,9 +41,7 @@ export class Activity extends StateObject<UActivityState, IActivityState> implem
             _activity = new Activity(optsConnection);
         }
         if (state) {
-            _activity.set({
-                ...state
-            });
+            _activity.set(state);
         }
         return _activity;
     }

package/src/ecl/logicalFile.ts

@@ -91,10 +91,13 @@ export class LogicalFile extends StateObject<FileDetailEx, FileDetailEx> impleme
 
     get properties(): FileDetailEx { return this.get(); }
 
-    static attach(optsConnection: IOptions | IConnection | DFUService, Cluster: string, Name: string): LogicalFile {
+    static attach(optsConnection: IOptions | IConnection | DFUService, Cluster: string, Name: string, state?: FileDetailEx): LogicalFile {
         const retVal: LogicalFile = _store.get({ BaseUrl: optsConnection.baseUrl, Cluster, Name }, () => {
             return new LogicalFile(optsConnection, Cluster, Name);
         });
+        if (state) {
+            retVal.set(state);
+        }
         return retVal;
     }
 

package/src/ecl/query.ts

@@ -78,10 +78,13 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
         } as QueryEx);
     }
 
-    static attach(optsConnection: IOptions | IConnection, querySet: string, queryId: string): Query {
+    static attach(optsConnection: IOptions | IConnection, querySet: string, queryId: string, state?: QueryEx): Query {
         const retVal: Query = _queries.get({ BaseUrl: optsConnection.baseUrl, QuerySet: querySet, QueryId: queryId } as QueryEx, () => {
             return new Query(optsConnection, querySet, queryId);
         });
+        if (state) {
+            retVal.set(state);
+        }
         return retVal;
     }
 

package/src/ecl/targetCluster.ts

@@ -43,9 +43,7 @@ export class TargetCluster extends StateObject<UTargetClusterState, ITargetClust
             return new TargetCluster(optsConnection, name);
         });
         if (state) {
-            retVal.set({
-                ...state
-            });
+            retVal.set(state);
         }
         return retVal;
     }

package/src/ecl/topology.ts

@@ -30,10 +30,13 @@ export class Topology extends StateObject<TopologyStateEx, TopologyStateEx> impl
     get LogicalClusters(): WsTopology.TpLogicalCluster[] { return this.get("LogicalClusters"); }
     get Services(): WsTopology.ServiceList { return this.get("Services"); }
 
-    static attach(optsConnection: IOptions | IConnection | TopologyService) {
+    static attach(optsConnection: IOptions | IConnection | TopologyService, state?: TopologyStateEx): Topology {
         const retVal: Topology = _topology.get({ BaseUrl: optsConnection.baseUrl }, () => {
             return new Topology(optsConnection);
         });
+        if (state) {
+            retVal.set(state);
+        }
         return retVal;
     }
 

package/src/espConnection.ts

@@ -161,4 +161,12 @@ export class Service {
     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.browser.ts

@@ -0,0 +1 @@
+export * from "./index.common.ts";

package/src/index.node.ts

@@ -65,7 +65,7 @@ if (typeof root.btoa === "undefined") {
     };
 }
 
-export * from "./index-common.ts";
+export * from "./index.common.ts";
 
 //  Client Tools  ---
 export * from "./clienttools/eclcc.ts";

package/src/services/wsAccount.ts

@@ -2,7 +2,7 @@ import { AccountServiceBase, WsAccount } from "./wsdl/ws_account/v1.06/ws_accoun
 import { ESPExceptions } from "../espConnection.ts";
 
 export {
-    WsAccount
+    type WsAccount
 };
 
 export class AccountService extends AccountServiceBase {

package/src/services/wsCloud.ts

@@ -1,7 +1,7 @@
 import { CloudServiceBase, WsCloud } from "./wsdl/WsCloud/v1/WsCloud.ts";
 
 export {
-    WsCloud
+    type WsCloud
 };
 
 export class CloudService extends CloudServiceBase {

package/src/services/wsDali.ts

@@ -1,7 +1,7 @@
 import { DaliServiceBase, WsDali } from "./wsdl/WsDali/v1.07/WsDali.ts";
 
 export {
-    WsDali
+    type WsDali
 };
 
 export class DaliService extends DaliServiceBase {

package/src/services/wsEcl.ts

@@ -1,4 +1,4 @@
-import { DDL2 } from "@hpcc-js/ddl-shim";
+import type { DDL2 } from "@hpcc-js/ddl-shim";
 import { IConnection, IOptions } from "../connection.ts";
 import { ESPExceptions, Service } from "../espConnection.ts";
 

package/src/services/wsElk.ts

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

package/src/services/wsMachine.ts

@@ -4,7 +4,7 @@ import { max as d3Max, mean as d3Mean } from "d3-array";
 import { MachineServiceBase, WsMachine } from "./wsdl/ws_machine/v1.17/ws_machine.ts";
 
 export {
-    WsMachine
+    type WsMachine
 };
 
 export namespace WsMachineEx {

package/src/services/wsPackageProcess.ts

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

package/src/services/wsResources.ts

@@ -1,7 +1,7 @@
 import { ResourcesServiceBase, WsResources } from "./wsdl/WsResources/v1.01/WsResources.ts";
 
 export {
-    WsResources
+    type WsResources
 };
 
 export class ResourcesService extends ResourcesServiceBase {

package/src/services/wsWorkunits.ts

@@ -67,14 +67,6 @@ export class WorkunitsService extends WorkunitsServiceBase {
         super(optsConnection);
     }
 
-    opts() {
-        return this._connection.opts();
-    }
-
-    connection(): ESPConnection {
-        return this._connection.clone();
-    }
-
     Ping(): Promise<WsWorkunits.WsWorkunitsPingResponse> {
         return this._connection.send("Ping", {}, "json", false, undefined, "WsWorkunitsPingResponse").then((response) => {
             return { result: true };

package/types/__package__.d.ts

@@ -1,3 +1,3 @@
 export declare const PKG_NAME = "@hpcc-js/comms";
-export declare const PKG_VERSION = "3.1.0";
-export declare const BUILD_VERSION = "2.107.0";
+export declare const PKG_VERSION = "3.2.0";
+export declare const BUILD_VERSION = "3.2.1";

package/types/ecl/logicalFile.d.ts

@@ -78,7 +78,7 @@ export declare class LogicalFile extends StateObject<FileDetailEx, FileDetailEx>
     get ExpirationDate(): string;
     get ExtendedIndexInfo(): WsDfu.ExtendedIndexInfo;
     get properties(): FileDetailEx;
-    static attach(optsConnection: IOptions | IConnection | DFUService, Cluster: string, Name: string): LogicalFile;
+    static attach(optsConnection: IOptions | IConnection | DFUService, Cluster: string, Name: string, state?: FileDetailEx): LogicalFile;
     protected constructor(optsConnection: IOptions | IConnection | DFUService, Cluster: string, Name: string);
     filePartsOnCluster(): WsDfu.DFUFilePartsOnCluster[];
     fileParts(): DFUPartEx[];

package/types/ecl/query.d.ts

@@ -42,7 +42,7 @@ export declare class Query extends StateObject<QueryEx, QueryEx> implements Quer
     get WUTimers(): WsWorkunits.WUTimers;
     get PriorityID(): number;
     private constructor();
-    static attach(optsConnection: IOptions | IConnection, querySet: string, queryId: string): Query;
+    static attach(optsConnection: IOptions | IConnection, querySet: string, queryId: string, state?: QueryEx): Query;
     private _eclService;
     protected wsEclService(): Promise<EclService | undefined>;
     private fetchDetails;

package/types/ecl/topology.d.ts

@@ -20,7 +20,7 @@ export declare class Topology extends StateObject<TopologyStateEx, TopologyState
     get CTargetClusters(): TargetCluster[];
     get LogicalClusters(): WsTopology.TpLogicalCluster[];
     get Services(): WsTopology.ServiceList;
-    static attach(optsConnection: IOptions | IConnection | TopologyService): Topology;
+    static attach(optsConnection: IOptions | IConnection | TopologyService, state?: TopologyStateEx): Topology;
     protected constructor(optsConnection: IOptions | IConnection | TopologyService);
     GetESPServiceBaseURL(type?: string): Promise<string>;
     fetchTargetClusters(): Promise<TargetCluster[]>;

package/types/espConnection.d.ts

@@ -38,4 +38,6 @@ export declare class Service {
     protected _connection: ESPConnection;
     get baseUrl(): string;
     constructor(optsConnection: IOptions | IConnection, service: string, version: string);
+    opts(): IOptions;
+    connection(): ESPConnection;
 }

package/types/index.browser.d.ts

@@ -0,0 +1 @@
+export * from "./index.common.ts";

package/types/index.node.d.ts

@@ -1,3 +1,3 @@
-export * from "./index-common.ts";
+export * from "./index.common.ts";
 export * from "./clienttools/eclcc.ts";
 export * from "./clienttools/eclMeta.ts";

package/types/services/wsAccount.d.ts

@@ -1,5 +1,5 @@
 import { AccountServiceBase, WsAccount } from "./wsdl/ws_account/v1.06/ws_account.ts";
-export { WsAccount };
+export { type WsAccount };
 export declare class AccountService extends AccountServiceBase {
     VerifyUser(request: WsAccount.VerifyUserRequest): Promise<WsAccount.VerifyUserResponse>;
 }

package/types/services/wsCloud.d.ts

@@ -1,5 +1,5 @@
 import { CloudServiceBase, WsCloud } from "./wsdl/WsCloud/v1/WsCloud.ts";
-export { WsCloud };
+export { type WsCloud };
 export declare class CloudService extends CloudServiceBase {
     getPODs(): Promise<object[]>;
 }

package/types/services/wsDali.d.ts

@@ -1,4 +1,4 @@
 import { DaliServiceBase, WsDali } from "./wsdl/WsDali/v1.07/WsDali.ts";
-export { WsDali };
+export { type WsDali };
 export declare class DaliService extends DaliServiceBase {
 }

package/types/services/wsEcl.d.ts

@@ -1,4 +1,4 @@
-import { DDL2 } from "@hpcc-js/ddl-shim";
+import type { DDL2 } from "@hpcc-js/ddl-shim";
 import { IConnection, IOptions } from "../connection.ts";
 import { Service } from "../espConnection.ts";
 export type IFieldType = DDL2.IFieldType;

package/types/services/wsElk.d.ts

@@ -1,4 +1,4 @@
 import { ElkServiceBase, WsElk } from "./wsdl/ws_elk/v1/ws_elk.ts";
-export { WsElk };
+export { type WsElk };
 export declare class ElkService extends ElkServiceBase {
 }

package/types/services/wsMachine.d.ts

@@ -1,5 +1,5 @@
 import { MachineServiceBase, WsMachine } from "./wsdl/ws_machine/v1.17/ws_machine.ts";
-export { WsMachine };
+export { type WsMachine };
 export declare namespace WsMachineEx {
     interface DiskUsage extends WsMachine.DiskUsage {
         Total: number;

package/types/services/wsPackageProcess.d.ts

@@ -1,4 +1,4 @@
 import { PackageProcessServiceBase, WsPackageProcess } from "./wsdl/WsPackageProcess/v1.04/WsPackageProcess.ts";
-export { WsPackageProcess };
+export { type WsPackageProcess };
 export declare class PackageProcessService extends PackageProcessServiceBase {
 }

package/types/services/wsResources.d.ts

@@ -1,4 +1,4 @@
 import { ResourcesServiceBase, WsResources } from "./wsdl/WsResources/v1.01/WsResources.ts";
-export { WsResources };
+export { type WsResources };
 export declare class ResourcesService extends ResourcesServiceBase {
 }

package/types/services/wsWorkunits.d.ts

@@ -1,7 +1,6 @@
 import { XMLNode } from "@hpcc-js/util";
 import { WsWorkunits, WorkunitsServiceBase } from "./wsdl/WsWorkunits/v2/WsWorkunits.ts";
 import { IConnection, IOptions } from "../connection.ts";
-import { ESPConnection } from "../espConnection.ts";
 export { WsWorkunits };
 export declare enum WUStateID {
     Unknown = 0,
@@ -43,8 +42,6 @@ export declare function isWUQueryECLWorkunit(_: WsWorkunits.ECLWorkunit | WsWork
 export declare function isWUInfoWorkunit(_: WsWorkunits.ECLWorkunit | WsWorkunits.Workunit): _ is WsWorkunits.Workunit;
 export declare class WorkunitsService extends WorkunitsServiceBase {
     constructor(optsConnection: IOptions | IConnection);
-    opts(): IOptions;
-    connection(): ESPConnection;
     Ping(): Promise<WsWorkunits.WsWorkunitsPingResponse>;
     WUQuery(request?: Partial<WsWorkunits.WUQuery>, abortSignal?: AbortSignal): Promise<WsWorkunits.WUQueryResponse>;
     WUInfo(_request: Partial<WsWorkunits.WUInfo>): Promise<WsWorkunits.WUInfoResponse>;