add reroll & add flags & fix api

.github/workflows/releases.yaml

@@ -1,6 +1,6 @@
 name: Node.js Package
 env:
-  APPVERSION: v2.7.${{ github.run_number }}
+  APPVERSION: v3.0.${{ github.run_number }}
 on:
   workflow_dispatch:
   push:

README.md

@@ -30,31 +30,31 @@ import { Midjourney } from "midjourney";
     Debug: true,
     Ws:true,
   });
-  await client.init();
+  await client.Connect();
   const Imagine = await client.Imagine("A little pink elephant", (uri: string, progress:string) => {
    onsole.log("Imagine", uri, "progress", progress);
   });
   console.log({ Imagine });
 
-  const Variation = await client.Variation(
-    Imagine.content,
-    2,
-    <string>Imagine.id,
-    <string>Imagine.hash,
-    (uri: string, progress:string) => {
-     onsole.log("Imagine", uri, "progress", progress);
-    }
-  );
+  const Variation = await client.Variation({
+    index: 2,
+    msgId: <string>Imagine.id,
+    hash: <string>Imagine.hash,
+    flags: Imagine.flags,
+    loading: (uri: string, progress: string) => {
+      console.log("Variation.loading", uri, "progress", progress);
+    },
+  });
   console.log({ Variation });
-  const Upscale = await client.Upscale(
-    Variation.content,
-    2,
-    <string>Variation.id,
-    <string>Variation.hash,
-    (uri: string, progress: string) => {
-      console.log("Upscale", uri, "progress", progress);
-    }
-  );
+  const Upscale = await client.Upscale({
+    index: 2,
+    msgId: <string>Variation.id,
+    hash: <string>Variation.hash,
+    flags: Variation.flags,
+    loading: (uri: string, progress: string) => {
+      console.log("Upscale.loading", uri, "progress", progress);
+    },
+  });
   console.log({ Upscale });
 
 ```
@@ -101,7 +101,7 @@ npx tsx example/imagine-ws.ts
 ```
 
 ## route-map
-- [x] `/imagine` `variation` `upscale` 
+- [x] `/imagine` `variation` `upscale` `reroll`
 - [x] websocket get message
 - [x] callback error
 - [x] verify human

example/describe.ts

@@ -15,7 +15,7 @@ async function main() {
     Debug: true,
     Ws: true,
   });
-  await client.init();
+  await client.Connect();
   const msg = await client.Describe(
     "https://img.ohdat.io/midjourney-image/1b74cab8-70c9-474e-bfbb-093e9a3cfd5c/0_1.png"
   );

example/fast.ts

@@ -15,7 +15,7 @@ async function main() {
     Debug: true,
     Ws: true,
   });
-  await client.init();
+  await client.Connect();
   await client.Fast();
   const msg = await client.Info();
   console.log({ msg });

example/imagine-dm.ts

@@ -13,7 +13,7 @@ async function main() {
     Debug: true,
     Ws: true,
   });
