gromer

git clone https://pyrossh.dev/repos/gromer.git

gromer is a framework and cli to build multipage web apps in golang using htmx and alpinejs.

f3604a4a — pyros2097

handle panics

Files changed (5) hide show

app_nowasm.go +7 -7
app_wasm.go +5 -10
example/main.go +1 -0
example/panic.go +9 -0
router.go +28 -406

app_nowasm.go CHANGED Viewed

@@ -5,6 +5,7 @@ package app
 import (
 	"bytes"
 	"fmt"
+	"io"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -46,19 +47,19 @@ func Run() {
 			return
 		}
 		assetsFS := http.FileServer(pkger.Dir(filepath.Join(wd, "assets")))
-		router.GET("/assets/*filepath", func(w http.ResponseWriter, r *http.Request) {
+		AppRouter.GET("/assets/*filepath", func(w http.ResponseWriter, r *http.Request) {
 			r.URL.Path = strings.Replace(r.URL.Path, "/assets", "", 1)
 			assetsFS.ServeHTTP(w, r)
 		})
 	}
 	if isLambda {
 		println("running in lambda mode")
-		algnhsa.ListenAndServe(router, &algnhsa.Options{
+		algnhsa.ListenAndServe(AppRouter, &algnhsa.Options{
 			BinaryContentTypes: []string{"application/wasm", "image/png"},
 		})
 	} else {
 		println("Serving on HTTP port: 1234")
-		http.ListenAndServe(":1234", router)
+		http.ListenAndServe(":1234", AppRouter)
 	}
 }
@@ -68,10 +69,10 @@ func Reload() {
 func Route(path string, render RenderFunc) {
 	println("registering route: " + path)
-	router.GET(path, render)
+	AppRouter.GET(path, render)
 }
-func createPage(ui UI) *bytes.Buffer {
+func writePage(ui UI, w io.Writer) {
 	isLambda := os.Getenv("_LAMBDA_SERVER_PORT") != ""
 	page := bytes.NewBuffer(nil)
 	page.WriteString("<!DOCTYPE html>\n")
@@ -92,6 +93,5 @@ func createPage(ui UI) *bytes.Buffer {
 			Script(`const enosys = () => { const a = new Error("not implemented"); return a.code = "ENOSYS", a }; let outputBuf = ""; window.fs = { constants: { O_WRONLY: -1, O_RDWR: -1, O_CREAT: -1, O_TRUNC: -1, O_APPEND: -1, O_EXCL: -1 }, writeSync(a, b) { outputBuf += decoder.decode(b); const c = outputBuf.lastIndexOf("\n"); return -1 != c && (console.log(outputBuf.substr(0, c)), outputBuf = outputBuf.substr(c + 1)), b.length }, write(a, b, c, d, e, f) { if (0 !== c || d !== b.length || null !== e) return void f(enosys()); const g = this.writeSync(a, b); f(null, g) } }; const encoder = new TextEncoder("utf-8"), decoder = new TextDecoder("utf-8"); class Go { constructor() { this.argv = ["js"], this.env = {}, this.exit = a => { 0 !== a && console.warn("exit code:", a) }, this._exitPromise = new Promise(a => { this._resolveExitPromise = a }), this._pendingEvent = null, this._scheduledTimeouts = new Map, this._nextCallbackTimeoutID = 1; const a = (a, b) => { this.mem.setUint32(a + 0, b, !0), this.mem.setUint32(a + 4, Math.floor(b / 4294967296), !0) }, b = a => { const b = this.mem.getUint32(a + 0, !0), c = this.mem.getInt32(a + 4, !0); return b + 4294967296 * c }, c = a => { const b = this.mem.getFloat64(a, !0); if (0 !== b) { if (!isNaN(b)) return b; const c = this.mem.getUint32(a, !0); return this._values[c] } }, d = (a, b) => { const c = 2146959360; if ("number" == typeof b) return isNaN(b) ? (this.mem.setUint32(a + 4, 2146959360, !0), void this.mem.setUint32(a, 0, !0)) : 0 === b ? (this.mem.setUint32(a + 4, 2146959360, !0), void this.mem.setUint32(a, 1, !0)) : void this.mem.setFloat64(a, b, !0); switch (b) { case void 0: return void this.mem.setFloat64(a, 0, !0); case null: return this.mem.setUint32(a + 4, c, !0), void this.mem.setUint32(a, 2, !0); case !0: return this.mem.setUint32(a + 4, c, !0), void this.mem.setUint32(a, 3, !0); case !1: return this.mem.setUint32(a + 4, c, !0), void this.mem.setUint32(a, 4, !0); }let d = this._ids.get(b); d === void 0 && (d = this._idPool.pop(), d === void 0 && (d = this._values.length), this._values[d] = b, this._goRefCounts[d] = 0, this._ids.set(b, d)), this._goRefCounts[d]++; let e = 1; switch (typeof b) { case "string": e = 2; break; case "symbol": e = 3; break; case "function": e = 4; }this.mem.setUint32(a + 4, 2146959360 | e, !0), this.mem.setUint32(a, d, !0) }, e = a => { const c = b(a + 0), d = b(a + 8); return new Uint8Array(this._inst.exports.mem.buffer, c, d) }, f = d => { const e = b(d + 0), f = b(d + 8), g = Array(f); for (let a = 0; a < f; a++)g[a] = c(e + 8 * a); return g }, g = a => { const c = b(a + 0), d = b(a + 8); return decoder.decode(new DataView(this._inst.exports.mem.buffer, c, d)) }, h = Date.now() - performance.now(); this.importObject = { go: { "runtime.wasmExit": a => { const b = this.mem.getInt32(a + 8, !0); this.exited = !0, delete this._inst, delete this._values, delete this._goRefCounts, delete this._ids, delete this._idPool, this.exit(b) }, "runtime.wasmWrite": a => { const c = b(a + 8), d = b(a + 16), e = this.mem.getInt32(a + 24, !0); fs.writeSync(c, new Uint8Array(this._inst.exports.mem.buffer, d, e)) }, "runtime.resetMemoryDataView": () => { this.mem = new DataView(this._inst.exports.mem.buffer) }, "runtime.nanotime1": b => { a(b + 8, 1e6 * (h + performance.now())) }, "runtime.walltime1": b => { const c = new Date().getTime(); a(b + 8, c / 1e3), this.mem.setInt32(b + 16, 1e6 * (c % 1e3), !0) }, "runtime.scheduleTimeoutEvent": a => { const c = this._nextCallbackTimeoutID; this._nextCallbackTimeoutID++, this._scheduledTimeouts.set(c, setTimeout(() => { for (this._resume(); this._scheduledTimeouts.has(c);)console.warn("scheduleTimeoutEvent: missed timeout event"), this._resume() }, b(a + 8) + 1)), this.mem.setInt32(a + 16, c, !0) }, "runtime.clearTimeoutEvent": a => { const b = this.mem.getInt32(a + 8, !0); clearTimeout(this._scheduledTimeouts.get(b)), this._scheduledTimeouts.delete(b) }, "runtime.getRandomData": a => { crypto.getRandomValues(e(a + 8)) }, "syscall/js.finalizeRef": a => { const b = this.mem.getUint32(a + 8, !0); if (this._goRefCounts[b]--, 0 === this._goRefCounts[b]) { const a = this._values[b]; this._values[b] = null, this._ids.delete(a), this._idPool.push(b) } }, "syscall/js.stringVal": a => { d(a + 24, g(a + 8)) }, "syscall/js.valueGet": a => { const b = Reflect.get(c(a + 8), g(a + 16)); a = this._inst.exports.getsp(), d(a + 32, b) }, "syscall/js.valueSet": a => { Reflect.set(c(a + 8), g(a + 16), c(a + 32)) }, "syscall/js.valueDelete": a => { Reflect.deleteProperty(c(a + 8), g(a + 16)) }, "syscall/js.valueIndex": a => { d(a + 24, Reflect.get(c(a + 8), b(a + 16))) }, "syscall/js.valueSetIndex": a => { Reflect.set(c(a + 8), b(a + 16), c(a + 24)) }, "syscall/js.valueCall": a => { try { const b = c(a + 8), e = Reflect.get(b, g(a + 16)), h = f(a + 32), i = Reflect.apply(e, b, h); a = this._inst.exports.getsp(), d(a + 56, i), this.mem.setUint8(a + 64, 1) } catch (b) { d(a + 56, b), this.mem.setUint8(a + 64, 0) } }, "syscall/js.valueInvoke": a => { try { const b = c(a + 8), e = f(a + 16), g = Reflect.apply(b, void 0, e); a = this._inst.exports.getsp(), d(a + 40, g), this.mem.setUint8(a + 48, 1) } catch (b) { d(a + 40, b), this.mem.setUint8(a + 48, 0) } }, "syscall/js.valueNew": a => { try { const b = c(a + 8), e = f(a + 16), g = Reflect.construct(b, e); a = this._inst.exports.getsp(), d(a + 40, g), this.mem.setUint8(a + 48, 1) } catch (b) { d(a + 40, b), this.mem.setUint8(a + 48, 0) } }, "syscall/js.valueLength": b => { a(b + 16, parseInt(c(b + 8).length)) }, "syscall/js.valuePrepareString": b => { const e = encoder.encode(c(b + 8) + ""); d(b + 16, e), a(b + 24, e.length) }, "syscall/js.valueLoadString": a => { const b = c(a + 8); e(a + 16).set(b) }, "syscall/js.valueInstanceOf": a => { this.mem.setUint8(a + 24, c(a + 8) instanceof c(a + 16)) }, "syscall/js.copyBytesToGo": b => { const d = e(b + 8), f = c(b + 32); if (!(f instanceof Uint8Array)) return void this.mem.setUint8(b + 48, 0); const g = f.subarray(0, d.length); d.set(g), a(b + 40, g.length), this.mem.setUint8(b + 48, 1) }, "syscall/js.copyBytesToJS": b => { const d = c(b + 8), f = e(b + 16); if (!(d instanceof Uint8Array)) return void this.mem.setUint8(b + 48, 0); const g = f.subarray(0, d.length); d.set(g), a(b + 40, g.length), this.mem.setUint8(b + 48, 1) }, debug: a => { console.log(a) } } } } async run(a) { this._inst = a, this.mem = new DataView(this._inst.exports.mem.buffer), this._values = [NaN, 0, null, !0, !1, window, this], this._goRefCounts = [], this._ids = new Map, this._idPool = [], this.exited = !1; let b = 4096; const c = a => { const c = b, d = encoder.encode(a + "\0"); return new Uint8Array(this.mem.buffer, b, d.length).set(d), b += d.length, 0 != b % 8 && (b += 8 - b % 8), c }, d = this.argv.length, e = []; this.argv.forEach(a => { e.push(c(a)) }), e.push(0); const f = Object.keys(this.env).sort(); f.forEach(a => { e.push(c(a + "=" + this.env[a])) }), e.push(0); const g = b; e.forEach(a => { this.mem.setUint32(b, a, !0), this.mem.setUint32(b + 4, 0, !0), b += 8 }), this._inst.exports.run(d, g), this.exited && this._resolveExitPromise(), await this._exitPromise } _resume() { if (this.exited) throw new Error("Go program has already exited"); this._inst.exports.resume(), this.exited && this._resolveExitPromise() } _makeFuncWrapper(a) { const b = this; return function () { const c = { id: a, this: this, args: arguments }; return b._pendingEvent = c, b._resume(), c.result } } } const go = new Go; WebAssembly.instantiateStreaming(fetch("`+basePath+`main.wasm`+`"), go.importObject).then(a => go.run(a.instance)).catch(a => console.error("could not load wasm", a));`),
 		),
 		Body(ui),
-	).Html(page)
+	).Html(w)
-	return page
 }

app_wasm.go CHANGED Viewed

@@ -2,19 +2,15 @@
 package app
 import (
-	"bytes"
+	"io"
 	"github.com/pyros2097/wapp/js"
 )
 func Run() {
-	handle, _, _ := router.Lookup("GET", js.Window.URL().Path)
+	handle, _, _ := AppRouter.Lookup("GET", js.Window.URL().Path)
 	if handle == nil {
-		if router.NotFound != nil {
-			renderFunc = router.NotFound
+		renderFunc = AppRouter.NotFound
-		} else {
-			renderFunc = DefaultNotFound
-		}
 	} else {
 		renderFunc, _ = handle.(RenderFunc)
 	}
@@ -46,7 +42,7 @@ func Reload() {
 }
 func Route(path string, render RenderFunc) {
-	router.GET(path, render)
+	AppRouter.GET(path, render)
 }
 func initBody() {
@@ -81,6 +77,5 @@ func initContent() {
 // 	return u.Fragment != ""
 // }
-func createPage(ui UI) *bytes.Buffer {
+func writePage(ui UI, w io.Writer) {
-	return &bytes.Buffer{}
 }

example/main.go CHANGED Viewed

@@ -5,6 +5,7 @@ import (
 )
 func main() {
+	Route("/panic", Panic)
 	Route("/about", About)
 	Route("/clock", Clock)
 	Route("/container", Container)

example/panic.go ADDED Viewed

@@ -0,0 +1,9 @@
+package main
+import (
+	. "github.com/pyros2097/wapp"
+)
+func Panic(c *RenderContext) UI {
+	panic("Hello")
+}

router.go CHANGED Viewed

@@ -3,157 +3,12 @@ package app
 import (
 	"context"
 	"net/http"
-	"strconv"
 	"strings"
 	"sync"
 	"unicode"
 	"unicode/utf8"
 )
-// CleanPath is the URL version of path.Clean, it returns a canonical URL path
-// for p, eliminating . and .. elements.
-//
-// The following rules are applied iteratively until no further processing can
-// be done:
-//	1. Replace multiple slashes with a single slash.
-//	2. Eliminate each . path name element (the current directory).
-//	3. Eliminate each inner .. path name element (the parent directory)
-//	   along with the non-.. element that precedes it.
-//	4. Eliminate .. elements that begin a rooted path:
-//	   that is, replace "/.." by "/" at the beginning of a path.
-//
-// If the result of this process is an empty string, "/" is returned
-func CleanPath(p string) string {
-	const stackBufSize = 128
-	// Turn empty string into "/"
-	if p == "" {
-		return "/"
-	}
-	// Reasonably sized buffer on stack to avoid allocations in the common case.
-	// If a larger buffer is required, it gets allocated dynamically.
-	buf := make([]byte, 0, stackBufSize)
-	n := len(p)
-	// Invariants:
-	//      reading from path; r is index of next byte to process.
-	//      writing to buf; w is index of next byte to write.
-	// path must start with '/'
-	r := 1
-	w := 1
-	if p[0] != '/' {
-		r = 0
-		if n+1 > stackBufSize {
-			buf = make([]byte, n+1)
-		} else {
-			buf = buf[:n+1]
-		}
-		buf[0] = '/'
-	}
-	trailing := n > 1 && p[n-1] == '/'
-	// A bit more clunky without a 'lazybuf' like the path package, but the loop
-	// gets completely inlined (bufApp calls).
-	// So in contrast to the path package this loop has no expensive function
-	// calls (except make, if needed).
-	for r < n {
-		switch {
-		case p[r] == '/':
-			// empty path element, trailing slash is added after the end
-			r++
-		case p[r] == '.' && r+1 == n:
-			trailing = true
-			r++
-		case p[r] == '.' && p[r+1] == '/':
-			// . element
-			r += 2
-		case p[r] == '.' && p[r+1] == '.' && (r+2 == n || p[r+2] == '/'):
-			// .. element: remove to last /
-			r += 3
-			if w > 1 {
-				// can backtrack
-				w--
-				if len(buf) == 0 {
-					for w > 1 && p[w] != '/' {
-						w--
-					}
-				} else {
-					for w > 1 && buf[w] != '/' {
-						w--
-					}
-				}
-			}
-		default:
-			// Real path element.
-			// Add slash if needed
-			if w > 1 {
-				bufApp(&buf, p, w, '/')
-				w++
-			}
-			// Copy element
-			for r < n && p[r] != '/' {
-				bufApp(&buf, p, w, p[r])
-				w++
-				r++
-			}
-		}
-	}
-	// Re-append trailing slash
-	if trailing && w > 1 {
-		bufApp(&buf, p, w, '/')
-		w++
-	}
-	// If the original string was not modified (or only shortened at the end),
-	// return the respective substring of the original string.
-	// Otherwise return a new string from the buffer.
-	if len(buf) == 0 {
-		return p[:w]
-	}
-	return string(buf[:w])
-}
-// Internal helper to lazily create a buffer if necessary.
-// Calls to this function get inlined.
-func bufApp(buf *[]byte, s string, w int, c byte) {
-	b := *buf
-	if len(b) == 0 {
-		// No modification of the original string so far.
-		// If the next character is the same as in the original string, we do
-		// not yet have to allocate a buffer.
-		if s[w] == c {
-			return
-		}
-		// Otherwise use either the stack buffer, if it is large enough, or
-		// allocate a new buffer on the heap, and copy all previous characters.
-		if l := len(s); l > cap(b) {
-			*buf = make([]byte, len(s))
-		} else {
-			*buf = (*buf)[:l]
-		}
-		b = *buf
-		copy(b, s[:w])
-	}
-	b[w] = c
-}
 func min(a, b int) int {
 	if a <= b {
 		return a
@@ -857,31 +712,12 @@ func ParamsFromContext(ctx context.Context) Params {
 	return p
 }
-// MatchedRoutePathParam is the Param name under which the path of the matched
-// route is stored, if Router.SaveMatchedRoutePath is set.
-var MatchedRoutePathParam = "$matchedRoutePath"
-// MatchedRoutePath retrieves the path of the matched route.
-// Router.SaveMatchedRoutePath must have been enabled when the respective
-// handler was added, otherwise this function always returns an empty string.
-func (ps Params) MatchedRoutePath() string {
-	return ps.ByName(MatchedRoutePathParam)
-}
 // Router is a http.Handler which can be used to dispatch requests to different
 // handler functions via configurable routes
 type Router struct {
-	trees map[string]*node
+	trees      map[string]*node
 	paramsPool sync.Pool
 	maxParams  uint16
-	// If enabled, adds the matched route path onto the http.Request context
-	// before invoking the handler.
-	// The matched route path is only added to handlers of routes that were
-	// registered when this option was enabled.
-	SaveMatchedRoutePath bool
 	// Enables automatic redirection if the current route can't be matched but a
 	// handler for the path with (without) the trailing slash exists.
 	// For example if /foo/ is requested but a route only exists for /foo, the
@@ -889,66 +725,25 @@ type Router struct {
 	// and 308 for all other request methods.
 	RedirectTrailingSlash bool
-	// If enabled, the router tries to fix the current request path, if no
-	// handle is registered for it.
-	// First superfluous path elements like ../ or // are removed.
-	// Afterwards the router does a case-insensitive lookup of the cleaned path.
-	// If a handle can be found for this route, the router makes a redirection
-	// to the corrected path with status code 301 for GET requests and 308 for
-	// all other request methods.
-	// For example /FOO and /..//Foo could be redirected to /foo.
-	// RedirectTrailingSlash is independent of this option.
-	RedirectFixedPath bool
-	// If enabled, the router checks if another method is allowed for the
-	// current route, if the current request can not be routed.
-	// If this is the case, the request is answered with 'Method Not Allowed'
-	// and HTTP status code 405.
-	// If no other Method is allowed, the request is delegated to the NotFound
-	// handler.
-	HandleMethodNotAllowed bool
-	// If enabled, the router automatically replies to OPTIONS requests.
-	// Custom OPTIONS handlers take priority over automatic replies.
-	HandleOPTIONS bool
-	// An optional http.Handler that is called on automatic OPTIONS requests.
-	// The handler is only called if HandleOPTIONS is true and no OPTIONS
-	// handler for the specific path was set.
-	// The "Allowed" header is set before calling the handler.
-	GlobalOPTIONS http.Handler
-	// Cached value of global (*) allowed methods
-	globalAllowed string
-	// Configurable http.Handler which is called when no matching route is
+	// Configurable handler which is called when no matching route is found.
-	// found. If it is not set, http.NotFound is used.
 	NotFound RenderFunc
-	// Configurable http.Handler which is called when a request
+	// Configurable handler which is called when an error occurs.
-	// cannot be routed and HandleMethodNotAllowed is true.
-	// If it is not set, http.Error with http.StatusMethodNotAllowed is used.
-	// The "Allow" header with allowed request methods is set before the handler
-	// is called.
-	MethodNotAllowed http.Handler
-	// Function to handle panics recovered from http handlers.
-	// It should be used to generate a error page and return the http error code
-	// 500 (Internal Server Error).
-	// The handler can be used to keep your server from crashing because of
-	// unrecovered panics.
+	Error RenderFunc
-	PanicHandler func(http.ResponseWriter, *http.Request, interface{})
 }
-// func(http.ResponseWriter, *http.Request, Params)
-// Make sure the Router conforms with the http.Handler interface
-// var _ http.Handler = New()
-var router = &Router{
+var AppRouter = &Router{
-	RedirectTrailingSlash:  true,
+	RedirectTrailingSlash: true,
-	RedirectFixedPath:      true,
+	NotFound: func(c *RenderContext) UI {
-	HandleMethodNotAllowed: true,
+		return Col(
+			Row(
-	HandleOPTIONS:          true,
+				Text("This is the default 404 - Not Found Route handler"),
+			),
+			Row(
+				Text("Create a notfound.go file and add a  func NotFound(c *RenderContext) UI {} to override it"),
+			),
+		)
+	},
 }
 func (r *Router) getParams() *Params {
@@ -963,43 +758,11 @@ func (r *Router) putParams(ps *Params) {
 	}
 }
-// func (r *Router) saveMatchedRoutePath(path string, handle interface{}) interface{} {
-// 	return func(w http.ResponseWriter, req *http.Request, ps Params) {
-// 		if ps == nil {
-// 			psp := r.getParams()
-// 			ps = (*psp)[0:1]
-// 			ps[0] = Param{Key: MatchedRoutePathParam, Value: path}
-// 			println("route: " + r.URL.Path)
-// 			page := createPage(info, render(NewRenderContext()))
-// 			w.Header().Set("Content-Length", strconv.Itoa(page.Len()))
-// 			w.Header().Set("Content-Type", "text/html")
-// 			w.WriteHeader(http.StatusOK)
-// 			w.Write(page.Bytes())
-// 			handle(w, req, ps)
-// 			r.putParams(psp)
-// 		} else {
-// 			ps = append(ps, Param{Key: MatchedRoutePathParam, Value: path})
-// 			handle(w, req, ps)
-// 		}
-// 	}
-// }
 // GET is a shortcut for router.Handle(http.MethodGet, path, handle)
 func (r *Router) GET(path string, handle interface{}) {
 	r.Handle(http.MethodGet, path, handle)
 }
-// HEAD is a shortcut for router.Handle(http.MethodHead, path, handle)
-func (r *Router) HEAD(path string, handle interface{}) {
-	r.Handle(http.MethodHead, path, handle)
-}
-// OPTIONS is a shortcut for router.Handle(http.MethodOptions, path, handle)
-func (r *Router) OPTIONS(path string, handle interface{}) {
-	r.Handle(http.MethodOptions, path, handle)
-}
-// POST is a shortcut for router.Handle(http.MethodPost, path, handle)
 func (r *Router) POST(path string, handle interface{}) {
 	r.Handle(http.MethodPost, path, handle)
 }
@@ -1009,11 +772,6 @@ func (r *Router) PUT(path string, handle interface{}) {
 	r.Handle(http.MethodPut, path, handle)
 }
-// PATCH is a shortcut for router.Handle(http.MethodPatch, path, handle)
-func (r *Router) PATCH(path string, handle interface{}) {
-	r.Handle(http.MethodPatch, path, handle)
-}
 // DELETE is a shortcut for router.Handle(http.MethodDelete, path, handle)
 func (r *Router) DELETE(path string, handle interface{}) {
 	r.Handle(http.MethodDelete, path, handle)
@@ -1053,8 +811,6 @@ func (r *Router) Handle(method, path string, handle interface{}) {
 	if root == nil {
 		root = new(node)
 		r.trees[method] = root
-		r.globalAllowed = r.allowed("*", "")
 	}
 	root.addRoute(path, handle)
@@ -1073,34 +829,6 @@ func (r *Router) Handle(method, path string, handle interface{}) {
 	}
 }
-// Handler is an adapter which allows the usage of an http.Handler as a
-// request handle.
-// The Params are available in the request context under ParamsKey.
-// func (r *Router) Handler(method, path string, handler http.Handler) {
-// 	r.Handle(method, path,
-// 		func(w http.ResponseWriter, req *http.Request, p Params) {
-// 			if len(p) > 0 {
-// 				ctx := req.Context()
-// 				ctx = context.WithValue(ctx, ParamsKey, p)
-// 				req = req.WithContext(ctx)
-// 			}
-// 			handler.ServeHTTP(w, req)
-// 		},
-// 	)
-// }
-// HandlerFunc is an adapter which allows the usage of an http.HandlerFunc as a
-// request handle.
-// func (r *Router) HandlerFunc(method, path string, handler http.HandlerFunc) {
-// 	r.Handler(method, path, handler)
-// }
-func (r *Router) recv(w http.ResponseWriter, req *http.Request) {
-	if rcv := recover(); rcv != nil {
-		r.PanicHandler(w, req, rcv)
-	}
-}
 // Lookup allows the manual lookup of a method + path combo.
 // This is e.g. useful to build a framework around this router.
 // If the path was found, it returns the handle function and the path parameter
@@ -1121,62 +849,16 @@ func (r *Router) Lookup(method, path string) (interface{}, Params, bool) {
 	return nil, nil, false
 }
-func (r *Router) allowed(path, reqMethod string) (allow string) {
-	allowed := make([]string, 0, 9)
-	if path == "*" { // server-wide
-		// empty method is used for internal calls to refresh the cache
-		if reqMethod == "" {
-			for method := range r.trees {
-				if method == http.MethodOptions {
-					continue
-				}
-				// Add request method to list of allowed methods
-				allowed = append(allowed, method)
-			}
-		} else {
-			return r.globalAllowed
-		}
-	} else { // specific path
-		for method := range r.trees {
-			// Skip the requested method - we already tried this one
-			if method == reqMethod || method == http.MethodOptions {
-				continue
-			}
-			handle, _, _ := r.trees[method].getValue(path, nil)
-			if handle != nil {
-				// Add request method to list of allowed methods
-				allowed = append(allowed, method)
-			}
-		}
-	}
-	if len(allowed) > 0 {
-		// Add request method to list of allowed methods
-		allowed = append(allowed, http.MethodOptions)
-		// Sort allowed methods.
-		// sort.Strings(allowed) unfortunately causes unnecessary allocations
-		// due to allowed being moved to the heap and interface conversion
-		for i, l := 1, len(allowed); i < l; i++ {
-			for j := i; j > 0 && allowed[j] < allowed[j-1]; j-- {
-				allowed[j], allowed[j-1] = allowed[j-1], allowed[j]
-			}
-		}
-		// return as comma separated list
-		return strings.Join(allowed, ", ")
-	}
-	return allow
-}
 // ServeHTTP makes the router implement the http.Handler interface.
 func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	// Handle errors
+	defer func() {
-	if r.PanicHandler != nil {
+		if rcv := recover(); rcv != nil {
-		defer r.recv(w, req)
+			writePage(r.Error(NewRenderContext()), w)
+			w.Header().Set("Content-Type", "text/html")
+			w.WriteHeader(http.StatusInternalServerError)
-	}
+		}
+	}()
 	path := req.URL.Path
@@ -1185,11 +867,9 @@ func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		if handle, _, tsr := root.getValue(path, r.getParams); handle != nil {
 			println("route: " + req.URL.Path)
 			if render, ok := handle.(RenderFunc); ok {
-				page := createPage(render(NewRenderContext()))
+				writePage(render(NewRenderContext()), w)
-				w.Header().Set("Content-Length", strconv.Itoa(page.Len()))
 				w.Header().Set("Content-Type", "text/html")
 				w.WriteHeader(http.StatusOK)
-				w.Write(page.Bytes())
 				return
 			} else {
 				handle.(func(w http.ResponseWriter, r *http.Request))(w, req)
@@ -1213,69 +893,11 @@ func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 				http.Redirect(w, req, req.URL.String(), code)
 				return
 			}
-			// Try to fix the request path
-			if r.RedirectFixedPath {
-				fixedPath, found := root.findCaseInsensitivePath(
-					CleanPath(path),
-					r.RedirectTrailingSlash,
-				)
-				if found {
-					req.URL.Path = fixedPath
-					http.Redirect(w, req, req.URL.String(), code)
-					return
-				}
-			}
-		}
-	}
-	if req.Method == http.MethodOptions && r.HandleOPTIONS {
-		// Handle OPTIONS requests
-		if allow := r.allowed(path, http.MethodOptions); allow != "" {
-			w.Header().Set("Allow", allow)
-			if r.GlobalOPTIONS != nil {
-				r.GlobalOPTIONS.ServeHTTP(w, req)
-			}
-			return
-		}
-	} else if r.HandleMethodNotAllowed { // Handle 405
-		if allow := r.allowed(path, req.Method); allow != "" {
-			w.Header().Set("Allow", allow)
-			if r.MethodNotAllowed != nil {
-				r.MethodNotAllowed.ServeHTTP(w, req)
-			} else {
-				http.Error(w,
-					http.StatusText(http.StatusMethodNotAllowed),
-					http.StatusMethodNotAllowed,
-				)
-			}
-			return
 		}
 	}
 	// Handle 404
-	if r.NotFound != nil {
-		page := createPage(r.NotFound(NewRenderContext()))
+	writePage(r.NotFound(NewRenderContext()), w)
-		w.Header().Set("Content-Length", strconv.Itoa(page.Len()))
-		w.Header().Set("Content-Type", "text/html")
+	w.Header().Set("Content-Type", "text/html")
-		w.WriteHeader(http.StatusOK)
+	w.WriteHeader(http.StatusNotFound)
-		w.Write(page.Bytes())
-	} else {
-		page := createPage(DefaultNotFound(NewRenderContext()))
-		w.Header().Set("Content-Length", strconv.Itoa(page.Len()))
-		w.Header().Set("Content-Type", "text/html")
-		w.WriteHeader(http.StatusOK)
-		w.Write(page.Bytes())
-	}
-}
-func DefaultNotFound(c *RenderContext) UI {
-	return Col(
-		Row(
-			Text("This is the default 404 - Not Found Route handler"),
-		),
-		Row(
-			Text("Create a notfound.go file and add a  func NotFound(c *RenderContext) UI {} to override it"),
-		),
-	)
 }

~repos /gromer

git clone https://pyrossh.dev/repos/gromer.git

gromer is a framework and cli to build multipage web apps in golang using htmx and alpinejs.