@hpcc-js/comms 3.14.4 → 3.15.1

package/src/services/fileSpray.ts

@@ -1,48 +1,73 @@
-import { FileSprayServiceBase, FileSpray } from "./wsdl/FileSpray/v1.27/FileSpray.ts";
-
-export {
-    FileSpray
-};
-
-type UpdateDFUWorkunitMinusWU = Omit<FileSpray.UpdateDFUWorkunit, "wu">;
-type UpdateDFUWorkunitWU = FileSpray.UpdateDFUWorkunit["wu"];
-
-export enum FileSprayStates {
-    unknown = 0,
-    scheduled,
-    queued,
-    started,
-    aborted,
-    failed,
-    finished,
-    monitoring,
-    aborting,
-    notfound = 999
-}
-
-export interface UpdateDFUWorkunitEx extends UpdateDFUWorkunitMinusWU {
-    wu?: Partial<UpdateDFUWorkunitWU>
-}
-
-export class FileSprayService extends FileSprayServiceBase {
-
-    DFUWUFileEx(request: FileSpray.DFUWUFileRequest): Promise<string> {
-        return this._connection.send("DFUWUFile", request, "text");
-    }
-
-    SprayFixedEx(request: Partial<FileSpray.SprayFixed>): Promise<FileSpray.SprayFixedResponse> {
-        return this._connection.send("SprayFixed", request);
-    }
-
-    SprayVariableEx(request: Partial<FileSpray.SprayVariable>): Promise<FileSpray.SprayResponse> {
-        return this._connection.send("SprayVariable", request, "json", false, null, "SprayResponse");
-    }
-
-    DesprayEx(request: Partial<FileSpray.Despray>): Promise<FileSpray.DesprayResponse> {
-        return this._connection.send("Despray", request);
-    }
-
-    UpdateDFUWorkunitEx(request: Partial<UpdateDFUWorkunitEx>): Promise<FileSpray.UpdateDFUWorkunitResponse> {
-        return this._connection.send("UpdateDFUWorkunit", request, "json", false, undefined, "UpdateDFUWorkunitResponse");
-    }
-}
+import { FileSprayServiceBase, FileSpray } from "./wsdl/FileSpray/v1.27/FileSpray.ts";
+
+export {
+    FileSpray
+};
+
+type UpdateDFUWorkunitMinusWU = Omit<FileSpray.UpdateDFUWorkunit, "wu">;
+type UpdateDFUWorkunitWU = FileSpray.UpdateDFUWorkunit["wu"];
+
+export enum FileSprayStates {
+    unknown = 0,
+    scheduled,
+    queued,
+    started,
+    aborted,
+    failed,
+    finished,
+    monitoring,
+    aborting,
+    notfound = 999
+}
+
+// defined in https://github.com/hpcc-systems/HPCC-Platform/blob/master/dali/dfu/dfuwu.cpp#L102-L121
+export enum DFUWUTypes {
+    Copy = "copy",
+    Remove = "remove",
+    Move = "move",
+    Rename = "rename",
+    Replicate = "replicate",
+    Import = "import",
+    Export = "export",
+    /*
+     * These seem to not be valid with respect to filtering DFU WUs,
+     * but leaving them here because they exist in the dfuwu.cpp struct
+     *
+     * Add = "add",
+     * Transfer = "transfer",
+     * Savemap = "savemap",
+     * Addgroup = "addgroup",
+     * Server = "server",
+     */
+    Monitor = "monitor",
+    Copymerge = "copymerge",
+    Supercopy = "supercopy",
+    Publish = "publish",
+}
+
+export interface UpdateDFUWorkunitEx extends UpdateDFUWorkunitMinusWU {
+    wu?: Partial<UpdateDFUWorkunitWU>
+}
+
+export class FileSprayService extends FileSprayServiceBase {
+
+    DFUWUFileEx(request: FileSpray.DFUWUFileRequest): Promise<string> {
+        return this._connection.send("DFUWUFile", request, "text");
+    }
+
+    SprayFixedEx(request: Partial<FileSpray.SprayFixed>): Promise<FileSpray.SprayFixedResponse> {
+        return this._connection.send("SprayFixed", request);
+    }
+
+    SprayVariableEx(request: Partial<FileSpray.SprayVariable>): Promise<FileSpray.SprayResponse> {
+        return this._connection.send("SprayVariable", request, "json", false, null, "SprayResponse");
+    }
+
+    DesprayEx(request: Partial<FileSpray.Despray>): Promise<FileSpray.DesprayResponse> {
+        return this._connection.send("Despray", request);
+    }
+
+    UpdateDFUWorkunitEx(request: Partial<UpdateDFUWorkunitEx>): Promise<FileSpray.UpdateDFUWorkunitResponse> {
+        return this._connection.send("UpdateDFUWorkunit", request, "json", false, undefined, "UpdateDFUWorkunitResponse");
+    }
+}

