diff --git a/benchmarks/rps/go.mod b/benchmarks/rps/go.mod index 3cab854a..634c0c7e 100644 --- a/benchmarks/rps/go.mod +++ b/benchmarks/rps/go.mod @@ -4,29 +4,29 @@ go 1.21.4 require ( github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b - github.com/go-orb/plugins/client/middleware/log v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/client/orb/transport/drpc v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/client/orb/transport/grpc v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/client/orb/transport/h2c v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/client/orb/transport/hertzh2c v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/client/orb/transport/hertzhttp v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/client/orb/transport/http v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/client/orb/transport/http3 v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/client/orb/transport/https v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/codecs/proto v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/codecs/yaml v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/config/source/file v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/log/lumberjack v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/log/slog v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/registry/consul v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/registry/mdns v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/server/drpc v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/server/grpc v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/server/hertz v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/server/http v0.0.0-20231206042754-386df184f3b8 + github.com/go-orb/plugins/client/middleware/log v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/client/orb/transport/drpc v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/client/orb/transport/grpc v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/client/orb/transport/h2c v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/client/orb/transport/hertzh2c v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/client/orb/transport/hertzhttp v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/client/orb/transport/http v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/client/orb/transport/http3 v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/client/orb/transport/https v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/codecs/proto v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/codecs/yaml v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/config/source/file v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/log/lumberjack v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/log/slog v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/registry/consul v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/registry/mdns v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/server/drpc v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/server/grpc v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/server/hertz v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/server/http v0.0.0-20231206043051-39c19db01b8f github.com/google/wire v0.5.0 github.com/hashicorp/consul/sdk v0.15.0 google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4 @@ -51,9 +51,9 @@ require ( github.com/fatih/color v1.16.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/go-chi/chi v1.5.5 // indirect - github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206042754-386df184f3b8 // indirect - github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206042754-386df184f3b8 // indirect - github.com/go-orb/plugins/registry/regutil v0.0.0-20231206042754-386df184f3b8 // indirect + github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206043051-39c19db01b8f // indirect + github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206043051-39c19db01b8f // indirect + github.com/go-orb/plugins/registry/regutil v0.0.0-20231206043051-39c19db01b8f // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/pprof v0.0.0-20231205033806-a5a03c77bf08 // indirect diff --git a/benchmarks/rps/go.sum b/benchmarks/rps/go.sum index babe9855..61b9a623 100644 --- a/benchmarks/rps/go.sum +++ b/benchmarks/rps/go.sum @@ -72,100 +72,56 @@ github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b h1:9lg1vas/UKYhd+SmIR0BJyeAcubhKSonZIWwBSpkGdo= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b/go.mod h1:esPD35O0lg1ksWTaiiYFJaAtH+Srku8DuoN0L91fvp0= -github.com/go-orb/plugins/client/middleware/log v0.0.0-20231206042754-386df184f3b8 h1:SLbjDQgU+Z1HcovoHvzZY630IpOXZVFFjk4KE5mvRhw= -github.com/go-orb/plugins/client/middleware/log v0.0.0-20231206042754-386df184f3b8/go.mod h1:txC3QmAPS3TLgEPjfNK97+eCbt/L5S2Zc5Oc2NSW5DQ= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d h1:gGNdaIn86SK5dh8PM29bxnJERwIixmWLOIjQ+JBvas8= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d/go.mod h1:l/PcMxCOSaY3Lm71obNbkhuBJZVq9wCd1L3EPQ94P4Q= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 h1:bmoCt8QGKBOMFRylCBFwunelLiflyUj8h+nWGltpsZI= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= -github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231205052311-482ca12d811d h1:08WFPgDpNgd2wFMVEoiLPh7beuNfFNP5Jh84s++9exE= -github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231205052311-482ca12d811d/go.mod h1:bsStSjTqzm1cjOtMThYkkxQCXerOTNwSkFV8V9DtEV4= -github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206042754-386df184f3b8 h1:yh3LjEC+3yHv7Y1aAUzsi9oEX46xJGA265JcX1Jjq04= -github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206042754-386df184f3b8/go.mod h1:jIilCtYh7Nzh6a8HdZIo831NBniHvbaBJuV0g87BWjk= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231205052311-482ca12d811d h1:H137KycRatHPpEX86JTdranTZRE9MDhKqVrFfjbJnZU= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231205052311-482ca12d811d/go.mod h1:zjMemu6YavzjIY9+z0J5VbBi5BZn5mCH5QWE/6BfLjg= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206042754-386df184f3b8 h1:EUBVYcERpfcwzx6L0Nn9zFuf9LIrsOkCUN7hkPQyQPY= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206042754-386df184f3b8/go.mod h1:z51cC+01j4PNPm9bpkap0zxNV3oOvmD89CBHO+L7Ck4= -github.com/go-orb/plugins/client/orb/transport/drpc v0.0.0-20231205052311-482ca12d811d h1:ox6lcrCwpoM12U7Gn/UI7CdbbdhmZ4XOFe4G5JEMunU= -github.com/go-orb/plugins/client/orb/transport/drpc v0.0.0-20231205052311-482ca12d811d/go.mod h1:Qpz9pgBgXTPmOc5OUiD+XszeOHqeTIHIWd45jt+8+GM= -github.com/go-orb/plugins/client/orb/transport/drpc v0.0.0-20231206042754-386df184f3b8 h1:/oaUUhKA2cFJWGRTqYJPMazGTb8G94vr1xr2ztwoDJc= -github.com/go-orb/plugins/client/orb/transport/drpc v0.0.0-20231206042754-386df184f3b8/go.mod h1:oyUY2px3yCY9XTuSMJ6E5eE7K6Ph0RUfrRQz5c9PgpI= -github.com/go-orb/plugins/client/orb/transport/grpc v0.0.0-20231205052311-482ca12d811d h1:arv/uRuZS9GYpJ1wUmRqLnoURact5lzAc/WYS1LI1s4= -github.com/go-orb/plugins/client/orb/transport/grpc v0.0.0-20231205052311-482ca12d811d/go.mod h1:/mRp2BQ/FddAkpLayyMc/tCGJAnst0xCgIEF6lpXM5s= -github.com/go-orb/plugins/client/orb/transport/grpc v0.0.0-20231206042754-386df184f3b8 h1:HFjQ7QcYuQExHvz9Z1uafFAvp6R9+EOMlDDI++TO5Aw= -github.com/go-orb/plugins/client/orb/transport/grpc v0.0.0-20231206042754-386df184f3b8/go.mod h1:TID68s+jYHkRHmbEVX2AqTXqVA0Y6En++s1EL/0oRVc= -github.com/go-orb/plugins/client/orb/transport/hertzhttp v0.0.0-20231205052311-482ca12d811d h1:8VDJVh6StEtAfxaPBfVxWkFMydlWdXrXTiGDYhW90oE= -github.com/go-orb/plugins/client/orb/transport/hertzhttp v0.0.0-20231205052311-482ca12d811d/go.mod h1:okrBN+0iF7/Bz1cYiKsZkq/t/CEET0eoVMiHFXL5dh8= -github.com/go-orb/plugins/client/orb/transport/hertzhttp v0.0.0-20231206042754-386df184f3b8 h1:4a+9Dz+IhfTDavGSQrexF2obLQDim5od7BNfB7akgnQ= -github.com/go-orb/plugins/client/orb/transport/hertzhttp v0.0.0-20231206042754-386df184f3b8/go.mod h1:oT6JuV8+9ojtN4mYjfL7tW07I9mfUG1A0JYhPCXVoqI= -github.com/go-orb/plugins/client/orb/transport/http v0.0.0-20231205052311-482ca12d811d h1:DUUIN/2EgDZ5+tIMq0Sd6TbG5AO7yb7M4nYKzPEz94A= -github.com/go-orb/plugins/client/orb/transport/http v0.0.0-20231205052311-482ca12d811d/go.mod h1:AbP2tvWx9TGp6yWTNLxVnIhdPfAxemIcObGo047Pw68= -github.com/go-orb/plugins/client/orb/transport/http v0.0.0-20231206042754-386df184f3b8 h1:4ZjgvY7Vk7mvUoYzoPmX5Bjq+r19RoBE6k51zf9QCpM= -github.com/go-orb/plugins/client/orb/transport/http v0.0.0-20231206042754-386df184f3b8/go.mod h1:PglIy9ombmz0kt8bD6F2JanbfC80cLpfibi3JzAiyFM= -github.com/go-orb/plugins/client/orb/transport/https v0.0.0-20231205052311-482ca12d811d h1:1AR30gVEjvNTPr1hcaIDu8sEJiSZ5LKdwB+XnRUhI6o= -github.com/go-orb/plugins/client/orb/transport/https v0.0.0-20231205052311-482ca12d811d/go.mod h1:sZzGJQU76AMv3Vyn184roJh6rkHr0Luv66WABOGuRn4= -github.com/go-orb/plugins/client/orb/transport/https v0.0.0-20231206042754-386df184f3b8 h1:ax7mHON3Hw2aSQXUhOZs7PQ8Hu6oMJ8tZGM+nFIYbJM= -github.com/go-orb/plugins/client/orb/transport/https v0.0.0-20231206042754-386df184f3b8/go.mod h1:iqqqIGGyjhs5T6F5oqeKzSvbGVVrIQmYkYf8cVRcNu8= +github.com/go-orb/plugins/client/middleware/log v0.0.0-20231206043051-39c19db01b8f h1:I3GOtCwR1iTolKYPqW5KHmWzVTf/njDqyJKdsco1IqA= +github.com/go-orb/plugins/client/middleware/log v0.0.0-20231206043051-39c19db01b8f/go.mod h1:txC3QmAPS3TLgEPjfNK97+eCbt/L5S2Zc5Oc2NSW5DQ= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f h1:GIC2Got3yjQkf5pdlMeslCww2fysgo5ijBUlKiXKBaI= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= +github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206043051-39c19db01b8f h1:j2qnGj9hcrtYMF9kCVDNuqfHwZPwTvlcWh2XGqKM5Nk= +github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206043051-39c19db01b8f/go.mod h1:FaxvWV7sUHKbPINgxai905yHhvDQeDLH7XN/XIqJoAg= +github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206043051-39c19db01b8f h1:22zUMmkCaHe43dY6MU8x7rF+r4tr97Na5T+KNEDfcB8= +github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206043051-39c19db01b8f/go.mod h1:FEY7L26d9zyTE0dhpHeAz/gcPhCuBqfIjaYiZoGXd6U= +github.com/go-orb/plugins/client/orb/transport/drpc v0.0.0-20231206043051-39c19db01b8f h1:dpl/28ONCIETJzfrANqLEO9IIZbfOcgtxwEiEwjnHPg= +github.com/go-orb/plugins/client/orb/transport/drpc v0.0.0-20231206043051-39c19db01b8f/go.mod h1:JKLyiaHn9lI0fz3Qoj4JnZNCKo0tgIkQUfPMKp9UzmU= +github.com/go-orb/plugins/client/orb/transport/grpc v0.0.0-20231206043051-39c19db01b8f h1:+5W3bBZkO+GjvnBiQW2qfyqVtUS8yPTH/vWaPRSvZes= +github.com/go-orb/plugins/client/orb/transport/grpc v0.0.0-20231206043051-39c19db01b8f/go.mod h1:qu3AWSMq7AecaUZmwT5902vQyuSAmsXlerKAs85hzV0= +github.com/go-orb/plugins/client/orb/transport/hertzhttp v0.0.0-20231206043051-39c19db01b8f h1:bE2wXOs4nCXzbboxB3beb/PcQ4kkBN4NrAKxdW8QRy4= +github.com/go-orb/plugins/client/orb/transport/hertzhttp v0.0.0-20231206043051-39c19db01b8f/go.mod h1:0dFWDR/6ycL5bqRo/b2QoDJhlM90vcTkylujYyEaqZo= +github.com/go-orb/plugins/client/orb/transport/http v0.0.0-20231206043051-39c19db01b8f h1:gwLTC5JMrkqV5tEjD3LShm8mmcQ1m8FoLQWZNNDZ8v8= +github.com/go-orb/plugins/client/orb/transport/http v0.0.0-20231206043051-39c19db01b8f/go.mod h1:qnmPO+00U2hfn3tmb28O/EtKGiq5zq3ocNWlTvBnuBc= +github.com/go-orb/plugins/client/orb/transport/https v0.0.0-20231206043051-39c19db01b8f h1:NnTPH27/D8/JM0U5E9E4GtofG140MBvbfdiur6oZP2c= +github.com/go-orb/plugins/client/orb/transport/https v0.0.0-20231206043051-39c19db01b8f/go.mod h1:Jk140iju5x6xW8uQDr9raV5Ya5QGBI4MclKkBHoCn4M= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05 h1:2ygm/mJfGtC/dNvrgXy7v57pSPDmAy3mitejcmouOCk= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05/go.mod h1:OBpWNo8j7owv13FexdfA7u3yVGDq73XXt007cDLMUsA= -github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d h1:sLkCVFSIcM+wabC782u9fmvBnFXKvOXWTZVtOUKuqS8= -github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d/go.mod h1:dMuNs3Btn7qUgPE5Wu/2vjX/XWUsIQGSZ5Y8p6AIJKA= -github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231206042754-386df184f3b8 h1:depIXBRIGLkhcA81H+mtvLLAtqR7c5hT8GGzHn6azfU= -github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231206042754-386df184f3b8/go.mod h1:iAxCNf8Ygq38xzYEWNifmwQRorz0gJfZ7Bk5KGodQM0= -github.com/go-orb/plugins/codecs/proto v0.0.0-20231205052311-482ca12d811d h1:zZBm5OKs2yyhFMVRp6/9ceVdPs/NPtJ6x222FawQ9TA= -github.com/go-orb/plugins/codecs/proto v0.0.0-20231205052311-482ca12d811d/go.mod h1:HGEfvIM6HsnpY/4ceJ3kXeKXMF9FYmnqGH70gkGNDyI= -github.com/go-orb/plugins/codecs/proto v0.0.0-20231206042754-386df184f3b8 h1:VgCFJAGCrvVI3AfRlAgCLyxuVCIb2hJJjqcFmT0BnAM= -github.com/go-orb/plugins/codecs/proto v0.0.0-20231206042754-386df184f3b8/go.mod h1:/CfsLwZ5tYLoLJgMpgMPYn+QpGcd6prpJPnCInX1y4c= -github.com/go-orb/plugins/codecs/yaml v0.0.0-20231205052311-482ca12d811d h1:5K6Xm3NQvbjhqNfkIRfmHF1lkz+L9XMNfcGO1GYgJhQ= -github.com/go-orb/plugins/codecs/yaml v0.0.0-20231205052311-482ca12d811d/go.mod h1:j7Xu5w+cpedUh2rZPRYsL/2h5fwGsxSu+m03J+BM6So= -github.com/go-orb/plugins/codecs/yaml v0.0.0-20231206042754-386df184f3b8 h1:OKc3ZtnFeiOwnVEfhzKLcuDBJjmCQoWTcvlT7aU5Gs8= -github.com/go-orb/plugins/codecs/yaml v0.0.0-20231206042754-386df184f3b8/go.mod h1:RkkK7CTjPErJJhN9F1gRsJJaWoOSokO74PBnuVeiKFM= -github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20231205052311-482ca12d811d h1:Gavx145hh8A5ssxm+qA7rwAn0jmpWL2ROw5muym6004= -github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20231205052311-482ca12d811d/go.mod h1:W5cFAEWktR5EdxQdpudmyAth9y6LDPBx1zAhINWrJAo= -github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20231206042754-386df184f3b8 h1:kpL95UwWua/DEi6Pzhnh6IlfD6usNnw96z/bLNHgNqE= -github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20231206042754-386df184f3b8/go.mod h1:QImbJQlRBawvzY4UBD1wi6yfm1iWYaQp8rFjoLV+YLQ= -github.com/go-orb/plugins/config/source/file v0.0.0-20231205052311-482ca12d811d h1:bbO5aqFj2VxS8FrkyLnqHCs92VkyIRl8vVxx++Dsbqk= -github.com/go-orb/plugins/config/source/file v0.0.0-20231205052311-482ca12d811d/go.mod h1:JeQPUsW7ZpuTkRnx4YOlDvBFwv4wdR2zUDzhcwyrPnw= -github.com/go-orb/plugins/config/source/file v0.0.0-20231206042754-386df184f3b8 h1:vczxh+zOJRDj7Rl0AFHjLpag6fgeRt54byZyVgXcmcQ= -github.com/go-orb/plugins/config/source/file v0.0.0-20231206042754-386df184f3b8/go.mod h1:i3Yh8hu6kgKMMs0MPNFj8+1WxRm+NNxGaGZsGHzrTnw= -github.com/go-orb/plugins/log/lumberjack v0.0.0-20231205052311-482ca12d811d h1:gW2rdQA+THszFrNFW0IA/Yfo1MApk7m4btzPEGUavSo= -github.com/go-orb/plugins/log/lumberjack v0.0.0-20231205052311-482ca12d811d/go.mod h1:3foB2sN8f46Q4p6YebJ0lIfpGmJJjloiz33RI9HhexY= -github.com/go-orb/plugins/log/lumberjack v0.0.0-20231206042754-386df184f3b8 h1:a5YZTRvQulyc9eK5O0lnPZPwYbRWff90N7BuudWaqDU= -github.com/go-orb/plugins/log/lumberjack v0.0.0-20231206042754-386df184f3b8/go.mod h1:W0HJRx/lyhlVIluiqE8AwaNffDf5f8QluDW6rBvsEjc= -github.com/go-orb/plugins/log/slog v0.0.0-20231205052311-482ca12d811d h1:AdAuXO60ixnjMXD0A9HySIbCSLGrqiCOxkxG2uHSS1E= -github.com/go-orb/plugins/log/slog v0.0.0-20231205052311-482ca12d811d/go.mod h1:CWYWUlVqdGd7To0WYb7FTSvyPQOM9/Ra3DDUXIMdHWY= -github.com/go-orb/plugins/log/slog v0.0.0-20231206042754-386df184f3b8 h1:zEhFaA4jCLVY5yL1lfUVgzIWr5SBGAo2st1/wL+Z8iE= -github.com/go-orb/plugins/log/slog v0.0.0-20231206042754-386df184f3b8/go.mod h1:SSlXvvFZlEnbzt+OdN8rLqsQRmrSllEVt7Zb1ibfkWc= -github.com/go-orb/plugins/registry/consul v0.0.0-20231205052311-482ca12d811d h1:nEuKj4QuBVy4ssBrCEP0DppX+DeVQOV3hSMFlDazSbE= -github.com/go-orb/plugins/registry/consul v0.0.0-20231205052311-482ca12d811d/go.mod h1:sgFaHMKkCmZoXJSnii1F/X55BYH2FBIy9KAiSOePfqc= -github.com/go-orb/plugins/registry/consul v0.0.0-20231206042754-386df184f3b8 h1:7JgYgsUgl0pI0KuDMxs6xE8x6x+e8xMh30SjufSsebM= -github.com/go-orb/plugins/registry/consul v0.0.0-20231206042754-386df184f3b8/go.mod h1:Yx2vmVdsZHTrkUgj5K3ay7BvSuzGnu7dyTt91QLZms0= -github.com/go-orb/plugins/registry/mdns v0.0.0-20231205052311-482ca12d811d h1:8WHA4VxWeSiwuhxDghkOemKCFSXXExxri9ZE0fcDrnQ= -github.com/go-orb/plugins/registry/mdns v0.0.0-20231205052311-482ca12d811d/go.mod h1:Q1LIdW1yCcFQ9ApSgelVxjOtc0N5Rw4QepCizfwyQWI= -github.com/go-orb/plugins/registry/mdns v0.0.0-20231206042754-386df184f3b8 h1:oAgCr5EhjGa+gVV84qstSCtiz3wriLoKJk0d2z2YVwg= -github.com/go-orb/plugins/registry/mdns v0.0.0-20231206042754-386df184f3b8/go.mod h1:U8mDTZRPhCIzeUkVCLU+D+3FJwclnD051ZkKVUVoasU= -github.com/go-orb/plugins/registry/regutil v0.0.0-20231205052311-482ca12d811d h1:YtOiPpdf5+oEQEnIqCBVUEVlFfhveDrBgyA/KbhtAP0= -github.com/go-orb/plugins/registry/regutil v0.0.0-20231205052311-482ca12d811d/go.mod h1:9JM12HiMcJiy0pfS62ijOldhlyPMa/b57oupEfQMH8U= -github.com/go-orb/plugins/registry/regutil v0.0.0-20231206042754-386df184f3b8 h1:j0hoUYnLcCgwA741Ubjf/0zsOHYwWtu2OnQA69OpESM= -github.com/go-orb/plugins/registry/regutil v0.0.0-20231206042754-386df184f3b8/go.mod h1:nm1pQM4sAj/ziFFhLOwqqaHmzbHnislQ59yN4zeRC6s= +github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231206043051-39c19db01b8f h1:ubgIFUAzHR0IcCQsMBEqid7baATin3528NKUwaEr/2M= +github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231206043051-39c19db01b8f/go.mod h1:iAxCNf8Ygq38xzYEWNifmwQRorz0gJfZ7Bk5KGodQM0= +github.com/go-orb/plugins/codecs/proto v0.0.0-20231206043051-39c19db01b8f h1:iOFlU2BN6hdUch9sdnJ7SDpgH395fH1OtYMoh4qc4DA= +github.com/go-orb/plugins/codecs/proto v0.0.0-20231206043051-39c19db01b8f/go.mod h1:/CfsLwZ5tYLoLJgMpgMPYn+QpGcd6prpJPnCInX1y4c= +github.com/go-orb/plugins/codecs/yaml v0.0.0-20231206043051-39c19db01b8f h1:P0ssOuM5YzRldT7GN85NX67TVqeNt8jhTKaHGhDdfLc= +github.com/go-orb/plugins/codecs/yaml v0.0.0-20231206043051-39c19db01b8f/go.mod h1:RkkK7CTjPErJJhN9F1gRsJJaWoOSokO74PBnuVeiKFM= +github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20231206043051-39c19db01b8f h1:lrhO/U4rrBU94zNoWNJMKUYiStWUlzdLGTKwblqDWX8= +github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20231206043051-39c19db01b8f/go.mod h1:QImbJQlRBawvzY4UBD1wi6yfm1iWYaQp8rFjoLV+YLQ= +github.com/go-orb/plugins/config/source/file v0.0.0-20231206043051-39c19db01b8f h1:rXjPlAaeZXuDOUgSUHTMwSj+sAVM7uxSRPCyrkeaftc= +github.com/go-orb/plugins/config/source/file v0.0.0-20231206043051-39c19db01b8f/go.mod h1:i3Yh8hu6kgKMMs0MPNFj8+1WxRm+NNxGaGZsGHzrTnw= +github.com/go-orb/plugins/log/lumberjack v0.0.0-20231206043051-39c19db01b8f h1:6rx+7r7ORg3W1bHS27WHzh8t2rTFgw2bvzuz0/G5zHs= +github.com/go-orb/plugins/log/lumberjack v0.0.0-20231206043051-39c19db01b8f/go.mod h1:W0HJRx/lyhlVIluiqE8AwaNffDf5f8QluDW6rBvsEjc= +github.com/go-orb/plugins/log/slog v0.0.0-20231206043051-39c19db01b8f h1:8teLLeV0IfFjuiGAC6DqUS5XqstpwFw+XfkBRQ4ceDA= +github.com/go-orb/plugins/log/slog v0.0.0-20231206043051-39c19db01b8f/go.mod h1:SSlXvvFZlEnbzt+OdN8rLqsQRmrSllEVt7Zb1ibfkWc= +github.com/go-orb/plugins/registry/consul v0.0.0-20231206043051-39c19db01b8f h1:b7Hus7qN2Os+MX7t7obRC+r5NSUQpntBievToF2eIQQ= +github.com/go-orb/plugins/registry/consul v0.0.0-20231206043051-39c19db01b8f/go.mod h1:QsBYxigHlBHAvXPZhZxMtt1/oBAdtGYARBi9wU01vYo= +github.com/go-orb/plugins/registry/mdns v0.0.0-20231206043051-39c19db01b8f h1:zygGnRNJURL64w528Bx7o120x4NDqAFBHjJV1S/4iqI= +github.com/go-orb/plugins/registry/mdns v0.0.0-20231206043051-39c19db01b8f/go.mod h1:U8mDTZRPhCIzeUkVCLU+D+3FJwclnD051ZkKVUVoasU= +github.com/go-orb/plugins/registry/regutil v0.0.0-20231206043051-39c19db01b8f h1:31Hw14BH2CZs76LT4A2hUqj1XpPVAI1jAmEECVZv3dY= +github.com/go-orb/plugins/registry/regutil v0.0.0-20231206043051-39c19db01b8f/go.mod h1:nm1pQM4sAj/ziFFhLOwqqaHmzbHnislQ59yN4zeRC6s= github.com/go-orb/plugins/registry/tests v0.0.0-20231205051152-a7c84fe79f05 h1:HL6/6l+Ezio0mdvZo+fCK6ssGFFrk4EucqCKXwGGlIU= github.com/go-orb/plugins/registry/tests v0.0.0-20231205051152-a7c84fe79f05/go.mod h1:Nvf7DoZwRN7beKCb3ty4ydfI4eJeQR1x6LkckEjMsoQ= -github.com/go-orb/plugins/server/drpc v0.0.0-20231205052311-482ca12d811d h1:fA4Z+Ddsh08oyDHZLFhfXRjp8z1E095VjffOxt9dgjs= -github.com/go-orb/plugins/server/drpc v0.0.0-20231205052311-482ca12d811d/go.mod h1:UqT+rUIJ4bPllOK63RfoyMJRY4BkbUboibHnvocTznU= -github.com/go-orb/plugins/server/drpc v0.0.0-20231206042754-386df184f3b8 h1:4Pf4jYjmg2XUIKUO4D7KCyeY5VqvCGJXmEv3/kQ7Y+4= -github.com/go-orb/plugins/server/drpc v0.0.0-20231206042754-386df184f3b8/go.mod h1:7/d6F1BicKo3Ohjyc3o20dgDwSG3q2fD94pdG+Vo3Ck= -github.com/go-orb/plugins/server/grpc v0.0.0-20231205052311-482ca12d811d h1:O9rvdJqRlWrzvgbiU975hTORnR2ryqSNTLozVtTNQWI= -github.com/go-orb/plugins/server/grpc v0.0.0-20231205052311-482ca12d811d/go.mod h1:BvYEgrYvrcPDX7x3/C8oN/cl1HmOqW1HTootQNuJMSk= -github.com/go-orb/plugins/server/grpc v0.0.0-20231206042754-386df184f3b8 h1:OYB9qivTSUK1CuVq2j7pbocsJenNz6M7UxUxPX7aGdE= -github.com/go-orb/plugins/server/grpc v0.0.0-20231206042754-386df184f3b8/go.mod h1:zn286H8tLNfxnGQrvjtYwxNc3IGVvAMO5SJ7Ctdzr7s= -github.com/go-orb/plugins/server/hertz v0.0.0-20231205052311-482ca12d811d h1:ycmJdqc2RaWn2T9iPkg9yeHjhDExH5jOTUCPqF3rmYg= -github.com/go-orb/plugins/server/hertz v0.0.0-20231205052311-482ca12d811d/go.mod h1:9UPdKGOWNiIH3KWBkUwlXCGiY3Hu9upLUvnrMdXYsjc= -github.com/go-orb/plugins/server/hertz v0.0.0-20231206042754-386df184f3b8 h1:Q1o66IDhUcfx2Fbo6dYQRW9VCyvB8S2GlxOv8Nb2Phc= -github.com/go-orb/plugins/server/hertz v0.0.0-20231206042754-386df184f3b8/go.mod h1:Xl7v4XkoFQhBJhmWfMk9ssBdlcro9Py9iLw3heK7JDU= -github.com/go-orb/plugins/server/http v0.0.0-20231205052311-482ca12d811d h1:3DnV74lNjbrW40P3JwCgEuhjrMwHbJJXvqlY1/A8uaQ= -github.com/go-orb/plugins/server/http v0.0.0-20231205052311-482ca12d811d/go.mod h1:ANDH1eWctqLEDRABl0zgMjfAzc5xZ+d9X+TQT2KQ544= -github.com/go-orb/plugins/server/http v0.0.0-20231206042754-386df184f3b8 h1:snUtwNhuo2fXNEkJp2LVS7smfc9PCxadT7hiCnbeEqo= -github.com/go-orb/plugins/server/http v0.0.0-20231206042754-386df184f3b8/go.mod h1:uyBIbAL2s8dS/lOvN128CvyC8VZ0/SPwlcu3rNXL4zc= +github.com/go-orb/plugins/server/drpc v0.0.0-20231206043051-39c19db01b8f h1:ft9XbVMuw9Ql4jvNp24S30KSKclYT+ag/72Rq/ff92A= +github.com/go-orb/plugins/server/drpc v0.0.0-20231206043051-39c19db01b8f/go.mod h1:bNtyDppPUKB20IRJDLzIfr1BnYXo+KOCtxeINlLF1DU= +github.com/go-orb/plugins/server/grpc v0.0.0-20231206043051-39c19db01b8f h1:S+g807mY7cn+CH8g3JbowEUGQbjU1P42aWKuTXVk6xc= +github.com/go-orb/plugins/server/grpc v0.0.0-20231206043051-39c19db01b8f/go.mod h1:zn286H8tLNfxnGQrvjtYwxNc3IGVvAMO5SJ7Ctdzr7s= +github.com/go-orb/plugins/server/hertz v0.0.0-20231206043051-39c19db01b8f h1:27AfEJLd0LY0d35wdf9TD+Q+UReyYWrbMzO5t6Xpqaw= +github.com/go-orb/plugins/server/hertz v0.0.0-20231206043051-39c19db01b8f/go.mod h1:Xl7v4XkoFQhBJhmWfMk9ssBdlcro9Py9iLw3heK7JDU= +github.com/go-orb/plugins/server/http v0.0.0-20231206043051-39c19db01b8f h1:Pb+QdfIHvHLgvB4R9KN1/N2gIT6S6N0MgZJQcztcYQQ= +github.com/go-orb/plugins/server/http v0.0.0-20231206043051-39c19db01b8f/go.mod h1:uyBIbAL2s8dS/lOvN128CvyC8VZ0/SPwlcu3rNXL4zc= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= diff --git a/client/middleware/log/log.go b/client/middleware/log/log.go index 3bf500b6..e276f095 100644 --- a/client/middleware/log/log.go +++ b/client/middleware/log/log.go @@ -1,3 +1,4 @@ +// Package log provides a logging middleware for client. package log import ( @@ -14,14 +15,12 @@ func init() { client.Middlewares.Register(Name, Provide) } +// Name is the middlewares name. const Name = "log" -type Config struct { - *client.MiddlewareConfig `yaml:",inline"` -} - var _ client.Middleware = (*Middleware)(nil) +// Middleware is the log Middleware for client. type Middleware struct { logger log.Logger } @@ -31,7 +30,7 @@ func (m *Middleware) Start() error { return nil } // Stop the component. E.g. disconnect from the broker. // The context will contain a timeout, and cancelation should be respected. -func (m *Middleware) Stop(ctx context.Context) error { return nil } +func (m *Middleware) Stop(_ context.Context) error { return nil } // Type returns the component type, e.g. broker. func (m *Middleware) Type() string { @@ -92,7 +91,8 @@ func (m *Middleware) CallNoCodec( } } -func Provide(sections []string, configs types.ConfigData, client client.Type, logger log.Logger) (client.Middleware, error) { +// Provide will be registered to client.Middlewares, it's a factory for this. +func Provide(sections []string, configs types.ConfigData, _ client.Type, logger log.Logger) (client.Middleware, error) { // Configure the logger. logger, err := logger.WithConfig(sections, configs) if err != nil { diff --git a/client/orb/client.go b/client/orb/client.go index 91745464..d39419ee 100644 --- a/client/orb/client.go +++ b/client/orb/client.go @@ -308,13 +308,16 @@ func ProvideClient( sections := types.SplitServiceName(name) sections = append(sections, client.DefaultConfigSection) + if err := config.Parse(sections, data, &cfg); err != nil { return client.Type{}, err } - c := New(cfg, logger, registry) + newClient := New(cfg, logger, registry) + //nolint:nestif if config.HasKey[[]any](sections, "middlewares", data) { + // Get and factory them all. middlewares := []client.Middleware{} for i := 0; ; i++ { @@ -323,6 +326,7 @@ func ProvideClient( if errors.Is(err, config.ErrNotExistent) || mCfg.Name == "" { break } + return client.Type{}, err } @@ -331,7 +335,7 @@ func ProvideClient( return client.Type{}, fmt.Errorf("Client middleware '%s' not found, did you import it?", mCfg.Name) } - m, err := fac(append(sections, "middlewares", strconv.Itoa(i)), data, client.Type{Client: c}, logger) + m, err := fac(append(sections, "middlewares", strconv.Itoa(i)), data, client.Type{Client: newClient}, logger) if err != nil { return client.Type{}, err } @@ -339,10 +343,11 @@ func ProvideClient( middlewares = append(middlewares, m) } + // Apply them to the client. if len(middlewares) > 0 { - c.middlewares = middlewares + newClient.middlewares = middlewares } } - return client.Type{Client: c}, nil + return client.Type{Client: newClient}, nil } diff --git a/client/orb/transport/basehertz/basehertz.go b/client/orb/transport/basehertz/basehertz.go index f12751af..a6dca535 100644 --- a/client/orb/transport/basehertz/basehertz.go +++ b/client/orb/transport/basehertz/basehertz.go @@ -119,9 +119,9 @@ func (h *hresBodyCloserWrapper) Close() error { func (t *Transport) call2( ctx context.Context, - node *registry.Node, + _ *registry.Node, opts *client.CallOptions, - req *client.Request[any, any], + _ *client.Request[any, any], hReq *protocol.Request, ) (*client.RawResponse, error) { // Run the request. diff --git a/client/orb/transport/basehertz/go.mod b/client/orb/transport/basehertz/go.mod index 93035196..4d4e3cbf 100644 --- a/client/orb/transport/basehertz/go.mod +++ b/client/orb/transport/basehertz/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/cloudwego/hertz v0.7.2 github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b - github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 + github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f ) require ( diff --git a/client/orb/transport/basehertz/go.sum b/client/orb/transport/basehertz/go.sum index a1a94ae0..af9f02ce 100644 --- a/client/orb/transport/basehertz/go.sum +++ b/client/orb/transport/basehertz/go.sum @@ -38,10 +38,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b h1:9lg1vas/UKYhd+SmIR0BJyeAcubhKSonZIWwBSpkGdo= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b/go.mod h1:esPD35O0lg1ksWTaiiYFJaAtH+Srku8DuoN0L91fvp0= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d h1:gGNdaIn86SK5dh8PM29bxnJERwIixmWLOIjQ+JBvas8= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d/go.mod h1:l/PcMxCOSaY3Lm71obNbkhuBJZVq9wCd1L3EPQ94P4Q= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 h1:bmoCt8QGKBOMFRylCBFwunelLiflyUj8h+nWGltpsZI= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f h1:GIC2Got3yjQkf5pdlMeslCww2fysgo5ijBUlKiXKBaI= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/client/orb/transport/basehttp/basehttp.go b/client/orb/transport/basehttp/basehttp.go index e584aaa4..49a98c25 100644 --- a/client/orb/transport/basehttp/basehttp.go +++ b/client/orb/transport/basehttp/basehttp.go @@ -13,7 +13,6 @@ import ( "github.com/go-orb/go-orb/client" "github.com/go-orb/go-orb/codecs" "github.com/go-orb/go-orb/log" - "github.com/go-orb/go-orb/registry" "github.com/go-orb/go-orb/util/metadata" "github.com/go-orb/go-orb/util/orberrors" "github.com/go-orb/plugins/client/orb" @@ -99,10 +98,10 @@ func (t *Transport) Call(ctx context.Context, req *client.Request[any, any], opt } } - return t.call2(node, opts, req, hReq) + return t.call2(opts, hReq) } -func (t *Transport) call2(node *registry.Node, opts *client.CallOptions, req *client.Request[any, any], hReq *http.Request, +func (t *Transport) call2(opts *client.CallOptions, hReq *http.Request, ) (*client.RawResponse, error) { // Run the request. resp, err := t.hclient.Do(hReq) diff --git a/client/orb/transport/basehttp/go.mod b/client/orb/transport/basehttp/go.mod index 53382dd1..48af319a 100644 --- a/client/orb/transport/basehttp/go.mod +++ b/client/orb/transport/basehttp/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b - github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 + github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f ) require github.com/cornelk/hashmap v1.0.8 // indirect diff --git a/client/orb/transport/basehttp/go.sum b/client/orb/transport/basehttp/go.sum index d2a9636f..9e3b63d2 100644 --- a/client/orb/transport/basehttp/go.sum +++ b/client/orb/transport/basehttp/go.sum @@ -4,10 +4,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b h1:9lg1vas/UKYhd+SmIR0BJyeAcubhKSonZIWwBSpkGdo= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b/go.mod h1:esPD35O0lg1ksWTaiiYFJaAtH+Srku8DuoN0L91fvp0= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d h1:gGNdaIn86SK5dh8PM29bxnJERwIixmWLOIjQ+JBvas8= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d/go.mod h1:l/PcMxCOSaY3Lm71obNbkhuBJZVq9wCd1L3EPQ94P4Q= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 h1:bmoCt8QGKBOMFRylCBFwunelLiflyUj8h+nWGltpsZI= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f h1:GIC2Got3yjQkf5pdlMeslCww2fysgo5ijBUlKiXKBaI= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= diff --git a/client/orb/transport/drpc/go.mod b/client/orb/transport/drpc/go.mod index b094d79e..54f6d916 100644 --- a/client/orb/transport/drpc/go.mod +++ b/client/orb/transport/drpc/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b - github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 + github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05 github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d github.com/go-orb/plugins/codecs/proto v0.0.0-20231205052311-482ca12d811d @@ -13,7 +13,6 @@ require ( github.com/go-orb/plugins/log/slog v0.0.0-20231205052311-482ca12d811d github.com/go-orb/plugins/registry/mdns v0.0.0-20231205052311-482ca12d811d github.com/stretchr/testify v1.8.4 - go.elara.ws/drpc v0.0.0-20230829003339-8c0677d03573 google.golang.org/protobuf v1.31.0 storj.io/drpc v0.0.33 ) @@ -40,7 +39,6 @@ require ( github.com/google/uuid v1.4.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/hashicorp/yamux v0.1.1 // indirect github.com/hertz-contrib/http2 v0.1.8 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/miekg/dns v1.1.57 // indirect diff --git a/client/orb/transport/drpc/go.sum b/client/orb/transport/drpc/go.sum index bac1a7ef..80c0a773 100644 --- a/client/orb/transport/drpc/go.sum +++ b/client/orb/transport/drpc/go.sum @@ -40,10 +40,8 @@ github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b h1:9lg1vas/UKYhd+SmIR0BJyeAcubhKSonZIWwBSpkGdo= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b/go.mod h1:esPD35O0lg1ksWTaiiYFJaAtH+Srku8DuoN0L91fvp0= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d h1:gGNdaIn86SK5dh8PM29bxnJERwIixmWLOIjQ+JBvas8= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d/go.mod h1:l/PcMxCOSaY3Lm71obNbkhuBJZVq9wCd1L3EPQ94P4Q= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 h1:bmoCt8QGKBOMFRylCBFwunelLiflyUj8h+nWGltpsZI= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f h1:GIC2Got3yjQkf5pdlMeslCww2fysgo5ijBUlKiXKBaI= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05 h1:2ygm/mJfGtC/dNvrgXy7v57pSPDmAy3mitejcmouOCk= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05/go.mod h1:OBpWNo8j7owv13FexdfA7u3yVGDq73XXt007cDLMUsA= github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d h1:sLkCVFSIcM+wabC782u9fmvBnFXKvOXWTZVtOUKuqS8= @@ -86,8 +84,6 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= -github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/henrylee2cn/ameda v1.4.8/go.mod h1:liZulR8DgHxdK+MEwvZIylGnmcjzQ6N6f2PlWe7nEO4= github.com/henrylee2cn/ameda v1.4.10/go.mod h1:liZulR8DgHxdK+MEwvZIylGnmcjzQ6N6f2PlWe7nEO4= github.com/henrylee2cn/goutil v0.0.0-20210127050712-89660552f6f8/go.mod h1:Nhe/DM3671a5udlv2AdV2ni/MZzgfv2qrPL5nIi3EGQ= @@ -155,8 +151,6 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/errs v1.3.0 h1:hmiaKqgYZzcVgRL1Vkc1Mn2914BbzB0IBxs+ebeutGs= github.com/zeebo/errs v1.3.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4= -go.elara.ws/drpc v0.0.0-20230829003339-8c0677d03573 h1:eVuCIll1PuKWnc1f2sNHgPHljQU5O1gIzLSqSRrTqBY= -go.elara.ws/drpc v0.0.0-20230829003339-8c0677d03573/go.mod h1:NDprjiVqKXQKVGzX7jp2g/jctsUbvOxz1nN15QOBEGk= go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo= go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= golang.org/x/arch v0.0.0-20201008161808-52c3e6f60cff/go.mod h1:flIaEI6LNU6xOCD5PaJvn9wGP0agmIOqjrtsKGRguv4= diff --git a/client/orb/transport/grpc/go.mod b/client/orb/transport/grpc/go.mod index 4fb419d6..8c4fbf17 100644 --- a/client/orb/transport/grpc/go.mod +++ b/client/orb/transport/grpc/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b - github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 + github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05 github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d github.com/go-orb/plugins/codecs/proto v0.0.0-20231205052311-482ca12d811d diff --git a/client/orb/transport/grpc/go.sum b/client/orb/transport/grpc/go.sum index 3e776003..c25579a0 100644 --- a/client/orb/transport/grpc/go.sum +++ b/client/orb/transport/grpc/go.sum @@ -69,10 +69,8 @@ github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b h1:9lg1vas/UKYhd+SmIR0BJyeAcubhKSonZIWwBSpkGdo= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b/go.mod h1:esPD35O0lg1ksWTaiiYFJaAtH+Srku8DuoN0L91fvp0= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d h1:gGNdaIn86SK5dh8PM29bxnJERwIixmWLOIjQ+JBvas8= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d/go.mod h1:l/PcMxCOSaY3Lm71obNbkhuBJZVq9wCd1L3EPQ94P4Q= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 h1:bmoCt8QGKBOMFRylCBFwunelLiflyUj8h+nWGltpsZI= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f h1:GIC2Got3yjQkf5pdlMeslCww2fysgo5ijBUlKiXKBaI= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05 h1:2ygm/mJfGtC/dNvrgXy7v57pSPDmAy3mitejcmouOCk= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05/go.mod h1:OBpWNo8j7owv13FexdfA7u3yVGDq73XXt007cDLMUsA= github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d h1:sLkCVFSIcM+wabC782u9fmvBnFXKvOXWTZVtOUKuqS8= diff --git a/client/orb/transport/h2c/go.mod b/client/orb/transport/h2c/go.mod index 707a8d3a..94cc5f58 100644 --- a/client/orb/transport/h2c/go.mod +++ b/client/orb/transport/h2c/go.mod @@ -4,8 +4,8 @@ go 1.21.4 require ( github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b - github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206042754-386df184f3b8 + github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206043051-39c19db01b8f github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05 github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d github.com/go-orb/plugins/codecs/proto v0.0.0-20231205052311-482ca12d811d diff --git a/client/orb/transport/h2c/go.sum b/client/orb/transport/h2c/go.sum index 33cfa4a4..eb7dc7f4 100644 --- a/client/orb/transport/h2c/go.sum +++ b/client/orb/transport/h2c/go.sum @@ -69,14 +69,10 @@ github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b h1:9lg1vas/UKYhd+SmIR0BJyeAcubhKSonZIWwBSpkGdo= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b/go.mod h1:esPD35O0lg1ksWTaiiYFJaAtH+Srku8DuoN0L91fvp0= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d h1:gGNdaIn86SK5dh8PM29bxnJERwIixmWLOIjQ+JBvas8= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d/go.mod h1:l/PcMxCOSaY3Lm71obNbkhuBJZVq9wCd1L3EPQ94P4Q= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 h1:bmoCt8QGKBOMFRylCBFwunelLiflyUj8h+nWGltpsZI= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231205052311-482ca12d811d h1:H137KycRatHPpEX86JTdranTZRE9MDhKqVrFfjbJnZU= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231205052311-482ca12d811d/go.mod h1:zjMemu6YavzjIY9+z0J5VbBi5BZn5mCH5QWE/6BfLjg= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206042754-386df184f3b8 h1:EUBVYcERpfcwzx6L0Nn9zFuf9LIrsOkCUN7hkPQyQPY= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206042754-386df184f3b8/go.mod h1:z51cC+01j4PNPm9bpkap0zxNV3oOvmD89CBHO+L7Ck4= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f h1:GIC2Got3yjQkf5pdlMeslCww2fysgo5ijBUlKiXKBaI= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= +github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206043051-39c19db01b8f h1:22zUMmkCaHe43dY6MU8x7rF+r4tr97Na5T+KNEDfcB8= +github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206043051-39c19db01b8f/go.mod h1:FEY7L26d9zyTE0dhpHeAz/gcPhCuBqfIjaYiZoGXd6U= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05 h1:2ygm/mJfGtC/dNvrgXy7v57pSPDmAy3mitejcmouOCk= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05/go.mod h1:OBpWNo8j7owv13FexdfA7u3yVGDq73XXt007cDLMUsA= github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d h1:sLkCVFSIcM+wabC782u9fmvBnFXKvOXWTZVtOUKuqS8= diff --git a/client/orb/transport/hertzh2c/go.mod b/client/orb/transport/hertzh2c/go.mod index 331d4a4a..9b6599c8 100644 --- a/client/orb/transport/hertzh2c/go.mod +++ b/client/orb/transport/hertzh2c/go.mod @@ -5,8 +5,8 @@ go 1.21.4 require ( github.com/cloudwego/hertz v0.7.2 github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b - github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206042754-386df184f3b8 + github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206043051-39c19db01b8f github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05 github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d github.com/go-orb/plugins/codecs/proto v0.0.0-20231205052311-482ca12d811d diff --git a/client/orb/transport/hertzh2c/go.sum b/client/orb/transport/hertzh2c/go.sum index 1568ae41..0174b829 100644 --- a/client/orb/transport/hertzh2c/go.sum +++ b/client/orb/transport/hertzh2c/go.sum @@ -69,14 +69,10 @@ github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b h1:9lg1vas/UKYhd+SmIR0BJyeAcubhKSonZIWwBSpkGdo= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b/go.mod h1:esPD35O0lg1ksWTaiiYFJaAtH+Srku8DuoN0L91fvp0= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d h1:gGNdaIn86SK5dh8PM29bxnJERwIixmWLOIjQ+JBvas8= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d/go.mod h1:l/PcMxCOSaY3Lm71obNbkhuBJZVq9wCd1L3EPQ94P4Q= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 h1:bmoCt8QGKBOMFRylCBFwunelLiflyUj8h+nWGltpsZI= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= -github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231205052311-482ca12d811d h1:08WFPgDpNgd2wFMVEoiLPh7beuNfFNP5Jh84s++9exE= -github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231205052311-482ca12d811d/go.mod h1:bsStSjTqzm1cjOtMThYkkxQCXerOTNwSkFV8V9DtEV4= -github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206042754-386df184f3b8 h1:yh3LjEC+3yHv7Y1aAUzsi9oEX46xJGA265JcX1Jjq04= -github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206042754-386df184f3b8/go.mod h1:jIilCtYh7Nzh6a8HdZIo831NBniHvbaBJuV0g87BWjk= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f h1:GIC2Got3yjQkf5pdlMeslCww2fysgo5ijBUlKiXKBaI= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= +github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206043051-39c19db01b8f h1:j2qnGj9hcrtYMF9kCVDNuqfHwZPwTvlcWh2XGqKM5Nk= +github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206043051-39c19db01b8f/go.mod h1:FaxvWV7sUHKbPINgxai905yHhvDQeDLH7XN/XIqJoAg= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05 h1:2ygm/mJfGtC/dNvrgXy7v57pSPDmAy3mitejcmouOCk= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05/go.mod h1:OBpWNo8j7owv13FexdfA7u3yVGDq73XXt007cDLMUsA= github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d h1:sLkCVFSIcM+wabC782u9fmvBnFXKvOXWTZVtOUKuqS8= diff --git a/client/orb/transport/hertzhttp/go.mod b/client/orb/transport/hertzhttp/go.mod index 517386ff..76f2288a 100644 --- a/client/orb/transport/hertzhttp/go.mod +++ b/client/orb/transport/hertzhttp/go.mod @@ -5,8 +5,8 @@ go 1.21.4 require ( github.com/cloudwego/hertz v0.7.2 github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b - github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206042754-386df184f3b8 + github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206043051-39c19db01b8f github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05 github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d github.com/go-orb/plugins/codecs/proto v0.0.0-20231205052311-482ca12d811d diff --git a/client/orb/transport/hertzhttp/go.sum b/client/orb/transport/hertzhttp/go.sum index 1568ae41..0174b829 100644 --- a/client/orb/transport/hertzhttp/go.sum +++ b/client/orb/transport/hertzhttp/go.sum @@ -69,14 +69,10 @@ github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b h1:9lg1vas/UKYhd+SmIR0BJyeAcubhKSonZIWwBSpkGdo= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b/go.mod h1:esPD35O0lg1ksWTaiiYFJaAtH+Srku8DuoN0L91fvp0= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d h1:gGNdaIn86SK5dh8PM29bxnJERwIixmWLOIjQ+JBvas8= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d/go.mod h1:l/PcMxCOSaY3Lm71obNbkhuBJZVq9wCd1L3EPQ94P4Q= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 h1:bmoCt8QGKBOMFRylCBFwunelLiflyUj8h+nWGltpsZI= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= -github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231205052311-482ca12d811d h1:08WFPgDpNgd2wFMVEoiLPh7beuNfFNP5Jh84s++9exE= -github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231205052311-482ca12d811d/go.mod h1:bsStSjTqzm1cjOtMThYkkxQCXerOTNwSkFV8V9DtEV4= -github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206042754-386df184f3b8 h1:yh3LjEC+3yHv7Y1aAUzsi9oEX46xJGA265JcX1Jjq04= -github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206042754-386df184f3b8/go.mod h1:jIilCtYh7Nzh6a8HdZIo831NBniHvbaBJuV0g87BWjk= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f h1:GIC2Got3yjQkf5pdlMeslCww2fysgo5ijBUlKiXKBaI= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= +github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206043051-39c19db01b8f h1:j2qnGj9hcrtYMF9kCVDNuqfHwZPwTvlcWh2XGqKM5Nk= +github.com/go-orb/plugins/client/orb/transport/basehertz v0.0.0-20231206043051-39c19db01b8f/go.mod h1:FaxvWV7sUHKbPINgxai905yHhvDQeDLH7XN/XIqJoAg= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05 h1:2ygm/mJfGtC/dNvrgXy7v57pSPDmAy3mitejcmouOCk= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05/go.mod h1:OBpWNo8j7owv13FexdfA7u3yVGDq73XXt007cDLMUsA= github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d h1:sLkCVFSIcM+wabC782u9fmvBnFXKvOXWTZVtOUKuqS8= diff --git a/client/orb/transport/http/go.mod b/client/orb/transport/http/go.mod index d2d5c061..56ca05b9 100644 --- a/client/orb/transport/http/go.mod +++ b/client/orb/transport/http/go.mod @@ -4,8 +4,8 @@ go 1.21.4 require ( github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b - github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206042754-386df184f3b8 + github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206043051-39c19db01b8f github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05 github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d github.com/go-orb/plugins/codecs/proto v0.0.0-20231205052311-482ca12d811d diff --git a/client/orb/transport/http/go.sum b/client/orb/transport/http/go.sum index 33cfa4a4..eb7dc7f4 100644 --- a/client/orb/transport/http/go.sum +++ b/client/orb/transport/http/go.sum @@ -69,14 +69,10 @@ github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b h1:9lg1vas/UKYhd+SmIR0BJyeAcubhKSonZIWwBSpkGdo= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b/go.mod h1:esPD35O0lg1ksWTaiiYFJaAtH+Srku8DuoN0L91fvp0= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d h1:gGNdaIn86SK5dh8PM29bxnJERwIixmWLOIjQ+JBvas8= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d/go.mod h1:l/PcMxCOSaY3Lm71obNbkhuBJZVq9wCd1L3EPQ94P4Q= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 h1:bmoCt8QGKBOMFRylCBFwunelLiflyUj8h+nWGltpsZI= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231205052311-482ca12d811d h1:H137KycRatHPpEX86JTdranTZRE9MDhKqVrFfjbJnZU= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231205052311-482ca12d811d/go.mod h1:zjMemu6YavzjIY9+z0J5VbBi5BZn5mCH5QWE/6BfLjg= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206042754-386df184f3b8 h1:EUBVYcERpfcwzx6L0Nn9zFuf9LIrsOkCUN7hkPQyQPY= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206042754-386df184f3b8/go.mod h1:z51cC+01j4PNPm9bpkap0zxNV3oOvmD89CBHO+L7Ck4= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f h1:GIC2Got3yjQkf5pdlMeslCww2fysgo5ijBUlKiXKBaI= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= +github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206043051-39c19db01b8f h1:22zUMmkCaHe43dY6MU8x7rF+r4tr97Na5T+KNEDfcB8= +github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206043051-39c19db01b8f/go.mod h1:FEY7L26d9zyTE0dhpHeAz/gcPhCuBqfIjaYiZoGXd6U= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05 h1:2ygm/mJfGtC/dNvrgXy7v57pSPDmAy3mitejcmouOCk= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05/go.mod h1:OBpWNo8j7owv13FexdfA7u3yVGDq73XXt007cDLMUsA= github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d h1:sLkCVFSIcM+wabC782u9fmvBnFXKvOXWTZVtOUKuqS8= diff --git a/client/orb/transport/http3/go.mod b/client/orb/transport/http3/go.mod index 4da3c1c1..292926dd 100644 --- a/client/orb/transport/http3/go.mod +++ b/client/orb/transport/http3/go.mod @@ -4,8 +4,8 @@ go 1.21.4 require ( github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b - github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206042754-386df184f3b8 + github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206043051-39c19db01b8f github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05 github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d github.com/go-orb/plugins/codecs/proto v0.0.0-20231205052311-482ca12d811d diff --git a/client/orb/transport/http3/go.sum b/client/orb/transport/http3/go.sum index 33cfa4a4..eb7dc7f4 100644 --- a/client/orb/transport/http3/go.sum +++ b/client/orb/transport/http3/go.sum @@ -69,14 +69,10 @@ github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b h1:9lg1vas/UKYhd+SmIR0BJyeAcubhKSonZIWwBSpkGdo= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b/go.mod h1:esPD35O0lg1ksWTaiiYFJaAtH+Srku8DuoN0L91fvp0= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d h1:gGNdaIn86SK5dh8PM29bxnJERwIixmWLOIjQ+JBvas8= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d/go.mod h1:l/PcMxCOSaY3Lm71obNbkhuBJZVq9wCd1L3EPQ94P4Q= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 h1:bmoCt8QGKBOMFRylCBFwunelLiflyUj8h+nWGltpsZI= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231205052311-482ca12d811d h1:H137KycRatHPpEX86JTdranTZRE9MDhKqVrFfjbJnZU= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231205052311-482ca12d811d/go.mod h1:zjMemu6YavzjIY9+z0J5VbBi5BZn5mCH5QWE/6BfLjg= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206042754-386df184f3b8 h1:EUBVYcERpfcwzx6L0Nn9zFuf9LIrsOkCUN7hkPQyQPY= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206042754-386df184f3b8/go.mod h1:z51cC+01j4PNPm9bpkap0zxNV3oOvmD89CBHO+L7Ck4= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f h1:GIC2Got3yjQkf5pdlMeslCww2fysgo5ijBUlKiXKBaI= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= +github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206043051-39c19db01b8f h1:22zUMmkCaHe43dY6MU8x7rF+r4tr97Na5T+KNEDfcB8= +github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206043051-39c19db01b8f/go.mod h1:FEY7L26d9zyTE0dhpHeAz/gcPhCuBqfIjaYiZoGXd6U= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05 h1:2ygm/mJfGtC/dNvrgXy7v57pSPDmAy3mitejcmouOCk= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05/go.mod h1:OBpWNo8j7owv13FexdfA7u3yVGDq73XXt007cDLMUsA= github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d h1:sLkCVFSIcM+wabC782u9fmvBnFXKvOXWTZVtOUKuqS8= diff --git a/client/orb/transport/https/go.mod b/client/orb/transport/https/go.mod index 09bcfb7e..c4215931 100644 --- a/client/orb/transport/https/go.mod +++ b/client/orb/transport/https/go.mod @@ -4,8 +4,8 @@ go 1.21.4 require ( github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b - github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206042754-386df184f3b8 + github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206043051-39c19db01b8f github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05 github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d github.com/go-orb/plugins/codecs/proto v0.0.0-20231205052311-482ca12d811d diff --git a/client/orb/transport/https/go.sum b/client/orb/transport/https/go.sum index 33cfa4a4..eb7dc7f4 100644 --- a/client/orb/transport/https/go.sum +++ b/client/orb/transport/https/go.sum @@ -69,14 +69,10 @@ github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b h1:9lg1vas/UKYhd+SmIR0BJyeAcubhKSonZIWwBSpkGdo= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b/go.mod h1:esPD35O0lg1ksWTaiiYFJaAtH+Srku8DuoN0L91fvp0= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d h1:gGNdaIn86SK5dh8PM29bxnJERwIixmWLOIjQ+JBvas8= -github.com/go-orb/plugins/client/orb v0.0.0-20231205052311-482ca12d811d/go.mod h1:l/PcMxCOSaY3Lm71obNbkhuBJZVq9wCd1L3EPQ94P4Q= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8 h1:bmoCt8QGKBOMFRylCBFwunelLiflyUj8h+nWGltpsZI= -github.com/go-orb/plugins/client/orb v0.0.0-20231206042754-386df184f3b8/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231205052311-482ca12d811d h1:H137KycRatHPpEX86JTdranTZRE9MDhKqVrFfjbJnZU= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231205052311-482ca12d811d/go.mod h1:zjMemu6YavzjIY9+z0J5VbBi5BZn5mCH5QWE/6BfLjg= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206042754-386df184f3b8 h1:EUBVYcERpfcwzx6L0Nn9zFuf9LIrsOkCUN7hkPQyQPY= -github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206042754-386df184f3b8/go.mod h1:z51cC+01j4PNPm9bpkap0zxNV3oOvmD89CBHO+L7Ck4= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f h1:GIC2Got3yjQkf5pdlMeslCww2fysgo5ijBUlKiXKBaI= +github.com/go-orb/plugins/client/orb v0.0.0-20231206043051-39c19db01b8f/go.mod h1:AwdEKO1R2RPXSPVGvPp0Z4YCaZJJCJIo+cVI6qlQZdM= +github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206043051-39c19db01b8f h1:22zUMmkCaHe43dY6MU8x7rF+r4tr97Na5T+KNEDfcB8= +github.com/go-orb/plugins/client/orb/transport/basehttp v0.0.0-20231206043051-39c19db01b8f/go.mod h1:FEY7L26d9zyTE0dhpHeAz/gcPhCuBqfIjaYiZoGXd6U= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05 h1:2ygm/mJfGtC/dNvrgXy7v57pSPDmAy3mitejcmouOCk= github.com/go-orb/plugins/client/tests v0.0.0-20231205051152-a7c84fe79f05/go.mod h1:OBpWNo8j7owv13FexdfA7u3yVGDq73XXt007cDLMUsA= github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d h1:sLkCVFSIcM+wabC782u9fmvBnFXKvOXWTZVtOUKuqS8= diff --git a/client/tests/go.mod b/client/tests/go.mod index f3bc99e4..338b0637 100644 --- a/client/tests/go.mod +++ b/client/tests/go.mod @@ -4,19 +4,19 @@ go 1.21.4 require ( github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b - github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/codecs/proto v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/codecs/yaml v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/config/source/file v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/log/lumberjack v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/log/slog v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/registry/consul v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/registry/mdns v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/server/drpc v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/server/grpc v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/server/hertz v0.0.0-20231206042754-386df184f3b8 - github.com/go-orb/plugins/server/http v0.0.0-20231206042754-386df184f3b8 + github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/codecs/proto v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/codecs/yaml v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/config/source/file v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/log/lumberjack v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/log/slog v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/registry/consul v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/registry/mdns v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/server/drpc v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/server/grpc v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/server/hertz v0.0.0-20231206043051-39c19db01b8f + github.com/go-orb/plugins/server/http v0.0.0-20231206043051-39c19db01b8f github.com/google/wire v0.5.0 github.com/hashicorp/consul/sdk v0.15.0 github.com/stretchr/testify v1.8.4 @@ -44,7 +44,7 @@ require ( github.com/fatih/color v1.16.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/go-chi/chi v1.5.5 // indirect - github.com/go-orb/plugins/registry/regutil v0.0.0-20231206042754-386df184f3b8 // indirect + github.com/go-orb/plugins/registry/regutil v0.0.0-20231206043051-39c19db01b8f // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/pprof v0.0.0-20231205033806-a5a03c77bf08 // indirect diff --git a/client/tests/go.sum b/client/tests/go.sum index 390a740a..c341fb3e 100644 --- a/client/tests/go.sum +++ b/client/tests/go.sum @@ -72,64 +72,36 @@ github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b h1:9lg1vas/UKYhd+SmIR0BJyeAcubhKSonZIWwBSpkGdo= github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b/go.mod h1:esPD35O0lg1ksWTaiiYFJaAtH+Srku8DuoN0L91fvp0= -github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d h1:sLkCVFSIcM+wabC782u9fmvBnFXKvOXWTZVtOUKuqS8= -github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231205052311-482ca12d811d/go.mod h1:dMuNs3Btn7qUgPE5Wu/2vjX/XWUsIQGSZ5Y8p6AIJKA= -github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231206042754-386df184f3b8 h1:depIXBRIGLkhcA81H+mtvLLAtqR7c5hT8GGzHn6azfU= -github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231206042754-386df184f3b8/go.mod h1:iAxCNf8Ygq38xzYEWNifmwQRorz0gJfZ7Bk5KGodQM0= -github.com/go-orb/plugins/codecs/proto v0.0.0-20231205052311-482ca12d811d h1:zZBm5OKs2yyhFMVRp6/9ceVdPs/NPtJ6x222FawQ9TA= -github.com/go-orb/plugins/codecs/proto v0.0.0-20231205052311-482ca12d811d/go.mod h1:HGEfvIM6HsnpY/4ceJ3kXeKXMF9FYmnqGH70gkGNDyI= -github.com/go-orb/plugins/codecs/proto v0.0.0-20231206042754-386df184f3b8 h1:VgCFJAGCrvVI3AfRlAgCLyxuVCIb2hJJjqcFmT0BnAM= -github.com/go-orb/plugins/codecs/proto v0.0.0-20231206042754-386df184f3b8/go.mod h1:/CfsLwZ5tYLoLJgMpgMPYn+QpGcd6prpJPnCInX1y4c= -github.com/go-orb/plugins/codecs/yaml v0.0.0-20231205052311-482ca12d811d h1:5K6Xm3NQvbjhqNfkIRfmHF1lkz+L9XMNfcGO1GYgJhQ= -github.com/go-orb/plugins/codecs/yaml v0.0.0-20231205052311-482ca12d811d/go.mod h1:j7Xu5w+cpedUh2rZPRYsL/2h5fwGsxSu+m03J+BM6So= -github.com/go-orb/plugins/codecs/yaml v0.0.0-20231206042754-386df184f3b8 h1:OKc3ZtnFeiOwnVEfhzKLcuDBJjmCQoWTcvlT7aU5Gs8= -github.com/go-orb/plugins/codecs/yaml v0.0.0-20231206042754-386df184f3b8/go.mod h1:RkkK7CTjPErJJhN9F1gRsJJaWoOSokO74PBnuVeiKFM= -github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20231205052311-482ca12d811d h1:Gavx145hh8A5ssxm+qA7rwAn0jmpWL2ROw5muym6004= -github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20231205052311-482ca12d811d/go.mod h1:W5cFAEWktR5EdxQdpudmyAth9y6LDPBx1zAhINWrJAo= -github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20231206042754-386df184f3b8 h1:kpL95UwWua/DEi6Pzhnh6IlfD6usNnw96z/bLNHgNqE= -github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20231206042754-386df184f3b8/go.mod h1:QImbJQlRBawvzY4UBD1wi6yfm1iWYaQp8rFjoLV+YLQ= -github.com/go-orb/plugins/config/source/file v0.0.0-20231205052311-482ca12d811d h1:bbO5aqFj2VxS8FrkyLnqHCs92VkyIRl8vVxx++Dsbqk= -github.com/go-orb/plugins/config/source/file v0.0.0-20231205052311-482ca12d811d/go.mod h1:JeQPUsW7ZpuTkRnx4YOlDvBFwv4wdR2zUDzhcwyrPnw= -github.com/go-orb/plugins/config/source/file v0.0.0-20231206042754-386df184f3b8 h1:vczxh+zOJRDj7Rl0AFHjLpag6fgeRt54byZyVgXcmcQ= -github.com/go-orb/plugins/config/source/file v0.0.0-20231206042754-386df184f3b8/go.mod h1:i3Yh8hu6kgKMMs0MPNFj8+1WxRm+NNxGaGZsGHzrTnw= -github.com/go-orb/plugins/log/lumberjack v0.0.0-20231205052311-482ca12d811d h1:gW2rdQA+THszFrNFW0IA/Yfo1MApk7m4btzPEGUavSo= -github.com/go-orb/plugins/log/lumberjack v0.0.0-20231205052311-482ca12d811d/go.mod h1:3foB2sN8f46Q4p6YebJ0lIfpGmJJjloiz33RI9HhexY= -github.com/go-orb/plugins/log/lumberjack v0.0.0-20231206042754-386df184f3b8 h1:a5YZTRvQulyc9eK5O0lnPZPwYbRWff90N7BuudWaqDU= -github.com/go-orb/plugins/log/lumberjack v0.0.0-20231206042754-386df184f3b8/go.mod h1:W0HJRx/lyhlVIluiqE8AwaNffDf5f8QluDW6rBvsEjc= -github.com/go-orb/plugins/log/slog v0.0.0-20231205052311-482ca12d811d h1:AdAuXO60ixnjMXD0A9HySIbCSLGrqiCOxkxG2uHSS1E= -github.com/go-orb/plugins/log/slog v0.0.0-20231205052311-482ca12d811d/go.mod h1:CWYWUlVqdGd7To0WYb7FTSvyPQOM9/Ra3DDUXIMdHWY= -github.com/go-orb/plugins/log/slog v0.0.0-20231206042754-386df184f3b8 h1:zEhFaA4jCLVY5yL1lfUVgzIWr5SBGAo2st1/wL+Z8iE= -github.com/go-orb/plugins/log/slog v0.0.0-20231206042754-386df184f3b8/go.mod h1:SSlXvvFZlEnbzt+OdN8rLqsQRmrSllEVt7Zb1ibfkWc= -github.com/go-orb/plugins/registry/consul v0.0.0-20231205052311-482ca12d811d h1:nEuKj4QuBVy4ssBrCEP0DppX+DeVQOV3hSMFlDazSbE= -github.com/go-orb/plugins/registry/consul v0.0.0-20231205052311-482ca12d811d/go.mod h1:sgFaHMKkCmZoXJSnii1F/X55BYH2FBIy9KAiSOePfqc= -github.com/go-orb/plugins/registry/consul v0.0.0-20231206042754-386df184f3b8 h1:7JgYgsUgl0pI0KuDMxs6xE8x6x+e8xMh30SjufSsebM= -github.com/go-orb/plugins/registry/consul v0.0.0-20231206042754-386df184f3b8/go.mod h1:Yx2vmVdsZHTrkUgj5K3ay7BvSuzGnu7dyTt91QLZms0= -github.com/go-orb/plugins/registry/mdns v0.0.0-20231205052311-482ca12d811d h1:8WHA4VxWeSiwuhxDghkOemKCFSXXExxri9ZE0fcDrnQ= -github.com/go-orb/plugins/registry/mdns v0.0.0-20231205052311-482ca12d811d/go.mod h1:Q1LIdW1yCcFQ9ApSgelVxjOtc0N5Rw4QepCizfwyQWI= -github.com/go-orb/plugins/registry/mdns v0.0.0-20231206042754-386df184f3b8 h1:oAgCr5EhjGa+gVV84qstSCtiz3wriLoKJk0d2z2YVwg= -github.com/go-orb/plugins/registry/mdns v0.0.0-20231206042754-386df184f3b8/go.mod h1:U8mDTZRPhCIzeUkVCLU+D+3FJwclnD051ZkKVUVoasU= -github.com/go-orb/plugins/registry/regutil v0.0.0-20231205052311-482ca12d811d h1:YtOiPpdf5+oEQEnIqCBVUEVlFfhveDrBgyA/KbhtAP0= -github.com/go-orb/plugins/registry/regutil v0.0.0-20231205052311-482ca12d811d/go.mod h1:9JM12HiMcJiy0pfS62ijOldhlyPMa/b57oupEfQMH8U= -github.com/go-orb/plugins/registry/regutil v0.0.0-20231206042754-386df184f3b8 h1:j0hoUYnLcCgwA741Ubjf/0zsOHYwWtu2OnQA69OpESM= -github.com/go-orb/plugins/registry/regutil v0.0.0-20231206042754-386df184f3b8/go.mod h1:nm1pQM4sAj/ziFFhLOwqqaHmzbHnislQ59yN4zeRC6s= +github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231206043051-39c19db01b8f h1:ubgIFUAzHR0IcCQsMBEqid7baATin3528NKUwaEr/2M= +github.com/go-orb/plugins/codecs/jsonpb v0.0.0-20231206043051-39c19db01b8f/go.mod h1:iAxCNf8Ygq38xzYEWNifmwQRorz0gJfZ7Bk5KGodQM0= +github.com/go-orb/plugins/codecs/proto v0.0.0-20231206043051-39c19db01b8f h1:iOFlU2BN6hdUch9sdnJ7SDpgH395fH1OtYMoh4qc4DA= +github.com/go-orb/plugins/codecs/proto v0.0.0-20231206043051-39c19db01b8f/go.mod h1:/CfsLwZ5tYLoLJgMpgMPYn+QpGcd6prpJPnCInX1y4c= +github.com/go-orb/plugins/codecs/yaml v0.0.0-20231206043051-39c19db01b8f h1:P0ssOuM5YzRldT7GN85NX67TVqeNt8jhTKaHGhDdfLc= +github.com/go-orb/plugins/codecs/yaml v0.0.0-20231206043051-39c19db01b8f/go.mod h1:RkkK7CTjPErJJhN9F1gRsJJaWoOSokO74PBnuVeiKFM= +github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20231206043051-39c19db01b8f h1:lrhO/U4rrBU94zNoWNJMKUYiStWUlzdLGTKwblqDWX8= +github.com/go-orb/plugins/config/source/cli/urfave v0.0.0-20231206043051-39c19db01b8f/go.mod h1:QImbJQlRBawvzY4UBD1wi6yfm1iWYaQp8rFjoLV+YLQ= +github.com/go-orb/plugins/config/source/file v0.0.0-20231206043051-39c19db01b8f h1:rXjPlAaeZXuDOUgSUHTMwSj+sAVM7uxSRPCyrkeaftc= +github.com/go-orb/plugins/config/source/file v0.0.0-20231206043051-39c19db01b8f/go.mod h1:i3Yh8hu6kgKMMs0MPNFj8+1WxRm+NNxGaGZsGHzrTnw= +github.com/go-orb/plugins/log/lumberjack v0.0.0-20231206043051-39c19db01b8f h1:6rx+7r7ORg3W1bHS27WHzh8t2rTFgw2bvzuz0/G5zHs= +github.com/go-orb/plugins/log/lumberjack v0.0.0-20231206043051-39c19db01b8f/go.mod h1:W0HJRx/lyhlVIluiqE8AwaNffDf5f8QluDW6rBvsEjc= +github.com/go-orb/plugins/log/slog v0.0.0-20231206043051-39c19db01b8f h1:8teLLeV0IfFjuiGAC6DqUS5XqstpwFw+XfkBRQ4ceDA= +github.com/go-orb/plugins/log/slog v0.0.0-20231206043051-39c19db01b8f/go.mod h1:SSlXvvFZlEnbzt+OdN8rLqsQRmrSllEVt7Zb1ibfkWc= +github.com/go-orb/plugins/registry/consul v0.0.0-20231206043051-39c19db01b8f h1:b7Hus7qN2Os+MX7t7obRC+r5NSUQpntBievToF2eIQQ= +github.com/go-orb/plugins/registry/consul v0.0.0-20231206043051-39c19db01b8f/go.mod h1:QsBYxigHlBHAvXPZhZxMtt1/oBAdtGYARBi9wU01vYo= +github.com/go-orb/plugins/registry/mdns v0.0.0-20231206043051-39c19db01b8f h1:zygGnRNJURL64w528Bx7o120x4NDqAFBHjJV1S/4iqI= +github.com/go-orb/plugins/registry/mdns v0.0.0-20231206043051-39c19db01b8f/go.mod h1:U8mDTZRPhCIzeUkVCLU+D+3FJwclnD051ZkKVUVoasU= +github.com/go-orb/plugins/registry/regutil v0.0.0-20231206043051-39c19db01b8f h1:31Hw14BH2CZs76LT4A2hUqj1XpPVAI1jAmEECVZv3dY= +github.com/go-orb/plugins/registry/regutil v0.0.0-20231206043051-39c19db01b8f/go.mod h1:nm1pQM4sAj/ziFFhLOwqqaHmzbHnislQ59yN4zeRC6s= github.com/go-orb/plugins/registry/tests v0.0.0-20231205051152-a7c84fe79f05 h1:HL6/6l+Ezio0mdvZo+fCK6ssGFFrk4EucqCKXwGGlIU= github.com/go-orb/plugins/registry/tests v0.0.0-20231205051152-a7c84fe79f05/go.mod h1:Nvf7DoZwRN7beKCb3ty4ydfI4eJeQR1x6LkckEjMsoQ= -github.com/go-orb/plugins/server/drpc v0.0.0-20231205052311-482ca12d811d h1:fA4Z+Ddsh08oyDHZLFhfXRjp8z1E095VjffOxt9dgjs= -github.com/go-orb/plugins/server/drpc v0.0.0-20231205052311-482ca12d811d/go.mod h1:UqT+rUIJ4bPllOK63RfoyMJRY4BkbUboibHnvocTznU= -github.com/go-orb/plugins/server/drpc v0.0.0-20231206042754-386df184f3b8 h1:4Pf4jYjmg2XUIKUO4D7KCyeY5VqvCGJXmEv3/kQ7Y+4= -github.com/go-orb/plugins/server/drpc v0.0.0-20231206042754-386df184f3b8/go.mod h1:7/d6F1BicKo3Ohjyc3o20dgDwSG3q2fD94pdG+Vo3Ck= -github.com/go-orb/plugins/server/grpc v0.0.0-20231205052311-482ca12d811d h1:O9rvdJqRlWrzvgbiU975hTORnR2ryqSNTLozVtTNQWI= -github.com/go-orb/plugins/server/grpc v0.0.0-20231205052311-482ca12d811d/go.mod h1:BvYEgrYvrcPDX7x3/C8oN/cl1HmOqW1HTootQNuJMSk= -github.com/go-orb/plugins/server/grpc v0.0.0-20231206042754-386df184f3b8 h1:OYB9qivTSUK1CuVq2j7pbocsJenNz6M7UxUxPX7aGdE= -github.com/go-orb/plugins/server/grpc v0.0.0-20231206042754-386df184f3b8/go.mod h1:zn286H8tLNfxnGQrvjtYwxNc3IGVvAMO5SJ7Ctdzr7s= -github.com/go-orb/plugins/server/hertz v0.0.0-20231205052311-482ca12d811d h1:ycmJdqc2RaWn2T9iPkg9yeHjhDExH5jOTUCPqF3rmYg= -github.com/go-orb/plugins/server/hertz v0.0.0-20231205052311-482ca12d811d/go.mod h1:9UPdKGOWNiIH3KWBkUwlXCGiY3Hu9upLUvnrMdXYsjc= -github.com/go-orb/plugins/server/hertz v0.0.0-20231206042754-386df184f3b8 h1:Q1o66IDhUcfx2Fbo6dYQRW9VCyvB8S2GlxOv8Nb2Phc= -github.com/go-orb/plugins/server/hertz v0.0.0-20231206042754-386df184f3b8/go.mod h1:Xl7v4XkoFQhBJhmWfMk9ssBdlcro9Py9iLw3heK7JDU= -github.com/go-orb/plugins/server/http v0.0.0-20231205052311-482ca12d811d h1:3DnV74lNjbrW40P3JwCgEuhjrMwHbJJXvqlY1/A8uaQ= -github.com/go-orb/plugins/server/http v0.0.0-20231205052311-482ca12d811d/go.mod h1:ANDH1eWctqLEDRABl0zgMjfAzc5xZ+d9X+TQT2KQ544= -github.com/go-orb/plugins/server/http v0.0.0-20231206042754-386df184f3b8 h1:snUtwNhuo2fXNEkJp2LVS7smfc9PCxadT7hiCnbeEqo= -github.com/go-orb/plugins/server/http v0.0.0-20231206042754-386df184f3b8/go.mod h1:uyBIbAL2s8dS/lOvN128CvyC8VZ0/SPwlcu3rNXL4zc= +github.com/go-orb/plugins/server/drpc v0.0.0-20231206043051-39c19db01b8f h1:ft9XbVMuw9Ql4jvNp24S30KSKclYT+ag/72Rq/ff92A= +github.com/go-orb/plugins/server/drpc v0.0.0-20231206043051-39c19db01b8f/go.mod h1:bNtyDppPUKB20IRJDLzIfr1BnYXo+KOCtxeINlLF1DU= +github.com/go-orb/plugins/server/grpc v0.0.0-20231206043051-39c19db01b8f h1:S+g807mY7cn+CH8g3JbowEUGQbjU1P42aWKuTXVk6xc= +github.com/go-orb/plugins/server/grpc v0.0.0-20231206043051-39c19db01b8f/go.mod h1:zn286H8tLNfxnGQrvjtYwxNc3IGVvAMO5SJ7Ctdzr7s= +github.com/go-orb/plugins/server/hertz v0.0.0-20231206043051-39c19db01b8f h1:27AfEJLd0LY0d35wdf9TD+Q+UReyYWrbMzO5t6Xpqaw= +github.com/go-orb/plugins/server/hertz v0.0.0-20231206043051-39c19db01b8f/go.mod h1:Xl7v4XkoFQhBJhmWfMk9ssBdlcro9Py9iLw3heK7JDU= +github.com/go-orb/plugins/server/http v0.0.0-20231206043051-39c19db01b8f h1:Pb+QdfIHvHLgvB4R9KN1/N2gIT6S6N0MgZJQcztcYQQ= +github.com/go-orb/plugins/server/http v0.0.0-20231206043051-39c19db01b8f/go.mod h1:uyBIbAL2s8dS/lOvN128CvyC8VZ0/SPwlcu3rNXL4zc= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= diff --git a/registry/consul/go.mod b/registry/consul/go.mod index a9dedca0..5dde6e24 100644 --- a/registry/consul/go.mod +++ b/registry/consul/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b github.com/go-orb/plugins/log/slog v0.0.0-20231205051152-a7c84fe79f05 - github.com/go-orb/plugins/registry/regutil v0.0.0-20231206042754-386df184f3b8 + github.com/go-orb/plugins/registry/regutil v0.0.0-20231206043051-39c19db01b8f github.com/go-orb/plugins/registry/tests v0.0.0-20231205051152-a7c84fe79f05 github.com/google/uuid v1.4.0 github.com/hashicorp/consul/api v1.26.1 diff --git a/registry/consul/go.sum b/registry/consul/go.sum index 2827d8a4..37eb63ca 100644 --- a/registry/consul/go.sum +++ b/registry/consul/go.sum @@ -35,10 +35,8 @@ github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b h1:9lg1vas/UKYhd+SmI github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b/go.mod h1:esPD35O0lg1ksWTaiiYFJaAtH+Srku8DuoN0L91fvp0= github.com/go-orb/plugins/log/slog v0.0.0-20231205051152-a7c84fe79f05 h1:CiLUwsuIWi/CdDyuRUa0w/pDZEy50WfvBj2k8phnwog= github.com/go-orb/plugins/log/slog v0.0.0-20231205051152-a7c84fe79f05/go.mod h1:CWYWUlVqdGd7To0WYb7FTSvyPQOM9/Ra3DDUXIMdHWY= -github.com/go-orb/plugins/registry/regutil v0.0.0-20231205052311-482ca12d811d h1:YtOiPpdf5+oEQEnIqCBVUEVlFfhveDrBgyA/KbhtAP0= -github.com/go-orb/plugins/registry/regutil v0.0.0-20231205052311-482ca12d811d/go.mod h1:9JM12HiMcJiy0pfS62ijOldhlyPMa/b57oupEfQMH8U= -github.com/go-orb/plugins/registry/regutil v0.0.0-20231206042754-386df184f3b8 h1:j0hoUYnLcCgwA741Ubjf/0zsOHYwWtu2OnQA69OpESM= -github.com/go-orb/plugins/registry/regutil v0.0.0-20231206042754-386df184f3b8/go.mod h1:nm1pQM4sAj/ziFFhLOwqqaHmzbHnislQ59yN4zeRC6s= +github.com/go-orb/plugins/registry/regutil v0.0.0-20231206043051-39c19db01b8f h1:31Hw14BH2CZs76LT4A2hUqj1XpPVAI1jAmEECVZv3dY= +github.com/go-orb/plugins/registry/regutil v0.0.0-20231206043051-39c19db01b8f/go.mod h1:nm1pQM4sAj/ziFFhLOwqqaHmzbHnislQ59yN4zeRC6s= github.com/go-orb/plugins/registry/tests v0.0.0-20231205051152-a7c84fe79f05 h1:HL6/6l+Ezio0mdvZo+fCK6ssGFFrk4EucqCKXwGGlIU= github.com/go-orb/plugins/registry/tests v0.0.0-20231205051152-a7c84fe79f05/go.mod h1:Nvf7DoZwRN7beKCb3ty4ydfI4eJeQR1x6LkckEjMsoQ= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= diff --git a/server/drpc/go.mod b/server/drpc/go.mod index f17e5e96..35c045c3 100644 --- a/server/drpc/go.mod +++ b/server/drpc/go.mod @@ -5,7 +5,6 @@ go 1.21.4 require ( github.com/go-orb/go-orb v0.0.0-20231205054835-5d5151ec921b github.com/google/uuid v1.4.0 - github.com/hashicorp/yamux v0.1.1 storj.io/drpc v0.0.33 ) diff --git a/server/drpc/go.sum b/server/drpc/go.sum index 5d869df5..c2ecc01a 100644 --- a/server/drpc/go.sum +++ b/server/drpc/go.sum @@ -12,8 +12,6 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= -github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= diff --git a/server/drpc/muxconn/muxconn.go b/server/drpc/muxconn/muxconn.go deleted file mode 100644 index 2a766d15..00000000 --- a/server/drpc/muxconn/muxconn.go +++ /dev/null @@ -1,141 +0,0 @@ -// Package muxconn has been copied from https://gitea.elara.ws/Elara6331/drpc/src/branch/master/muxconn/muxconn.go -// MIT - Copyright (c) 2023 Elara Musayelyan -package muxconn - -import ( - "context" - "errors" - "io" - - "github.com/hashicorp/yamux" - "storj.io/drpc" - "storj.io/drpc/drpcconn" - "storj.io/drpc/drpcmanager" -) - -// ErrClosed happens when connection has been closed. -var ErrClosed = errors.New("connection closed") - -var _ drpc.Conn = (*Conn)(nil) - -// Options controls configuration settings for a conn. -type Options struct { - // Manager controls the options we pass to the manager of this conn. - Manager drpcmanager.Options -} - -// Conn implements drpc.Conn using the yamux -// multiplexer to allow concurrent RPCs. -type Conn struct { - conn io.ReadWriteCloser - sess *yamux.Session - isClosed bool - closed chan struct{} - unblockedChan chan struct{} -} - -// New returns a new multiplexed DRPC connection. -func New(conn io.ReadWriteCloser) (*Conn, error) { - return NewWithOptions(conn, Options{}) -} - -func NewWithOptions(conn io.ReadWriteCloser, opts Options) (*Conn, error) { - sess, err := yamux.Client(conn, nil) - if err != nil { - return nil, err - } - - uc := make(chan struct{}, 0) - close(uc) - - return &Conn{ - conn: conn, - sess: sess, - closed: make(chan struct{}), - unblockedChan: uc, - }, nil -} - -// Close closes the multiplexer session -// and the underlying connection. -func (m *Conn) Close() error { - if m.isClosed { - return nil - } - - m.isClosed = true - defer close(m.closed) - - err := m.sess.Close() - if err != nil { - m.conn.Close() - return err - } - - if err = m.conn.Close(); err != nil { - return err - } - - return nil -} - -// Closed returns a channel that will be closed -// when the connection is closed -func (m *Conn) Closed() <-chan struct{} { - return m.closed -} - -// Invoke issues the rpc on the transport serializing in, waits for a response, and deserializes it into out. -func (m *Conn) Invoke(ctx context.Context, rpc string, enc drpc.Encoding, in, out drpc.Message) error { - if m.isClosed { - return ErrClosed - } - - conn, err := m.sess.Open() - if err != nil { - return err - } - - dconn := drpcconn.New(conn) - invokeErr := dconn.Invoke(ctx, rpc, enc, in, out) - - dconn.Close() - conn.Close() - - return invokeErr -} - -// NewStream begins a streaming rpc on the connection. -func (m *Conn) NewStream(ctx context.Context, rpc string, enc drpc.Encoding) (drpc.Stream, error) { - if m.isClosed { - return nil, ErrClosed - } - - conn, err := m.sess.Open() - if err != nil { - return nil, err - } - dconn := drpcconn.New(conn) - - s, err := dconn.NewStream(ctx, rpc, enc) - if err != nil { - return nil, err - } - - // TODO(jochumdev): don't like to spawn a goroutine here. - go func() { - select { - case <-dconn.Closed(): - conn.Close() - case <-s.Context().Done(): - dconn.Close() - conn.Close() - } - }() - - return s, nil -} - -func (m *Conn) Unblocked() <-chan struct{} { - return m.unblockedChan -} diff --git a/server/drpc/muxserver/muxserver.go b/server/drpc/muxserver/muxserver.go deleted file mode 100644 index f63cde1d..00000000 --- a/server/drpc/muxserver/muxserver.go +++ /dev/null @@ -1,81 +0,0 @@ -package muxserver - -import ( - "context" - "errors" - "io" - "net" - - "github.com/hashicorp/yamux" - "storj.io/drpc" - "storj.io/drpc/drpcserver" -) - -// Server is a DRPC server that handles -// multiplexed streams -type Server struct { - srv *drpcserver.Server -} - -// New returns a new multiplexed Server that serves handler -func New(handler drpc.Handler) *Server { - return &Server{srv: drpcserver.New(handler)} -} - -// NewWithOptions is the same as New but passes options to DRPC -func NewWithOptions(handler drpc.Handler, opts drpcserver.Options) *Server { - return &Server{srv: drpcserver.NewWithOptions(handler, opts)} -} - -// Serve listens on the given listener and handles all multiplexed -// streams. -func (s *Server) Serve(ctx context.Context, ln net.Listener) error { - connCh := make(chan net.Conn, 2) - errCh := make(chan error, 2) - go connChannel(ln, connCh, errCh) - - for { - select { - case conn := <-connCh: - sess, err := yamux.Server(conn, nil) - if err != nil { - return err - } - - go s.handleSession(ctx, sess) - case err := <-errCh: - return err - case <-ctx.Done(): - return nil - } - } -} - -func (s *Server) handleSession(ctx context.Context, sess *yamux.Session) { - for { - conn, err := sess.Accept() - if errors.Is(err, io.EOF) { - break - } else if err != nil { - continue - } - - go s.srv.ServeOne(ctx, conn) - } -} - -// ServeOne serves a single set of rpcs on the provided transport. -func (s *Server) ServeOne(ctx context.Context, conn io.ReadWriteCloser) error { - return s.srv.ServeOne(ctx, conn) -} - -func connChannel(ln net.Listener, connCh chan net.Conn, errCh chan error) { - for { - conn, err := ln.Accept() - if err != nil { - errCh <- err - continue - } - connCh <- conn - } -}