@runware/sdk-js 1.0.30 → 1.1.0

package/dist/index.js

@@ -224,6 +224,7 @@ __export(Runware_exports, {
   EOpenPosePreProcessor: () => EOpenPosePreProcessor,
   EPreProcessor: () => EPreProcessor,
   EPreProcessorGroup: () => EPreProcessorGroup,
+  ETaskType: () => ETaskType,
   Environment: () => Environment,
   Runware: () => Runware,
   RunwareServer: () => RunwareServer,
@@ -243,6 +244,17 @@ var SdkType = /* @__PURE__ */ ((SdkType2) => {
   SdkType2["SERVER"] = "SERVER";
   return SdkType2;
 })(SdkType || {});
+var ETaskType = /* @__PURE__ */ ((ETaskType2) => {
+  ETaskType2["IMAGE_INFERENCE"] = "imageInference";
+  ETaskType2["IMAGE_UPLOAD"] = "imageUpload";
+  ETaskType2["IMAGE_UPSCALE"] = "imageUpscale";
+  ETaskType2["IMAGE_BACKGROUND_REMOVAL"] = "imageBackgroundRemoval";
+  ETaskType2["IMAGE_CAPTION"] = "imageCaption";
+  ETaskType2["IMAGE_CONTROL_NET_PRE_PROCESS"] = "imageControlNetPreProcess";
+  ETaskType2["PROMPT_ENHANCE"] = "promptEnhance";
+  ETaskType2["AUTHENTICATION"] = "authentication";
+  return ETaskType2;
+})(ETaskType || {});
 var EControlMode = /* @__PURE__ */ ((EControlMode2) => {
   EControlMode2["BALANCED"] = "balanced";
   EControlMode2["PROMPT"] = "prompt";
@@ -355,82 +367,6 @@ var fileToBase64 = (file) => new Promise((resolve) => {
 });
 var getUUID = () => (0, import_uuid.v4)();
 var isValidUUID = (uuid) => (0, import_uuid.validate)(uuid);
-var getTaskType = ({
-  prompt,
-  controlNet,
-  imageMaskInitiator,
-  imageInitiator
-}) => {
-  if (evaluateToBoolean(prompt, !controlNet, !imageMaskInitiator, !imageInitiator)) {
-    return 1;
-  }
-  if (evaluateToBoolean(prompt, !controlNet, !imageMaskInitiator, imageInitiator)) {
-    return 2;
-  }
-  if (evaluateToBoolean(prompt, !controlNet, imageMaskInitiator, imageInitiator)) {
-    return 3;
-  }
-  if (evaluateToBoolean(prompt, controlNet, !imageMaskInitiator, !imageInitiator)) {
-    return 9;
-  }
-  if (evaluateToBoolean(prompt, controlNet, !imageMaskInitiator, imageInitiator)) {
-    return 10;
-  }
-  if (evaluateToBoolean(prompt, controlNet, imageMaskInitiator, imageInitiator)) {
-    return 10;
-  }
-};
-var evaluateToBoolean = (...args) => [...args].every((e) => !!e);
-var compact = (value, data) => !!value ? data : {};
-var getPreprocessorType = (processor) => {
-  const processorGroup = Object.keys(
-    EPreProcessorGroup
-  );
-  switch (processor) {
-    case "canny" /* canny */:
-      return "canny" /* canny */;
-    case "depth_leres" /* depth_leres */:
-    case "depth_midas" /* depth_midas */:
-    case "depth_zoe" /* depth_zoe */:
-      return "depth" /* depth */;
-    case "inpaint_global_harmonious" /* inpaint_global_harmonious */:
-      return "depth" /* depth */;
-    case "lineart_anime" /* lineart_anime */:
-      return "lineart_anime" /* lineart_anime */;
-    case "lineart_coarse" /* lineart_coarse */:
-    case "lineart_realistic" /* lineart_realistic */:
-    case "lineart_standard" /* lineart_standard */:
-      return "lineart" /* lineart */;
-    case "mlsd" /* mlsd */:
-      return "mlsd" /* mlsd */;
-    case "normal_bae" /* normal_bae */:
-      return "normalbae" /* normalbae */;
-    case "openpose_face" /* openpose_face */:
-    case "openpose_faceonly" /* openpose_faceonly */:
-    case "openpose_full" /* openpose_full */:
-    case "openpose_hand" /* openpose_hand */:
-    case "openpose" /* openpose */:
-      return "openpose" /* openpose */;
-    case "scribble_hed" /* scribble_hed */:
-    case "scribble_pidinet" /* scribble_pidinet */:
-      return "scribble" /* scribble */;
-    case "seg_ofade20k" /* seg_ofade20k */:
-    case "seg_ofcoco" /* seg_ofcoco */:
-    case "seg_ufade20k" /* seg_ufade20k */:
-      return "seg" /* seg */;
-    case "shuffle" /* shuffle */:
-      return "shuffle" /* shuffle */;
-    case "softedge_hed" /* softedge_hed */:
-    case "softedge_hedsafe" /* softedge_hedsafe */:
-    case "softedge_pidinet" /* softedge_pidinet */:
-    case "softedge_pidisafe" /* softedge_pidisafe */:
-      return "softedge" /* softedge */;
-    case "tile_gaussian" /* tile_gaussian */:
-      return "tile" /* tile */;
-    default:
-      return "canny" /* canny */;
-  }
-};
 var accessDeepObject = ({
   key,
   data,
@@ -508,34 +444,36 @@ var RunwareBase = class {
       var _a;
       return ((_a = this._ws) == null ? void 0 : _a.readyState) === 1;
     };
-    this.send = (msg) => this._ws.send(JSON.stringify(msg));
+    // We moving to an array format, it make sense to consolidate all request to an array here
+    this.send = (msg) => this._ws.send(JSON.stringify([msg]));
     this.uploadImage = async (file) => {
       try {
         return await asyncRetry(async () => {
           const taskUUID = getUUID();
           if (typeof file === "string" && isValidUUID(file)) {
             return {
-              newImageUUID: file,
-              newImageSrc: file,
-              taskUUID
+              imageURL: file,
+              imageUUID: file,
+              taskUUID,
+              taskType: "imageUpload" /* IMAGE_UPLOAD */
             };
           }
           const imageBase64 = typeof file === "string" ? file : await fileToBase64(file);
           this.send({
-            newImageUpload: {
-              imageBase64,
-              taskUUID,
-              taskType: 7
-            }
+            taskType: "imageUpload" /* IMAGE_UPLOAD */,
+            image: imageBase64,
+            taskUUID
           });
           const lis = this.globalListener({
-            responseKey: "newUploadedImageUUID",
-            taskKey: "newUploadedImageUUID",
             taskUUID
           });
           const image = await getIntervalWithPromise(
             ({ resolve, reject }) => {
-              const uploadedImage = this._globalMessages[taskUUID];
+              const uploadedImage = this.getSingleMessage({
+                taskUUID
+              });
+              if (!uploadedImage)
+                return;
               if (uploadedImage == null ? void 0 : uploadedImage.error) {
                 reject(uploadedImage);
                 return true;
@@ -555,44 +493,54 @@ var RunwareBase = class {
         throw e;
       }
     };
-    this.uploadUnprocessedImage = async ({
-      file,
-      preProcessorType,
-      width,
+    this.controlNetPreProcess = async ({
+      inputImage,
+      preProcessor,
       height,
-      lowThresholdCanny,
+      width,
+      outputType,
+      outputFormat,
       highThresholdCanny,
-      includeHandsAndFaceOpenPose = true,
-      returnBase64Image
+      lowThresholdCanny,
+      includeHandsAndFaceOpenPose,
+      includeCost
     }) => {
       try {
-        const image = await this.uploadImage(file);
-        if (!image)
+        const image = await this.uploadImage(inputImage);
+        if (!(image == null ? void 0 : image.imageUUID))
           return null;
         const taskUUID = getUUID();
-        this.send({
-          newPreProcessControlNet: __spreadValues(__spreadValues(__spreadValues({
-            taskUUID,
-            preProcessorType,
-            guideImageUUID: image.newImageUUID,
-            includeHandsAndFaceOpenPose
-          }, returnBase64Image ? { returnBase64Image } : {}), compact(lowThresholdCanny, { lowThresholdCanny })), compact(highThresholdCanny, { highThresholdCanny }))
-        });
+        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({
-          responseKey: "newPreProcessControlNet",
-          taskKey: "newPreProcessControlNet",
           taskUUID
         });
         const guideImage = await getIntervalWithPromise(
           ({ resolve, reject }) => {
-            const uploadedImage = this._globalMessages[taskUUID];
+            const uploadedImage = this.getSingleMessage({
+              taskUUID
+            });
+            if (!uploadedImage)
+              return;
             if (uploadedImage == null ? void 0 : uploadedImage.error) {
               reject(uploadedImage);
               return true;
             }
             if (uploadedImage) {
-              delete this._globalMessages[taskUUID];
-              resolve(uploadedImage == null ? void 0 : uploadedImage.newPreProcessControlNet);
+              resolve(uploadedImage);
               return true;
             }
           },
@@ -605,38 +553,40 @@ var RunwareBase = class {
       }
     };
     this.requestImageToText = async ({
-      imageInitiator
+      inputImage,
+      includeCost
     }) => {
       try {
         await this.ensureConnection();
         return await asyncRetry(async () => {
           const imageUploaded = await this.uploadImage(
-            imageInitiator
+            inputImage
           );
-          if (!(imageUploaded == null ? void 0 : imageUploaded.newImageUUID))
+          if (!(imageUploaded == null ? void 0 : imageUploaded.imageUUID))
             return null;
           const taskUUID = getUUID();
-          this.send({
-            newReverseImageClip: {
-              imageUUID: imageUploaded.newImageUUID,
-              taskUUID
-            }
-          });
+          this.send(__spreadValues({
+            taskUUID,
+            taskType: "imageCaption" /* IMAGE_CAPTION */,
+            inputImage: imageUploaded.imageUUID
+          }, evaluateNonTrue({ key: "includeCost", value: includeCost })));
           const lis = this.globalListener({
-            responseKey: "newReverseClip",
-            taskKey: "newReverseClip.texts",
             taskUUID
           });
           const response = await getIntervalWithPromise(
             ({ resolve, reject }) => {
-              const newReverseClip = this._globalMessages[taskUUID];
+              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[0]);
+                resolve(newReverseClip);
                 return true;
               }
             },
@@ -650,39 +600,59 @@ var RunwareBase = class {
       }
     };
     this.removeImageBackground = async ({
-      imageInitiator
+      inputImage,
+      outputType,
+      outputFormat,
+      rgba,
+      postProcessMask,
+      returnOnlyMask,
+      alphaMatting,
+      alphaMattingForegroundThreshold,
+      alphaMattingBackgroundThreshold,
+      alphaMattingErodeSize,
+      includeCost
     }) => {
       try {
         await this.ensureConnection();
         return await asyncRetry(async () => {
           const imageUploaded = await this.uploadImage(
-            imageInitiator
+            inputImage
           );
-          if (!(imageUploaded == null ? void 0 : imageUploaded.newImageUUID))
+          if (!(imageUploaded == null ? void 0 : imageUploaded.imageUUID))
             return null;
           const taskUUID = getUUID();
-          this.send({
-            newRemoveBackground: {
-              imageUUID: imageUploaded.newImageUUID,
-              taskUUID,
-              taskType: 8
-            }
-          });
+          this.send(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({
+            taskType: "imageBackgroundRemoval" /* IMAGE_BACKGROUND_REMOVAL */,
+            taskUUID,
+            inputImage: 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({
-            responseKey: "newRemoveBackground",
-            taskKey: "newRemoveBackground.images",
             taskUUID
           });
           const response = await getIntervalWithPromise(
             ({ resolve, reject }) => {
-              const newRemoveBackground = this._globalMessages[taskUUID];
+              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);
+                resolve([newRemoveBackground]);
                 return true;
               }
             },
@@ -696,39 +666,41 @@ var RunwareBase = class {
       }
     };
     this.upscaleGan = async ({
-      imageInitiator,
-      upscaleFactor
+      inputImage,
+      upscaleFactor,
+      outputType,
+      outputFormat,
+      includeCost
     }) => {
       try {
         await this.ensureConnection();
         return await asyncRetry(async () => {
           let imageUploaded;
-          imageUploaded = await this.uploadImage(imageInitiator);
-          if (!(imageUploaded == null ? void 0 : imageUploaded.newImageUUID))
+          imageUploaded = await this.uploadImage(inputImage);
+          if (!(imageUploaded == null ? void 0 : imageUploaded.imageUUID))
             return null;
           const taskUUID = getUUID();
-          this.send({
-            newUpscaleGan: {
-              imageUUID: imageUploaded == null ? void 0 : imageUploaded.newImageUUID,
-              taskUUID,
-              upscaleFactor
-            }
-          });
+          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({
-            responseKey: "newUpscaleGan",
-            taskKey: "newUpscaleGan.images",
             taskUUID
           });
           const response = await getIntervalWithPromise(
             ({ resolve, reject }) => {
-              const newUpscaleGan = this._globalMessages[taskUUID];
+              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);
+                resolve([newUpscaleGan]);
                 return true;
               }
             },
@@ -744,25 +716,22 @@ var RunwareBase = class {
     this.enhancePrompt = async ({
       prompt,
       promptMaxLength = 380,
-      promptLanguageId = 1,
-      promptVersions = 1
+      promptVersions = 1,
+      includeCost
     }) => {
       try {
         await this.ensureConnection();
         return await asyncRetry(async () => {
           const taskUUID = getUUID();
-          this.send({
-            newPromptEnhance: {
-              prompt,
-              taskUUID,
-              promptMaxLength,
-              promptVersions,
-              promptLanguageId
-            }
-          });
+          this.send(__spreadProps(__spreadValues({
+            prompt,
+            taskUUID,
+            promptMaxLength,
+            promptVersions
+          }, evaluateNonTrue({ key: "includeCost", value: includeCost })), {
+            taskType: "promptEnhance" /* PROMPT_ENHANCE */
+          }));
           const lis = this.globalListener({
-            responseKey: "newPromptEnhancer",
-            taskKey: "newPromptEnhancer.texts",
             taskUUID
           });
           const response = await getIntervalWithPromise(
@@ -787,6 +756,12 @@ var RunwareBase = class {
         throw e;
       }
     };
+    this.getSingleMessage = ({ taskUUID }) => {
+      var _a, _b;
+      if (!((_a = this._globalMessages[taskUUID]) == null ? void 0 : _a[0]))
+        return null;
+      return (_b = this._globalMessages[taskUUID]) == null ? void 0 : _b[0];
+    };
     this.connected = () => this.isWebsocketReadyState() && !!this._connectionSessionUUID;
     this._apiKey = apiKey;
     this._url = url;
@@ -814,14 +789,27 @@ var RunwareBase = class {
   // }
   addListener({
     lis,
-    check,
-    groupKey
+    // check,
+    groupKey,
+    taskUUID
   }) {
     const listener = (msg) => {
-      if (msg == null ? void 0 : msg.error) {
-        lis(msg);
-      } else if (check(msg)) {
-        lis(msg);
+      var _a;
+      const arrayMessage = Array.isArray(msg == null ? void 0 : msg.data) ? msg.data : [msg.data];
+      const arrayErrors = Array.isArray(msg == null ? void 0 : msg.errors) ? msg.errors : [msg.errors];
+      const filteredMessage = arrayMessage.filter(
+        (v) => (v == null ? void 0 : v.taskUUID) === taskUUID
+      );
+      const filteredErrors = arrayErrors.filter(
+        (v) => (v == null ? void 0 : v.taskUUID) === taskUUID
+      );
+      if (filteredErrors.length) {
+        lis({ error: __spreadValues({}, (_a = arrayErrors[0]) != null ? _a : {}) });
+        return;
+      }
+      if (filteredMessage.length) {
+        lis({ [taskUUID]: arrayMessage });
+        return;
       }
     };
     const groupListener = { key: getUUID(), listener, groupKey };
@@ -837,28 +825,24 @@ var RunwareBase = class {
     this._ws.onopen = (e) => {
       if (this._connectionSessionUUID) {
         this.send({
-          newConnection: {
-            apiKey: this._apiKey,
-            connectionSessionUUID: this._connectionSessionUUID
-          }
+          taskType: "authentication" /* AUTHENTICATION */,
+          apiKey: this._apiKey,
+          connectionSessionUUID: this._connectionSessionUUID
         });
       } else {
-        this.send({ newConnection: { apiKey: this._apiKey } });
+        this.send({ apiKey: this._apiKey, taskType: "authentication" /* AUTHENTICATION */ });
       }
       this.addListener({
-        check: (m) => {
-          var _a;
-          return (_a = m == null ? void 0 : m.newConnectionSessionUUID) == null ? void 0 : _a.connectionSessionUUID;
-        },
+        taskUUID: "authentication" /* AUTHENTICATION */,
         lis: (m) => {
-          var _a;
+          var _a, _b;
           if (m == null ? void 0 : m.error) {
             if (m.errorId === 19) {
               this._invalidAPIkey = "Invalid API key";
             }
             return;
           }
-          this._connectionSessionUUID = (_a = m == null ? void 0 : m.newConnectionSessionUUID) == null ? void 0 : _a.connectionSessionUUID;
+          this._connectionSessionUUID = (_b = (_a = m == null ? void 0 : m["authentication" /* AUTHENTICATION */]) == null ? void 0 : _a[0]) == null ? void 0 : _b.connectionSessionUUID;
           this._invalidAPIkey = void 0;
         }
       });
@@ -888,13 +872,10 @@ var RunwareBase = class {
     groupKey
   }) {
     return this.addListener({
-      check: (m) => {
-        var _a;
-        return (_a = m.newImages) == null ? void 0 : _a.images;
-      },
+      taskUUID,
       lis: (m) => {
-        var _a, _b, _c;
-        const images = (_b = (_a = m.newImages) == null ? void 0 : _a.images) == null ? void 0 : _b.filter(
+        var _a, _b;
+        const images = (_a = m == null ? void 0 : m[taskUUID]) == null ? void 0 : _a.filter(
           (img) => img.taskUUID === taskUUID
         );
         onPartialImages == null ? void 0 : onPartialImages(images, (m == null ? void 0 : m.error) && m);
@@ -904,7 +885,7 @@ var RunwareBase = class {
           if (this._sdkType === "CLIENT" /* CLIENT */) {
             this._globalImages = [
               ...this._globalImages,
-              ...(_c = m.newImages) == null ? void 0 : _c.images
+              ...(_b = m == null ? void 0 : m[taskUUID]) != null ? _b : []
             ];
           } else {
             this._globalImages = [...this._globalImages, ...images];
@@ -914,27 +895,25 @@ var RunwareBase = class {
       groupKey
     });
   }
-  globalListener({
-    responseKey,
-    taskKey,
-    taskUUID
-  }) {
+  globalListener({ taskUUID }) {
     return this.addListener({
-      check: (m) => {
-        const value = accessDeepObject({
-          key: responseKey,
-          data: m,
-          useZero: false
-        });
-        return !!value;
-      },
+      // check: (m) => {
+      //   const value = accessDeepObject({
+      //     key: responseKey,
+      //     data: m,
+      //     useZero: false,
+      //   });
+      //   return !!value;
+      // },
+      // check: responseKey,
+      taskUUID,
       lis: (m) => {
         if (m.error) {
           this._globalMessages[taskUUID] = m;
           return;
         }
         const value = accessDeepObject({
-          key: taskKey,
+          key: taskUUID,
           data: m,
           useZero: false
         });
@@ -953,24 +932,30 @@ var RunwareBase = class {
     });
   }
   async requestImages({
-    modelId,
+    outputType,
+    outputFormat,
+    uploadEndpoint,
+    checkNsfw,
     positivePrompt,
-    imageSize,
     negativePrompt,
-    numberOfImages = 1,
-    useCache = false,
-    imageInitiator,
-    controlNet,
-    imageMaskInitiator,
+    seedImage,
+    maskImage,
+    strength,
+    height,
+    width,
+    model,
     steps,
-    onPartialImages,
-    lora,
-    seed,
-    gScale,
-    checkNsfw,
-    returnBase64Image,
     scheduler,
-    usePromptWeighting
+    seed,
+    CFGScale,
+    clipSkip,
+    usePromptWeighting,
+    numberResults = 1,
+    controlNet,
+    lora,
+    useCache,
+    onPartialImages,
+    includeCost
   }) {
     let lis = void 0;
     let requestObject = void 0;
@@ -978,86 +963,68 @@ var RunwareBase = class {
     let retryCount = 0;
     try {
       await this.ensureConnection();
-      let imageInitiatorUUID = null;
-      let imageMaskInitiatorUUID = null;
+      let seedImageUUID = null;
+      let maskImageUUID = null;
       let controlNetData = [];
-      if (imageInitiator) {
-        const uploadedImage = await this.uploadImage(imageInitiator);
+      if (seedImage) {
+        const uploadedImage = await this.uploadImage(seedImage);
         if (!uploadedImage)
           return [];
-        imageInitiatorUUID = uploadedImage.newImageUUID;
+        seedImageUUID = uploadedImage.imageUUID;
       }
-      if (imageMaskInitiator) {
-        const uploadedMaskInitiator = await this.uploadImage(
-          imageMaskInitiator
-        );
+      if (maskImage) {
+        const uploadedMaskInitiator = await this.uploadImage(maskImage);
         if (!uploadedMaskInitiator)
           return [];
-        imageMaskInitiatorUUID = uploadedMaskInitiator.newImageUUID;
+        maskImageUUID = uploadedMaskInitiator.imageUUID;
       }
       if (controlNet == null ? void 0 : controlNet.length) {
         for (let i = 0; i < controlNet.length; i++) {
           const controlData = controlNet[i];
-          const anyControlData = controlData;
           const {
             endStep,
-            preprocessor,
             startStep,
             weight,
             guideImage,
-            guideImageUnprocessed,
             controlMode,
-            returnBase64Image: returnBase64Image2
+            startStepPercentage,
+            endStepPercentage,
+            model: controlNetModel
           } = controlData;
-          const getCannyObject = () => {
-            if (controlData.preprocessor === "canny") {
-              return {
-                lowThresholdCanny: anyControlData.lowThresholdCanny,
-                highThresholdCanny: anyControlData.highThresholdCanny
-              };
-            } else
-              return {};
-          };
-          const imageUploaded = await (guideImageUnprocessed ? this.uploadUnprocessedImage(__spreadProps(__spreadValues({
-            file: guideImageUnprocessed,
-            preProcessorType: getPreprocessorType(
-              preprocessor
-            ),
-            includeHandsAndFaceOpenPose: anyControlData.includeHandsAndFaceOpenPose
-          }, getCannyObject()), {
-            returnBase64Image: returnBase64Image2
-          })) : this.uploadImage(guideImage));
+          if (!guideImage)
+            return;
+          const imageUploaded = await this.uploadImage(
+            guideImage
+          );
           if (!imageUploaded)
-            return [];
-          controlNetData.push(__spreadValues({
-            guideImageUUID: imageUploaded.newImageUUID,
+            return;
+          controlNetData.push(__spreadProps(__spreadValues(__spreadValues({
+            guideImage: imageUploaded.imageUUID,
+            model: controlNetModel,
             endStep,
-            preprocessor,
             startStep,
-            weight,
+            weight
+          }, evaluateNonTrue({
+            key: "startStepPercentage",
+            value: startStepPercentage
+          })), evaluateNonTrue({
+            key: "endStepPercentage",
+            value: endStepPercentage
+          })), {
             controlMode: controlMode || "controlnet" /* CONTROL_NET */
-          }, getCannyObject()));
+          }));
         }
       }
-      const prompt = `${positivePrompt} ${negativePrompt ? `-no ${negativePrompt}` : ""}`.trim();
-      gScale = gScale != null ? gScale : 7;
-      requestObject = __spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({
-        offset: 0,
-        modelId,
-        promptText: prompt,
-        numberResults: numberOfImages,
-        sizeId: imageSize,
-        taskType: getTaskType({
-          prompt,
-          controlNet,
-          imageInitiator,
-          imageMaskInitiator
-        }),
-        useCache
-      }, scheduler ? { scheduler } : {}), returnBase64Image ? { returnBase64Image } : {}), evaluateNonTrue({ key: "checkNsfw", value: checkNsfw })), evaluateNonTrue({ key: "gScale", value: gScale })), evaluateNonTrue({ key: "steps", value: steps })), evaluateNonTrue({
+      requestObject = __spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadProps(__spreadValues(__spreadValues(__spreadValues({
+        taskType: "imageInference" /* IMAGE_INFERENCE */,
+        model,
+        positivePrompt
+      }, negativePrompt ? { negativePrompt } : {}), height ? { height } : {}), width ? { width } : {}), {
+        numberResults
+      }), (lora == null ? void 0 : lora.length) ? { lora } : {}), outputType ? { outputType } : {}), outputFormat ? { outputFormat } : {}), uploadEndpoint ? { uploadEndpoint } : {}), evaluateNonTrue({ key: "checkNsfw", value: checkNsfw })), evaluateNonTrue({ key: "strength", value: strength })), evaluateNonTrue({ key: "CFGScale", value: CFGScale })), evaluateNonTrue({ key: "clipSkip", value: clipSkip })), evaluateNonTrue({
         key: "usePromptWeighting",
         value: usePromptWeighting
-      })), imageInitiatorUUID ? { imageInitiatorUUID } : {}), imageMaskInitiatorUUID ? { imageMaskInitiatorUUID } : {}), controlNetData.length ? { controlNet: controlNetData } : {}), (lora == null ? void 0 : lora.length) ? { lora } : {}), seed ? { seed } : {});
+      })), evaluateNonTrue({ key: "steps", value: steps })), controlNetData.length ? { controlNet: controlNetData } : {}), seed ? { seed } : {}), scheduler ? { scheduler } : {}), evaluateNonTrue({ key: "includeCost", value: includeCost })), evaluateNonTrue({ key: "useCache", value: useCache })), seedImageUUID ? { seedImage: seedImageUUID } : {}), maskImageUUID ? { maskImage: maskImageUUID } : {});
       return await asyncRetry(
         async () => {
           retryCount++;
@@ -1067,22 +1034,20 @@ var RunwareBase = class {
           );
           const taskUUID = getUUID();
           taskUUIDs.push(taskUUID);
-          const imageRemaining = numberOfImages - imagesWithSimilarTask.length;
-          const newRequestObject = {
-            newTask: __spreadProps(__spreadValues({}, requestObject), {
-              taskUUID,
-              numberResults: imageRemaining
-            })
-          };
+          const imageRemaining = numberResults - imagesWithSimilarTask.length;
+          const newRequestObject = __spreadProps(__spreadValues({}, requestObject), {
+            taskUUID,
+            numberResults: imageRemaining
+          });
           this.send(newRequestObject);
           lis = this.listenToImages({
             onPartialImages,
             taskUUID,
             groupKey: "REQUEST_IMAGES" /* REQUEST_IMAGES */
           });
-          const promise = await this.getSimililarImage({
+          const promise = await this.getSimilarImages({
             taskUUID: taskUUIDs,
-            numberOfImages,
+            numberResults,
             lis
           });
           return promise;
@@ -1100,25 +1065,9 @@ var RunwareBase = class {
       }
     }
   }
-  handleIncompleteImages({
-    taskUUIDs,
-    error
-  }) {
-    const imagesWithSimilarTask = this._globalImages.filter(
-      (img) => taskUUIDs.includes(img.taskUUID)
-    );
-    if (imagesWithSimilarTask.length > 1) {
-      this._globalImages = this._globalImages.filter(
-        (img) => !taskUUIDs.includes(img.taskUUID)
-      );
-      return imagesWithSimilarTask;
-    } else {
-      throw error;
-    }
-  }
   async ensureConnection() {
     var _a;
-    let isConnected = this.connected() && this._ws.readyState === 1;
+    let isConnected = this.connected();
     try {
       if (this._invalidAPIkey)
         throw this._invalidAPIkey;
@@ -1130,9 +1079,9 @@ var RunwareBase = class {
       throw (_a = this._invalidAPIkey) != null ? _a : "Could not connect to server. Ensure your API key is correct";
     }
   }
-  async getSimililarImage({
+  async getSimilarImages({
     taskUUID,
-    numberOfImages,
+    numberResults,
     shouldThrowError,
     lis
   }) {
@@ -1148,20 +1097,34 @@ var RunwareBase = class {
           clearInterval(intervalId);
           reject == null ? void 0 : reject(newData);
           return true;
-        } else if (imagesWithSimilarTask.length >= numberOfImages) {
+        } else if (imagesWithSimilarTask.length >= numberResults) {
           clearInterval(intervalId);
           this._globalImages = this._globalImages.filter(
             (img) => !taskUUIDs.includes(img.taskUUID)
           );
-          resolve(
-            [...imagesWithSimilarTask].slice(0, numberOfImages)
-          );
+          resolve([...imagesWithSimilarTask].slice(0, numberResults));
           return true;
         }
       },
       { debugKey: "getting images", shouldThrowError }
     );
   }
+  handleIncompleteImages({
+    taskUUIDs,
+    error
+  }) {
+    const imagesWithSimilarTask = this._globalImages.filter(
+      (img) => taskUUIDs.includes(img.taskUUID)
+    );
+    if (imagesWithSimilarTask.length > 1) {
+      this._globalImages = this._globalImages.filter(
+        (img) => !taskUUIDs.includes(img.taskUUID)
+      );
+      return imagesWithSimilarTask;
+    } else {
+      throw error;
+    }
+  }
   //end of data
 };
 
@@ -1188,7 +1151,7 @@ var RunwareServer = class extends RunwareBase {
     this._listeners = [];
     this._reconnectingIntervalId = null;
     this.send = (msg) => {
-      this._ws.send(JSON.stringify(msg));
+      this._ws.send(JSON.stringify([msg]));
     };
     this._sdkType = "SERVER" /* SERVER */;
     if (apiKey) {
@@ -1231,51 +1194,23 @@ var RunwareServer = class extends RunwareBase {
     });
     this._ws.on("close", () => this.handleClose());
     this._ws.on("open", () => {
-      var _a;
       if (this._reconnectingIntervalId) {
         clearInterval(this._reconnectingIntervalId);
       }
       if (this._connectionSessionUUID && this.isWebsocketReadyState()) {
         this.send({
-          newConnection: {
-            apiKey: this._apiKey,
-            connectionSessionUUID: this._connectionSessionUUID
-          }
+          taskType: "authentication" /* AUTHENTICATION */,
+          apiKey: this._apiKey,
+          connectionSessionUUID: this._connectionSessionUUID
         });
       } else {
         if (this.isWebsocketReadyState()) {
-          this.send({ newConnection: { apiKey: this._apiKey } });
+          this.send({
+            apiKey: this._apiKey,
+            taskType: "authentication" /* AUTHENTICATION */
+          });
         }
       }
-      this.addListener({
-        check: (m) => {
-          var _a2;
-          return (_a2 = m == null ? void 0 : m.newConnectionSessionUUID) == null ? void 0 : _a2.connectionSessionUUID;
-        },
-        lis: (m) => {
-          var _a2;
-          if (m == null ? void 0 : m.error) {
-            if (m.errorId === 19) {
-              this._invalidAPIkey = "Invalid API key";
-            } else {
-              this._invalidAPIkey = "Error connection ";
-            }
-            return;
-          }
-          this._connectionSessionUUID = (_a2 = m == null ? void 0 : m.newConnectionSessionUUID) == null ? void 0 : _a2.connectionSessionUUID;
-          this._invalidAPIkey = void 0;
-          this.heartBeat();
-        }
-      });
-      (_a = this._pongListener) == null ? void 0 : _a.destroy();
-      this._pongListener = this.addListener({
-        check: (m) => m == null ? void 0 : m.pong,
-        lis: (m) => {
-          if (m.pong) {
-            this.heartBeat();
-          }
-        }
-      });
     });
     this._ws.on("message", (e, isBinary) => {
       const data = isBinary ? e : e == null ? void 0 : e.toString();
@@ -1316,6 +1251,7 @@ var RunwareServer = class extends RunwareBase {
   EOpenPosePreProcessor,
   EPreProcessor,
   EPreProcessorGroup,
+  ETaskType,
   Environment,
   Runware,
   RunwareServer,