Complete loading page to pdf and base API

This commit is contained in:
2023-03-27 22:09:54 +03:00
parent 92469fa3a2
commit 91d8f676ae
24 changed files with 864 additions and 95 deletions

View File

@@ -160,6 +160,113 @@ func (c *Client) sendAddPage(ctx context.Context, request OptAddPageReq) (res *P
return result, nil
}
// GetFile invokes getFile operation.
//
// Get file content.
//
// GET /pages/{id}/file/{file_id}
func (c *Client) GetFile(ctx context.Context, params GetFileParams) (GetFileRes, error) {
res, err := c.sendGetFile(ctx, params)
_ = res
return res, err
}
func (c *Client) sendGetFile(ctx context.Context, params GetFileParams) (res GetFileRes, err error) {
otelAttrs := []attribute.KeyValue{
otelogen.OperationID("getFile"),
}
// Run stopwatch.
startTime := time.Now()
defer func() {
elapsedDuration := time.Since(startTime)
c.duration.Record(ctx, elapsedDuration.Microseconds(), otelAttrs...)
}()
// Increment request counter.
c.requests.Add(ctx, 1, otelAttrs...)
// Start a span for this request.
ctx, span := c.cfg.Tracer.Start(ctx, "GetFile",
trace.WithAttributes(otelAttrs...),
clientSpanKind,
)
// Track stage for error reporting.
var stage string
defer func() {
if err != nil {
span.RecordError(err)
span.SetStatus(codes.Error, stage)
c.errors.Add(ctx, 1, otelAttrs...)
}
span.End()
}()
stage = "BuildURL"
u := uri.Clone(c.requestURL(ctx))
var pathParts [4]string
pathParts[0] = "/pages/"
{
// Encode "id" parameter.
e := uri.NewPathEncoder(uri.PathEncoderConfig{
Param: "id",
Style: uri.PathStyleSimple,
Explode: false,
})
if err := func() error {
return e.EncodeValue(conv.UUIDToString(params.ID))
}(); err != nil {
return res, errors.Wrap(err, "encode path")
}
encoded, err := e.Result()
if err != nil {
return res, errors.Wrap(err, "encode path")
}
pathParts[1] = encoded
}
pathParts[2] = "/file/"
{
// Encode "file_id" parameter.
e := uri.NewPathEncoder(uri.PathEncoderConfig{
Param: "file_id",
Style: uri.PathStyleSimple,
Explode: false,
})
if err := func() error {
return e.EncodeValue(conv.UUIDToString(params.FileID))
}(); err != nil {
return res, errors.Wrap(err, "encode path")
}
encoded, err := e.Result()
if err != nil {
return res, errors.Wrap(err, "encode path")
}
pathParts[3] = encoded
}
uri.AddPathParts(u, pathParts[:]...)
stage = "EncodeRequest"
r, err := ht.NewRequest(ctx, "GET", u, nil)
if err != nil {
return res, errors.Wrap(err, "create request")
}
stage = "SendRequest"
resp, err := c.cfg.Client.Do(r)
if err != nil {
return res, errors.Wrap(err, "do request")
}
defer resp.Body.Close()
stage = "DecodeResponse"
result, err := decodeGetFileResponse(resp)
if err != nil {
return res, errors.Wrap(err, "decode response")
}
return result, nil
}
// GetPage invokes getPage operation.
//
// Get page details.

View File

