refactor middleware interface

Author: Quinn-With-Two-Ns

nexus/operation.go

@@ -32,7 +32,7 @@ type OperationOptions struct {
 	Header Header
 }
 
-type MiddlewareFunc func(OperationOptions, Operation[any, any]) (Operation[any, any], error)
+type MiddlewareFunc func(OperationOptions, OperationInvoker[any, any]) (OperationInvoker[any, any], error)
 
 // OperationReference provides a typed interface for invoking operations. Every [Operation] is also an
 // [OperationReference]. Callers may create references using [NewOperationReference] when the implementation is not
@@ -89,7 +89,10 @@ type RegisterableOperation interface {
 type Operation[I, O any] interface {
 	RegisterableOperation
 	OperationReference[I, O]
+	OperationInvoker[I, O]
+}
 
+type OperationInvoker[I, O any] interface {
 	// Start handles requests for starting an operation. Return [HandlerStartOperationResultSync] to respond
 	// successfully - inline, or [HandlerStartOperationResultAsync] to indicate that an asynchronous operation was
 	// started. Return an [OperationError] to indicate that an operation completed as failed or
@@ -263,7 +266,7 @@ type registryHandler struct {
 	middlewares []MiddlewareFunc
 }
 
-func (r *registryHandler) getOperation(options OperationOptions) (Operation[any, any], error) {
+func (r *registryHandler) getOperation(options OperationOptions) (OperationInvoker[any, any], error) {
 	s, ok := r.services[options.ServiceName]
 	if !ok {
 		return nil, HandlerErrorf(HandlerErrorTypeNotFound, "service %q not found", options.ServiceName)
@@ -273,7 +276,7 @@ func (r *registryHandler) getOperation(options OperationOptions) (Operation[any,
 		return nil, HandlerErrorf(HandlerErrorTypeNotFound, "operation %q not found", options.OperationName)
 	}
 
-	var handler Operation[any, any]
+	var handler OperationInvoker[any, any]
 	handler = &rootOperationHandler{h: h}
 	if h != nil && len(r.middlewares) > 0 {
 		for i := len(r.middlewares) - 1; i >= 0; i-- {
@@ -334,29 +337,7 @@ func (r *rootOperationHandler) Start(ctx context.Context, input interface{}, opt
 	return ret.(HandlerStartOperationResult[any]), nil
 }
 
-func (r *rootOperationHandler) InputType() reflect.Type {
-	m, _ := reflect.TypeOf(r.h).MethodByName("InputType")
-	values := m.Func.Call([]reflect.Value{reflect.ValueOf(r.h)})
-	ret := values[0].Interface()
-	return ret.(reflect.Type)
-}
-
-func (r *rootOperationHandler) OutputType() reflect.Type {
-	m, _ := reflect.TypeOf(r.h).MethodByName("OutputType")
-	values := m.Func.Call([]reflect.Value{reflect.ValueOf(r.h)})
-	ret := values[0].Interface()
-	return ret.(reflect.Type)
-}
-
-func (r *rootOperationHandler) inferType(input, output any) {}
-
-func (r *rootOperationHandler) Name() string {
-	return r.h.Name()
-}
-
-func (r *rootOperationHandler) mustEmbedUnimplementedOperation() {}
-
-var _ Operation[any, any] = &rootOperationHandler{}
+var _ OperationInvoker[any, any] = &rootOperationHandler{}
 
 // CancelOperation implements Handler.
 func (r *registryHandler) CancelOperation(ctx context.Context, service, operation string, operationID string, options CancelOperationOptions) error {

nexus/operation_test.go

@@ -306,7 +306,7 @@ func TestOperationInterceptor(t *testing.T) {
 }
 
 func newAuthMiddleware(authKey string) MiddlewareFunc {
-	return func(oo OperationOptions, uo Operation[any, any]) (Operation[any, any], error) {
+	return func(oo OperationOptions, uo OperationInvoker[any, any]) (OperationInvoker[any, any], error) {
 		if oo.Header.Get("authorization") != authKey {
 			return nil, HandlerErrorf(HandlerErrorTypeUnauthorized, "unauthorized")
 		}
@@ -315,34 +315,36 @@ func newAuthMiddleware(authKey string) MiddlewareFunc {
 }
 
 type loggingOperation struct {
-	Operation[any, any]
-	output func(string)
+	Operation OperationInvoker[any, any]
+	name      string
+	output    func(string)
 }
 
 func (lo *loggingOperation) Start(ctx context.Context, input any, options StartOperationOptions) (HandlerStartOperationResult[any], error) {
-	lo.output(fmt.Sprintf("starting operation %s", lo.Operation.Name()))
+	lo.output(fmt.Sprintf("starting operation %s", lo.name))
 	return lo.Operation.Start(ctx, input, options)
 }
 
 func (lo *loggingOperation) GetResult(ctx context.Context, id string, options GetOperationResultOptions) (any, error) {
-	lo.output(fmt.Sprintf("getting result for operation %s", lo.Operation.Name()))
+	lo.output(fmt.Sprintf("getting result for operation %s", lo.name))
 	return lo.Operation.GetResult(ctx, id, options)
 }
 
 func (lo *loggingOperation) Cancel(ctx context.Context, id string, options CancelOperationOptions) error {
-	lo.output(fmt.Sprintf("cancel operation %s", lo.Operation.Name()))
+	lo.output(fmt.Sprintf("cancel operation %s", lo.name))
 	return lo.Operation.Cancel(ctx, id, options)
 }
 
 func (lo *loggingOperation) GetInfo(ctx context.Context, id string, options GetOperationInfoOptions) (*OperationInfo, error) {
-	lo.output(fmt.Sprintf("getting info for operation %s", lo.Operation.Name()))
+	lo.output(fmt.Sprintf("getting info for operation %s", lo.name))
 	return lo.Operation.GetInfo(ctx, id, options)
 }
 
 func newLoggingMiddleware(output func(string)) MiddlewareFunc {
-	return func(oo OperationOptions, uo Operation[any, any]) (Operation[any, any], error) {
+	return func(oo OperationOptions, uo OperationInvoker[any, any]) (OperationInvoker[any, any], error) {
 		return &loggingOperation{
 			uo,
+			oo.OperationName,
 			output,
 		}, nil
 	}