@hpcc-js/comms 2.102.1 → 2.102.2

package/src/ecl/logicalFile.ts

@@ -1,195 +1,195 @@
-import { Cache, scopedLogger, StateObject } from "@hpcc-js/util";
-import { IConnection, IOptions } from "../connection";
-import { DFUService, WsDfu } from "../services/wsDFU";
-import { ESPExceptions } from "../espConnection";
-
-const logger = scopedLogger("logicalFile.ts");
-
-export class LogicalFileCache extends Cache<{ BaseUrl: string, Cluster: string, Name: string }, LogicalFile> {
-    constructor() {
-        super((obj) => {
-            return `${obj.BaseUrl}-${obj.Cluster}-${obj.Name}`;
-        });
-    }
-}
-const _store = new LogicalFileCache();
-
-export interface DFUPartEx extends WsDfu.DFUPart {
-    //  From WsDfu.DFUFilePartsOnCluster  ---
-    Cluster: string;
-    BaseDir: string;
-    ReplicateDir: string;
-    Replicate: boolean;
-    CanReplicate: boolean;
-}
-
-export interface FileDetailEx extends WsDfu.FileDetail {
-    Cluster: string;
-    StateID?: number;
-}
-
-export class LogicalFile extends StateObject<FileDetailEx, FileDetailEx> implements FileDetailEx {
-    protected connection: DFUService;
-    get BaseUrl() { return this.connection.baseUrl; }
-
-    get Cluster(): string { return this.get("Cluster"); }
-    get Name(): string { return this.get("Name"); }
-
-    get Filename(): string { return this.get("Filename"); }
-    get Prefix(): string { return this.get("Prefix"); }
-    get NodeGroup(): string { return this.get("NodeGroup"); }
-    get NumParts(): number { return this.get("NumParts"); }
-    get Description(): string { return this.get("Description"); }
-    get Dir(): string { return this.get("Dir"); }
-    get PathMask(): string { return this.get("PathMask"); }
-    get Filesize(): string { return this.get("Filesize"); }
-    get FileSizeInt64(): number { return this.get("FileSizeInt64"); }
-    get RecordSize(): string { return this.get("RecordSize"); }
-    get RecordCount(): string { return this.get("RecordCount"); }
-    get RecordSizeInt64(): number { return this.get("RecordSizeInt64"); }
-    get RecordCountInt64(): number { return this.get("RecordCountInt64"); }
-    get Wuid(): string { return this.get("Wuid"); }
-    get Owner(): string { return this.get("Owner"); }
-    get JobName(): string { return this.get("JobName"); }
-    get Persistent(): string { return this.get("Persistent"); }
-    get Format(): string { return this.get("Format"); }
-    get MaxRecordSize(): string { return this.get("MaxRecordSize"); }
-    get CsvSeparate(): string { return this.get("CsvSeparate"); }
-    get CsvQuote(): string { return this.get("CsvQuote"); }
-    get CsvTerminate(): string { return this.get("CsvTerminate"); }
-    get CsvEscape(): string { return this.get("CsvEscape"); }
-    get Modified(): string { return this.get("Modified"); }
-    get Ecl(): string { return this.get("Ecl"); }
-    get Stat(): WsDfu.Stat { return this.get("Stat"); }
-    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 Superfiles(): WsDfu.Superfiles { return this.get("Superfiles"); }
-    get ProtectList(): WsDfu.ProtectList { return this.get("ProtectList"); }
-    get FromRoxieCluster(): boolean { return this.get("FromRoxieCluster"); }
-    get Graphs(): WsDfu.Graphs { return this.get("Graphs"); }
-    get UserPermission(): string { return this.get("UserPermission"); }
-    get ContentType(): string { return this.get("ContentType"); }
-    get CompressedFileSize(): number { return this.get("CompressedFileSize"); }
-    get PercentCompressed(): string { return this.get("PercentCompressed"); }
-    get IsCompressed(): boolean { return this.get("IsCompressed"); }
-    get BrowseData(): boolean { return this.get("BrowseData"); }
-    get jsonInfo(): string { return this.get("jsonInfo"); }
-    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"); }
-    get ExpireDays(): number { return this.get("ExpireDays"); }
-    get KeyType(): string { return this.get("KeyType"); }
-    get IsRestricted(): boolean { return this.get("IsRestricted"); }
-    get AtRestCost(): number { return this.get("AtRestCost"); }
-    get AccessCost(): number { return this.get("AccessCost"); }
-    get StateID(): number { return this.get("StateID"); }
-    get ExpirationDate(): string { return this.get("ExpirationDate"); }
-    get ExtendedIndexInfo(): WsDfu.ExtendedIndexInfo { return this.get("ExtendedIndexInfo"); }
-
-    get properties(): FileDetailEx { return this.get(); }
-
-    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;
-    }
-
-    protected constructor(optsConnection: IOptions | IConnection | DFUService, Cluster: string, Name: string) {
-        super();
-        if (optsConnection instanceof DFUService) {
-            this.connection = optsConnection;
-        } else {
-            this.connection = new DFUService(optsConnection);
-        }
-
-        this.clear({
-            Cluster,
-            Name
-        });
-    }
-
-    filePartsOnCluster() {
-        return [...(this.DFUFilePartsOnClusters?.DFUFilePartsOnCluster || [])];
-    }
-
-    fileParts() {
-        const retVal: DFUPartEx[] = [];
-        for (const poc of this.DFUFilePartsOnClusters?.DFUFilePartsOnCluster || []) {
-            for (const part of poc?.DFUFileParts?.DFUPart || []) {
-                const row = { ...poc, ...part };
-                delete row.DFUFileParts;
-                retVal.push(row);
-            }
-        }
-        return retVal;
-    }
-
-    update(request: Partial<WsDfu.DFUInfoRequest>): Promise<WsDfu.DFUInfoResponse> {
-        return this.connection.DFUInfo({
-            ...request,
-            ...{
-                Cluster: this.Cluster,
-                Name: this.Name
-            }
-        }).then((response) => {
-            this.set({
-                Cluster: this.Cluster,
-                ...response.FileDetail
-            });
-            return response;
-        });
-    }
-
-    fetchInfo(): Promise<WsDfu.FileDetail> {
-        return this.connection.DFUInfo({ Cluster: this.Cluster, Name: this.Name }).then(response => {
-            this.set({
-                Cluster: this.Cluster,
-                ...response.FileDetail,
-                ProtectList: response?.FileDetail?.ProtectList ?? { DFUFileProtect: [] }
-            });
-            return response.FileDetail;
-        }).catch((e: ESPExceptions) => {
-            //  deleted  ---
-            const fileMissing = e.Exception.some((exception) => {
-                if (exception.Code === 20038) {
-                    this.set("Name", this.Name + " (Deleted)");
-                    this.set("StateID", 999);
-                    return true;
-                }
-                return false;
-            });
-            if (!fileMissing) {
-                logger.warning(`Unexpected ESP exception: ${e.message}`);
-                throw e;
-            }
-            return {} as FileDetailEx;
-        });
-    }
-
-    fetchDefFile(format: WsDfu.DFUDefFileFormat): Promise<string> {
-        return this.connection.DFUFile({ Name: this.Name, Format: format });
-    }
-
-    fetchAllLogicalFiles(): Promise<string[]> {
-        return this.connection.recursiveFetchLogicalFiles([this]);
-    }
-
-    fetchListHistory(): Promise<WsDfu.Origin[]> {
-        return this.connection.ListHistory({ Name: this.Name }).then(response => {
-            return response?.History?.Origin || [];
-        });
-    }
-
-    eraseHistory(): Promise<WsDfu.Origin[]> {
-        return this.connection.EraseHistory({ Name: this.Name }).then(response => {
-            return response?.History?.Origin || [];
-        });
-    }
-}
+import { Cache, scopedLogger, StateObject } from "@hpcc-js/util";
+import { IConnection, IOptions } from "../connection";
+import { DFUService, WsDfu } from "../services/wsDFU";
+import { ESPExceptions } from "../espConnection";
+
+const logger = scopedLogger("logicalFile.ts");
+
+export class LogicalFileCache extends Cache<{ BaseUrl: string, Cluster: string, Name: string }, LogicalFile> {
+    constructor() {
+        super((obj) => {
+            return `${obj.BaseUrl}-${obj.Cluster}-${obj.Name}`;
+        });
+    }
+}
+const _store = new LogicalFileCache();
+
+export interface DFUPartEx extends WsDfu.DFUPart {
+    //  From WsDfu.DFUFilePartsOnCluster  ---
+    Cluster: string;
+    BaseDir: string;
+    ReplicateDir: string;
+    Replicate: boolean;
+    CanReplicate: boolean;
+}
+
+export interface FileDetailEx extends WsDfu.FileDetail {
+    Cluster: string;
+    StateID?: number;
+}
+
+export class LogicalFile extends StateObject<FileDetailEx, FileDetailEx> implements FileDetailEx {
+    protected connection: DFUService;
+    get BaseUrl() { return this.connection.baseUrl; }
+
+    get Cluster(): string { return this.get("Cluster"); }
+    get Name(): string { return this.get("Name"); }
+
+    get Filename(): string { return this.get("Filename"); }
+    get Prefix(): string { return this.get("Prefix"); }
+    get NodeGroup(): string { return this.get("NodeGroup"); }
+    get NumParts(): number { return this.get("NumParts"); }
+    get Description(): string { return this.get("Description"); }
+    get Dir(): string { return this.get("Dir"); }
+    get PathMask(): string { return this.get("PathMask"); }
+    get Filesize(): string { return this.get("Filesize"); }
+    get FileSizeInt64(): number { return this.get("FileSizeInt64"); }
+    get RecordSize(): string { return this.get("RecordSize"); }
+    get RecordCount(): string { return this.get("RecordCount"); }
+    get RecordSizeInt64(): number { return this.get("RecordSizeInt64"); }
+    get RecordCountInt64(): number { return this.get("RecordCountInt64"); }
+    get Wuid(): string { return this.get("Wuid"); }
+    get Owner(): string { return this.get("Owner"); }
+    get JobName(): string { return this.get("JobName"); }
+    get Persistent(): string { return this.get("Persistent"); }
+    get Format(): string { return this.get("Format"); }
+    get MaxRecordSize(): string { return this.get("MaxRecordSize"); }
+    get CsvSeparate(): string { return this.get("CsvSeparate"); }
+    get CsvQuote(): string { return this.get("CsvQuote"); }
+    get CsvTerminate(): string { return this.get("CsvTerminate"); }
+    get CsvEscape(): string { return this.get("CsvEscape"); }
+    get Modified(): string { return this.get("Modified"); }
+    get Ecl(): string { return this.get("Ecl"); }
+    get Stat(): WsDfu.Stat { return this.get("Stat"); }
+    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 Superfiles(): WsDfu.Superfiles { return this.get("Superfiles"); }
+    get ProtectList(): WsDfu.ProtectList { return this.get("ProtectList"); }
+    get FromRoxieCluster(): boolean { return this.get("FromRoxieCluster"); }
+    get Graphs(): WsDfu.Graphs { return this.get("Graphs"); }
+    get UserPermission(): string { return this.get("UserPermission"); }
+    get ContentType(): string { return this.get("ContentType"); }
+    get CompressedFileSize(): number { return this.get("CompressedFileSize"); }
+    get PercentCompressed(): string { return this.get("PercentCompressed"); }
+    get IsCompressed(): boolean { return this.get("IsCompressed"); }
+    get BrowseData(): boolean { return this.get("BrowseData"); }
+    get jsonInfo(): string { return this.get("jsonInfo"); }
+    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"); }
+    get ExpireDays(): number { return this.get("ExpireDays"); }
+    get KeyType(): string { return this.get("KeyType"); }
+    get IsRestricted(): boolean { return this.get("IsRestricted"); }
+    get AtRestCost(): number { return this.get("AtRestCost"); }
+    get AccessCost(): number { return this.get("AccessCost"); }
+    get StateID(): number { return this.get("StateID"); }
+    get ExpirationDate(): string { return this.get("ExpirationDate"); }
+    get ExtendedIndexInfo(): WsDfu.ExtendedIndexInfo { return this.get("ExtendedIndexInfo"); }
+
+    get properties(): FileDetailEx { return this.get(); }
+
+    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;
+    }
+
+    protected constructor(optsConnection: IOptions | IConnection | DFUService, Cluster: string, Name: string) {
+        super();
+        if (optsConnection instanceof DFUService) {
+            this.connection = optsConnection;
+        } else {
+            this.connection = new DFUService(optsConnection);
+        }
+
+        this.clear({
+            Cluster,
+            Name
+        });
+    }
+
+    filePartsOnCluster() {
+        return [...(this.DFUFilePartsOnClusters?.DFUFilePartsOnCluster || [])];
+    }
+
+    fileParts() {
+        const retVal: DFUPartEx[] = [];
+        for (const poc of this.DFUFilePartsOnClusters?.DFUFilePartsOnCluster || []) {
+            for (const part of poc?.DFUFileParts?.DFUPart || []) {
+                const row = { ...poc, ...part };
+                delete row.DFUFileParts;
+                retVal.push(row);
+            }
+        }
+        return retVal;
+    }
+
+    update(request: Partial<WsDfu.DFUInfoRequest>): Promise<WsDfu.DFUInfoResponse> {
+        return this.connection.DFUInfo({
+            ...request,
+            ...{
+                Cluster: this.Cluster,
+                Name: this.Name
+            }
+        }).then((response) => {
+            this.set({
+                Cluster: this.Cluster,
+                ...response.FileDetail
+            });
+            return response;
+        });
+    }
+
+    fetchInfo(): Promise<WsDfu.FileDetail> {
+        return this.connection.DFUInfo({ Cluster: this.Cluster, Name: this.Name }).then(response => {
+            this.set({
+                Cluster: this.Cluster,
+                ...response.FileDetail,
+                ProtectList: response?.FileDetail?.ProtectList ?? { DFUFileProtect: [] }
+            });
+            return response.FileDetail;
+        }).catch((e: ESPExceptions) => {
+            //  deleted  ---
+            const fileMissing = e.Exception.some((exception) => {
+                if (exception.Code === 20038) {
+                    this.set("Name", this.Name + " (Deleted)");
+                    this.set("StateID", 999);
+                    return true;
+                }
+                return false;
+            });
+            if (!fileMissing) {
+                logger.warning(`Unexpected ESP exception: ${e.message}`);
+                throw e;
+            }
+            return {} as FileDetailEx;
+        });
+    }
+
+    fetchDefFile(format: WsDfu.DFUDefFileFormat): Promise<string> {
+        return this.connection.DFUFile({ Name: this.Name, Format: format });
+    }
+
+    fetchAllLogicalFiles(): Promise<string[]> {
+        return this.connection.recursiveFetchLogicalFiles([this]);
+    }
+
+    fetchListHistory(): Promise<WsDfu.Origin[]> {
+        return this.connection.ListHistory({ Name: this.Name }).then(response => {
+            return response?.History?.Origin || [];
+        });
+    }
+
+    eraseHistory(): Promise<WsDfu.Origin[]> {
+        return this.connection.EraseHistory({ Name: this.Name }).then(response => {
+            return response?.History?.Origin || [];
+        });
+    }
+}