@@ -129,6 +129,120 @@ func (s *Server) handleAddPageRequest(args [0]string, argsEscaped bool, w http.R
}
}
// handleGetFileRequest handles getFile operation.
//
// Get file content.
//
// GET /pages/{id}/file/{file_id}
func (s *Server) handleGetFileRequest(args [2]string, argsEscaped bool, w http.ResponseWriter, r *http.Request) {
otelAttrs := []attribute.KeyValue{
otelogen.OperationID("getFile"),
semconv.HTTPMethodKey.String("GET"),
semconv.HTTPRouteKey.String("/pages/{id}/file/{file_id}"),
}
// Start a span for this request.
ctx, span := s.cfg.Tracer.Start(r.Context(), "GetFile",
trace.WithAttributes(otelAttrs...),
serverSpanKind,
)
defer span.End()
// Run stopwatch.
startTime := time.Now()
defer func() {
elapsedDuration := time.Since(startTime)
s.duration.Record(ctx, elapsedDuration.Microseconds(), otelAttrs...)
}()
// Increment request counter.
s.requests.Add(ctx, 1, otelAttrs...)
var (
recordError = func(stage string, err error) {
span.RecordError(err)
span.SetStatus(codes.Error, stage)
s.errors.Add(ctx, 1, otelAttrs...)
}
err error
opErrContext = ogenerrors.OperationContext{
Name: "GetFile",
ID: "getFile",
}
)
params, err := decodeGetFileParams(args, argsEscaped, r)
if err != nil {
err = &ogenerrors.DecodeParamsError{
OperationContext: opErrContext,
Err: err,
}
recordError("DecodeParams", err)
s.cfg.ErrorHandler(ctx, w, r, err)
return
}
var response GetFileRes
if m := s.cfg.Middleware; m != nil {
mreq := middleware.Request{
Context: ctx,
OperationName: "GetFile",
OperationID: "getFile",
Body: nil,
Params: middleware.Parameters{
{
Name: "id",
In: "path",
}: params.ID,
{
Name: "file_id",
In: "path",
}: params.FileID,
},
Raw: r,
}
type (
Request = struct{}
Params = GetFileParams
Response = GetFileRes
)
response, err = middleware.HookMiddleware[
Request,
Params,
Response,
](
m,
mreq,
unpackGetFileParams,
func(ctx context.Context, request Request, params Params) (response Response, err error) {
response, err = s.h.GetFile(ctx, params)
return response, err
},
)
} else {
response, err = s.h.GetFile(ctx, params)
}
if err != nil {
recordError("Internal", err)
if errRes, ok := errors.Into[*ErrorStatusCode](err); ok {
encodeErrorResponse(errRes, w, span)
return
}
if errors.Is(err, ht.ErrNotImplemented) {
s.cfg.ErrorHandler(ctx, w, r, err)
return
}
encodeErrorResponse(s.h.NewError(ctx, err), w, span)
return
}
if err := encodeGetFileResponse(response, w, span); err != nil {
recordError("EncodeResponse", err)
s.cfg.ErrorHandler(ctx, w, r, err)
return
}
}
// handleGetPageRequest handles getPage operation.
//
// Get page details.

View File

@@ -1,6 +1,10 @@
// Code generated by ogen, DO NOT EDIT.
package openapi
type GetFileRes interface {
getFileRes()
}
type GetPageRes interface {
getPageRes()
}

View File

