From fa13c96412f1606adeb0ccf31729fd63ff42c412 Mon Sep 17 00:00:00 2001 From: zijiren233 Date: Tue, 30 Jan 2024 18:04:54 +0800 Subject: [PATCH] Fix: ali ios play --- go.mod | 18 +++++------ go.sum | 20 ++++++++++++ proto/message/message.pb.go | 62 +++++++++++++++++++----------------- proto/message/message.proto | 1 + server/handlers/websocket.go | 35 ++++++++++++++++++-- 5 files changed, 96 insertions(+), 40 deletions(-) diff --git a/go.mod b/go.mod index 71f1a2c3..95c13fce 100644 --- a/go.mod +++ b/go.mod @@ -9,8 +9,8 @@ require ( github.com/gin-gonic/gin v1.9.1 github.com/glebarez/sqlite v1.10.0 github.com/go-kratos/aegis v0.2.0 - github.com/go-kratos/kratos/contrib/registry/consul/v2 v2.0.0-20240118055437-9860d59ca7e9 - github.com/go-kratos/kratos/contrib/registry/etcd/v2 v2.0.0-20240118055437-9860d59ca7e9 + github.com/go-kratos/kratos/contrib/registry/consul/v2 v2.0.0-20240119085030-a556a2b53120 + github.com/go-kratos/kratos/contrib/registry/etcd/v2 v2.0.0-20240119085030-a556a2b53120 github.com/go-kratos/kratos/v2 v2.7.2 github.com/go-resty/resty/v2 v2.11.0 github.com/golang-jwt/jwt/v4 v4.5.0 @@ -40,7 +40,7 @@ require ( github.com/zijiren233/yaml-comment v0.2.1 go.etcd.io/etcd/client/v3 v3.5.11 golang.org/x/crypto v0.18.0 - golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 + golang.org/x/exp v0.0.0-20240119083558-1b970713d09a golang.org/x/oauth2 v0.16.0 google.golang.org/grpc v1.61.0 google.golang.org/protobuf v1.32.0 @@ -73,7 +73,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-querystring v1.1.0 // indirect - github.com/google/pprof v0.0.0-20240117000934-35fc243c5815 // indirect + github.com/google/pprof v0.0.0-20240125082051-42cd04596328 // indirect github.com/google/wire v0.5.0 // indirect github.com/gorilla/mux v1.8.1 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect @@ -92,10 +92,10 @@ require ( github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect - github.com/leodido/go-urn v1.2.4 // indirect + github.com/leodido/go-urn v1.3.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mattn/go-sqlite3 v1.14.19 // indirect + github.com/mattn/go-sqlite3 v1.14.20 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect @@ -121,9 +121,9 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.17.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect + google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect ) diff --git a/go.sum b/go.sum index 308b086b..b80a8b00 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM= +cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4= cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= @@ -75,8 +77,12 @@ github.com/go-kratos/aegis v0.2.0 h1:dObzCDWn3XVjUkgxyBp6ZeWtx/do0DPZ7LY3yNSJLUQ github.com/go-kratos/aegis v0.2.0/go.mod h1:v0R2m73WgEEYB3XYu6aE2WcMwsZkJ/Rzuf5eVccm7bI= github.com/go-kratos/kratos/contrib/registry/consul/v2 v2.0.0-20240118055437-9860d59ca7e9 h1:PX55RxIjI0VWRv3KhMDAHxa3WBuKuzd5uFffbpfYifE= github.com/go-kratos/kratos/contrib/registry/consul/v2 v2.0.0-20240118055437-9860d59ca7e9/go.mod h1:yb9i4gq3jCW5zMFqzi50J0Xh3n4MRbcMlnuDBXYpvjs= +github.com/go-kratos/kratos/contrib/registry/consul/v2 v2.0.0-20240119085030-a556a2b53120 h1:jP+QvvpAY6MagSlTY6jHCNQEag0WkqdXcdXN3CPCemg= +github.com/go-kratos/kratos/contrib/registry/consul/v2 v2.0.0-20240119085030-a556a2b53120/go.mod h1:yb9i4gq3jCW5zMFqzi50J0Xh3n4MRbcMlnuDBXYpvjs= github.com/go-kratos/kratos/contrib/registry/etcd/v2 v2.0.0-20240118055437-9860d59ca7e9 h1:/IlfKi/wI8vjRI2BNdblsn/OEnDesCDMdT0kGI8hO7c= github.com/go-kratos/kratos/contrib/registry/etcd/v2 v2.0.0-20240118055437-9860d59ca7e9/go.mod h1:CiTe7H5Lj8WB6dGvBwS4HFukcWnobfq+vFWedIGYftA= +github.com/go-kratos/kratos/contrib/registry/etcd/v2 v2.0.0-20240119085030-a556a2b53120 h1:RaXWYcS+fNTB5+nEagfEHq8Uojjl170EJq8pZxFZxy0= +github.com/go-kratos/kratos/contrib/registry/etcd/v2 v2.0.0-20240119085030-a556a2b53120/go.mod h1:CiTe7H5Lj8WB6dGvBwS4HFukcWnobfq+vFWedIGYftA= github.com/go-kratos/kratos/v2 v2.7.2 h1:WVPGFNLKpv+0odMnCPxM4ZHa2hy9I5FOnwpG3Vv4w5c= github.com/go-kratos/kratos/v2 v2.7.2/go.mod h1:rppuc8+pGL2UtXA29bgFHWKqaaF6b6GB2XIYiDvFBRk= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= @@ -136,6 +142,8 @@ github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20240117000934-35fc243c5815 h1:WzfWbQz/Ze8v6l++GGbGNFZnUShVpP/0xffCPLL+ax8= github.com/google/pprof v0.0.0-20240117000934-35fc243c5815/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= +github.com/google/pprof v0.0.0-20240125082051-42cd04596328 h1:oI+lCI2DY1BsRrdzMJBhIMxBBdlZJl31YNQC11EiyvA= +github.com/google/pprof v0.0.0-20240125082051-42cd04596328/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -233,6 +241,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= +github.com/leodido/go-urn v1.3.0 h1:jX8FDLfW4ThVXctBNZ+3cIWnCSnrACDV73r76dy0aQQ= +github.com/leodido/go-urn v1.3.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/maruel/natural v1.1.1 h1:Hja7XhhmvEFhcByqDoHz9QZbkWey+COd9xWfCfn1ioo= github.com/maruel/natural v1.1.1/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRHB7ZKEg= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= @@ -252,6 +262,8 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI= github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.20 h1:BAZ50Ns0OFBNxdAqFhbZqdPcht1Xlb16pDCqkq1spr0= +github.com/mattn/go-sqlite3 v1.14.20/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY= @@ -396,6 +408,8 @@ golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o= golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= @@ -499,10 +513,16 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac h1:ZL/Teoy/ZGnzyrqK/Optxxp2pmVh+fmJ97slxSRyzUg= google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:+Rvu7ElI+aLzyDQhpHMFMMltsD6m7nqpuWDd2CwJw3k= +google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe h1:USL2DhxfgRchafRvt/wYyyQNzwgL7ZiURcozOE/Pkvo= +google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac h1:OZkkudMUu9LVQMCoRUbI/1p5VCo9BOrlvkqMvWtqa6s= google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:B5xPO//w8qmBDjGReYLpR6UJPnkldGkCSMoH/2vxJeg= +google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe h1:0poefMBYvYbs7g5UkjS6HcxBPaTRAmznle9jnxYoAI8= +google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac h1:nUQEQmH/csSvFECKYRv6HWEyypysidKl2I6Qpsglq/0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:daQN87bsDqDoe316QbbvX60nMoJQa4r6Ds0ZuoAe5yA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe h1:bQnxqljG/wqi4NTXu2+DJ3n7APcEA882QZ1JvhQAq9o= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= diff --git a/proto/message/message.pb.go b/proto/message/message.pb.go index 2e16bcc1..2c928ced 100644 --- a/proto/message/message.pb.go +++ b/proto/message/message.pb.go @@ -23,19 +23,20 @@ const ( type ElementMessageType int32 const ( - ElementMessageType_UNKNOWN ElementMessageType = 0 - ElementMessageType_ERROR ElementMessageType = 1 - ElementMessageType_CHAT_MESSAGE ElementMessageType = 2 - ElementMessageType_PLAY ElementMessageType = 3 - ElementMessageType_PAUSE ElementMessageType = 4 - ElementMessageType_CHECK ElementMessageType = 5 - ElementMessageType_TOO_FAST ElementMessageType = 6 - ElementMessageType_TOO_SLOW ElementMessageType = 7 - ElementMessageType_CHANGE_RATE ElementMessageType = 8 - ElementMessageType_CHANGE_SEEK ElementMessageType = 9 - ElementMessageType_CURRENT_CHANGED ElementMessageType = 10 - ElementMessageType_MOVIES_CHANGED ElementMessageType = 11 - ElementMessageType_PEOPLE_CHANGED ElementMessageType = 12 + ElementMessageType_UNKNOWN ElementMessageType = 0 + ElementMessageType_ERROR ElementMessageType = 1 + ElementMessageType_CHAT_MESSAGE ElementMessageType = 2 + ElementMessageType_PLAY ElementMessageType = 3 + ElementMessageType_PAUSE ElementMessageType = 4 + ElementMessageType_CHECK ElementMessageType = 5 + ElementMessageType_TOO_FAST ElementMessageType = 6 + ElementMessageType_TOO_SLOW ElementMessageType = 7 + ElementMessageType_CHANGE_RATE ElementMessageType = 8 + ElementMessageType_CHANGE_SEEK ElementMessageType = 9 + ElementMessageType_CURRENT_CHANGED ElementMessageType = 10 + ElementMessageType_MOVIES_CHANGED ElementMessageType = 11 + ElementMessageType_PEOPLE_CHANGED ElementMessageType = 12 + ElementMessageType_SYNC_MOVIE_STATUS ElementMessageType = 13 ) // Enum value maps for ElementMessageType. @@ -54,21 +55,23 @@ var ( 10: "CURRENT_CHANGED", 11: "MOVIES_CHANGED", 12: "PEOPLE_CHANGED", + 13: "SYNC_MOVIE_STATUS", } ElementMessageType_value = map[string]int32{ - "UNKNOWN": 0, - "ERROR": 1, - "CHAT_MESSAGE": 2, - "PLAY": 3, - "PAUSE": 4, - "CHECK": 5, - "TOO_FAST": 6, - "TOO_SLOW": 7, - "CHANGE_RATE": 8, - "CHANGE_SEEK": 9, - "CURRENT_CHANGED": 10, - "MOVIES_CHANGED": 11, - "PEOPLE_CHANGED": 12, + "UNKNOWN": 0, + "ERROR": 1, + "CHAT_MESSAGE": 2, + "PLAY": 3, + "PAUSE": 4, + "CHECK": 5, + "TOO_FAST": 6, + "TOO_SLOW": 7, + "CHANGE_RATE": 8, + "CHANGE_SEEK": 9, + "CURRENT_CHANGED": 10, + "MOVIES_CHANGED": 11, + "PEOPLE_CHANGED": 12, + "SYNC_MOVIE_STATUS": 13, } ) @@ -582,7 +585,7 @@ var file_proto_message_message_proto_rawDesc = []byte{ 0x64, 0x12, 0x35, 0x0a, 0x0e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x0e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, - 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x2a, 0xd9, 0x01, 0x0a, 0x12, 0x45, 0x6c, 0x65, + 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x2a, 0xf0, 0x01, 0x0a, 0x12, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x43, 0x48, 0x41, 0x54, 0x5f, @@ -596,8 +599,9 @@ var file_proto_message_message_proto_rawDesc = []byte{ 0x4e, 0x54, 0x5f, 0x43, 0x48, 0x41, 0x4e, 0x47, 0x45, 0x44, 0x10, 0x0a, 0x12, 0x12, 0x0a, 0x0e, 0x4d, 0x4f, 0x56, 0x49, 0x45, 0x53, 0x5f, 0x43, 0x48, 0x41, 0x4e, 0x47, 0x45, 0x44, 0x10, 0x0b, 0x12, 0x12, 0x0a, 0x0e, 0x50, 0x45, 0x4f, 0x50, 0x4c, 0x45, 0x5f, 0x43, 0x48, 0x41, 0x4e, 0x47, - 0x45, 0x44, 0x10, 0x0c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x45, 0x44, 0x10, 0x0c, 0x12, 0x15, 0x0a, 0x11, 0x53, 0x59, 0x4e, 0x43, 0x5f, 0x4d, 0x4f, 0x56, + 0x49, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x10, 0x0d, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/message/message.proto b/proto/message/message.proto index becdc9bc..fda42c2c 100644 --- a/proto/message/message.proto +++ b/proto/message/message.proto @@ -17,6 +17,7 @@ enum ElementMessageType { CURRENT_CHANGED = 10; MOVIES_CHANGED = 11; PEOPLE_CHANGED = 12; + SYNC_MOVIE_STATUS = 13; } message ChatResp { diff --git a/server/handlers/websocket.go b/server/handlers/websocket.go index dda98813..4e5fdf0e 100644 --- a/server/handlers/websocket.go +++ b/server/handlers/websocket.go @@ -168,8 +168,7 @@ func handleElementMsg(cli *op.Client, msg *pb.ElementMessage) error { }) case pb.ElementMessageType_PLAY, pb.ElementMessageType_PAUSE, - pb.ElementMessageType_CHANGE_RATE, - pb.ElementMessageType_CHANGE_SEEK: + pb.ElementMessageType_CHANGE_RATE: status := cli.Room().SetStatus(msg.ChangeMovieStatusReq.Playing, msg.ChangeMovieStatusReq.Seek, msg.ChangeMovieStatusReq.Rate, timeDiff) cli.Broadcast(&pb.ElementMessage{ Type: msg.Type, @@ -185,6 +184,38 @@ func handleElementMsg(cli *op.Client, msg *pb.ElementMessage) error { }, }, }, op.WithIgnoreClient(cli)) + case pb.ElementMessageType_CHANGE_SEEK: + status := cli.Room().SetSeekRate(msg.ChangeMovieStatusReq.Seek, msg.ChangeMovieStatusReq.Rate, timeDiff) + cli.Broadcast(&pb.ElementMessage{ + Type: msg.Type, + MovieStatusChanged: &pb.MovieStatusChanged{ + Sender: &pb.Sender{ + Username: cli.User().Username, + Userid: cli.User().ID, + }, + Status: &pb.MovieStatus{ + Playing: status.Playing, + Seek: status.Seek, + Rate: status.Rate, + }, + }, + }, op.WithIgnoreClient(cli)) + case pb.ElementMessageType_SYNC_MOVIE_STATUS: + status := cli.Room().Current().Status + cli.Send(&pb.ElementMessage{ + Type: pb.ElementMessageType_SYNC_MOVIE_STATUS, + MovieStatusChanged: &pb.MovieStatusChanged{ + Sender: &pb.Sender{ + Username: cli.User().Username, + Userid: cli.User().ID, + }, + Status: &pb.MovieStatus{ + Playing: status.Playing, + Seek: status.Seek, + Rate: status.Rate, + }, + }, + }) case pb.ElementMessageType_CHECK: current := cli.Room().Current() if msg.CheckReq.ExpireId != 0 {