latest

Dockerfile

@@ -1,5 +1,6 @@
 FROM chromedp/headless-shell
-ADD wrp /wrp
+ARG TARGETARCH
+ADD wrp-${TARGETARCH}-linux /wrp
 ENTRYPOINT ["/wrp"]
 ENV PATH="/headless-shell:${PATH}"
 LABEL maintainer="as@tenoware.com"

Makefile

@@ -14,14 +14,9 @@ cross:
 	GOOS=linux GOARCH=arm64 go build -a -o wrp-arm64-linux wrp.go
 
 docker: wrp
-	docker build -t tenox7/wrp:latest .
-
-dockerhub:
-	docker push tenox7/wrp:latest
-
-gcrio:
-	docker tag tenox7/wrp:latest gcr.io/tenox7/wrp
-	docker push gcr.io/tenox7/wrp
+	GOOS=linux GOARCH=amd64 go build -a -o wrp-amd64-linux wrp.go
+	GOOS=linux GOARCH=arm64 go build -a -o wrp-arm64-linux wrp.go
+	docker buildx build --platform linux/amd64,linux/arm64 -t tenox7/wrp:latest --push .
 
 clean:
 	rm -rf wrp-* wrp

README.md

@@ -52,33 +52,31 @@ used with PNG and lots of memory on a client side.
 
 **< ^ v >** are arrow keys, typically for navigating a map, buggy.
 
-### UI Customization 
+### UI Customization
 
 WRP supports customizing it's own UI using HTML Template file. Download [wrp.html](wrp.html) place in the same directory with wrp binary customize it to your liking.
 
 ## Docker
 
 ```shell
-$ docker run -d -p 80:8080 tenox7/wrp
+$ docker run -d -p 8080:8080 tenox7/wrp:latest
 ```
 
 ## Google Cloud Run
 
 ```shell
-$ gcloud run deploy --platform managed --image=gcr.io/tenox7/wrp:latest --memory=2Gi --args='-t=png','-g=1280x0x256'
+$ gcloud run deploy --platform managed --image=tenox7/wrp:latest --memory=2Gi --args='-t=png','-g=1280x0x256'
 ```
 