@@ -16,6 +16,124 @@ import (
"github.com/ogen-go/ogen/validate"
)
// GetFileParams is parameters of getFile operation.
type GetFileParams struct {
ID uuid.UUID
FileID uuid.UUID
}
func unpackGetFileParams(packed middleware.Parameters) (params GetFileParams) {
{
key := middleware.ParameterKey{
Name: "id",
In: "path",
}
params.ID = packed[key].(uuid.UUID)
}
{
key := middleware.ParameterKey{
Name: "file_id",
In: "path",
}
params.FileID = packed[key].(uuid.UUID)
}
return params
}
func decodeGetFileParams(args [2]string, argsEscaped bool, r *http.Request) (params GetFileParams, _ error) {
// Decode path: id.
if err := func() error {
param := args[0]
if argsEscaped {
unescaped, err := url.PathUnescape(args[0])
if err != nil {
return errors.Wrap(err, "unescape path")
}
param = unescaped
}
if len(param) > 0 {
d := uri.NewPathDecoder(uri.PathDecoderConfig{
Param: "id",
Value: param,
Style: uri.PathStyleSimple,
Explode: false,
})
if err := func() error {
val, err := d.DecodeValue()
if err != nil {
return err
}
c, err := conv.ToUUID(val)
if err != nil {
return err
}
params.ID = c
return nil
}(); err != nil {
return err
}
} else {
return validate.ErrFieldRequired
}
return nil
}(); err != nil {
return params, &ogenerrors.DecodeParamError{
Name: "id",
In: "path",
Err: err,
}
}
// Decode path: file_id.
if err := func() error {
param := args[1]
if argsEscaped {
unescaped, err := url.PathUnescape(args[1])
if err != nil {
return errors.Wrap(err, "unescape path")
}
param = unescaped
}
if len(param) > 0 {
d := uri.NewPathDecoder(uri.PathDecoderConfig{
Param: "file_id",
Value: param,
Style: uri.PathStyleSimple,
Explode: false,
})
if err := func() error {
val, err := d.DecodeValue()
if err != nil {
return err
}
c, err := conv.ToUUID(val)
if err != nil {
return err
}
params.FileID = c
return nil
}(); err != nil {
return err
}
} else {
return validate.ErrFieldRequired
}
return nil
}(); err != nil {
return params, &ogenerrors.DecodeParamError{
Name: "file_id",
In: "path",
Err: err,
}
}
return params, nil
}
// GetPageParams is parameters of getPage operation.
type GetPageParams struct {
ID uuid.UUID

View File

@@ -3,6 +3,7 @@
package openapi
import (
"bytes"
"io"
"mime"
"net/http"
@@ -97,6 +98,94 @@ func decodeAddPageResponse(resp *http.Response) (res *Page, err error) {
return res, errors.Wrap(defRes, "error")
}
func decodeGetFileResponse(resp *http.Response) (res GetFileRes, err error) {
switch resp.StatusCode {
case 200:
// Code 200.
ct, _, err := mime.ParseMediaType(resp.Header.Get("Content-Type"))
if err != nil {
return res, errors.Wrap(err, "parse media type")
}
switch {
case ct == "application/pdf":
reader := resp.Body
b, err := io.ReadAll(reader)
if err != nil {
return res, err
}
response := GetFileOKApplicationPdf{Data: bytes.NewReader(b)}
return &response, nil
case ct == "text/html":
reader := resp.Body
b, err := io.ReadAll(reader)
if err != nil {
return res, err
}
response := GetFileOKTextHTML{Data: bytes.NewReader(b)}
return &response, nil
case ct == "text/plain":
reader := resp.Body
b, err := io.ReadAll(reader)
if err != nil {
return res, err
}
response := GetFileOKTextPlain{Data: bytes.NewReader(b)}
return &response, nil
default:
return res, validate.InvalidContentType(ct)
}
case 404:
// Code 404.
return &GetFileNotFound{}, nil
}
// Convenient error response.
defRes, err := func() (res *ErrorStatusCode, err error) {
ct, _, err := mime.ParseMediaType(resp.Header.Get("Content-Type"))
if err != nil {
return res, errors.Wrap(err, "parse media type")
}
switch {
case ct == "application/json":
buf, err := io.ReadAll(resp.Body)
if err != nil {
return res, err
}
d := jx.DecodeBytes(buf)
var response Error
if err := func() error {
if err := response.Decode(d); err != nil {
return err
}
if err := d.Skip(); err != io.EOF {
return errors.New("unexpected trailing data")
}
return nil
}(); err != nil {
err = &ogenerrors.DecodeBodyError{
ContentType: ct,
Body: buf,
Err: err,
}
return res, err
}
return &ErrorStatusCode{
StatusCode: resp.StatusCode,
Response: response,
}, nil
default:
return res, validate.InvalidContentType(ct)
}
}()
if err != nil {
return res, errors.Wrap(err, "default")
}
return res, errors.Wrap(defRes, "error")
}
func decodeGetPageResponse(resp *http.Response) (res GetPageRes, err error) {
switch resp.StatusCode {
case 200:

View File

@@ -3,6 +3,7 @@
package openapi
import (
"io"
"net/http"
"github.com/go-faster/errors"
@@ -24,6 +25,52 @@ func encodeAddPageResponse(response *Page, w http.ResponseWriter, span trace.Spa
return nil
}
func encodeGetFileResponse(response GetFileRes, w http.ResponseWriter, span trace.Span) error {
switch response := response.(type) {
case *GetFileOKApplicationPdf:
w.Header().Set("Content-Type", "application/pdf")
w.WriteHeader(200)
span.SetStatus(codes.Ok, http.StatusText(200))
writer := w
if _, err := io.Copy(writer, response); err != nil {
return errors.Wrap(err, "write")
}
return nil
case *GetFileOKTextHTML:
w.Header().Set("Content-Type", "text/html")
w.WriteHeader(200)
span.SetStatus(codes.Ok, http.StatusText(200))
writer := w
if _, err := io.Copy(writer, response); err != nil {
return errors.Wrap(err, "write")
}
return nil
case *GetFileOKTextPlain:
w.Header().Set("Content-Type", "text/plain")
w.WriteHeader(200)
span.SetStatus(codes.Ok, http.StatusText(200))
writer := w
if _, err := io.Copy(writer, response); err != nil {
return errors.Wrap(err, "write")
}
return nil
case *GetFileNotFound:
w.WriteHeader(404)
span.SetStatus(codes.Error, http.StatusText(404))
return nil
default:
return errors.Errorf("unexpected response type: %T", response)
}
}
func encodeGetPageResponse(response GetPageRes, w http.ResponseWriter, span trace.Span) error {
switch response := response.(type) {
case *PageWithResults:

View File

@@ -35,7 +35,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
s.notFound(w, r)
return
}
args := [1]string{}
args := [2]string{}
// Static code generated router with unwrapped path search.
switch {
@@ -72,12 +72,15 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
// Param: "id"
// Leaf parameter
args[0] = elem
elem = ""
// Match until "/"
idx := strings.IndexByte(elem, '/')
if idx < 0 {
idx = len(elem)
}
args[0] = elem[:idx]
elem = elem[idx:]
if len(elem) == 0 {
// Leaf node.
switch r.Method {
case "GET":
s.handleGetPageRequest([1]string{
@@ -89,6 +92,34 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return
}
switch elem[0] {
case '/': // Prefix: "/file/"
if l := len("/file/"); len(elem) >= l && elem[0:l] == "/file/" {
elem = elem[l:]
} else {
break
}
// Param: "file_id"
// Leaf parameter
args[1] = elem
elem = ""
if len(elem) == 0 {
// Leaf node.
switch r.Method {
case "GET":
s.handleGetFileRequest([2]string{
args[0],
args[1],
}, elemIsEscaped, w, r)
default:
s.notAllowed(w, r, "GET")
}
return
}
}
}
}
}
@@ -101,7 +132,7 @@ type Route struct {
operationID string
pathPattern string
count int
args [1]string
args [2]string
}
// Name returns ogen operation name.
@@ -195,14 +226,17 @@ func (s *Server) FindPath(method string, u *url.URL) (r Route, _ bool) {
}
// Param: "id"
// Leaf parameter
args[0] = elem
elem = ""
// Match until "/"
idx := strings.IndexByte(elem, '/')
if idx < 0 {
idx = len(elem)
}
args[0] = elem[:idx]
elem = elem[idx:]
if len(elem) == 0 {
switch method {
case "GET":
// Leaf: GetPage
r.name = "GetPage"
r.operationID = "getPage"
r.pathPattern = "/pages/{id}"
@@ -213,6 +247,34 @@ func (s *Server) FindPath(method string, u *url.URL) (r Route, _ bool) {
return
}
}
switch elem[0] {
case '/': // Prefix: "/file/"
if l := len("/file/"); len(elem) >= l && elem[0:l] == "/file/" {
elem = elem[l:]
} else {
break
}
// Param: "file_id"
// Leaf parameter
args[1] = elem
elem = ""
if len(elem) == 0 {
switch method {
case "GET":
// Leaf: GetFile
r.name = "GetFile"
r.operationID = "getFile"
r.pathPattern = "/pages/{id}/file/{file_id}"
r.args = args
r.count = 2
return r, true
default:
return
}
}
}
}
}
}

View File

@@ -4,6 +4,7 @@ package openapi
import (
"fmt"
"io"
"time"
"github.com/go-faster/errors"
@@ -148,6 +149,50 @@ func (s *Format) UnmarshalText(data []byte) error {
}
}
// GetFileNotFound is response for GetFile operation.
type GetFileNotFound struct{}
func (*GetFileNotFound) getFileRes() {}
type GetFileOKApplicationPdf struct {
Data io.Reader
}
// Read reads data from the Data reader.
//
// Kept to satisfy the io.Reader interface.
func (s GetFileOKApplicationPdf) Read(p []byte) (n int, err error) {
return s.Data.Read(p)
}
func (*GetFileOKApplicationPdf) getFileRes() {}
type GetFileOKTextHTML struct {
Data io.Reader
}
// Read reads data from the Data reader.
//
// Kept to satisfy the io.Reader interface.
func (s GetFileOKTextHTML) Read(p []byte) (n int, err error) {
return s.Data.Read(p)
}
func (*GetFileOKTextHTML) getFileRes() {}
type GetFileOKTextPlain struct {
Data io.Reader
}
// Read reads data from the Data reader.
//
// Kept to satisfy the io.Reader interface.
func (s GetFileOKTextPlain) Read(p []byte) (n int, err error) {
return s.Data.Read(p)
}
func (*GetFileOKTextPlain) getFileRes() {}
// GetPageNotFound is response for GetPage operation.
type GetPageNotFound struct{}

View File

@@ -14,6 +14,12 @@ type Handler interface {
//
// POST /pages
AddPage(ctx context.Context, req OptAddPageReq) (*Page, error)
// GetFile implements getFile operation.
//
// Get file content.
//
// GET /pages/{id}/file/{file_id}
GetFile(ctx context.Context, params GetFileParams) (GetFileRes, error)
// GetPage implements getPage operation.
//
// Get page details.

View File

@@ -22,6 +22,15 @@ func (UnimplementedHandler) AddPage(ctx context.Context, req OptAddPageReq) (r *
return r, ht.ErrNotImplemented
}
// GetFile implements getFile operation.
//
// Get file content.
//
// GET /pages/{id}/file/{file_id}
func (UnimplementedHandler) GetFile(ctx context.Context, params GetFileParams) (r GetFileRes, _ error) {
return r, ht.ErrNotImplemented
}
// GetPage implements getPage operation.
//
// Get page details.