@runware/sdk-js 1.1.0 → 1.1.2

package/dist/index.d.mts

@@ -279,7 +279,7 @@ declare class RunwareBase {
     removeImageBackground: ({ inputImage, outputType, outputFormat, rgba, postProcessMask, returnOnlyMask, alphaMatting, alphaMattingForegroundThreshold, alphaMattingBackgroundThreshold, alphaMattingErodeSize, includeCost, }: IRemoveImageBackground) => Promise<IRemoveImage[]>;
     upscaleGan: ({ inputImage, upscaleFactor, outputType, outputFormat, includeCost, }: IUpscaleGan) => Promise<IImage[]>;
     enhancePrompt: ({ prompt, promptMaxLength, promptVersions, includeCost, }: IPromptEnhancer) => Promise<IEnhancedPrompt[]>;
-    ensureConnection(): Promise<void>;
+    ensureConnection(): Promise<unknown>;
     getSimilarImages({ taskUUID, numberResults, shouldThrowError, lis, }: {
         taskUUID: string | string[];
         numberResults: number;

package/dist/index.d.ts

@@ -279,7 +279,7 @@ declare class RunwareBase {
     removeImageBackground: ({ inputImage, outputType, outputFormat, rgba, postProcessMask, returnOnlyMask, alphaMatting, alphaMattingForegroundThreshold, alphaMattingBackgroundThreshold, alphaMattingErodeSize, includeCost, }: IRemoveImageBackground) => Promise<IRemoveImage[]>;
     upscaleGan: ({ inputImage, upscaleFactor, outputType, outputFormat, includeCost, }: IUpscaleGan) => Promise<IImage[]>;
     enhancePrompt: ({ prompt, promptMaxLength, promptVersions, includeCost, }: IPromptEnhancer) => Promise<IEnhancedPrompt[]>;
-    ensureConnection(): Promise<void>;
+    ensureConnection(): Promise<unknown>;
     getSimilarImages({ taskUUID, numberResults, shouldThrowError, lis, }: {
         taskUUID: string | string[];
         numberResults: number;

package/dist/index.js

@@ -798,10 +798,10 @@ var RunwareBase = class {
       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
+        (v) => ((v == null ? void 0 : v.taskUUID) || (v == null ? void 0 : v.taskType)) === taskUUID
       );
       const filteredErrors = arrayErrors.filter(
-        (v) => (v == null ? void 0 : v.taskUUID) === taskUUID
+        (v) => ((v == null ? void 0 : v.taskUUID) || (v == null ? void 0 : v.taskType)) === taskUUID
       );
       if (filteredErrors.length) {
         lis({ error: __spreadValues({}, (_a = arrayErrors[0]) != null ? _a : {}) });
@@ -1068,9 +1068,34 @@ var RunwareBase = class {
   async ensureConnection() {
     var _a;
     let isConnected = this.connected();
+    if (isConnected)
+      return;
+    const interval = 2e3;
     try {
       if (this._invalidAPIkey)
         throw this._invalidAPIkey;
+      return new Promise((resolve, reject) => {
+        let retry = 0;
+        const MAX_RETRY = 2;
+        const intervalId = setInterval(async () => {
+          try {
+            const hasConnected = this.connected();
+            if (hasConnected) {
+              clearInterval(intervalId);
+              resolve(true);
+            } else if (retry >= MAX_RETRY) {
+              clearInterval(intervalId);
+              reject(new Error("Polling timed out"));
+            } else {
+              this.connect();
+              retry++;
+            }
+          } catch (error) {
+            clearInterval(intervalId);
+            reject(error);
+          }
+        }, interval);
+      });
       if (!isConnected) {
         this.connect();
         await delay(2);
@@ -1211,6 +1236,20 @@ var RunwareServer = class extends RunwareBase {
           });
         }
       }
+      this.addListener({
+        taskUUID: "authentication" /* AUTHENTICATION */,
+        lis: (m) => {
+          var _a, _b;
+          if (m == null ? void 0 : m.error) {
+            if (m.errorId === 19) {
+              this._invalidAPIkey = "Invalid API key";
+            }
+            return;
+          }
+          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;
+        }
+      });
     });
     this._ws.on("message", (e, isBinary) => {
       const data = isBinary ? e : e == null ? void 0 : e.toString();

package/dist/index.mjs

@@ -777,10 +777,10 @@ var RunwareBase = class {
       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
+        (v) => ((v == null ? void 0 : v.taskUUID) || (v == null ? void 0 : v.taskType)) === taskUUID
       );
       const filteredErrors = arrayErrors.filter(
-        (v) => (v == null ? void 0 : v.taskUUID) === taskUUID
+        (v) => ((v == null ? void 0 : v.taskUUID) || (v == null ? void 0 : v.taskType)) === taskUUID
       );
       if (filteredErrors.length) {
         lis({ error: __spreadValues({}, (_a = arrayErrors[0]) != null ? _a : {}) });
@@ -1047,9 +1047,34 @@ var RunwareBase = class {
   async ensureConnection() {
     var _a;
     let isConnected = this.connected();
+    if (isConnected)
+      return;
+    const interval = 2e3;
     try {
       if (this._invalidAPIkey)
         throw this._invalidAPIkey;
+      return new Promise((resolve, reject) => {
+        let retry = 0;
+        const MAX_RETRY = 2;
+        const intervalId = setInterval(async () => {
+          try {
+            const hasConnected = this.connected();
+            if (hasConnected) {
+              clearInterval(intervalId);
+              resolve(true);
+            } else if (retry >= MAX_RETRY) {
+              clearInterval(intervalId);
+              reject(new Error("Polling timed out"));
+            } else {
+              this.connect();
+              retry++;
+            }
+          } catch (error) {
+            clearInterval(intervalId);
+            reject(error);
+          }
+        }, interval);
+      });
       if (!isConnected) {
         this.connect();
         await delay(2);
@@ -1190,6 +1215,20 @@ var RunwareServer = class extends RunwareBase {
           });
         }
       }
+      this.addListener({
+        taskUUID: "authentication" /* AUTHENTICATION */,
+        lis: (m) => {
+          var _a, _b;
+          if (m == null ? void 0 : m.error) {
+            if (m.errorId === 19) {
+              this._invalidAPIkey = "Invalid API key";
+            }
+            return;
+          }
+          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;
+        }
+      });
     });
     this._ws.on("message", (e, isBinary) => {
       const data = isBinary ? e : e == null ? void 0 : e.toString();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@runware/sdk-js",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "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",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "uuid": "^9.0.1",
-    "ws": "^8.14.2"
+    "ws": "^8.18.0"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.8"

package/readme.md

@@ -356,6 +356,19 @@ return interface IControlNetImage {
 
 ## Changelog
 
+### - v1.1.2
+
+**Added or Changed**
+
+- Retry connection for server side
+
+### - v1.1.1
+
+**Added or Changed**
+
+- Upgraded WS
+- Fix delay time
+
 ### - v1.1.0
 
 **Added or Changed**