package/src/services/wsAccess.ts

@@ -1,8 +1,8 @@
-import { AccessServiceBase, WsAccess } from "./wsdl/ws_access/v1.17/ws_access.ts";
-
-export {
-    WsAccess
-};
-
-export class AccessService extends AccessServiceBase {
-}
+import { AccessServiceBase, WsAccess } from "./wsdl/ws_access/v1.17/ws_access.ts";
+
+export {
+    WsAccess
+};
+
+export class AccessService extends AccessServiceBase {
+}

package/src/services/wsAccount.ts

@@ -1,27 +1,27 @@
-import { AccountServiceBase, WsAccount } from "./wsdl/ws_account/v1.07/ws_account.ts";
-import { ESPExceptions } from "../espConnection.ts";
-
-export {
-    type WsAccount
-};
-
-export class AccountService extends AccountServiceBase {
-
-    VerifyUser(request: WsAccount.VerifyUserRequest): Promise<WsAccount.VerifyUserResponse> {
-        return this._connection.send("VerifyUser", request)
-            .catch((e: ESPExceptions) => {
-                //  old client version warning  ---
-                if (e.isESPExceptions && e.Exception.some(exception => exception.Code === 20043)) {
-                    return {
-                        retcode: 20043,
-                        Exceptions: {
-                            Source: "wsAccount",
-                            Exception: e.Exception
-                        }
-                    };
-                }
-                throw e;
-            });
-    }
-
-}
+import { AccountServiceBase, WsAccount } from "./wsdl/ws_account/v1.07/ws_account.ts";
+import { ESPExceptions } from "../espConnection.ts";
+
+export {
+    type WsAccount
+};
+
+export class AccountService extends AccountServiceBase {
+
+    VerifyUser(request: WsAccount.VerifyUserRequest): Promise<WsAccount.VerifyUserResponse> {
+        return this._connection.send("VerifyUser", request)
+            .catch((e: ESPExceptions) => {
+                //  old client version warning  ---
+                if (e.isESPExceptions && e.Exception.some(exception => exception.Code === 20043)) {
+                    return {
+                        retcode: 20043,
+                        Exceptions: {
+                            Source: "wsAccount",
+                            Exception: e.Exception
+                        }
+                    };
+                }
+                throw e;
+            });
+    }
+
+}

package/src/services/wsCloud.ts

