Update headers

zachey01 · Jul 12, 2024 · 5d287bf · 5d287bf
1 parent 5bf35d4
commit 5d287bf
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 51 deletions.
diff --git a/dist/gpt4js.min.js b/dist/gpt4js.min.js
diff --git a/src/Providers/ChatCompletion/AlibabaProvider.js b/src/Providers/ChatCompletion/AlibabaProvider.js
@@ -1,27 +1,16 @@
 "use strict";
 import Provider from "./provider.js";
+import baseHeaders from "../../Utils/baseHeaders.js";
 
 class AlibabaProvider extends Provider {
   async chatCompletion(messages, options) {
     try {
       const response = await fetch(
         "https://chat.chatgpt.org.uk/api/openai/v1/chat/completions",
         {
-          headers: {
-            accept: "application/json, text/event-stream",
-            "accept-language": "ru,en;q=0.9",
-            "content-type": "application/json",
-            priority: "u=1, i",
-            "sec-ch-ua":
-              '"Chromium";v="124", "YaBrowser";v="24.6", "Not-A.Brand";v="99", "Yowser";v="2.5"',
-            "sec-ch-ua-mobile": "?0",
-            "sec-ch-ua-platform": '"Windows"',
-            "sec-fetch-dest": "empty",
-            "sec-fetch-mode": "cors",
-            "sec-fetch-site": "same-origin",
-            Referer: "https://chat.chatgpt.org.uk/",
-            "Referrer-Policy": "strict-origin-when-cross-origin",
-          },
+          headers: baseHeaders(
+            "https://chat.chatgpt.org.uk/api/openai/v1/chat/completions"
+          ),
           body: JSON.stringify({
             messages: messages,
             stream: options.stream || false,

diff --git a/src/Providers/ChatCompletion/Aryahcr.js b/src/Providers/ChatCompletion/Aryahcr.js
@@ -1,15 +1,13 @@
 "use strict";
 import Provider from "./provider.js";
+import baseHeaders from "../../Utils/baseHeaders.js";
 
 class AryahcrProvider extends Provider {
   async chatCompletion(messages, options) {
     try {
       const response = await fetch("https://nexra.aryahcr.cc/api/chat/gpt", {
         method: "POST",
-        headers: {
-          accept: "application/json",
-          "content-type": "application/json",
-        },
+        headers: baseHeaders("https://nexra.aryahcr.cc/api/chat/gpt"),
         body: JSON.stringify({
           messages: messages,
           model: options.model || "gpt-4",

diff --git a/src/Providers/ChatCompletion/BlackBox.js b/src/Providers/ChatCompletion/BlackBox.js
@@ -1,5 +1,6 @@
 "use strict";
 import Provider from "./provider.js";
+import baseHeaders from "../../Utils/baseHeaders.js";
 
 class BlackBoxProvider extends Provider {
   async chatCompletion(messages, options = {}) {
@@ -49,13 +50,7 @@ class BlackBoxProvider extends Provider {
     }
 
     const response = await fetch(url, {
-      headers: {
-        accept: "*/*",
-        "content-type": "application/json",
-        "sec-fetch-dest": "empty",
-        "sec-fetch-mode": "cors",
-        "sec-fetch-site": "cross-site",
-      },
+      headers: baseHeaders("https://www.blackbox.ai/api/chat"),
       body: JSON.stringify(body),
       method: "POST",
       mode: "cors",

diff --git a/src/Providers/ChatCompletion/ChatBotRu.js b/src/Providers/ChatCompletion/ChatBotRu.js
@@ -1,5 +1,6 @@
 "use strict";
 import Provider from "./provider.js";
+import baseHeaders from "../../Utils/baseHeaders.js";
 
 class ChatBotRuProvider extends Provider {
   async chatCompletion(messages, options) {
@@ -15,21 +16,9 @@ class ChatBotRuProvider extends Provider {
       const response = await fetch(
         "https://gpt-chatbotru-chat-main.ru/api/openai/v1/chat/completions",
         {
-          headers: {
-            accept: "application/json, text/event-stream",
-            "accept-language": "ru,en;q=0.9",
-            "content-type": "application/json",
-            priority: "u=1, i",
-            "sec-ch-ua":
-              '"Chromium";v="124", "YaBrowser";v="24.6", "Not-A.Brand";v="99", "Yowser";v="2.5"',
-            "sec-ch-ua-mobile": "?0",
-            "sec-ch-ua-platform": '"Windows"',
-            "sec-fetch-dest": "empty",
-            "sec-fetch-mode": "cors",
-            "sec-fetch-site": "same-origin",
-            Referer: "https://gpt-chatbotru-chat-main.ru/",
-            "Referrer-Policy": "strict-origin-when-cross-origin",
-          },
+          headers: baseHeaders(
+            "https://gpt-chatbotru-chat-main.ru/api/openai/v1/chat/completions"
+          ),
           body: JSON.stringify({
             messages: messages,
             stream: options.stream || false,

diff --git a/src/Providers/ChatCompletion/Nextway.js b/src/Providers/ChatCompletion/Nextway.js
@@ -1,5 +1,6 @@
 "use strict";
 import Provider from "./provider.js";
+import baseHeaders from "../../Utils/baseHeaders.js";
 
 class NextwayProvider extends Provider {
   async chatCompletion(messages, options) {
@@ -8,11 +9,9 @@ class NextwayProvider extends Provider {
       : "https://chat.eqing.tech/api/openai/v1/chat/completions";
 
     const response = await fetch(proxyUrl, {
-      headers: {
-        accept: "text/event-stream",
-        "content-type": "application/json",
-        usesearch: "false",
-      },
+      headers: baseHeaders(
+        "https://chat.eqing.tech/api/openai/v1/chat/completions"
+      ),
       body: JSON.stringify({
         messages: messages,
         stream: options.stream,

diff --git a/src/Providers/ChatCompletion/Ollama.js b/src/Providers/ChatCompletion/Ollama.js
@@ -1,16 +1,16 @@
 "use strict";
 import Provider from "./provider.js";
+import baseHeaders from "../../Utils/baseHeaders.js";
 
 class OllamaProvider extends Provider {
   async chatCompletion(messages, options) {
     try {
       const response = await fetch(
         `${options.ollama_url || "http://localhost:11434"}/api/chat`,
         {
-          headers: {
-            accept: "application/json",
-            "content-type": "application/json",
-          },
+          headers: baseHeaders(
+            `${options.ollama_url || "http://localhost:11434"}`
+          ),
           body: JSON.stringify({
             messages: messages,
             stream: options.stream || false,

diff --git a/src/Utils/baseHeaders.js b/src/Utils/baseHeaders.js
@@ -0,0 +1,19 @@
+function baseHeaders(url) {
+  return {
+    accept: "application/json, text/event-stream",
+    "accept-language": "ru,en;q=0.9",
+    "content-type": "application/json",
+    priority: "u=1, i",
+    "sec-ch-ua":
+      '"Chromium";v="124", "YaBrowser";v="24.6", "Not-A.Brand";v="99", "Yowser";v="2.5"',
+    "sec-ch-ua-mobile": "?0",
+    "sec-ch-ua-platform": '"Windows"',
+    "sec-fetch-dest": "empty",
+    "sec-fetch-mode": "cors",
+    "sec-fetch-site": "same-origin",
+    Referer: url,
+    "Referrer-Policy": "strict-origin-when-cross-origin",
+    usesearch: "false",
+  };
+}
+export default baseHeaders;