mirror of
https://github.com/songquanpeng/one-api.git
synced 2025-09-19 10:06:37 +08:00
d953da1ff2
- Refactor error handling using `errors/v2` package for improved error management and formatting - Implement changes in relay/controller/text.go, controller/channel-test.go, controller/relay.go, common/message/email.go, relay/controller/audio.go, controller/channel-billing.go, relay/controller/helper.go, relay/channel/common.go, relay/channel/minimax/main.go, and common/message/main.go - Add package imports and update package paths for better code organization - Replace hardcoded strings with error variables for consistency and readability - Implement secure methods for generating unique Message-ID - Improve SMTP handling and authentication in email.go - Update response handling and error messages for better user experience - Add constant checks and modify functions based on imageRequest parameters in helper.go - Use `http.NewRequest` instead of `fmt.Fprint` for improved request handling in relay/channel/common.go - Update error handling and formatting for better consistency across all files
52 lines
1.4 KiB
Go
52 lines
1.4 KiB
Go
package channel
|
|
|
|
import (
|
|
"io"
|
|
"net/http"
|
|
|
|
"github.com/Laisky/errors/v2"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/songquanpeng/one-api/relay/util"
|
|
)
|
|
|
|
func SetupCommonRequestHeader(c *gin.Context, req *http.Request, meta *util.RelayMeta) {
|
|
req.Header.Set("Content-Type", c.Request.Header.Get("Content-Type"))
|
|
req.Header.Set("Accept", c.Request.Header.Get("Accept"))
|
|
if meta.IsStream && c.Request.Header.Get("Accept") == "" {
|
|
req.Header.Set("Accept", "text/event-stream")
|
|
}
|
|
}
|
|
|
|
func DoRequestHelper(a Adaptor, c *gin.Context, meta *util.RelayMeta, requestBody io.Reader) (*http.Response, error) {
|
|
fullRequestURL, err := a.GetRequestURL(meta)
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "get request url failed")
|
|
}
|
|
req, err := http.NewRequest(c.Request.Method, fullRequestURL, requestBody)
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "new request failed")
|
|
}
|
|
err = a.SetupRequestHeader(c, req, meta)
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "setup request header failed")
|
|
}
|
|
resp, err := DoRequest(c, req)
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "do request failed")
|
|
}
|
|
return resp, nil
|
|
}
|
|
|
|
func DoRequest(c *gin.Context, req *http.Request) (*http.Response, error) {
|
|
resp, err := util.HTTPClient.Do(req)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if resp == nil {
|
|
return nil, errors.New("resp is nil")
|
|
}
|
|
_ = req.Body.Close()
|
|
_ = c.Request.Body.Close()
|
|
return resp, nil
|
|
}
|