-  await client.init();
+  await client.Connect();
   const msg = await client.Imagine(
     "A little white dog",
     (uri: string, progress: string) => {

example/imagine-err.ts

@@ -16,7 +16,7 @@ async function main() {
     Ws: true,
   });
 
-  await client.init();
+  await client.Connect();
   const msg = await client.Imagine(
     "https://edge-runtime.vercel.app/features/available-apis",
     (uri: string, progress: string) => {

example/imagine-uri.ts

@@ -25,15 +25,16 @@ async function main() {
     console.log("no message");
     return;
   }
-  const msg2 = await client.Upscale(
-    msg.content,
-    2,
-    msg.id,
-    msg.hash,
-    (uri: string, progress: string) => {
+  const msg2 = await client.Upscale({
+    index: 2,
+    msgId: <string>msg.id,
+    hash: <string>msg.hash,
+    flags: msg.flags,
+    content: msg.content,
+    loading: (uri: string, progress: string) => {
       console.log("loading", uri, "progress", progress);
-    }
-  );
+    },
+  });
   console.log({ msg2 });
 }
 main().catch((err) => {

example/imagine-ws-m.ts

@@ -14,9 +14,8 @@ async function main() {
     SalaiToken: <string>process.env.SALAI_TOKEN,
     HuggingFaceToken: <string>process.env.HUGGINGFACE_TOKEN,
     Debug: true,
-    Ws: true,
   });
-  await client.init();
+  await client.Connect();
   client
     .Imagine("A little pink elephant", (uri) => {
       console.log("loading123---", uri);

example/imagine-ws.ts

@@ -16,7 +16,7 @@ async function main() {
     Debug: true,
     Ws: true,
   });
-  await client.init();
+  await client.Connect();
   const Imagine = await client.Imagine(
     "Red hamster smoking a cigaret, https://media.discordapp.net/attachments/1108515696385720410/1118385339732590682/DanielH_A_giant_hamster_monster._Friendly_in_a_business_suit_si_d4be1836-a4e1-41a8-b1d7-99eebc521220.png?width=1878&height=1878 ",
     (uri: string, progress: string) => {
@@ -27,30 +27,41 @@ async function main() {
   if (!Imagine) {
     return;
   }
-  const Variation = await client.Variation(
-    Imagine.content,
-    2,
-    <string>Imagine.id,
-    <string>Imagine.hash,
-    (uri: string, progress: string) => {
+  const reroll = await client.Reroll({
+    msgId: <string>Imagine.id,
+    hash: <string>Imagine.hash,
+    flags: Imagine.flags,
+    loading: (uri: string, progress: string) => {
+      console.log("Reroll.loading", uri, "progress", progress);
+    },
+  });
+  console.log({ reroll });
+
+  const Variation = await client.Variation({
+    index: 2,
+    msgId: <string>Imagine.id,
+    hash: <string>Imagine.hash,
+    flags: Imagine.flags,
+    loading: (uri: string, progress: string) => {
       console.log("Variation.loading", uri, "progress", progress);
-    }
-  );
+    },
+  });
 
   console.log({ Variation });
   if (!Variation) {
     return;
   }
-  const Upscale = await client.Upscale(
-    Variation.content,
-    2,
-    <string>Variation.id,
-    <string>Variation.hash,
-    (uri: string, progress: string) => {
+  const Upscale = await client.Upscale({
+    index: 2,
+    msgId: <string>Variation.id,
+    hash: <string>Variation.hash,
+    flags: Variation.flags,
+    loading: (uri: string, progress: string) => {
       console.log("Upscale.loading", uri, "progress", progress);
-    }
-  );
+    },
+  });
   console.log({ Upscale });
+
   client.Close();
 }
 main()

example/info.ts

@@ -15,7 +15,7 @@ async function main() {
     Debug: true,
     Ws: true,
   });
-  await client.init();
+  await client.Connect();
   const msg = await client.Info();
   console.log({ msg });
   client.Close();

example/relax.ts

@@ -15,7 +15,7 @@ async function main() {
     Debug: true,
     Ws: true,
   });
-  await client.init();
+  await client.Connect();
   await client.Relax();
   const msg = await client.Info();
   console.log({ msg });

example/upscale-ws.ts

@@ -15,23 +15,24 @@ async function main() {
     Debug: true,
     Ws: true,
   });
-  await client.init();
+  await client.Connect();
   const msg = await client.Imagine("a cool cat, blue ears, yellow hat");
   console.log({ msg });
   if (!msg) {
     console.log("no message");
     return;
   }
-  const msg2 = await client.Upscale(
-    msg.content,
-    2,
-    <string>msg.id,
-    <string>msg.hash,
-    (uri: string, progress: string) => {
+  const msg2 = await client.Upscale({
+    index: 2,
+    msgId: <string>msg.id,
+    hash: <string>msg.hash,
+    flags: msg.flags,
+    loading: (uri: string, progress: string) => {
       console.log("loading", uri, "progress", progress);
-    }
-  );
+    },
+  });
   console.log({ msg2 });
+  client.Close();
 }
 main().catch((err) => {
   console.error(err);

example/upscale.ts

@@ -20,15 +20,16 @@ async function main() {
     console.log("no message");
     return;
   }
-  const msg2 = await client.Upscale(
-    msg.content,
-    2,
-    <string>msg.id,
-    <string>msg.hash,
-    (uri: string, progress: string) => {
+  const msg2 = await client.Upscale({
+    index: 2,
+    msgId: <string>msg.id,
+    hash: <string>msg.hash,
+    flags: msg.flags,
+    content: msg.content,
+    loading: (uri: string, progress: string) => {
       console.log("loading", uri, "progress", progress);
-    }
-  );
+    },
+  });
   console.log({ msg2 });
 }
 main().catch((err) => {

example/variation-ws.ts

@@ -15,36 +15,39 @@ async function main() {
     Debug: true,
     Ws: true,
   });
-  await client.init();
-  const msg = await client.Imagine("a dog, blue ears, and a red nose");
-  console.log({ msg });
-  if (!msg) {
+  await client.Connect();
+  const Imagine = await client.Imagine(
+    "the queen of the underworld, race: vampire, appearance: delicate features with detailed portrayal, super exquisite facial features, silver long hair reaching ankles, silver pupils, fair skin with a hint of melancholy in the eyes, beautiful and noble, clothing: wearing a blood-red rose on the hair, skirt with layers of lace, sitting in a (pose), captured in ultra-high resolution, film-like realism, 8k for the best visual quality, super clear and finely drawn. --ar 9:16 --v 5"
+  );
+  console.log({ Imagine });
+  if (!Imagine) {
     console.log("no message");
     return;
   }
+
   client
-    .Variation(
-      msg.content,
-      2,
-      <string>msg.id,
-      <string>msg.hash,
-      (uri: string) => {
-        console.log("loading2", uri);
-      }
-    )
+    .Variation({
+      index: 2,
+      msgId: <string>Imagine.id,
+      hash: <string>Imagine.hash,
+      flags: Imagine.flags,
+      loading: (uri: string, progress: string) => {
+        console.log("Variation2.loading", uri, "progress", progress);
+      },
+    })
     .then((msg2) => {
       console.log({ msg2 });
     });
   client
-    .Variation(
-      msg.content,
-      3,
-      <string>msg.id,
-      <string>msg.hash,
-      (uri: string) => {
-        console.log("loading3", uri);
-      }
-    )
+    .Variation({
+      index: 3,
+      msgId: <string>Imagine.id,
+      hash: <string>Imagine.hash,
+      flags: Imagine.flags,
+      loading: (uri: string, progress: string) => {
+        console.log("Variation3.loading", uri, "progress", progress);
+      },
+    })
     .then((msg3) => {
       console.log({ msg3 });
     });