starpc 0.29.1 → 0.30.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/Makefile +21 -14
  2. package/e2e/mock/mock.pb.go +54 -10
  3. package/echo/echo.pb.go +54 -10
  4. package/go.mod +5 -2
  5. package/go.sum +12 -4
  6. package/package.json +2 -2
  7. package/srpc/rpcproto.pb.go +259 -52
  8. package/integration/integration_srpc.pb.go +0 -139
package/Makefile CHANGED
@@ -1,13 +1,14 @@
1
1
  # https://github.com/aperturerobotics/protobuf-project
2
2
 
3
3
  SHELL:=bash
4
- ESBUILD=hack/bin/esbuild
5
4
  PROTOWRAP=hack/bin/protowrap
6
5
  PROTOC_GEN_GO=hack/bin/protoc-gen-go-lite
7
6
  PROTOC_GEN_STARPC=hack/bin/protoc-gen-go-starpc
8
7
  GOIMPORTS=hack/bin/goimports
8
+ GOFUMPT=hack/bin/gofumpt
9
9
  GOLANGCI_LINT=hack/bin/golangci-lint
10
10
  GO_MOD_OUTDATED=hack/bin/go-mod-outdated
11
+ ESBUILD=hack/bin/esbuild
11
12
  GOLIST=go list -f "{{ .Dir }}" -m
12
13
 
13
14
  export GO111MODULE=on
@@ -19,30 +20,24 @@ all:
19
20
  vendor:
20
21
  go mod vendor
21
22
 
22
- $(ESBUILD):
23
- cd ./hack; \
24
- go build -v \
25
- -o ./bin/esbuild \
26
- github.com/evanw/esbuild/cmd/esbuild
27
-
28
23
  $(PROTOC_GEN_GO):
29
24
  cd ./hack; \
30
25
  go build -v \
31
26
  -o ./bin/protoc-gen-go-lite \
32
27
  github.com/aperturerobotics/protobuf-go-lite/cmd/protoc-gen-go-lite
33
28
 
34
- $(PROTOC_GEN_STARPC):
35
- cd ./hack; \
36
- go build -v \
37
- -o ./bin/protoc-gen-go-starpc \
38
- github.com/aperturerobotics/starpc/cmd/protoc-gen-go-starpc
39
-
40
29
  $(GOIMPORTS):
41
30
  cd ./hack; \
42
31
  go build -v \
43
32
  -o ./bin/goimports \
44
33
  golang.org/x/tools/cmd/goimports
45
34
 
35
+ $(GOFUMPT):
36
+ cd ./hack; \
37
+ go build -v \
38
+ -o ./bin/gofumpt \
39
+ mvdan.cc/gofumpt
40
+
46
41
  $(PROTOWRAP):
47
42
  cd ./hack; \
48
43
  go build -v \
@@ -61,6 +56,18 @@ $(GO_MOD_OUTDATED):
61
56
  -o ./bin/go-mod-outdated \
62
57
  github.com/psampaz/go-mod-outdated
63
58
 
59
+ $(PROTOC_GEN_STARPC):
60
+ cd ./hack; \
61
+ go build -v \
62
+ -o ./bin/protoc-gen-go-starpc \
63
+ github.com/aperturerobotics/starpc/cmd/protoc-gen-go-starpc
64
+
65
+ $(ESBUILD):
66
+ cd ./hack; \
67
+ go build -v \
68
+ -o ./bin/esbuild \
69
+ github.com/evanw/esbuild/cmd/esbuild
70
+
64
71
  node_modules:
65
72
  yarn install
66
73
 
@@ -78,7 +85,7 @@ genproto: vendor node_modules $(GOIMPORTS) $(PROTOWRAP) $(PROTOC_GEN_GO) $(PROTO
78
85
  -I $$(pwd)/vendor \
79
86
  --plugin=./node_modules/.bin/protoc-gen-ts_proto \
80
87
  --go-lite_out=$$(pwd)/vendor \
81
- --go-lite_opt=features=marshal+unmarshal+size+equal+clone \
88
+ --go-lite_opt=features=marshal+unmarshal+size+equal+json+clone \
82
89
  --go-starpc_out=$$(pwd)/vendor \
83
90
  --ts_proto_out=$$(pwd)/vendor \
84
91
  --ts_proto_opt=esModuleInterop=true \
package/e2e/mock/mock.pb.go CHANGED
@@ -1,5 +1,5 @@
1
1
  // Code generated by protoc-gen-go-lite. DO NOT EDIT.
2
- // protoc-gen-go-lite version: v0.2.4
2
+ // protoc-gen-go-lite version: v0.4.1
3
3
  // source: github.com/aperturerobotics/starpc/e2e/mock/mock.proto
4
4
 
5
5
  package e2e_mock
@@ -7,7 +7,8 @@ package e2e_mock
7
7
  import (
8
8
  io "io"
9
9
 
10
- protohelpers "github.com/aperturerobotics/protobuf-go-lite/protohelpers"
10
+ protobuf_go_lite "github.com/aperturerobotics/protobuf-go-lite"
11
+ json "github.com/aperturerobotics/protobuf-go-lite/json"
11
12
  errors "github.com/pkg/errors"
12
13
  )
13
14
 
@@ -66,6 +67,49 @@ func (this *MockMsg) EqualMessageVT(thatMsg any) bool {
66
67
  }
67
68
  return this.EqualVT(that)
68
69
  }
70
+
71
+ // MarshalProtoJSON marshals the MockMsg message to JSON.
72
+ func (x *MockMsg) MarshalProtoJSON(s *json.MarshalState) {
73
+ if x == nil {
74
+ s.WriteNil()
75
+ return
76
+ }
77
+ s.WriteObjectStart()
78
+ var wroteField bool
79
+ if x.Body != "" || s.HasField("body") {
80
+ s.WriteMoreIf(&wroteField)
81
+ s.WriteObjectField("body")
82
+ s.WriteString(x.Body)
83
+ }
84
+ s.WriteObjectEnd()
85
+ }
86
+
87
+ // MarshalJSON marshals the MockMsg to JSON.
88
+ func (x *MockMsg) MarshalJSON() ([]byte, error) {
89
+ return json.DefaultMarshalerConfig.Marshal(x)
90
+ }
91
+
92
+ // UnmarshalProtoJSON unmarshals the MockMsg message from JSON.
93
+ func (x *MockMsg) UnmarshalProtoJSON(s *json.UnmarshalState) {
94
+ if s.ReadNil() {
95
+ return
96
+ }
97
+ s.ReadObject(func(key string) {
98
+ switch key {
99
+ default:
100
+ s.ReadAny() // ignore unknown field
101
+ case "body":
102
+ s.AddField("body")
103
+ x.Body = s.ReadString()
104
+ }
105
+ })
106
+ }
107
+
108
+ // UnmarshalJSON unmarshals the MockMsg from JSON.
109
+ func (x *MockMsg) UnmarshalJSON(b []byte) error {
110
+ return json.DefaultUnmarshalerConfig.Unmarshal(b, x)
111
+ }
112
+
69
113
  func (m *MockMsg) MarshalVT() (dAtA []byte, err error) {
70
114
  if m == nil {
71
115
  return nil, nil
@@ -99,7 +143,7 @@ func (m *MockMsg) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
99
143
  if len(m.Body) > 0 {
100
144
  i -= len(m.Body)
101
145
  copy(dAtA[i:], m.Body)
102
- i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.Body)))
146
+ i = protobuf_go_lite.EncodeVarint(dAtA, i, uint64(len(m.Body)))
103
147
  i--
