Init V4 community edition (#2265)
* Init V4 community edition * Init V4 community edition
This commit is contained in:
@@ -1,34 +1,50 @@
|
||||
package request
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
model "github.com/cloudreve/Cloudreve/v3/models"
|
||||
"github.com/cloudreve/Cloudreve/v3/pkg/auth"
|
||||
"github.com/cloudreve/Cloudreve/v3/pkg/conf"
|
||||
"github.com/cloudreve/Cloudreve/v3/pkg/serializer"
|
||||
"github.com/cloudreve/Cloudreve/v3/pkg/util"
|
||||
"github.com/cloudreve/Cloudreve/v4/application/constants"
|
||||
"github.com/cloudreve/Cloudreve/v4/pkg/auth"
|
||||
"github.com/cloudreve/Cloudreve/v4/pkg/conf"
|
||||
"github.com/cloudreve/Cloudreve/v4/pkg/logging"
|
||||
"github.com/cloudreve/Cloudreve/v4/pkg/serializer"
|
||||
"github.com/samber/lo"
|
||||
)
|
||||
|
||||
// GeneralClient 通用 HTTP Client
|
||||
var GeneralClient Client = NewClient()
|
||||
var GeneralClient Client = NewClientDeprecated()
|
||||
|
||||
const (
|
||||
CorrelationHeader = constants.CrHeaderPrefix + "Correlation-Id"
|
||||
SiteURLHeader = constants.CrHeaderPrefix + "Site-Url"
|
||||
SiteVersionHeader = constants.CrHeaderPrefix + "Version"
|
||||
SiteIDHeader = constants.CrHeaderPrefix + "Site-Id"
|
||||
SlaveNodeIDHeader = constants.CrHeaderPrefix + "Node-Id"
|
||||
LocalIP = "localhost"
|
||||
)
|
||||
|
||||
// Response 请求的响应或错误信息
|
||||
type Response struct {
|
||||
Err error
|
||||
Response *http.Response
|
||||
l logging.Logger
|
||||
}
|
||||
|
||||
// Client 请求客户端
|
||||
type Client interface {
|
||||
// Apply applies the given options to this client.
|
||||
Apply(opts ...Option)
|
||||
// Request send a HTTP request
|
||||
Request(method, target string, body io.Reader, opts ...Option) *Response
|
||||
}
|
||||
|
||||
@@ -37,9 +53,26 @@ type HTTPClient struct {
|
||||
mu sync.Mutex
|
||||
options *options
|
||||
tpsLimiter TPSLimiter
|
||||
l logging.Logger
|
||||
config conf.ConfigProvider
|
||||
}
|
||||
|
||||
func NewClient(opts ...Option) Client {
|
||||
func NewClient(config conf.ConfigProvider, opts ...Option) Client {
|
||||
client := &HTTPClient{
|
||||
options: newDefaultOption(),
|
||||
tpsLimiter: globalTPSLimiter,
|
||||
config: config,
|
||||
}
|
||||
|
||||
for _, o := range opts {
|
||||
o.apply(client.options)
|
||||
}
|
||||
|
||||
return client
|
||||
}
|
||||
|
||||
// Deprecated
|
||||
func NewClientDeprecated(opts ...Option) Client {
|
||||
client := &HTTPClient{
|
||||
options: newDefaultOption(),
|
||||
tpsLimiter: globalTPSLimiter,
|
||||
@@ -52,6 +85,12 @@ func NewClient(opts ...Option) Client {
|
||||
return client
|
||||
}
|
||||
|
||||
func (c *HTTPClient) Apply(opts ...Option) {
|
||||
for _, o := range opts {
|
||||
o.apply(c.options)
|
||||
}
|
||||
}
|
||||
|
||||
// Request 发送HTTP请求
|
||||
func (c *HTTPClient) Request(method, target string, body io.Reader, opts ...Option) *Response {
|
||||
// 应用额外设置
|
||||
@@ -63,7 +102,14 @@ func (c *HTTPClient) Request(method, target string, body io.Reader, opts ...Opti
|
||||
}
|
||||
|
||||
// 创建请求客户端
|
||||
client := &http.Client{Timeout: options.timeout}
|
||||
client := &http.Client{
|
||||
Timeout: options.timeout,
|
||||
Jar: options.cookieJar,
|
||||
}
|
||||
|
||||
if options.transport != nil {
|
||||
client.Transport = options.transport
|
||||
}
|
||||
|
||||
// size为0时将body设为nil
|
||||
if options.contentLength == 0 {
|
||||
@@ -86,6 +132,7 @@ func (c *HTTPClient) Request(method, target string, body io.Reader, opts ...Opti
|
||||
req *http.Request
|
||||
err error
|
||||
)
|
||||
start := time.Now()
|
||||
if options.ctx != nil {
|
||||
req, err = http.NewRequestWithContext(options.ctx, method, target, body)
|
||||
} else {
|
||||
@@ -102,14 +149,21 @@ func (c *HTTPClient) Request(method, target string, body io.Reader, opts ...Opti
|
||||
}
|
||||
}
|
||||
|
||||
if options.masterMeta && conf.SystemConfig.Mode == "master" {
|
||||
req.Header.Add(auth.CrHeaderPrefix+"Site-Url", model.GetSiteURL().String())
|
||||
req.Header.Add(auth.CrHeaderPrefix+"Site-Id", model.GetSettingByName("siteID"))
|
||||
req.Header.Add(auth.CrHeaderPrefix+"Cloudreve-Version", conf.BackendVersion)
|
||||
req.Header.Set("User-Agent", "Cloudreve/"+constants.BackendVersion)
|
||||
|
||||
if options.ctx != nil && options.withCorrelationID {
|
||||
req.Header.Add(CorrelationHeader, logging.CorrelationID(options.ctx).String())
|
||||
}
|
||||
|
||||
if options.slaveNodeID != "" && conf.SystemConfig.Mode == "slave" {
|
||||
req.Header.Add(auth.CrHeaderPrefix+"Node-Id", options.slaveNodeID)
|
||||
mode := c.config.System().Mode
|
||||
if options.masterMeta && mode == conf.MasterMode {
|
||||
req.Header.Add(SiteURLHeader, options.siteURL)
|
||||
req.Header.Add(SiteIDHeader, options.siteID)
|
||||
req.Header.Add(SiteVersionHeader, constants.BackendVersion)
|
||||
}
|
||||
|
||||
if options.slaveNodeID > 0 {
|
||||
req.Header.Add(SlaveNodeIDHeader, strconv.Itoa(options.slaveNodeID))
|
||||
}
|
||||
|
||||
if options.contentLength != -1 {
|
||||
@@ -118,11 +172,16 @@ func (c *HTTPClient) Request(method, target string, body io.Reader, opts ...Opti
|
||||
|
||||
// 签名请求
|
||||
if options.sign != nil {
|
||||
ctx := options.ctx
|
||||
if options.ctx == nil {
|
||||
ctx = context.Background()
|
||||
}
|
||||
expire := time.Now().Add(time.Second * time.Duration(options.signTTL))
|
||||
switch method {
|
||||
case "PUT", "POST", "PATCH":
|
||||
auth.SignRequest(options.sign, req, options.signTTL)
|
||||
auth.SignRequest(ctx, options.sign, req, &expire)
|
||||
default:
|
||||
if resURL, err := auth.SignURI(options.sign, req.URL.String(), options.signTTL); err == nil {
|
||||
if resURL, err := auth.SignURI(ctx, options.sign, req.URL.String(), &expire); err == nil {
|
||||
req.URL = resURL
|
||||
}
|
||||
}
|
||||
@@ -134,11 +193,32 @@ func (c *HTTPClient) Request(method, target string, body io.Reader, opts ...Opti
|
||||
|
||||
// 发送请求
|
||||
resp, err := client.Do(req)
|
||||
|
||||
// Logging request
|
||||
if options.logger != nil {
|
||||
statusCode := 0
|
||||
errStr := ""
|
||||
if resp != nil {
|
||||
statusCode = resp.StatusCode
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
errStr = err.Error()
|
||||
}
|
||||
|
||||
logging.Request(options.logger, false, statusCode, req.Method, LocalIP, req.URL.String(), errStr, start)
|
||||
}
|
||||
|
||||
// Apply cookies
|
||||
if resp != nil && resp.Cookies() != nil && options.cookieJar != nil {
|
||||
options.cookieJar.SetCookies(req.URL, resp.Cookies())
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return &Response{Err: err}
|
||||
}
|
||||
|
||||
return &Response{Err: nil, Response: resp}
|
||||
return &Response{Err: nil, Response: resp, l: options.logger}
|
||||
}
|
||||
|
||||
// GetResponse 检查响应并获取响应正文
|
||||
@@ -146,21 +226,33 @@ func (resp *Response) GetResponse() (string, error) {
|
||||
if resp.Err != nil {
|
||||
return "", resp.Err
|
||||
}
|
||||
respBody, err := ioutil.ReadAll(resp.Response.Body)
|
||||
respBody, err := io.ReadAll(resp.Response.Body)
|
||||
_ = resp.Response.Body.Close()
|
||||
|
||||
return string(respBody), err
|
||||
}
|
||||
|
||||
// GetResponseIgnoreErr 获取响应正文
|
||||
func (resp *Response) GetResponseIgnoreErr() (string, error) {
|
||||
if resp.Response == nil {
|
||||
return "", resp.Err
|
||||
}
|
||||
|
||||
respBody, _ := io.ReadAll(resp.Response.Body)
|
||||
_ = resp.Response.Body.Close()
|
||||
|
||||
return string(respBody), resp.Err
|
||||
}
|
||||
|
||||
// CheckHTTPResponse 检查请求响应HTTP状态码
|
||||
func (resp *Response) CheckHTTPResponse(status int) *Response {
|
||||
func (resp *Response) CheckHTTPResponse(status ...int) *Response {
|
||||
if resp.Err != nil {
|
||||
return resp
|
||||
}
|
||||
|
||||
// 检查HTTP状态码
|
||||
if resp.Response.StatusCode != status {
|
||||
resp.Err = fmt.Errorf("服务器返回非正常HTTP状态%d", resp.Response.StatusCode)
|
||||
if !lo.Contains(status, resp.Response.StatusCode) {
|
||||
resp.Err = fmt.Errorf("Remote returns unexpected status code: %d", resp.Response.StatusCode)
|
||||
}
|
||||
return resp
|
||||
}
|
||||
@@ -179,7 +271,10 @@ func (resp *Response) DecodeResponse() (*serializer.Response, error) {
|
||||
var res serializer.Response
|
||||
err = json.Unmarshal([]byte(respString), &res)
|
||||
if err != nil {
|
||||
util.Log().Debug("Failed to parse response: %s", string(respString))
|
||||
if resp.l != nil {
|
||||
resp.l.Debug("Failed to parse response: %s", respString)
|
||||
}
|
||||
|
||||
return nil, err
|
||||
}
|
||||
return &res, nil
|
||||
@@ -254,10 +349,3 @@ func (instance NopRSCloser) Seek(offset int64, whence int) (int64, error) {
|
||||
return 0, errors.New("not implemented")
|
||||
|
||||
}
|
||||
|
||||
// BlackHole 将客户端发来的数据放入黑洞
|
||||
func BlackHole(r io.Reader) {
|
||||
if !model.IsTrueVal(model.GetSettingByName("reset_after_upload_failed")) {
|
||||
io.Copy(ioutil.Discard, r)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user