-Or from [Gcloud Console](https://console.cloud.google.com/run). Use `gcr.io/tenox7/wrp:latest` as container image URL.
-
-Note that unfortunately GCR forces https. Your browser support of encryption protocols and certification authorities will vary. 
+Note that unfortunately GCR forces https. Your browser support of encryption protocols and certification authorities will vary.
 
 ## Azure Container Instances
 
 ```shell
-$ az container create --resource-group wrp --name wrp --image gcr.io/tenox7/wrp:latest --cpu 1 --memory 2 --ports 80 --protocol tcp --os-type Linux --ip-address Public --command-line '/wrp -l :80 -t png -g 1280x0x256'
+$ az container create --resource-group wrp --name wrp --image tenox7/wrp:latest --cpu 1 --memory 2 --ports 80 --protocol tcp --os-type Linux --ip-address Public --command-line '/wrp -l :80 -t png -g 1280x0x256'
 ```
 
-Or from the [Azure Console](https://portal.azure.com/#create/Microsoft.ContainerInstances). Use `gcr.io/tenox7/wrp:latest` or `tenox7/wrp:latest` for image name.
+Or from the [Azure Console](https://portal.azure.com/#create/Microsoft.ContainerInstances). Use `tenox7/wrp:latest` for image name.
 
 Fortunately ACI allows port 80 without encryption.
 
@@ -94,6 +92,7 @@ Fortunately ACI allows port 80 without encryption.
 -d   chromedp debug logging (default false)
 -n   do not free maps and images after use (default false)
 -ui  html template file (default "wrp.html")
+-ua  user agent, override the default "headless" agent
 -s   delay/sleep after page is rendered before screenshot is taken (default 2s)
 ```
 
@@ -106,12 +105,22 @@ Fortunately ACI allows port 80 without encryption.
 
 ### I can't get it to run
 
-This program does not have a GUI and is run from the command line. You may need to enable executable bit on Unix systems, for example:
+This program does not have a GUI and is run from the command line. After downloading, you may need to enable executable bit on Unix systems, for example:
 
 ```shell
 $ cd ~/Downloads
 $ chmod +x wrp-amd64-macos
-$ ./wrp-amd64-macos -t png
+$ ./wrp-amd64-macos
+```
+
+### Websites are blocking headless browsers
+
+This is a well known issue. WRP has some provisions to work around it, but it's a cat and mouse game. The first and
+foremost recommendation is to change `User Agent`, so that it doesn't say "headless". Add `-ua="my agent"` to override the default one.
+Obtain your regular desktop browser user agent and specify it as the flag. For example
+
+```shell
+$ wrp -ua="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36"
 ```
 
 ## History
@@ -120,10 +129,11 @@ $ ./wrp-amd64-macos -t png
 * Version 2.0 became a stand alone http-proxy server, supporting both Linux and MacOS, [another post](https://virtuallyfun.com/wordpress/2014/03/11/web-rendering-proxy-update//).
 * In 2016 thanks to EFF/Certbot the whole internet migrated to HTTPS/SSL/TLS and WRP largely stopped working. Python code became unmaintainable and there was no easy way to make it work on Windows, even under WSL.
 * Version 3.0 (2019) has been rewritten in [Go](https://golang.org/) using [Chromedp](https://github.com/chromedp) as browser-in-browser instead of http-proxy. The initial version was [less than 100 lines of code](https://gist.github.com/tenox7/b0f03c039b0a8b67f6c1bf47e2dd0df0).
-* Version 4.0 has been completely refactored to use mouse clicks via imagemap instead parsing a href nodes. 
+* Version 4.0 has been completely refactored to use mouse clicks via imagemap instead parsing a href nodes.
 * Version 4.1 added sending keystrokes in to input boxes. You can now login to Gmail. Also now runs as a Docker container and on Cloud Run/Azure Containers.
 * Version 4.5 introduces rendering whole pages in to a single tall image with client scrolling.
 * Version 4.6 adds blazing fast gif encoding by [Hill Ma](https://github.com/mahiuchun).
+* Version 4.6.3 adds arm64 / aarch64 Docker container support - you can run it on Raspberry PI!
 
 ## Credits
 
@@ -136,6 +146,8 @@ $ ./wrp-amd64-macos -t png
 
 ## Legal Stuff
 
-License: Apache 2.0  
-Copyright (c) 2013-2018 Antoni Sawicki  
-Copyright (c) 2019-2022 Google LLC
+```text
+License: Apache 2.0
+Copyright (c) 2013-2024 Antoni Sawicki
+Copyright (c) 2019-2024 Google LLC
+```

go.mod

@@ -4,8 +4,8 @@ go 1.21.5
 
 require (
 	github.com/MaxHalford/halfgone v0.0.0-20171017091812-482157b86ccb
-	github.com/chromedp/cdproto v0.0.0-20231205062650-00455a960d61
-	github.com/chromedp/chromedp v0.9.3
+	github.com/chromedp/cdproto v0.0.0-20240519224452-66462be74baa
+	github.com/chromedp/chromedp v0.9.5
 	github.com/soniakeys/quant v1.0.0
 )
 
@@ -13,8 +13,8 @@ require (
 	github.com/chromedp/sysutil v1.0.0 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
-	github.com/gobwas/ws v1.3.1 // indirect
+	github.com/gobwas/ws v1.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
 )

go.sum

@@ -3,8 +3,13 @@ github.com/MaxHalford/halfgone v0.0.0-20171017091812-482157b86ccb/go.mod h1:J86X
 github.com/chromedp/cdproto v0.0.0-20231011050154-1d073bb38998/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
 github.com/chromedp/cdproto v0.0.0-20231205062650-00455a960d61 h1:XD280QPATe9jaz20dylKe3vBsNcH1w3mkssGY0lidn8=
 github.com/chromedp/cdproto v0.0.0-20231205062650-00455a960d61/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
+github.com/chromedp/cdproto v0.0.0-20240202021202-6d0b6a386732/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
+github.com/chromedp/cdproto v0.0.0-20240519224452-66462be74baa h1:T3Ho4BWIkoEoMPCj90W2HIPF/k56qk4JWzTs6JUBxVw=
+github.com/chromedp/cdproto v0.0.0-20240519224452-66462be74baa/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
 github.com/chromedp/chromedp v0.9.3 h1:Wq58e0dZOdHsxaj9Owmfcf+ibtpYN1N0FWVbaxa/esg=
 github.com/chromedp/chromedp v0.9.3/go.mod h1:NipeUkUcuzIdFbBP8eNNvl9upcceOfWzoJn6cRe4ksA=
+github.com/chromedp/chromedp v0.9.5 h1:viASzruPJOiThk7c5bueOUY91jGLJVximoEMGoH93rg=
+github.com/chromedp/chromedp v0.9.5/go.mod h1:D4I2qONslauw/C7INoCir1BJkSwBYMyZgx8X276z3+Y=
 github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic=
 github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww=
 github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
@@ -14,6 +19,9 @@ github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6Wezm
 github.com/gobwas/ws v1.3.0/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
 github.com/gobwas/ws v1.3.1 h1:Qi34dfLMWJbiKaNbDVzM9x27nZBjmkaW6i4+Ku+pGVU=
 github.com/gobwas/ws v1.3.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
+github.com/gobwas/ws v1.3.2/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
+github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
+github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo=
@@ -27,3 +35,6 @@ github.com/soniakeys/quant v1.0.0/go.mod h1:HI1k023QuVbD4H8i9YdfZP2munIHU4QpjsIm
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

wrp.go

@@ -1,8 +1,8 @@
 //
 // WRP - Web Rendering Proxy
 //
-// Copyright (c) 2013-2018 Antoni Sawicki
-// Copyright (c) 2019-2022 Google LLC
+// Copyright (c) 2013-2024 Antoni Sawicki
+// Copyright (c) 2019-2024 Google LLC
 //
 
 package main
@@ -29,6 +29,7 @@ import (
 	"net/url"
 	"os"
 	"os/signal"
+	"runtime"
 	"strconv"
 	"strings"
 	"syscall"
@@ -42,7 +43,7 @@ import (
 	"github.com/soniakeys/quant/median"
 )
 
-const version = "4.6.0"
+const version = "4.6.3"
 
 var (
 	addr        = flag.String("l", ":8080", "Listen address:port, default :8080")
@@ -53,6 +54,7 @@ var (
 	fgeom       = flag.String("g", "1152x600x216", "Geometry: width x height x colors, height can be 0 for unlimited")
 	htmFnam     = flag.String("ui", "wrp.html", "HTML template file for the UI")
 	delay       = flag.Duration("s", 2*time.Second, "Delay/sleep after page is rendered and before screenshot is taken")
+	userAgent   = flag.String("ua", "", "override chrome user agent")
 	srv         http.Server
 	actx, ctx   context.Context
 	acncl, cncl context.CancelFunc
@@ -547,8 +549,9 @@ func printIPs(b string) {
 // Main
 func main() {
 	var err error
+	log.SetFlags(log.LstdFlags | log.Lshortfile)
 	flag.Parse()
-	log.Printf("Web Rendering Proxy Version %s\n", version)
+	log.Printf("Web Rendering Proxy Version %s (%v)\n", version, runtime.GOARCH)
 	log.Printf("Args: %q", os.Args)
 	if len(os.Getenv("PORT")) > 0 {
 		*addr = ":" + os.Getenv(("PORT"))
@@ -562,7 +565,12 @@ func main() {
 	opts := append(chromedp.DefaultExecAllocatorOptions[:],
 		chromedp.Flag("headless", *headless),
 		chromedp.Flag("hide-scrollbars", false),
+		chromedp.Flag("enable-automation", false),
+		chromedp.Flag("disable-blink-features", "AutomationControlled"),
 	)
+	if *userAgent != "" {
+		opts = append(opts, chromedp.UserAgent(*userAgent))
+	}
 	actx, acncl = chromedp.NewExecAllocator(context.Background(), opts...)
 	defer acncl()
 	ctx, cncl = chromedp.NewContext(actx)