remove select all from default template

remove evil corpo slavemark
add better key descriptions
2025-04-22 05:42:52 +00:00 · 2025-02-14 01:45:17 -08:00 · 2025-02-14 01:44:26 -08:00 · 2025-02-14 01:41:17 -08:00 · 2025-02-14 01:25:48 -08:00 · 2025-02-14 01:23:00 -08:00
10 changed files with 745 additions and 582 deletions
--- a/Dockerfile.local
+++ b/Dockerfile.local
@ -0,0 +1,6 @@
+FROM chromedp/headless-shell
+ARG TARGETARCH
+ADD wrp-${TARGETARCH}-linux /wrp
+ENTRYPOINT ["/wrp"]
+ENV PATH="/headless-shell:${PATH}"
+LABEL maintainer="as@tenoware.com"
--- a/25
+++ b/25
@ -1,23 +1,28 @@
 all: wrp

 wrp: wrp.go
-	go build wrp.go
+	go build -a

 cross:
-	GOOS=linux GOARCH=amd64 go build -a -o wrp-amd64-linux wrp.go
-	GOOS=freebsd GOARCH=amd64 go build -a -o wrp-amd64-freebsd wrp.go
-	GOOS=openbsd GOARCH=amd64 go build -a -o wrp-amd64-openbsd wrp.go
-	GOOS=darwin GOARCH=amd64 go build -a -o wrp-amd64-macos wrp.go
-	GOOS=darwin GOARCH=arm64 go build -a -o wrp-arm64-macos wrp.go
-	GOOS=windows GOARCH=amd64 go build -a -o wrp-amd64-windows.exe wrp.go
-	GOOS=linux GOARCH=arm go build -a -o wrp-arm-linux wrp.go
-	GOOS=linux GOARCH=arm64 go build -a -o wrp-arm64-linux wrp.go
+	GOOS=linux GOARCH=amd64 go build -a -o wrp-amd64-linux
+	GOOS=freebsd GOARCH=amd64 go build -a -o wrp-amd64-freebsd
+	GOOS=openbsd GOARCH=amd64 go build -a -o wrp-amd64-openbsd
+	GOOS=darwin GOARCH=amd64 go build -a -o wrp-amd64-macos
+	GOOS=darwin GOARCH=arm64 go build -a -o wrp-arm64-macos
+	GOOS=windows GOARCH=amd64 go build -a -o wrp-amd64-windows.exe
+	GOOS=linux GOARCH=arm go build -a -o wrp-arm-linux
+	GOOS=linux GOARCH=arm64 go build -a -o wrp-arm64-linux

 docker-local:
-	docker buildx build --platform linux/amd64,linux/arm64 -t tenox7/wrp:latest --load .
+	GOOS=linux GOARCH=amd64 go build -a -o wrp-amd64-linux
+	GOOS=linux GOARCH=arm64 go build -a -o wrp-arm64-linux
+	docker buildx build --platform linux/amd64,linux/arm64 -t tenox7/wrp:latest -f Dockerfile.local --load .

 docker-push:
 	docker buildx build --platform linux/amd64,linux/arm64 -t tenox7/wrp:latest --push .

+docker-clean:
+	docker buildx prune -a -f
+
 clean:
 	rm -rf wrp-* wrp
--- a/README.md
+++ b/README.md
@ -1,65 +1,74 @@
 # WRP - Web Rendering Proxy

-A browser-in-browser "proxy" server that allows to use historical / vintage web browsers on the modern web. It works by rendering a web page in to a GIF or PNG image with clickable imagemap. Optionally by converting modern HTML in to Markdown and back to a simple HTML.
+A browser-in-browser "proxy" server that allows to use historical / vintage web browsers on the modern web. It has two modes:
+
+- ISMAP "graphical" mode, renders web page in to a GIF, PNG or JPG image with clickable imagemap.
+- Simple HTML mode converts web page in to Markdown, then renders it into simplified HTML for old browsers.

 ![Internet Explorer 1.5 doing Gmail](wrp.png)

 ## Usage Instructions

