From db34c54cafc9d3322f47ea42d3dadd192b8e9e17 Mon Sep 17 00:00:00 2001 From: Dmitrii Okunev Date: Sun, 19 Oct 2025 22:20:33 +0100 Subject: [PATCH] No comment --- cmd/streamcli/commands/screenshot_sender.go | 2 +- go.mod | 8 +++++--- go.sum | 14 ++++++++------ pkg/chatmessagesstorage/store.go | 4 ++-- pkg/streamcontrol/twitch/chat_handler_irc_test.go | 2 ++ pkg/streamd/grpc/goconv/encoder_config.go | 4 ++-- .../mediamtx/streamserver/stream_server.go | 2 +- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/cmd/streamcli/commands/screenshot_sender.go b/cmd/streamcli/commands/screenshot_sender.go index 4b31aef..ad96244 100644 --- a/cmd/streamcli/commands/screenshot_sender.go +++ b/cmd/streamcli/commands/screenshot_sender.go @@ -62,7 +62,7 @@ func (s *screenshotSender) setImage( var err error s.ImageResized, err = imgLike( img.Image, - image.Point{X: consts.ScreenshotMaxWidth, Y: consts.ScreenshotMaxHeight}, + image.Point{X: consts.ScreenshotMaxWidth / 2, Y: consts.ScreenshotMaxHeight / 2}, ) if err != nil { return fmt.Errorf("unable to create resized image: %w", err) diff --git a/go.mod b/go.mod index 2bdbeea..d6a624d 100755 --- a/go.mod +++ b/go.mod @@ -35,6 +35,8 @@ replace github.com/scorfly/gokick => github.com/xaionaro-go/gokick v0.0.0-202507 replace github.com/abhinavxd/youtube-live-chat-downloader/v2 => github.com/xaionaro-go/youtube-live-chat-downloader/v2 v2.0.0-20250726224735-811554015ae8 +replace github.com/Danny-Dasilva/CycleTLS => github.com/xaionaro-go/CycleTLS v0.0.0-20250923213111-aed0022ae7b5 + require ( github.com/facebookincubator/go-belt v0.0.0-20250308011339-62fb7027b11f github.com/go-git/go-billy/v5 v5.6.2 @@ -71,7 +73,7 @@ require ( github.com/abema/go-mp4 v1.4.1 // indirect github.com/adrg/libvlc-go/v3 v3.1.6 // indirect github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect - github.com/andybalholm/brotli v1.1.0 // indirect + github.com/andybalholm/brotli v1.2.0 // indirect github.com/asticode/go-astikit v0.55.0 // indirect github.com/asticode/go-astits v1.13.0 // indirect github.com/av-elier/go-decimal-to-rational v0.0.0-20250603203441-f39a07f43ff3 // indirect @@ -294,7 +296,7 @@ require ( github.com/iancoleman/strcase v0.3.0 github.com/immune-gmbh/attestation-sdk v0.0.0-20230711173209-f44e4502aeca github.com/kbinani/screenshot v0.0.0-20250624051815-089614a94018 - github.com/klauspost/compress v1.17.9 + github.com/klauspost/compress v1.18.0 github.com/lusingander/colorpicker v0.7.3 github.com/pojntfx/weron v0.2.7 github.com/prometheus/client_golang v1.20.5 @@ -312,7 +314,7 @@ require ( github.com/xaionaro-go/go-rtmp v0.0.0-20241009130244-1e3160f27f42 github.com/xaionaro-go/grpcproxy v0.0.0-20241103205849-a8fef42e72f9 github.com/xaionaro-go/iterate v0.0.0-20250406123757-7802d56b52ce - github.com/xaionaro-go/kickcom v0.0.0-20250923213542-2e7de9d14c9a + github.com/xaionaro-go/kickcom v0.0.0-20251019213336-23769c47b395 github.com/xaionaro-go/lockmap v0.0.0-20240901172806-e17aea364748 github.com/xaionaro-go/logwriter v0.0.0-20250111154941-c3f7a1a2d567 github.com/xaionaro-go/mediamtx v0.0.0-20250406132618-79ecbc3e138f diff --git a/go.sum b/go.sum index b1a3e01..ce37a8f 100755 --- a/go.sum +++ b/go.sum @@ -141,8 +141,8 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= -github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= +github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ= +github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= @@ -664,8 +664,8 @@ github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= -github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= +github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE= github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= @@ -1129,8 +1129,8 @@ github.com/xaionaro-go/helix/v2 v2.0.0-20250309182928-f54c9d4c8a29 h1:k7WLDHIK0A github.com/xaionaro-go/helix/v2 v2.0.0-20250309182928-f54c9d4c8a29/go.mod h1:e1GsZq4NDk9sQlPJ0Nr3+14R9cizqg09VAk7/IonpOU= github.com/xaionaro-go/iterate v0.0.0-20250406123757-7802d56b52ce h1:4a0vM4EOq7cU15TTmJHX66vX2cXA7RgVX3bWyj4ZVw4= github.com/xaionaro-go/iterate v0.0.0-20250406123757-7802d56b52ce/go.mod h1:Dx52o1WH1xUoV8jjpiIVTRZ/rNoPNPcnLdMrQ5D2FH0= -github.com/xaionaro-go/kickcom v0.0.0-20250923213542-2e7de9d14c9a h1:NgG7G0HBfvtrkgp0eWkKwAg6iwtJMUbLo4RtoxC4bTg= -github.com/xaionaro-go/kickcom v0.0.0-20250923213542-2e7de9d14c9a/go.mod h1:F02WBGD4oO/NTVzE/355Osx9nhZSE1pS7vsasXkdfSs= +github.com/xaionaro-go/kickcom v0.0.0-20251019213336-23769c47b395 h1:lkr6P2AsXh6hVQcdJeWsttQcWskhg4GW4uKeaoc3USo= +github.com/xaionaro-go/kickcom v0.0.0-20251019213336-23769c47b395/go.mod h1:dxsKxBKOTkPeeXejFkmmIuSpHVSJo8X1rv2O7iPZKj0= github.com/xaionaro-go/libsrt v0.0.0-20250505013920-61d894a3b7e9 h1:z5K1pa9cJZ2oqFNWyyxrxO/50Hv4Gn+1kkfXTHkoKNM= github.com/xaionaro-go/libsrt v0.0.0-20250505013920-61d894a3b7e9/go.mod h1:yH5w7hdIyhbR4p0WfABH9fLIIK2ZwPd5CKk2K2ND/vo= github.com/xaionaro-go/lockmap v0.0.0-20240901172806-e17aea364748 h1:SlB3zLAuLgRxdOo250gMUG/7hSiEU2NzEUNYbJDuI2A= @@ -1192,6 +1192,8 @@ github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= +github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU= +github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= github.com/yargevad/filepathx v1.0.0 h1:SYcT+N3tYGi+NvazubCNlvgIPbzAk7i7y2dwg3I5FYc= github.com/yargevad/filepathx v1.0.0/go.mod h1:BprfX/gpYNJHJfc35GjRRpVcwWXS89gGulUIU5tK3tA= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/pkg/chatmessagesstorage/store.go b/pkg/chatmessagesstorage/store.go index 28247ed..364efd1 100644 --- a/pkg/chatmessagesstorage/store.go +++ b/pkg/chatmessagesstorage/store.go @@ -40,13 +40,13 @@ func (s *ChatMessagesStorage) storeLocked(ctx context.Context) (_err error) { err = os.Rename(s.FilePath, oldFilePath) if err != nil { if !os.IsNotExist(err) { - return fmt.Errorf("unable to move '%s' to '%s': %w", s.FilePath, oldFilePath) + return fmt.Errorf("unable to move '%s' to '%s': %w", s.FilePath, oldFilePath, err) } } err = os.Rename(newFilePath, s.FilePath) if err != nil { - return fmt.Errorf("unable to move '%s' to '%s': %w", newFilePath, s.FilePath) + return fmt.Errorf("unable to move '%s' to '%s': %w", newFilePath, s.FilePath, err) } err = os.Remove(oldFilePath) diff --git a/pkg/streamcontrol/twitch/chat_handler_irc_test.go b/pkg/streamcontrol/twitch/chat_handler_irc_test.go index e59d251..337e1df 100644 --- a/pkg/streamcontrol/twitch/chat_handler_irc_test.go +++ b/pkg/streamcontrol/twitch/chat_handler_irc_test.go @@ -54,10 +54,12 @@ func TestChatHandlerIRC(t *testing.T) { require.NoError(t, err) expectedEvent := streamcontrol.ChatMessage{ + EventType: 1, UserID: "user-id", Username: "user-id", MessageID: "message-id", Message: "some\nmulti line\n message", + MessageFormatType: 1, } messagesCount := 0 diff --git a/pkg/streamd/grpc/goconv/encoder_config.go b/pkg/streamd/grpc/goconv/encoder_config.go index ff594da..727e1d3 100644 --- a/pkg/streamd/grpc/goconv/encoder_config.go +++ b/pkg/streamd/grpc/goconv/encoder_config.go @@ -55,7 +55,7 @@ func AudioCodecToThrift( case recoder.AudioCodecOpus: return streamd_grpc.AudioCodec_AudioCodecOpus default: - panic(fmt.Errorf("unexpected audio codec: '%s'", codec)) + panic(fmt.Errorf("unexpected audio codec: '%#+v'", codec)) } } @@ -114,7 +114,7 @@ func VideoCodecToThrift( case recoder.VideoCodecAV1: return streamd_grpc.VideoCodec_VideoCodecAV1 default: - panic(fmt.Errorf("unexpected video codec: '%s'", codec)) + panic(fmt.Errorf("unexpected video codec: '%#+v'", codec)) } } diff --git a/pkg/streamserver/implementations/mediamtx/streamserver/stream_server.go b/pkg/streamserver/implementations/mediamtx/streamserver/stream_server.go index db45738..bf55348 100644 --- a/pkg/streamserver/implementations/mediamtx/streamserver/stream_server.go +++ b/pkg/streamserver/implementations/mediamtx/streamserver/stream_server.go @@ -152,7 +152,7 @@ func (s *StreamServer) PathReady(path defs.Path) { publisher := s.publishers[appKey] if publisher != nil { err := fmt.Errorf( - "double-registration of a publisher for '%s' (this is an internal error in the code): %w", + "double-registration of a publisher for '%s' (this is an internal error in the code)", appKey, ) logger.Errorf(ctx, "%v", err)