oob: improve performance

Author: xcolwell

message_pool.go

@@ -1,6 +1,7 @@
 package connect
 
 import (
+	"encoding/base64"
 	"encoding/binary"
 	"fmt"
 	"hash/maphash"
@@ -497,3 +498,23 @@ func ProtoMarshalWithTag(m proto.Message, tag uint8) ([]byte, error) {
 func ProtoUnmarshal(b []byte, m proto.Message) error {
 	return proto.Unmarshal(b, m)
 }
+
+func EncodeBase64(enc *base64.Encoding, src []byte) string {
+	buf := MessagePoolGet(enc.EncodedLen(len(src)))
+	defer MessagePoolReturn(buf)
+	enc.Encode(buf, src)
+	return string(buf)
+}
+
+func DecodeBase64(enc *base64.Encoding, s string) ([]byte, error) {
+	sbuf := MessagePoolGet(len(s))
+	defer MessagePoolReturn(sbuf)
+	copy(sbuf, s)
+	buf := MessagePoolGet(enc.DecodedLen(len(s)))
+	n, err := enc.Decode(buf, sbuf)
+	if err != nil {
+		MessagePoolReturn(buf)
+		return nil, err
+	}
+	return buf[:n], nil
+}

message_pool_test.go

@@ -2,6 +2,7 @@ package connect
 
 import (
 	"bytes"
+	"encoding/base64"
 	"fmt"
 	mathrand "math/rand"
 	"testing"
@@ -107,3 +108,14 @@ func TestMessagePoolShare(t *testing.T) {
 		assert.Equal(t, shared, false)
 	}
 }
+
+func TestBase64(t *testing.T) {
+	for range 128 {
+		n := mathrand.Intn(512)
+		b := make([]byte, n)
+		mathrand.Read(b)
+		b2, err := DecodeBase64(base64.StdEncoding, EncodeBase64(base64.StdEncoding, b))
+		assert.Equal(t, err, nil)
+		assert.Equal(t, b, b2)
+	}
+}

transfer_oob_control.go

@@ -75,23 +75,22 @@ func (self *ApiOutOfBandControl) SendControl(
 	}
 	defer MessagePoolReturn(packBytes)
 
-	packByteStr := base64.StdEncoding.EncodeToString(packBytes)
-
 	self.api.ConnectControl(
 		&ConnectControlArgs{
-			Pack: packByteStr,
+			Pack: EncodeBase64(base64.StdEncoding, packBytes),
 		},
 		NewApiCallback(func(result *ConnectControlResult, err error) {
 			if err != nil {
 				safeCallback(nil, err)
 				return
 			}
 
-			packBytes, err := base64.StdEncoding.DecodeString(result.Pack)
+			packBytes, err := DecodeBase64(base64.StdEncoding, result.Pack)
 			if err != nil {
 				safeCallback(nil, err)
 				return
 			}
+			defer MessagePoolReturn(packBytes)
 
 			responsePack := &protocol.Pack{}
 			err = ProtoUnmarshal(packBytes, responsePack)