add options

example/imagine.ts

@@ -16,12 +16,12 @@ async function main() {
   });
 
   const msg = 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",
+    "Red hamster",
     (uri: string, progress: string) => {
       console.log("loading", uri, "progress", progress);
     }
   );
-  console.log({ msg });
+  console.log(JSON.stringify(msg));
 }
 main().catch((err) => {
   console.error(err);

src/interfaces/message.ts

@@ -5,6 +5,7 @@ export interface MJMessage {
   id?: string;
   hash?: string;
   progress?: string;
+  options?: MJOptions[];
 }
 
 export type LoadingHandler = (uri: string, progress: string) => void;
@@ -34,5 +35,6 @@ export interface MJInfo {
 
 export interface MJOptions {
   label: string;
+  type: string;
   custom: string;
 }

src/midjourney.message.ts

@@ -1,3 +1,4 @@
+import { format } from "path";
 import {
   DefaultMJConfig,
   LoadingHandler,
@@ -6,7 +7,7 @@ import {
   MJConfigParam,
 } from "./interfaces";
 import { CreateQueue } from "./queue";
-import { sleep } from "./utls";
+import { formatOptions, sleep } from "./utls";
 
 export class MidjourneyMessage {
   private magApiQueue = CreateQueue(1);
@@ -61,12 +62,13 @@ export class MidjourneyMessage {
         //finished
         const content = item.content.split("**")[1];
         const msg: MJMessage = {
+          content,
           id: item.id,
           uri: imageUrl,
           flags: item.flags,
           hash: this.UriToHash(imageUrl),
-          content: content,
           progress: "done",
+          options: formatOptions(item.components),
         };
         return msg;
       }

src/utls/index.ts

@@ -1,16 +1,33 @@
 import { Snowyflake, Epoch } from "snowyflake";
+import { MJOptions } from "../interfaces";
 
 export const sleep = async (ms: number): Promise<void> =>
   await new Promise((resolve) => setTimeout(resolve, ms));
 
 export const random = (min: number, max: number): number =>
   Math.floor(Math.random() * (max - min) + min);
 
-// const snowflake = new Snowflake(1);
 const snowflake = new Snowyflake({
   workerId: 0n,
   processId: 0n,
   epoch: Epoch.Discord, // BigInt timestamp
 });
 
 export const nextNonce = (): string => snowflake.nextId().toString();
+
+export const formatOptions = (components: any) => {
+  var data: MJOptions[] = [];
+  for (var i = 0; i < components.length; i++) {
+    const component = components[i];
+    if (component.components && component.components.length > 0) {
+      const item = formatOptions(component.components);
+      data = data.concat(item);
+    }
+    data.push({
+      type: component.type,
+      label: component.label || component.emoji?.name,
+      custom: component.custom_id,
+    });
+  }
+  return data;
+};

src/ws.message.ts

@@ -8,6 +8,7 @@ import {
 } from "./interfaces";
 
 import { MidjourneyApi } from "./midjourne.api";
+import { formatOptions } from "./utls";
 import { VerifyHuman } from "./verify.human";
 import WebSocket from "isomorphic-ws";
 export class WsMessage {
@@ -239,14 +240,15 @@ export class WsMessage {
 
   private done(message: any) {
     const { content, id, attachments, components, flags } = message;
-    console.log("components=====", JSON.stringify(message));
+    console.log("components=====", JSON.stringify(components));
     const MJmsg: MJMessage = {
       id,
+      flags,
+      content,
       hash: this.uriToHash(attachments[0].url),
       progress: "done",
-      flags: flags,
       uri: attachments[0].url,
-      content: content,
+      options: formatOptions(components),
     };
     this.filterMessages(MJmsg);
     return;