去除zlib

happyVee · May 29, 2023 · fcd6968 · fcd6968
1 parent 1075e3b
commit fcd6968
Show file tree

Hide file tree

Showing 11 changed files with 118 additions and 15 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/aws.xml b/.idea/aws.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/midjourney-api.iml b/.idea/midjourney-api.iml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/src/interfaces/config.ts b/src/interfaces/config.ts
@@ -8,6 +8,8 @@ export interface MessageConfig {
   SessionId: string;
   Ws?: boolean;
   HuggingFaceToken?: string;
+  discord_baseurl?:string;
+  ws_baseurl?:string;
 }
 export interface MessageConfigParam {
   ChannelId: string;
@@ -19,6 +21,8 @@ export interface MessageConfigParam {
   HuggingFaceToken?: string;
   ServerId?: string;
   SessionId?: string;
+  discord_baseurl?:string;
+  ws_baseurl?:string;
 }
 export interface MidjourneyConfig extends MessageConfig {
   ServerId: string;

diff --git a/src/midjourney.message.ts b/src/midjourney.message.ts
@@ -151,7 +151,7 @@ export class MidjourneyMessage {
   async RetrieveMessages(limit = this.config.Limit) {
     const headers = { authorization: this.config.SalaiToken };
     const response = await fetch(
-      `https://discord.com/api/v10/channels/${this.config.ChannelId}/messages?limit=${limit}`,
+        (this.config.discord_baseurl?this.config.discord_baseurl:"https://discord.com")+`/api/v10/channels/${this.config.ChannelId}/messages?limit=${limit}`,
       {
         headers: headers,
       }

diff --git a/src/midjourney.ts b/src/midjourney.ts
@@ -76,7 +76,7 @@ export class Midjourney extends MidjourneyMessage {
         "Content-Type": "application/json",
         Authorization: this.config.SalaiToken,
       };
-      const response = await fetch("https://discord.com/api/v9/interactions", {
+      const response = await fetch(this.config.discord_baseurl?this.config.discord_baseurl+"/api/v9/interactions":"https://discord.com/api/v9/interactions", {
         method: "POST",
         body: JSON.stringify(payload),
         headers: headers,

diff --git a/src/ws.message.ts b/src/ws.message.ts
@@ -1,5 +1,4 @@
 import WebSocket from "ws";
-import { createInflate, Inflate, constants as ZlibConstants } from "zlib";
 import {
   MessageConfig,
   MessageConfigParam,
@@ -13,12 +12,11 @@ import { VerifyHuman } from "./verify.human";
 
 export class WsMessage {
   DISCORD_GATEWAY =
-    "wss://gateway.discord.gg/?v=9&encoding=json&compress=zlib-stream";
+    "wss://gateway.discord.gg/?v=9&encoding=json&compress=gzip-stream";
   ws: WebSocket;
   MJBotId = "936929561302675456";
   private zlibChunks: Buffer[] = [];
   public config: MessageConfig;
-  private inflate: Inflate;
   private event: Array<{ event: string; callback: (message: any) => void }> =
     [];
   private waitMjEvents: Map<string, WaitMjEvent> = new Map();
@@ -35,11 +33,12 @@ export class WsMessage {
       ...DefaultMessageConfig,
       ...defaults,
     };
+    if(this.config.ws_baseurl){
+      this.DISCORD_GATEWAY.replace("wss://gateway.discord.gg",this.config.ws_baseurl)
+    }
     this.ws = new WebSocket(this.DISCORD_GATEWAY, {});
     this.ws.on("open", this.open.bind(this));
 
-    this.inflate = createInflate({ flush: ZlibConstants.Z_SYNC_FLUSH });
-    this.inflate.on("data", (data) => this.zlibChunks.push(data));
   }
 
   private reconnect() {
@@ -98,13 +97,8 @@ export class WsMessage {
     return new Promise((resolve) => setTimeout(resolve, ms));
   }
   private incomingMessage(data: Buffer) {
-    this.inflate.write(data);
-    if (data.length >= 4 && data.readUInt32BE(data.length - 4) === 0x0ffff) {
-      this.inflate.flush(
-        ZlibConstants.Z_SYNC_FLUSH,
-        this.handleFlushComplete.bind(this)
-      );
-    }
+    this.zlibChunks.push(data)
+    this.handleFlushComplete.bind(this)
   }
   private handleFlushComplete() {
     const data =
@@ -267,7 +261,7 @@ export class WsMessage {
         "Content-Type": "application/json",
         Authorization: this.config.SalaiToken,
       };
-      const response = await fetch("https://discord.com/api/v9/interactions", {
+      const response = await fetch(this.config.discord_baseurl?this.config.discord_baseurl:"https://discord.com"+"/api/v9/interactions", {
         method: "POST",
         body: JSON.stringify(payload),
         headers: headers,