Update go-server version in client (#66)

* Updates to client

* Updated go-server version

Author: djthorpe

client.go

@@ -316,7 +316,7 @@ func do(client *http.Client, req *http.Request, accept string, strict bool, out
 	defer response.Body.Close()
 
 	// Get content type
-	mimetype, err := respContentType(response)
+	mimetype, err := types.ParseContentType(response.Header.Get(types.ContentTypeHeader))
 	if err != nil {
 		return err
 	}
@@ -381,7 +381,7 @@ func do(client *http.Client, req *http.Request, accept string, strict bool, out
 	}
 
 	switch {
-	case mimetype == types.ContentTypeJSON || mimetype == types.ContentTypeJSONStream:
+	case mimetype == types.ContentTypeJSON || mimetype == types.ContentTypeJSONStream || mimetype == types.ContentTypeJSONStreamLegacy:
 		dec := json.NewDecoder(response.Body)
 		if reqopts.jsonStreamCallback != nil {
 			for {
@@ -408,6 +408,24 @@ func do(client *http.Client, req *http.Request, accept string, strict bool, out
 				return err
 			}
 		}
+	case mimetype == types.ContentTypeTextStream:
+		if reqopts.textStreamCallback != nil {
+			stream := NewTextStream()
+			if err := stream.Decode(response.Body, reqopts.textStreamCallback); err != nil {
+				return err
+			}
+			return nil
+		}
+		if out == nil {
+			return nil
+		}
+		if v, ok := out.(io.Writer); ok {
+			if _, err := io.Copy(v, response.Body); err != nil {
+				return err
+			}
+			return nil
+		}
+		return httpresponse.ErrInternalError.Withf("do: response does not implement Unmarshaler for %q", mimetype)
 	case mimetype == types.ContentTypeTextXml || mimetype == types.ContentTypeXML:
 		if err := xml.NewDecoder(response.Body).Decode(out); err != nil {
 			return err
@@ -442,16 +460,3 @@ func do(client *http.Client, req *http.Request, accept string, strict bool, out
 	// Return success
 	return nil
 }
-
-// Parse the response content type
-func respContentType(resp *http.Response) (string, error) {
-	contenttype := resp.Header.Get("Content-Type")
-	if contenttype == "" {
-		return types.ContentTypeBinary, nil
-	}
-	if mimetype, err := types.ParseContentType(contenttype); err != nil {
-		return contenttype, httpresponse.Err(http.StatusUnsupportedMediaType).With(contenttype)
-	} else {
-		return mimetype, nil
-	}
-}

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/andreburgaud/crypt2go v1.8.0
 	github.com/djthorpe/go-errors v1.0.3
 	github.com/djthorpe/go-tablewriter v0.0.11
-	github.com/mutablelogic/go-server v1.6.23
+	github.com/mutablelogic/go-server v1.6.24
 	github.com/stretchr/testify v1.11.1
 	github.com/xdg-go/pbkdf2 v1.0.0
 	go.opentelemetry.io/otel v1.43.0

go.sum

@@ -39,8 +39,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-runewidth v0.0.23 h1:7ykA0T0jkPpzSvMS5i9uoNn2Xy3R383f9HDx3RybWcw=
 github.com/mattn/go-runewidth v0.0.23/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
-github.com/mutablelogic/go-server v1.6.23 h1:olZitKaYVMEbrr/4Gfa/ZvmQONw7f7vkJE5eaQ/X+U8=
-github.com/mutablelogic/go-server v1.6.23/go.mod h1:Ey+p09lrV1T54szrJi9hlbknRlTvHLxsfo3h6nyxurk=
+github.com/mutablelogic/go-server v1.6.24 h1:TzvtNYSyfu57PzDSoPr8rXRA9zM/IhdGeOM6jkUFMAo=
+github.com/mutablelogic/go-server v1.6.24/go.mod h1:Ey+p09lrV1T54szrJi9hlbknRlTvHLxsfo3h6nyxurk=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=