From f28431d199205ff86d8da02b600218606652e83b Mon Sep 17 00:00:00 2001 From: kkumar-gcc Date: Wed, 31 Jul 2024 20:04:51 +0530 Subject: [PATCH 1/8] add streaming functionality --- context_response.go | 4 ++++ response.go | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/context_response.go b/context_response.go index 72bd7f9..71f4814 100644 --- a/context_response.go +++ b/context_response.go @@ -89,6 +89,10 @@ func (r *ContextResponse) Status(code int) contractshttp.ResponseStatus { return NewStatus(r.instance, code) } +func (r *ContextResponse) Stream(step func(w contractshttp.StreamWriter) error, code int, contentType string) contractshttp.Response { + return &StreamResponse{code, contentType, r.instance, step} +} + func (r *ContextResponse) View() contractshttp.ResponseView { return NewView(r.instance) } diff --git a/response.go b/response.go index a29a986..db37d04 100644 --- a/response.go +++ b/response.go @@ -1,10 +1,13 @@ package fiber import ( + "bufio" "net/url" "path/filepath" "github.com/gofiber/fiber/v2" + + contractshttp "github.com/goravel/framework/contracts/http" ) type DataResponse struct { @@ -96,3 +99,22 @@ type HtmlResponse struct { func (r *HtmlResponse) Render() error { return r.instance.Render(r.view, r.data) } + +type StreamResponse struct { + code int + contentType string + instance *fiber.Ctx + writer func(w contractshttp.StreamWriter) error +} + +func (r *StreamResponse) Render() (err error) { + r.instance.Set(fiber.HeaderContentType, r.contentType) + r.instance.Status(r.code) + + ctx := r.instance.Context() + ctx.SetBodyStreamWriter(func(w *bufio.Writer) { + err = r.writer(w) + }) + + return err +} From ee8425feb41eb605e91d706aabb36b0a2450a2b8 Mon Sep 17 00:00:00 2001 From: kkumar-gcc Date: Fri, 2 Aug 2024 11:11:29 +0530 Subject: [PATCH 2/8] update framework --- go.mod | 26 +++++++++++++------------- go.sum | 52 ++++++++++++++++++++++++++-------------------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/go.mod b/go.mod index a2f2f8e..9f08177 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/gofiber/fiber/v2 v2.52.5 github.com/gofiber/template/html/v2 v2.1.2 github.com/gookit/validate v1.5.2 - github.com/goravel/framework v1.14.1-0.20240713081914-3c96472aa3a4 + github.com/goravel/framework v1.14.1-0.20240802052104-488ee246d523 github.com/savioxavier/termlink v1.3.0 github.com/spf13/cast v1.6.0 github.com/stretchr/testify v1.9.0 @@ -36,13 +36,13 @@ require ( github.com/catppuccin/go v0.2.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/charmbracelet/bubbles v0.18.0 // indirect - github.com/charmbracelet/bubbletea v0.26.4 // indirect - github.com/charmbracelet/huh v0.5.1 // indirect - github.com/charmbracelet/huh/spinner v0.0.0-20240712195021-ccca06d54254 // indirect + github.com/charmbracelet/bubbletea v0.26.6 // indirect + github.com/charmbracelet/huh v0.5.2 // indirect + github.com/charmbracelet/huh/spinner v0.0.0-20240725212135-67d4a4354ed1 // indirect github.com/charmbracelet/lipgloss v0.12.1 // indirect github.com/charmbracelet/x/ansi v0.1.4 // indirect - github.com/charmbracelet/x/exp/strings v0.0.0-20240617190524-788ec55faed1 // indirect - github.com/charmbracelet/x/input v0.1.2 // indirect + github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect + github.com/charmbracelet/x/input v0.1.3 // indirect github.com/charmbracelet/x/term v0.1.1 // indirect github.com/charmbracelet/x/windows v0.1.2 // indirect github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect @@ -53,7 +53,7 @@ require ( github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/gabriel-vasile/mimetype v1.4.4 // indirect + github.com/gabriel-vasile/mimetype v1.4.5 // indirect github.com/glebarez/go-sqlite v1.22.0 // indirect github.com/glebarez/sqlite v1.11.0 // indirect github.com/go-logr/logr v1.4.1 // indirect @@ -101,7 +101,7 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-localereader v0.0.1 // indirect - github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/mattn/go-runewidth v0.0.16 // indirect github.com/microsoft/go-mssqldb v1.6.0 // indirect github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect @@ -114,7 +114,7 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/pterm/pterm v0.12.79 // indirect github.com/rabbitmq/amqp091-go v1.9.0 // indirect - github.com/redis/go-redis/v9 v9.5.4 // indirect + github.com/redis/go-redis/v9 v9.6.1 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 // indirect github.com/rivo/uniseg v0.4.7 // indirect @@ -130,14 +130,14 @@ require ( github.com/spf13/viper v1.19.0 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/subosito/gotenv v1.6.0 // indirect - github.com/urfave/cli/v2 v2.27.2 // indirect + github.com/urfave/cli/v2 v2.27.3 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect - github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect + github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect go.mongodb.org/mongo-driver v1.7.5 // indirect go.opencensus.io v0.24.0 // indirect @@ -149,8 +149,8 @@ require ( go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.9.0 // indirect golang.org/x/crypto v0.25.0 // indirect - golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect - golang.org/x/net v0.26.0 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect + golang.org/x/net v0.27.0 // indirect golang.org/x/oauth2 v0.20.0 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.22.0 // indirect diff --git a/go.sum b/go.sum index 9487825..ae81b36 100644 --- a/go.sum +++ b/go.sum @@ -135,22 +135,22 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/charmbracelet/bubbles v0.18.0 h1:PYv1A036luoBGroX6VWjQIE9Syf2Wby2oOl/39KLfy0= github.com/charmbracelet/bubbles v0.18.0/go.mod h1:08qhZhtIwzgrtBjAcJnij1t1H0ZRjwHyGsy6AL11PSw= -github.com/charmbracelet/bubbletea v0.26.4 h1:2gDkkzLZaTjMl/dQBpNVtnvcCxsh/FCkimep7FC9c40= -github.com/charmbracelet/bubbletea v0.26.4/go.mod h1:P+r+RRA5qtI1DOHNFn0otoNwB4rn+zNAzSj/EXz6xU0= -github.com/charmbracelet/huh v0.5.1 h1:t5j6g9sMjAE2a9AQuc4lNL7pf/0X4WdHiiMGkL8v/aM= -github.com/charmbracelet/huh v0.5.1/go.mod h1:gs7b2brpzXkY0PBWUqJrlzvOowTCL0vNAR6OTItc+kA= -github.com/charmbracelet/huh/spinner v0.0.0-20240712195021-ccca06d54254 h1:GhjNbVAWHcYdw5DHmELKs3xhiVFvZ+/fte4jl2PVA7s= -github.com/charmbracelet/huh/spinner v0.0.0-20240712195021-ccca06d54254/go.mod h1:CrXBZnOWs3zpyppOZZS7lu2CpLq2jx6U5chL/frRG/E= +github.com/charmbracelet/bubbletea v0.26.6 h1:zTCWSuST+3yZYZnVSvbXwKOPRSNZceVeqpzOLN2zq1s= +github.com/charmbracelet/bubbletea v0.26.6/go.mod h1:dz8CWPlfCCGLFbBlTY4N7bjLiyOGDJEnd2Muu7pOWhk= +github.com/charmbracelet/huh v0.5.2 h1:ofeNkJ4iaFnzv46Njhx896DzLUe/j0L2QAf8znwzX4c= +github.com/charmbracelet/huh v0.5.2/go.mod h1:Sf7dY0oAn6N/e3sXJFtFX9hdQLrUdO3z7AYollG9bAM= +github.com/charmbracelet/huh/spinner v0.0.0-20240725212135-67d4a4354ed1 h1:IjNcc7cCYR0ymVfy4dWvBHE6VSqfpcvHRfWpCWcun0g= +github.com/charmbracelet/huh/spinner v0.0.0-20240725212135-67d4a4354ed1/go.mod h1:9VssyY5pUozMRmDYlLYV20QMMcA2sHg3qnaB6PvdIm8= github.com/charmbracelet/lipgloss v0.12.1 h1:/gmzszl+pedQpjCOH+wFkZr/N90Snz40J/NR7A0zQcs= github.com/charmbracelet/lipgloss v0.12.1/go.mod h1:V2CiwIuhx9S1S1ZlADfOj9HmxeMAORuz5izHb0zGbB8= github.com/charmbracelet/x/ansi v0.1.4 h1:IEU3D6+dWwPSgZ6HBH+v6oUuZ/nVawMiWj5831KfiLM= github.com/charmbracelet/x/ansi v0.1.4/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw= -github.com/charmbracelet/x/exp/strings v0.0.0-20240617190524-788ec55faed1 h1:VZIQzjwFE0EamzG2v8HfemeisB8X02Tl0BZBnJ0PeU8= -github.com/charmbracelet/x/exp/strings v0.0.0-20240617190524-788ec55faed1/go.mod h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ= +github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 h1:qko3AQ4gK1MTS/de7F5hPGx6/k1u0w4TeYmBFwzYVP4= +github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0/go.mod h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ= github.com/charmbracelet/x/exp/term v0.0.0-20240524151031-ff83003bf67a h1:k/s6UoOSVynWiw7PlclyGO2VdVs5ZLbMIHiGp4shFZE= github.com/charmbracelet/x/exp/term v0.0.0-20240524151031-ff83003bf67a/go.mod h1:YBotIGhfoWhHDlnUpJMkjebGV2pdGRCn1Y4/Nk/vVcU= -github.com/charmbracelet/x/input v0.1.2 h1:QJAZr33eOhDowkkEQ24rsJy4Llxlm+fRDf/cQrmqJa0= -github.com/charmbracelet/x/input v0.1.2/go.mod h1:LGBim0maUY4Pitjn/4fHnuXb4KirU3DODsyuHuXdOyA= +github.com/charmbracelet/x/input v0.1.3 h1:oy4TMhyGQsYs/WWJwu1ELUMFnjiUAXwtDf048fHbCkg= +github.com/charmbracelet/x/input v0.1.3/go.mod h1:1gaCOyw1KI9e2j00j/BBZ4ErzRZqa05w0Ghn83yIhKU= github.com/charmbracelet/x/term v0.1.1 h1:3cosVAiPOig+EV4X9U+3LDgtwwAoEzJjNdwbXDjF6yI= github.com/charmbracelet/x/term v0.1.1/go.mod h1:wB1fHt5ECsu3mXYusyzcngVWWlu1KKUmmLhfgr/Flxw= github.com/charmbracelet/x/windows v0.1.2 h1:Iumiwq2G+BRmgoayww/qfcvof7W/3uLoelhxojXlRWg= @@ -204,8 +204,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/gabriel-vasile/mimetype v1.4.4 h1:QjV6pZ7/XZ7ryI2KuyeEDE8wnh7fHP9YnQy+R0LnH8I= -github.com/gabriel-vasile/mimetype v1.4.4/go.mod h1:JwLei5XPtWdGiMFB5Pjle1oEeoSeEuJfJE+TtfvdB/s= +github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4= +github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4= github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec+ruQ= github.com/glebarez/go-sqlite v1.22.0/go.mod h1:PlBIdHe0+aUEFn+r2/uthrWq4FxbzugL0L8Li6yQJbc= github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw= @@ -381,8 +381,8 @@ github.com/gookit/validate v1.5.2 h1:i5I2OQ7WYHFRPRATGu9QarR9snnNHydvwSuHXaRWAV0 github.com/gookit/validate v1.5.2/go.mod h1:yuPy2WwDlwGRa06fFJ5XIO8QEwhRnTC2LmxmBa5SE14= github.com/goravel/file-rotatelogs/v2 v2.4.2 h1:g68AzbePXcm0V2CpUMc9j4qVzcDn7+7aoWSjZ51C0m4= github.com/goravel/file-rotatelogs/v2 v2.4.2/go.mod h1:23VuSW8cBS4ax5cmbV+5AaiLpq25b8UJ96IhbAkdo8I= -github.com/goravel/framework v1.14.1-0.20240713081914-3c96472aa3a4 h1:7+HOyQEfGLSvSzHSvY+0guk4t5KRLtQB4pwzSSPW7KI= -github.com/goravel/framework v1.14.1-0.20240713081914-3c96472aa3a4/go.mod h1:w5TR5ChUoRTV63nQbwHKreY9lwqGAb9f5iZYmoHxH+U= +github.com/goravel/framework v1.14.1-0.20240802052104-488ee246d523 h1:PZrCaVeBs6sntB7XShn2qog1E0ywMbpULVON9NV6gm4= +github.com/goravel/framework v1.14.1-0.20240802052104-488ee246d523/go.mod h1:NJP4LyBnGusBgfUHQZn7z7KMXx7kK2xLK2C3wOZPYMI= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -470,8 +470,8 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4= github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88= github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= -github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= +github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/microsoft/go-mssqldb v1.6.0 h1:mM3gYdVwEPFrlg/Dvr2DNVEgYFG7L42l+dGc67NNNpc= github.com/microsoft/go-mssqldb v1.6.0/go.mod h1:00mDtPbeQCRGC1HwOOR5K/gr30P1NcEG0vx6Kbv2aJU= github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4= @@ -533,8 +533,8 @@ github.com/rabbitmq/amqp091-go v1.9.0 h1:qrQtyzB4H8BQgEuJwhmVQqVHB9O4+MNDJCCAcpc github.com/rabbitmq/amqp091-go v1.9.0/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc= github.com/redis/go-redis/v9 v9.0.2/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps= github.com/redis/go-redis/v9 v9.0.5/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk= -github.com/redis/go-redis/v9 v9.5.4 h1:vOFYDKKVgrI5u++QvnMT7DksSMYg7Aw/Np4vLJLKLwY= -github.com/redis/go-redis/v9 v9.5.4/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= +github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4= +github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo= @@ -606,8 +606,8 @@ github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSW github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.27.2 h1:6e0H+AkS+zDckwPCUrZkKX38mRaau4nL2uipkJpbkcI= -github.com/urfave/cli/v2 v2.27.2/go.mod h1:g0+79LmHHATl7DAcHO99smiR/T7uGLw84w8Y42x+4eM= +github.com/urfave/cli/v2 v2.27.3 h1:/POWahRmdh7uztQ3CYnaDddk0Rm90PyOgIxgW2rr41M= +github.com/urfave/cli/v2 v2.27.3/go.mod h1:m4QzxcD2qpra4z7WhzEGn74WZLViBnMpb1ToCAKdGRQ= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.55.0 h1:Zkefzgt6a7+bVKHnu/YaYSOPfNYNisSVBo/unVCf8k8= @@ -627,8 +627,8 @@ github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHM github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= -github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw= -github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk= +github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4= +github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -696,8 +696,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= -golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -772,8 +772,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= From e2b18984b1abd55fa424aa95e2186414887bf772 Mon Sep 17 00:00:00 2001 From: kkumar-gcc Date: Sat, 3 Aug 2024 17:07:06 +0530 Subject: [PATCH 3/8] remove content type --- context_response.go | 4 ++-- response.go | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/context_response.go b/context_response.go index 71f4814..b2adb81 100644 --- a/context_response.go +++ b/context_response.go @@ -89,8 +89,8 @@ func (r *ContextResponse) Status(code int) contractshttp.ResponseStatus { return NewStatus(r.instance, code) } -func (r *ContextResponse) Stream(step func(w contractshttp.StreamWriter) error, code int, contentType string) contractshttp.Response { - return &StreamResponse{code, contentType, r.instance, step} +func (r *ContextResponse) Stream(step func(w contractshttp.StreamWriter) error, code int) contractshttp.Response { + return &StreamResponse{code, r.instance, step} } func (r *ContextResponse) View() contractshttp.ResponseView { diff --git a/response.go b/response.go index db37d04..8f4979a 100644 --- a/response.go +++ b/response.go @@ -101,14 +101,12 @@ func (r *HtmlResponse) Render() error { } type StreamResponse struct { - code int - contentType string - instance *fiber.Ctx - writer func(w contractshttp.StreamWriter) error + code int + instance *fiber.Ctx + writer func(w contractshttp.StreamWriter) error } func (r *StreamResponse) Render() (err error) { - r.instance.Set(fiber.HeaderContentType, r.contentType) r.instance.Status(r.code) ctx := r.instance.Context() From 505e6f13387747952ac16c5f6eca40384d2e4e38 Mon Sep 17 00:00:00 2001 From: kkumar-gcc Date: Sun, 4 Aug 2024 15:38:21 +0530 Subject: [PATCH 4/8] add Stream to ResponseStatus --- context_response.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/context_response.go b/context_response.go index b2adb81..1c4a24b 100644 --- a/context_response.go +++ b/context_response.go @@ -89,7 +89,7 @@ func (r *ContextResponse) Status(code int) contractshttp.ResponseStatus { return NewStatus(r.instance, code) } -func (r *ContextResponse) Stream(step func(w contractshttp.StreamWriter) error, code int) contractshttp.Response { +func (r *ContextResponse) Stream(code int, step func(w contractshttp.StreamWriter) error) contractshttp.Response { return &StreamResponse{code, r.instance, step} } @@ -210,6 +210,10 @@ func (r *Status) String(format string, values ...any) contractshttp.Response { return &StringResponse{r.status, format, r.instance, values} } +func (r *Status) Stream(step func(w contractshttp.StreamWriter) error) contractshttp.Response { + return &StreamResponse{r.status, r.instance, step} +} + func ResponseMiddleware() contractshttp.Middleware { return func(ctx contractshttp.Context) { switch ctx := ctx.(type) { From 9906f62605b6e92666ec14e9e8ee87302add0831 Mon Sep 17 00:00:00 2001 From: kkumar-gcc Date: Sun, 4 Aug 2024 19:11:37 +0530 Subject: [PATCH 5/8] update go mod --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 9f08177..c541cef 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/gofiber/fiber/v2 v2.52.5 github.com/gofiber/template/html/v2 v2.1.2 github.com/gookit/validate v1.5.2 - github.com/goravel/framework v1.14.1-0.20240802052104-488ee246d523 + github.com/goravel/framework v1.14.1-0.20240804133715-98a226e9dfb8 github.com/savioxavier/termlink v1.3.0 github.com/spf13/cast v1.6.0 github.com/stretchr/testify v1.9.0 @@ -38,7 +38,7 @@ require ( github.com/charmbracelet/bubbles v0.18.0 // indirect github.com/charmbracelet/bubbletea v0.26.6 // indirect github.com/charmbracelet/huh v0.5.2 // indirect - github.com/charmbracelet/huh/spinner v0.0.0-20240725212135-67d4a4354ed1 // indirect + github.com/charmbracelet/huh/spinner v0.0.0-20240803000013-2eb851f67645 // indirect github.com/charmbracelet/lipgloss v0.12.1 // indirect github.com/charmbracelet/x/ansi v0.1.4 // indirect github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect diff --git a/go.sum b/go.sum index ae81b36..269d71e 100644 --- a/go.sum +++ b/go.sum @@ -139,8 +139,8 @@ github.com/charmbracelet/bubbletea v0.26.6 h1:zTCWSuST+3yZYZnVSvbXwKOPRSNZceVeqp github.com/charmbracelet/bubbletea v0.26.6/go.mod h1:dz8CWPlfCCGLFbBlTY4N7bjLiyOGDJEnd2Muu7pOWhk= github.com/charmbracelet/huh v0.5.2 h1:ofeNkJ4iaFnzv46Njhx896DzLUe/j0L2QAf8znwzX4c= github.com/charmbracelet/huh v0.5.2/go.mod h1:Sf7dY0oAn6N/e3sXJFtFX9hdQLrUdO3z7AYollG9bAM= -github.com/charmbracelet/huh/spinner v0.0.0-20240725212135-67d4a4354ed1 h1:IjNcc7cCYR0ymVfy4dWvBHE6VSqfpcvHRfWpCWcun0g= -github.com/charmbracelet/huh/spinner v0.0.0-20240725212135-67d4a4354ed1/go.mod h1:9VssyY5pUozMRmDYlLYV20QMMcA2sHg3qnaB6PvdIm8= +github.com/charmbracelet/huh/spinner v0.0.0-20240803000013-2eb851f67645 h1:lpAqYjFpvhDyUjzQpRNUC+jrEgv6nT7gltkUZSpTPHA= +github.com/charmbracelet/huh/spinner v0.0.0-20240803000013-2eb851f67645/go.mod h1:9VssyY5pUozMRmDYlLYV20QMMcA2sHg3qnaB6PvdIm8= github.com/charmbracelet/lipgloss v0.12.1 h1:/gmzszl+pedQpjCOH+wFkZr/N90Snz40J/NR7A0zQcs= github.com/charmbracelet/lipgloss v0.12.1/go.mod h1:V2CiwIuhx9S1S1ZlADfOj9HmxeMAORuz5izHb0zGbB8= github.com/charmbracelet/x/ansi v0.1.4 h1:IEU3D6+dWwPSgZ6HBH+v6oUuZ/nVawMiWj5831KfiLM= @@ -381,8 +381,8 @@ github.com/gookit/validate v1.5.2 h1:i5I2OQ7WYHFRPRATGu9QarR9snnNHydvwSuHXaRWAV0 github.com/gookit/validate v1.5.2/go.mod h1:yuPy2WwDlwGRa06fFJ5XIO8QEwhRnTC2LmxmBa5SE14= github.com/goravel/file-rotatelogs/v2 v2.4.2 h1:g68AzbePXcm0V2CpUMc9j4qVzcDn7+7aoWSjZ51C0m4= github.com/goravel/file-rotatelogs/v2 v2.4.2/go.mod h1:23VuSW8cBS4ax5cmbV+5AaiLpq25b8UJ96IhbAkdo8I= -github.com/goravel/framework v1.14.1-0.20240802052104-488ee246d523 h1:PZrCaVeBs6sntB7XShn2qog1E0ywMbpULVON9NV6gm4= -github.com/goravel/framework v1.14.1-0.20240802052104-488ee246d523/go.mod h1:NJP4LyBnGusBgfUHQZn7z7KMXx7kK2xLK2C3wOZPYMI= +github.com/goravel/framework v1.14.1-0.20240804133715-98a226e9dfb8 h1:3uZs9BMhOIGleWkyUJaH1Hwg03z+nF/osduSgFQD3qY= +github.com/goravel/framework v1.14.1-0.20240804133715-98a226e9dfb8/go.mod h1:uXY1t6lpuPtSM27aKNlib03OCG40xQcw4JbKcGlvz2k= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= From 09c069c774b341454c580e2650dcc0554a6b0505 Mon Sep 17 00:00:00 2001 From: kkumar-gcc Date: Thu, 8 Aug 2024 11:37:02 +0530 Subject: [PATCH 6/8] add tests for streaming --- context_response_test.go | 84 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/context_response_test.go b/context_response_test.go index 4f03d6a..59a029d 100644 --- a/context_response_test.go +++ b/context_response_test.go @@ -1,6 +1,7 @@ package fiber import ( + "bufio" "fmt" "io" "net/http" @@ -701,3 +702,86 @@ func TestResponse_Status(t *testing.T) { }) } } + +func TestResponse_Stream(t *testing.T) { + var ( + err error + fiber *Route + req *http.Request + mockConfig *configmocks.Config + ) + + beforeEach := func() { + mockConfig = &configmocks.Config{} + mockConfig.On("GetBool", "http.drivers.fiber.prefork", false).Return(false).Once() + mockConfig.On("GetInt", "http.drivers.fiber.body_limit", 4096).Return(4096).Once() + mockConfig.On("GetInt", "http.drivers.fiber.header_limit", 4096).Return(4096).Once() + ConfigFacade = mockConfig + } + + tests := []struct { + name string + method string + url string + setup func(method, url string) error + output []string + }{ + { + name: "Stream", + method: "GET", + url: "/stream", + setup: func(method, url string) error { + fiber.Get("/stream", func(ctx contractshttp.Context) contractshttp.Response { + return ctx.Response().Status(http.StatusCreated).Stream(func(w contractshttp.StreamWriter) error { + b := []string{"a", "b", "c", "c", "c", "c", "c"} + for _, a := range b { + if _, err := w.Write([]byte(a + "\n")); err != nil { + return err + } + + if err := w.Flush(); err != nil { + return err + } + } + + return nil + }) + }) + + var err error + req, err = http.NewRequest(method, url, nil) + if err != nil { + return err + } + + return nil + }, + output: []string{"a", "b", "c", "c", "c", "c", "c"}, + }, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + beforeEach() + fiber, err = NewRoute(mockConfig, nil) + assert.Nil(t, err) + + err := test.setup(test.method, test.url) + assert.Nil(t, err) + + resp, err := fiber.Test(req) + assert.NoError(t, err) + + scanner := bufio.NewScanner(resp.Body) + var output []string + for scanner.Scan() { + output = append(output, scanner.Text()) + } + + assert.Equal(t, test.output, output) + + mockConfig.AssertExpectations(t) + }) + } + +} From 6eb594b07564e9bd2679c077c0298b5b0cc9050c Mon Sep 17 00:00:00 2001 From: kkumar-gcc Date: Thu, 8 Aug 2024 21:10:05 +0530 Subject: [PATCH 7/8] optimize test --- context_response_test.go | 90 ++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 58 deletions(-) diff --git a/context_response_test.go b/context_response_test.go index 59a029d..b8a1cf3 100644 --- a/context_response_test.go +++ b/context_response_test.go @@ -713,75 +713,49 @@ func TestResponse_Stream(t *testing.T) { beforeEach := func() { mockConfig = &configmocks.Config{} - mockConfig.On("GetBool", "http.drivers.fiber.prefork", false).Return(false).Once() - mockConfig.On("GetInt", "http.drivers.fiber.body_limit", 4096).Return(4096).Once() - mockConfig.On("GetInt", "http.drivers.fiber.header_limit", 4096).Return(4096).Once() + mockConfig.EXPECT().GetBool("http.drivers.fiber.prefork", false).Return(false).Once() + mockConfig.EXPECT().GetInt("http.drivers.fiber.body_limit", 4096).Return(4096).Once() + mockConfig.EXPECT().GetInt("http.drivers.fiber.header_limit", 4096).Return(4096).Once() ConfigFacade = mockConfig } - tests := []struct { - name string - method string - url string - setup func(method, url string) error - output []string - }{ - { - name: "Stream", - method: "GET", - url: "/stream", - setup: func(method, url string) error { - fiber.Get("/stream", func(ctx contractshttp.Context) contractshttp.Response { - return ctx.Response().Status(http.StatusCreated).Stream(func(w contractshttp.StreamWriter) error { - b := []string{"a", "b", "c", "c", "c", "c", "c"} - for _, a := range b { - if _, err := w.Write([]byte(a + "\n")); err != nil { - return err - } - - if err := w.Flush(); err != nil { - return err - } - } - - return nil - }) - }) + t.Run("Stream", func(t *testing.T) { + beforeEach() + fiber, err = NewRoute(mockConfig, nil) + assert.Nil(t, err) + + fiber.Get("/stream", func(ctx contractshttp.Context) contractshttp.Response { + return ctx.Response().Status(http.StatusCreated).Stream(func(w contractshttp.StreamWriter) error { + b := []string{"a", "b", "c"} + for _, a := range b { + if _, err := w.Write([]byte(a + "\n")); err != nil { + return err + } - var err error - req, err = http.NewRequest(method, url, nil) - if err != nil { - return err + if err := w.Flush(); err != nil { + return err + } } return nil - }, - output: []string{"a", "b", "c", "c", "c", "c", "c"}, - }, - } + }) + }) - for _, test := range tests { - t.Run(test.name, func(t *testing.T) { - beforeEach() - fiber, err = NewRoute(mockConfig, nil) - assert.Nil(t, err) + req, err = http.NewRequest("GET", "/stream", nil) + assert.Nil(t, err) - err := test.setup(test.method, test.url) - assert.Nil(t, err) - - resp, err := fiber.Test(req) - assert.NoError(t, err) + resp, err := fiber.Test(req) + assert.NoError(t, err) - scanner := bufio.NewScanner(resp.Body) - var output []string - for scanner.Scan() { - output = append(output, scanner.Text()) - } + scanner := bufio.NewScanner(resp.Body) + var output []string + for scanner.Scan() { + output = append(output, scanner.Text()) + } - assert.Equal(t, test.output, output) + assert.Equal(t, []string{"a", "b", "c"}, output) - mockConfig.AssertExpectations(t) - }) - } + mockConfig.AssertExpectations(t) + }) } From 47d350764dd58b9394c0ded31550ae586cca0c71 Mon Sep 17 00:00:00 2001 From: kkumar-gcc Date: Fri, 9 Aug 2024 21:51:16 +0530 Subject: [PATCH 8/8] fix:test --- context_response_test.go | 75 +++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 44 deletions(-) diff --git a/context_response_test.go b/context_response_test.go index b8a1cf3..d37fbdb 100644 --- a/context_response_test.go +++ b/context_response_test.go @@ -704,58 +704,45 @@ func TestResponse_Status(t *testing.T) { } func TestResponse_Stream(t *testing.T) { - var ( - err error - fiber *Route - req *http.Request - mockConfig *configmocks.Config - ) - - beforeEach := func() { - mockConfig = &configmocks.Config{} - mockConfig.EXPECT().GetBool("http.drivers.fiber.prefork", false).Return(false).Once() - mockConfig.EXPECT().GetInt("http.drivers.fiber.body_limit", 4096).Return(4096).Once() - mockConfig.EXPECT().GetInt("http.drivers.fiber.header_limit", 4096).Return(4096).Once() - ConfigFacade = mockConfig - } - - t.Run("Stream", func(t *testing.T) { - beforeEach() - fiber, err = NewRoute(mockConfig, nil) - assert.Nil(t, err) - - fiber.Get("/stream", func(ctx contractshttp.Context) contractshttp.Response { - return ctx.Response().Status(http.StatusCreated).Stream(func(w contractshttp.StreamWriter) error { - b := []string{"a", "b", "c"} - for _, a := range b { - if _, err := w.Write([]byte(a + "\n")); err != nil { - return err - } + mockConfig := &configmocks.Config{} + mockConfig.EXPECT().GetBool("http.drivers.fiber.prefork", false).Return(false).Once() + mockConfig.EXPECT().GetInt("http.drivers.fiber.body_limit", 4096).Return(4096).Once() + mockConfig.EXPECT().GetInt("http.drivers.fiber.header_limit", 4096).Return(4096).Once() + + fiber, err := NewRoute(mockConfig, nil) + assert.Nil(t, err) + + fiber.Get("/stream", func(ctx contractshttp.Context) contractshttp.Response { + return ctx.Response().Status(http.StatusCreated).Stream(func(w contractshttp.StreamWriter) error { + b := []string{"a", "b", "c"} + for _, a := range b { + if _, err := w.Write([]byte(a + "\n")); err != nil { + return err + } - if err := w.Flush(); err != nil { - return err - } + if err := w.Flush(); err != nil { + return err } + } - return nil - }) + return nil }) + }) - req, err = http.NewRequest("GET", "/stream", nil) - assert.Nil(t, err) + req, err := http.NewRequest("GET", "/stream", nil) + assert.Nil(t, err) - resp, err := fiber.Test(req) - assert.NoError(t, err) + resp, err := fiber.Test(req) + assert.NoError(t, err) - scanner := bufio.NewScanner(resp.Body) - var output []string - for scanner.Scan() { - output = append(output, scanner.Text()) - } + scanner := bufio.NewScanner(resp.Body) + var output []string + for scanner.Scan() { + output = append(output, scanner.Text()) + } - assert.Equal(t, []string{"a", "b", "c"}, output) + assert.Equal(t, []string{"a", "b", "c"}, output) - mockConfig.AssertExpectations(t) - }) + mockConfig.AssertExpectations(t) }