@@ -1,73 +1,73 @@
-import { scopedLogger } from "@hpcc-js/util";
-import type { V1Pod } from "@kubernetes/client-node";
-import type { WsCloud as WsCloudV1 } from "./wsdl/WsCloud/v1/WsCloud.ts";
-import { CloudServiceBase, WsCloud } from "./wsdl/WsCloud/v1.02/WsCloud.ts";
-
-const logger = scopedLogger("@hpcc-js/comms/services/wsCloud.ts");
-
-export {
-    type WsCloud
-};
-
-function isGetPODsResponse_v1_02(response: any): response is WsCloud.GetPODsResponse {
-    return response?.Pods !== undefined;
-}
-
-function mapPorts(pod: V1Pod): WsCloud.Port[] {
-    return pod.spec?.containers?.reduce((prev, curr) => {
-        curr.ports?.forEach(p => {
-            prev.push({
-                ContainerPort: p.containerPort,
-                Name: p.name,
-                Protocol: p.protocol
-            });
-        });
-        return prev;
-    }, [] as WsCloud.Port[]) ?? [];
-}
-
-function mapPods(pods: V1Pod[]): WsCloud.Pod[] {
-    return pods
-        .filter(pod => {
-            const labels = pod?.metadata?.labels ?? {};
-            return labels.hasOwnProperty("app.kubernetes.io/part-of") && labels["app.kubernetes.io/part-of"] === "HPCC-Platform";
-        })
-        .map((pod: V1Pod): WsCloud.Pod => {
-            const started = new Date(pod.metadata?.creationTimestamp);
-            return {
-                Name: pod.metadata.name,
-                Status: pod.status?.phase,
-                CreationTimestamp: started.toISOString(),
-                ContainerName: pod.status?.containerStatuses?.reduce((prev, curr) => {
-                    if (curr.name) {
-                        prev.push(curr.name);
-                    } return prev;
-                }, [] as string[]).join(", ") ?? "",
-                ContainerCount: pod.spec?.containers?.length ?? 0,
-                ContainerReadyCount: pod.status?.containerStatuses?.reduce((prev, curr) => prev + (curr.ready ? 1 : 0), 0),
-                ContainerRestartCount: pod.status?.containerStatuses?.reduce((prev, curr) => prev + curr.restartCount, 0),
-                Ports: {
-                    Port: mapPorts(pod)
-                },
-            };
-        })
-        ;
-}
-
-export class CloudService extends CloudServiceBase {
-
-    getPODs(): Promise<WsCloud.Pod[]> {
-        return super.GetPODs({}).then((response: WsCloud.GetPODsResponse | WsCloudV1.GetPODsResponse) => {
-            if (isGetPODsResponse_v1_02(response)) {
-                return response.Pods?.Pod ?? [];
-            }
-            try {
-                const obj = typeof response.Result === "string" ? JSON.parse(response.Result) : response.Result;
-                return mapPods(obj?.items ?? []);
-            } catch (error) {
-                logger.error(`Error parsing V1Pods json '${(error instanceof Error ? error.message : String(error))}'`);
-                return [];
-            }
-        });
-    }
-}
+import { scopedLogger } from "@hpcc-js/util";
+import type { V1Pod } from "@kubernetes/client-node";
+import type { WsCloud as WsCloudV1 } from "./wsdl/WsCloud/v1/WsCloud.ts";
+import { CloudServiceBase, WsCloud } from "./wsdl/WsCloud/v1.02/WsCloud.ts";
+
+const logger = scopedLogger("@hpcc-js/comms/services/wsCloud.ts");
+
+export {
+    type WsCloud
+};
+
+function isGetPODsResponse_v1_02(response: any): response is WsCloud.GetPODsResponse {
+    return response?.Pods !== undefined;
+}
+
+function mapPorts(pod: V1Pod): WsCloud.Port[] {
+    return pod.spec?.containers?.reduce((prev, curr) => {
+        curr.ports?.forEach(p => {
+            prev.push({
+                ContainerPort: p.containerPort,
+                Name: p.name,
+                Protocol: p.protocol
+            });
+        });
+        return prev;
+    }, [] as WsCloud.Port[]) ?? [];
+}
+
+function mapPods(pods: V1Pod[]): WsCloud.Pod[] {
+    return pods
+        .filter(pod => {
+            const labels = pod?.metadata?.labels ?? {};
+            return labels.hasOwnProperty("app.kubernetes.io/part-of") && labels["app.kubernetes.io/part-of"] === "HPCC-Platform";
+        })
+        .map((pod: V1Pod): WsCloud.Pod => {
+            const started = new Date(pod.metadata?.creationTimestamp);
+            return {
+                Name: pod.metadata.name,
+                Status: pod.status?.phase,
+                CreationTimestamp: started.toISOString(),
+                ContainerName: pod.status?.containerStatuses?.reduce((prev, curr) => {
+                    if (curr.name) {
+                        prev.push(curr.name);
+                    } return prev;
+                }, [] as string[]).join(", ") ?? "",
+                ContainerCount: pod.spec?.containers?.length ?? 0,
+                ContainerReadyCount: pod.status?.containerStatuses?.reduce((prev, curr) => prev + (curr.ready ? 1 : 0), 0),
+                ContainerRestartCount: pod.status?.containerStatuses?.reduce((prev, curr) => prev + curr.restartCount, 0),
+                Ports: {
+                    Port: mapPorts(pod)
+                },
+            };
+        })
+        ;
+}
+
+export class CloudService extends CloudServiceBase {
+
+    getPODs(): Promise<WsCloud.Pod[]> {
+        return super.GetPODs({}).then((response: WsCloud.GetPODsResponse | WsCloudV1.GetPODsResponse) => {
+            if (isGetPODsResponse_v1_02(response)) {
+                return response.Pods?.Pod ?? [];
+            }
+            try {
+                const obj = typeof response.Result === "string" ? JSON.parse(response.Result) : response.Result;
+                return mapPods(obj?.items ?? []);
+            } catch (error) {
+                logger.error(`Error parsing V1Pods json '${(error instanceof Error ? error.message : String(error))}'`);
+                return [];
+            }
+        });
+    }
+}

package/src/services/wsCodesign.ts

