66 "encoding/json"
77 "io"
88 "log/slog"
9+ "maps"
910 "net/http"
1011 "strconv"
1112 "time"
@@ -34,16 +35,19 @@ type OperationCompletion interface {
3435// OperationCompletionSuccessful is input for [NewCompletionHTTPRequest], used to deliver successful operation results.
3536type OperationCompletionSuccessful struct {
3637 // Header to send in the completion request.
37- Header http.Header
38- // Body to send in the completion HTTP request.
39- // If it implements `io.Closer` it will automatically be closed by the client.
40- Body io.Reader
38+ // Note that this is a Nexus header, not an HTTP header.
39+ Header Header
40+
41+ // A [Reader] that may be directly set on the completion or constructed when instantiating via
42+ // [NewOperationCompletionSuccessful].
43+ // Automatically closed when the completion is delivered.
44+ Reader * Reader
4145 // OperationID is the unique ID for this operation. Used when a completion callback is received before a started response.
4246 OperationID string
4347 // StartTime is the time the operation started. Used when a completion callback is received before a started response.
4448 StartTime time.Time
45- // StartLinks are used to link back to the operation when a completion callback is received before a started response.
46- StartLinks []Link
49+ // Links are used to link back to the operation when a completion callback is received before a started response.
50+ Links []Link
4751}
4852
4953// OperationCompletionSuccessfulOptions are options for [NewOperationCompletionSuccessful].
@@ -55,48 +59,56 @@ type OperationCompletionSuccessfulOptions struct {
5559 OperationID string
5660 // StartTime is the time the operation started. Used when a completion callback is received before a started response.
5761 StartTime time.Time
58- // StartLinks are used to link back to the operation when a completion callback is received before a started response.
59- StartLinks []Link
62+ // Links are used to link back to the operation when a completion callback is received before a started response.
63+ Links []Link
6064}
6165
6266// NewOperationCompletionSuccessful constructs an [OperationCompletionSuccessful] from a given result.
6367func NewOperationCompletionSuccessful (result any , options OperationCompletionSuccessfulOptions ) (* OperationCompletionSuccessful , error ) {
64- if reader , ok := result .(* Reader ); ok {
65- return & OperationCompletionSuccessful {
66- Header : addContentHeaderToHTTPHeader (reader .Header , make (http.Header )),
67- Body : reader .ReadCloser ,
68- OperationID : options .OperationID ,
69- StartTime : options .StartTime ,
70- StartLinks : options .StartLinks ,
71- }, nil
72- } else {
68+ reader , ok := result .(* Reader )
69+ if ! ok {
7370 content , ok := result .(* Content )
7471 if ! ok {
75- var err error
7672 serializer := options .Serializer
7773 if serializer == nil {
7874 serializer = defaultSerializer
7975 }
76+ var err error
8077 content , err = serializer .Serialize (result )
8178 if err != nil {
8279 return nil , err
8380 }
8481 }
85- header := http.Header {"Content-Length" : []string {strconv .Itoa (len (content .Data ))}}
82+ header := maps .Clone (content .Header )
83+ if header == nil {
84+ header = make (Header , 1 )
85+ }
86+ header ["length" ] = strconv .Itoa (len (content .Data ))
8687
87- return & OperationCompletionSuccessful {
88- Header : addContentHeaderToHTTPHeader (content .Header , header ),
89- Body : bytes .NewReader (content .Data ),
90- OperationID : options .OperationID ,
91- StartTime : options .StartTime ,
92- StartLinks : options .StartLinks ,
93- }, nil
88+ reader = & Reader {
89+ Header : header ,
90+ ReadCloser : io .NopCloser (bytes .NewReader (content .Data )),
91+ }
9492 }
93+
94+ return & OperationCompletionSuccessful {
95+ Header : make (Header ),
96+ Reader : reader ,
97+ OperationID : options .OperationID ,
98+ StartTime : options .StartTime ,
99+ Links : options .Links ,
100+ }, nil
95101}
96102
97103func (c * OperationCompletionSuccessful ) applyToHTTPRequest (request * http.Request ) error {
104+ if request .Header == nil {
105+ request .Header = make (http.Header , len (c .Header )+ len (c .Reader .Header )+ 1 ) // +1 for headerOperationState
106+ }
107+ if c .Reader .Header != nil {
108+ addContentHeaderToHTTPHeader (c .Reader .Header , request .Header )
109+ }
98110 if c .Header != nil {
99- request .Header = c .Header . Clone ( )
111+ addNexusHeaderToHTTPHeader ( c .Header , request .Header )
100112 }
101113 request .Header .Set (headerOperationState , string (OperationStateSucceeded ))
102114 if c .Header .Get (HeaderOperationID ) == "" && c .OperationID != "" {
@@ -106,39 +118,39 @@ func (c *OperationCompletionSuccessful) applyToHTTPRequest(request *http.Request
106118 request .Header .Set (headerOperationStartTime , c .StartTime .Format (http .TimeFormat ))
107119 }
108120 if c .Header .Get (headerLink ) == "" {
109- if err := addLinksToHTTPHeader (c .StartLinks , request .Header ); err != nil {
121+ if err := addLinksToHTTPHeader (c .Links , request .Header ); err != nil {
110122 return err
111123 }
112124 }
113125
114- if closer , ok := c .Body .(io.ReadCloser ); ok {
115- request .Body = closer
116- } else {
117- request .Body = io .NopCloser (c .Body )
118- }
126+ request .Body = c .Reader .ReadCloser
119127 return nil
120128}
121129
122130// OperationCompletionUnsuccessful is input for [NewCompletionHTTPRequest], used to deliver unsuccessful operation
123131// results.
124132type OperationCompletionUnsuccessful struct {
125133 // Header to send in the completion request.
126- Header http.Header
134+ // Note that this is a Nexus header, not an HTTP header.
135+ Header Header
127136 // State of the operation, should be failed or canceled.
128137 State OperationState
129138 // OperationID is the unique ID for this operation. Used when a completion callback is received before a started response.
130139 OperationID string
131140 // StartTime is the time the operation started. Used when a completion callback is received before a started response.
132141 StartTime time.Time
133- // StartLinks are used to link back to the operation when a completion callback is received before a started response.
134- StartLinks []Link
142+ // Links are used to link back to the operation when a completion callback is received before a started response.
143+ Links []Link
135144 // Failure object to send with the completion.
136145 Failure * Failure
137146}
138147
139148func (c * OperationCompletionUnsuccessful ) applyToHTTPRequest (request * http.Request ) error {
149+ if request .Header == nil {
150+ request .Header = make (http.Header , len (c .Header )+ 2 ) // +2 for headerOperationState and content-type
151+ }
140152 if c .Header != nil {
141- request .Header = c .Header . Clone ( )
153+ addNexusHeaderToHTTPHeader ( c .Header , request .Header )
142154 }
143155 request .Header .Set (headerOperationState , string (c .State ))
144156 request .Header .Set ("Content-Type" , contentTypeJSON )
@@ -149,7 +161,7 @@ func (c *OperationCompletionUnsuccessful) applyToHTTPRequest(request *http.Reque
149161 request .Header .Set (headerOperationStartTime , c .StartTime .Format (http .TimeFormat ))
150162 }
151163 if c .Header .Get (headerLink ) == "" {
152- if err := addLinksToHTTPHeader (c .StartLinks , request .Header ); err != nil {
164+ if err := addLinksToHTTPHeader (c .Links , request .Header ); err != nil {
153165 return err
154166 }
155167 }
0 commit comments