@runware/sdk-js 1.1.9 → 1.1.11

package/dist/index.d.mts

@@ -81,7 +81,7 @@ type IControlNetPreprocess = {
 };
 type IControlNet = IControlNetGeneral;
 type IControlNetWithUUID = Omit<IControlNet, "guideImage"> & {
-    guideImage: string;
+    guideImage?: string;
 };
 interface IError {
     error: boolean;
@@ -112,7 +112,6 @@ interface IRequestImage {
     lora?: ILora[];
     includeCost?: boolean;
     customTaskUUID?: string;
-    useCache?: boolean;
     onPartialImages?: (images: IImage[], error?: IError) => void;
     retry?: number;
 }
@@ -243,10 +242,6 @@ type ListenerType = {
     groupKey?: string;
 };
 
-declare enum LISTEN_TO_IMAGES_KEY {
-    REQUEST_IMAGES = "REQUEST_IMAGES"
-}
-
 declare class RunwareBase {
     _ws: ReconnectingWebsocketProps | any;
     _listeners: ListenerType[];
@@ -268,47 +263,26 @@ declare class RunwareBase {
         destroy: () => void;
     };
     protected connect(): void;
-    protected send: (msg: Object) => any;
+    protected send: (msg: Object) => void;
     private destroy;
     private uploadImage;
-    listenToImages({ onPartialImages, taskUUID, groupKey, positivePrompt, negativePrompt, }: {
-        taskUUID: string;
-        onPartialImages?: (images: IImage[], error?: any) => void;
-        groupKey: LISTEN_TO_IMAGES_KEY;
-        positivePrompt?: string;
-        negativePrompt?: string;
-    }): {
-        destroy: () => void;
-    };
-    globalListener({ taskUUID }: {
-        taskUUID: string;
-    }): {
-        destroy: () => void;
-    };
-    requestImages({ outputType, outputFormat, uploadEndpoint, checkNsfw, positivePrompt, negativePrompt, seedImage, maskImage, strength, height, width, model, steps, scheduler, seed, CFGScale, clipSkip, usePromptWeighting, numberResults, controlNet, lora, useCache, onPartialImages, includeCost, customTaskUUID, retry, }: IRequestImage): Promise<ITextToImage[] | undefined>;
+    private listenToImages;
+    private globalListener;
+    requestImages({ outputType, outputFormat, uploadEndpoint, checkNsfw, positivePrompt, negativePrompt, seedImage, maskImage, strength, height, width, model, steps, scheduler, seed, CFGScale, clipSkip, usePromptWeighting, numberResults, controlNet, lora, onPartialImages, includeCost, customTaskUUID, retry, }: IRequestImage): Promise<ITextToImage[] | undefined>;
     controlNetPreProcess: ({ inputImage, preProcessor, height, width, outputType, outputFormat, highThresholdCanny, lowThresholdCanny, includeHandsAndFaceOpenPose, includeCost, customTaskUUID, }: IControlNetPreprocess) => Promise<IControlNetImage | null>;
     requestImageToText: ({ inputImage, includeCost, customTaskUUID, }: IRequestImageToText) => Promise<IImageToText>;
     removeImageBackground: ({ inputImage, outputType, outputFormat, rgba, postProcessMask, returnOnlyMask, alphaMatting, alphaMattingForegroundThreshold, alphaMattingBackgroundThreshold, alphaMattingErodeSize, includeCost, customTaskUUID, }: IRemoveImageBackground) => Promise<IRemoveImage[]>;
     upscaleGan: ({ inputImage, upscaleFactor, outputType, outputFormat, includeCost, customTaskUUID, }: IUpscaleGan) => Promise<IImage[]>;
     enhancePrompt: ({ prompt, promptMaxLength, promptVersions, includeCost, customTaskUUID, }: IPromptEnhancer) => Promise<IEnhancedPrompt[]>;
     ensureConnection(): Promise<unknown>;
-    getSimilarImages({ taskUUID, numberResults, shouldThrowError, lis, }: {
-        taskUUID: string | string[];
-        numberResults: number;
-        shouldThrowError?: boolean;
-        lis: any;
-    }): Promise<IImage[] | IError>;
-    getSingleMessage: ({ taskUUID }: {
-        taskUUID: string;
-    }) => any;
-    handleIncompleteImages({ taskUUIDs, error, }: {
-        taskUUIDs: string[];
-        error: any;
-    }): IImage[];
-    connected: () => boolean;
+    private getSimilarImages;
+    private getSingleMessage;
+    private handleIncompleteImages;
+    disconnect: () => Promise<void>;
+    private connected;
 }
 
-declare class Runware extends RunwareBase {
+declare class RunwareClient extends RunwareBase {
     constructor({ apiKey, url }: RunwareBaseType);
 }
 
@@ -325,4 +299,6 @@ declare class RunwareServer extends RunwareBase {
     protected heartBeat(): void;
 }
 
-export { EControlMode, EOpenPosePreProcessor, EPreProcessor, EPreProcessorGroup, ETaskType, Environment, GetWithPromiseCallBackType, IControlNet, IControlNetGeneral, IControlNetImage, IControlNetPreprocess, IControlNetWithUUID, IEnhancedPrompt, IError, IImage, IImageToText, IOutputFormat, IOutputType, IPromptEnhancer, IRemoveImage, IRemoveImageBackground, IRequestImage, IRequestImageToText, ITextToImage, IUpscaleGan, ListenerType, ReconnectingWebsocketProps, RequireAtLeastOne, RequireOnlyOne, Runware, RunwareBaseType, RunwareServer, SdkType, UploadImageType };
+declare let Runware: any;
+
+export { EControlMode, EOpenPosePreProcessor, EPreProcessor, EPreProcessorGroup, ETaskType, Environment, GetWithPromiseCallBackType, IControlNet, IControlNetGeneral, IControlNetImage, IControlNetPreprocess, IControlNetWithUUID, IEnhancedPrompt, IError, IImage, IImageToText, IOutputFormat, IOutputType, IPromptEnhancer, IRemoveImage, IRemoveImageBackground, IRequestImage, IRequestImageToText, ITextToImage, IUpscaleGan, ListenerType, ReconnectingWebsocketProps, RequireAtLeastOne, RequireOnlyOne, Runware, RunwareBaseType, RunwareClient, RunwareServer, SdkType, UploadImageType };

package/dist/index.d.ts

@@ -81,7 +81,7 @@ type IControlNetPreprocess = {
 };
 type IControlNet = IControlNetGeneral;
 type IControlNetWithUUID = Omit<IControlNet, "guideImage"> & {
-    guideImage: string;
+    guideImage?: string;
 };
 interface IError {
     error: boolean;
@@ -112,7 +112,6 @@ interface IRequestImage {
     lora?: ILora[];
     includeCost?: boolean;
     customTaskUUID?: string;
-    useCache?: boolean;
     onPartialImages?: (images: IImage[], error?: IError) => void;
     retry?: number;
 }
@@ -243,10 +242,6 @@ type ListenerType = {
     groupKey?: string;
 };
 
-declare enum LISTEN_TO_IMAGES_KEY {
-    REQUEST_IMAGES = "REQUEST_IMAGES"
-}
-
 declare class RunwareBase {
     _ws: ReconnectingWebsocketProps | any;
     _listeners: ListenerType[];
@@ -268,47 +263,26 @@ declare class RunwareBase {
         destroy: () => void;
     };
     protected connect(): void;
-    protected send: (msg: Object) => any;
+    protected send: (msg: Object) => void;
     private destroy;
     private uploadImage;
-    listenToImages({ onPartialImages, taskUUID, groupKey, positivePrompt, negativePrompt, }: {
-        taskUUID: string;
-        onPartialImages?: (images: IImage[], error?: any) => void;
-        groupKey: LISTEN_TO_IMAGES_KEY;
-        positivePrompt?: string;
-        negativePrompt?: string;
-    }): {
-        destroy: () => void;
-    };
-    globalListener({ taskUUID }: {
-        taskUUID: string;
-    }): {
-        destroy: () => void;
-    };
-    requestImages({ outputType, outputFormat, uploadEndpoint, checkNsfw, positivePrompt, negativePrompt, seedImage, maskImage, strength, height, width, model, steps, scheduler, seed, CFGScale, clipSkip, usePromptWeighting, numberResults, controlNet, lora, useCache, onPartialImages, includeCost, customTaskUUID, retry, }: IRequestImage): Promise<ITextToImage[] | undefined>;
+    private listenToImages;
+    private globalListener;
+    requestImages({ outputType, outputFormat, uploadEndpoint, checkNsfw, positivePrompt, negativePrompt, seedImage, maskImage, strength, height, width, model, steps, scheduler, seed, CFGScale, clipSkip, usePromptWeighting, numberResults, controlNet, lora, onPartialImages, includeCost, customTaskUUID, retry, }: IRequestImage): Promise<ITextToImage[] | undefined>;
     controlNetPreProcess: ({ inputImage, preProcessor, height, width, outputType, outputFormat, highThresholdCanny, lowThresholdCanny, includeHandsAndFaceOpenPose, includeCost, customTaskUUID, }: IControlNetPreprocess) => Promise<IControlNetImage | null>;
     requestImageToText: ({ inputImage, includeCost, customTaskUUID, }: IRequestImageToText) => Promise<IImageToText>;
     removeImageBackground: ({ inputImage, outputType, outputFormat, rgba, postProcessMask, returnOnlyMask, alphaMatting, alphaMattingForegroundThreshold, alphaMattingBackgroundThreshold, alphaMattingErodeSize, includeCost, customTaskUUID, }: IRemoveImageBackground) => Promise<IRemoveImage[]>;
     upscaleGan: ({ inputImage, upscaleFactor, outputType, outputFormat, includeCost, customTaskUUID, }: IUpscaleGan) => Promise<IImage[]>;
     enhancePrompt: ({ prompt, promptMaxLength, promptVersions, includeCost, customTaskUUID, }: IPromptEnhancer) => Promise<IEnhancedPrompt[]>;
     ensureConnection(): Promise<unknown>;
-    getSimilarImages({ taskUUID, numberResults, shouldThrowError, lis, }: {
-        taskUUID: string | string[];
-        numberResults: number;
-        shouldThrowError?: boolean;
-        lis: any;
-    }): Promise<IImage[] | IError>;
-    getSingleMessage: ({ taskUUID }: {
-        taskUUID: string;
-    }) => any;
-    handleIncompleteImages({ taskUUIDs, error, }: {
-        taskUUIDs: string[];
-        error: any;
-    }): IImage[];
-    connected: () => boolean;
+    private getSimilarImages;
+    private getSingleMessage;
+    private handleIncompleteImages;
+    disconnect: () => Promise<void>;
+    private connected;
 }
 
-declare class Runware extends RunwareBase {
+declare class RunwareClient extends RunwareBase {
     constructor({ apiKey, url }: RunwareBaseType);
 }
 
@@ -325,4 +299,6 @@ declare class RunwareServer extends RunwareBase {
     protected heartBeat(): void;
 }
 
-export { EControlMode, EOpenPosePreProcessor, EPreProcessor, EPreProcessorGroup, ETaskType, Environment, GetWithPromiseCallBackType, IControlNet, IControlNetGeneral, IControlNetImage, IControlNetPreprocess, IControlNetWithUUID, IEnhancedPrompt, IError, IImage, IImageToText, IOutputFormat, IOutputType, IPromptEnhancer, IRemoveImage, IRemoveImageBackground, IRequestImage, IRequestImageToText, ITextToImage, IUpscaleGan, ListenerType, ReconnectingWebsocketProps, RequireAtLeastOne, RequireOnlyOne, Runware, RunwareBaseType, RunwareServer, SdkType, UploadImageType };
+declare let Runware: any;
+
+export { EControlMode, EOpenPosePreProcessor, EPreProcessor, EPreProcessorGroup, ETaskType, Environment, GetWithPromiseCallBackType, IControlNet, IControlNetGeneral, IControlNetImage, IControlNetPreprocess, IControlNetWithUUID, IEnhancedPrompt, IError, IImage, IImageToText, IOutputFormat, IOutputType, IPromptEnhancer, IRemoveImage, IRemoveImageBackground, IRequestImage, IRequestImageToText, ITextToImage, IUpscaleGan, ListenerType, ReconnectingWebsocketProps, RequireAtLeastOne, RequireOnlyOne, Runware, RunwareBaseType, RunwareClient, RunwareServer, SdkType, UploadImageType };

package/dist/index.js

@@ -227,6 +227,7 @@ __export(Runware_exports, {
   ETaskType: () => ETaskType,
   Environment: () => Environment,
   Runware: () => Runware,
+  RunwareClient: () => RunwareClient,
   RunwareServer: () => RunwareServer,
   SdkType: () => SdkType
 });
@@ -339,13 +340,6 @@ var getIntervalWithPromise = (callback, {
   shouldThrowError = true
 }) => {
   return new Promise((resolve, reject) => {
-    let intervalId = setInterval(async () => {
-      const shouldClear = callback({ resolve, reject, intervalId });
-      if (shouldClear) {
-        clearInterval(intervalId);
-        intervalId = 0;
-      }
-    }, POLLING_INTERVAL);
     const timeoutId = setTimeout(() => {
       if (intervalId) {
         clearInterval(intervalId);
@@ -356,6 +350,13 @@ var getIntervalWithPromise = (callback, {
       }
       clearTimeout(timeoutId);
     }, timeOutDuration);
+    let intervalId = setInterval(async () => {
+      const shouldClear = callback({ resolve, reject, intervalId });
+      if (shouldClear) {
+        clearInterval(intervalId);
+        clearTimeout(timeoutId);
+      }
+    }, POLLING_INTERVAL);
   });
 };
 var fileToBase64 = (file) => new Promise((resolve) => {
@@ -445,7 +446,9 @@ var RunwareBase = class {
       return ((_a = this._ws) == null ? void 0 : _a.readyState) === 1;
     };
     // 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.send = (msg) => {
+      this._ws.send(JSON.stringify([msg]));
+    };
     this.uploadImage = async (file) => {
       try {
         return await asyncRetry(async () => {
@@ -561,16 +564,12 @@ var RunwareBase = class {
       try {
         await this.ensureConnection();
         return await asyncRetry(async () => {
-          const imageUploaded = await this.uploadImage(
-            inputImage
-          );
-          if (!(imageUploaded == null ? void 0 : imageUploaded.imageUUID))
-            return null;
+          const imageUploaded = inputImage ? await this.uploadImage(inputImage) : null;
           const taskUUID = customTaskUUID || getUUID();
           this.send(__spreadValues({
             taskUUID,
             taskType: "imageCaption" /* IMAGE_CAPTION */,
-            inputImage: imageUploaded.imageUUID
+            inputImage: imageUploaded == null ? void 0 : imageUploaded.imageUUID
           }, evaluateNonTrue({ key: "includeCost", value: includeCost })));
           const lis = this.globalListener({
             taskUUID
@@ -618,16 +617,12 @@ var RunwareBase = class {
       try {
         await this.ensureConnection();
         return await asyncRetry(async () => {
-          const imageUploaded = await this.uploadImage(
-            inputImage
-          );
-          if (!(imageUploaded == null ? void 0 : imageUploaded.imageUUID))
-            return null;
+          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.imageUUID
+            inputImage: imageUploaded == null ? void 0 : imageUploaded.imageUUID
           }, evaluateNonTrue({ key: "rgba", value: rgba })), evaluateNonTrue({
             key: "postProcessMask",
             value: postProcessMask
@@ -681,8 +676,6 @@ var RunwareBase = class {
         return await asyncRetry(async () => {
           let imageUploaded;
           imageUploaded = await this.uploadImage(inputImage);
-          if (!(imageUploaded == null ? void 0 : imageUploaded.imageUUID))
-            return null;
           const taskUUID = customTaskUUID || getUUID();
           this.send(__spreadValues(__spreadValues(__spreadValues({
             taskUUID,
@@ -762,10 +755,16 @@ var RunwareBase = class {
       }
     };
     this.getSingleMessage = ({ taskUUID }) => {
-      var _a, _b;
-      if (!((_a = this._globalMessages[taskUUID]) == null ? void 0 : _a[0]))
+      var _a;
+      const value = this._globalMessages[taskUUID] || ((_a = this._globalMessages[taskUUID]) == null ? void 0 : _a[0]);
+      if (!value)
         return null;
-      return (_b = this._globalMessages[taskUUID]) == null ? void 0 : _b[0];
+      return value;
+    };
+    this.disconnect = async () => {
+      var _a, _b, _c, _d;
+      (_b = (_a = this._ws) == null ? void 0 : _a.terminate) == null ? void 0 : _b.call(_a);
+      (_d = (_c = this._ws) == null ? void 0 : _c.close) == null ? void 0 : _d.call(_c);
     };
     this.connected = () => this.isWebsocketReadyState() && !!this._connectionSessionUUID;
     this._apiKey = apiKey;
@@ -966,7 +965,6 @@ var RunwareBase = class {
     numberResults = 1,
     controlNet,
     lora,
-    useCache,
     onPartialImages,
     includeCost,
     customTaskUUID,
@@ -1007,15 +1005,9 @@ var RunwareBase = class {
             endStepPercentage,
             model: controlNetModel
           } = controlData;
-          if (!guideImage)
-            return;
-          const imageUploaded = await this.uploadImage(
-            guideImage
-          );
-          if (!imageUploaded)
-            return;
+          const imageUploaded = guideImage ? await this.uploadImage(guideImage) : null;
           controlNetData.push(__spreadProps(__spreadValues(__spreadValues({
-            guideImage: imageUploaded.imageUUID,
+            guideImage: imageUploaded == null ? void 0 : imageUploaded.imageUUID,
             model: controlNetModel,
             endStep,
             startStep,
@@ -1031,7 +1023,7 @@ var RunwareBase = class {
           }));
         }
       }
-      requestObject = __spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadProps(__spreadValues(__spreadValues(__spreadValues({
+      requestObject = __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
@@ -1040,7 +1032,7 @@ var RunwareBase = class {
       }), (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
-      })), 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 } : {});
+      })), evaluateNonTrue({ key: "steps", value: steps })), controlNetData.length ? { controlNet: controlNetData } : {}), seed ? { seed } : {}), scheduler ? { scheduler } : {}), evaluateNonTrue({ key: "includeCost", value: includeCost })), seedImageUUID ? { seedImage: seedImageUUID } : {}), maskImageUUID ? { maskImage: maskImageUUID } : {});
       return await asyncRetry(
         async () => {
           retryCount++;
@@ -1068,6 +1060,7 @@ var RunwareBase = class {
             numberResults,
             lis
           });
+          lis.destroy();
           return promise;
         },
         {
@@ -1098,7 +1091,7 @@ var RunwareBase = class {
         throw this._invalidAPIkey;
       return new Promise((resolve, reject) => {
         let retry = 0;
-        const MAX_RETRY = 10;
+        const MAX_RETRY = 30;
         let retryIntervalId;
         let pollingIntervalId;
         const clearAllIntervals = () => {
@@ -1195,9 +1188,9 @@ var RunwareBase = class {
   //end of data
 };
 
-// Runware/Runware.ts
+// Runware/Runware-client.ts
 var import_reconnect = __toESM(require_reconnect());
-var Runware = class extends RunwareBase {
+var RunwareClient = class extends RunwareBase {
   constructor({ apiKey, url }) {
     super({ apiKey, url });
     if (apiKey) {
@@ -1258,7 +1251,9 @@ var RunwareServer = class extends RunwareBase {
     });
     this._ws.on("error", () => {
     });
-    this._ws.on("close", () => this.handleClose());
+    this._ws.on("close", () => {
+      this.handleClose();
+    });
     this._ws.on("open", () => {
       if (this._reconnectingIntervalId) {
         clearInterval(this._reconnectingIntervalId);
@@ -1311,7 +1306,6 @@ var RunwareServer = class extends RunwareBase {
     if (this._reconnectingIntervalId) {
       clearInterval(this._reconnectingIntervalId);
     }
-    this._reconnectingIntervalId = setInterval(() => this.connect(), 1e3);
   }
   heartBeat() {
     clearTimeout(this._pingTimeout);
@@ -1323,6 +1317,14 @@ var RunwareServer = class extends RunwareBase {
   }
   //end of data
 };
+
+// Runware/Runware.ts
+var Runware;
+if (typeof window === "undefined") {
+  Runware = RunwareServer;
+} else {
+  Runware = RunwareClient;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   EControlMode,
@@ -1332,6 +1334,7 @@ var RunwareServer = class extends RunwareBase {
   ETaskType,
   Environment,
   Runware,
+  RunwareClient,
   RunwareServer,
   SdkType
 });

package/dist/index.mjs

@@ -318,13 +318,6 @@ var getIntervalWithPromise = (callback, {
   shouldThrowError = true
 }) => {
   return new Promise((resolve, reject) => {
-    let intervalId = setInterval(async () => {
-      const shouldClear = callback({ resolve, reject, intervalId });
-      if (shouldClear) {
-        clearInterval(intervalId);
-        intervalId = 0;
-      }
-    }, POLLING_INTERVAL);
     const timeoutId = setTimeout(() => {
       if (intervalId) {
         clearInterval(intervalId);
@@ -335,6 +328,13 @@ var getIntervalWithPromise = (callback, {
       }
       clearTimeout(timeoutId);
     }, timeOutDuration);
+    let intervalId = setInterval(async () => {
+      const shouldClear = callback({ resolve, reject, intervalId });
+      if (shouldClear) {
+        clearInterval(intervalId);
+        clearTimeout(timeoutId);
+      }
+    }, POLLING_INTERVAL);
   });
 };
 var fileToBase64 = (file) => new Promise((resolve) => {
@@ -424,7 +424,9 @@ var RunwareBase = class {
       return ((_a = this._ws) == null ? void 0 : _a.readyState) === 1;
     };
     // 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.send = (msg) => {
+      this._ws.send(JSON.stringify([msg]));
+    };
     this.uploadImage = async (file) => {
       try {
         return await asyncRetry(async () => {
@@ -540,16 +542,12 @@ var RunwareBase = class {
       try {
         await this.ensureConnection();
         return await asyncRetry(async () => {
-          const imageUploaded = await this.uploadImage(
-            inputImage
-          );
-          if (!(imageUploaded == null ? void 0 : imageUploaded.imageUUID))
-            return null;
+          const imageUploaded = inputImage ? await this.uploadImage(inputImage) : null;
           const taskUUID = customTaskUUID || getUUID();
           this.send(__spreadValues({
             taskUUID,
             taskType: "imageCaption" /* IMAGE_CAPTION */,
-            inputImage: imageUploaded.imageUUID
+            inputImage: imageUploaded == null ? void 0 : imageUploaded.imageUUID
           }, evaluateNonTrue({ key: "includeCost", value: includeCost })));
           const lis = this.globalListener({
             taskUUID
@@ -597,16 +595,12 @@ var RunwareBase = class {
       try {
         await this.ensureConnection();
         return await asyncRetry(async () => {
-          const imageUploaded = await this.uploadImage(
-            inputImage
-          );
-          if (!(imageUploaded == null ? void 0 : imageUploaded.imageUUID))
-            return null;
+          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.imageUUID
+            inputImage: imageUploaded == null ? void 0 : imageUploaded.imageUUID
           }, evaluateNonTrue({ key: "rgba", value: rgba })), evaluateNonTrue({
             key: "postProcessMask",
             value: postProcessMask
@@ -660,8 +654,6 @@ var RunwareBase = class {
         return await asyncRetry(async () => {
           let imageUploaded;
           imageUploaded = await this.uploadImage(inputImage);
-          if (!(imageUploaded == null ? void 0 : imageUploaded.imageUUID))
-            return null;
           const taskUUID = customTaskUUID || getUUID();
           this.send(__spreadValues(__spreadValues(__spreadValues({
             taskUUID,
@@ -741,10 +733,16 @@ var RunwareBase = class {
       }
     };
     this.getSingleMessage = ({ taskUUID }) => {
-      var _a, _b;
-      if (!((_a = this._globalMessages[taskUUID]) == null ? void 0 : _a[0]))
+      var _a;
+      const value = this._globalMessages[taskUUID] || ((_a = this._globalMessages[taskUUID]) == null ? void 0 : _a[0]);
+      if (!value)
         return null;
-      return (_b = this._globalMessages[taskUUID]) == null ? void 0 : _b[0];
+      return value;
+    };
+    this.disconnect = async () => {
+      var _a, _b, _c, _d;
+      (_b = (_a = this._ws) == null ? void 0 : _a.terminate) == null ? void 0 : _b.call(_a);
+      (_d = (_c = this._ws) == null ? void 0 : _c.close) == null ? void 0 : _d.call(_c);
     };
     this.connected = () => this.isWebsocketReadyState() && !!this._connectionSessionUUID;
     this._apiKey = apiKey;
@@ -945,7 +943,6 @@ var RunwareBase = class {
     numberResults = 1,
     controlNet,
     lora,
-    useCache,
     onPartialImages,
     includeCost,
     customTaskUUID,
@@ -986,15 +983,9 @@ var RunwareBase = class {
             endStepPercentage,
             model: controlNetModel
           } = controlData;
-          if (!guideImage)
-            return;
-          const imageUploaded = await this.uploadImage(
-            guideImage
-          );
-          if (!imageUploaded)
-            return;
+          const imageUploaded = guideImage ? await this.uploadImage(guideImage) : null;
           controlNetData.push(__spreadProps(__spreadValues(__spreadValues({
-            guideImage: imageUploaded.imageUUID,
+            guideImage: imageUploaded == null ? void 0 : imageUploaded.imageUUID,
             model: controlNetModel,
             endStep,
             startStep,
@@ -1010,7 +1001,7 @@ var RunwareBase = class {
           }));
         }
       }
-      requestObject = __spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadProps(__spreadValues(__spreadValues(__spreadValues({
+      requestObject = __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
@@ -1019,7 +1010,7 @@ var RunwareBase = class {
       }), (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
-      })), 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 } : {});
+      })), evaluateNonTrue({ key: "steps", value: steps })), controlNetData.length ? { controlNet: controlNetData } : {}), seed ? { seed } : {}), scheduler ? { scheduler } : {}), evaluateNonTrue({ key: "includeCost", value: includeCost })), seedImageUUID ? { seedImage: seedImageUUID } : {}), maskImageUUID ? { maskImage: maskImageUUID } : {});
       return await asyncRetry(
         async () => {
           retryCount++;
@@ -1047,6 +1038,7 @@ var RunwareBase = class {
             numberResults,
             lis
           });
+          lis.destroy();
           return promise;
         },
         {
@@ -1077,7 +1069,7 @@ var RunwareBase = class {
         throw this._invalidAPIkey;
       return new Promise((resolve, reject) => {
         let retry = 0;
-        const MAX_RETRY = 10;
+        const MAX_RETRY = 30;
         let retryIntervalId;
         let pollingIntervalId;
         const clearAllIntervals = () => {
@@ -1174,9 +1166,9 @@ var RunwareBase = class {
   //end of data
 };
 
-// Runware/Runware.ts
+// Runware/Runware-client.ts
 var import_reconnect = __toESM(require_reconnect());
-var Runware = class extends RunwareBase {
+var RunwareClient = class extends RunwareBase {
   constructor({ apiKey, url }) {
     super({ apiKey, url });
     if (apiKey) {
@@ -1237,7 +1229,9 @@ var RunwareServer = class extends RunwareBase {
     });
     this._ws.on("error", () => {
     });
-    this._ws.on("close", () => this.handleClose());
+    this._ws.on("close", () => {
+      this.handleClose();
+    });
     this._ws.on("open", () => {
       if (this._reconnectingIntervalId) {
         clearInterval(this._reconnectingIntervalId);
@@ -1290,7 +1284,6 @@ var RunwareServer = class extends RunwareBase {
     if (this._reconnectingIntervalId) {
       clearInterval(this._reconnectingIntervalId);
     }
-    this._reconnectingIntervalId = setInterval(() => this.connect(), 1e3);
   }
   heartBeat() {
     clearTimeout(this._pingTimeout);
@@ -1302,6 +1295,14 @@ var RunwareServer = class extends RunwareBase {
   }
   //end of data
 };
+
+// Runware/Runware.ts
+var Runware;
+if (typeof window === "undefined") {
+  Runware = RunwareServer;
+} else {
+  Runware = RunwareClient;
+}
 export {
   EControlMode,
   EOpenPosePreProcessor,
@@ -1310,6 +1311,7 @@ export {
   ETaskType,
   Environment,
   Runware,
+  RunwareClient,
   RunwareServer,
   SdkType
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@runware/sdk-js",
-  "version": "1.1.9",
+  "version": "1.1.11",
   "description": "The SDK is used to run image inference with the Runware API, powered by the RunWare inference platform. It can be used to generate imaged with text-to-image and image-to-image. It also allows the use of an existing gallery of models or selecting any model or LoRA from the CivitAI gallery. The API also supports upscaling, background removal, inpainting and outpainting, and a series of other ControlNet models.",
   "main": "dist/index.js",
   "module": "dist/index.mjs",