Add redirect/geoip/geosite

common/rw/output.go

@@ -1,94 +0,0 @@
-package rw
-
-import (
-	"io"
-
-	"github.com/sagernet/sing/common"
-	"github.com/sagernet/sing/common/buf"
-	"github.com/sagernet/sing/common/list"
-)
-
-type OutputStream interface {
-	common.WriterWithUpstream
-	Process(p []byte) (n int, buffer *buf.Buffer, flush bool, err error)
-}
-
-type DirectException struct {
-	Suppressed error
-}
-
-func (e *DirectException) Error() string {
-	return "upstream used directly"
-}
-
-type processFunc func(p []byte) (n int, buffer *buf.Buffer, flush bool, err error)
-
-type OutputStreamWriter struct {
-	upstream io.Writer
-	chain    list.List[processFunc]
-}
-
-func (w *OutputStreamWriter) Upstream() io.Writer {
-	return w.upstream
-}
-
-func (w *OutputStreamWriter) Write(p []byte) (n int, err error) {
-	var needFlush bool
-	var buffers list.List[*buf.Buffer]
-	defer buf.ReleaseMulti(&buffers)
-
-	for stream := w.chain.Back(); stream != nil; stream = stream.Prev() {
-		// TODO: remove cast
-		var process processFunc = stream.Value
-		processed, buffer, flush, err := process(p)
-		if buffer != nil {
-			p = buffer.Bytes()
-			processed = buffer.Len()
-			buffers.PushBack(buffer)
-		}
-		if err != nil {
-			if directException, isDirectException := err.(*DirectException); isDirectException {
-				return processed, directException.Suppressed
-			}
-			return 0, err
-		}
-		p = p[:processed]
-		if flush {
-			needFlush = true
-		}
-	}
-	n, err = w.upstream.Write(p)
-	if err != nil {
-		return
-	}
-
-	if needFlush {
-		err = common.Flush(w.upstream)
-	}
-
-	return
-}
-
-func GetWriter(writer io.Writer) io.Writer {
-	if _, isOutputStreamWriter := writer.(*OutputStreamWriter); isOutputStreamWriter {
-		return writer
-	}
-
-	output := OutputStreamWriter{}
-	for index := 0; ; index++ {
-		if outputStream, isOutputStream := writer.(OutputStream); isOutputStream {
-			output.chain.PushFront(outputStream.Process)
-			writer = outputStream.Upstream()
-		} else if outputStreamWriter, isOutputStreamWriter := writer.(*OutputStreamWriter); isOutputStreamWriter {
-			writer = outputStreamWriter.upstream
-			output.chain.PushFrontList(&outputStreamWriter.chain)
-		} else {
-			if index == 0 {
-				return writer
-			}
-			break
-		}
-	}
-	output.upstream = writer
-	return &output
-}

common/rw/varinat.go

@@ -0,0 +1,42 @@
+package rw
+
+import (
+	"encoding/binary"
+	"github.com/sagernet/sing/common"
+	"io"
+)
+
+type InputStream interface {
+	io.Reader
+	io.ByteReader
+}
+
+type OutputStream interface {
+	io.Writer
+	io.ByteWriter
+}
+
+func WriteUVariant(writer io.Writer, value uint64) error {
+	var b [8]byte
+	return common.Error(writer.Write(b[:binary.PutUvarint(b[:], value)]))
+}
+
+func WriteVString(writer io.Writer, value string) error {
+	err := WriteUVariant(writer, uint64(len(value)))
+	if err != nil {
+		return err
+	}
+	return WriteString(writer, value)
+}
+
+func ReadVString(reader InputStream) (string, error) {
+	length, err := binary.ReadUvarint(reader)
+	if err != nil {
+		return "", err
+	}
+	value, err := ReadBytes(reader, int(length))
+	if err != nil {
+		return "", err
+	}
+	return string(value), nil
+}