@@ -1,18 +1,18 @@
-import { CodesignServiceBase, WsCodesign } from "./wsdl/ws_codesign/v1.1/ws_codesign.ts";
-
-export { WsCodesign };
-
-export class CodesignService extends CodesignServiceBase {
-
-    ListUserIDsEx(request: Partial<WsCodesign.ListUserIDsRequest>): Promise<string[]> {
-        return super.ListUserIDs(request).then((response: WsCodesign.ListUserIDsResponse) => {
-            return response.UserIDs.Item;
-        }).catch(e => {
-            return [];
-        });
-    }
-
-    Sign(request: Partial<WsCodesign.SignRequest>): Promise<WsCodesign.SignResponse> {
-        return super.Sign({ SigningMethod: WsCodesign.SigningMethodType.gpg, ...request });
-    }
-}
+import { CodesignServiceBase, WsCodesign } from "./wsdl/ws_codesign/v1.1/ws_codesign.ts";
+
+export { WsCodesign };
+
+export class CodesignService extends CodesignServiceBase {
+
+    ListUserIDsEx(request: Partial<WsCodesign.ListUserIDsRequest>): Promise<string[]> {
+        return super.ListUserIDs(request).then((response: WsCodesign.ListUserIDsResponse) => {
+            return response.UserIDs.Item;
+        }).catch(e => {
+            return [];
+        });
+    }
+
+    Sign(request: Partial<WsCodesign.SignRequest>): Promise<WsCodesign.SignResponse> {
+        return super.Sign({ SigningMethod: WsCodesign.SigningMethodType.gpg, ...request });
+    }
+}

package/src/services/wsDFU.ts

@@ -1,34 +1,34 @@
-import { DfuServiceBase, WsDfu } from "./wsdl/WsDfu/v1.67/WsDfu.ts";
-
-export { WsDfu };
-
-export const DFUArrayActions = WsDfu.DFUArrayActions;
-export const DFUDefFileFormat = WsDfu.DFUDefFileFormat;
-export const DFUChangeProtection = WsDfu.DFUChangeProtection;
-export const DFUChangeRestriction = WsDfu.DFUChangeRestriction;
-
-export type base64Binary = WsDfu.base64Binary;
-
-export class DFUService extends DfuServiceBase {
-
-    DFUFile(request: WsDfu.DFUDefFileRequest): Promise<string> {
-        return this._connection.send("DFUDefFile", request, "text");
-    }
-
-    async recursiveFetchLogicalFiles(superFiles: { NodeGroup: string, Name: string }[]): Promise<string[]> {
-        const childSuperFiles: WsDfu.DFULogicalFile[] = [];
-        const logicalFiles: string[] = [];
-        await Promise.all(superFiles.map(superFile => {
-            return this.DFUInfo({ Cluster: superFile.NodeGroup, Name: superFile.Name, IncludeJsonTypeInfo: false, IncludeBinTypeInfo: false, ForceIndexInfo: false })
-                .then(response => {
-                    for (const child of response?.FileDetail?.Superfiles?.DFULogicalFile ?? []) {
-                        childSuperFiles.push(child);
-                    }
-                    for (const child of response?.FileDetail?.subfiles?.Item ?? []) {
-                        logicalFiles.push(child);
-                    }
-                });
-        }));
-        return logicalFiles.concat(childSuperFiles.length ? await this.recursiveFetchLogicalFiles(childSuperFiles) : []);
-    }
-}
+import { DfuServiceBase, WsDfu } from "./wsdl/WsDfu/v1.67/WsDfu.ts";
+
+export { WsDfu };
+
+export const DFUArrayActions = WsDfu.DFUArrayActions;
+export const DFUDefFileFormat = WsDfu.DFUDefFileFormat;
+export const DFUChangeProtection = WsDfu.DFUChangeProtection;
+export const DFUChangeRestriction = WsDfu.DFUChangeRestriction;
+
+export type base64Binary = WsDfu.base64Binary;
+
+export class DFUService extends DfuServiceBase {
+
+    DFUFile(request: WsDfu.DFUDefFileRequest): Promise<string> {
+        return this._connection.send("DFUDefFile", request, "text");
+    }
+
+    async recursiveFetchLogicalFiles(superFiles: { NodeGroup: string, Name: string }[]): Promise<string[]> {
+        const childSuperFiles: WsDfu.DFULogicalFile[] = [];
+        const logicalFiles: string[] = [];
+        await Promise.all(superFiles.map(superFile => {
+            return this.DFUInfo({ Cluster: superFile.NodeGroup, Name: superFile.Name, IncludeJsonTypeInfo: false, IncludeBinTypeInfo: false, ForceIndexInfo: false })
+                .then(response => {
+                    for (const child of response?.FileDetail?.Superfiles?.DFULogicalFile ?? []) {
+                        childSuperFiles.push(child);
+                    }
+                    for (const child of response?.FileDetail?.subfiles?.Item ?? []) {
+                        logicalFiles.push(child);
+                    }
+                });
+        }));
+        return logicalFiles.concat(childSuperFiles.length ? await this.recursiveFetchLogicalFiles(childSuperFiles) : []);
+    }
+}