@runware/sdk-js 1.1.17 → 1.1.18

package/dist/index.js

@@ -22,6 +22,18 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
@@ -168,9 +180,9 @@ var require_reconnect = __commonJS({
       };
       log("init");
       connect();
-      this.close = (code = 1e3, reason = "", { keepClosed = false, fastClose = true, delay: delay2 = 0 } = {}) => {
-        if (delay2) {
-          reconnectDelay = delay2;
+      this.close = (code = 1e3, reason = "", { keepClosed = false, fastClose = true, delay: delay3 = 0 } = {}) => {
+        if (delay3) {
+          reconnectDelay = delay3;
         }
         shouldRetry = !keepClosed;
         ws.close(code, reason);
@@ -262,50 +274,50 @@ var EControlMode = /* @__PURE__ */ ((EControlMode2) => {
   EControlMode2["CONTROL_NET"] = "controlnet";
   return EControlMode2;
 })(EControlMode || {});
-var EPreProcessorGroup = /* @__PURE__ */ ((EPreProcessorGroup3) => {
-  EPreProcessorGroup3["canny"] = "canny";
-  EPreProcessorGroup3["depth"] = "depth";
-  EPreProcessorGroup3["mlsd"] = "mlsd";
-  EPreProcessorGroup3["normalbae"] = "normalbae";
-  EPreProcessorGroup3["openpose"] = "openpose";
-  EPreProcessorGroup3["tile"] = "tile";
-  EPreProcessorGroup3["seg"] = "seg";
-  EPreProcessorGroup3["lineart"] = "lineart";
-  EPreProcessorGroup3["lineart_anime"] = "lineart_anime";
-  EPreProcessorGroup3["shuffle"] = "shuffle";
-  EPreProcessorGroup3["scribble"] = "scribble";
-  EPreProcessorGroup3["softedge"] = "softedge";
-  return EPreProcessorGroup3;
+var EPreProcessorGroup = /* @__PURE__ */ ((EPreProcessorGroup2) => {
+  EPreProcessorGroup2["canny"] = "canny";
+  EPreProcessorGroup2["depth"] = "depth";
+  EPreProcessorGroup2["mlsd"] = "mlsd";
+  EPreProcessorGroup2["normalbae"] = "normalbae";
+  EPreProcessorGroup2["openpose"] = "openpose";
+  EPreProcessorGroup2["tile"] = "tile";
+  EPreProcessorGroup2["seg"] = "seg";
+  EPreProcessorGroup2["lineart"] = "lineart";
+  EPreProcessorGroup2["lineart_anime"] = "lineart_anime";
+  EPreProcessorGroup2["shuffle"] = "shuffle";
+  EPreProcessorGroup2["scribble"] = "scribble";
+  EPreProcessorGroup2["softedge"] = "softedge";
+  return EPreProcessorGroup2;
 })(EPreProcessorGroup || {});
-var EPreProcessor = /* @__PURE__ */ ((EPreProcessor3) => {
-  EPreProcessor3["canny"] = "canny";
-  EPreProcessor3["depth_leres"] = "depth_leres";
-  EPreProcessor3["depth_midas"] = "depth_midas";
-  EPreProcessor3["depth_zoe"] = "depth_zoe";
-  EPreProcessor3["inpaint_global_harmonious"] = "inpaint_global_harmonious";
-  EPreProcessor3["lineart_anime"] = "lineart_anime";
-  EPreProcessor3["lineart_coarse"] = "lineart_coarse";
-  EPreProcessor3["lineart_realistic"] = "lineart_realistic";
-  EPreProcessor3["lineart_standard"] = "lineart_standard";
-  EPreProcessor3["mlsd"] = "mlsd";
-  EPreProcessor3["normal_bae"] = "normal_bae";
-  EPreProcessor3["scribble_hed"] = "scribble_hed";
-  EPreProcessor3["scribble_pidinet"] = "scribble_pidinet";
-  EPreProcessor3["seg_ofade20k"] = "seg_ofade20k";
-  EPreProcessor3["seg_ofcoco"] = "seg_ofcoco";
-  EPreProcessor3["seg_ufade20k"] = "seg_ufade20k";
-  EPreProcessor3["shuffle"] = "shuffle";
-  EPreProcessor3["softedge_hed"] = "softedge_hed";
-  EPreProcessor3["softedge_hedsafe"] = "softedge_hedsafe";
-  EPreProcessor3["softedge_pidinet"] = "softedge_pidinet";
-  EPreProcessor3["softedge_pidisafe"] = "softedge_pidisafe";
-  EPreProcessor3["tile_gaussian"] = "tile_gaussian";
-  EPreProcessor3["openpose"] = "openpose";
-  EPreProcessor3["openpose_face"] = "openpose_face";
-  EPreProcessor3["openpose_faceonly"] = "openpose_faceonly";
-  EPreProcessor3["openpose_full"] = "openpose_full";
-  EPreProcessor3["openpose_hand"] = "openpose_hand";
-  return EPreProcessor3;
+var EPreProcessor = /* @__PURE__ */ ((EPreProcessor2) => {
+  EPreProcessor2["canny"] = "canny";
+  EPreProcessor2["depth_leres"] = "depth_leres";
+  EPreProcessor2["depth_midas"] = "depth_midas";
+  EPreProcessor2["depth_zoe"] = "depth_zoe";
+  EPreProcessor2["inpaint_global_harmonious"] = "inpaint_global_harmonious";
+  EPreProcessor2["lineart_anime"] = "lineart_anime";
+  EPreProcessor2["lineart_coarse"] = "lineart_coarse";
+  EPreProcessor2["lineart_realistic"] = "lineart_realistic";
+  EPreProcessor2["lineart_standard"] = "lineart_standard";
+  EPreProcessor2["mlsd"] = "mlsd";
+  EPreProcessor2["normal_bae"] = "normal_bae";
+  EPreProcessor2["scribble_hed"] = "scribble_hed";
+  EPreProcessor2["scribble_pidinet"] = "scribble_pidinet";
+  EPreProcessor2["seg_ofade20k"] = "seg_ofade20k";
+  EPreProcessor2["seg_ofcoco"] = "seg_ofcoco";
+  EPreProcessor2["seg_ufade20k"] = "seg_ufade20k";
+  EPreProcessor2["shuffle"] = "shuffle";
+  EPreProcessor2["softedge_hed"] = "softedge_hed";
+  EPreProcessor2["softedge_hedsafe"] = "softedge_hedsafe";
+  EPreProcessor2["softedge_pidinet"] = "softedge_pidinet";
+  EPreProcessor2["softedge_pidisafe"] = "softedge_pidisafe";
+  EPreProcessor2["tile_gaussian"] = "tile_gaussian";
+  EPreProcessor2["openpose"] = "openpose";
+  EPreProcessor2["openpose_face"] = "openpose_face";
+  EPreProcessor2["openpose_faceonly"] = "openpose_faceonly";
+  EPreProcessor2["openpose_full"] = "openpose_full";
+  EPreProcessor2["openpose_hand"] = "openpose_hand";
+  return EPreProcessor2;
 })(EPreProcessor || {});
 var EOpenPosePreProcessor = /* @__PURE__ */ ((EOpenPosePreProcessor2) => {
   EOpenPosePreProcessor2["openpose"] = "openpose";
@@ -319,6 +331,7 @@ var EOpenPosePreProcessor = /* @__PURE__ */ ((EOpenPosePreProcessor2) => {
 // Runware/utils.ts
 var import_uuid = require("uuid");
 var TIMEOUT_DURATION = 6e4;
+var MINIMUM_TIMEOUT_DURATION = 1e3;
 var POLLING_INTERVAL = 100;
 var BASE_RUNWARE_URLS = {
   ["PRODUCTION" /* PRODUCTION */]: "wss://ws-api.runware.ai/v1",
@@ -336,20 +349,20 @@ var removeFromAray = (col, targetElem) => {
 };
 var getIntervalWithPromise = (callback, {
   debugKey = "debugKey",
-  timeOutDuration = TIMEOUT_DURATION,
+  timeoutDuration = TIMEOUT_DURATION,
   shouldThrowError = true
 }) => {
+  timeoutDuration = timeoutDuration < MINIMUM_TIMEOUT_DURATION ? MINIMUM_TIMEOUT_DURATION : timeoutDuration;
   return new Promise((resolve, reject) => {
     const timeoutId = setTimeout(() => {
       if (intervalId) {
         clearInterval(intervalId);
         if (shouldThrowError) {
-          reject(`Message could not be received for ${debugKey}`);
-          console.error("Message could not be received for ", debugKey);
+          reject(`Response could not be received from server for ${debugKey}`);
         }
       }
       clearTimeout(timeoutId);
-    }, timeOutDuration);
+    }, timeoutDuration);
     let intervalId = setInterval(async () => {
       const shouldClear = callback({ resolve, reject, intervalId });
       if (shouldClear) {
@@ -439,7 +452,9 @@ var RunwareBase = class {
   constructor({
     apiKey,
     url = BASE_RUNWARE_URLS.PRODUCTION,
-    shouldReconnect = true
+    shouldReconnect = true,
+    globalMaxRetries = 2,
+    timeoutDuration = TIMEOUT_DURATION
   }) {
     this._listeners = [];
     // _globalMessages: any[] = [];
@@ -488,51 +503,68 @@ var RunwareBase = class {
       lowThresholdCanny,
       includeHandsAndFaceOpenPose,
       includeCost,
-      customTaskUUID
+      customTaskUUID,
+      retry
     }) => {
+      const totalRetry = retry || this._globalMaxRetries;
+      let lis = void 0;
       try {
-        const image = await this.uploadImage(inputImage);
-        if (!(image == null ? void 0 : image.imageUUID))
-          return null;
-        const taskUUID = customTaskUUID || getUUID();
-        this.send(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({
-          inputImage: image.imageUUID,
-          taskType: "imageControlNetPreProcess" /* IMAGE_CONTROL_NET_PRE_PROCESS */,
-          taskUUID,
-          preProcessor
-        }, evaluateNonTrue({ key: "height", value: height })), evaluateNonTrue({ key: "width", value: width })), evaluateNonTrue({ key: "outputType", value: outputType })), evaluateNonTrue({ key: "outputFormat", value: outputFormat })), evaluateNonTrue({ key: "includeCost", value: includeCost })), evaluateNonTrue({
-          key: "highThresholdCanny",
-          value: highThresholdCanny
-        })), evaluateNonTrue({
-          key: "lowThresholdCanny",
-          value: lowThresholdCanny
-        })), evaluateNonTrue({
-          key: "includeHandsAndFaceOpenPose",
-          value: includeHandsAndFaceOpenPose
-        })));
-        const lis = this.globalListener({
-          taskUUID
-        });
-        const guideImage = await getIntervalWithPromise(
-          ({ resolve, reject }) => {
-            const uploadedImage = this.getSingleMessage({
+        return await asyncRetry(
+          async () => {
+            await this.ensureConnection();
+            const image = await this.uploadImage(inputImage);
+            if (!(image == null ? void 0 : image.imageUUID))
+              return null;
+            const taskUUID = customTaskUUID || getUUID();
+            this.send(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({
+              inputImage: image.imageUUID,
+              taskType: "imageControlNetPreProcess" /* IMAGE_CONTROL_NET_PRE_PROCESS */,
+              taskUUID,
+              preProcessor
+            }, evaluateNonTrue({ key: "height", value: height })), evaluateNonTrue({ key: "width", value: width })), evaluateNonTrue({ key: "outputType", value: outputType })), evaluateNonTrue({ key: "outputFormat", value: outputFormat })), evaluateNonTrue({ key: "includeCost", value: includeCost })), evaluateNonTrue({
+              key: "highThresholdCanny",
+              value: highThresholdCanny
+            })), evaluateNonTrue({
+              key: "lowThresholdCanny",
+              value: lowThresholdCanny
+            })), evaluateNonTrue({
+              key: "includeHandsAndFaceOpenPose",
+              value: includeHandsAndFaceOpenPose
+            })));
+            lis = this.globalListener({
               taskUUID
             });
-            if (!uploadedImage)
-              return;
-            if (uploadedImage == null ? void 0 : uploadedImage.error) {
-              reject(uploadedImage);
-              return true;
-            }
-            if (uploadedImage) {
-              resolve(uploadedImage);
-              return true;
-            }
+            const guideImage = await getIntervalWithPromise(
+              ({ resolve, reject }) => {
+                const uploadedImage = this.getSingleMessage({
+                  taskUUID
+                });
+                if (!uploadedImage)
+                  return;
+                if (uploadedImage == null ? void 0 : uploadedImage.error) {
+                  reject(uploadedImage);
+                  return true;
+                }
+                if (uploadedImage) {
+                  resolve(uploadedImage);
+                  return true;
+                }
+              },
+              {
+                debugKey: "unprocessed-image",
+                timeoutDuration: this._timeoutDuration
+              }
+            );
+            lis.destroy();
+            return guideImage;
           },
-          { debugKey: "unprocessed-image" }
+          {
+            maxRetries: totalRetry,
+            callback: () => {
+              lis == null ? void 0 : lis.destroy();
+            }
+          }
         );
-        lis.destroy();
-        return guideImage;
       } catch (e) {
         throw e;
       }
@@ -540,43 +572,57 @@ var RunwareBase = class {
     this.requestImageToText = async ({
       inputImage,
       includeCost,
-      customTaskUUID
+      customTaskUUID,
+      retry
     }) => {
+      const totalRetry = retry || this._globalMaxRetries;
+      let lis = void 0;
       try {
-        await this.ensureConnection();
-        return await asyncRetry(async () => {
-          const imageUploaded = inputImage ? await this.uploadImage(inputImage) : null;
-          const taskUUID = customTaskUUID || getUUID();
-          this.send(__spreadValues({
-            taskUUID,
-            taskType: "imageCaption" /* IMAGE_CAPTION */,
-            inputImage: imageUploaded == null ? void 0 : imageUploaded.imageUUID
-          }, evaluateNonTrue({ key: "includeCost", value: includeCost })));
-          const lis = this.globalListener({
-            taskUUID
-          });
-          const response = await getIntervalWithPromise(
-            ({ resolve, reject }) => {
-              const newReverseClip = this.getSingleMessage({
-                taskUUID
-              });
-              if (!newReverseClip)
-                return;
-              if (newReverseClip == null ? void 0 : newReverseClip.error) {
-                reject(newReverseClip);
-                return true;
-              }
-              if (newReverseClip) {
-                delete this._globalMessages[taskUUID];
-                resolve(newReverseClip);
-                return true;
+        return await asyncRetry(
+          async () => {
+            await this.ensureConnection();
+            const imageUploaded = inputImage ? await this.uploadImage(inputImage) : null;
+            const taskUUID = customTaskUUID || getUUID();
+            this.send(__spreadValues({
+              taskUUID,
+              taskType: "imageCaption" /* IMAGE_CAPTION */,
+              inputImage: imageUploaded == null ? void 0 : imageUploaded.imageUUID
+            }, evaluateNonTrue({ key: "includeCost", value: includeCost })));
+            lis = this.globalListener({
+              taskUUID
+            });
+            const response = await getIntervalWithPromise(
+              ({ resolve, reject }) => {
+                const newReverseClip = this.getSingleMessage({
+                  taskUUID
+                });
+                if (!newReverseClip)
+                  return;
+                if (newReverseClip == null ? void 0 : newReverseClip.error) {
+                  reject(newReverseClip);
+                  return true;
+                }
+                if (newReverseClip) {
+                  delete this._globalMessages[taskUUID];
+                  resolve(newReverseClip);
+                  return true;
+                }
+              },
+              {
+                debugKey: "remove-image-background",
+                timeoutDuration: this._timeoutDuration
               }
-            },
-            { debugKey: "remove-image-background" }
-          );
-          lis.destroy();
-          return response;
-        });
+            );
+            lis.destroy();
+            return response;
+          },
+          {
+            maxRetries: totalRetry,
+            callback: () => {
+              lis == null ? void 0 : lis.destroy();
+            }
+          }
+        );
       } catch (e) {
         throw e;
       }
@@ -593,53 +639,70 @@ var RunwareBase = class {
       alphaMattingBackgroundThreshold,
       alphaMattingErodeSize,
       includeCost,
-      customTaskUUID
+      customTaskUUID,
+      retry
     }) => {
+      const totalRetry = retry || this._globalMaxRetries;
+      let lis = void 0;
       try {
-        await this.ensureConnection();
-        return await asyncRetry(async () => {
-          const imageUploaded = inputImage ? await this.uploadImage(inputImage) : null;
-          const taskUUID = customTaskUUID || getUUID();
-          this.send(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({
-            taskType: "imageBackgroundRemoval" /* IMAGE_BACKGROUND_REMOVAL */,
-            taskUUID,
-            inputImage: imageUploaded == null ? void 0 : imageUploaded.imageUUID
-          }, evaluateNonTrue({ key: "rgba", value: rgba })), evaluateNonTrue({
-            key: "postProcessMask",
-            value: postProcessMask
-          })), evaluateNonTrue({ key: "returnOnlyMask", value: returnOnlyMask })), evaluateNonTrue({ key: "alphaMatting", value: alphaMatting })), evaluateNonTrue({ key: "includeCost", value: includeCost })), evaluateNonTrue({
-            key: "alphaMattingForegroundThreshold",
-            value: alphaMattingForegroundThreshold
-          })), evaluateNonTrue({
-            key: "alphaMattingBackgroundThreshold",
-            value: alphaMattingBackgroundThreshold
-          })), evaluateNonTrue({
-            key: "alphaMattingErodeSize",
-            value: alphaMattingErodeSize
-          })), evaluateNonTrue({ key: "outputType", value: outputType })), evaluateNonTrue({ key: "outputFormat", value: outputFormat })));
-          const lis = this.globalListener({
-            taskUUID
-          });
-          const response = await getIntervalWithPromise(
-            ({ resolve, reject }) => {
-              const newRemoveBackground = this.getSingleMessage({ taskUUID });
-              if (!newRemoveBackground)
-                return;
-              if (newRemoveBackground == null ? void 0 : newRemoveBackground.error) {
-                reject(newRemoveBackground);
-                return true;
-              }
-              if (newRemoveBackground) {
-                delete this._globalMessages[taskUUID];
-                resolve(newRemoveBackground);
-                return true;
+        return await asyncRetry(
+          async () => {
+            await this.ensureConnection();
+            const imageUploaded = inputImage ? await this.uploadImage(inputImage) : null;
+            const taskUUID = customTaskUUID || getUUID();
+            this.send(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({
+              taskType: "imageBackgroundRemoval" /* IMAGE_BACKGROUND_REMOVAL */,
+              taskUUID,
+              inputImage: imageUploaded == null ? void 0 : imageUploaded.imageUUID
+            }, evaluateNonTrue({ key: "rgba", value: rgba })), evaluateNonTrue({
+              key: "postProcessMask",
+              value: postProcessMask
+            })), evaluateNonTrue({
+              key: "returnOnlyMask",
+              value: returnOnlyMask
+            })), evaluateNonTrue({ key: "alphaMatting", value: alphaMatting })), evaluateNonTrue({ key: "includeCost", value: includeCost })), evaluateNonTrue({
+              key: "alphaMattingForegroundThreshold",
+              value: alphaMattingForegroundThreshold
+            })), evaluateNonTrue({
+              key: "alphaMattingBackgroundThreshold",
+              value: alphaMattingBackgroundThreshold
+            })), evaluateNonTrue({
+              key: "alphaMattingErodeSize",
+              value: alphaMattingErodeSize
+            })), evaluateNonTrue({ key: "outputType", value: outputType })), evaluateNonTrue({ key: "outputFormat", value: outputFormat })));
+            lis = this.globalListener({
+              taskUUID
+            });
+            const response = await getIntervalWithPromise(
+              ({ resolve, reject }) => {
+                const newRemoveBackground = this.getSingleMessage({ taskUUID });
+                if (!newRemoveBackground)
+                  return;
+                if (newRemoveBackground == null ? void 0 : newRemoveBackground.error) {
+                  reject(newRemoveBackground);
+                  return true;
+                }
+                if (newRemoveBackground) {
+                  delete this._globalMessages[taskUUID];
+                  resolve(newRemoveBackground);
+                  return true;
+                }
+              },
+              {
+                debugKey: "remove-image-background",
+                timeoutDuration: this._timeoutDuration
               }
-            },
-            { debugKey: "remove-image-background" }
-          );
-          lis.destroy();
-          return response;
-        });
+            );
+            lis.destroy();
+            return response;
+          },
+          {
+            maxRetries: totalRetry,
+            callback: () => {
+              lis == null ? void 0 : lis.destroy();
+            }
+          }
+        );
       } catch (e) {
         throw e;
       }
