Revert back the secret package

pkg/llm/chatgpt.go

@@ -7,8 +7,8 @@ import (
 	"github.com/cloudwego/eino-ext/components/model/openai"
 	"github.com/cloudwego/eino/schema"
 	"github.com/facebookincubator/go-belt/tool/logger"
-	"github.com/xaionaro-go/secret"
 	llmtypes "github.com/xaionaro-go/streamctl/pkg/llm/types"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 )
 
 type ChatGPT struct {

pkg/p2p/implementations/weron/p2p.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pojntfx/weron/pkg/wrtcconn"
 	"github.com/pojntfx/weron/pkg/wrtcip"
 	"github.com/xaionaro-go/observability"
-	"github.com/xaionaro-go/secret"
 	"github.com/xaionaro-go/streamctl/pkg/consts"
 	p2pconsts "github.com/xaionaro-go/streamctl/pkg/p2p/implementations/weron/consts"
 	"github.com/xaionaro-go/streamctl/pkg/p2p/types"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 )
 
 const (

pkg/screenshoter/screenshoter_wayland.go

@@ -23,8 +23,8 @@ import (
 	"github.com/xaionaro-go/avpipeline/node"
 	"github.com/xaionaro-go/avpipeline/packet"
 	"github.com/xaionaro-go/observability"
-	"github.com/xaionaro-go/secret"
 	"github.com/xaionaro-go/streamctl/pkg/screenshot"
+	"github.com/xaionaro-go/secret"
 	"golang.org/x/sys/unix"
 )
 
@@ -57,7 +57,7 @@ func (s *ScreenshoterWayland) Loop(
 	logger.Debugf(ctx, "starting wf-recorder")
 	args := []string{
 		"wf-recorder",
-		"-o", "DP-2",
+		"-o", "DP-8",
 		"-y",
 		"-r", fmt.Sprintf("%f", 1.0/interval.Seconds()),
 		"-c", "rawvideo",

pkg/secret/any.go

@@ -0,0 +1,61 @@
+package secret
+
+import (
+	"encoding/base64"
+	"fmt"
+
+	"github.com/xaionaro-go/secret"
+	"gopkg.in/yaml.v2"
+)
+
+type Any[T any] struct {
+	secret.Any[T]
+}
+
+func New[T any](in T) Any[T] {
+	return Any[T]{Any: secret.New(in)}
+}
+
+func (s Any[T]) MarshalYAML() (_ret []byte, _err error) {
+	defer func() {
+		if r := recover(); r != nil {
+			_err = fmt.Errorf("got a panic: %v", r)
+		}
+	}()
+
+	var v any = s.Get()
+	if b, ok := v.([]byte); ok {
+		v = base64.StdEncoding.EncodeToString(b)
+	}
+	b, err := yaml.Marshal(v)
+	return b, err
+}
+
+func (s *Any[T]) UnmarshalYAML(b []byte) (_err error) {
+	defer func() {
+		if r := recover(); r != nil {
+			_err = fmt.Errorf("got a panic: %v", r)
+		}
+	}()
+
+	var v T
+	if _, ok := any(v).([]byte); ok {
+		var str string
+		err := yaml.Unmarshal(b, &str)
+		if err != nil {
+			return fmt.Errorf("unable to yaml.Unmarshal: %w", err)
+		}
+		b, err := base64.StdEncoding.DecodeString(str)
+		if err != nil {
+			return fmt.Errorf("unable to decode '%s' as base64: %w", str, err)
+		}
+		s.Set(any(b).(T))
+	} else {
+		err := yaml.Unmarshal(b, &v)
+		if err != nil {
+			return fmt.Errorf("unable to yaml.Unmarshal: %w", err)
+		}
+		s.Set(v)
+	}
+	return nil
+}

pkg/secret/bytes.go

@@ -0,0 +1,3 @@
+package secret
+
+type Bytes = Any[[]byte]

pkg/secret/oauth2_token.go

@@ -0,0 +1,9 @@
+package secret
+
+import (
+	"golang.org/x/oauth2"
+)
+
+// OAuth2Token stores an OAuth2 token in an encrypted state in memory, so that
+// you don't accidentally leak these secrets via logging or whatever.
+type OAuth2Token = Any[oauth2.Token]

pkg/secret/string.go

@@ -0,0 +1,3 @@
+package secret
+
+type String = Any[string]

pkg/streamcontrol/kick/kick.go

@@ -18,8 +18,8 @@ import (
 	"github.com/scorfly/gokick"
 	"github.com/xaionaro-go/kickcom"
 	"github.com/xaionaro-go/observability"
-	"github.com/xaionaro-go/secret"
 	"github.com/xaionaro-go/streamctl/pkg/oauthhandler"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 	"github.com/xaionaro-go/streamctl/pkg/streamcontrol"
 	"github.com/xaionaro-go/xsync"
 )

pkg/streamcontrol/kick/types/config.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"time"
 
-	"github.com/xaionaro-go/secret"
 	"github.com/xaionaro-go/streamctl/pkg/buildvars"
 	"github.com/xaionaro-go/streamctl/pkg/oauthhandler"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 	streamctl "github.com/xaionaro-go/streamctl/pkg/streamcontrol"
 )
 

pkg/streamcontrol/kick/types/custom_data.go

@@ -1,7 +1,7 @@
 package kick
 
 import (
-	"github.com/xaionaro-go/secret"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 )
 
 type CustomData struct {

pkg/streamcontrol/obs/types/config.go

@@ -3,7 +3,7 @@ package types
 import (
 	"time"
 
-	"github.com/xaionaro-go/secret"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 	streamctl "github.com/xaionaro-go/streamctl/pkg/streamcontrol"
 )
 

pkg/streamcontrol/twitch/auth/access_token_app.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/facebookincubator/go-belt/tool/logger"
-	"github.com/xaionaro-go/secret"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 	twitch "github.com/xaionaro-go/streamctl/pkg/streamcontrol/twitch/types"
 )
 

pkg/streamcontrol/twitch/auth/access_token_user.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/facebookincubator/go-belt/tool/logger"
 	"github.com/xaionaro-go/observability"
-	"github.com/xaionaro-go/secret"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 	twitch "github.com/xaionaro-go/streamctl/pkg/streamcontrol/twitch/types"
 )
 

pkg/streamcontrol/twitch/cmd/chatlistener/main.go

@@ -12,8 +12,8 @@ import (
 	"github.com/facebookincubator/go-belt/tool/logger/implementation/zap"
 	"github.com/nicklaw5/helix/v2"
 	"github.com/xaionaro-go/observability"
-	"github.com/xaionaro-go/secret"
 	"github.com/xaionaro-go/streamctl/pkg/oauthhandler"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 	"github.com/xaionaro-go/streamctl/pkg/streamcontrol/twitch"
 	"github.com/xaionaro-go/streamctl/pkg/streamcontrol/twitch/auth"
 )

pkg/streamcontrol/twitch/twitch.go

@@ -16,9 +16,9 @@ import (
 	"github.com/hashicorp/go-multierror"
 	"github.com/nicklaw5/helix/v2"
 	"github.com/xaionaro-go/observability"
-	"github.com/xaionaro-go/secret"
 	"github.com/xaionaro-go/streamctl/pkg/buildvars"
 	"github.com/xaionaro-go/streamctl/pkg/ringbuffer"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 	"github.com/xaionaro-go/streamctl/pkg/streamcontrol"
 	"github.com/xaionaro-go/streamctl/pkg/streamcontrol/twitch/auth"
 	"github.com/xaionaro-go/xsync"

pkg/streamcontrol/twitch/types/config.go

@@ -1,8 +1,8 @@
 package twitch
 
 import (
-	"github.com/xaionaro-go/secret"
 	"github.com/xaionaro-go/streamctl/pkg/buildvars"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 	streamctl "github.com/xaionaro-go/streamctl/pkg/streamcontrol"
 )
 

pkg/streamcontrol/youtube/types/config.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/xaionaro-go/secret"
 	"github.com/xaionaro-go/streamctl/pkg/oauthhandler"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 	streamctl "github.com/xaionaro-go/streamctl/pkg/streamcontrol"
 	"golang.org/x/oauth2"
 )

pkg/streamcontrol/youtube/youtube.go

@@ -22,8 +22,8 @@ import (
 	"github.com/go-yaml/yaml"
 	"github.com/hashicorp/go-multierror"
 	"github.com/xaionaro-go/observability"
-	"github.com/xaionaro-go/secret"
 	"github.com/xaionaro-go/streamctl/pkg/oauthhandler"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 	"github.com/xaionaro-go/streamctl/pkg/streamcontrol"
 	"github.com/xaionaro-go/timeapiio"
 	"github.com/xaionaro-go/xcontext"

pkg/streamd/config/git_repo_config.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/xaionaro-go/secret"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 )
 
 type GitRepoConfig struct {

pkg/streamd/config/p2p_network.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/goombaio/namegenerator"
-	"github.com/xaionaro-go/secret"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 )
 
 type P2PPrivateKey struct {

pkg/streamd/llm.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 
 	"github.com/facebookincubator/go-belt/tool/logger"
-	"github.com/xaionaro-go/secret"
 	llms "github.com/xaionaro-go/streamctl/pkg/llm"
 	llmtypes "github.com/xaionaro-go/streamctl/pkg/llm/types"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 	"github.com/xaionaro-go/xcontext"
 	"github.com/xaionaro-go/xsync"
 )

pkg/streamserver/streamforward/stream_forwards.go

@@ -11,7 +11,7 @@ import (
 	"github.com/xaionaro-go/lockmap"
 	"github.com/xaionaro-go/observability"
 	"github.com/xaionaro-go/recoder"
-	"github.com/xaionaro-go/secret"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 	"github.com/xaionaro-go/streamctl/pkg/streamcontrol/youtube"
 	"github.com/xaionaro-go/streamctl/pkg/streamd/memoize"
 	"github.com/xaionaro-go/streamctl/pkg/streamserver/types"

pkg/streamserver/types/types.go

@@ -2,7 +2,7 @@ package types
 
 import (
 	"github.com/xaionaro-go/recoder/xaionaro-go-rtmp/yutoppgortmp"
-	"github.com/xaionaro-go/secret"
+	"github.com/xaionaro-go/streamctl/pkg/secret"
 	"github.com/xaionaro-go/streamctl/pkg/streamtypes"
 )