sync: update from connectors monorepo

nativebpm-bot · nativebpm-bot · commit d0664217f759 · 2025-10-12T04:39:01.000Z
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ go get github.com/nativebpm/gotenberg
 - **LibreOffice**: Convert Office documents (Word, Excel, PowerPoint) to PDF
 - **PDF Engines**: Merge, split, and manipulate PDFs
 - **Webhook support**: Async conversions with callback URLs
-- **Stream-first**: Built on `streamhttp` for efficient multipart uploads
+- **Stream-first**: Built on `httpstream` for efficient multipart uploads
 
 ## Conversion Engines
 
diff --git a/examples/cmd/chromium/converturl/main.go b/examples/cmd/chromium/converturl/main.go
@@ -12,7 +12,7 @@ import (
 )
 
 func main() {
-	client, err := gotenberg.NewClient(http.Client{}, "http://localhost:3000")
+	client, err := gotenberg.NewClient(&http.Client{}, "http://localhost:3000")
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/cmd/chromium/helloworld/main.go b/examples/cmd/chromium/helloworld/main.go
@@ -12,7 +12,7 @@ import (
 )
 
 func main() {
-	client, err := gotenberg.NewClient(http.Client{}, "http://localhost:3000")
+	client, err := gotenberg.NewClient(&http.Client{}, "http://localhost:3000")
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/cmd/chromium/markdown/main.go b/examples/cmd/chromium/markdown/main.go
@@ -14,7 +14,7 @@ import (
 )
 
 func main() {
-	httpClient := http.Client{
+	httpClient := &http.Client{
 		Timeout: 30 * time.Second,
 	}
 
diff --git a/examples/cmd/chromium/timeout/main.go b/examples/cmd/chromium/timeout/main.go
@@ -18,7 +18,7 @@ func main() {
 	time.Sleep(100 * time.Millisecond)
 
 	// Create client pointing to real Gotenberg server
-	client, err := gotenberg.NewClient(http.Client{}, "http://localhost:3000")
+	client, err := gotenberg.NewClient(&http.Client{}, "http://localhost:3000")
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/cmd/chromium/trace/main.go b/examples/cmd/chromium/trace/main.go
@@ -12,7 +12,7 @@ import (
 )
 
 func main() {
-	client, err := gotenberg.NewClient(http.Client{}, "http://localhost:3000")
+	client, err := gotenberg.NewClient(&http.Client{}, "http://localhost:3000")
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/cmd/chromium/webhook/main.go b/examples/cmd/chromium/webhook/main.go
@@ -48,7 +48,7 @@ func main() {
 
 	gotenbergURL := `http://localhost:3000`
 
-	httpClient := http.Client{
+	httpClient := &http.Client{
 		Timeout: 90 * time.Second,
 	}
 
diff --git a/examples/cmd/health/main.go b/examples/cmd/health/main.go
@@ -10,7 +10,7 @@ import (
 )
 
 func main() {
-	client, err := gotenberg.NewClient(http.Client{}, "http://localhost:3000")
+	client, err := gotenberg.NewClient(&http.Client{}, "http://localhost:3000")
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/cmd/libreoffice/convert/main.go b/examples/cmd/libreoffice/convert/main.go
@@ -13,7 +13,7 @@ import (
 
 func main() {
 	// Create a Gotenberg client
-	client, err := gotenberg.NewClient(http.Client{}, "http://localhost:3000")
+	client, err := gotenberg.NewClient(&http.Client{}, "http://localhost:3000")
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/cmd/pdfengines/merge/main.go b/examples/cmd/pdfengines/merge/main.go
@@ -13,7 +13,7 @@ import (
 
 func main() {
 	// Create a Gotenberg client
-	client, err := gotenberg.NewClient(http.Client{}, "http://localhost:3000")
+	client, err := gotenberg.NewClient(&http.Client{}, "http://localhost:3000")
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/go.mod b/go.mod
@@ -2,4 +2,4 @@ module github.com/nativebpm/gotenberg
 
 go 1.21
 
-require github.com/nativebpm/connectors/streamhttp v1.0.1
+require github.com/nativebpm/connectors/httpstream v0.0.1
diff --git a/go.sum b/go.sum
@@ -1,2 +1,2 @@
-github.com/nativebpm/connectors/streamhttp v1.0.1 h1:9E1jx9+yts3bCEoHcMYeyw/MgSrODkkro15SfC65rpU=
-github.com/nativebpm/connectors/streamhttp v1.0.1/go.mod h1:bUBu284aYzl/NEJykPaufubHYIUy0WMUPnVQn/AXHX4=
+github.com/nativebpm/connectors/httpstream v0.0.1 h1:QEAUngoC0nXBghGcIT0NwtFj9222L+GZnvAQbkuqxCA=
+github.com/nativebpm/connectors/httpstream v0.0.1/go.mod h1:nBNkMFg6xXbhDVT9h54UtDsRFCpsJnuwy0X1QXNXJIo=
diff --git a/gotenberg.go b/gotenberg.go
@@ -9,7 +9,7 @@ import (
 	"github.com/nativebpm/gotenberg/internal/gotenberg"
 	"github.com/nativebpm/gotenberg/internal/libreoffice"
 	"github.com/nativebpm/gotenberg/internal/pdfengines"
-	"github.com/nativebpm/connectors/streamhttp"
+	"github.com/nativebpm/connectors/httpstream"
 )
 
 // Re-export common types for easier access.
@@ -18,31 +18,35 @@ type Response = gotenberg.Response
 // Client is a Gotenberg HTTP client that wraps the base HTTP client
 // with Gotenberg-specific functionality for document conversion.
 type Client struct {
-	client *streamhttp.Client
+	HttpStream *httpstream.Client
 }
 
 // NewClient creates a new Gotenberg client with the given HTTP client and base URL.
 // Returns an error if the base URL is invalid.
-func NewClient(httpClient http.Client, baseURL string,
-	middlewares ...func(http.RoundTripper) http.RoundTripper) (*Client, error) {
-	client, err := streamhttp.NewClient(httpClient, baseURL, middlewares...)
+func NewClient(httpClient *http.Client, baseURL string) (*Client, error) {
+	client, err := httpstream.NewClient(httpClient, baseURL)
 	if err != nil {
 		return nil, err
 	}
 
 	return &Client{
-		client: client,
+		HttpStream: client,
 	}, nil
 }
 
+func (c *Client) Use(middleware func(http.RoundTripper) http.RoundTripper) *Client {
+	c.HttpStream = c.HttpStream.Use(middleware)
+	return c
+}
+
 func (c *Client) Chromium() *chromium.Chromium {
-	return chromium.NewChromium(c.client)
+	return chromium.NewChromium(c.HttpStream)
 }
 
 func (c *Client) LibreOffice() *libreoffice.LibreOffice {
-	return libreoffice.NewLibreOffice(c.client)
+	return libreoffice.NewLibreOffice(c.HttpStream)
 }
 
 func (c *Client) PDFEngines() *pdfengines.PDFEngines {
-	return pdfengines.NewPDFEngines(c.client)
+	return pdfengines.NewPDFEngines(c.HttpStream)
 }
diff --git a/health.go b/health.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"io"
 
-	"github.com/nativebpm/connectors/streamhttp"
+	"github.com/nativebpm/connectors/httpstream"
 )
 
 // HealthResponse represents the response from the health check endpoint.
@@ -17,7 +17,7 @@ type HealthResponse struct {
 // GetHealth performs a health check on the Gotenberg service.
 // It returns the overall status and details about each module (e.g., Chromium, LibreOffice).
 func (c *Client) GetHealth(ctx context.Context) (*HealthResponse, error) {
-	resp, err := c.client.Request(ctx, streamhttp.GET, "/health").Send()
+	resp, err := c.HttpStream.Request(ctx, httpstream.GET, "/health").Send()
 	if err != nil {
 		return nil, err
 	}
@@ -32,7 +32,7 @@ func (c *Client) GetHealth(ctx context.Context) (*HealthResponse, error) {
 }
 
 func (c *Client) GetVersion(ctx context.Context) (string, error) {
-	resp, err := c.client.Request(ctx, streamhttp.GET, "/version").Send()
+	resp, err := c.HttpStream.Request(ctx, httpstream.GET, "/version").Send()
 	if err != nil {
 		return "", err
 	}
@@ -47,7 +47,7 @@ func (c *Client) GetVersion(ctx context.Context) (string, error) {
 }
 
 func (c *Client) GetMetrics(ctx context.Context) (string, error) {
-	resp, err := c.client.Request(ctx, streamhttp.GET, "/prometheus/metrics").Send()
+	resp, err := c.HttpStream.Request(ctx, httpstream.GET, "/prometheus/metrics").Send()
 	if err != nil {
 		return "", err
 	}
diff --git a/internal/chromium/chromium.go b/internal/chromium/chromium.go
@@ -9,15 +9,15 @@ import (
 	"time"
 
 	"github.com/nativebpm/gotenberg/internal/gotenberg"
-	"github.com/nativebpm/connectors/streamhttp"
+	"github.com/nativebpm/connectors/httpstream"
 )
 
 // Chromium represents a Gotenberg conversion request builder.
 type Chromium struct {
 	*gotenberg.Gotenberg
 }
 
-func NewChromium(client *streamhttp.Client) *Chromium {
+func NewChromium(client *httpstream.Client) *Chromium {
 	return &Chromium{
 		Gotenberg: gotenberg.NewGotenberg(client),
 	}
@@ -26,37 +26,37 @@ func NewChromium(client *streamhttp.Client) *Chromium {
 // ConvertHTML creates a request to convert HTML content to PDF.
 // The html parameter should contain the HTML content to be converted.
 func (r *Chromium) ConvertHTML(ctx context.Context, html io.Reader) *Chromium {
-	r.Req = r.Client.Multipart(ctx, "/forms/chromium/convert/html").File("files", "index.html", html)
+	r.Req = r.HttpStream.Multipart(ctx, "/forms/chromium/convert/html").File("files", "index.html", html)
 	return r
 }
 
 // ConvertURL creates a request to convert a web page at the given URL to PDF.
 func (r *Chromium) ConvertURL(ctx context.Context, url string) *Chromium {
-	r.Req = r.Client.Multipart(ctx, "/forms/chromium/convert/url").Param("url", url)
+	r.Req = r.HttpStream.Multipart(ctx, "/forms/chromium/convert/url").Param("url", url)
 	return r
 }
 
 // ConvertMarkdown creates a request to convert Markdown content to PDF.
 func (r *Chromium) ConvertMarkdown(ctx context.Context, html io.Reader) *Chromium {
-	r.Req = r.Client.Multipart(ctx, "/forms/chromium/convert/markdown").File("files", "index.html", html)
+	r.Req = r.HttpStream.Multipart(ctx, "/forms/chromium/convert/markdown").File("files", "index.html", html)
 	return r
 }
 
 // ScreenshotURL creates a request to take a screenshot of a web page at the given URL.
 func (r *Chromium) ScreenshotURL(ctx context.Context, url string) *Chromium {
-	r.Req = r.Client.Multipart(ctx, "/forms/chromium/screenshot/url").Param("url", url)
+	r.Req = r.HttpStream.Multipart(ctx, "/forms/chromium/screenshot/url").Param("url", url)
 	return r
 }
 
 // ScreenshotHTML creates a request to take a screenshot of HTML content.
 func (r *Chromium) ScreenshotHTML(ctx context.Context, html io.Reader) *Chromium {
-	r.Req = r.Client.Multipart(ctx, "/forms/chromium/screenshot/html").File("files", "index.html", html)
+	r.Req = r.HttpStream.Multipart(ctx, "/forms/chromium/screenshot/html").File("files", "index.html", html)
 	return r
 }
 
 // ScreenshotMarkdown creates a request to take a screenshot of Markdown content.
 func (r *Chromium) ScreenshotMarkdown(ctx context.Context, html io.Reader) *Chromium {
-	r.Req = r.Client.Multipart(ctx, "/forms/chromium/screenshot/markdown").File("files", "index.html", html)
+	r.Req = r.HttpStream.Multipart(ctx, "/forms/chromium/screenshot/markdown").File("files", "index.html", html)
 	return r
 }
 
diff --git a/internal/gotenberg/gotenberg.go b/internal/gotenberg/gotenberg.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/nativebpm/connectors/streamhttp"
+	"github.com/nativebpm/connectors/httpstream"
 )
 
 type downloadFrom struct {
@@ -25,17 +25,17 @@ type Response struct {
 // Gotenberg provides common functionality for building Gotenberg requests.
 // It wraps the underlying multipart request and provides shared methods.
 type Gotenberg struct {
-	Client *streamhttp.Client
-	Req    *streamhttp.Multipart
-	Wh     map[string]string
-	Meta   map[string]string
-	Df     []downloadFrom
+	HttpStream *httpstream.Client
+	Req        *httpstream.Multipart
+	Wh         map[string]string
+	Meta       map[string]string
+	Df         []downloadFrom
 }
 
 // NewGotenberg creates a new RequestBuilder with the given client.
-func NewGotenberg(client *streamhttp.Client) *Gotenberg {
+func NewGotenberg(httpStream *httpstream.Client) *Gotenberg {
 	return &Gotenberg{
-		Client: client,
+		HttpStream: httpStream,
 	}
 }
 
diff --git a/internal/libreoffice/libreoffice.go b/internal/libreoffice/libreoffice.go
@@ -9,15 +9,15 @@ import (
 	"time"
 
 	"github.com/nativebpm/gotenberg/internal/gotenberg"
-	"github.com/nativebpm/connectors/streamhttp"
+	"github.com/nativebpm/connectors/httpstream"
 )
 
 // LibreOffice represents a Gotenberg conversion request builder.
 type LibreOffice struct {
 	*gotenberg.Gotenberg
 }
 
-func NewLibreOffice(client *streamhttp.Client) *LibreOffice {
+func NewLibreOffice(client *httpstream.Client) *LibreOffice {
 	return &LibreOffice{
 		Gotenberg: gotenberg.NewGotenberg(client),
 	}
@@ -26,7 +26,7 @@ func NewLibreOffice(client *streamhttp.Client) *LibreOffice {
 // Convert creates a request to convert Office documents to PDF.
 // The files parameter should contain the Office documents to be converted.
 func (r *LibreOffice) Convert(ctx context.Context) *LibreOffice {
-	r.Req = r.Client.Multipart(ctx, "/forms/libreoffice/convert")
+	r.Req = r.HttpStream.Multipart(ctx, "/forms/libreoffice/convert")
 	return r
 }
 
diff --git a/internal/pdfengines/pdfengines.go b/internal/pdfengines/pdfengines.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/nativebpm/gotenberg/internal/gotenberg"
-	"github.com/nativebpm/connectors/streamhttp"
+	"github.com/nativebpm/connectors/httpstream"
 )
 
 // PDFEngines represents a Gotenberg conversion request builder.
@@ -17,45 +17,45 @@ type PDFEngines struct {
 	*gotenberg.Gotenberg
 }
 
-func NewPDFEngines(client *streamhttp.Client) *PDFEngines {
+func NewPDFEngines(client *httpstream.Client) *PDFEngines {
 	return &PDFEngines{
 		Gotenberg: gotenberg.NewGotenberg(client),
 	}
 }
 
 // Convert creates a request to convert PDFs to PDF/A & PDF/UA.
 func (r *PDFEngines) Convert(ctx context.Context) *PDFEngines {
-	r.Req = r.Client.Multipart(ctx, "/forms/pdfengines/convert")
+	r.Req = r.HttpStream.Multipart(ctx, "/forms/pdfengines/convert")
 	return r
 }
 
 // MetadataRead creates a request to read metadata from PDFs.
 func (r *PDFEngines) MetadataRead(ctx context.Context) *PDFEngines {
-	r.Req = r.Client.Multipart(ctx, "/forms/pdfengines/metadata/read")
+	r.Req = r.HttpStream.Multipart(ctx, "/forms/pdfengines/metadata/read")
 	return r
 }
 
 // MetadataWrite creates a request to write metadata to PDFs.
 func (r *PDFEngines) MetadataWrite(ctx context.Context) *PDFEngines {
-	r.Req = r.Client.Multipart(ctx, "/forms/pdfengines/metadata/write")
+	r.Req = r.HttpStream.Multipart(ctx, "/forms/pdfengines/metadata/write")
 	return r
 }
 
 // Merge creates a request to merge PDFs.
 func (r *PDFEngines) Merge(ctx context.Context) *PDFEngines {
-	r.Req = r.Client.Multipart(ctx, "/forms/pdfengines/merge")
+	r.Req = r.HttpStream.Multipart(ctx, "/forms/pdfengines/merge")
 	return r
 }
 
 // Split creates a request to split PDFs.
 func (r *PDFEngines) Split(ctx context.Context) *PDFEngines {
-	r.Req = r.Client.Multipart(ctx, "/forms/pdfengines/split")
+	r.Req = r.HttpStream.Multipart(ctx, "/forms/pdfengines/split")
 	return r
 }
 
 // Flatten creates a request to flatten PDFs.
 func (r *PDFEngines) Flatten(ctx context.Context) *PDFEngines {
-	r.Req = r.Client.Multipart(ctx, "/forms/pdfengines/flatten")
+	r.Req = r.HttpStream.Multipart(ctx, "/forms/pdfengines/flatten")
 	return r
 }
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func main() {`
`15`		`- client, err := gotenberg.NewClient(http.Client{}, "http://localhost:3000")`
	`15`	`+ client, err := gotenberg.NewClient(&http.Client{}, "http://localhost:3000")`
`16`	`16`	`if err != nil {`
`17`	`17`	`log.Fatal(err)`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func main() {`
`17`		`- httpClient := http.Client{`
	`17`	`+ httpClient := &http.Client{`
`18`	`18`	`Timeout: 30 * time.Second,`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ func main() {`
`18`	`18`	`time.Sleep(100 * time.Millisecond)`
`19`	`19`
`20`	`20`	`// Create client pointing to real Gotenberg server`
`21`		`- client, err := gotenberg.NewClient(http.Client{}, "http://localhost:3000")`
	`21`	`+ client, err := gotenberg.NewClient(&http.Client{}, "http://localhost:3000")`
`22`	`22`	`if err != nil {`
`23`	`23`	`log.Fatal(err)`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func main() {`
`48`	`48`
`49`	`49`	gotenbergURL := `http://localhost:3000`
`50`	`50`
`51`		`- httpClient := http.Client{`
	`51`	`+ httpClient := &http.Client{`
`52`	`52`	`Timeout: 90 * time.Second,`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func main() {`
`13`		`- client, err := gotenberg.NewClient(http.Client{}, "http://localhost:3000")`
	`13`	`+ client, err := gotenberg.NewClient(&http.Client{}, "http://localhost:3000")`
`14`	`14`	`if err != nil {`
`15`	`15`	`log.Fatal(err)`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`
`14`	`14`	`func main() {`
`15`	`15`	`// Create a Gotenberg client`
`16`		`- client, err := gotenberg.NewClient(http.Client{}, "http://localhost:3000")`
	`16`	`+ client, err := gotenberg.NewClient(&http.Client{}, "http://localhost:3000")`
`17`	`17`	`if err != nil {`
`18`	`18`	`log.Fatal(err)`
`19`	`19`	`}`