-### Image Map Mode
-
 * [Download a WRP binary](https://github.com/tenox7/wrp/releases/) run it on a machine that will become your WRP gateway/server. This should be modern hardware and OS. Google Chrome / Chromium Browser is required to be preinstalled. Do not try to run WRP on an old machine like Windows XP or 98.
 * Make sure you have disabled firewall or open port WRP is listening on (by default 8080).
 * Point your legacy browser to `http://address:port` of the WRP server. Do not set or use it as a "proxy server".
 * Type a search string or a full http/https URL and click **Go**.
+* Select whether you want to use graphical (ISMAP) or simple HTML mode.
+
+### Image Map Mode
+
 * Adjust your screen **W**idth/**H**eight/**S**cale/**C**olors to fit in your old browser.
-* Scroll web page by clicking on the in-image scroll bar.
+* Scroll web page by clicking on the in-image scroll bar on the right.
 * WRP also allows **a single tall image without the vertical scrollbar** and use client scrolling. To enable this, simply height **H** to `0` . However this should not be used with old and low spec clients. Such tall images will be very large, take a lot of memory and long time to process, especially for GIFs.
 * Do not use client browser history-back, instead use **Bk** button in the app.
 * You can re-capture page screenshot without reloading by using **St** (Stop). This is useful if page didn't render fully before screenshot is taken.
 * You can also reload and re-capture current page with **Re** (Reload).
 * To send keystrokes, fill **K** input box and press **Go**. There also are buttons for backspace, enter and arrow keys.
-* Prefer PNG over GIF if your browser supports it. PNG is much faster, whereas GIF requires a lot of additional processing on both client and server to encode/decode. Jpeg encoding is also quite fast.
+* If your browser supports it, prefer PNG over GIF/JPG. PNG is much faster, whereas GIF/JPG requires a lot of additional processing on both client and server to encode/decode.
 * GIF images are by default encoded with 216 colors, "web safe" palette. This uses an ultra fast but not very accurate color mapping algorithm. If you want better color representation switch to 256 color mode.

 ### Simple HTML mode

-Also known as **Reader** mode. **NEW!**
-
-* Select image type to `TXT`. WRP will convert the image in to Markdown, then render it back in to a simplified HTML.
-* If you want to always start in txt mode specify `-t txt` flag.
+* Select image type PNG/GIF/JPG. Each individual image from the original web site will be converted to the selected format.
+* Type maximum image size in pixels.

 ## UI explanation

 The first unnamed input box is either search (google) or URL starting with http/https

-**Go** instructs browser to navigate to the url or perform search
+`Go` Navigate to the url or perform search

-**Bk** is History Back
+`Bk` History Back

-**St** is Stop, also re-capture screenshot without refreshing page, for example if page
-render takes a long time or it changes periodically
+`St` Stop, also re-capture screenshot without refreshing page, for example if page
+render takes a long time or it updates / changes periodically

-**Re** is Reload
+`Re` Remote Reload / Refresh

-**W** is width in pixels, adjust it to get rid of horizontal scroll bar
+`Up` Page Up

-**H** is height in pixels, adjust it to get rid of vertical scroll bar.
+`Dn` Page Down
+
+`W` is width in pixels, adjust it to get rid of horizontal scroll bar
+
+`H` is height in pixels, adjust it to get rid of vertical scroll bar.
 It can also be set to 0 to produce one very tall image and use
 client scroll. This 0 size is experimental, buggy and should be
 used with PNG and lots of memory on a client side.

-**Z** is zoom or scale
+`Z` Zoom or scale

-**C** is colors, for GIF images only (unused in PNG, JPG)
+`M` Mode - ISMAP (clickable imagemap) or simple HTML mode

-**K** is keystroke input, you can type some letters in it and when you click Go it will be typed in the remote browser.
+`T` Image type PNG / GIF / JPEG

-**Bs** is backspace
+`C` Colors, for GIF images only

-**Rt** is return / enter
+`K` Keystroke input, you can type some letters in it and when you click Go it will be typed in the remote browser.

-**< ^ v >** are arrow keys, typically for navigating a map, buggy.
+`Bs` Backspace
+
+`Rt` Return / enter

 ### UI Customization

@ -121,15 +130,16 @@ Unfortunately Google Cloud Run forces you to use HTTPS, which likely won't work

 ```text
 -l   listen address:port (default :8080)
-t   image type gif, png or jpg (default gif) also txt for simple html/reader mode
+-m   mode, either ismap (graphical) or html
+-t   image type gif, png or jpg (default gif)
 -g   image geometry, WxHxC, height can be 0 for unlimited (default 1152x600x216)
     C (number of colors) is only used for GIF
-q   Jpeg image quality, default 80%
+-q   Jpeg image quality, default 75%
 -h   headless mode, hide browser window on the server (default true)
 -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
+-ua  user agent, override the default "headless" agent (only for ismap mode)
 -s   delay/sleep after page is rendered before screenshot is taken (default 2s)
 ```

@ -152,9 +162,7 @@ $ ./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
+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 the `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"
@ -166,7 +174,11 @@ WRP originally started as true http proxy. However this stopped working because

 ### Will you support http proxy mode in future?

-Some efforts are under way but it's very [difficult](https://en.wikipedia.org/wiki/HTTP_tunnel#HTTP_CONNECT_method) to do it correctly and the priority is rather low.
+Some efforts (ssl strip) are under way but it's very [difficult](https://en.wikipedia.org/wiki/HTTP_tunnel#HTTP_CONNECT_method) to do it correctly and the priority is rather low.
+
+### Why isn't there a Docker image for armv6
+
+Because https://hub.docker.com/r/chromedp/headless-shell/ doesn't have one. WRP uses that image. If you have a fork that builds for armv6 let me know.

 ## History

@ -180,6 +192,7 @@ Some efforts are under way but it's very [difficult](https://en.wikipedia.org/wi
 * 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!
 * Version 4.7 add simple html aka reader aka text mode.
+* Version 4.8 add image support to simple html mode.

 ## Credits

@ -202,7 +215,5 @@ You may also be interested in:

 ```text
 License: Apache 2.0
-Copyright (c) 2013-2024 Antoni Sawicki
-Copyright (c) 2019-2024 Google LLC
+Copyright (c) 2013-2025 Antoni Sawicki
 ```
-
--- a/go.mod
+++ b/go.mod
@ -1,28 +1,33 @@
 module github.com/tenox7/wrp

-go 1.21.5
+go 1.23
+
+toolchain go1.24.0

 require (
 	github.com/JohannesKaufmann/html-to-markdown v1.6.0
 	github.com/MaxHalford/halfgone v0.0.0-20171017091812-482157b86ccb
-	github.com/chromedp/cdproto v0.0.0-20240519224452-66462be74baa
-	github.com/chromedp/chromedp v0.9.5
+	github.com/breml/rootcerts v0.2.20
+	github.com/chromedp/cdproto v0.0.0-20250210231439-aea867ea8506
+	github.com/chromedp/chromedp v0.12.1
+	github.com/lithammer/shortuuid/v4 v4.2.0
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
 	github.com/soniakeys/quant v1.0.0
-	github.com/yuin/goldmark v1.7.2
-	golang.org/x/image v0.18.0
+	github.com/yuin/goldmark v1.7.8
+	golang.org/x/image v0.24.0
 )

 require (
-	github.com/PuerkitoBio/goquery v1.9.2 // indirect
-	github.com/andybalholm/cascadia v1.3.2 // indirect
-	github.com/chromedp/sysutil v1.0.0 // indirect
+	github.com/PuerkitoBio/goquery v1.10.2 // indirect
+	github.com/andybalholm/cascadia v1.3.3 // indirect
+	github.com/chromedp/sysutil v1.1.0 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/gobwas/ws v1.4.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
+	github.com/mailru/easyjson v0.9.0 // indirect
+	golang.org/x/net v0.35.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -4,24 +4,41 @@ github.com/MaxHalford/halfgone v0.0.0-20171017091812-482157b86ccb h1:YQ+d0g0P0F/
 github.com/MaxHalford/halfgone v0.0.0-20171017091812-482157b86ccb/go.mod h1:J86XzS1wgzJPjpQmpriJ+SetP17JSQUd9l+HWQK86jA=
 github.com/PuerkitoBio/goquery v1.9.2 h1:4/wZksC3KgkQw7SQgkKotmKljk0M6V8TUvA8Wb4yPeE=
 github.com/PuerkitoBio/goquery v1.9.2/go.mod h1:GHPCaP0ODyyxqcNoFGYlAprUFH81NuRPd0GX3Zu2Mvk=
+github.com/PuerkitoBio/goquery v1.10.2 h1:7fh2BdHcG6VFZsK7toXBT/Bh1z5Wmy8Q9MV9HqT2AM8=
+github.com/PuerkitoBio/goquery v1.10.2/go.mod h1:0guWGjcLu9AYC7C1GHnpysHy056u9aEkUHwhdnePMCU=
 github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss=
 github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU=
-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.5 h1:viASzruPJOiThk7c5bueOUY91jGLJVximoEMGoH93rg=
-github.com/chromedp/chromedp v0.9.5/go.mod h1:D4I2qONslauw/C7INoCir1BJkSwBYMyZgx8X276z3+Y=
+github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
+github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
+github.com/breml/rootcerts v0.2.17 h1:0/M2BE2Apw0qEJCXDOkaiu7d5Sx5ObNfe1BkImJ4u1I=
+github.com/breml/rootcerts v0.2.17/go.mod h1:S/PKh+4d1HUn4HQovEB8hPJZO6pUZYrIhmXBhsegfXw=
+github.com/breml/rootcerts v0.2.20 h1:koth1lShwiiDp3VOX6/4qKEZ87S7HgDKsnDr47XEIq0=
+github.com/breml/rootcerts v0.2.20/go.mod h1:S/PKh+4d1HUn4HQovEB8hPJZO6pUZYrIhmXBhsegfXw=
+github.com/chromedp/cdproto v0.0.0-20240801214329-3f85d328b335/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
+github.com/chromedp/cdproto v0.0.0-20240810084448-b931b754e476 h1:VnjHsRXCRti7Av7E+j4DCha3kf68echfDzQ+wD11SBU=
+github.com/chromedp/cdproto v0.0.0-20240810084448-b931b754e476/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
+github.com/chromedp/cdproto v0.0.0-20250210231439-aea867ea8506 h1:OfjMcN8R6eUWZfKyJaTnlyiZh1BGgmEKmRkCZuDtGRw=
+github.com/chromedp/cdproto v0.0.0-20250210231439-aea867ea8506/go.mod h1:RTGuBeCeabAJGi3OZf71a6cGa7oYBfBP75VJZFLv6SU=
+github.com/chromedp/chromedp v0.10.0 h1:bRclRYVpMm/UVD76+1HcRW9eV3l58rFfy7AdBvKab1E=
+github.com/chromedp/chromedp v0.10.0/go.mod h1:ei/1ncZIqXX1YnAYDkxhD4gzBgavMEUu7JCKvztdomE=
+github.com/chromedp/chromedp v0.12.1 h1:kBMblXk7xH5/6j3K9uk8d7/c+fzXWiUsCsPte0VMwOA=
+github.com/chromedp/chromedp v0.12.1/go.mod h1:F6+wdq9LKFDMoyxhq46ZLz4VLXrsrCAR3sFqJz4Nqc0=
 github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic=
 github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww=
+github.com/chromedp/sysutil v1.1.0 h1:PUFNv5EcprjqXZD9nJb9b/c9ibAbxiYo4exNWZyipwM=
+github.com/chromedp/sysutil v1.1.0/go.mod h1:WiThHUdltqCNKGc4gaU50XgYjwjYIhKWoHGPTUfWTJ8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
 github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
-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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 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/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@ -31,8 +48,14 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo=
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
+github.com/lithammer/shortuuid/v4 v4.0.0 h1:QRbbVkfgNippHOS8PXDkti4NaWeyYfcBTHtw7k08o4c=
+github.com/lithammer/shortuuid/v4 v4.0.0/go.mod h1:Zs8puNcrvf2rV9rTH51ZLLcj7ZXqQI3lv67aw4KiB1Y=
+github.com/lithammer/shortuuid/v4 v4.2.0 h1:LMFOzVB3996a7b8aBuEXxqOBflbfPQAiVzkIcHO0h8c=
+github.com/lithammer/shortuuid/v4 v4.2.0/go.mod h1:D5noHZ2oFw/YaKCfGy0YxyE7M0wMbezmMjPdhyEFe6Y=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
+github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde h1:x0TT0RDC7UhAVbbWWBzr41ElhJx5tXPWkIHA2HWPRuw=
@ -52,30 +75,48 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
-github.com/yuin/goldmark v1.7.2 h1:NjGd7lO7zrUn/A7eKwn5PEOt4ONYGqpxSEeZuduvgxc=
-github.com/yuin/goldmark v1.7.2/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
+github.com/yuin/goldmark v1.7.4 h1:BDXOHExt+A7gwPCJgPIIq7ENvceR7we7rOS9TNoLZeg=
+github.com/yuin/goldmark v1.7.4/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
+github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
+github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
-golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/image v0.19.0 h1:D9FX4QWkLfkeqaC62SonffIIuYdOk/UE2XKUBgRIBIQ=
+golang.org/x/image v0.19.0/go.mod h1:y0zrRqlQRWQ5PXaYCOMLTW2fpsxZ8Qh9I/ohnInJEys=
+golang.org/x/image v0.24.0 h1:AN7zRgVsbvmTfNyqIbbOraYL8mSwcKncEj8ofjgzcMQ=
+golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
+golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
+golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@ -85,30 +126,42 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.19.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=
+golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
+golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
--- a/ismap.go
+++ b/ismap.go
@ -0,0 +1,293 @@
+// WRP ISMAP / ChromeDP routines
+package main
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"image"
+	"image/gif"
+	"image/jpeg"
+	"image/png"
+	"io"
+	"log"
+	"math"
+	"net/http"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/chromedp/cdproto/css"
+	"github.com/chromedp/cdproto/emulation"
+	"github.com/chromedp/cdproto/input"
+	"github.com/chromedp/cdproto/page"
+	"github.com/chromedp/chromedp"
+	"github.com/lithammer/shortuuid/v4"
+)
+
+func chromedpStart() (context.CancelFunc, context.CancelFunc) {
+	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...)
+	ctx, cncl = chromedp.NewContext(actx)
+	return cncl, acncl
+}
+
+// Determine what action to take
+func (rq *wrpReq) action() chromedp.Action {
+	// Mouse Click
+	if rq.mouseX > 0 && rq.mouseY > 0 {
+		log.Printf("%s Mouse Click %d,%d\n", rq.r.RemoteAddr, rq.mouseX, rq.mouseY)
+		return chromedp.MouseClickXY(float64(rq.mouseX)/float64(rq.zoom), float64(rq.mouseY)/float64(rq.zoom))
+	}
+	// Buttons
+	if len(rq.buttons) > 0 {
+		log.Printf("%s Button %v\n", rq.r.RemoteAddr, rq.buttons)
+		switch rq.buttons {
+		case "Bk":
+			return chromedp.NavigateBack()
+		case "St":
+			return chromedp.Stop()
+		case "Re":
+			return chromedp.Reload()
+		case "Bs":
+			return chromedp.KeyEvent("\b")
+		case "Rt":
+			return chromedp.KeyEvent("\r")
+		case "<":
+			return chromedp.KeyEvent("\u0302")
+		case "^":
+			return chromedp.KeyEvent("\u0304")
+		case "v":
+			return chromedp.KeyEvent("\u0301")
+		case ">":
+			return chromedp.KeyEvent("\u0303")
+		case "Up":
+			return chromedp.KeyEvent("\u0308")
+		case "Dn":
+			return chromedp.KeyEvent("\u0307")
+		case "All": // Select all
+			return chromedp.KeyEvent("a", chromedp.KeyModifiers(input.ModifierCtrl))
+		}
+	}
+	// Keys
+	if len(rq.keys) > 0 {
+		log.Printf("%s Sending Keys: %#v\n", rq.r.RemoteAddr, rq.keys)
+		return chromedp.KeyEvent(rq.keys)
+	}
+	// Navigate to URL
+	log.Printf("%s Processing Navigate Request for %s\n", rq.r.RemoteAddr, rq.url)
+	return chromedp.Navigate(rq.url)
+}
+
+// Navigate to the desired URL.
+func (rq *wrpReq) navigate() {
+	ctxErr(chromedp.Run(ctx, rq.action()), rq.w)
+}
+
+// Handle context errors
+func ctxErr(err error, w io.Writer) {
+	// TODO: callers should have retry logic, perhaps create another function
+	// that takes ...chromedp.Action and retries with give up
+	if err == nil {
+		return
+	}
+	log.Printf("Context error: %s", err)
+	fmt.Fprintf(w, "Context error: %s<BR>\n", err)
+	if err.Error() != "context canceled" {
+		return
+	}
+	ctx, cncl = chromedp.NewContext(actx)
+	log.Printf("Created new context, try again")
+	fmt.Fprintln(w, "Created new context, try again")
+}
+
+// https://github.com/chromedp/chromedp/issues/979
+func chromedpCaptureScreenshot(res *[]byte, h int64) chromedp.Action {
+	if res == nil {
+		panic("res cannot be nil") // TODO: do not panic here, return error
+	}
+	if h == 0 {
+		return chromedp.CaptureScreenshot(res)
+	}
+
+	return chromedp.ActionFunc(func(ctx context.Context) error {
+		var err error
+		*res, err = page.CaptureScreenshot().Do(ctx)
+		return err
+	})
+}
+
+// Capture Screenshot using CDP
+func (rq *wrpReq) captureScreenshot() {
+	var styles []*css.ComputedStyleProperty
+	var r, g, b int
+	var bgColorSet bool
+	var h int64
+	var pngCap []byte
+	chromedp.Run(ctx,
+		emulation.SetDeviceMetricsOverride(int64(float64(rq.width)/rq.zoom), 10, rq.zoom, false),
+		chromedp.Location(&rq.url),
+		chromedp.ComputedStyle("body", &styles, chromedp.ByQuery),
+		chromedp.ActionFunc(func(ctx context.Context) error {
+			_, _, _, _, _, s, err := page.GetLayoutMetrics().Do(ctx)
+			if err == nil {
+				h = int64(math.Ceil(s.Height))
+			}
+			return nil
+		}),
+	)
+	log.Printf("%s Landed on: %s, Height: %v\n", rq.r.RemoteAddr, rq.url, h)
+	for _, style := range styles {
+		if style.Name != "background-color" {
+			continue
+		}
+		fmt.Sscanf(style.Value, "rgb(%d,%d,%d)", &r, &g, &b)
+		bgColorSet = true
+		break
+	}
+	if !bgColorSet {
+		r = 255
+		g = 255
+		b = 255
+	}
+	height := int64(float64(rq.height) / rq.zoom)
+	if rq.height == 0 && h > 0 {
+		height = h + 30
+	}
+	chromedp.Run(
+		ctx, emulation.SetDeviceMetricsOverride(int64(float64(rq.width)/rq.zoom), height, rq.zoom, false),
+		chromedp.Sleep(*delay), // TODO(tenox): find a better way to determine if page is rendered
+	)
+	// Capture screenshot...
+	ctxErr(chromedp.Run(ctx, chromedpCaptureScreenshot(&pngCap, rq.height)), rq.w)
+	seq := shortuuid.New()
+	imgPath := fmt.Sprintf("/img/%s.%s", seq, rq.imgType)
+	mapPath := fmt.Sprintf("/map/%s.map", seq)
+	ismap[mapPath] = *rq
+	var sSize string
+	var iW, iH int
+	switch rq.imgType {
+	case "png":
+		pngBuf := bytes.NewBuffer(pngCap)
+		img[imgPath] = *pngBuf
+		cfg, _, _ := image.DecodeConfig(pngBuf)
+		sSize = fmt.Sprintf("%.0f KB", float32(len(pngBuf.Bytes()))/1024.0)
+		iW = cfg.Width
+		iH = cfg.Height
+		log.Printf("%s Got PNG image: %s, Size: %s, Res: %dx%d\n", rq.r.RemoteAddr, imgPath, sSize, iW, iH)
+	case "gif":
+		i, err := png.Decode(bytes.NewReader(pngCap))
+		if err != nil {
+			log.Printf("%s Failed to decode PNG screenshot: %s\n", rq.r.RemoteAddr, err)
+			fmt.Fprintf(rq.w, "<BR>Unable to decode page PNG screenshot:<BR>%s<BR>\n", err)
+			return
+		}
+		st := time.Now()
+		var gifBuf bytes.Buffer
+		err = gif.Encode(&gifBuf, gifPalette(i, rq.nColors), &gif.Options{})
+		if err != nil {
+			log.Printf("%s Failed to encode GIF: %s\n", rq.r.RemoteAddr, err)
+			fmt.Fprintf(rq.w, "<BR>Unable to encode GIF:<BR>%s<BR>\n", err)
+			return
+		}
+		img[imgPath] = gifBuf
+		sSize = fmt.Sprintf("%.0f KB", float32(len(gifBuf.Bytes()))/1024.0)
+		iW = i.Bounds().Max.X
+		iH = i.Bounds().Max.Y
+		log.Printf("%s Encoded GIF image: %s, Size: %s, Colors: %d, Res: %dx%d, Time: %vms\n", rq.r.RemoteAddr, imgPath, sSize, rq.nColors, iW, iH, time.Since(st).Milliseconds())
+	case "jpg":
+		i, err := png.Decode(bytes.NewReader(pngCap))
+		if err != nil {
+			log.Printf("%s Failed to decode PNG screenshot: %s\n", rq.r.RemoteAddr, err)
+			fmt.Fprintf(rq.w, "<BR>Unable to decode page PNG screenshot:<BR>%s<BR>\n", err)
+			return
+		}
+		st := time.Now()
+		var jpgBuf bytes.Buffer
+		err = jpeg.Encode(&jpgBuf, i, &jpeg.Options{Quality: int(rq.jQual)})
+		if err != nil {
+			log.Printf("%s Failed to encode JPG: %s\n", rq.r.RemoteAddr, err)
+			fmt.Fprintf(rq.w, "<BR>Unable to encode JPG:<BR>%s<BR>\n", err)
+			return
+		}
+		img[imgPath] = jpgBuf
+		sSize = fmt.Sprintf("%.0f KB", float32(len(jpgBuf.Bytes()))/1024.0)
+		iW = i.Bounds().Max.X
+		iH = i.Bounds().Max.Y
+		log.Printf("%s Encoded JPG image: %s, Size: %s, Quality: %d, Res: %dx%d, Time: %vms\n", rq.r.RemoteAddr, imgPath, sSize, *defJpgQual, iW, iH, time.Since(st).Milliseconds())
+	}
+	rq.printUI(uiParams{
+		bgColor:    fmt.Sprintf("#%02X%02X%02X", r, g, b),
+		pageHeight: fmt.Sprintf("%d PX", h),
+		imgSize:    sSize,
+		imgURL:     imgPath,
+		mapURL:     mapPath,
+		imgWidth:   iW,
+		imgHeight:  iH,
+	})
+	log.Printf("%s Done with capture for %s\n", rq.r.RemoteAddr, rq.url)
+}
+
+func mapServer(w http.ResponseWriter, r *http.Request) {
+	log.Printf("%s ISMAP Request for %s [%+v]\n", r.RemoteAddr, r.URL.Path, r.URL.RawQuery)
+	rq, ok := ismap[r.URL.Path]
+	rq.r = r
+	rq.w = w
+	if !ok {
+		fmt.Fprintf(w, "Unable to find map %s\n", r.URL.Path)
+		log.Printf("Unable to find map %s\n", r.URL.Path)
+		return
+	}
+	if !*noDel {
+		defer delete(ismap, r.URL.Path)
+	}
+	n, err := fmt.Sscanf(r.URL.RawQuery, "%d,%d", &rq.mouseX, &rq.mouseY)
+	if err != nil || n != 2 {
+		fmt.Fprintf(w, "n=%d, err=%s\n", n, err)
+		log.Printf("%s ISMAP n=%d, err=%s\n", r.RemoteAddr, n, err)
+		return
+	}
+	log.Printf("%s WrpReq from ISMAP: %+v\n", r.RemoteAddr, rq)
+	if len(rq.url) < 4 {
+		rq.printUI(uiParams{bgColor: "#FFFFFF"})
+		return
+	}
+	rq.navigate() // TODO: if error from navigate do not capture
+	rq.captureScreenshot()
+}
+
+// TODO: merge this with html mode IMGZ
+func imgServerMap(w http.ResponseWriter, r *http.Request) {
+	log.Printf("%s IMG Request for %s\n", r.RemoteAddr, r.URL.Path)
+	imgBuf, ok := img[r.URL.Path]
+	if !ok || imgBuf.Bytes() == nil {
+		fmt.Fprintf(w, "Unable to find image %s\n", r.URL.Path)
+		log.Printf("%s Unable to find image %s\n", r.RemoteAddr, r.URL.Path)
+		return
+	}
+	if !*noDel {
+		defer delete(img, r.URL.Path)
+	}
+	switch {
+	case strings.HasSuffix(r.URL.Path, ".gif"):
+		w.Header().Set("Content-Type", "image/gif")
+	case strings.HasSuffix(r.URL.Path, ".png"):
+		w.Header().Set("Content-Type", "image/png")
+	case strings.HasSuffix(r.URL.Path, ".jpg"):
+		w.Header().Set("Content-Type", "image/jpeg")
+	}
+	w.Header().Set("Content-Length", strconv.Itoa(len(imgBuf.Bytes())))
+	w.Header().Set("Cache-Control", "max-age=0")
+	w.Header().Set("Expires", "-1")
+	w.Header().Set("Pragma", "no-cache")
+	w.Write(imgBuf.Bytes())
+	w.(http.Flusher).Flush()
+}
--- a/shtml.go
+++ b/shtml.go
@ -1,16 +1,22 @@
+// WRP TXT / Simple HTML Mode Routines
 package main

 // TODO:
-// - image type based on form value
-// - also size and quality
-// - non overlaping image names atomic.int etc
-// - garbage collector / delete old images from map
+// - add image processing times counter to the footer
+// - img cache w/garbage collector / test back/button behavior in old browsers
 // - add referer header
 // - svg support
-// - BOG: DomainFromURL always prefixes with http instead of https
+// - incorrect cert support in both markdown and image download
+// - unify cdp and txt image handlers
+// - use goroutiness to process images
+// - get inner html from chromedp instead of html2markdown
+//
+// - BUG: DomainFromURL always prefixes with http instead of https
 //   reproduces on vsi vms docs
 // - BUG: markdown table errors
 //   reproduces on hacker news
+// - BUG: captcha errors using html to markdown, perhaps use cdp inner html + downloaded images
+//   reproduces on https://www.cnn.com/cnn-underscored/electronics

 import (
 	"bytes"
@ -23,7 +29,6 @@ import (
 	"image/png"
 	"io"
 	"log"
-	"math/rand"
 	"net/http"
 	"strconv"
 	"strings"
@ -32,6 +37,7 @@ import (

 	h2m "github.com/JohannesKaufmann/html-to-markdown"
 	"github.com/JohannesKaufmann/html-to-markdown/plugin"
+	"github.com/lithammer/shortuuid/v4"
 	"github.com/nfnt/resize"
 	"github.com/yuin/goldmark"
 	"github.com/yuin/goldmark/ast"
@ -48,10 +54,6 @@ const imgZpfx = "/imgz/"

 func init() {
 	imgStor.img = make(map[string]imageContainer)
-	// TODO: add garbage collector
-	// think about how to remove old images
-	// if removed from cache how to download them later if a browser goes back?
-	// browser should cache on it's own... but it may request it, what then?
 }

 type imageContainer struct {
@ -87,112 +89,43 @@ func (i *imageStore) del(id string) {
 	delete(i.img, id)
 }

-func fetchImage(id, url string) error {
+func fetchImage(id, url, imgType string, maxSize, imgOpt int) (int, error) {
 	log.Printf("Downloading IMGZ URL=%q for ID=%q", url, id)
-	var img []byte
+	var in []byte
 	var err error
 	switch url[:4] {
 	case "http":
 		r, err := http.Get(url) // TODO: possibly set a header "referer" here
 		if err != nil {
-			return fmt.Errorf("Error downloading %q: %v", url, err)
+			return 0, fmt.Errorf("Error downloading %q: %v", url, err)
 		}
 		if r.StatusCode != http.StatusOK {
-			return fmt.Errorf("Error %q HTTP Status Code: %v", url, r.StatusCode)
+			return 0, fmt.Errorf("Error %q HTTP Status Code: %v", url, r.StatusCode)
 		}
 		defer r.Body.Close()
-		img, err = io.ReadAll(r.Body)
+		in, err = io.ReadAll(r.Body)
 		if err != nil {
-			return fmt.Errorf("Error reading %q: %v", url, err)
+			return 0, fmt.Errorf("Error reading %q: %v", url, err)
 		}
 	case "data":
 		idx := strings.Index(url, ",")
 		if idx < 1 {
-			return fmt.Errorf("image is embeded but unable to find coma: %q", url)
+			return 0, fmt.Errorf("image is embeded but unable to find coma: %q", url)
 		}
-		img, err = base64.StdEncoding.DecodeString(url[idx+1:])
+		in, err = base64.StdEncoding.DecodeString(url[idx+1:])
 		if err != nil {
-			return fmt.Errorf("error decoding image from url embed: %q: %v", url, err)
+			return 0, fmt.Errorf("error decoding image from url embed: %q: %v", url, err)
 		}
 	}
-	gif, err := smallGif(img)
+	out, err := smallImg(in, imgType, maxSize, imgOpt)
 	if err != nil {
-		return fmt.Errorf("Error scaling down image: %v", err)
+		return 0, fmt.Errorf("Error scaling down image: %v", err)
 	}
-	imgStor.add(id, url, gif)
-	return nil
+	imgStor.add(id, url, out)
+	return len(out), nil
 }

-type astTransformer struct{}
-
-func (t *astTransformer) Transform(node *ast.Document, reader text.Reader, pc parser.Context) {
-	ast.Walk(node, func(n ast.Node, entering bool) (ast.WalkStatus, error) {
-		if link, ok := n.(*ast.Link); ok && entering {
-			link.Destination = append([]byte("/?t=txt&url="), link.Destination...)
-		}
-		if img, ok := n.(*ast.Image); ok && entering {
-			// TODO: dynamic extension based on form value
-			id := fmt.Sprintf("txt%05d.gif", rand.Intn(99999)) // BUG: atomic.AddInt64 or something that ever increases - time based?
-			err := fetchImage(id, string(img.Destination))     // TODO: use goroutines with waitgroup
-			if err != nil {
-				log.Print(err)
-				n.Parent().RemoveChildren(n)
-				return ast.WalkContinue, nil
-			}
-			img.Destination = []byte(imgZpfx + id)
-		}
-		return ast.WalkContinue, nil
-	})
-}
-
-func (rq *wrpReq) captureMarkdown() {
-	log.Printf("Processing Markdown conversion request for %v", rq.url)
-	// TODO: bug - DomainFromURL always prefixes with http:// instead of https
-	// this causes issues on some websites, fix or write a smarter DomainFromURL
-	c := h2m.NewConverter(h2m.DomainFromURL(rq.url), true, nil)
-	c.Use(plugin.GitHubFlavored())
-	md, err := c.ConvertURL(rq.url) // We could also get inner html from chromedp
-	if err != nil {
-		http.Error(rq.w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	log.Printf("Got %v bytes md from %v", len(md), rq.url)
-	t := &astTransformer{}
-	gm := goldmark.New(
-		goldmark.WithExtensions(extension.GFM),
-		goldmark.WithParserOptions(parser.WithASTTransformers(util.Prioritized(t, 100))),
-	)
-	var ht bytes.Buffer
-	err = gm.Convert([]byte(md), &ht)
-	if err != nil {
-		http.Error(rq.w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	log.Printf("Rendered %v bytes html for %v", len(ht.String()), rq.url)
-	rq.printHTML(printParams{
-		text:    string(asciify([]byte(ht.String()))),
-		bgColor: "#FFFFFF",
-	})
-}
-
-func imgServerZ(w http.ResponseWriter, r *http.Request) {
-	log.Printf("%s IMGZ Request for %s", r.RemoteAddr, r.URL.Path)
-	id := strings.Replace(r.URL.Path, imgZpfx, "", 1)
-	img, err := imgStor.get(id)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		log.Printf("%s IMGZ error for %s: %v", r.RemoteAddr, r.URL.Path, err)
-		return
-	}
-	imgStor.del(id)
-	w.Header().Set("Content-Type", http.DetectContentType(img))
-	w.Header().Set("Content-Length", strconv.Itoa(len(img)))
-	w.Write(img)
-	w.(http.Flusher).Flush()
-}
-
-// TODO set JPG/GIF/PNG type based on form...
-func smallGif(src []byte) ([]byte, error) {
+func smallImg(src []byte, imgType string, maxSize, imgOpt int) ([]byte, error) {
 	t := http.DetectContentType(src)
 	var err error
 	var img image.Image
@ -211,11 +144,99 @@ func smallGif(src []byte) ([]byte, error) {
 	if err != nil {
 		return nil, fmt.Errorf("image decode problem: %v", err)
 	}
-	img = resize.Thumbnail(uint(*txtImgSize), uint(*txtImgSize), img, resize.NearestNeighbor)
-	var gifBuf bytes.Buffer
-	err = gif.Encode(&gifBuf, gifPalette(img, 216), &gif.Options{})
+	img = resize.Thumbnail(uint(maxSize), uint(maxSize), img, resize.NearestNeighbor)
+	var outBuf bytes.Buffer
+	switch imgType {
+	case "png":
+		err = png.Encode(&outBuf, img)
+	case "gif":
+		err = gif.Encode(&outBuf, gifPalette(img, int64(imgOpt)), &gif.Options{})
+	case "jpg":
+		err = jpeg.Encode(&outBuf, img, &jpeg.Options{Quality: imgOpt})
+	}
 	if err != nil {
 		return nil, fmt.Errorf("gif encode problem: %v", err)
 	}
-	return gifBuf.Bytes(), nil
+	return outBuf.Bytes(), nil
+}
+
+type astTransformer struct {
+	imgType string
+	maxSize int
+	imgOpt  int
+	totSize int
+}
+
+func (t *astTransformer) Transform(node *ast.Document, reader text.Reader, pc parser.Context) {
+	ast.Walk(node, func(n ast.Node, entering bool) (ast.WalkStatus, error) {
+		if link, ok := n.(*ast.Link); ok && entering {
+			link.Destination = append([]byte("/?m=html&t="+t.imgType+"&s="+strconv.Itoa(t.maxSize)+"&url="), link.Destination...)
+		}
+		if img, ok := n.(*ast.Image); ok && entering {
+			seq := shortuuid.New() + "." + t.imgType
+			size, err := fetchImage(seq, string(img.Destination), t.imgType, t.maxSize, t.imgOpt) // TODO: use goroutines with waitgroup
+			if err != nil {
+				log.Print(err)
+				n.Parent().RemoveChildren(n)
+				return ast.WalkContinue, nil
+			}
+			img.Destination = []byte(imgZpfx + seq)
+			t.totSize += size
+		}
+		return ast.WalkContinue, nil
+	})
+}
+
+func (rq *wrpReq) captureMarkdown() {
+	log.Printf("Processing Markdown conversion request for %v", rq.url)
+	// TODO: bug - DomainFromURL always prefixes with http:// instead of https
+	// this causes issues on some websites, fix or write a smarter DomainFromURL
+	c := h2m.NewConverter(h2m.DomainFromURL(rq.url), true, nil)
+	c.Use(plugin.GitHubFlavored())
+	md, err := c.ConvertURL(rq.url) // We could also get inner html from chromedp
+	if err != nil {
+		http.Error(rq.w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	log.Printf("Got %v bytes md from %v", len(md), rq.url)
+	var imgOpt int
+	switch rq.imgType {
+	case "jpg":
+		imgOpt = int(rq.jQual)
+	case "gif":
+		imgOpt = int(rq.nColors)
+	}
+	t := &astTransformer{imgType: rq.imgType, maxSize: int(rq.maxSize), imgOpt: imgOpt}
+	gm := goldmark.New(
+		goldmark.WithExtensions(extension.GFM),
+		goldmark.WithParserOptions(parser.WithASTTransformers(util.Prioritized(t, 100))),
+	)
+	var ht bytes.Buffer
+	err = gm.Convert([]byte(md), &ht)
+	if err != nil {
+		http.Error(rq.w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	log.Printf("Rendered %v bytes html for %v", len(ht.String()), rq.url)
+	rq.printUI(uiParams{
+		text:    string(asciify([]byte(ht.String()))),
+		bgColor: "#FFFFFF",
+		imgSize: fmt.Sprintf("%.0f KB", float32(t.totSize)/1024.0),
+	})
+}
+
+func imgServerTxt(w http.ResponseWriter, r *http.Request) {
+	log.Printf("%s IMGZ Request for %s", r.RemoteAddr, r.URL.Path)
+	id := strings.Replace(r.URL.Path, imgZpfx, "", 1)
+	img, err := imgStor.get(id)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		log.Printf("%s IMGZ error for %s: %v", r.RemoteAddr, r.URL.Path, err)
+		return
+	}
+	imgStor.del(id)
+	w.Header().Set("Content-Type", http.DetectContentType(img))
+	w.Header().Set("Content-Length", strconv.Itoa(len(img)))
+	w.Write(img)
+	w.(http.Flusher).Flush()
 }
--- a/util.go
+++ b/util.go
@ -0,0 +1,89 @@
+// wrp utility functions
+package main
+
+import (
+	"image"
+	"image/color/palette"
+	"log"
+	"net"
+	"strings"
+
+	"github.com/MaxHalford/halfgone"
+	"github.com/soniakeys/quant/median"
+)
+
+func printMyIPs(b string) {
+	ap := strings.Split(b, ":")
+	if len(ap) < 1 {
+		log.Fatal("Wrong format of ipaddress:port")
+	}
+	log.Printf("Listen address: %v", b)
+	if ap[0] != "" && ap[0] != "0.0.0.0" {
+		return
+	}
+	a, err := net.InterfaceAddrs()
+	if err != nil {
+		log.Print("Unable to get interfaces: ", err)
+		return
+	}
+	var m string
+	for _, i := range a {
+		n, ok := i.(*net.IPNet)
+		if !ok || n.IP.IsLoopback() || strings.Contains(n.IP.String(), ":") {
+			continue
+		}
+		m = m + n.IP.String() + " "
+	}
+	log.Print("My IP addresses: ", m)
+}
+
+func gifPalette(i image.Image, n int64) image.Image {
+	switch n {
+	case 2:
+		i = halfgone.FloydSteinbergDitherer{}.Apply(halfgone.ImageToGray(i))
+	case 216:
+		var FastGifLut = [256]int{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5}
+		r := i.Bounds()
+		// NOTE: the color index computation below works only for palette.WebSafe!
+		p := image.NewPaletted(r, palette.WebSafe)
+		if i64, ok := i.(image.RGBA64Image); ok {
+			for y := r.Min.Y; y < r.Max.Y; y++ {
+				for x := r.Min.X; x < r.Max.X; x++ {
+					c := i64.RGBA64At(x, y)
+					r6 := FastGifLut[c.R>>8]
+					g6 := FastGifLut[c.G>>8]
+					b6 := FastGifLut[c.B>>8]
+					p.SetColorIndex(x, y, uint8(36*r6+6*g6+b6))
+				}
+			}
+		} else {
+			for y := r.Min.Y; y < r.Max.Y; y++ {
+				for x := r.Min.X; x < r.Max.X; x++ {
+					c := i.At(x, y)
+					r, g, b, _ := c.RGBA()
+					r6 := FastGifLut[r&0xff]
+					g6 := FastGifLut[g&0xff]
+					b6 := FastGifLut[b&0xff]
+					p.SetColorIndex(x, y, uint8(36*r6+6*g6+b6))
+				}
+			}
+		}
+		i = p
+	default:
+		q := median.Quantizer(n)
+		i = q.Paletted(i)
+	}
+	return i
+}
+
+func asciify(s []byte) []byte {
+	a := make([]byte, len(s))
+	for i := 0; i < len(s); i++ {
+		if s[i] > 127 {
+			a[i] = '.'
+			continue
+		}
+		a[i] = s[i]
+	}
+	return a
+}
--- a/wrp.go
+++ b/wrp.go
@ -1,8 +1,7 @@
 //
 // WRP - Web Rendering Proxy
 //
-// Copyright (c) 2013-2024 Antoni Sawicki
-// Copyright (c) 2019-2024 Google LLC
+// Copyright (c) 2013-2025 Antoni Sawicki
 //

 package main
@ -13,17 +12,8 @@ import (
 	"embed"
 	"flag"
 	"fmt"
-	"image"
-	"image/color/palette"
-	"image/gif"
-	"image/jpeg"
-	"image/png"
 	"io"
-	"io/ioutil"
 	"log"
-	"math"
-	"math/rand"
-	"net"
 	"net/http"
 	"net/url"
 	"os"
@ -35,28 +25,26 @@ import (
 	"text/template"
 	"time"

-	"github.com/MaxHalford/halfgone"
-	"github.com/chromedp/cdproto/css"
-	"github.com/chromedp/cdproto/emulation"
-	"github.com/chromedp/cdproto/input"
-	"github.com/chromedp/cdproto/page"
-	"github.com/chromedp/chromedp"
-	"github.com/soniakeys/quant/median"
+	_ "github.com/breml/rootcerts"
 )

-const version = "4.7.1"
+const version = "4.8.2"
+
+var (
+	addr       = flag.String("l", ":8080", "Listen address:port, default :8080")
+	headless   = flag.Bool("h", true, "Headless mode / hide browser window (default true)")
+	noDel      = flag.Bool("n", false, "Do not free maps and images after use")
+	defType    = flag.String("t", "gif", "Image type: png|gif|jpg")
+	wrpMode    = flag.String("m", "ismap", "WRP Mode: ismap|html")
+	defImgSize = flag.Int64("is", 200, "html mode default image size")
+	defJpgQual = flag.Int64("q", 75, "Jpeg image quality, default 75%") // TODO: this should be form dropdown when jpeg is selected as image type
+	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")
+)

 var (
-	addr        = flag.String("l", ":8080", "Listen address:port, default :8080")
-	headless    = flag.Bool("h", true, "Headless mode / hide browser window (default true)")
-	noDel       = flag.Bool("n", false, "Do not free maps and images after use")
-	defType     = flag.String("t", "gif", "Image type: png|gif|jpg|txt")
-	txtImgSize  = flag.Int("ts", 200, "txt mode image size") // make it default, this should come from the from
-	jpgQual     = flag.Int("q", 80, "Jpeg image quality, default 80%")
-	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
@ -75,12 +63,17 @@ type geom struct {
 	c int64
 }

+// TODO: there is a major overlap/duplication/triplication
+// between the 3 data structs, perhps we could reduce to just one?
+
 // Data for html template
 type uiData struct {
 	Version    string
+	WrpMode    string
 	URL        string
 	BgColor    string
 	NColors    int64
+	JQual      int64
 	Width      int64
 	Height     int64
 	Zoom       float64
@ -89,13 +82,14 @@ type uiData struct {
 	ImgSize    string
 	ImgWidth   int
 	ImgHeight  int
+	MaxSize    int64
 	MapURL     string
 	PageHeight string
 	TeXT       string
 }

 // Parameters for HTML print function
-type printParams struct {
+type uiParams struct {
 	bgColor    string
 	pageHeight string
 	imgSize    string
@ -108,27 +102,34 @@ type printParams struct {

 // WRP Request
 type wrpReq struct {
-	url     string  // url
-	width   int64   // width
-	height  int64   // height
-	zoom    float64 // zoom/scale
-	colors  int64   // #colors
-	mouseX  int64   // mouseX
-	mouseY  int64   // mouseY
-	keys    string  // keys to send
-	buttons string  // Fn buttons
-	imgType string  // imgtype
+	url     string
+	width   int64
+	height  int64
+	zoom    float64
+	nColors int64
+	jQual   int64
+	mouseX  int64
+	mouseY  int64
+	keys    string
+	buttons string
+	imgType string
+	wrpMode string
+	maxSize int64
 	w       http.ResponseWriter
 	r       *http.Request
 }

-// Parse HTML Form, Process Input Boxes, Etc.
 func (rq *wrpReq) parseForm() {
 	rq.r.ParseForm()
+	rq.wrpMode = rq.r.FormValue("m")
+	if rq.wrpMode == "" {
+		rq.wrpMode = *wrpMode
+	}
 	rq.url = rq.r.FormValue("url")
 	if len(rq.url) > 1 && !strings.HasPrefix(rq.url, "http") {
 		rq.url = fmt.Sprintf("http://www.google.com/search?q=%s", url.QueryEscape(rq.url))
 	}
+	// TODO: implement atoiOrZero
 	rq.width, _ = strconv.ParseInt(rq.r.FormValue("w"), 10, 64)
 	rq.height, _ = strconv.ParseInt(rq.r.FormValue("h"), 10, 64)
 	if rq.width < 10 && rq.height < 10 {
@ -139,26 +140,30 @@ func (rq *wrpReq) parseForm() {
 	if rq.zoom < 0.1 {
 		rq.zoom = 1.0
 	}
-	rq.colors, _ = strconv.ParseInt(rq.r.FormValue("c"), 10, 64)
-	if rq.colors < 2 || rq.colors > 256 {
-		rq.colors = defGeom.c
+	rq.imgType = rq.r.FormValue("t")
+	switch rq.imgType {
+	case "png", "gif", "jpg":
+	default:
+		rq.imgType = *defType
+	}
+	rq.nColors, _ = strconv.ParseInt(rq.r.FormValue("c"), 10, 64)
+	if rq.nColors < 2 || rq.nColors > 256 {
+		rq.nColors = defGeom.c
+	}
+	rq.jQual, _ = strconv.ParseInt(rq.r.FormValue("q"), 10, 64)
+	if rq.jQual < 1 || rq.jQual > 100 {
+		rq.jQual = *defJpgQual
 	}
 	rq.keys = rq.r.FormValue("k")
 	rq.buttons = rq.r.FormValue("Fn")
-	rq.imgType = rq.r.FormValue("t")
-	switch rq.imgType {
-	case "png":
-	case "gif":
-	case "jpg":
-	case "txt":
-	default:
-		rq.imgType = *defType
+	rq.maxSize, _ = strconv.ParseInt(rq.r.FormValue("s"), 10, 64)
+	if rq.maxSize == 0 {
+		rq.maxSize = *defImgSize
 	}
 	log.Printf("%s WrpReq from UI Form: %+v\n", rq.r.RemoteAddr, rq)
 }

-// Display WP UI
-func (rq *wrpReq) printHTML(p printParams) {
+func (rq *wrpReq) printUI(p uiParams) {
 	rq.w.Header().Set("Cache-Control", "max-age=0")
 	rq.w.Header().Set("Expires", "-1")
 	rq.w.Header().Set("Pragma", "no-cache")
@ -168,12 +173,15 @@ func (rq *wrpReq) printHTML(p printParams) {
 	}
 	data := uiData{
 		Version:    version,
+		WrpMode:    rq.wrpMode,
 		URL:        rq.url,
 		BgColor:    p.bgColor,
 		Width:      rq.width,
 		Height:     rq.height,
-		NColors:    rq.colors,
+		NColors:    rq.nColors,
+		JQual:      rq.jQual,
 		Zoom:       rq.zoom,
+		MaxSize:    rq.maxSize,
 		ImgType:    rq.imgType,
 		ImgSize:    p.imgSize,
 		ImgWidth:   p.imgWidth,
@ -189,253 +197,6 @@ func (rq *wrpReq) printHTML(p printParams) {
 	}
 }

-// Determine what action to take
-func (rq *wrpReq) action() chromedp.Action {
-	// Mouse Click
-	if rq.mouseX > 0 && rq.mouseY > 0 {
-		log.Printf("%s Mouse Click %d,%d\n", rq.r.RemoteAddr, rq.mouseX, rq.mouseY)
-		return chromedp.MouseClickXY(float64(rq.mouseX)/float64(rq.zoom), float64(rq.mouseY)/float64(rq.zoom))
-	}
-	// Buttons
-	if len(rq.buttons) > 0 {
-		log.Printf("%s Button %v\n", rq.r.RemoteAddr, rq.buttons)
-		switch rq.buttons {
-		case "Bk":
-			return chromedp.NavigateBack()
-		case "St":
-			return chromedp.Stop()
-		case "Re":
-			return chromedp.Reload()
-		case "Bs":
-			return chromedp.KeyEvent("\b")
-		case "Rt":
-			return chromedp.KeyEvent("\r")
-		case "<":
-			return chromedp.KeyEvent("\u0302")
-		case "^":
-			return chromedp.KeyEvent("\u0304")
-		case "v":
-			return chromedp.KeyEvent("\u0301")
-		case ">":
-			return chromedp.KeyEvent("\u0303")
-		case "Up":
-			return chromedp.KeyEvent("\u0308")
-		case "Dn":
-			return chromedp.KeyEvent("\u0307")
-		case "All": // Select all
-			return chromedp.KeyEvent("a", chromedp.KeyModifiers(input.ModifierCtrl))
-		}
-	}
-	// Keys
-	if len(rq.keys) > 0 {
-		log.Printf("%s Sending Keys: %#v\n", rq.r.RemoteAddr, rq.keys)
-		return chromedp.KeyEvent(rq.keys)
-	}
-	// Navigate to URL
-	log.Printf("%s Processing Navigate Request for %s\n", rq.r.RemoteAddr, rq.url)
-	return chromedp.Navigate(rq.url)
-}
-
-// Navigate to the desired URL.
-func (rq *wrpReq) navigate() {
-	ctxErr(chromedp.Run(ctx, rq.action()), rq.w)
-}
-
-// Handle context errors
-func ctxErr(err error, w io.Writer) {
-	// TODO: callers should have retry logic, perhaps create another function
-	// that takes ...chromedp.Action and retries with give up
-	if err == nil {
-		return
-	}
-	log.Printf("Context error: %s", err)
-	fmt.Fprintf(w, "Context error: %s<BR>\n", err)
-	if err.Error() != "context canceled" {
-		return
-	}
-	ctx, cncl = chromedp.NewContext(actx)
-	log.Printf("Created new context, try again")
-	fmt.Fprintln(w, "Created new context, try again")
-}
-
-// https://github.com/chromedp/chromedp/issues/979
-func chromedpCaptureScreenshot(res *[]byte, h int64) chromedp.Action {
-	if res == nil {
-		panic("res cannot be nil")
-	}
-	if h == 0 {
-		return chromedp.CaptureScreenshot(res)
-	}
-
-	return chromedp.ActionFunc(func(ctx context.Context) error {
-		var err error
-		*res, err = page.CaptureScreenshot().Do(ctx)
-		return err
-	})
-}
-
-func gifPalette(i image.Image, n int64) image.Image {
-	switch n {
-	case 2:
-		i = halfgone.FloydSteinbergDitherer{}.Apply(halfgone.ImageToGray(i))
-	case 216:
-		var FastGifLut = [256]int{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5}
-		r := i.Bounds()
-		// NOTE: the color index computation below works only for palette.WebSafe!
-		p := image.NewPaletted(r, palette.WebSafe)
-		if i64, ok := i.(image.RGBA64Image); ok {
-			for y := r.Min.Y; y < r.Max.Y; y++ {
-				for x := r.Min.X; x < r.Max.X; x++ {
-					c := i64.RGBA64At(x, y)
-					r6 := FastGifLut[c.R>>8]
-					g6 := FastGifLut[c.G>>8]
-					b6 := FastGifLut[c.B>>8]
-					p.SetColorIndex(x, y, uint8(36*r6+6*g6+b6))
-				}
-			}
-		} else {
-			for y := r.Min.Y; y < r.Max.Y; y++ {
-				for x := r.Min.X; x < r.Max.X; x++ {
-					c := i.At(x, y)
-					r, g, b, _ := c.RGBA()
-					r6 := FastGifLut[r&0xff]
-					g6 := FastGifLut[g&0xff]
-					b6 := FastGifLut[b&0xff]
-					p.SetColorIndex(x, y, uint8(36*r6+6*g6+b6))
-				}
-			}
-		}
-		i = p
-	default:
-		q := median.Quantizer(n)
-		i = q.Paletted(i)
-	}
-	return i
-}
-
-func (rq *wrpReq) captureImage() {
-	var styles []*css.ComputedStyleProperty
-	var r, g, b int
-	var bgColorSet bool
-	var h int64
-	var pngCap []byte
-	chromedp.Run(ctx,
-		emulation.SetDeviceMetricsOverride(int64(float64(rq.width)/rq.zoom), 10, rq.zoom, false),
-		chromedp.Location(&rq.url),
-		chromedp.ComputedStyle("body", &styles, chromedp.ByQuery),
-		chromedp.ActionFunc(func(ctx context.Context) error {
-			_, _, _, _, _, s, err := page.GetLayoutMetrics().Do(ctx)
-			if err == nil {
-				h = int64(math.Ceil(s.Height))
-			}
-			return nil
-		}),
-	)
-	log.Printf("%s Landed on: %s, Height: %v\n", rq.r.RemoteAddr, rq.url, h)
-	for _, style := range styles {
-		if style.Name != "background-color" {
-			continue
-		}
-		fmt.Sscanf(style.Value, "rgb(%d,%d,%d)", &r, &g, &b)
-		bgColorSet = true
-		break
-	}
-	if !bgColorSet {
-		r = 255
-		g = 255
-		b = 255
-	}
-	height := int64(float64(rq.height) / rq.zoom)
-	if rq.height == 0 && h > 0 {
-		height = h + 30
-	}
-	chromedp.Run(
-		ctx, emulation.SetDeviceMetricsOverride(int64(float64(rq.width)/rq.zoom), height, rq.zoom, false),
-		chromedp.Sleep(*delay), // TODO(tenox): find a better way to determine if page is rendered
-	)
-	// Capture screenshot...
-	ctxErr(chromedp.Run(ctx, chromedpCaptureScreenshot(&pngCap, rq.height)), rq.w)
-	seq := rand.Intn(9999)
-	imgPath := fmt.Sprintf("/img/%04d.%s", seq, rq.imgType)
-	mapPath := fmt.Sprintf("/map/%04d.map", seq)
-	ismap[mapPath] = *rq
-	var sSize string
-	var iW, iH int
-	switch rq.imgType {
-	case "png":
-		pngBuf := bytes.NewBuffer(pngCap)
-		img[imgPath] = *pngBuf
-		cfg, _, _ := image.DecodeConfig(pngBuf)
-		sSize = fmt.Sprintf("%.0f KB", float32(len(pngBuf.Bytes()))/1024.0)
-		iW = cfg.Width
-		iH = cfg.Height
-		log.Printf("%s Got PNG image: %s, Size: %s, Res: %dx%d\n", rq.r.RemoteAddr, imgPath, sSize, iW, iH)
-	case "gif":
-		i, err := png.Decode(bytes.NewReader(pngCap))
-		if err != nil {
-			log.Printf("%s Failed to decode PNG screenshot: %s\n", rq.r.RemoteAddr, err)
-			fmt.Fprintf(rq.w, "<BR>Unable to decode page PNG screenshot:<BR>%s<BR>\n", err)
-			return
-		}
-		st := time.Now()
-		var gifBuf bytes.Buffer
-		err = gif.Encode(&gifBuf, gifPalette(i, rq.colors), &gif.Options{})
-		if err != nil {
-			log.Printf("%s Failed to encode GIF: %s\n", rq.r.RemoteAddr, err)
-			fmt.Fprintf(rq.w, "<BR>Unable to encode GIF:<BR>%s<BR>\n", err)
-			return
-		}
-		img[imgPath] = gifBuf
-		sSize = fmt.Sprintf("%.0f KB", float32(len(gifBuf.Bytes()))/1024.0)
-		iW = i.Bounds().Max.X
-		iH = i.Bounds().Max.Y
-		log.Printf("%s Encoded GIF image: %s, Size: %s, Colors: %d, Res: %dx%d, Time: %vms\n", rq.r.RemoteAddr, imgPath, sSize, rq.colors, iW, iH, time.Since(st).Milliseconds())
-	case "jpg":
-		i, err := png.Decode(bytes.NewReader(pngCap))
-		if err != nil {
-			log.Printf("%s Failed to decode PNG screenshot: %s\n", rq.r.RemoteAddr, err)
-			fmt.Fprintf(rq.w, "<BR>Unable to decode page PNG screenshot:<BR>%s<BR>\n", err)
-			return
-		}
-		st := time.Now()
-		var jpgBuf bytes.Buffer
-		err = jpeg.Encode(&jpgBuf, i, &jpeg.Options{Quality: *jpgQual})
-		if err != nil {
-			log.Printf("%s Failed to encode JPG: %s\n", rq.r.RemoteAddr, err)
-			fmt.Fprintf(rq.w, "<BR>Unable to encode JPG:<BR>%s<BR>\n", err)
-			return
-		}
-		img[imgPath] = jpgBuf
-		sSize = fmt.Sprintf("%.0f KB", float32(len(jpgBuf.Bytes()))/1024.0)
-		iW = i.Bounds().Max.X
-		iH = i.Bounds().Max.Y
-		log.Printf("%s Encoded JPG image: %s, Size: %s, Quality: %d, Res: %dx%d, Time: %vms\n", rq.r.RemoteAddr, imgPath, sSize, *jpgQual, iW, iH, time.Since(st).Milliseconds())
-	}
-	rq.printHTML(printParams{
-		bgColor:    fmt.Sprintf("#%02X%02X%02X", r, g, b),
-		pageHeight: fmt.Sprintf("%d PX", h),
-		imgSize:    sSize,
-		imgURL:     imgPath,
-		mapURL:     mapPath,
-		imgWidth:   iW,
-		imgHeight:  iH,
-	})
-	log.Printf("%s Done with capture for %s\n", rq.r.RemoteAddr, rq.url)
-}
-
-func asciify(s []byte) []byte {
-	a := make([]byte, len(s))
-	for i := 0; i < len(s); i++ {
-		if s[i] > 127 {
-			a[i] = '.'
-			continue
-		}
-		a[i] = s[i]
-	}
-	return a
-}
-
-// Process HTTP requests to WRP '/' url
 func pageServer(w http.ResponseWriter, r *http.Request) {
 	log.Printf("%s Page Request for %s [%+v]\n", r.RemoteAddr, r.URL.Path, r.URL.RawQuery)
 	rq := wrpReq{
@ -444,80 +205,19 @@ func pageServer(w http.ResponseWriter, r *http.Request) {
 	}
 	rq.parseForm()
 	if len(rq.url) < 4 {
-		rq.printHTML(printParams{bgColor: "#FFFFFF"})
+		rq.printUI(uiParams{bgColor: "#FFFFFF"})
 		return
 	}
 	rq.navigate() // TODO: if error from navigate do not capture
-	if rq.imgType == "txt" {
+	if rq.wrpMode == "html" {
 		rq.captureMarkdown()
 		return
 	}
-	rq.captureImage()
+	rq.captureScreenshot()
 }

-// Process HTTP requests to ISMAP '/map/' url
-func mapServer(w http.ResponseWriter, r *http.Request) {
-	log.Printf("%s ISMAP Request for %s [%+v]\n", r.RemoteAddr, r.URL.Path, r.URL.RawQuery)
-	rq, ok := ismap[r.URL.Path]
-	rq.r = r
-	rq.w = w
-	if !ok {
-		fmt.Fprintf(w, "Unable to find map %s\n", r.URL.Path)
-		log.Printf("Unable to find map %s\n", r.URL.Path)
-		return
-	}
-	if !*noDel {
-		defer delete(ismap, r.URL.Path)
-	}
-	n, err := fmt.Sscanf(r.URL.RawQuery, "%d,%d", &rq.mouseX, &rq.mouseY)
-	if err != nil || n != 2 {
-		fmt.Fprintf(w, "n=%d, err=%s\n", n, err)
-		log.Printf("%s ISMAP n=%d, err=%s\n", r.RemoteAddr, n, err)
-		return
-	}
-	log.Printf("%s WrpReq from ISMAP: %+v\n", r.RemoteAddr, rq)
-	if len(rq.url) < 4 {
-		rq.printHTML(printParams{bgColor: "#FFFFFF"})
-		return
-	}
-	rq.navigate() // TODO: if error from navigate do not capture
-	rq.captureImage()
-}
-
-// Process HTTP requests for images '/img/' url
-func imgServer(w http.ResponseWriter, r *http.Request) {
-	log.Printf("%s IMG Request for %s\n", r.RemoteAddr, r.URL.Path)
-	imgBuf, ok := img[r.URL.Path]
-	if !ok || imgBuf.Bytes() == nil {
-		fmt.Fprintf(w, "Unable to find image %s\n", r.URL.Path)
-		log.Printf("%s Unable to find image %s\n", r.RemoteAddr, r.URL.Path)
-		return
-	}
-	if !*noDel {
-		defer delete(img, r.URL.Path)
-	}
-	switch {
-	case strings.HasSuffix(r.URL.Path, ".gif"):
-		w.Header().Set("Content-Type", "image/gif")
-	case strings.HasSuffix(r.URL.Path, ".png"):
-		w.Header().Set("Content-Type", "image/png")
-	case strings.HasSuffix(r.URL.Path, ".jpg"):
-		w.Header().Set("Content-Type", "image/jpeg")
-	}
-	w.Header().Set("Content-Length", strconv.Itoa(len(imgBuf.Bytes())))
-	w.Header().Set("Cache-Control", "max-age=0")
-	w.Header().Set("Expires", "-1")
-	w.Header().Set("Pragma", "no-cache")
-	w.Write(imgBuf.Bytes())
-	w.(http.Flusher).Flush()
-}
-
-// Process HTTP requests for Shutdown via '/shutdown/' url
 func haltServer(w http.ResponseWriter, r *http.Request) {
 	log.Printf("%s Shutdown Request for %s\n", r.RemoteAddr, r.URL.Path)
-	w.Header().Set("Cache-Control", "max-age=0")
-	w.Header().Set("Expires", "-1")
-	w.Header().Set("Pragma", "no-cache")
 	w.Header().Set("Content-Type", "text/plain")
 	fmt.Fprintf(w, "Shutting down WRP...\n")
 	w.(http.Flusher).Flush()
@ -528,8 +228,7 @@ func haltServer(w http.ResponseWriter, r *http.Request) {
 	os.Exit(1)
 }

-// returns html template, either from html file or built-in
-func tmpl(t string) string {
+func wrpTemplate(t string) string {
 	var tmpl []byte
 	fh, err := os.Open(t)
 	if err != nil {
@ -537,7 +236,7 @@ func tmpl(t string) string {
 	}
 	defer fh.Close()

-	tmpl, err = ioutil.ReadAll(fh)
+	tmpl, err = io.ReadAll(fh)
 	if err != nil {
 		goto builtin
 	}
@ -551,7 +250,7 @@ builtin:
 	}
 	defer fhs.Close()

-	tmpl, err = ioutil.ReadAll(fhs)
+	tmpl, err = io.ReadAll(fhs)
 	if err != nil {
 		log.Fatal(err)
 	}
@ -559,61 +258,25 @@ builtin:
 	return string(tmpl)
 }

-// Print my own IP addresses
-func printIPs(b string) {
-	ap := strings.Split(b, ":")
-	if len(ap) < 1 {
-		log.Fatal("Wrong format of ipaddress:port")
-	}
-	log.Printf("Listen address: %v", b)
-	if ap[0] != "" && ap[0] != "0.0.0.0" {
-		return
-	}
-	a, err := net.InterfaceAddrs()
-	if err != nil {
-		log.Print("Unable to get interfaces: ", err)
-		return
-	}
-	var m string
-	for _, i := range a {
-		n, ok := i.(*net.IPNet)
-		if !ok || n.IP.IsLoopback() || strings.Contains(n.IP.String(), ":") {
-			continue
-		}
-		m = m + n.IP.String() + " "
-	}
-	log.Print("My IP addresses: ", m)
-}
-
-// Main
 func main() {
 	var err error
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
 	flag.Parse()
 	log.Printf("Web Rendering Proxy Version %s (%v)\n", version, runtime.GOARCH)
+	log.Printf("Using embedded ca-certs from github.com/breml/rootcerts")
 	log.Printf("Args: %q", os.Args)
 	if len(os.Getenv("PORT")) > 0 {
 		*addr = ":" + os.Getenv(("PORT"))
 	}
-	printIPs(*addr)
+	printMyIPs(*addr)
 	n, err := fmt.Sscanf(*fgeom, "%dx%dx%d", &defGeom.w, &defGeom.h, &defGeom.c)
 	if err != nil || n != 3 {
 		log.Fatalf("Unable to parse -g geometry flag / %s", err)
 	}

-	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)
+	cncl, acncl = chromedpStart()
 	defer cncl()
+	defer acncl()

 	c := make(chan os.Signal)
 	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
@ -628,14 +291,14 @@ func main() {

 	http.HandleFunc("/", pageServer)
 	http.HandleFunc("/map/", mapServer)
-	http.HandleFunc("/img/", imgServer)
-	http.HandleFunc(imgZpfx, imgServerZ)
+	http.HandleFunc("/img/", imgServerMap)
+	http.HandleFunc(imgZpfx, imgServerTxt)
 	http.HandleFunc("/shutdown/", haltServer)
 	http.HandleFunc("/favicon.ico", http.NotFound)

 	log.Printf("Default Img Type: %v, Geometry: %+v", *defType, defGeom)

-	htmlTmpl, err = template.New("wrp.html").Parse(tmpl(*htmFnam))
+	htmlTmpl, err = template.New("wrp.html").Parse(wrpTemplate(*htmFnam))
 	if err != nil {
 		log.Fatal(err)
 	}
--- a/wrp.html
+++ b/wrp.html
@ -6,7 +6,7 @@
        <FORM ACTION="/" METHOD="POST">
            <INPUT TYPE="TEXT" NAME="url" VALUE="{{.URL}}" SIZE="20">
            <INPUT TYPE="SUBMIT" VALUE="Go">
-            {{ if ne .ImgType "txt" }}
+            {{ if eq .WrpMode "ismap" }}
            <INPUT TYPE="SUBMIT" NAME="Fn" VALUE="Bk">
            <INPUT TYPE="SUBMIT" NAME="Fn" VALUE="St">
            <INPUT TYPE="SUBMIT" NAME="Fn" VALUE="Re">
@ -14,7 +14,13 @@
            <INPUT TYPE="SUBMIT" NAME="Fn" VALUE="Dn">
            W <INPUT TYPE="TEXT" NAME="w" VALUE="{{.Width}}" SIZE="4">
            H <INPUT TYPE="TEXT" NAME="h" VALUE="{{.Height}}" SIZE="4">
+            {{ end }}
+            {{ if eq .WrpMode "html" }}
+            S <INPUT TYPE="TEXT" NAME="s" VALUE="{{.MaxSize}}" SIZE="4">
+            {{ end }}
+            {{ if eq .WrpMode "ismap" }}
            Z <SELECT NAME="z">
+                <OPTION DISABLED>Zoom</OPTION>
                <OPTION VALUE="0.7" {{ if eq .Zoom 0.7}}SELECTED{{end}}>0.7 x</OPTION>
                <OPTION VALUE="0.8" {{ if eq .Zoom 0.8}}SELECTED{{end}}>0.8 x</OPTION>
                <OPTION VALUE="0.9" {{ if eq .Zoom 0.9}}SELECTED{{end}}>0.9 x</OPTION>
@ -24,14 +30,20 @@
                <OPTION VALUE="1.3" {{ if eq .Zoom 1.3}}SELECTED{{end}}>1.3 x</OPTION>
            </SELECT>
            {{ end }}
+            M <SELECT NAME="m">
+                <OPTION DISABLED>Mode</OPTION>
+                <OPTION VALUE="ismap" {{ if eq .WrpMode "ismap"}}SELECTED{{end}}>ISMAP</OPTION>
+                <OPTION VALUE="html" {{ if eq .WrpMode "html"}}SELECTED{{end}}>HTML</OPTION>
+            </SELECT>
            T <SELECT NAME="t">
+                <OPTION DISABLED>Type</OPTION>
                <OPTION VALUE="png" {{ if eq .ImgType "png"}}SELECTED{{end}}>PNG</OPTION>
                <OPTION VALUE="gif" {{ if eq .ImgType "gif"}}SELECTED{{end}}>GIF</OPTION>
                <OPTION VALUE="jpg" {{ if eq .ImgType "jpg"}}SELECTED{{end}}>JPG</OPTION>
-                <OPTION VALUE="txt" {{ if eq .ImgType "txt"}}SELECTED{{end}}>TXT</OPTION>
            </SELECT>
-            {{ if ne .ImgType "txt" }}
+            {{ if eq .ImgType "gif" }}
            C <SELECT NAME="c">
+                <OPTION DISABLED>Ncol</OPTION>
                <OPTION VALUE="256" {{ if eq .NColors 256}}SELECTED{{end}}>256</OPTION>
                <OPTION VALUE="216" {{ if eq .NColors 216}}SELECTED{{end}}>216</OPTION>
                <OPTION VALUE="128" {{ if eq .NColors 128}}SELECTED{{end}}>128</OPTION>
@ -39,10 +51,15 @@
                <OPTION VALUE="16" {{ if eq .NColors 16}}SELECTED{{end}}>16</OPTION>
                <OPTION VALUE="2" {{ if eq .NColors 2}}SELECTED{{end}}>2</OPTION>
            </SELECT>
+            {{ end }}
+            {{ if eq .ImgType "jpg" }}
+            Q <INPUT TYPE="TEXT" NAME="q" VALUE="{{.JQual}}" SIZE="2">%
+            {{ end }}
+            {{ if eq .WrpMode "ismap" }}
            K <INPUT TYPE="TEXT" NAME="k" VALUE="" SIZE="4">
            <INPUT TYPE="SUBMIT" NAME="Fn" VALUE="Bs">
-            <INPUT TYPE="SUBMIT" NAME="Fn" VALUE="Rt">
-            <INPUT TYPE="SUBMIT" NAME="Fn" VALUE="All"><!--
+            <INPUT TYPE="SUBMIT" NAME="Fn" VALUE="Rt"><!--
+            <INPUT TYPE="SUBMIT" NAME="Fn" VALUE="All">
            <INPUT TYPE="SUBMIT" NAME="Fn" VALUE="&lt;">
            <INPUT TYPE="SUBMIT" NAME="Fn" VALUE="^">
            <INPUT TYPE="SUBMIT" NAME="Fn" VALUE="v">
@ -60,7 +77,7 @@
 		<FONT SIZE="-2">
 		<A HREF="/?url=https://github.com/tenox7/wrp/&w={{.Width}}&h={{.Height}}&s={{printf "%.1f" .Zoom}}&c={{.NColors}}&t={{.ImgType}}">Web Rendering Proxy {{.Version}}</A> |
 		<A HREF="/shutdown/">Shutdown WRP</A> |
-        {{ if ne .ImgType "txt" }}
+        {{ if eq .WrpMode "ismap" }}
 		<A HREF="/">Page Height: {{.PageHeight}}</A> |
 		<A HREF="/">Img Size: {{.ImgSize}}</A>
        {{end}}
Author	SHA1	Message	Date
Antoni Sawicki	0fd6967393	remove select all from default template	2025-02-14 01:45:17 -08:00
Antoni Sawicki	3ad8f78c45	remove evil corpo slavemark	2025-02-14 01:44:26 -08:00
Antoni Sawicki	e3dbe85c51	add better key descriptions	2025-02-14 01:41:17 -08:00
Antoni Sawicki	30c42bd9b8	update ver	2025-02-14 01:25:48 -08:00
Antoni Sawicki	12724a262e	update dependencies	2025-02-14 01:23:00 -08:00
Antoni Sawicki	25a382e809	update dependencies	2024-08-25 15:45:00 -07:00
Antoni Sawicki	b03b8a8031	add info on armv6	2024-08-25 15:44:44 -07:00
Antoni Sawicki	a0eb33fe51	fix html wrpmode	2024-07-14 14:54:31 -07:00
Antoni Sawicki	f56c958aba	readme update	2024-07-11 21:40:13 -07:00
Antoni Sawicki	3004962beb	merge txt into master	2024-07-11 21:25:34 -07:00
Antoni Sawicki	4d9319eef2	todo update	2024-07-11 21:22:13 -07:00
Antoni Sawicki	7916fa1260	rename files	2024-07-09 22:53:55 -07:00
Antoni Sawicki	9f9014dc15	use short uuid generator instead of rand	2024-07-09 22:50:25 -07:00
Antoni Sawicki	3231a0a61c	count image size for simple html mode	2024-07-09 22:03:22 -07:00
Antoni Sawicki	94fb4f437b	todo updates	2024-07-09 02:11:41 -07:00
Antoni Sawicki	9110ad0853	embed certs for text mode	2024-07-09 02:09:18 -07:00
Antoni Sawicki	51c4c35651	use local binaries for local docker	2024-07-09 02:07:50 -07:00
Antoni Sawicki	b6e402029a	ver bump to 4.7.2	2024-07-09 02:00:45 -07:00
Antoni Sawicki	9f7107c00b	add docker clean target	2024-07-09 02:00:34 -07:00
Antoni Sawicki	500ad0d19a	use local binaries for local dockerfile	2024-07-09 01:57:51 -07:00
Antoni Sawicki	b5747f52e7	use embedded certs	2024-07-09 01:57:03 -07:00
Antoni Sawicki	0d998af68c	jpeg quality via form value etc	2024-07-09 01:45:03 -07:00
Antoni Sawicki	eb38499280	todo updates	2024-07-09 01:11:20 -07:00
Antoni Sawicki	56fa314d61	image type based on form value	2024-07-08 21:55:03 -07:00
Antoni Sawicki	335a84f52e	use form image size	2024-07-08 21:54:45 -07:00
Antoni Sawicki	bb29ce38de	pass img type and size	2024-07-08 21:46:47 -07:00
Antoni Sawicki	db4ed0d811	code reorg, comments etc	2024-07-08 21:36:32 -07:00
Antoni Sawicki	2f667e447c	move some code to util.go	2024-07-08 21:27:51 -07:00
Antoni Sawicki	00304b5d05	fix makefile	2024-07-07 23:40:46 -07:00
Antoni Sawicki	9f21d8d06e	makefile fixes	2024-07-07 23:38:33 -07:00
Antoni Sawicki	8d165df36d	more fixes	2024-07-03 05:24:56 -07:00