Skip to content

Commit

Permalink
style: update emit.io version
Browse files Browse the repository at this point in the history
  • Loading branch information
@bincooo
bincooo committed Sep 18, 2024
1 parent fed1fce commit 9b5e4db
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 61 deletions.
14 changes: 7 additions & 7 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ go 1.21.6

require (
github.com/antonfisher/nested-logrus-formatter v1.3.1
github.com/bincooo/claude-api v1.0.5-0.20240814184031-56ad31d90db8
github.com/bincooo/cohere-api v0.0.0-20240918064927-10e2ab540e41
github.com/bincooo/coze-api v1.0.2-0.20240917114117-0352dbf03f21
github.com/bincooo/edge-api v1.0.4-0.20240801160633-4131c13986a5
github.com/bincooo/emit.io v1.0.1-0.20240814182208-c5236f8f202c
github.com/bincooo/vecmul.com v0.0.0-20240806095224-6e571cbe7b7e
github.com/bincooo/you.com v0.0.0-20240916065816-07513a84d11e
github.com/bincooo/claude-api v1.0.5-0.20240918105519-bfef6b26ec32
github.com/bincooo/cohere-api v0.0.0-20240918105710-b88e2b55a4dd
github.com/bincooo/coze-api v1.0.2-0.20240918110129-770fad86481e
github.com/bincooo/edge-api v1.0.4-0.20240918111026-76a4223e60d0
github.com/bincooo/emit.io v1.0.1-0.20240918104917-7aa3711f2559
github.com/bincooo/vecmul.com v0.0.0-20240918113329-241a0f273998
github.com/bincooo/you.com v0.0.0-20240918111518-4ae3958b355f
github.com/bogdanfinn/tls-client v1.7.7
github.com/dlclark/regexp2 v1.11.4
github.com/dop251/goja v0.0.0-20240828124009-016eb7256539
Expand Down
28 changes: 14 additions & 14 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,20 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/bincooo/claude-api v1.0.5-0.20240814184031-56ad31d90db8 h1:YTa3k9RjFSFYQ0Te7XkiS/RDErPf8mqeiRuMGozNa4Y=
github.com/bincooo/claude-api v1.0.5-0.20240814184031-56ad31d90db8/go.mod h1:1C9dP0HFj9CjYUfz4l3gyoNGXKafPlXDTfBaIrh8ZLY=
github.com/bincooo/cohere-api v0.0.0-20240918064927-10e2ab540e41 h1:d+pOMdaCi/ZCrejv5QI2aDvthYLy6XqdnrBIH6UVwck=
github.com/bincooo/cohere-api v0.0.0-20240918064927-10e2ab540e41/go.mod h1:nGYQHPke4eHK0x6p0ZpyDyuVTSNeoftdo36+OJegW4E=
github.com/bincooo/coze-api v1.0.2-0.20240917114117-0352dbf03f21 h1:XiOfZ2qFuxxYsBpERc1uE2E+M4iJRj5zgRO/YQH85wQ=
github.com/bincooo/coze-api v1.0.2-0.20240917114117-0352dbf03f21/go.mod h1:DbHf5dv8h0bGrQoWoCyVTFJzsfqTOb7asqzn3gTfTas=
github.com/bincooo/edge-api v1.0.4-0.20240801160633-4131c13986a5 h1:LXwjKFfwyOSinPSKMRI8mRNUkkLhJoexl8jGn/t9ZOk=
github.com/bincooo/edge-api v1.0.4-0.20240801160633-4131c13986a5/go.mod h1:OBBrqmW8rUMTsF/sPH1GsPQT5K9QKJCZkHdYkTIR09Q=
github.com/bincooo/emit.io v1.0.1-0.20240814182208-c5236f8f202c h1:+E1m0U39B0AA54+/p75+yz+GoN1yAFQ99SCuRs9tRsM=
github.com/bincooo/emit.io v1.0.1-0.20240814182208-c5236f8f202c/go.mod h1:OJbKJoZ6x6vSpCC+JNtfcaXo3ilpvQscWrcGEmtmrZI=
github.com/bincooo/vecmul.com v0.0.0-20240806095224-6e571cbe7b7e h1:NEPtfaeaLrY5fSAykG9gopRovHwIvORJGGCSRhVyHTQ=
github.com/bincooo/vecmul.com v0.0.0-20240806095224-6e571cbe7b7e/go.mod h1:YqrsM+ORzIuR/2guKHE89xHiJ1+tvHm+aPV7pVbvFO4=
github.com/bincooo/you.com v0.0.0-20240916065816-07513a84d11e h1:1PjCeRPePiGyq4Yl0AYMu1F0UbH5ZZidvXfjubiMNvY=
github.com/bincooo/you.com v0.0.0-20240916065816-07513a84d11e/go.mod h1:qCgh1ZiXjmtmaXiFYWtUfXZ3JZpbl3QOqcxB7LIo6OI=
github.com/bincooo/claude-api v1.0.5-0.20240918105519-bfef6b26ec32 h1:hA8dUuAi6RPjPxZnVDj3P0j8iK7VXsIRzWqhK+VS844=
github.com/bincooo/claude-api v1.0.5-0.20240918105519-bfef6b26ec32/go.mod h1:6SXQejOJkxFQs+ZrcT4rPClaNAPRpHuXwLtjs5TsXPs=
github.com/bincooo/cohere-api v0.0.0-20240918105710-b88e2b55a4dd h1:Q7UJyh1ACfI4oQ1gm74Xx+syO6ZESzEu7WUPv9i8fh4=
github.com/bincooo/cohere-api v0.0.0-20240918105710-b88e2b55a4dd/go.mod h1:bqkfsp68pquv5Rg2RogWFy9+XU7Awq/wRzm+3T/ZnN8=
github.com/bincooo/coze-api v1.0.2-0.20240918110129-770fad86481e h1:j1iCjZtC2nUKd6pq33FPDY5bvMImErC9q3eKfgq59eo=
github.com/bincooo/coze-api v1.0.2-0.20240918110129-770fad86481e/go.mod h1:qhaSqKdvR4T594sBMzp+TKZ+PcaeelAiBMvIE254b6g=
github.com/bincooo/edge-api v1.0.4-0.20240918111026-76a4223e60d0 h1:wUhq+osIixsjgLOn6c/feldQDgaPCKaf5bweAp51UWw=
github.com/bincooo/edge-api v1.0.4-0.20240918111026-76a4223e60d0/go.mod h1:l0FX6lul8AcKLnkIFHIl4MsNL0HgXlX03vHAUuEAtW0=
github.com/bincooo/emit.io v1.0.1-0.20240918104917-7aa3711f2559 h1:JL6cGQ4eXhPRaBeWTPXzMr62KRpgXipQj+3uIu459eg=
github.com/bincooo/emit.io v1.0.1-0.20240918104917-7aa3711f2559/go.mod h1:OJbKJoZ6x6vSpCC+JNtfcaXo3ilpvQscWrcGEmtmrZI=
github.com/bincooo/vecmul.com v0.0.0-20240918113329-241a0f273998 h1:FgFjU/WZPzocFsF3Ltahj+6CbLTu4FAr9c5RZOUy0Xk=
github.com/bincooo/vecmul.com v0.0.0-20240918113329-241a0f273998/go.mod h1:iNsaIde7efj9BBtghS/noQ6OqXz1v/RQ7/NMO1s3Nzw=
github.com/bincooo/you.com v0.0.0-20240918111518-4ae3958b355f h1:GX24CoKOA9w+63QHI0WCU7t2LjWNwzHMx4py/jbMTEM=
github.com/bincooo/you.com v0.0.0-20240918111518-4ae3958b355f/go.mod h1:Rs9F3k8IIMxDSd65XvLdhroB8AcHfvzogY3yv1fZGs0=
github.com/bogdanfinn/fhttp v0.5.28 h1:G6thT8s8v6z1IuvXMUsX9QKy3ZHseTQTzxuIhSiaaAw=
github.com/bogdanfinn/fhttp v0.5.28/go.mod h1:oJiYPG3jQTKzk/VFmogH8jxjH5yiv2rrOH48Xso2lrE=
github.com/bogdanfinn/tls-client v1.7.7 h1:c3mf6LX6bxEsunJhP2BJeJE7qN/7BniWUpIpBc9Igu8=
Expand Down
27 changes: 13 additions & 14 deletions internal/common/com.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,47 +44,46 @@ func AddExited(apply func()) {
exitFunctions = append(exitFunctions, apply)
}

func GetIdleConnectOption() *emit.ConnectOption {
func GetIdleConnectOptions() (options []emit.OptionHelper) {
opts := pkg.Config.GetStringMap("server-conn")
var option emit.ConnectOption
if value, ok := opts["idleconntimeout"]; ok {
connTimeout, o := value.(int)
timeout, o := value.(int)
if o {
if connTimeout > 0 {
option.IdleConnTimeout = time.Duration(connTimeout) * time.Second
if timeout > 0 {
options = append(options, emit.IdleConnTimeoutHelper(time.Duration(timeout)*time.Second))
}
} else {
logger.Warnf("read idleConnTimeout error: %v", value)
}
}

if value, ok := opts["responseheadertimeout"]; ok {
connTimeout, o := value.(int)
timeout, o := value.(int)
if o {
if connTimeout > 0 {
option.ResponseHeaderTimeout = time.Duration(connTimeout) * time.Second
if timeout > 0 {
options = append(options, emit.ResponseHeaderTimeoutHelper(time.Duration(timeout)*time.Second))
}
} else {
logger.Warnf("read responseHeaderTimeout error: %v", value)
}
}

if value, ok := opts["expectcontinuetimeout"]; ok {
connTimeout, o := value.(int)
timeout, o := value.(int)
if o {
if connTimeout > 0 {
option.ExpectContinueTimeout = time.Duration(connTimeout) * time.Second
if timeout > 0 {
options = append(options, emit.ExpectContinueTimeoutHelper(time.Duration(timeout)*time.Second))
}
} else {
logger.Warnf("read expectContinueTimeout error: %v", value)
}
}

option.TLSClientConfig = &tls.Config{
options = append(options, emit.TLSConfigHelper(&tls.Config{
InsecureSkipVerify: true,
}
}))

return &option
return
}

// 删除子元素
Expand Down
24 changes: 5 additions & 19 deletions internal/plugin/adapter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,36 +30,22 @@ type Model struct {
func init() {
common.AddInitialized(func() {
var err error
whites := []string{
"127.0.0.1",
}

option := common.GetIdleConnectOption()
HTTPClient, err = emit.NewDefaultSession(vars.Proxies, option, whites...)
if err != nil {
logger.Error("Error initializing HTTPClient: ", err)
}

options := common.GetIdleConnectOptions()
connTimeout := pkg.Config.GetInt("server-conn.connTimeout")
if connTimeout == 0 {
connTimeout = 180
}

HTTPJa3Client, err := emit.NewJa3Session(emit.Echo{RandomTLSExtension: true, HelloID: profiles.Chrome_124}, vars.Proxies, connTimeout)
options = append(options, emit.Ja3Helper(emit.Echo{RandomTLSExtension: true, HelloID: profiles.Chrome_124}, connTimeout))
HTTPClient, err = emit.NewSession(vars.Proxies, emit.SimpleWithes("127.0.0.1"), options...)
if err != nil {
logger.Error("Error initializing HTTPJa3Client: ", err)
}

SocketClient, err := emit.NewSocketSession(vars.Proxies, option, whites...)
if err != nil {
logger.Error("Error initializing HTTPJa3Client: ", err)
logger.Error("Error initializing HTTPClient: ", err)
}

HTTPClient = emit.MergeSession(HTTPClient, HTTPJa3Client, SocketClient)
IO = socketio.NewServer(nil, nil)

if value := pkg.Config.GetString("clash.proxies"); value != "" {
ClashAPIClient, err = emit.NewDefaultSession(value, option, whites...)
ClashAPIClient, err = emit.NewSession(vars.Proxies, emit.SimpleWithes("127.0.0.1"), options...)
if err != nil {
logger.Error("Error initializing ClashAPIClient: ", err)
}
Expand Down
14 changes: 7 additions & 7 deletions internal/plugin/llm/lmsys/fetch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func partTwo(ctx context.Context, proxies, cookies, hash string, opts options) e
Proxies(proxies).
POST(baseUrl+"/queue/join").
JHeader().
Ja3("yes").
Ja3().
Header("User-Agent", ua).
Header("Cookie", cookies).
Header("Origin", baseUrl).
Expand Down Expand Up @@ -111,7 +111,7 @@ func partTwo(ctx context.Context, proxies, cookies, hash string, opts options) e
response, err = emit.ClientBuilder(plugin.HTTPClient).
Context(ctx).
Proxies(proxies).
Ja3("yes").
Ja3().
GET(baseUrl+"/queue/data").
Query("session_hash", hash).
Header("User-Agent", ua).
Expand Down Expand Up @@ -154,7 +154,7 @@ func partThree(ctx context.Context, proxies, cookies, hash string, opts options)
Proxies(proxies).
POST(baseUrl+"/queue/join").
JHeader().
Ja3("yes").
Ja3().
Header("User-Agent", ua).
Header("Cookie", cookies).
Header("Origin", baseUrl).
Expand Down Expand Up @@ -184,7 +184,7 @@ func partThree(ctx context.Context, proxies, cookies, hash string, opts options)
response, err = emit.ClientBuilder(plugin.HTTPClient).
Context(ctx).
Proxies(proxies).
Ja3("yes").
Ja3().
GET(baseUrl+"/queue/data").
Query("session_hash", hash).
Header("User-Agent", ua).
Expand Down Expand Up @@ -303,7 +303,7 @@ func partOne(ctx context.Context, proxies, token string, opts *options, messages
Proxies(proxies).
POST(baseUrl+"/queue/join").
JHeader().
Ja3("yes").
Ja3().
Header("User-Agent", ua).
Header("Cookie", cookies).
Header("Origin", baseUrl).
Expand Down Expand Up @@ -335,7 +335,7 @@ func partOne(ctx context.Context, proxies, token string, opts *options, messages
response, err = emit.ClientBuilder(plugin.HTTPClient).
Context(ctx).
Proxies(proxies).
Ja3("yes").
Ja3().
GET(baseUrl+"/queue/data").
Query("session_hash", hash).
Header("User-Agent", ua).
Expand Down Expand Up @@ -415,7 +415,7 @@ label:
Context(ctx).
Proxies(proxies).
GET(baseUrl+"/info").
Ja3("yes").
Ja3().
Header("pragma", "no-cache").
Header("cache-control", "no-cache").
Header("Accept-Language", "en-US,en;q=0.9").
Expand Down

0 comments on commit 9b5e4db

Please sign in to comment.