starpc 0.50.0 → 0.52.0

package/srpc/invoker.ts

@@ -2,6 +2,7 @@ import { Sink, Source } from 'it-stream-types'
 import { pushable } from 'it-pushable'
 import { pipe } from 'it-pipe'
 import type { MethodDefinition } from './definition.js'
+import type { ServerContext } from './server-context.js'
 import { InvokeFn } from './handler.js'
 import {
   buildDecodeMessageTransform,
@@ -11,15 +12,27 @@ import { writeToPushable } from './pushable.js'
 import type { MessageType, Message } from '@aptre/protobuf-es-lite'
 import { MethodIdempotency, MethodKind } from '@aptre/protobuf-es-lite'
 
-import type { ServerInvocation } from './server-invocation.js'
 // MethodProto is a function which matches one of the RPC signatures.
 export type MethodProto<R extends Message<R>, O extends Message<O>> =
-  | ((request: R, invocation?: ServerInvocation) => Promise<O>)
-  | ((request: R, invocation?: ServerInvocation) => AsyncIterable<O>)
-  | ((request: AsyncIterable<R>, invocation?: ServerInvocation) => Promise<O>)
+  | ((
+      request: R,
+      abortSignal: AbortSignal,
+      context: ServerContext,
+    ) => Promise<O>)
+  | ((
+      request: R,
+      abortSignal: AbortSignal,
+      context: ServerContext,
+    ) => AsyncIterable<O>)
+  | ((
+      request: AsyncIterable<R>,
+      abortSignal: AbortSignal,
+      context: ServerContext,
+    ) => Promise<O>)
   | ((
       request: AsyncIterable<R>,
-      invocation?: ServerInvocation,
+      abortSignal: AbortSignal,
+      context: ServerContext,
     ) => AsyncIterable<O>)
 
 // createInvokeFn builds an InvokeFn from a method definition and a function prototype.
@@ -36,7 +49,7 @@ export function createInvokeFn<R extends Message<R>, O extends Message<O>>(
   return async (
     dataSource: Source<Uint8Array>,
     dataSink: Sink<Source<Uint8Array>>,
-    invocation?: ServerInvocation,
+    context: ServerContext,
   ) => {
     // responseSink is a Sink for response messages.
     const responseSink = pushable<O>({
@@ -71,7 +84,7 @@ export function createInvokeFn<R extends Message<R>, O extends Message<O>>(
 
     // Call the implementation.
     try {
-      const responseObj = methodProto(requestArg, invocation)
+      const responseObj = methodProto(requestArg, context.signal, context)
       if (!responseObj) {
         throw new Error('return value was undefined')
       }

package/srpc/message.go

@@ -86,4 +86,4 @@ func (m *RawMessage) MarshalToSizedBufferVT(dAtA []byte) (int, error) {
 }
 
 // _ is a type assertion
-var _ Message = ((*RawMessage)(nil))
+var _ Message = (*RawMessage)(nil)

package/srpc/msg-stream.go

@@ -86,13 +86,5 @@ func (r *MsgStream) Close() error {
 	return err
 }
 
-func (r *MsgStream) receiptTerminalKind() (TerminalKind, bool) {
-	receipt, ok := r.rw.(receiptTerminalStream)
-	if !ok {
-		return 0, false
-	}
-	return receipt.receiptTerminalKind()
-}
-
 // _ is a type assertion
-var _ Stream = ((*MsgStream)(nil))
+var _ Stream = (*MsgStream)(nil)

package/srpc/mux-verbose.go

@@ -93,4 +93,4 @@ func (v *VMux) HasServiceMethod(serviceID, methodID string) (has bool) {
 }
 
 // _ is a type assertion
-var _ Mux = ((*VMux)(nil))
+var _ Mux = (*VMux)(nil)

package/srpc/mux.go

@@ -134,4 +134,4 @@ func (m *mux) InvokeMethod(serviceID, methodID string, strm Stream) (bool, error
 }
 
 // _ is a type assertion
-var _ Mux = ((*mux)(nil))
+var _ Mux = (*mux)(nil)

package/srpc/rpcproto.pb.cc

@@ -120,8 +120,8 @@ struct PacketDefaultTypeInternal {
 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
     PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 PacketDefaultTypeInternal _Packet_default_instance_;
 }  // namespace srpc
-static const ::_pb::EnumDescriptor* PROTOBUF_NONNULL
-    file_level_enum_descriptors_github_2ecom_2faperturerobotics_2fstarpc_2fsrpc_2frpcproto_2eproto[1];
+static constexpr const ::_pb::EnumDescriptor* PROTOBUF_NONNULL* PROTOBUF_NULLABLE
+    file_level_enum_descriptors_github_2ecom_2faperturerobotics_2fstarpc_2fsrpc_2frpcproto_2eproto = nullptr;
 static constexpr const ::_pb::ServiceDescriptor* PROTOBUF_NONNULL* PROTOBUF_NULLABLE
     file_level_service_descriptors_github_2ecom_2faperturerobotics_2fstarpc_2fsrpc_2frpcproto_2eproto = nullptr;
 const ::uint32_t
@@ -178,18 +178,13 @@ const char descriptor_table_protodef_github_2ecom_2faperturerobotics_2fstarpc_2f
     "service\030\001 \001(\t\022\022\n\nrpc_method\030\002 \001(\t\022\014\n\004dat"
     "a\030\003 \001(\014\022\024\n\014data_is_zero\030\004 \001(\010\"O\n\010CallDat"
     "a\022\014\n\004data\030\001 \001(\014\022\024\n\014data_is_zero\030\002 \001(\010\022\020\n"
-    "\010complete\030\003 \001(\010\022\r\n\005error\030\004 \001(\t*\277\001\n\014Termi"
-    "nalKind\022\035\n\031TERMINAL_KIND_UNSPECIFIED\020\000\022\033"
-    "\n\027TERMINAL_KIND_COMMITTED\020\001\022\032\n\026TERMINAL_"
-    "KIND_CANCELED\020\002\022 \n\034TERMINAL_KIND_TRANSPO"
-    "RT_LOST\020\003\022\030\n\024TERMINAL_KIND_CLOSED\020\004\022\033\n\027T"
-    "ERMINAL_KIND_ABANDONED\020\005b\006proto3"
+    "\010complete\030\003 \001(\010\022\r\n\005error\030\004 \001(\tb\006proto3"
 };
 static ::absl::once_flag descriptor_table_github_2ecom_2faperturerobotics_2fstarpc_2fsrpc_2frpcproto_2eproto_once;
 PROTOBUF_CONSTINIT const ::_pbi::DescriptorTable descriptor_table_github_2ecom_2faperturerobotics_2fstarpc_2fsrpc_2frpcproto_2eproto = {
     false,
     false,
-    552,
+    358,
     descriptor_table_protodef_github_2ecom_2faperturerobotics_2fstarpc_2fsrpc_2frpcproto_2eproto,
     "github.com/aperturerobotics/starpc/srpc/rpcproto.proto",
     &descriptor_table_github_2ecom_2faperturerobotics_2fstarpc_2fsrpc_2frpcproto_2eproto_once,
@@ -203,12 +198,6 @@ PROTOBUF_CONSTINIT const ::_pbi::DescriptorTable descriptor_table_github_2ecom_2
     file_level_service_descriptors_github_2ecom_2faperturerobotics_2fstarpc_2fsrpc_2frpcproto_2eproto,
 };
 namespace srpc {
-const ::google::protobuf::EnumDescriptor* PROTOBUF_NONNULL TerminalKind_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_github_2ecom_2faperturerobotics_2fstarpc_2fsrpc_2frpcproto_2eproto);
-  return file_level_enum_descriptors_github_2ecom_2faperturerobotics_2fstarpc_2fsrpc_2frpcproto_2eproto[0];
-}
-PROTOBUF_CONSTINIT const uint32_t TerminalKind_internal_data_[] = {
-    393216u, 0u, };
 // ===================================================================
 
 class Packet::_Internal {