104
148
  dAtA[i] = 0xa
105
149
  }
@@ -114,7 +158,7 @@ func (m *MockMsg) SizeVT() (n int) {
114
158
  _ = l
115
159
  l = len(m.Body)
116
160
  if l > 0 {
117
- n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
161
+ n += 1 + l + protobuf_go_lite.SizeOfVarint(uint64(l))
118
162
  }
119
163
  n += len(m.unknownFields)
120
164
  return n
@@ -128,7 +172,7 @@ func (m *MockMsg) UnmarshalVT(dAtA []byte) error {
128
172
  var wire uint64
129
173
  for shift := uint(0); ; shift += 7 {
130
174
  if shift >= 64 {
131
- return protohelpers.ErrIntOverflow
175
+ return protobuf_go_lite.ErrIntOverflow
132
176
  }
133
177
  if iNdEx >= l {
134
178
  return io.ErrUnexpectedEOF
@@ -156,7 +200,7 @@ func (m *MockMsg) UnmarshalVT(dAtA []byte) error {
156
200
  var stringLen uint64
157
201
  for shift := uint(0); ; shift += 7 {
158
202
  if shift >= 64 {
159
- return protohelpers.ErrIntOverflow
203
+ return protobuf_go_lite.ErrIntOverflow
160
204
  }
161
205
  if iNdEx >= l {
162
206
  return io.ErrUnexpectedEOF
@@ -170,11 +214,11 @@ func (m *MockMsg) UnmarshalVT(dAtA []byte) error {
170
214
  }
171
215
  intStringLen := int(stringLen)
172
216
  if intStringLen < 0 {
173
- return protohelpers.ErrInvalidLength
217
+ return protobuf_go_lite.ErrInvalidLength
174
218
  }
175
219
  postIndex := iNdEx + intStringLen
176
220
  if postIndex < 0 {
177
- return protohelpers.ErrInvalidLength
221
+ return protobuf_go_lite.ErrInvalidLength
178
222
  }
179
223
  if postIndex > l {
180
224
  return io.ErrUnexpectedEOF
@@ -183,12 +227,12 @@ func (m *MockMsg) UnmarshalVT(dAtA []byte) error {
183
227
  iNdEx = postIndex
184
228
  default:
185
229
  iNdEx = preIndex
186
- skippy, err := protohelpers.Skip(dAtA[iNdEx:])
230
+ skippy, err := protobuf_go_lite.Skip(dAtA[iNdEx:])
187
231
  if err != nil {
188
232
  return err
189
233
  }
190
234
  if (skippy < 0) || (iNdEx+skippy) < 0 {
191
- return protohelpers.ErrInvalidLength
235
+ return protobuf_go_lite.ErrInvalidLength
192
236
  }
193
237
  if (iNdEx + skippy) > l {
194
238
  return io.ErrUnexpectedEOF
package/echo/echo.pb.go CHANGED
@@ -1,5 +1,5 @@
1
1
  // Code generated by protoc-gen-go-lite. DO NOT EDIT.
2
- // protoc-gen-go-lite version: v0.2.4
2
+ // protoc-gen-go-lite version: v0.4.1
3
3
  // source: github.com/aperturerobotics/starpc/echo/echo.proto
4
4
 
5
5
  package echo
@@ -7,7 +7,8 @@ package echo
7
7
  import (
8
8
  io "io"
9
9
 
10
- protohelpers "github.com/aperturerobotics/protobuf-go-lite/protohelpers"
10
+ protobuf_go_lite "github.com/aperturerobotics/protobuf-go-lite"
11
+ json "github.com/aperturerobotics/protobuf-go-lite/json"
11
12
  _ "github.com/aperturerobotics/starpc/rpcstream"
12
13
  errors "github.com/pkg/errors"
13
14
  )
@@ -67,6 +68,49 @@ func (this *EchoMsg) EqualMessageVT(thatMsg any) bool {
67
68
  }
68
69
  return this.EqualVT(that)
69
70
  }
71
+
72
+ // MarshalProtoJSON marshals the EchoMsg message to JSON.
73
+ func (x *EchoMsg) MarshalProtoJSON(s *json.MarshalState) {
74
+ if x == nil {
75
+ s.WriteNil()
76
+ return
77
+ }
78
+ s.WriteObjectStart()
79
+ var wroteField bool
80
+ if x.Body != "" || s.HasField("body") {
81
+ s.WriteMoreIf(&wroteField)
82
+ s.WriteObjectField("body")
83
+ s.WriteString(x.Body)
84
+ }
85
+ s.WriteObjectEnd()
86
+ }
87
+
88
+ // MarshalJSON marshals the EchoMsg to JSON.
89
+ func (x *EchoMsg) MarshalJSON() ([]byte, error) {
90
+ return json.DefaultMarshalerConfig.Marshal(x)
91
+ }
92
+
93
+ // UnmarshalProtoJSON unmarshals the EchoMsg message from JSON.
94
+ func (x *EchoMsg) UnmarshalProtoJSON(s *json.UnmarshalState) {
95
+ if s.ReadNil() {
96
+ return
97
+ }
98
+ s.ReadObject(func(key string) {
99
+ switch key {
100
+ default:
101
+ s.ReadAny() // ignore unknown field
102
+ case "body":
103
+ s.AddField("body")
104
+ x.Body = s.ReadString()
105
+ }
106
+ })
107
+ }
108
+
109
+ // UnmarshalJSON unmarshals the EchoMsg from JSON.
110
+ func (x *EchoMsg) UnmarshalJSON(b []byte) error {
111
+ return json.DefaultUnmarshalerConfig.Unmarshal(b, x)
112
+ }
113
+
70
114
  func (m *EchoMsg) MarshalVT() (dAtA []byte, err error) {
71
115
  if m == nil {
72
116
  return nil, nil
@@ -100,7 +144,7 @@ func (m *EchoMsg) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
100
144
  if len(m.Body) > 0 {
101
145
  i -= len(m.Body)
102
146
  copy(dAtA[i:], m.Body)
103
- i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.Body)))
147
+ i = protobuf_go_lite.EncodeVarint(dAtA, i, uint64(len(m.Body)))
104
148
  i--
105
149
  dAtA[i] = 0xa
106
150
  }
@@ -115,7 +159,7 @@ func (m *EchoMsg) SizeVT() (n int) {
115
159
  _ = l
116
160
  l = len(m.Body)
117
161
  if l > 0 {
118
- n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
162
+ n += 1 + l + protobuf_go_lite.SizeOfVarint(uint64(l))
119
163
  }
120
164
  n += len(m.unknownFields)
121
165
  return n
@@ -129,7 +173,7 @@ func (m *EchoMsg) UnmarshalVT(dAtA []byte) error {
129
173
  var wire uint64
130
174
  for shift := uint(0); ; shift += 7 {
131
175
  if shift >= 64 {
132
- return protohelpers.ErrIntOverflow
176
+ return protobuf_go_lite.ErrIntOverflow
133
177
  }
134
178
  if iNdEx >= l {
135
179
  return io.ErrUnexpectedEOF
@@ -157,7 +201,7 @@ func (m *EchoMsg) UnmarshalVT(dAtA []byte) error {
157
201
  var stringLen uint64
158
202
  for shift := uint(0); ; shift += 7 {
159
203
  if shift >= 64 {
160
- return protohelpers.ErrIntOverflow
204
+ return protobuf_go_lite.ErrIntOverflow
161
205
  }
162
206
  if iNdEx >= l {
163
207
  return io.ErrUnexpectedEOF
@@ -171,11 +215,11 @@ func (m *EchoMsg) UnmarshalVT(dAtA []byte) error {
171
215
  }
172
216
  intStringLen := int(stringLen)
173
217
  if intStringLen < 0 {
174
- return protohelpers.ErrInvalidLength
218
+ return protobuf_go_lite.ErrInvalidLength
175
219
  }
176
220
  postIndex := iNdEx + intStringLen
177
221
  if postIndex < 0 {
178
- return protohelpers.ErrInvalidLength
222
+ return protobuf_go_lite.ErrInvalidLength
179
223
  }
180
224
  if postIndex > l {
181
225
  return io.ErrUnexpectedEOF
@@ -184,12 +228,12 @@ func (m *EchoMsg) UnmarshalVT(dAtA []byte) error {
184
228
  iNdEx = postIndex
185
229
  default:
186
230
  iNdEx = preIndex
187
- skippy, err := protohelpers.Skip(dAtA[iNdEx:])
231
+ skippy, err := protobuf_go_lite.Skip(dAtA[iNdEx:])
188
232
  if err != nil {
189
233
  return err
190
234
  }
191
235
  if (skippy < 0) || (iNdEx+skippy) < 0 {
192
- return protohelpers.ErrInvalidLength
236
+ return protobuf_go_lite.ErrInvalidLength
193
237
  }
194
238
  if (iNdEx + skippy) > l {
195
239
  return io.ErrUnexpectedEOF
package/go.mod CHANGED
@@ -3,8 +3,8 @@ module github.com/aperturerobotics/starpc
3
3
  go 1.22
4
4
 
5
5
  require (
6
- github.com/aperturerobotics/protobuf-go-lite v0.2.4
7
- github.com/aperturerobotics/util v1.16.5 // latest
6
+ github.com/aperturerobotics/protobuf-go-lite v0.4.1 // latest
7
+ github.com/aperturerobotics/util v1.17.0 // latest
8
8
  )
9
9
 
10
10
  require (
@@ -19,9 +19,12 @@ require (
19
19
  require (
20
20
  github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
21
21
  github.com/ipfs/go-cid v0.4.1 // indirect
22
+ github.com/json-iterator/go v1.1.12 // indirect
22
23
  github.com/klauspost/cpuid/v2 v2.2.7 // indirect
23
24
  github.com/libp2p/go-buffer-pool v0.1.0 // indirect
24
25
  github.com/minio/sha256-simd v1.0.1 // indirect
26
+ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
27
+ github.com/modern-go/reflect2 v1.0.2 // indirect
25
28
  github.com/mr-tron/base58 v1.2.0 // indirect
26
29
  github.com/multiformats/go-base32 v0.1.0 // indirect
27
30
  github.com/multiformats/go-base36 v0.2.0 // indirect
package/go.sum CHANGED
@@ -1,7 +1,7 @@
1
- github.com/aperturerobotics/protobuf-go-lite v0.2.4 h1:BaEBcTP01WSatsarPb7O58ejm7Yx7VcRZkR1fPKtOD4=
2
- github.com/aperturerobotics/protobuf-go-lite v0.2.4/go.mod h1:uGsGl8o72hBjkAqBVz2kepXKeA7BZDiqCZPyHjw2yws=
3
- github.com/aperturerobotics/util v1.16.5 h1:zW6l07O1cCZMG+cbE08D5gv6p/tYfGipGRO5WaXpd1c=
4
- github.com/aperturerobotics/util v1.16.5/go.mod h1:UzxQN3nK8D+T7ruiBqvNiZOuEerkgsM1fN8eAvjsIMo=
1
+ github.com/aperturerobotics/protobuf-go-lite v0.4.1 h1:jd+DhFlf/f+L5gJPDCFrezBcaydCaxt5Keg0IJzJvOU=
2
+ github.com/aperturerobotics/protobuf-go-lite v0.4.1/go.mod h1:wRZn4YydbTn8Bdx4NB6ms0doF19llgim+0SNBvQ7M9c=
3
+ github.com/aperturerobotics/util v1.17.0 h1:eN9/NVXpf51OZQ4ERgGar/49kL1Pl8puW1MIYiYlA/8=
4
+ github.com/aperturerobotics/util v1.17.0/go.mod h1:YAWPti3PGLd1vagad3uMa3OfOLKo0rMXv80UJJPT0NA=
5
5
  github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6
6
  github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
7
7
  github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -11,8 +11,11 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etly
11
11
  github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
12
12
  github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
13
13
  github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
14
+ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
14
15
  github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=
15
16
  github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk=
17
+ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
18
+ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
16
19
  github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
17
20
  github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
18
21
  github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
@@ -25,6 +28,10 @@ github.com/libp2p/go-yamux/v4 v4.0.2-0.20240322071716-53ef5820bd48 h1:KI65sCCL2h
25
28
  github.com/libp2p/go-yamux/v4 v4.0.2-0.20240322071716-53ef5820bd48/go.mod h1:PGP+3py2ZWDKABvqstBZtMnixEHNC7U/odnGylzur5o=
26
29
  github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
27
30
  github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
31
+ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
32
+ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
33
+ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
34
+ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
28
35
  github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
29
36
  github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
30
37
  github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aGkbLYxPE=
@@ -52,6 +59,7 @@ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs
52
59
  github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
53
60
  github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
54
61
  github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
62
+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
55
63
  github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
56
64
  github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
57
65
  github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "starpc",
3
- "version": "0.29.1",
3
+ "version": "0.30.1",
4
4
  "description": "Streaming protobuf RPC service protocol over any two-way channel.",
5
5
  "license": "MIT",
6
6
  "author": {
@@ -64,7 +64,7 @@
64
64
  "singleQuote": true
65
65
  },
66
66
  "devDependencies": {
67
- "@aperturerobotics/ts-common": "^0.10.0",
67
+ "@aperturerobotics/ts-common": "^0.10.2",
68
68
  "bufferutil": "^4.0.7",
69
69
  "depcheck": "^1.4.6",
70
70
  "esbuild": "^0.20.0",
package/srpc/rpcproto.pb.go CHANGED
@@ -1,5 +1,5 @@
1
1
  // Code generated by protoc-gen-go-lite. DO NOT EDIT.
2
- // protoc-gen-go-lite version: v0.2.4
2
+ // protoc-gen-go-lite version: v0.4.1
3
3
  // source: github.com/aperturerobotics/starpc/srpc/rpcproto.proto
4
4
 
5
5
  package srpc
@@ -7,7 +7,8 @@ package srpc
7
7
  import (
8
8
  io "io"
9
9
 
10
- protohelpers "github.com/aperturerobotics/protobuf-go-lite/protohelpers"
10
+ protobuf_go_lite "github.com/aperturerobotics/protobuf-go-lite"
11
+ json "github.com/aperturerobotics/protobuf-go-lite/json"
11
12
  errors "github.com/pkg/errors"
12
13
  )
13
14
 
@@ -424,6 +425,212 @@ func (this *CallData) EqualMessageVT(thatMsg any) bool {
424
425
  }
425
426
  return this.EqualVT(that)
426
427
  }
428
+
429
+ // MarshalProtoJSON marshals the Packet message to JSON.
430
+ func (x *Packet) MarshalProtoJSON(s *json.MarshalState) {
431
+ if x == nil {
432
+ s.WriteNil()
433
+ return
434
+ }
435
+ s.WriteObjectStart()
436
+ var wroteField bool
437
+ if x.Body != nil {
438
+ switch ov := x.Body.(type) {
439
+ case *Packet_CallStart:
440
+ s.WriteMoreIf(&wroteField)
441
+ s.WriteObjectField("call_start")
442
+ ov.CallStart.MarshalProtoJSON(s.WithField("call_start"))
443
+ case *Packet_CallData:
444
+ s.WriteMoreIf(&wroteField)
445
+ s.WriteObjectField("call_data")
446
+ ov.CallData.MarshalProtoJSON(s.WithField("call_data"))
447
+ case *Packet_CallCancel:
448
+ s.WriteMoreIf(&wroteField)
449
+ s.WriteObjectField("call_cancel")
450
+ s.WriteBool(ov.CallCancel)
451
+ }
452
+ }
453
+ s.WriteObjectEnd()
454
+ }
455
+
456
+ // MarshalJSON marshals the Packet to JSON.
457
+ func (x *Packet) MarshalJSON() ([]byte, error) {
458
+ return json.DefaultMarshalerConfig.Marshal(x)
459
+ }
460
+
461
+ // UnmarshalProtoJSON unmarshals the Packet message from JSON.
462
+ func (x *Packet) UnmarshalProtoJSON(s *json.UnmarshalState) {
463
+ if s.ReadNil() {
464
+ return
465
+ }
466
+ s.ReadObject(func(key string) {
467
+ switch key {
468
+ default:
469
+ s.ReadAny() // ignore unknown field
470
+ case "call_start", "callStart":
471
+ ov := &Packet_CallStart{}
472
+ x.Body = ov
473
+ if s.ReadNil() {
474
+ ov.CallStart = nil
475
+ return
476
+ }
477
+ ov.CallStart = &CallStart{}
478
+ ov.CallStart.UnmarshalProtoJSON(s.WithField("call_start", true))
479
+ case "call_data", "callData":
480
+ ov := &Packet_CallData{}
481
+ x.Body = ov
482
+ if s.ReadNil() {
483
+ ov.CallData = nil
484
+ return
485
+ }
486
+ ov.CallData = &CallData{}
487
+ ov.CallData.UnmarshalProtoJSON(s.WithField("call_data", true))
488
+ case "call_cancel", "callCancel":
489
+ s.AddField("call_cancel")
490
+ ov := &Packet_CallCancel{}
491
+ x.Body = ov
492
+ ov.CallCancel = s.ReadBool()
493
+ }
494
+ })
495
+ }
496
+
497
+ // UnmarshalJSON unmarshals the Packet from JSON.
498
+ func (x *Packet) UnmarshalJSON(b []byte) error {
499
+ return json.DefaultUnmarshalerConfig.Unmarshal(b, x)
500
+ }
501
+
502
+ // MarshalProtoJSON marshals the CallStart message to JSON.
503
+ func (x *CallStart) MarshalProtoJSON(s *json.MarshalState) {
504
+ if x == nil {
505
+ s.WriteNil()
506
+ return
507
+ }
508
+ s.WriteObjectStart()
509
+ var wroteField bool
510
+ if x.RpcService != "" || s.HasField("rpc_service") {
511
+ s.WriteMoreIf(&wroteField)
512
+ s.WriteObjectField("rpc_service")
513
+ s.WriteString(x.RpcService)
514
+ }
515
+ if x.RpcMethod != "" || s.HasField("rpc_method") {
516
+ s.WriteMoreIf(&wroteField)
517
+ s.WriteObjectField("rpc_method")
518
+ s.WriteString(x.RpcMethod)
519
+ }
520
+ if len(x.Data) > 0 || s.HasField("data") {
521
+ s.WriteMoreIf(&wroteField)
522
+ s.WriteObjectField("data")
523
+ s.WriteBytes(x.Data)
524
+ }
525
+ if x.DataIsZero || s.HasField("data_is_zero") {
526
+ s.WriteMoreIf(&wroteField)
527
+ s.WriteObjectField("data_is_zero")
528
+ s.WriteBool(x.DataIsZero)
529
+ }
530
+ s.WriteObjectEnd()
531
+ }
532
+
533
+ // MarshalJSON marshals the CallStart to JSON.
534
+ func (x *CallStart) MarshalJSON() ([]byte, error) {
535
+ return json.DefaultMarshalerConfig.Marshal(x)
536
+ }
537
+
538
+ // UnmarshalProtoJSON unmarshals the CallStart message from JSON.
539
+ func (x *CallStart) UnmarshalProtoJSON(s *json.UnmarshalState) {
540
+ if s.ReadNil() {
541
+ return
542
+ }
543
+ s.ReadObject(func(key string) {
544
+ switch key {
545
+ default:
546
+ s.ReadAny() // ignore unknown field
547
+ case "rpc_service", "rpcService":
548
+ s.AddField("rpc_service")
549
+ x.RpcService = s.ReadString()
550
+ case "rpc_method", "rpcMethod":
551
+ s.AddField("rpc_method")
552
+ x.RpcMethod = s.ReadString()
553
+ case "data":
554
+ s.AddField("data")
555
+ x.Data = s.ReadBytes()
556
+ case "data_is_zero", "dataIsZero":
557
+ s.AddField("data_is_zero")
558
+ x.DataIsZero = s.ReadBool()
559
+ }
560
+ })
561
+ }
562
+
563
+ // UnmarshalJSON unmarshals the CallStart from JSON.
564
+ func (x *CallStart) UnmarshalJSON(b []byte) error {
565
+ return json.DefaultUnmarshalerConfig.Unmarshal(b, x)
566
+ }
567
+
568
+ // MarshalProtoJSON marshals the CallData message to JSON.
569
+ func (x *CallData) MarshalProtoJSON(s *json.MarshalState) {
570
+ if x == nil {
571
+ s.WriteNil()
572
+ return
573
+ }
574
+ s.WriteObjectStart()
575
+ var wroteField bool
576
+ if len(x.Data) > 0 || s.HasField("data") {
577
+ s.WriteMoreIf(&wroteField)
578
+ s.WriteObjectField("data")
579
+ s.WriteBytes(x.Data)
580
+ }
581
+ if x.DataIsZero || s.HasField("data_is_zero") {
582
+ s.WriteMoreIf(&wroteField)
583
+ s.WriteObjectField("data_is_zero")
584
+ s.WriteBool(x.DataIsZero)
585
+ }
586
+ if x.Complete || s.HasField("complete") {
587
+ s.WriteMoreIf(&wroteField)
588
+ s.WriteObjectField("complete")
589
+ s.WriteBool(x.Complete)
590
+ }
591
+ if x.Error != "" || s.HasField("error") {
592
+ s.WriteMoreIf(&wroteField)
593
+ s.WriteObjectField("error")
594
+ s.WriteString(x.Error)
595
+ }
596
+ s.WriteObjectEnd()
597
+ }
598
+
599
+ // MarshalJSON marshals the CallData to JSON.
600
+ func (x *CallData) MarshalJSON() ([]byte, error) {
601
+ return json.DefaultMarshalerConfig.Marshal(x)
602
+ }
603
+
604
+ // UnmarshalProtoJSON unmarshals the CallData message from JSON.
605
+ func (x *CallData) UnmarshalProtoJSON(s *json.UnmarshalState) {
606
+ if s.ReadNil() {
607
+ return
608
+ }
609
+ s.ReadObject(func(key string) {
610
+ switch key {
611
+ default:
612
+ s.ReadAny() // ignore unknown field
613
+ case "data":
614
+ s.AddField("data")
615
+ x.Data = s.ReadBytes()
616
+ case "data_is_zero", "dataIsZero":
617
+ s.AddField("data_is_zero")
618
+ x.DataIsZero = s.ReadBool()
619
+ case "complete":
620
+ s.AddField("complete")
621
+ x.Complete = s.ReadBool()
622
+ case "error":
623
+ s.AddField("error")
624
+ x.Error = s.ReadString()
625
+ }
626
+ })
627
+ }
628
+
629
+ // UnmarshalJSON unmarshals the CallData from JSON.
630
+ func (x *CallData) UnmarshalJSON(b []byte) error {
631
+ return json.DefaultUnmarshalerConfig.Unmarshal(b, x)
632
+ }
633
+
427
634
  func (m *Packet) MarshalVT() (dAtA []byte, err error) {
428
635
  if m == nil {
429
636
  return nil, nil
@@ -479,11 +686,11 @@ func (m *Packet_CallStart) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
479
686
  return 0, err
480
687
  }
481
688
  i -= size
482
- i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
689
+ i = protobuf_go_lite.EncodeVarint(dAtA, i, uint64(size))
483
690
  i--
484
691
  dAtA[i] = 0xa
485
692
  } else {
486
- i = protohelpers.EncodeVarint(dAtA, i, 0)
693
+ i = protobuf_go_lite.EncodeVarint(dAtA, i, 0)
487
694
  i--
488
695
  dAtA[i] = 0xa
489
696
  }
@@ -502,11 +709,11 @@ func (m *Packet_CallData) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
502
709
  return 0, err
503
710
  }
504
711
  i -= size
505
- i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
712
+ i = protobuf_go_lite.EncodeVarint(dAtA, i, uint64(size))
506
713
  i--
507
714
  dAtA[i] = 0x12
508
715
  } else {
509
- i = protohelpers.EncodeVarint(dAtA, i, 0)
716
+ i = protobuf_go_lite.EncodeVarint(dAtA, i, 0)
510
717
  i--
511
718
  dAtA[i] = 0x12
512
719
  }
@@ -572,21 +779,21 @@ func (m *CallStart) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
572
779
  if len(m.Data) > 0 {
573
780
  i -= len(m.Data)
574
781
  copy(dAtA[i:], m.Data)
575
- i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.Data)))
782
+ i = protobuf_go_lite.EncodeVarint(dAtA, i, uint64(len(m.Data)))
576
783
  i--
577
784
  dAtA[i] = 0x1a
578
785
  }
579
786
  if len(m.RpcMethod) > 0 {
580
787
  i -= len(m.RpcMethod)
581
788
  copy(dAtA[i:], m.RpcMethod)
582
- i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.RpcMethod)))
789
+ i = protobuf_go_lite.EncodeVarint(dAtA, i, uint64(len(m.RpcMethod)))
583
790
  i--
584
791
  dAtA[i] = 0x12
585
792
  }
586
793
  if len(m.RpcService) > 0 {
587
794
  i -= len(m.RpcService)
588
795
  copy(dAtA[i:], m.RpcService)
589
- i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.RpcService)))
796
+ i = protobuf_go_lite.EncodeVarint(dAtA, i, uint64(len(m.RpcService)))
590
797
  i--
591
798
  dAtA[i] = 0xa
592
799
  }
@@ -626,7 +833,7 @@ func (m *CallData) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
626
833
  if len(m.Error) > 0 {
627
834
  i -= len(m.Error)
628
835
  copy(dAtA[i:], m.Error)
629
- i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.Error)))
836
+ i = protobuf_go_lite.EncodeVarint(dAtA, i, uint64(len(m.Error)))
630
837
  i--
631
838
  dAtA[i] = 0x22
632
839
  }
@@ -653,7 +860,7 @@ func (m *CallData) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
653
860
  if len(m.Data) > 0 {
654
861
  i -= len(m.Data)
655
862
  copy(dAtA[i:], m.Data)
656
- i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.Data)))
863
+ i = protobuf_go_lite.EncodeVarint(dAtA, i, uint64(len(m.Data)))
657
864
  i--
658
865
  dAtA[i] = 0xa
659
866
  }
@@ -681,7 +888,7 @@ func (m *Packet_CallStart) SizeVT() (n int) {
681
888
  _ = l
682
889
  if m.CallStart != nil {
683
890
  l = m.CallStart.SizeVT()
684
- n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
891
+ n += 1 + l + protobuf_go_lite.SizeOfVarint(uint64(l))
685
892
  } else {
686
893
  n += 2
687
894
  }
@@ -695,7 +902,7 @@ func (m *Packet_CallData) SizeVT() (n int) {
695
902
  _ = l
696
903
  if m.CallData != nil {
697
904
  l = m.CallData.SizeVT()
698
- n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
905
+ n += 1 + l + protobuf_go_lite.SizeOfVarint(uint64(l))
699
906
  } else {
700
907
  n += 2
701
908
  }
@@ -718,15 +925,15 @@ func (m *CallStart) SizeVT() (n int) {
718
925
  _ = l
719
926
  l = len(m.RpcService)
720
927
  if l > 0 {
721
- n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
928
+ n += 1 + l + protobuf_go_lite.SizeOfVarint(uint64(l))
722
929
  }
723
930
  l = len(m.RpcMethod)
724
931
  if l > 0 {
725
- n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
932
+ n += 1 + l + protobuf_go_lite.SizeOfVarint(uint64(l))
726
933
  }
727
934
  l = len(m.Data)
728
935
  if l > 0 {
729
- n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
936
+ n += 1 + l + protobuf_go_lite.SizeOfVarint(uint64(l))
730
937
  }
731
938
  if m.DataIsZero {
732
939
  n += 2
@@ -743,7 +950,7 @@ func (m *CallData) SizeVT() (n int) {
743
950
  _ = l
744
951
  l = len(m.Data)
745
952
  if l > 0 {
746
- n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
953
+ n += 1 + l + protobuf_go_lite.SizeOfVarint(uint64(l))
747
954
  }
748
955
  if m.DataIsZero {
749
956
  n += 2
@@ -753,7 +960,7 @@ func (m *CallData) SizeVT() (n int) {
753
960
  }
754
961
  l = len(m.Error)
755
962
  if l > 0 {
756
- n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
963
+ n += 1 + l + protobuf_go_lite.SizeOfVarint(uint64(l))
757
964
  }
758
965
  n += len(m.unknownFields)
759
966
  return n
@@ -767,7 +974,7 @@ func (m *Packet) UnmarshalVT(dAtA []byte) error {
767
974
  var wire uint64
768
975
  for shift := uint(0); ; shift += 7 {
769
976
  if shift >= 64 {
770
- return protohelpers.ErrIntOverflow
977
+ return protobuf_go_lite.ErrIntOverflow
771
978
  }
772
979
  if iNdEx >= l {
773
980
  return io.ErrUnexpectedEOF
@@ -795,7 +1002,7 @@ func (m *Packet) UnmarshalVT(dAtA []byte) error {
795
1002
  var msglen int
796
1003
  for shift := uint(0); ; shift += 7 {
797
1004
  if shift >= 64 {
798
- return protohelpers.ErrIntOverflow
1005
+ return protobuf_go_lite.ErrIntOverflow
799
1006
  }
800
1007
  if iNdEx >= l {
801
1008
  return io.ErrUnexpectedEOF
@@ -808,11 +1015,11 @@ func (m *Packet) UnmarshalVT(dAtA []byte) error {
808
1015
  }
809
1016
  }
810
1017
  if msglen < 0 {
811
- return protohelpers.ErrInvalidLength
1018
+ return protobuf_go_lite.ErrInvalidLength
812
1019
  }
813
1020
  postIndex := iNdEx + msglen
814
1021
  if postIndex < 0 {
815
- return protohelpers.ErrInvalidLength
1022
+ return protobuf_go_lite.ErrInvalidLength
816
1023
  }
817
1024
  if postIndex > l {
818
1025
  return io.ErrUnexpectedEOF
@@ -836,7 +1043,7 @@ func (m *Packet) UnmarshalVT(dAtA []byte) error {
836
1043
  var msglen int
837
1044
  for shift := uint(0); ; shift += 7 {
838
1045
  if shift >= 64 {
839
- return protohelpers.ErrIntOverflow
1046
+ return protobuf_go_lite.ErrIntOverflow
840
1047
  }
841
1048
  if iNdEx >= l {
842
1049
  return io.ErrUnexpectedEOF
@@ -849,11 +1056,11 @@ func (m *Packet) UnmarshalVT(dAtA []byte) error {
849
1056
  }
850
1057
  }
851
1058
  if msglen < 0 {
852
- return protohelpers.ErrInvalidLength
1059
+ return protobuf_go_lite.ErrInvalidLength
853
1060
  }
854
1061
  postIndex := iNdEx + msglen
855
1062
  if postIndex < 0 {
856
- return protohelpers.ErrInvalidLength
1063
+ return protobuf_go_lite.ErrInvalidLength
857
1064
  }
858
1065
  if postIndex > l {
859
1066
  return io.ErrUnexpectedEOF
@@ -877,7 +1084,7 @@ func (m *Packet) UnmarshalVT(dAtA []byte) error {
877
1084
  var v int
878
1085
  for shift := uint(0); ; shift += 7 {
879
1086
  if shift >= 64 {
880
- return protohelpers.ErrIntOverflow
1087
+ return protobuf_go_lite.ErrIntOverflow
881
1088
  }
882
1089
  if iNdEx >= l {
883
1090
  return io.ErrUnexpectedEOF
@@ -893,12 +1100,12 @@ func (m *Packet) UnmarshalVT(dAtA []byte) error {
893
1100
  m.Body = &Packet_CallCancel{CallCancel: b}
894
1101
  default:
895
1102
  iNdEx = preIndex
896
- skippy, err := protohelpers.Skip(dAtA[iNdEx:])
1103
+ skippy, err := protobuf_go_lite.Skip(dAtA[iNdEx:])
897
1104
  if err != nil {
898
1105
  return err
899
1106
  }
900
1107
  if (skippy < 0) || (iNdEx+skippy) < 0 {
901
- return protohelpers.ErrInvalidLength
1108
+ return protobuf_go_lite.ErrInvalidLength
902
1109
  }
903
1110
  if (iNdEx + skippy) > l {
904
1111
  return io.ErrUnexpectedEOF
@@ -921,7 +1128,7 @@ func (m *CallStart) UnmarshalVT(dAtA []byte) error {
921
1128
  var wire uint64
922
1129
  for shift := uint(0); ; shift += 7 {
923
1130
  if shift >= 64 {
924
- return protohelpers.ErrIntOverflow
1131
+ return protobuf_go_lite.ErrIntOverflow
925
1132
  }
926
1133
  if iNdEx >= l {
927
1134
  return io.ErrUnexpectedEOF
@@ -949,7 +1156,7 @@ func (m *CallStart) UnmarshalVT(dAtA []byte) error {
949
1156
  var stringLen uint64
950
1157
  for shift := uint(0); ; shift += 7 {
951
1158
  if shift >= 64 {
952
- return protohelpers.ErrIntOverflow
1159
+ return protobuf_go_lite.ErrIntOverflow
953
1160
  }
954
1161
  if iNdEx >= l {
955
1162
  return io.ErrUnexpectedEOF
@@ -963,11 +1170,11 @@ func (m *CallStart) UnmarshalVT(dAtA []byte) error {
963
1170
  }
964
1171
  intStringLen := int(stringLen)
965
1172
  if intStringLen < 0 {
966
- return protohelpers.ErrInvalidLength
1173
+ return protobuf_go_lite.ErrInvalidLength
967
1174
  }
968
1175
  postIndex := iNdEx + intStringLen
969
1176
  if postIndex < 0 {
970
- return protohelpers.ErrInvalidLength
1177
+ return protobuf_go_lite.ErrInvalidLength
971
1178
  }
972
1179
  if postIndex > l {
973
1180
  return io.ErrUnexpectedEOF
@@ -981,7 +1188,7 @@ func (m *CallStart) UnmarshalVT(dAtA []byte) error {
981
1188
  var stringLen uint64
982
1189
  for shift := uint(0); ; shift += 7 {
983
1190
  if shift >= 64 {
984
- return protohelpers.ErrIntOverflow
1191
+ return protobuf_go_lite.ErrIntOverflow
985
1192
  }
986
1193
  if iNdEx >= l {
987
1194
  return io.ErrUnexpectedEOF
@@ -995,11 +1202,11 @@ func (m *CallStart) UnmarshalVT(dAtA []byte) error {
995
1202
  }
996
1203
  intStringLen := int(stringLen)
997
1204
  if intStringLen < 0 {
998
- return protohelpers.ErrInvalidLength
1205
+ return protobuf_go_lite.ErrInvalidLength
999
1206
  }
1000
1207
  postIndex := iNdEx + intStringLen
1001
1208
  if postIndex < 0 {
1002
- return protohelpers.ErrInvalidLength
1209
+ return protobuf_go_lite.ErrInvalidLength
1003
1210
  }
1004
1211
  if postIndex > l {
1005
1212
  return io.ErrUnexpectedEOF
@@ -1013,7 +1220,7 @@ func (m *CallStart) UnmarshalVT(dAtA []byte) error {
1013
1220
  var byteLen int
1014
1221
  for shift := uint(0); ; shift += 7 {
1015
1222
  if shift >= 64 {
1016
- return protohelpers.ErrIntOverflow
1223
+ return protobuf_go_lite.ErrIntOverflow
1017
1224
  }
1018
1225
  if iNdEx >= l {
1019
1226
  return io.ErrUnexpectedEOF
@@ -1026,11 +1233,11 @@ func (m *CallStart) UnmarshalVT(dAtA []byte) error {
1026
1233
  }
1027
1234
  }
1028
1235
  if byteLen < 0 {
1029
- return protohelpers.ErrInvalidLength
1236
+ return protobuf_go_lite.ErrInvalidLength
1030
1237
  }
1031
1238
  postIndex := iNdEx + byteLen
1032
1239
  if postIndex < 0 {
1033
- return protohelpers.ErrInvalidLength
1240
+ return protobuf_go_lite.ErrInvalidLength
1034
1241
  }
1035
1242
  if postIndex > l {
1036
1243
  return io.ErrUnexpectedEOF
@@ -1047,7 +1254,7 @@ func (m *CallStart) UnmarshalVT(dAtA []byte) error {
1047
1254
  var v int
1048
1255
  for shift := uint(0); ; shift += 7 {
1049
1256
  if shift >= 64 {
1050
- return protohelpers.ErrIntOverflow
1257
+ return protobuf_go_lite.ErrIntOverflow
1051
1258
  }
1052
1259
  if iNdEx >= l {
1053
1260
  return io.ErrUnexpectedEOF
@@ -1062,12 +1269,12 @@ func (m *CallStart) UnmarshalVT(dAtA []byte) error {
1062
1269
  m.DataIsZero = bool(v != 0)
1063
1270
  default:
1064
1271
  iNdEx = preIndex
1065
- skippy, err := protohelpers.Skip(dAtA[iNdEx:])
1272
+ skippy, err := protobuf_go_lite.Skip(dAtA[iNdEx:])
1066
1273
  if err != nil {
1067
1274
  return err
1068
1275
  }
1069
1276
  if (skippy < 0) || (iNdEx+skippy) < 0 {
1070
- return protohelpers.ErrInvalidLength
1277
+ return protobuf_go_lite.ErrInvalidLength
1071
1278
  }
1072
1279
  if (iNdEx + skippy) > l {
1073
1280
  return io.ErrUnexpectedEOF
@@ -1090,7 +1297,7 @@ func (m *CallData) UnmarshalVT(dAtA []byte) error {
1090
1297
  var wire uint64
1091
1298
  for shift := uint(0); ; shift += 7 {
1092
1299
  if shift >= 64 {
1093
- return protohelpers.ErrIntOverflow
1300
+ return protobuf_go_lite.ErrIntOverflow
1094
1301
  }
1095
1302
  if iNdEx >= l {
1096
1303
  return io.ErrUnexpectedEOF
@@ -1118,7 +1325,7 @@ func (m *CallData) UnmarshalVT(dAtA []byte) error {
1118
1325
  var byteLen int
1119
1326
  for shift := uint(0); ; shift += 7 {
1120
1327
  if shift >= 64 {
1121
- return protohelpers.ErrIntOverflow
1328
+ return protobuf_go_lite.ErrIntOverflow
1122
1329
  }
1123
1330
  if iNdEx >= l {
1124
1331
  return io.ErrUnexpectedEOF
@@ -1131,11 +1338,11 @@ func (m *CallData) UnmarshalVT(dAtA []byte) error {
1131
1338
  }
1132
1339
  }
1133
1340
  if byteLen < 0 {
1134
- return protohelpers.ErrInvalidLength
1341
+ return protobuf_go_lite.ErrInvalidLength
1135
1342
  }
1136
1343
  postIndex := iNdEx + byteLen
1137
1344
  if postIndex < 0 {
1138
- return protohelpers.ErrInvalidLength
1345
+ return protobuf_go_lite.ErrInvalidLength
1139
1346
  }
1140
1347
  if postIndex > l {
1141
1348
  return io.ErrUnexpectedEOF
@@ -1152,7 +1359,7 @@ func (m *CallData) UnmarshalVT(dAtA []byte) error {
1152
1359
  var v int
1153
1360
  for shift := uint(0); ; shift += 7 {
1154
1361
  if shift >= 64 {
1155
- return protohelpers.ErrIntOverflow
1362
+ return protobuf_go_lite.ErrIntOverflow
1156
1363
  }
1157
1364
  if iNdEx >= l {
1158
1365
  return io.ErrUnexpectedEOF
@@ -1172,7 +1379,7 @@ func (m *CallData) UnmarshalVT(dAtA []byte) error {
1172
1379
  var v int
1173
1380
  for shift := uint(0); ; shift += 7 {
1174
1381
  if shift >= 64 {
1175
- return protohelpers.ErrIntOverflow
1382
+ return protobuf_go_lite.ErrIntOverflow
1176
1383
  }
1177
1384
  if iNdEx >= l {
1178
1385
  return io.ErrUnexpectedEOF
@@ -1192,7 +1399,7 @@ func (m *CallData) UnmarshalVT(dAtA []byte) error {
1192
1399
  var stringLen uint64
1193
1400
  for shift := uint(0); ; shift += 7 {
1194
1401
  if shift >= 64 {
1195
- return protohelpers.ErrIntOverflow
1402
+ return protobuf_go_lite.ErrIntOverflow
1196
1403
  }
1197
1404
  if iNdEx >= l {
1198
1405
  return io.ErrUnexpectedEOF
@@ -1206,11 +1413,11 @@ func (m *CallData) UnmarshalVT(dAtA []byte) error {
1206
1413
  }
1207
1414
  intStringLen := int(stringLen)
1208
1415
  if intStringLen < 0 {
1209
- return protohelpers.ErrInvalidLength
1416
+ return protobuf_go_lite.ErrInvalidLength
1210
1417
  }
1211
1418
  postIndex := iNdEx + intStringLen
1212
1419
  if postIndex < 0 {
1213
- return protohelpers.ErrInvalidLength
1420
+ return protobuf_go_lite.ErrInvalidLength
1214
1421
  }
1215
1422
  if postIndex > l {
1216
1423
  return io.ErrUnexpectedEOF
@@ -1219,12 +1426,12 @@ func (m *CallData) UnmarshalVT(dAtA []byte) error {
1219
1426
  iNdEx = postIndex
1220
1427
  default:
1221
1428
  iNdEx = preIndex
1222
- skippy, err := protohelpers.Skip(dAtA[iNdEx:])
1429
+ skippy, err := protobuf_go_lite.Skip(dAtA[iNdEx:])
1223
1430
  if err != nil {
1224
1431
  return err
1225
1432
  }
1226
1433
  if (skippy < 0) || (iNdEx+skippy) < 0 {
1227
- return protohelpers.ErrInvalidLength
1434
+ return protobuf_go_lite.ErrInvalidLength
1228
1435
  }
1229
1436
  if (iNdEx + skippy) > l {
1230
1437
  return io.ErrUnexpectedEOF
package/integration/integration_srpc.pb.go DELETED
@@ -1,139 +0,0 @@
1
- // Code generated by protoc-gen-srpc. DO NOT EDIT.
2
- // protoc-gen-srpc version: v0.0.0-20220611014014-aa9dc5523865
3
- // source: github.com/aperturerobotics/starpc/integration/integration.proto
4
-
5
- package main
6
-
7
- import (
8
- context "context"
9
-
10
- rpcstream "github.com/aperturerobotics/starpc/rpcstream"
11
- srpc "github.com/aperturerobotics/starpc/srpc"
12
- )
13
-
14
- type SRPCIntegrationServiceClient interface {
15
- SRPCClient() srpc.Client
16
-
17
- RpcStream(ctx context.Context) (SRPCIntegrationService_RpcStreamClient, error)
18
- }
19
-
20
- type srpcIntegrationServiceClient struct {
21
- cc srpc.Client
22
- }
23
-
24
- func NewSRPCIntegrationServiceClient(cc srpc.Client) SRPCIntegrationServiceClient {
25
- return &srpcIntegrationServiceClient{cc}
26
- }
27
-
28
- func (c *srpcIntegrationServiceClient) SRPCClient() srpc.Client { return c.cc }
29
-
30
- func (c *srpcIntegrationServiceClient) RpcStream(ctx context.Context) (SRPCIntegrationService_RpcStreamClient, error) {
31
- stream, err := c.cc.NewStream(ctx, "main.IntegrationService", "RpcStream", nil)
32
- if err != nil {
33
- return nil, err
34
- }
35
- strm := &srpcIntegrationService_RpcStreamClient{stream}
36
- return strm, nil
37
- }
38
-
39
- type SRPCIntegrationService_RpcStreamClient interface {
40
- srpc.Stream
41
- Send(*rpcstream.RpcStreamPacket) error
42
- Recv() (*rpcstream.RpcStreamPacket, error)
43
- RecvTo(*rpcstream.RpcStreamPacket) error
44
- }
45
-
46
- type srpcIntegrationService_RpcStreamClient struct {
47
- srpc.Stream
48
- }
49
-
50
- func (x *srpcIntegrationService_RpcStreamClient) Send(m *rpcstream.RpcStreamPacket) error {
51
- return x.MsgSend(m)
52
- }
53
-
54
- func (x *srpcIntegrationService_RpcStreamClient) Recv() (*rpcstream.RpcStreamPacket, error) {
55
- m := new(rpcstream.RpcStreamPacket)
56
- if err := x.MsgRecv(m); err != nil {
57
- return nil, err
58
- }
59
- return m, nil
60
- }
61
-
62
- func (x *srpcIntegrationService_RpcStreamClient) RecvTo(m *rpcstream.RpcStreamPacket) error {
63
- return x.MsgRecv(m)
64
- }
65
-
66
- type SRPCIntegrationServiceServer interface {
67
- RpcStream(SRPCIntegrationService_RpcStreamStream) error
68
- }
69
-
70
- type SRPCIntegrationServiceUnimplementedServer struct{}
71
-
72
- func (s *SRPCIntegrationServiceUnimplementedServer) RpcStream(SRPCIntegrationService_RpcStreamStream) error {
73
- return srpc.ErrUnimplemented
74
- }
75
-
76
- const SRPCIntegrationServiceServiceID = "main.IntegrationService"
77
-
78
- type SRPCIntegrationServiceHandler struct {
79
- impl SRPCIntegrationServiceServer
80
- }
81
-
82
- func (SRPCIntegrationServiceHandler) GetServiceID() string { return SRPCIntegrationServiceServiceID }
83
-
84
- func (SRPCIntegrationServiceHandler) GetMethodIDs() []string {
85
- return []string{
86
- "RpcStream",
87
- }
88
- }
89
-
90
- func (d *SRPCIntegrationServiceHandler) InvokeMethod(
91
- serviceID, methodID string,
92
- strm srpc.Stream,
93
- ) (bool, error) {
94
- if serviceID != "" && serviceID != d.GetServiceID() {
95
- return false, nil
96
- }
97
-
98
- switch methodID {
99
- case "RpcStream":
100
- return true, d.InvokeMethod_RpcStream(d.impl, strm)
101
- default:
102
- return false, nil
103
- }
104
- }
105
-
106
- func (SRPCIntegrationServiceHandler) InvokeMethod_RpcStream(impl SRPCIntegrationServiceServer, strm srpc.Stream) error {
107
- clientStrm := &srpcIntegrationService_RpcStreamStream{strm}
108
- return impl.RpcStream(clientStrm)
109
- }
110
-
111
- func SRPCRegisterIntegrationService(mux srpc.Mux, impl SRPCIntegrationServiceServer) error {
112
- return mux.Register(&SRPCIntegrationServiceHandler{impl: impl})
113
- }
114
-
115
- type SRPCIntegrationService_RpcStreamStream interface {
116
- srpc.Stream
117
- Send(*rpcstream.RpcStreamPacket) error
118
- Recv() (*rpcstream.RpcStreamPacket, error)
119
- }
120
-
121
- type srpcIntegrationService_RpcStreamStream struct {
122
- srpc.Stream
123
- }
124
-
125
- func (x *srpcIntegrationService_RpcStreamStream) Send(m *rpcstream.RpcStreamPacket) error {
126
- return x.MsgSend(m)
127
- }
128
-
129
- func (x *srpcIntegrationService_RpcStreamStream) Recv() (*rpcstream.RpcStreamPacket, error) {
130
- m := new(rpcstream.RpcStreamPacket)
131
- if err := x.MsgRecv(m); err != nil {
132
- return nil, err
133
- }
134
- return m, nil
135
- }
136
-
137
- func (x *srpcIntegrationService_RpcStreamStream) RecvTo(m *rpcstream.RpcStreamPacket) error {
138
- return x.MsgRecv(m)
139
- }