@@ -650,43 +713,54 @@ var RunwareBase = class {
       outputType,
       outputFormat,
       includeCost,
-      customTaskUUID
+      customTaskUUID,
+      retry
     }) => {
+      const totalRetry = retry || this._globalMaxRetries;
+      let lis = void 0;
       try {
-        await this.ensureConnection();
-        return await asyncRetry(async () => {
-          let imageUploaded;
-          imageUploaded = await this.uploadImage(inputImage);
-          const taskUUID = customTaskUUID || getUUID();
-          this.send(__spreadValues(__spreadValues(__spreadValues({
-            taskUUID,
-            inputImage: imageUploaded == null ? void 0 : imageUploaded.imageUUID,
-            taskType: "imageUpscale" /* IMAGE_UPSCALE */,
-            upscaleFactor
-          }, evaluateNonTrue({ key: "includeCost", value: includeCost })), outputType ? { outputType } : {}), outputFormat ? { outputFormat } : {}));
-          const lis = this.globalListener({
-            taskUUID
-          });
-          const response = await getIntervalWithPromise(
-            ({ resolve, reject }) => {
-              const newUpscaleGan = this.getSingleMessage({ taskUUID });
-              if (!newUpscaleGan)
-                return;
-              if (newUpscaleGan == null ? void 0 : newUpscaleGan.error) {
-                reject(newUpscaleGan);
-                return true;
-              }
-              if (newUpscaleGan) {
-                delete this._globalMessages[taskUUID];
-                resolve(newUpscaleGan);
-                return true;
-              }
-            },
-            { debugKey: "upscale-gan" }
-          );
-          lis.destroy();
-          return response;
-        });
+        return await asyncRetry(
+          async () => {
+            await this.ensureConnection();
+            let imageUploaded;
+            imageUploaded = await this.uploadImage(inputImage);
+            const taskUUID = customTaskUUID || getUUID();
+            this.send(__spreadValues(__spreadValues(__spreadValues({
+              taskUUID,
+              inputImage: imageUploaded == null ? void 0 : imageUploaded.imageUUID,
+              taskType: "imageUpscale" /* IMAGE_UPSCALE */,
+              upscaleFactor
+            }, evaluateNonTrue({ key: "includeCost", value: includeCost })), outputType ? { outputType } : {}), outputFormat ? { outputFormat } : {}));
+            lis = this.globalListener({
+              taskUUID
+            });
+            const response = await getIntervalWithPromise(
+              ({ resolve, reject }) => {
+                const newUpscaleGan = this.getSingleMessage({ taskUUID });
+                if (!newUpscaleGan)
+                  return;
+                if (newUpscaleGan == null ? void 0 : newUpscaleGan.error) {
+                  reject(newUpscaleGan);
+                  return true;
+                }
+                if (newUpscaleGan) {
+                  delete this._globalMessages[taskUUID];
+                  resolve(newUpscaleGan);
+                  return true;
+                }
+              },
+              { debugKey: "upscale-gan", timeoutDuration: this._timeoutDuration }
+            );
+            lis.destroy();
+            return response;
+          },
+          {
+            maxRetries: totalRetry,
+            callback: () => {
+              lis == null ? void 0 : lis.destroy();
+            }
+          }
+        );
       } catch (e) {
         throw e;
       }
@@ -696,41 +770,55 @@ var RunwareBase = class {
       promptMaxLength = 380,
       promptVersions = 1,
       includeCost,
-      customTaskUUID
+      customTaskUUID,
+      retry
     }) => {
+      const totalRetry = retry || this._globalMaxRetries;
+      let lis = void 0;
       try {
-        await this.ensureConnection();
-        return await asyncRetry(async () => {
-          const taskUUID = customTaskUUID || getUUID();
-          this.send(__spreadProps(__spreadValues({
-            prompt,
-            taskUUID,
-            promptMaxLength,
-            promptVersions
-          }, evaluateNonTrue({ key: "includeCost", value: includeCost })), {
-            taskType: "promptEnhance" /* PROMPT_ENHANCE */
-          }));
-          const lis = this.globalListener({
-            taskUUID
-          });
-          const response = await getIntervalWithPromise(
-            ({ resolve, reject }) => {
-              const reducedPrompt = this._globalMessages[taskUUID];
-              if (reducedPrompt == null ? void 0 : reducedPrompt.error) {
-                reject(reducedPrompt);
-                return true;
-              }
-              if ((reducedPrompt == null ? void 0 : reducedPrompt.length) >= promptVersions) {
-                delete this._globalMessages[taskUUID];
-                resolve(reducedPrompt);
-                return true;
+        return await asyncRetry(
+          async () => {
+            await this.ensureConnection();
+            const taskUUID = customTaskUUID || getUUID();
+            this.send(__spreadProps(__spreadValues({
+              prompt,
+              taskUUID,
+              promptMaxLength,
+              promptVersions
+            }, evaluateNonTrue({ key: "includeCost", value: includeCost })), {
+              taskType: "promptEnhance" /* PROMPT_ENHANCE */
+            }));
+            lis = this.globalListener({
+              taskUUID
+            });
+            const response = await getIntervalWithPromise(
+              ({ resolve, reject }) => {
+                const reducedPrompt = this._globalMessages[taskUUID];
+                if (reducedPrompt == null ? void 0 : reducedPrompt.error) {
+                  reject(reducedPrompt);
+                  return true;
+                }
+                if ((reducedPrompt == null ? void 0 : reducedPrompt.length) >= promptVersions) {
+                  delete this._globalMessages[taskUUID];
+                  resolve(reducedPrompt);
+                  return true;
+                }
+              },
+              {
+                debugKey: "enhance-prompt",
+                timeoutDuration: this._timeoutDuration
               }
-            },
-            { debugKey: "enhance-prompt" }
-          );
-          lis.destroy();
-          return response;
-        });
+            );
+            lis.destroy();
+            return response;
+          },
+          {
+            maxRetries: totalRetry,
+            callback: () => {
+              lis == null ? void 0 : lis.destroy();
+            }
+          }
+        );
       } catch (e) {
         throw e;
       }
@@ -753,6 +841,17 @@ var RunwareBase = class {
     this._url = url;
     this._sdkType = "CLIENT" /* CLIENT */;
     this._shouldReconnect = shouldReconnect;
+    this._globalMaxRetries = globalMaxRetries;
+    this._timeoutDuration = timeoutDuration;
+  }
+  static async initialize(props) {
+    try {
+      const instance = new this(props);
+      await instance.ensureConnection();
+      return instance;
+    } catch (e) {
+      throw e;
+    }
   }
   // protected addListener({
   //   lis,
@@ -824,7 +923,7 @@ var RunwareBase = class {
         lis: (m) => {
           var _a, _b;
           if (m == null ? void 0 : m.error) {
-            this._invalidAPIkey = "Invalid API key";
+            this._invalidAPIkey = m;
             return;
           }
           this._connectionSessionUUID = (_b = (_a = m == null ? void 0 : m["authentication" /* AUTHENTICATION */]) == null ? void 0 : _a[0]) == null ? void 0 : _b.connectionSessionUUID;
@@ -843,7 +942,6 @@ var RunwareBase = class {
     };
     this._ws.onclose = (e) => {
       if (this._invalidAPIkey) {
-        console.error(this._invalidAPIkey);
         return;
       }
     };
@@ -951,13 +1049,13 @@ var RunwareBase = class {
     onPartialImages,
     includeCost,
     customTaskUUID,
-    retry = 2
+    retry
   }) {
-    await this.ensureConnection();
     let lis = void 0;
     let requestObject = void 0;
     let taskUUIDs = [];
     let retryCount = 0;
+    const totalRetry = retry || this._globalMaxRetries;
     try {
       await this.ensureConnection();
       let seedImageUUID = null;
@@ -1047,7 +1145,7 @@ var RunwareBase = class {
           return promise;
         },
         {
-          maxRetries: retry,
+          maxRetries: totalRetry,
           callback: () => {
             lis == null ? void 0 : lis.destroy();
           }
@@ -1057,7 +1155,7 @@ var RunwareBase = class {
       if (e.taskUUID) {
         throw e;
       }
-      if (retryCount >= retry) {
+      if (retryCount >= totalRetry) {
         return this.handleIncompleteImages({ taskUUIDs, error: e });
       }
     }
@@ -1109,18 +1207,15 @@ var RunwareBase = class {
           if (hasConnected) {
             clearAllIntervals();
             resolve(true);
+            return;
           }
           if (!!this._invalidAPIkey) {
             clearAllIntervals();
-            reject(new Error("Invalid API key"));
+            reject(this._invalidAPIkey);
             return;
           }
         }, pollingInterval);
       });
-      if (!isConnected) {
-        this.connect();
-        await delay(2);
-      }
     } catch (e) {
       throw (_a = this._invalidAPIkey) != null ? _a : "Could not connect to server. Ensure your API key is correct";
     }
@@ -1152,7 +1247,11 @@ var RunwareBase = class {
           return true;
         }
       },
-      { debugKey: "getting images", shouldThrowError }
+      {
+        debugKey: "getting images",
+        shouldThrowError,
+        timeoutDuration: this._timeoutDuration
+      }
     );
   }
   handleIncompleteImages({
@@ -1177,22 +1276,21 @@ var RunwareBase = class {
 // Runware/Runware-client.ts
 var import_reconnect = __toESM(require_reconnect());
 var RunwareClient = class extends RunwareBase {
-  constructor({ apiKey, url }) {
-    super({ apiKey, url });
-    if (apiKey) {
-      this._ws = new import_reconnect.default(
-        this._url
-      );
-      this.connect();
-    }
+  constructor(props) {
+    const _a = props, { shouldReconnect } = _a, rest = __objRest(_a, ["shouldReconnect"]);
+    super(rest);
+    this._ws = new import_reconnect.default(
+      this._url
+    );
+    this.connect();
   }
 };
 
 // Runware/Runware-server.ts
 var import_ws = __toESM(require("ws"));
 var RunwareServer = class extends RunwareBase {
-  constructor({ apiKey, url, shouldReconnect }) {
-    super({ apiKey, url, shouldReconnect });
+  constructor(props) {
+    super(props);
     this._instantiated = false;
     this._listeners = [];
     this._reconnectingIntervalId = null;
@@ -1213,9 +1311,7 @@ var RunwareServer = class extends RunwareBase {
       }
     };
     this._sdkType = "SERVER" /* SERVER */;
-    if (apiKey) {
-      this.connect();
-    }
+    this.connect();
   }
   // protected addListener({
   //   lis,
@@ -1277,7 +1373,7 @@ var RunwareServer = class extends RunwareBase {
         lis: (m) => {
           var _a, _b;
           if (m == null ? void 0 : m.error) {
-            this._invalidAPIkey = "Invalid API key";
+            this._invalidAPIkey = m;
             return;
           }
           this._connectionSessionUUID = (_b = (_a = m == null ? void 0 : m["authentication" /* AUTHENTICATION */]) == null ? void 0 : _a[0]) == null ? void 0 : _b.connectionSessionUUID;
@@ -1300,7 +1396,6 @@ var RunwareServer = class extends RunwareBase {
   }
   handleClose() {
     if (this._invalidAPIkey) {
-      console.error(this._invalidAPIkey);
       return;
     }
     if (this._reconnectingIntervalId) {