package/src/ecl/machine.ts

@@ -1,63 +1,63 @@
-import { Cache, StateObject } from "@hpcc-js/util";
-import { IConnection, IOptions } from "../connection";
-import { WsMachine, MachineService } from "../services/wsMachine";
-
-export class MachineCache extends Cache<{ Address: string }, Machine> {
-    constructor() {
-        super((obj) => {
-            return obj.Address;
-        });
-    }
-}
-const _machines = new MachineCache();
-
-export interface MachineInfoEx extends WsMachine.MachineInfoEx {
-}
-
-export class Machine extends StateObject<MachineInfoEx, MachineInfoEx> implements MachineInfoEx {
-    protected connection: MachineService;
-
-    get Address(): string { return this.get("Address"); }
-    get ConfigAddress(): string { return this.get("ConfigAddress"); }
-    get Name(): string { return this.get("Name"); }
-    get ProcessType(): string { return this.get("ProcessType"); }
-    get DisplayType(): string { return this.get("DisplayType"); }
-    get Description(): string { return this.get("Description"); }
-    get AgentVersion(): string { return this.get("AgentVersion"); }
-    get Contact(): string { return this.get("Contact"); }
-    get Location(): string { return this.get("Location"); }
-    get UpTime(): string { return this.get("UpTime"); }
-    get ComponentName(): string { return this.get("ComponentName"); }
-    get ComponentPath(): string { return this.get("ComponentPath"); }
-    get RoxieState(): string { return this.get("RoxieState"); }
-    get RoxieStateDetails(): string { return this.get("RoxieStateDetails"); }
-    get OS(): number { return this.get("OS"); }
-    get ProcessNumber(): number { return this.get("ProcessNumber"); }
-    get Channels(): number { return this.get("Channels"); }
-    get Processors(): WsMachine.Processors { return this.get("Processors"); }
-    get Storage(): WsMachine.Storage { return this.get("Storage"); }
-    get Running(): WsMachine.Running { return this.get("Running"); }
-    get PhysicalMemory(): WsMachine.PhysicalMemory { return this.get("PhysicalMemory"); }
-    get VirtualMemory(): WsMachine.VirtualMemory { return this.get("VirtualMemory"); }
-    get ComponentInfo(): WsMachine.ComponentInfo { return this.get("ComponentInfo"); }
-    get Exception(): string { return this.get("Exception"); }
-
-    static attach(optsConnection: IOptions | IConnection | MachineService, address: string, state?: WsMachine.MachineInfoEx): Machine {
-        const retVal: Machine = _machines.get({ Address: address }, () => {
-            return new Machine(optsConnection);
-        });
-        if (state) {
-            retVal.set(state);
-        }
-        return retVal;
-    }
-
-    private constructor(optsConnection: IOptions | IConnection | MachineService) {
-        super();
-        if (optsConnection instanceof MachineService) {
-            this.connection = optsConnection;
-        } else {
-            this.connection = new MachineService(optsConnection);
-        }
-    }
-}
+import { Cache, StateObject } from "@hpcc-js/util";
+import { IConnection, IOptions } from "../connection";
+import { WsMachine, MachineService } from "../services/wsMachine";
+
+export class MachineCache extends Cache<{ Address: string }, Machine> {
+    constructor() {
+        super((obj) => {
+            return obj.Address;
+        });
+    }
+}
+const _machines = new MachineCache();
+
+export interface MachineInfoEx extends WsMachine.MachineInfoEx {
+}
+
+export class Machine extends StateObject<MachineInfoEx, MachineInfoEx> implements MachineInfoEx {
+    protected connection: MachineService;
+
+    get Address(): string { return this.get("Address"); }
+    get ConfigAddress(): string { return this.get("ConfigAddress"); }
+    get Name(): string { return this.get("Name"); }
+    get ProcessType(): string { return this.get("ProcessType"); }
+    get DisplayType(): string { return this.get("DisplayType"); }
+    get Description(): string { return this.get("Description"); }
+    get AgentVersion(): string { return this.get("AgentVersion"); }
+    get Contact(): string { return this.get("Contact"); }
+    get Location(): string { return this.get("Location"); }
+    get UpTime(): string { return this.get("UpTime"); }
+    get ComponentName(): string { return this.get("ComponentName"); }
+    get ComponentPath(): string { return this.get("ComponentPath"); }
+    get RoxieState(): string { return this.get("RoxieState"); }
+    get RoxieStateDetails(): string { return this.get("RoxieStateDetails"); }
+    get OS(): number { return this.get("OS"); }
+    get ProcessNumber(): number { return this.get("ProcessNumber"); }
+    get Channels(): number { return this.get("Channels"); }
+    get Processors(): WsMachine.Processors { return this.get("Processors"); }
+    get Storage(): WsMachine.Storage { return this.get("Storage"); }
+    get Running(): WsMachine.Running { return this.get("Running"); }
+    get PhysicalMemory(): WsMachine.PhysicalMemory { return this.get("PhysicalMemory"); }
+    get VirtualMemory(): WsMachine.VirtualMemory { return this.get("VirtualMemory"); }
+    get ComponentInfo(): WsMachine.ComponentInfo { return this.get("ComponentInfo"); }
+    get Exception(): string { return this.get("Exception"); }
+
+    static attach(optsConnection: IOptions | IConnection | MachineService, address: string, state?: WsMachine.MachineInfoEx): Machine {
+        const retVal: Machine = _machines.get({ Address: address }, () => {
+            return new Machine(optsConnection);
+        });
+        if (state) {
+            retVal.set(state);
+        }
+        return retVal;
+    }
+
+    private constructor(optsConnection: IOptions | IConnection | MachineService) {
+        super();
+        if (optsConnection instanceof MachineService) {
+            this.connection = optsConnection;
+        } else {
+            this.connection = new MachineService(optsConnection);
+        }
+    }
+}