Support custom SESSION_ID

.env.example

@@ -2,3 +2,4 @@
 SALAI_TOKEN= [Token of the Account from which you paid MidJourney]
 SERVER_ID= [Server id here]
 CHANNEL_ID= [Channel in which commands are sent]
+SESSION_ID="8bb7f5b79c7a49f7d0824ab4b8773a81"

.github/workflows/releases.yaml

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

example/imagine-uri.ts

@@ -8,12 +8,12 @@ import { Midjourney } from "../src";
  * ```
  */
 async function main() {
-  const client = new Midjourney(
-    <string>process.env.SERVER_ID,
-    <string>process.env.CHANNEL_ID,
-    <string>process.env.SALAI_TOKEN,
-    true
-  );
+  const client = new Midjourney({
+    ServerId: <string>process.env.SERVER_ID,
+    ChannelId: <string>process.env.CHANNEL_ID,
+    SalaiToken: <string>process.env.SALAI_TOKEN,
+    Debug: true,
+  });
   const msg = await client.Imagine(
     "https://media.discordapp.net/attachments/1094892992281718894/1106660210380132503/Soga_A_Greek_man_with_mustache_in_national_costume_riding_a_don_3255e7c1-38ee-4892-b7c7-9f0dc3f2786d.png?width=1040&height=1040 https://cdn.discordapp.com/attachments/1094892992281718894/1106798152188702720/Soga__489d80b2-db74-4a93-a998-881a9542abbe.png  cool boy",
     (uri: string, progress: string) => {

example/imagine.ts

@@ -8,14 +8,14 @@ import { Midjourney } from "../src";
  * ```
  */
 async function main() {
-  const client = new Midjourney(
-    <string>process.env.SERVER_ID,
-    <string>process.env.CHANNEL_ID,
-    <string>process.env.SALAI_TOKEN,
-    true
-  );
-  client.Limit = 50;
-  client.maxWait = 200;
+  const client = new Midjourney({
+    ServerId: <string>process.env.SERVER_ID,
+    ChannelId: <string>process.env.CHANNEL_ID,
+    SalaiToken: <string>process.env.SALAI_TOKEN,
+    Debug: true,
+    SessionId: process.env.SALAI_TOKEN || "8bb7f5b79c7a49f7d0824ab4b8773a81",
+  });
+
   const msg = await client.Imagine(
     "A little white elephant",
     (uri: string, progress: string) => {

example/message.ts

@@ -0,0 +1,21 @@
+import "dotenv/config";
+import { Midjourney, MidjourneyMessage } from "../src";
+/**
+ *
+ * a simple example of how to use the imagine command
+ * ```
+ * npx tsx example/message.ts
+ * ```
+ */
+async function main() {
+  const client = new MidjourneyMessage({
+    ChannelId: <string>process.env.CHANNEL_ID,
+    SalaiToken: <string>process.env.SALAI_TOKEN,
+  });
+  const msg = await client.RetrieveMessages();
+  console.log({ msg });
+}
+main().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});

example/upscale.ts

@@ -8,12 +8,12 @@ import { Midjourney } from "../src";
  * ```
  */
 async function main() {
-  const client = new Midjourney(
-    <string>process.env.SERVER_ID,
-    <string>process.env.CHANNEL_ID,
-    <string>process.env.SALAI_TOKEN,
-    true
-  );
+  const client = new Midjourney({
+    ServerId: <string>process.env.SERVER_ID,
+    ChannelId: <string>process.env.CHANNEL_ID,
+    SalaiToken: <string>process.env.SALAI_TOKEN,
+    Debug: true,
+  });
   const msg = await client.Imagine("a cool cat, blue ears, yellow hat");
   console.log({ msg });
   if (!msg) {

example/variation.ts

@@ -8,12 +8,12 @@ import { Midjourney } from "../src";
  * ```
  */
 async function main() {
-  const client = new Midjourney(
-    <string>process.env.SERVER_ID,
-    <string>process.env.CHANNEL_ID,
-    <string>process.env.SALAI_TOKEN,
-    true
-  );
+  const client = new Midjourney({
+    ServerId: <string>process.env.SERVER_ID,
+    ChannelId: <string>process.env.CHANNEL_ID,
+    SalaiToken: <string>process.env.SALAI_TOKEN,
+    Debug: true,
+  });
   const msg = await client.Imagine("a dog, blue ears, and a red nose");
   console.log({ msg });
   if (!msg) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "midjourney",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "Node.js client for the unofficial MidJourney API.",
   "main": "libs/index.js",
   "types": "libs/index.d.ts",

src/interfaces/index.ts

@@ -1 +1,2 @@
 export * from "./message";
+export * from "./message.config";

src/interfaces/message.config.ts

@@ -0,0 +1,35 @@
+export interface MessageConfig {
+  ChannelId: string;
+  SalaiToken: string;
+  Debug: boolean;
+  Limit: number;
+  MaxWait: number;
+}
+export interface MessageConfigParam {
+  ChannelId: string;
+  SalaiToken: string;
+  Debug?: boolean;
+  Limit?: number;
+  MaxWait?: number;
+}
+export interface MidjourneyConfig extends MessageConfig {
+  ServerId: string;
+  SessionId: string;
+}
+
+export interface MidjourneyConfigParam extends MessageConfigParam {
+  ServerId: string;
+  SessionId?: string;
+}
+export const DefaultMessageConfig: MessageConfig = {
+  ChannelId: "",
+  SalaiToken: "",
+  Debug: false,
+  Limit: 50,
+  MaxWait: 100,
+};
+export const DefaultMidjourneyConfig: MidjourneyConfig = {
+  ...DefaultMessageConfig,
+  ServerId: "",
+  SessionId: "8bb7f5b79c7a49f7d0824ab4b8773a81",
+};

src/midjourney.message.ts

@@ -1,20 +1,25 @@
-import { LoadingHandler, MJMessage } from "./interfaces";
+import {
+  DefaultMessageConfig,
+  LoadingHandler,
+  MJMessage,
+  MessageConfig,
+  MessageConfigParam,
+  MidjourneyConfig,
+} from "./interfaces";
 import { CreateQueue } from "./queue";
 import { sleep } from "./utls";
 
 export class MidjourneyMessage {
   private magApiQueue = CreateQueue(1);
-  constructor(
-    public ChannelId: string,
-    protected SalaiToken: string,
-    public debug = false,
-    public Limit = 50,
-    public maxWait = 100
-  ) {
-    this.log("MidjourneyMessage constructor");
+  public config: MessageConfig;
+  constructor(defaults: MessageConfigParam) {
+    this.config = {
+      ...DefaultMessageConfig,
+      ...defaults,
+    };
   }
   protected log(...args: any[]) {
-    this.debug && console.log(...args, new Date().toISOString());
+    this.config.Debug && console.log(...args, new Date().toISOString());
   }
   async FilterMessages(
     prompt: string,
@@ -28,7 +33,7 @@ export class MidjourneyMessage {
     // remove multiple spaces
     prompt = prompt.trim();
 
-    const data = await this.safeRetrieveMessages(this.Limit);
+    const data = await this.safeRetrieveMessages(this.config.Limit);
     for (let i = 0; i < data.length; i++) {
       const item = data[i];
       if (
@@ -87,7 +92,7 @@ export class MidjourneyMessage {
     return uri.split("_").pop()?.split(".")[0] ?? "";
   }
   async WaitMessage(prompt: string, loading?: LoadingHandler) {
-    for (let i = 0; i < this.maxWait; i++) {
+    for (let i = 0; i < this.config.MaxWait; i++) {
       const msg = await this.FilterMessages(prompt, loading);
       if (msg !== null) {
         return msg;
@@ -102,7 +107,7 @@ export class MidjourneyMessage {
     options: string,
     loading?: LoadingHandler
   ) {
-    for (let i = 0; i < this.maxWait; i++) {
+    for (let i = 0; i < this.config.MaxWait; i++) {
       const msg = await this.FilterMessages(content, loading, options);
       if (msg !== null) {
         return msg;
@@ -116,7 +121,7 @@ export class MidjourneyMessage {
     index: number,
     loading?: LoadingHandler
   ) {
-    for (let i = 0; i < this.maxWait; i++) {
+    for (let i = 0; i < this.config.MaxWait; i++) {
       const msg = await this.FilterMessages(
         content,
         loading,
@@ -132,13 +137,13 @@ export class MidjourneyMessage {
   }
 
   // limit the number of concurrent interactions
-  protected async safeRetrieveMessages(limit = 50) {
+  protected async safeRetrieveMessages(limit = this.config.Limit) {
     return this.magApiQueue.addTask(() => this.RetrieveMessages(limit));
   }
-  async RetrieveMessages(limit = 50) {
-    const headers = { authorization: this.SalaiToken };
+  async RetrieveMessages(limit = this.config.Limit) {
+    const headers = { authorization: this.config.SalaiToken };
     const response = await fetch(
-      `https://discord.com/api/v10/channels/${this.ChannelId}/messages?limit=${limit}`,
+      `https://discord.com/api/v10/channels/${this.config.ChannelId}/messages?limit=${limit}`,
       {
         headers: headers,
       }

src/midjourney.ts

@@ -1,16 +1,21 @@
-import { LoadingHandler } from "./interfaces";
+import {
+  DefaultMidjourneyConfig,
+  LoadingHandler,
+  MidjourneyConfig,
+  MidjourneyConfigParam,
+} from "./interfaces";
 import { MidjourneyMessage } from "./midjourney.message";
 import { CreateQueue } from "./queue";
 import { random, sleep } from "./utls";
 export class Midjourney extends MidjourneyMessage {
   private ApiQueue = CreateQueue(1);
-  constructor(
-    public ServerId: string,
-    public ChannelId: string,
-    protected SalaiToken: string,
-    public debug = false
-  ) {
-    super(ChannelId, SalaiToken, debug);
+  public config: MidjourneyConfig;
+  constructor(defaults: MidjourneyConfigParam) {
+    super(defaults);
+    this.config = {
+      ...DefaultMidjourneyConfig,
+      ...defaults,
+    };
   }
 
   async Imagine(prompt: string, loading?: LoadingHandler) {
@@ -47,7 +52,7 @@ export class Midjourney extends MidjourneyMessage {
     try {
       const headers = {
         "Content-Type": "application/json",
-        Authorization: this.SalaiToken,
+        Authorization: this.config.SalaiToken,
       };
       const response = await fetch("https://discord.com/api/v9/interactions", {
         method: "POST",
@@ -68,9 +73,9 @@ export class Midjourney extends MidjourneyMessage {
     const payload = {
       type: 2,
       application_id: "936929561302675456",
-      guild_id: this.ServerId,
-      channel_id: this.ChannelId,
-      session_id: "2fb980f65e5c9a77c96ca01f2c242cf6",
+      guild_id: this.config.ServerId,
+      channel_id: this.config.ChannelId,
+      session_id: this.config.SessionId,
       data: {
         version: "1077969938624553050",
         id: "938956540159881230",
@@ -130,8 +135,8 @@ export class Midjourney extends MidjourneyMessage {
   async VariationApi(index: number, messageId: string, messageHash: string) {
     const payload = {
       type: 3,
-      guild_id: this.ServerId,
-      channel_id: this.ChannelId,
+      guild_id: this.config.ServerId,
+      channel_id: this.config.ChannelId,
       message_flags: 0,
       message_id: messageId,
       application_id: "936929561302675456",
@@ -166,8 +171,8 @@ export class Midjourney extends MidjourneyMessage {
   async UpscaleApi(index: number, messageId: string, messageHash: string) {
     const payload = {
       type: 3,
-      guild_id: this.ServerId,
-      channel_id: this.ChannelId,
+      guild_id: this.config.ServerId,
+      channel_id: this.config.ChannelId,
       message_flags: 0,
       message_id: messageId,
       application_id: "936929561302675456",
@@ -182,12 +187,12 @@ export class Midjourney extends MidjourneyMessage {
   async UpscaleByCustomID(messageId: string, customId: string) {
     const payload = {
       type: 3,
-      guild_id: this.ServerId,
-      channel_id: this.ChannelId,
+      guild_id: this.config.ServerId,
+      channel_id: this.config.ChannelId,
       message_flags: 0,
       message_id: messageId,
       application_id: "936929561302675456",
-      session_id: "ec6524c8d2926e285a8232f7ed1ced98",
+      session_id: this.config.SessionId,
       data: {
         component_type: 2,
         custom_id: customId,