CN-JS-HuiBai/SingboxForPanel
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix v2ray api

Browse Source
This commit is contained in:
世界
2022-10-26 19:20:34 +08:00
parent f2b5098fa0
commit 22f06f582b
6 changed files with 146 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
experimental/trackerconn/conn.go
View File

@@ -1,7 +1,6 @@
package trackerconn
import (
"io"
"net"
"github.com/sagernet/sing/common/buf"
@@ -11,33 +10,25 @@ import (
"go.uber.org/atomic"
)
func New(conn net.Conn, readCounter *atomic.Int64, writeCounter *atomic.Int64, direct bool) N.ExtendedConn {
trackerConn := &Conn{bufio.NewExtendedConn(conn), readCounter, writeCounter}
if direct {
return (*DirectConn)(trackerConn)
} else {
return trackerConn
}
func New(conn net.Conn, readCounter []*atomic.Int64, writeCounter []*atomic.Int64, direct bool) *Conn {
return &Conn{bufio.NewExtendedConn(conn), readCounter, writeCounter}
}
func NewHook(conn net.Conn, readCounter func(n int64), writeCounter func(n int64), direct bool) N.ExtendedConn {
trackerConn := &HookConn{bufio.NewExtendedConn(conn), readCounter, writeCounter}
if direct {
return (*DirectHookConn)(trackerConn)
} else {
return trackerConn
}
func NewHook(conn net.Conn, readCounter func(n int64), writeCounter func(n int64), direct bool) *HookConn {
return &HookConn{bufio.NewExtendedConn(conn), readCounter, writeCounter}
}
type Conn struct {
N.ExtendedConn
readCounter *atomic.Int64
writeCounter *atomic.Int64
readCounter []*atomic.Int64
writeCounter []*atomic.Int64
}
func (c *Conn) Read(p []byte) (n int, err error) {
n, err = c.ExtendedConn.Read(p)
c.readCounter.Add(int64(n))
for _, counter := range c.readCounter {
counter.Add(int64(n))
}
return n, err
}
@@ -46,13 +37,17 @@ func (c *Conn) ReadBuffer(buffer *buf.Buffer) error {
if err != nil {
return err
}
c.readCounter.Add(int64(buffer.Len()))
for _, counter := range c.readCounter {
counter.Add(int64(buffer.Len()))
}
return nil
}
func (c *Conn) Write(p []byte) (n int, err error) {
n, err = c.ExtendedConn.Write(p)
c.writeCounter.Add(int64(n))
for _, counter := range c.writeCounter {
counter.Add(int64(n))
}
return n, err
}
@@ -62,7 +57,9 @@ func (c *Conn) WriteBuffer(buffer *buf.Buffer) error {
if err != nil {
return err
}
c.writeCounter.Add(dataLen)
for _, counter := range c.writeCounter {
counter.Add(dataLen)
}
return nil
}
@@ -110,51 +107,3 @@ func (c *HookConn) WriteBuffer(buffer *buf.Buffer) error {
func (c *HookConn) Upstream() any {
return c.ExtendedConn
}
type DirectConn Conn
func (c *DirectConn) WriteTo(w io.Writer) (n int64, err error) {
reader := N.UnwrapReader(c.ExtendedConn)
if wt, ok := reader.(io.WriterTo); ok {
n, err = wt.WriteTo(w)
c.readCounter.Add(n)
return
} else {
return bufio.Copy(w, (*Conn)(c))
}
}
func (c *DirectConn) ReadFrom(r io.Reader) (n int64, err error) {
writer := N.UnwrapWriter(c.ExtendedConn)
if rt, ok := writer.(io.ReaderFrom); ok {
n, err = rt.ReadFrom(r)
c.writeCounter.Add(n)
return
} else {
return bufio.Copy((*Conn)(c), r)
}
}
type DirectHookConn HookConn
func (c *DirectHookConn) WriteTo(w io.Writer) (n int64, err error) {
reader := N.UnwrapReader(c.ExtendedConn)
if wt, ok := reader.(io.WriterTo); ok {
n, err = wt.WriteTo(w)
c.readCounter(n)
return
} else {
return bufio.Copy(w, (*HookConn)(c))
}
}
func (c *DirectHookConn) ReadFrom(r io.Reader) (n int64, err error) {
writer := N.UnwrapWriter(c.ExtendedConn)
if rt, ok := writer.(io.ReaderFrom); ok {
n, err = rt.ReadFrom(r)
c.writeCounter(n)
return
} else {
return bufio.Copy((*HookConn)(c), r)
}
}