starpc 0.30.0 → 0.30.1

package/e2e/mock/mock.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-lite. DO NOT EDIT.
-// protoc-gen-go-lite version: v0.3.1
+// protoc-gen-go-lite version: v0.4.1
 // source: github.com/aperturerobotics/starpc/e2e/mock/mock.proto
 
 package e2e_mock
@@ -89,6 +89,27 @@ func (x *MockMsg) MarshalJSON() ([]byte, error) {
 	return json.DefaultMarshalerConfig.Marshal(x)
 }
 
+// UnmarshalProtoJSON unmarshals the MockMsg message from JSON.
+func (x *MockMsg) UnmarshalProtoJSON(s *json.UnmarshalState) {
+	if s.ReadNil() {
+		return
+	}
+	s.ReadObject(func(key string) {
+		switch key {
+		default:
+			s.ReadAny() // ignore unknown field
+		case "body":
+			s.AddField("body")
+			x.Body = s.ReadString()
+		}
+	})
+}
+
+// UnmarshalJSON unmarshals the MockMsg from JSON.
+func (x *MockMsg) UnmarshalJSON(b []byte) error {
+	return json.DefaultUnmarshalerConfig.Unmarshal(b, x)
+}
+
 func (m *MockMsg) MarshalVT() (dAtA []byte, err error) {
 	if m == nil {
 		return nil, nil

package/echo/echo.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-lite. DO NOT EDIT.
-// protoc-gen-go-lite version: v0.3.1
+// protoc-gen-go-lite version: v0.4.1
 // source: github.com/aperturerobotics/starpc/echo/echo.proto
 
 package echo
@@ -90,6 +90,27 @@ func (x *EchoMsg) MarshalJSON() ([]byte, error) {
 	return json.DefaultMarshalerConfig.Marshal(x)
 }
 
+// UnmarshalProtoJSON unmarshals the EchoMsg message from JSON.
+func (x *EchoMsg) UnmarshalProtoJSON(s *json.UnmarshalState) {
+	if s.ReadNil() {
+		return
+	}
+	s.ReadObject(func(key string) {
+		switch key {
+		default:
+			s.ReadAny() // ignore unknown field
+		case "body":
+			s.AddField("body")
+			x.Body = s.ReadString()
+		}
+	})
+}
+
+// UnmarshalJSON unmarshals the EchoMsg from JSON.
+func (x *EchoMsg) UnmarshalJSON(b []byte) error {
+	return json.DefaultUnmarshalerConfig.Unmarshal(b, x)
+}
+
 func (m *EchoMsg) MarshalVT() (dAtA []byte, err error) {
 	if m == nil {
 		return nil, nil

package/go.mod

@@ -3,7 +3,7 @@ module github.com/aperturerobotics/starpc
 go 1.22
 
 require (
-	github.com/aperturerobotics/protobuf-go-lite v0.3.1 // latest
+	github.com/aperturerobotics/protobuf-go-lite v0.4.1 // latest
 	github.com/aperturerobotics/util v1.17.0 // latest
 )
 

package/go.sum

@@ -1,5 +1,5 @@
-github.com/aperturerobotics/protobuf-go-lite v0.3.1 h1:6A1y0dsrRGNj26xG5ohy6nheSeZAt6GApIGo02dA91k=
-github.com/aperturerobotics/protobuf-go-lite v0.3.1/go.mod h1:wRZn4YydbTn8Bdx4NB6ms0doF19llgim+0SNBvQ7M9c=
+github.com/aperturerobotics/protobuf-go-lite v0.4.1 h1:jd+DhFlf/f+L5gJPDCFrezBcaydCaxt5Keg0IJzJvOU=
+github.com/aperturerobotics/protobuf-go-lite v0.4.1/go.mod h1:wRZn4YydbTn8Bdx4NB6ms0doF19llgim+0SNBvQ7M9c=
 github.com/aperturerobotics/util v1.17.0 h1:eN9/NVXpf51OZQ4ERgGar/49kL1Pl8puW1MIYiYlA/8=
 github.com/aperturerobotics/util v1.17.0/go.mod h1:YAWPti3PGLd1vagad3uMa3OfOLKo0rMXv80UJJPT0NA=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.30.0",
+  "version": "0.30.1",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -64,7 +64,7 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@aperturerobotics/ts-common": "^0.10.0",
+    "@aperturerobotics/ts-common": "^0.10.2",
     "bufferutil": "^4.0.7",
     "depcheck": "^1.4.6",
     "esbuild": "^0.20.0",

package/srpc/rpcproto.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-lite. DO NOT EDIT.
-// protoc-gen-go-lite version: v0.3.1
+// protoc-gen-go-lite version: v0.4.1
 // source: github.com/aperturerobotics/starpc/srpc/rpcproto.proto
 
 package srpc
@@ -458,6 +458,47 @@ func (x *Packet) MarshalJSON() ([]byte, error) {
 	return json.DefaultMarshalerConfig.Marshal(x)
 }
 
+// UnmarshalProtoJSON unmarshals the Packet message from JSON.
+func (x *Packet) UnmarshalProtoJSON(s *json.UnmarshalState) {
+	if s.ReadNil() {
+		return
+	}
+	s.ReadObject(func(key string) {
+		switch key {
+		default:
+			s.ReadAny() // ignore unknown field
+		case "call_start", "callStart":
+			ov := &Packet_CallStart{}
+			x.Body = ov
+			if s.ReadNil() {
+				ov.CallStart = nil
+				return
+			}
+			ov.CallStart = &CallStart{}
+			ov.CallStart.UnmarshalProtoJSON(s.WithField("call_start", true))
+		case "call_data", "callData":
+			ov := &Packet_CallData{}
+			x.Body = ov
+			if s.ReadNil() {
+				ov.CallData = nil
+				return
+			}
+			ov.CallData = &CallData{}
+			ov.CallData.UnmarshalProtoJSON(s.WithField("call_data", true))
+		case "call_cancel", "callCancel":
+			s.AddField("call_cancel")
+			ov := &Packet_CallCancel{}
+			x.Body = ov
+			ov.CallCancel = s.ReadBool()
+		}
+	})
+}
+
+// UnmarshalJSON unmarshals the Packet from JSON.
+func (x *Packet) UnmarshalJSON(b []byte) error {
+	return json.DefaultUnmarshalerConfig.Unmarshal(b, x)
+}
+
 // MarshalProtoJSON marshals the CallStart message to JSON.
 func (x *CallStart) MarshalProtoJSON(s *json.MarshalState) {
 	if x == nil {
@@ -494,6 +535,36 @@ func (x *CallStart) MarshalJSON() ([]byte, error) {
 	return json.DefaultMarshalerConfig.Marshal(x)
 }
 
+// UnmarshalProtoJSON unmarshals the CallStart message from JSON.
+func (x *CallStart) UnmarshalProtoJSON(s *json.UnmarshalState) {
+	if s.ReadNil() {
+		return
+	}
+	s.ReadObject(func(key string) {
+		switch key {
+		default:
+			s.ReadAny() // ignore unknown field
+		case "rpc_service", "rpcService":
+			s.AddField("rpc_service")
+			x.RpcService = s.ReadString()
+		case "rpc_method", "rpcMethod":
+			s.AddField("rpc_method")
+			x.RpcMethod = s.ReadString()
+		case "data":
+			s.AddField("data")
+			x.Data = s.ReadBytes()
+		case "data_is_zero", "dataIsZero":
+			s.AddField("data_is_zero")
+			x.DataIsZero = s.ReadBool()
+		}
+	})
+}
+
+// UnmarshalJSON unmarshals the CallStart from JSON.
+func (x *CallStart) UnmarshalJSON(b []byte) error {
+	return json.DefaultUnmarshalerConfig.Unmarshal(b, x)
+}
+
 // MarshalProtoJSON marshals the CallData message to JSON.
 func (x *CallData) MarshalProtoJSON(s *json.MarshalState) {
 	if x == nil {
@@ -530,6 +601,36 @@ func (x *CallData) MarshalJSON() ([]byte, error) {
 	return json.DefaultMarshalerConfig.Marshal(x)
 }
 
+// UnmarshalProtoJSON unmarshals the CallData message from JSON.
+func (x *CallData) UnmarshalProtoJSON(s *json.UnmarshalState) {
+	if s.ReadNil() {
+		return
+	}
+	s.ReadObject(func(key string) {
+		switch key {
+		default:
+			s.ReadAny() // ignore unknown field
+		case "data":
+			s.AddField("data")
+			x.Data = s.ReadBytes()
+		case "data_is_zero", "dataIsZero":
+			s.AddField("data_is_zero")
+			x.DataIsZero = s.ReadBool()
+		case "complete":
+			s.AddField("complete")
+			x.Complete = s.ReadBool()
+		case "error":
+			s.AddField("error")
+			x.Error = s.ReadString()
+		}
+	})
+}
+
+// UnmarshalJSON unmarshals the CallData from JSON.
+func (x *CallData) UnmarshalJSON(b []byte) error {
+	return json.DefaultUnmarshalerConfig.Unmarshal(b, x)
+}
+
 func (m *Packet) MarshalVT() (dAtA []byte, err error) {
 	if m == nil {
 		return nil, nil