@runware/sdk-js 1.1.18 → 1.1.20-beta.1

package/dist/index.js

@@ -1,4 +1,3 @@
-"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
@@ -37,10 +36,6 @@ var __objRest = (source, exclude) => {
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -57,11 +52,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // Runware/reconnect.ts
 var require_reconnect = __commonJS({
-  "Runware/reconnect.ts"(exports, module2) {
+  "Runware/reconnect.ts"(exports, module) {
     "use strict";
     var isWebSocket = (constructor) => constructor && constructor.CLOSING === 2;
     var isGlobalWebSocket = () => typeof WebSocket !== "undefined" && isWebSocket(WebSocket);
@@ -225,26 +219,10 @@ var require_reconnect = __commonJS({
         ws.removeEventListener(type, listener, options2);
       };
     };
-    module2.exports = ReconnectingWebsocket2;
+    module.exports = ReconnectingWebsocket2;
   }
 });
 
-// Runware/index.ts
-var Runware_exports = {};
-__export(Runware_exports, {
-  EControlMode: () => EControlMode,
-  EOpenPosePreProcessor: () => EOpenPosePreProcessor,
-  EPreProcessor: () => EPreProcessor,
-  EPreProcessorGroup: () => EPreProcessorGroup,
-  ETaskType: () => ETaskType,
-  Environment: () => Environment,
-  Runware: () => Runware,
-  RunwareClient: () => RunwareClient,
-  RunwareServer: () => RunwareServer,
-  SdkType: () => SdkType
-});
-module.exports = __toCommonJS(Runware_exports);
-
 // Runware/types.ts
 var Environment = /* @__PURE__ */ ((Environment2) => {
   Environment2["PRODUCTION"] = "PRODUCTION";
@@ -266,6 +244,7 @@ var ETaskType = /* @__PURE__ */ ((ETaskType2) => {
   ETaskType2["IMAGE_CONTROL_NET_PRE_PROCESS"] = "imageControlNetPreProcess";
   ETaskType2["PROMPT_ENHANCE"] = "promptEnhance";
   ETaskType2["AUTHENTICATION"] = "authentication";
+  ETaskType2["MODEL_UPLOAD"] = "modelUpload";
   return ETaskType2;
 })(ETaskType || {});
 var EControlMode = /* @__PURE__ */ ((EControlMode2) => {
@@ -329,7 +308,7 @@ var EOpenPosePreProcessor = /* @__PURE__ */ ((EOpenPosePreProcessor2) => {
 })(EOpenPosePreProcessor || {});
 
 // Runware/utils.ts
-var import_uuid = require("uuid");
+import { v4 as uuidv4, validate as validateUUID } from "uuid";
 var TIMEOUT_DURATION = 6e4;
 var MINIMUM_TIMEOUT_DURATION = 1e3;
 var POLLING_INTERVAL = 100;
@@ -379,8 +358,8 @@ var fileToBase64 = (file) => new Promise((resolve) => {
     resolve(reader.result);
   };
 });
-var getUUID = () => (0, import_uuid.v4)();
-var isValidUUID = (uuid) => (0, import_uuid.validate)(uuid);
+var getUUID = () => uuidv4();
+var isValidUUID = (uuid) => validateUUID(uuid);
 var accessDeepObject = ({
   key,
   data,
@@ -494,7 +473,7 @@ var RunwareBase = class {
     };
     this.controlNetPreProcess = async ({
       inputImage,
-      preProcessor,
+      preProcessorType,
       height,
       width,
       outputType,
@@ -520,7 +499,7 @@ var RunwareBase = class {
               inputImage: image.imageUUID,
               taskType: "imageControlNetPreProcess" /* IMAGE_CONTROL_NET_PRE_PROCESS */,
               taskUUID,
-              preProcessor
+              preProcessorType
             }, 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
@@ -823,6 +802,54 @@ var RunwareBase = class {
         throw e;
       }
     };
+    this.modelUpload = async (payload) => {
+      const _a = payload, { onUploadStream, retry, customTaskUUID } = _a, addModelPayload = __objRest(_a, ["onUploadStream", "retry", "customTaskUUID"]);
+      const totalRetry = retry || this._globalMaxRetries;
+      let lis = void 0;
+      try {
+        return await asyncRetry(
+          async () => {
+            await this.ensureConnection();
+            const taskUUID = customTaskUUID || getUUID();
+            this.send(__spreadProps(__spreadValues({}, addModelPayload), {
+              taskUUID,
+              taskType: "modelUpload" /* MODEL_UPLOAD */
+            }));
+            let result;
+            lis = this.listenToUpload({
+              taskUUID,
+              onUploadStream: (response, error) => {
+                onUploadStream == null ? void 0 : onUploadStream(response, error);
+                if ((response == null ? void 0 : response.statusId) === 1 || error) {
+                  result = response || error;
+                }
+              }
+            });
+            const modelUploadResponse = await getIntervalWithPromise(
+              ({ resolve }) => {
+                if (result) {
+                  resolve(result);
+                  return true;
+                }
+              },
+              {
+                shouldThrowError: false,
+                timeoutDuration: 60 * 60 * 1e3
+              }
+            );
+            return modelUploadResponse;
+          },
+          {
+            maxRetries: totalRetry,
+            callback: () => {
+              lis == null ? void 0 : lis.destroy();
+            }
+          }
+        );
+      } catch (e) {
+        throw e;
+      }
+    };
     this.getSingleMessage = ({ taskUUID }) => {
       var _a;
       const value = (_a = this._globalMessages[taskUUID]) == null ? void 0 : _a[0];
@@ -880,9 +907,9 @@ var RunwareBase = class {
     taskUUID
   }) {
     const listener = (msg) => {
-      var _a;
+      var _a, _b, _c;
       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 arrayErrors = ((_a = msg == null ? void 0 : msg[0]) == null ? void 0 : _a.errors) ? (_b = msg == null ? void 0 : msg[0]) == null ? void 0 : _b.errors : Array.isArray(msg == null ? void 0 : msg.errors) ? msg.errors : [msg.errors];
       const filteredMessage = arrayMessage.filter(
         (v) => ((v == null ? void 0 : v.taskUUID) || (v == null ? void 0 : v.taskType)) === taskUUID
       );
@@ -890,7 +917,7 @@ var RunwareBase = class {
         (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 : {}) });
+        lis({ error: __spreadValues({}, (_c = arrayErrors[0]) != null ? _c : {}) });
         return;
       }
       if (filteredMessage.length) {
@@ -898,7 +925,7 @@ var RunwareBase = class {
         return;
       }
     };
-    const groupListener = { key: getUUID(), listener, groupKey };
+    const groupListener = { key: taskUUID || getUUID(), listener, groupKey };
     this._listeners.push(groupListener);
     const destroy = () => {
       this._listeners = removeListener(this._listeners, groupListener);
@@ -988,6 +1015,23 @@ var RunwareBase = class {
       groupKey
     });
   }
+  listenToUpload({
+    onUploadStream,
+    taskUUID
+  }) {
+    return this.addListener({
+      taskUUID,
+      lis: (m) => {
+        var _a;
+        const error = m == null ? void 0 : m.error;
+        const result = (_a = m == null ? void 0 : m[taskUUID]) == null ? void 0 : _a[0];
+        let response = (result == null ? void 0 : result.taskUUID) === taskUUID ? result : null;
+        if (response || error) {
+          onUploadStream == null ? void 0 : onUploadStream(response || void 0, error);
+        }
+      }
+    });
+  }
   globalListener({ taskUUID }) {
     return this.addListener({
       // check: (m) => {
@@ -1274,7 +1318,7 @@ var RunwareBase = class {
 };
 
 // Runware/Runware-client.ts
-var import_reconnect = __toESM(require_reconnect());
+var import_reconnect = __toESM(require_reconnect(), 1);
 var RunwareClient = class extends RunwareBase {
   constructor(props) {
     const _a = props, { shouldReconnect } = _a, rest = __objRest(_a, ["shouldReconnect"]);
@@ -1287,7 +1331,7 @@ var RunwareClient = class extends RunwareBase {
 };
 
 // Runware/Runware-server.ts
-var import_ws = __toESM(require("ws"));
+import WebSocket2 from "ws";
 var RunwareServer = class extends RunwareBase {
   constructor(props) {
     super(props);
@@ -1342,7 +1386,7 @@ var RunwareServer = class extends RunwareBase {
     if (!this._url)
       return;
     this.resetConnection();
-    this._ws = new import_ws.default(this._url, {
+    this._ws = new WebSocket2(this._url, {
       perMessageDeflate: false
     });
     this._ws.on("error", () => {
@@ -1423,8 +1467,7 @@ if (typeof window === "undefined") {
 } else {
   Runware = RunwareClient;
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   EControlMode,
   EOpenPosePreProcessor,
   EPreProcessor,
@@ -1435,4 +1478,4 @@ if (typeof window === "undefined") {
   RunwareClient,
   RunwareServer,
   SdkType
-});
+};

package/dist/index.mjs

@@ -244,6 +244,7 @@ var ETaskType = /* @__PURE__ */ ((ETaskType2) => {
   ETaskType2["IMAGE_CONTROL_NET_PRE_PROCESS"] = "imageControlNetPreProcess";
   ETaskType2["PROMPT_ENHANCE"] = "promptEnhance";
   ETaskType2["AUTHENTICATION"] = "authentication";
+  ETaskType2["MODEL_UPLOAD"] = "modelUpload";
   return ETaskType2;
 })(ETaskType || {});
 var EControlMode = /* @__PURE__ */ ((EControlMode2) => {
@@ -472,7 +473,7 @@ var RunwareBase = class {
     };
     this.controlNetPreProcess = async ({
       inputImage,
-      preProcessor,
+      preProcessorType,
       height,
       width,
       outputType,
@@ -498,7 +499,7 @@ var RunwareBase = class {
               inputImage: image.imageUUID,
               taskType: "imageControlNetPreProcess" /* IMAGE_CONTROL_NET_PRE_PROCESS */,
               taskUUID,
-              preProcessor
+              preProcessorType
             }, 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
@@ -744,7 +745,7 @@ var RunwareBase = class {
       }
     };
     this.enhancePrompt = async ({
-      prompt,
+      prompt: prompt2,
       promptMaxLength = 380,
       promptVersions = 1,
       includeCost,
@@ -759,7 +760,7 @@ var RunwareBase = class {
             await this.ensureConnection();
             const taskUUID = customTaskUUID || getUUID();
             this.send(__spreadProps(__spreadValues({
-              prompt,
+              prompt: prompt2,
               taskUUID,
               promptMaxLength,
               promptVersions
@@ -801,6 +802,54 @@ var RunwareBase = class {
         throw e;
       }
     };
+    this.modelUpload = async (payload) => {
+      const _a = payload, { retry, customTaskUUID } = _a, addModelPayload = __objRest(_a, ["retry", "customTaskUUID"]);
+      const totalRetry = retry || this._globalMaxRetries;
+      let lis = void 0;
+      try {
+        return await asyncRetry(
+          async () => {
+            await this.ensureConnection();
+            const taskUUID = customTaskUUID || getUUID();
+            this.send(__spreadProps(__spreadValues({
+              prompt
+            }, addModelPayload), {
+              taskType: "modelUpload" /* MODEL_UPLOAD */
+            }));
+            lis = this.globalListener({
+              taskUUID
+            });
+            const response = await getIntervalWithPromise(
+              ({ resolve, reject }) => {
+                const modelUpload = this.getSingleMessage({ taskUUID });
+                if (!modelUpload)
+                  return;
+                if (modelUpload == null ? void 0 : modelUpload.error) {
+                  reject(modelUpload);
+                  return true;
+                }
+                if (modelUpload) {
+                  delete this._globalMessages[taskUUID];
+                  resolve(modelUpload);
+                  return true;
+                }
+              },
+              { debugKey: "modelUpload", timeoutDuration: this._timeoutDuration }
+            );
+            lis.destroy();
+            return response;
+          },
+          {
+            maxRetries: totalRetry,
+            callback: () => {
+              lis == null ? void 0 : lis.destroy();
+            }
+          }
+        );
+      } catch (e) {
+        throw e;
+      }
+    };
     this.getSingleMessage = ({ taskUUID }) => {
       var _a;
       const value = (_a = this._globalMessages[taskUUID]) == null ? void 0 : _a[0];

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@runware/sdk-js",
-  "version": "1.1.18",
+  "version": "1.1.20-beta.1",
   "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",
   "types": "dist/index.d.ts",
+  "type": "module",
   "files": [
     "dist/"
   ],
@@ -14,7 +15,8 @@
     "pkg": "npx pkgfiles",
     "dev:test": "vitest --reporter verbose",
     "test": "vitest run --reporter verbose",
-    "test:single": "vitest run --reporter verbose tests/Runware/upscale-gan.test.ts"
+    "test:single": "vitest run --reporter verbose tests/Runware/upscale-gan.test.ts",
+    "debug": "tsx tests/script.ts"
   },
   "keywords": [
     "runware",
@@ -26,6 +28,7 @@
   "devDependencies": {
     "@types/uuid": "^9.0.6",
     "@types/ws": "^8.5.8",
+    "dotenv": "^16.4.5",
     "mock-socket": "^9.3.1",
     "tsup": "^7.2.0",
     "typescript": "^5.2.2",

package/readme.md

@@ -231,7 +231,7 @@ return interface IImageToText {
 
 const  runware  =  new Runware({ apiKey: "API_KEY" });
 const image = await runware.removeImageBackground({
-	imageInitiator: string | File
+	inputImage: string | File
 	outputType?: IOutputType;
 	outputFormat?: IOutputFormat;
 	rgba?: number[];
@@ -346,7 +346,7 @@ return interface IEnhancedPrompt {
 const  runware  =  new Runware({ apiKey: "API_KEY" });
 const controlNetPreProcessed = await runware.controlNetPreProcess({
 	inputImage: string | File;
-	preProcessor: EPreProcessor;
+	preProcessorType: EPreProcessor;
 	height?: number;
 	width?: number;
 	outputType?: IOutputType;
@@ -392,6 +392,13 @@ return interface IControlNetImage {
 
 ## Changelog
 
+### - v1.1.19
+
+**Added or Changed**
+
+- Fix Preprocessor type bug for controlnet
+- Update readme
+
 ### - v1.1.18
 
 **Added or Changed**