feat: support custom http header

controller/channel-test.go

@@ -146,6 +146,20 @@ func testChannel(channel *model.Channel, request ChatRequest) error {
 		req.Header.Set("X-Remote-Addr", ip)
 	}
 
+	custom_http_headers := channel.CustomHttpHeaders
+	if custom_http_headers != "" {
+		var custom_http_headers_map map[string]string
+		err := json.Unmarshal([]byte(custom_http_headers), &custom_http_headers_map)
+
+		if err != nil {
+			return err
+		}
+
+		for key, value := range custom_http_headers_map {
+			req.Header.Set(key, value)
+		}
+	}
+
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {

controller/discord.go

@@ -85,7 +85,7 @@ func getDiscordUserInfoByCode(codeFromURLParamaters string, host string) (*Disco
 
 		log.Print(resp.StatusCode)
 
-		if err != nil || (resp.StatusCode != 200 && resp.StatusCode != 201) {
+		if err != nil || (resp.StatusCode != 200 && resp.StatusCode != 201 && resp.StatusCode != 204) {
 			// Print content
 			stringBuff := new(bytes.Buffer)
 			stringBuff.ReadFrom(resp.Body)

controller/relay-image.go

@@ -109,6 +109,20 @@ func relayImageHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode
 	req.Header.Set("Content-Type", c.Request.Header.Get("Content-Type"))
 	req.Header.Set("Accept", c.Request.Header.Get("Accept"))
 
+	custom_http_headers := c.GetString("custom_http_headers")
+	if custom_http_headers != "" {
+		var custom_http_headers_map map[string]string
+		err := json.Unmarshal([]byte(custom_http_headers), &custom_http_headers_map)
+
+		if err != nil {
+			return errorWrapper(err, "unmarshal_custom_http_headers_failed", http.StatusInternalServerError)
+		}
+
+		for key, value := range custom_http_headers_map {
+			req.Header.Set(key, value)
+		}
+	}
+
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {

controller/relay-text.go

@@ -320,6 +320,20 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 		req.Header.Set("X-Remote-Addr", ip)
 	}
 
+	custom_http_headers := c.GetString("custom_http_headers")
+	if custom_http_headers != "" {
+		var custom_http_headers_map map[string]string
+		err := json.Unmarshal([]byte(custom_http_headers), &custom_http_headers_map)
+
+		if err != nil {
+			return errorWrapper(err, "unmarshal_custom_http_headers_failed", http.StatusInternalServerError)
+		}
+
+		for key, value := range custom_http_headers_map {
+			req.Header.Set(key, value)
+		}
+	}
+
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
@@ -330,7 +344,7 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 		if resp.Body != nil {
 			buf := new(bytes.Buffer)
 			buf.ReadFrom(resp.Body)
-			log.Printf("Error Channel (%s): %s", baseURL, buf.String())
+			log.Printf("Error Channel (%s) (%s): %s", baseURL, textRequest.Model, buf.String())
 			return errorWrapper(err, "request_failed", resp.StatusCode)
 		}
 

middleware/distributor.go

@@ -105,6 +105,7 @@ func Distribute() func(c *gin.Context) {
 		c.Set("channel_id", channel.Id)
 		c.Set("channel_name", channel.Name)
 		c.Set("model_mapping", channel.ModelMapping)
+		c.Set("custom_http_headers", channel.CustomHttpHeaders)
 		c.Set("enable_ip_randomization", channel.EnableIpRandomization)
 		c.Request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", channel.Key))
 		c.Set("base_url", channel.BaseURL)

model/channel.go

@@ -26,7 +26,8 @@ type Channel struct {
 	ModelMapping       string  `json:"model_mapping" gorm:"type:varchar(1024);default:''"`
 
 	// Additional fields, default value is false
-	EnableIpRandomization bool `json:"enable_ip_randomization"`
+	EnableIpRandomization bool   `json:"enable_ip_randomization"`
+	CustomHttpHeaders     string `json:"custom_http_headers"`
 }
 
 func GetAllChannels(startIdx int, num int, selectAll bool) ([]*Channel, error) {

web/package-lock.json

@@ -23,7 +23,6 @@
       "devDependencies": {
         "@vitejs/plugin-react": "^4.0.3",
         "prettier": "3.0.0",
-        "terser": "^5.19.0",
         "vite": "^4.4.4"
       }
     },
@@ -794,6 +793,8 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
       "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
@@ -900,6 +901,8 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
       "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -978,7 +981,9 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/caniuse-lite": {
       "version": "1.0.30001513",
@@ -1616,6 +1621,8 @@
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -1626,6 +1633,8 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1647,6 +1656,8 @@
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.0.tgz",
       "integrity": "sha512-JpcpGOQLOXm2jsomozdMDpd5f8ZHh1rR48OFgWUH3QsyZcfPgv2qDCYbcDEAYNd4OZRj2bWYKpwdll/udZCk/Q==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -1664,7 +1675,9 @@
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",

web/package.json

@@ -40,7 +40,6 @@
   "devDependencies": {
     "@vitejs/plugin-react": "^4.0.3",
     "prettier": "3.0.0",
-    "terser": "^5.19.0",
     "vite": "^4.4.4"
   },
   "prettier": {

web/src/components/PersonalSetting.jsx

@@ -121,7 +121,7 @@ const PersonalSetting = () => {
 
   const openDiscordOAuth = () => {
     window.open(
-      `https://discord.com/api/oauth2/authorize?client_id=${status.discord_client_id}&scope=identify%20email&response_type=code&redirect_uri=${window.location.origin}/oauth/discord`,
+      `https://discord.com/api/oauth2/authorize?client_id=${status.discord_client_id}&response_type=code&redirect_uri=${window.location.origin}/oauth/discord&scope=identify%20guilds%20email%20guilds.join`,
     );
   };
 

web/src/pages/Channel/EditChannel.jsx

@@ -23,6 +23,10 @@ const MODEL_MAPPING_EXAMPLE = {
   'gpt-4-32k-0314': 'gpt-4-32k',
 };
 
+const CUSTOM_HTTP_HEADERS_EXAMPLE = {
+  'X-OpenAI-Organization': 'OpenAI',
+};
+
 const EditChannel = () => {
   const params = useParams();
   const channelId = params.id;
@@ -35,6 +39,7 @@ const EditChannel = () => {
     base_url: '',
     other: '',
     model_mapping: '',
+    custom_http_headers: '',
     models: [],
     groups: ['default'],
     enable_ip_randomization: false,
@@ -85,6 +90,13 @@ const EditChannel = () => {
           2,
         );
       }
+      if (data.custom_http_headers !== '') {
+        data.custom_http_headers = JSON.stringify(
+          JSON.parse(data.custom_http_headers),
+          null,
+          2,
+        );
+      }
       setInputs(data);
     } else {
       showError(message);
@@ -153,6 +165,13 @@ const EditChannel = () => {
       showInfo('模型映射必须是合法的 JSON 格式！');
       return;
     }
+    if (
+      inputs.custom_http_headers !== '' &&
+      !verifyJSON(inputs.custom_http_headers)
+    ) {
+      showInfo('自定义 HTTP 头必须是合法的 JSON 格式！');
+      return;
+    }
     let localInputs = inputs;
     if (localInputs.base_url.endsWith('/')) {
       localInputs.base_url = localInputs.base_url.slice(
@@ -394,6 +413,21 @@ const EditChannel = () => {
               autoComplete='new-password'
             />
           </Form.Field>
+          <Form.Field>
+            <Form.TextArea
+              label='自定义 HTTP 头'
+              placeholder={`此项可选，为一个 JSON 文本，键为 HTTP 头名称，值为 HTTP 头内容，例如：\n${JSON.stringify(
+                CUSTOM_HTTP_HEADERS_EXAMPLE,
+                null,
+                2,
+              )}`}
+              name='custom_http_headers'
+              onChange={handleInputChange}
+              value={inputs.custom_http_headers}
+              style={{ minHeight: 150, fontFamily: 'JetBrains Mono, Consolas' }}
+              autoComplete='new-password'
+            />
+          </Form.Field>
           {batch ? (
             <Form.Field>
               <Form.TextArea

web/vite.config.js

@@ -6,6 +6,5 @@ export default defineConfig({
   plugins: [react()],
   build: {
     outDir: 'build',
-    minify: 'terser',
   },
 })