First version of Gemini formatting

update build flags

Brewfile

@@ -1,2 +0,0 @@
-# build deps
-brew "go@1.25"

Makefile

@@ -8,7 +8,7 @@ deps:
 	$(GO) mod download
 
 build: deps
-	CGO_ENABLED=0 $(GO) build -ldflags "-X fes/modules/version.gitCommit=$(shell git rev-parse --short HEAD)" -o fes
+	CGO_ENABLED=0 $(GO) build -trimpath -ldflags "-X fes/modules/version.gitCommit=$(shell git rev-parse --short HEAD) -s -w -buildid=" -o fes
 	@echo "Fes is now built to ./fes"
 
 lint:

go.mod

@@ -5,7 +5,6 @@ go 1.25.4
 require (
 	github.com/fatih/color v1.18.0
 	github.com/gomarkdown/markdown v0.0.0-20250810172220-2e2c11897d1a
-	github.com/pelletier/go-toml/v2 v2.2.4
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
 	github.com/yuin/gopher-lua v1.1.1
 )
@@ -13,5 +12,5 @@ require (
 require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
 )

go.sum

@@ -7,8 +7,6 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
-github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
@@ -16,5 +14,5 @@ github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=

lib/fes.lua

@@ -99,15 +99,15 @@ local default_gemini_header = [[
 ]]
 
 local default_gemini_footer = [[
+
 => https://git.vxserver.dev/fSD/fes Fes Powered
 => https://www.lua.org Lua Powered
 => https://git.vxserver.dev/fSD/fes/src/branch/main/LICENSE ISC Licensed
 {{COPYRIGHT}}
 ]]
 
-function M.fes(proto, header, footer)
+function M.fes(header, footer)
-	proto = proto or "http"
+	local proto = std.proto
-	std.proto = proto
 
 	local config = {}
 	local site_config = {}
@@ -168,11 +168,27 @@ end
 function M:build()
 	if self.proto == "http" then
 		local header = self.header:gsub("{{TITLE}}", self.title or "Document")
-		local favicon_html = self.favicon or '<link rel="icon" href="data:image/svg+xml,<svg xmlns=%%22http://www.w3.org/2000/svg%%22 viewBox=%%220 0 100 100%%22><text y=%%22.9em%%22 font-size=%%2290%%22>🔥</text></svg>">'
+		local favicon_html = self.favicon
+		    or
+		    '<link rel="icon" href="data:image/svg+xml,<svg xmlns=%%22http://www.w3.org/2000/svg%%22 viewBox=%%220 0 100 100%%22><text y=%%22.9em%%22 font-size=%%2290%%22>🔥</text></svg>">'
 		header = header:gsub("{{FAVICON}}", favicon_html)
-		local footer = self.footer:gsub("{{COPYRIGHT}}", self.copyright or symbol.legal.copyright .. "The Copyright Holder")
+
+		local footer = self.footer:gsub(
+			"{{COPYRIGHT}}",
+			self.copyright or symbol.legal.copyright .. "The Copyright Holder"
+		)
+
+		return header .. table.concat(self.parts, "\n") .. footer
+	elseif self.proto == "gemini" then
+		local footer = self.footer:gsub(
+			"{{COPYRIGHT}}",
+			self.copyright or "(c) The Copyright Holder"
+		)
+		local header = self.header
+
 		return header .. table.concat(self.parts, "\n") .. footer
 	end
+
 	return table.concat(self.parts, "\n")
 end
 

lib/std.lua

@@ -1,27 +1,22 @@
 local M = {}
 
 M.proto = "http"
+M.__fes_banner_set = false
 
 local function isHttp()
-	return M.proto == "http"
+	-- return M.proto == "http"
+	return false
 end
 
 local function isGemini()
-	return M.proto == "gemini"
+	-- return M.proto == "gemini"
-end
+	return true
-
-local function esc(s)
-	s = s or ""
-	s = s:gsub("&", "&")
-	s = s:gsub("<", "&lt;")
-	s = s:gsub(">", "&gt;")
-	return s
 end
 
 M.p = function(s)
 	s = s or ""
 	if isHttp() then
-		return "<p>" .. esc(s) .. "</p>"
+		return "<p>" .. s .. "</p>"
 	elseif isGemini() then
 		return s
 	end
@@ -33,16 +28,16 @@ M.h = function(level, s)
 	if level > 6 then level = 6 end
 	s = s or ""
 	if isHttp() then
-		return "<h" .. level .. ">" .. esc(s) .. "</h" .. level .. ">"
+		return "<h" .. level .. ">" .. s .. "</h" .. level .. ">"
 	elseif isGemini() then
-		return string.rep("#", level) .. " " .. s
+		return "\n" .. string.rep("#", level) .. " " .. s .. "\n"
 	end
 end
 
 M.codeblock = function(s)
 	s = s or ""
 	if isHttp() then
-		return "<pre><code>" .. esc(s) .. "</code></pre>"
+		return "<pre><code>" .. s .. "</code></pre>"
 	elseif isGemini() then
 		return "```\n" .. s .. "\n```"
 	end
@@ -51,17 +46,17 @@ end
 M.inline = function(s)
 	s = s or ""
 	if isHttp() then
-		return "<code>" .. esc(s) .. "</code>"
+		return "<code>" .. s .. "</code>"
 	elseif isGemini() then
 		return "`" .. s .. "`"
 	end
 end
 
-M.link = function(text, url)
+M.link = function(url, text)
-	text = text or ""
 	url = url or ""
+	text = text or url
 	if isHttp() then
-		return "<a href=\"" .. esc(url) .. "\">" .. esc(text) .. "</a>"
+		return "<a href=\"" .. url .. "\">" .. text .. "</a>"
 	elseif isGemini() then
 		return "=> " .. url .. " " .. text
 	end
@@ -73,7 +68,7 @@ M.list = function(items, ordered)
 		local tag = ordered and "ol" or "ul"
 		local out = "<" .. tag .. ">"
 		for _, v in ipairs(items) do
-			out = out .. "<li>" .. esc(v) .. "</li>"
+			out = out .. "<li>" .. v .. "</li>"
 		end
 		out = out .. "</" .. tag .. ">"
 		return out
@@ -93,9 +88,9 @@ end
 M.blockquote = function(s)
 	s = s or ""
 	if isHttp() then
-		return "<blockquote>" .. esc(s) .. "</blockquote>"
+		return "<blockquote>" .. s .. "</blockquote>"
 	elseif isGemini() then
-		return "> " .. s
+		return "> " .. string.gsub(s, "\n", "\n> ")
 	end
 end
 
@@ -111,7 +106,7 @@ M.image = function(alt, src)
 	alt = alt or ""
 	src = src or ""
 	if isHttp() then
-		return "<img src=\"" .. esc(src) .. "\" alt=\"" .. esc(alt) .. "\" />"
+		return "<img src=\"" .. src .. "\" alt=\"" .. alt .. "\" />"
 	elseif isGemini() then
 		return "=> " .. src .. " " .. alt
 	end
@@ -121,10 +116,35 @@ M.file = function(text, url)
 	text = text or ""
 	url = url or ""
 	if isHttp() then
-		return "<a href=\"" .. esc(url) .. "\" download>" .. esc(text) .. "</a>"
+		return "<a href=\"" .. url .. "\" download>" .. text .. "</a>"
 	elseif isGemini() then
 		return "=> " .. url .. " " .. text
 	end
 end
 
+M.note = function(text)
+	text = text or ""
+	if isHttp() then
+		return "<div class=\"note\">" .. text .. "</div>"
+	elseif isGemini() then
+		return "\n" .. text .. "\n"
+	end
+end
+
+M.banner = function (text)
+	text = text or ""
+
+	if M.__fes_banner_set then
+		error("Page already contains header")
+		return ""
+	end
+
+	M.__fes_banner_set = true
+	if isHttp() then
+		return "<div class=\"banner\">" .. text .. "</div>"
+	elseif isGemini() then
+		return text
+	end
+end
+
 return M

main.go

@@ -31,6 +31,7 @@ func init() {
 	config.Lib = lib
 	config.Doc = documentation
 	config.Verbose = flag.Bool("verbose", false, "Enable verbose logging")
+	config.Proto = flag.String("proto", "", "Force protocol")
 }
 
 func main() {
@@ -93,10 +94,10 @@ func main() {
 			os.Exit(1)
 		}
 	case "run":
+		ui.Log("Fes is starting")
 		if *config.Port == 3000 {
 			ui.WARNING("Using default port, this may lead to conflicts with other services")
 		}
-		ui.Log("Fes is starting")
 		ui.Log("Fes version=%s, commit=%s, just started", version.VERSION, version.GetCommit())
 
 		runtime.ReadMemStats(&m)

modules/config/config.go

@@ -12,6 +12,7 @@ var Color *bool
 var Static *bool
 var Docker *bool
 var Verbose *bool
+var Proto *string
 
 type AppConfig struct {
 	App struct {

modules/gemini/gemini.go

@@ -0,0 +1,196 @@
+package gemini
+
+import (
+	"bufio"
+	"crypto/tls"
+	"net"
+	"net/url"
+	"strings"
+	"sync"
+)
+
+const (
+	StatusSuccess       = 20
+	StatusTemporaryFail = 40
+	StatusPermanentFail = 50
+	StatusNotFound      = 51
+	StatusBadRequest    = 59
+)
+
+type Handler interface {
+	ServeGemini(ResponseWriter, *Request)
+}
+
+type HandlerFunc func(ResponseWriter, *Request)
+
+func (f HandlerFunc) ServeGemini(w ResponseWriter, r *Request) {
+	f(w, r)
+}
+
+type ServeMux struct {
+	mu       sync.RWMutex
+	handlers map[string]Handler
+}
+
+func NewServeMux() *ServeMux {
+	return &ServeMux{
+		handlers: make(map[string]Handler),
+	}
+}
+
+func (m *ServeMux) Handle(pattern string, h Handler) {
+	m.mu.Lock()
+	m.handlers[pattern] = h
+	m.mu.Unlock()
+}
+
+func (m *ServeMux) HandleFunc(pattern string, f func(ResponseWriter, *Request)) {
+	m.Handle(pattern, HandlerFunc(f))
+}
+
+func (m *ServeMux) ServeGemini(w ResponseWriter, r *Request) {
+	m.mu.RLock()
+	defer m.mu.RUnlock()
+
+	path := r.URL.Path
+
+	for pattern, handler := range m.handlers {
+		if strings.HasPrefix(path, pattern) {
+			handler.ServeGemini(w, r)
+			return
+		}
+	}
+
+	w.WriteHeader(StatusNotFound, "not found")
+}
+
+var DefaultServeMux = NewServeMux()
+
+func Handle(pattern string, h Handler) {
+	DefaultServeMux.Handle(pattern, h)
+}
+
+func HandleFunc(pattern string, f func(ResponseWriter, *Request)) {
+	DefaultServeMux.HandleFunc(pattern, f)
+}
+
+type Request struct {
+	URL  *url.URL
+	Conn net.Conn
+}
+
+type ResponseWriter interface {
+	Write([]byte) (int, error)
+	WriteHeader(status int, meta string)
+}
+
+type response struct {
+	conn        net.Conn
+	wroteHeader bool
+}
+
+func (r *response) WriteHeader(status int, meta string) {
+	if r.wroteHeader {
+		return
+	}
+	r.conn.Write([]byte(
+		strings.TrimSpace(
+			strings.Join([]string{
+				strings.TrimSpace(
+					strings.Join([]string{
+						string(rune(status/10 + '0')),
+						string(rune(status%10 + '0')),
+					}, ""),
+				),
+				meta,
+			}, " "),
+		) + "\r\n"))
+	r.wroteHeader = true
+}
+
+func (r *response) Write(b []byte) (int, error) {
+	if !r.wroteHeader {
+		r.WriteHeader(StatusSuccess, "text/gemini")
+	}
+	return r.conn.Write(b)
+}
+
+type Server struct {
+	Addr      string
+	Handler   Handler
+	TLSConfig *tls.Config
+}
+
+func (s *Server) ListenAndServeTLS(certFile, keyFile string) error {
+	handler := s.Handler
+	if handler == nil {
+		handler = DefaultServeMux
+	}
+
+	cert, err := tls.LoadX509KeyPair(certFile, keyFile)
+	if err != nil {
+		return err
+	}
+
+	cfg := s.TLSConfig
+	if cfg == nil {
+		cfg = &tls.Config{}
+	}
+	cfg.Certificates = []tls.Certificate{cert}
+
+	ln, err := tls.Listen("tcp", s.Addr, cfg)
+	if err != nil {
+		return err
+	}
+
+	for {
+		conn, err := ln.Accept()
+		if err != nil {
+			continue
+		}
+		go s.serve(conn, handler)
+	}
+}
+
+func (s *Server) serve(conn net.Conn, handler Handler) {
+	defer conn.Close()
+
+	reader := bufio.NewReader(conn)
+
+	line, err := reader.ReadString('\n')
+	if err != nil {
+		return
+	}
+
+	if len(line) > 1026 {
+		conn.Write([]byte("59 request too long\r\n"))
+		return
+	}
+
+	line = strings.TrimSpace(line)
+
+	u, err := url.Parse(line)
+	if err != nil {
+		conn.Write([]byte("59 bad request\r\n"))
+		return
+	}
+
+	req := &Request{
+		URL:  u,
+		Conn: conn,
+	}
+
+	rw := &response{
+		conn: conn,
+	}
+
+	handler.ServeGemini(rw, req)
+}
+
+func ListenAndServeTLS(addr, certFile, keyFile string, h Handler) error {
+	s := &Server{
+		Addr:    addr,
+		Handler: h,
+	}
+	return s.ListenAndServeTLS(certFile, keyFile)
+}

modules/new/new.go

@@ -74,14 +74,9 @@ local site = fes.fes()
 
 -- site.copyright = fes.util.copyright("https://example.com", "%s")
 
-site:h1("Hello, World!")
+site:h(1, "Hello, World!")
 
 return site`, name)
-	write("Fes.toml", `[app]
-
-name = "%s"
-version = "0.0.1"
-authors = ["%s"]`, dir, name)
 	write("README.md", strings.ReplaceAll(`# %s
 
 $$$$$$
@@ -112,9 +107,110 @@ All commands are run from the root of the project, from a terminal:
 | :------------------------ | :----------------------------------------------- |
 | $$fes run .$$             | Runs the project at $$.$$                        |
 
+## Gemini
+
+Fes supports many different protocols. One of which is the Gemini protocol; this
+protocol has specific encryption standards which makes the providing $$key.pem$$
+and a $$cert.pem$$ files. *Please* regenerate these files by running this command.
+$$$$$$
+openssl req -x509 -nodes -days 365 \
+  -newkey rsa:2048 \
+  -keyout key.pem \
+  -out cert.pem \
+  -subj "/C=US/ST=State/L=City/O=Local Development/OU=Localhost/CN=localhost" \
+  -addext "subjectAltName=DNS:localhost,IP:127.0.0.1,IP:::1" \
+  -addext "basicConstraints=CA:FALSE" \
+  -addext "keyUsage=digitalSignature,keyEncipherment" \
+  -addext "extendedKeyUsage=serverAuth"
+$$$$$$
+
 ## What to learn more?
 
 Check out [Fes's docs](https://docs.vxserver.dev/static/fes.html).`, "$$", "`"), dir, dir)
+	write("key.pem", `-----BEGIN PRIVATE KEY-----
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCfl+m81U9+WLBn
+PiJ1ZADnZC+BecXArguAdnbkgDlmfqe1eU6M0PBmXXFHEvJYOh2oYQZ7DMbuLLvo
+DdjomXM4yb9Axu2KDHfflTcw3wHD3850ganf9rwVG460gkVfUGaRiokyCvEJKd05
+BxKmx8Zh6G2tpetaDKm72ONYQFyaBCelYMzaBRpJ2kcPqk/gEhUSvQKVF4oDREm+
+sTEkCTWsjUesiG0393t3psFa/SlZKsNXNrb+N6y9SElKVlQOT28r9YGiDfy5PiAQ
+iFtQse2gqC4IhG2MGi0b4mu4Qa3+d2u3jsmn6Gqt92hKrbFOpz+Ci5GQ+zKXnE+j
+/h40l1J3h/aTM5/qS7malAtXySMVzLQnJzai6IL+nBKbIOMCzP1Bns64Oo7YuuhV
+Cx/sovrvgFF+8j4nLXOBgrx8llYB5cvgVYkNmccXtPzd7hZI6PHgZRGOd0uBKlZ+
+OHeKhgdnz/a+pCUBwJe8JAzX7fzoZ+HLy26ADx2Uywh0Rjfj4gVOSZXaGS0ne0p5
+PciN0xsWQdaAWPcVe6+YYRKS6l6qaWuGaPwVsZSvNgIMMPOgUn7+s2Bxh51DhqZT
+4MDFUJWXFmTnyhHg3Cq7pWJR7pv2erv5q32b8iah5o+CP4W3FeZX1CcBuiIsrimh
+vZZIa5W2vzpkLHbWgI2XGbx8yKRXowIDAQABAoICAENZb5lyB5cRRHh9XztdFYiQ
+3f9s7UhP6qiu1aO+fPrFDm9mHwEMF7eLTYep9j3HYMazE3IQRU8z76SRW21lfJuF
+gEGM8aeldV0UcnMcWXlY1J6ULaVHUb4yn/mLVE1R98cJyLYmqeutEB/F3VgmzJB6
+7vYuI/EfkO2mLOMMXkfc4wJGpIyJRLvP8tcoj4bG+r+qphFXGrYgNmLUEiHcBRup
+j4q/FCBfP2qSI90LI0zu3/rJK1aDFlHW1J8baWOUoBzUAX3rGzDth8iSUr7uJ5L6
+Blsvz68lSM4QslbS2OOfcATJrE5Apex+kTOas023BPVJgwfFCmey3mUdk4+sIG+I
+YpvrfUHBAbhRt1itGjjx/BH3HVtkwKsm3nNNgE8qS0qmziGVa60amLng0OgD4SOH
+QKWrotcojYlWHywdHNAmiaWP+ZV9U0u4T59dkHhjqBoPuY64kNddRCLYItszqOmC
+tamnflcoFPThdBnDpnXhLX+MnvQKIO2K2QTKjdYrkSMvEC/m96H49Vf4w+Fe3coc
+SLsyMqHmYSG3+QtFN3JSmqDdBLQ+bFK0KZOk3IE2UK+lvabmtHuGLkYguur/fOnG
+FvxcC+MIHHFrtSfqfvIrXeGFqe2Fb6DIKdMJFPV8iP5Px91A0GAGeabyktyya1n5
+kk5nMJY3A7rTmnDO2PUBAoIBAQDSd+pvNGDf/We74+NODKQBcleCfF0NNzvRIuYH
+9vel5jhyD28Y30XQS7+YBo3Y5Yo5pVlJ425Z5CveZOmr4VImuYG8LTbbGYY8ns3c
+R/IdP1ByAcIa1eRGQNcKHid7RW4aEoFdvW3jZNj6/ukbJwd9ZHOt4HEUv5MOObn7
+VXiXiwHjVy3X4uD5j0bHS4owd7S3Ygg0OneUzX3XJ+8qUgfU9B+lD3SbtsI4baoU
+qUKcQc/0yXKvJvoz9oX2tjQOHqGrGwHdootc2CLnr0PMI7fKBwT3k63B+24xEGcx
+OAPc5tUuiqIewiCn1oZbeCxmNnnimkAjDfG2KXMXj1R1G96BAoIBAQDCHnTNQhXH
+tcfwnxj86E+Zd7ORS7iH/5eWvnspt2pnNCpufLFQlbdiL3d9ysSN9nw3+y15/o83
+R79s7fLdC0+blc6q/ZQEdB1C+8YQa0nTlqqlZWVbRPjQUV+SfGssaZFEO4W7QWh3
+hJL14HbWUFC3XSdMAeKTNOcgvfVvQ9M8HlJI1ZPo4Pe4rGNFIEsKUz/6HVE7HFgQ
+OwcLSxZlSQSQ6/YErP/XJoyQUPjHldAjphV/rn28cvh2quoI35fbBuZu5pyKLXTg
+RKbdWbeoIZTthRojpqnfqnIR+rPXIIiaMYhStdPshNUxLL7DX+/3yI05qq8R+yqa
+2gLb2mJltuwjAoIBAF0WQI/ywK4Q7CKEBnLs0FT7d4z06EsCFOjI4KjBKIMtseVw
+whhkGAKqnhDlRTObQmmAol81wgbsDiMMyvUEcUtDXQgXj12UinShYDd/cqxQ5omm
+EW3BEHeqEfIdqCSzbqEFckY9lC6w2e8Zc4xY1M028psC28DrgmUWTxXEldOg3bLp
+ShNj+1Eld46J8JLDPyCksTA4c89Sm8ffl75GDcS4PI7KqS59xKUki8cbnaRyz0Fb
+H+gr+xmkfVfC+n8MOUDubwLR84Wa6sVCFWBio9UtCZteq8lSJUh6EsoIFl1LkxpE
+orOr9LmG/mHSYwDKM1pwEtHuRuvkpUzUTeyF6QECggEAbm/vWZtgUsdbocyR5cix
+CImuUlo2+MBz2KIz5c7grShjf4pXQpZ6x1Rj8d/7JRz3HM482Cv4BKZABNP3GMTH
+nKeE9YjgvgvlXedpjovLa6JLIV/nYx6BQ9sXuXopaxIAQEZw1dDngx+ckGAMm+8D
+jN5lbfugkMlHOTx5Nrzqn0hM3f0McjATHzCMJZayuoQUYNJvFWcRvuImJsmoSyVY
+gK6Nv6lAwIHA9JXsg3f6+10Q3BxEkoMCUlj4XuX+OfDaBnwS0RX9aV4FZOcW8oNw
+fBT+gwvdl08cKJht2lU7AiZt/UhO8j+8HobrXLHnDxw9JHKzuVIgsgqYF8ZNtrpz
+6wKCAQEAqJc9xfNYL2jyJTVBvqX34Uct9xV1fq7z45B3gpPHj4tc0dBOIwPKSsu8
+rGyefPuMDvbecJoaXqRZGQEcv03ecLVtHHDCsJcWavth9sCQJW9mnOxjOnLHdGnl
+h2yIV4iVzNEx5XA1+0JRAAwFMXrC9LUZDTT61opjohMJSEySo/HVekoWG9A0bQGn
+Ui+JbtLeuuCwwAGSgdAhVkjr27ANyFtjR63KVrDvSLbYFyZXKxrRYnZWs92Ho/g6
+oTLnUSmkbLlhsUDjknAaNfp+enETSoPHcpkd7MeqVw2oYrLw6MCo4h2tBsIgtZEd
+h6CgX4Gc3+bhvKx36XYxVwScPJUWsQ==
+-----END PRIVATE KEY-----`)
+	write("cert.pem", `-----BEGIN CERTIFICATE-----
+MIIFmzCCA4OgAwIBAgIUZGaMDLeCAQplfhhjXb2HaL6xpFYwDQYJKoZIhvcNAQEL
+BQAwXTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVN0YXRlMQ0wCwYDVQQHDARDaXR5
+MQwwCgYDVQQKDANPcmcxDTALBgNVBAsMBFVuaXQxEjAQBgNVBAMMCWxvY2FsaG9z
+dDAeFw0yNjAyMjQwMjUwMzVaFw0yNzAyMjQwMjUwMzVaMF0xCzAJBgNVBAYTAlVT
+MQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEMMAoGA1UECgwDT3JnMQ0w
+CwYDVQQLDARVbml0MRIwEAYDVQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQCfl+m81U9+WLBnPiJ1ZADnZC+BecXArguAdnbkgDlm
+fqe1eU6M0PBmXXFHEvJYOh2oYQZ7DMbuLLvoDdjomXM4yb9Axu2KDHfflTcw3wHD
+3850ganf9rwVG460gkVfUGaRiokyCvEJKd05BxKmx8Zh6G2tpetaDKm72ONYQFya
+BCelYMzaBRpJ2kcPqk/gEhUSvQKVF4oDREm+sTEkCTWsjUesiG0393t3psFa/SlZ
+KsNXNrb+N6y9SElKVlQOT28r9YGiDfy5PiAQiFtQse2gqC4IhG2MGi0b4mu4Qa3+
+d2u3jsmn6Gqt92hKrbFOpz+Ci5GQ+zKXnE+j/h40l1J3h/aTM5/qS7malAtXySMV
+zLQnJzai6IL+nBKbIOMCzP1Bns64Oo7YuuhVCx/sovrvgFF+8j4nLXOBgrx8llYB
+5cvgVYkNmccXtPzd7hZI6PHgZRGOd0uBKlZ+OHeKhgdnz/a+pCUBwJe8JAzX7fzo
+Z+HLy26ADx2Uywh0Rjfj4gVOSZXaGS0ne0p5PciN0xsWQdaAWPcVe6+YYRKS6l6q
+aWuGaPwVsZSvNgIMMPOgUn7+s2Bxh51DhqZT4MDFUJWXFmTnyhHg3Cq7pWJR7pv2
+erv5q32b8iah5o+CP4W3FeZX1CcBuiIsrimhvZZIa5W2vzpkLHbWgI2XGbx8yKRX
+owIDAQABo1MwUTAdBgNVHQ4EFgQUcyq+ZZWmAUejOPEQpHpl4hOllHswHwYDVR0j
+BBgwFoAUcyq+ZZWmAUejOPEQpHpl4hOllHswDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAgEANwdjxlPHqvOOyNTFJcFhcNff3862/74CyCiglrstk/ea
+txjyHxXFwXOtyAtm0tqaQPpzHWFM5MDqVD7Qip4aZrPcRvvfJ8zxXuakrgy7oI6i
+Wl4/BXzvIoxh8MyFVC7VdGmuv11fq091RaNPlnz5lH9Qxhb6QCGbk73PjTXxD/7A
+yusNiXuJvx3oRhLLGuksotFKEnngOq21Jla3ZPUmJTLAZdk/joXITk5Q64ZBp5uD
+rpxFZDtdHTBuL3nmNPUHixsxQRFzCSloufRlatdI2ldDc+d2WLLFhkpdM35Oedf3
+Hib0VXPgJ8j/w6RK+oYKMP27RojMFXALolzRBSQu3Zbd1bD1qVhh/dO5Uyn4E3mb
+2LW5+a9zuabD9wt8smSU9V5ZYw5hcR0ANN7xYmaMvGFKrNPNkI3m0c2dyj22vgg0
+zQqeMze4KxZqDf/gFifJ4UIybBAgc/p1uOIceFTSYplVXJQIgFACn9l6c4Zo0GZD
+H48iKQLwlxDdUSM8aHtItWxRddLCL7lYNKtu2/qu8I9NKkjx4/Kn3I9Is/f37EIn
+rF3ygUg3ee5zo3fvMjlhCNs6djm+ANx2KzdZkS7UU/jb0o+OSEvoMIgZh5NNgUlC
+aVR3opS3PTqwu4plN0Evh5kr3nEOx0vcIK726DwnpgNRhcG9cNcSi2UB4NYCWaw=
+-----END CERTIFICATE-----`)
 
 	ui.Hint("you can run this with `fes run %s`", dir)
 

modules/server/archive.go

@@ -1,8 +1,9 @@
 package server
 
 import (
+	"errors"
 	"fmt"
-	"net/http"
+	"io"
 	"os"
 	"path"
 	"path/filepath"
@@ -95,7 +96,9 @@ func generateArchiveIndex(fsPath string, urlPath string) (string, error) {
 }
 
 /* helper to read the archive files */
-func readArchive(w http.ResponseWriter, route string) error {
+func readArchive(w io.Writer, route string, protcol Protocols) error {
+	switch protcol {
+	case HTTP:
 		fsPath := "." + route
 		if info, err := os.Stat(fsPath); err == nil && info.IsDir() {
 			if page, err := generateArchiveIndex(fsPath, route); err == nil {
@@ -105,5 +108,10 @@ func readArchive(w http.ResponseWriter, route string) error {
 				return err
 			}
 		}
+	case GEMINI:
+		panic(errors.New("TODO"))
+	default:
+		panic(errors.New("Invalid Protocol"))
+	}
 	return nil
 }

modules/server/dirs.go

@@ -59,18 +59,21 @@ func loadDirs() map[string]string {
 	routes := make(map[string]string)
 
 	if entries, err := os.ReadDir("www"); err == nil {
+		ui.LogVerbose("reading www/")
 		if err := handleDir(entries, "www", routes, "", false); err != nil {
 			ui.Warning("failed to handle www directory", err)
 		}
 	}
 
 	if entries, err := os.ReadDir("static"); err == nil {
+		ui.LogVerbose("reading static/")
 		if err := handleDir(entries, "static", routes, "/static", true); err != nil {
 			ui.Warning("failed to handle static directory", err)
 		}
 	}
 
 	if entries, err := os.ReadDir("archive"); err == nil {
+		ui.LogVerbose("reading archive/")
 		if err := handleDir(entries, "archive", routes, "/archive", true); err != nil {
 			ui.Warning("failed to handle archive directory", err)
 		}

modules/server/gemini.go

@@ -0,0 +1,59 @@
+package server
+
+import (
+	"fes/modules/config"
+	"fes/modules/gemini"
+	"fes/modules/ui"
+	"os"
+	"strings"
+)
+
+func geminiHandler(w gemini.ResponseWriter, r *gemini.Request) {
+	ui.LogVerbose("Received %s", r.URL.Path)
+
+	route, ok := Routes[r.URL.Path]
+
+	var err error = nil
+
+	/* defer won't update paramaters unless we do this. */
+	defer func() {
+		ui.Path(route, err)
+	}()
+
+	if !ok {
+		err = config.ErrRouteMiss
+		route = r.URL.Path
+
+		if strings.HasPrefix(route, "/archive") {
+			err = readArchive(w, route, GEMINI)
+		} else {
+			w.WriteHeader(gemini.StatusNotFound, "StatusNotFound")
+		}
+		return
+	}
+
+	params := make(map[string]string)
+	for k, v := range r.URL.Query() {
+		if len(v) > 0 {
+			params[k] = v[0]
+		}
+	}
+
+	var data []byte
+	if strings.HasSuffix(route, ".lua") {
+		data, err = render(route, reqData{path: r.URL.Path, params: params}, GEMINI)
+	} else if strings.HasSuffix(route, ".md") {
+		data, err = os.ReadFile(route)
+		data = []byte(markdownToHTML(string(data)))
+		data = []byte("<style>body {max-width: 80ch;}</style>\n" + string(data))
+	} else {
+		ui.LogVerbose("serving unrecognized file")
+		data, err = os.ReadFile(route)
+	}
+
+	if err != nil {
+		w.WriteHeader(-1, err.Error())
+	}
+
+	w.Write(data)
+}

modules/server/http.go

@@ -0,0 +1,67 @@
+package server
+
+import (
+	"fes/modules/config"
+	"fes/modules/ui"
+	"fmt"
+	"net/http"
+	"os"
+	"strings"
+)
+
+func httpHandler(w http.ResponseWriter, r *http.Request) {
+	ui.LogVerbose("Received %s", r.URL.Path)
+
+	route, ok := Routes[r.URL.Path]
+
+	var err error = nil
+
+	/* defer won't update paramaters unless we do this. */
+	defer func() {
+		ui.Path(route, err)
+	}()
+
+	if !ok {
+		err = config.ErrRouteMiss
+		route = r.URL.Path
+
+		if strings.HasPrefix(route, "/archive") {
+			err = readArchive(w, route, HTTP)
+		} else {
+			w.WriteHeader(http.StatusNotFound)
+			w.Write([]byte(`<html>
+<head><title>404 Not Found</title></head>
+<body>
+<center><h1>404 Not Found</h1></center>
+<hr><center>fes</center>
+</body>
+</html>`))
+		}
+		return
+	}
+
+	params := make(map[string]string)
+	for k, v := range r.URL.Query() {
+		if len(v) > 0 {
+			params[k] = v[0]
+		}
+	}
+
+	var data []byte
+	if strings.HasSuffix(route, ".lua") {
+		data, err = render(route, reqData{path: r.URL.Path, params: params}, HTTP)
+	} else if strings.HasSuffix(route, ".md") {
+		data, err = os.ReadFile(route)
+		data = []byte(markdownToHTML(string(data)))
+		data = []byte("<style>body {max-width: 80ch;}</style>\n" + string(data))
+	} else {
+		ui.LogVerbose("serving unrecognized file")
+		data, err = os.ReadFile(route)
+	}
+
+	if err != nil {
+		http.Error(w, fmt.Sprintf("Error loading page: %v", err), http.StatusInternalServerError)
+	}
+
+	w.Write(data)
+}

modules/server/render.go

@@ -3,21 +3,18 @@ package server
 import (
 	"fes/modules/config"
 	"io/fs"
-	"os"
 	"path/filepath"
 	"strings"
 
 	lua "github.com/yuin/gopher-lua"
 )
 
-/* this is the request data we pass over the bus to the application, via the fes.bus interface */
 type reqData struct {
 	path   string
 	params map[string]string
 }
 
-/* returns a string of rendered html */
+func render(luapath string, requestData reqData, protocol Protocols) ([]byte, error) {
-func render(luapath string, requestData reqData) ([]byte, error) {
 	L := lua.NewState()
 	defer L.Close()
 
@@ -27,10 +24,8 @@ func render(luapath string, requestData reqData) ([]byte, error) {
 				continue
 			}
 			path := filepath.Join("lib", de.Name())
-			if data, err := config.Lib.ReadFile(path); err != nil {
+			if data, err := config.Lib.ReadFile(path); err == nil {
-				continue
+				_ = L.DoString(string(data))
-			} else {
-				L.DoString(string(data))
 			}
 		}
 	}
@@ -41,10 +36,11 @@ func render(luapath string, requestData reqData) ([]byte, error) {
 			if err != nil {
 				panic(err)
 			}
+
 			if err := L.DoString(string(fileData)); err != nil {
 				panic(err)
 			}
-			L.Push(L.Get(-1))
+
 			return 1
 		})
 	}
@@ -54,88 +50,71 @@ func render(luapath string, requestData reqData) ([]byte, error) {
 	preloadLuaModule("lib.util", "lib/util.lua")
 
 	L.PreloadModule("fes", func(L *lua.LState) int {
-		mod := L.NewTable()
+		fileData, err := config.Lib.ReadFile("lib/fes.lua")
-		libModules := []string{}
-		if ents, err := fs.ReadDir(config.Lib, "lib"); err == nil {
-			for _, e := range ents {
-				if e.IsDir() || !strings.HasSuffix(e.Name(), ".lua") {
-					continue
-				}
-				libModules = append(libModules, strings.TrimSuffix(e.Name(), ".lua"))
-			}
-		}
-		for _, modName := range libModules {
-			path := filepath.Join("lib", modName+".lua")
-			fileData, err := config.Lib.ReadFile(path)
 		if err != nil {
-				continue
+			panic(err)
 		}
+
 		if err := L.DoString(string(fileData)); err != nil {
-				continue
+			panic(err)
 		}
-			val := L.Get(-1)
+
+		mod := L.Get(-1)
 		L.Pop(1)
-			tbl, ok := val.(*lua.LTable)
+
-			if !ok || tbl == nil {
+		tbl, ok := mod.(*lua.LTable)
-				tbl = L.NewTable()
+		if !ok {
-			}
+			panic("fes module did not return table")
-			if modName == "fes" {
-				tbl.ForEach(func(k, v lua.LValue) { mod.RawSet(k, v) })
-			} else {
-				mod.RawSetString(modName, tbl)
-			}
 		}
 
-		mod.RawSetString("app", func() *lua.LTable {
+		if err := L.CallByParam(lua.P{
-			app := L.NewTable()
+			Fn:      L.GetGlobal("require"),
-			includeDir := "include"
+			NRet:    1,
-
+			Protect: true,
-			includes, err := os.ReadDir(includeDir)
+		}, lua.LString("lib.std")); err != nil {
-			if err != nil {
+			panic(err)
-				return app // load no includes
 		}
 
-			for _, de := range includes {
+		stdMod := L.Get(-1)
-				if de.IsDir() || !strings.HasSuffix(de.Name(), ".lua") {
-					continue
-				}
-
-				base := strings.TrimSuffix(de.Name(), ".lua")
-				path := filepath.Join(includeDir, de.Name())
-
-				if _, err := os.Stat(path); err != nil {
-					continue
-				} else if err := L.DoFile(path); err != nil {
-					continue
-				}
-
-				val := L.Get(-1)
 		L.Pop(1)
-				tbl, ok := val.(*lua.LTable)
+
-				if !ok || tbl == nil {
+		stdTbl, ok := stdMod.(*lua.LTable)
-					tbl = L.NewTable()
+		if !ok {
-				}
+			panic("lib.std did not return table")
-				app.RawSetString(base, tbl)
 		}
 
-			return app
+		proto := func() string {
-		}())
+			switch protocol {
+			case HTTP:
+				return "http"
+			case GEMINI:
+				return "gemini"
+			default:
+				return "http"
+			}
+		}()
+		proto = "gemini"
+
+		stdTbl.RawSetString("proto", lua.LString(proto))
+		tbl.RawSetString("std", stdTbl)
 
 		bus := L.NewTable()
 		bus.RawSetString("url", lua.LString(requestData.path))
+
 		params := L.NewTable()
 		for k, v := range requestData.params {
 			params.RawSetString(k, lua.LString(v))
 		}
 		bus.RawSetString("params", params)
-		mod.RawSetString("bus", bus)
 
-		mod.RawSetString("markdown_to_html", L.NewFunction(func(L *lua.LState) int {
+		tbl.RawSetString("bus", bus)
+
+		tbl.RawSetString("markdown_to_html", L.NewFunction(func(L *lua.LState) int {
 			L.Push(lua.LString(markdownToHTML(L.ToString(1))))
 			return 1
 		}))
 
-		L.Push(mod)
+		L.Push(tbl)
 		return 1
 	})
 
@@ -147,16 +126,25 @@ func render(luapath string, requestData reqData) ([]byte, error) {
 		return []byte(""), nil
 	}
 
-	L.SetGlobal("__fes_result", L.Get(-1))
+	val := L.Get(-1)
-	if err := L.DoString("return tostring(__fes_result)"); err != nil {
+	L.Pop(1)
-		L.GetGlobal("__fes_result")
+
-		if s := L.ToString(-1); s != "" {
+	if val == lua.LNil {
-			return []byte(s), nil
-		}
 		return []byte(""), nil
 	}
 
-	if s := L.ToString(-1); s != "" {
+	if err := L.CallByParam(lua.P{
+		Fn:      L.GetGlobal("tostring"),
+		NRet:    1,
+		Protect: true,
+	}, val); err != nil {
+		return nil, err
+	}
+
+	s := L.ToString(-1)
+	L.Pop(1)
+
+	if s != "" {
 		return []byte(s), nil
 	}
 

modules/server/server.go

@@ -2,16 +2,23 @@ package server
 
 import (
 	"fes/modules/config"
+	"fes/modules/gemini"
 	"fes/modules/ui"
 	"fmt"
-	"log"
 	"net/http"
 	"os"
 	"path/filepath"
-	"strings"
+	"sync"
 )
 
-var routes map[string]string
+type Protocols int
+
+const (
+	HTTP Protocols = iota
+	GEMINI
+)
+
+var Routes map[string]string
 
 func Start(dir string) {
 	if err := os.Chdir(dir); err != nil {
@@ -30,62 +37,41 @@ func Start(dir string) {
 
 	ui.Log("running root=%s, port=%d.", root, *config.Port)
 
-	routes := loadDirs()
+	ui.LogVerbose("start loading directories")
+	Routes = loadDirs()
 
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+	http.HandleFunc("/", httpHandler)
-		route, ok := routes[r.URL.Path]
+	gemini.HandleFunc("/", geminiHandler)
 
-		var err error = nil
+	var wg sync.WaitGroup
+	errs := make(chan error, 2)
 
-		/* defer won't update paramaters unless we do this. */
+	wg.Add(2)
-		defer func() {
+
-			ui.Path(route, err)
+	go func() {
+		defer wg.Done()
+		errs <- http.ListenAndServe(fmt.Sprintf("0.0.0.0:%d", *config.Port), nil)
 	}()
 
-		if !ok {
+	go func() {
-			err = config.ErrRouteMiss
+		defer wg.Done()
-			route = r.URL.Path
+		errs <- gemini.ListenAndServeTLS(fmt.Sprintf("0.0.0.0:%d", *config.Port-1035), "cert.pem", "key.pem", nil)
+	}()
 
-			if strings.HasPrefix(route, "/archive") {
+	ui.Log("Server initialized")
-				err = readArchive(w, route)
+	wg.Wait()
-			} else {
+	close(errs)
-				w.WriteHeader(http.StatusNotFound)
+
-				w.Write([]byte(`<html>
+	var collected []error
-<head><title>404 Not Found</title></head>
+
-<body>
+	for err := range errs {
-<center><h1>404 Not Found</h1></center>
+		if err != nil {
-<hr><center>fes</center>
+			collected = append(collected, err)
-</body>
-</html>`))
 		}
+	}
+
+	if len(collected) > 0 {
+		fmt.Printf("errors: %v\n", collected)
 		return
 	}
-
-		params := make(map[string]string)
-		for k, v := range r.URL.Query() {
-			if len(v) > 0 {
-				params[k] = v[0]
-			}
-		}
-
-		var data []byte
-		if strings.HasSuffix(route, ".lua") {
-			data, err = render(route, reqData{path: r.URL.Path, params: params})
-		} else if strings.HasSuffix(route, ".md") {
-			data, err = os.ReadFile(route)
-			data = []byte(markdownToHTML(string(data)))
-			data = []byte("<style>body {max-width: 80ch;}</style>\n" + string(data))
-		} else {
-			data, err = os.ReadFile(route)
-		}
-
-		if err != nil {
-			http.Error(w, fmt.Sprintf("Error loading page: %v", err), http.StatusInternalServerError)
-		}
-
-		w.Write(data)
-	})
-	ui.Log("Server initialized")
-
-	log.Fatal(http.ListenAndServe(fmt.Sprintf("0.0.0.0:%d", *config.Port), nil))
 }

test/README.md

@@ -1,7 +1,7 @@
-# default
+# test
 
 ```
-fes new default
+fes new test
 ```
 
 > **Know what you are doing?** Delete this file. Have fun!

test/archive_test/Fes.toml

@@ -1,5 +0,0 @@
-[app]
-
-name = "archive"
-version = "0.0.1"
-authors = ["vx-clutch"]

test/archive_test/README.md

@@ -1,4 +0,0 @@
-# archive
-
-This example demonstrates the archive feature of Fes it is useful for file
-sharing purposes.

test/archive_test/archive/facts/seals/seals.txt

@@ -1,22 +0,0 @@
-Pinnipeds [2] are the seals and their relatives, a group of semi-aquatic marine
-mammals. The Pinnipedia is in the Order Carnivora. There are three seal
-families: Odobenidae (walruses), Otariidae (eared seals, including sea lions
-and fur seals), and Phocidae (true seals).[3]
-
-Seals are sleek-bodied and barrel-shaped. Their bodies are well adapted to the
-aquatic habitat where they spend most of their lives. Pinnipeds have flippers
-for hands, big bulky bodies, doggish faces, and big eyes. Unlike cetaceans,
-pinnipeds have their noses on their faces, and each nostril of the nose closes
-when the pinniped goes underwater. Like cetaceans, pinnipeds have a thick layer
-of blubber (fat) just under their skin: this blubber keeps them warm in cold
-waters and keeps them fed during times when food is not easily found. When they
-cannot find food, they live off the fat in the blubber.
-
-Pinnipeds are carnivorous. This means they eat only meat (such as fish or
-squid) and not plants. However, almost all pinnipeds can be eaten by polar
-bears, sharks and killer whales.
-
-Seals are often trained in zoos or aquariums to put on shows. However, in
-Sweden, it is illegal to train a seal to balance a ball on its nose.[4]
-
-From [Pinniped Wikipedia](https://simple.wikipedia.org/wiki/Pinniped)

test/archive_test/www/index.lua

@@ -1,10 +0,0 @@
-local fes = require("fes")
-local site = fes.fes()
-
-site.copyright = fes.util.copyright("https://fsd.vxserver.dev", "fSD")
-
-site:h1("Hello, World!")
-
-site:a("/archive", fes.std.h2("To the file room!"))
-
-return site

test/basic_hello_world/Fes.toml

@@ -1,5 +0,0 @@
-[app]
-
-name = "hello"
-version = "0.0.1"
-authors = ["vx-clutch"]

test/basic_hello_world/README.md

@@ -1,4 +0,0 @@
-# hello
-
-This is a very simple hello world program, the only difference between this and
-default is this README.

test/basic_hello_world/www/index.lua

@@ -1,8 +0,0 @@
-local fes = require("fes")
-local site = fes.fes()
-
-site.copyright = fes.util.copyright("https://fsd.vxserver.dev", "fSD")
-
-site:h1("Hello, World!")
-
-return site

test/cert.pem

@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFmzCCA4OgAwIBAgIUZGaMDLeCAQplfhhjXb2HaL6xpFYwDQYJKoZIhvcNAQEL
+BQAwXTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVN0YXRlMQ0wCwYDVQQHDARDaXR5
+MQwwCgYDVQQKDANPcmcxDTALBgNVBAsMBFVuaXQxEjAQBgNVBAMMCWxvY2FsaG9z
+dDAeFw0yNjAyMjQwMjUwMzVaFw0yNzAyMjQwMjUwMzVaMF0xCzAJBgNVBAYTAlVT
+MQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEMMAoGA1UECgwDT3JnMQ0w
+CwYDVQQLDARVbml0MRIwEAYDVQQDDAlsb2NhbGhvc3QwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQCfl+m81U9+WLBnPiJ1ZADnZC+BecXArguAdnbkgDlm
+fqe1eU6M0PBmXXFHEvJYOh2oYQZ7DMbuLLvoDdjomXM4yb9Axu2KDHfflTcw3wHD
+3850ganf9rwVG460gkVfUGaRiokyCvEJKd05BxKmx8Zh6G2tpetaDKm72ONYQFya
+BCelYMzaBRpJ2kcPqk/gEhUSvQKVF4oDREm+sTEkCTWsjUesiG0393t3psFa/SlZ
+KsNXNrb+N6y9SElKVlQOT28r9YGiDfy5PiAQiFtQse2gqC4IhG2MGi0b4mu4Qa3+
+d2u3jsmn6Gqt92hKrbFOpz+Ci5GQ+zKXnE+j/h40l1J3h/aTM5/qS7malAtXySMV
+zLQnJzai6IL+nBKbIOMCzP1Bns64Oo7YuuhVCx/sovrvgFF+8j4nLXOBgrx8llYB
+5cvgVYkNmccXtPzd7hZI6PHgZRGOd0uBKlZ+OHeKhgdnz/a+pCUBwJe8JAzX7fzo
+Z+HLy26ADx2Uywh0Rjfj4gVOSZXaGS0ne0p5PciN0xsWQdaAWPcVe6+YYRKS6l6q
+aWuGaPwVsZSvNgIMMPOgUn7+s2Bxh51DhqZT4MDFUJWXFmTnyhHg3Cq7pWJR7pv2
+erv5q32b8iah5o+CP4W3FeZX1CcBuiIsrimhvZZIa5W2vzpkLHbWgI2XGbx8yKRX
+owIDAQABo1MwUTAdBgNVHQ4EFgQUcyq+ZZWmAUejOPEQpHpl4hOllHswHwYDVR0j
+BBgwFoAUcyq+ZZWmAUejOPEQpHpl4hOllHswDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAgEANwdjxlPHqvOOyNTFJcFhcNff3862/74CyCiglrstk/ea
+txjyHxXFwXOtyAtm0tqaQPpzHWFM5MDqVD7Qip4aZrPcRvvfJ8zxXuakrgy7oI6i
+Wl4/BXzvIoxh8MyFVC7VdGmuv11fq091RaNPlnz5lH9Qxhb6QCGbk73PjTXxD/7A
+yusNiXuJvx3oRhLLGuksotFKEnngOq21Jla3ZPUmJTLAZdk/joXITk5Q64ZBp5uD
+rpxFZDtdHTBuL3nmNPUHixsxQRFzCSloufRlatdI2ldDc+d2WLLFhkpdM35Oedf3
+Hib0VXPgJ8j/w6RK+oYKMP27RojMFXALolzRBSQu3Zbd1bD1qVhh/dO5Uyn4E3mb
+2LW5+a9zuabD9wt8smSU9V5ZYw5hcR0ANN7xYmaMvGFKrNPNkI3m0c2dyj22vgg0
+zQqeMze4KxZqDf/gFifJ4UIybBAgc/p1uOIceFTSYplVXJQIgFACn9l6c4Zo0GZD
+H48iKQLwlxDdUSM8aHtItWxRddLCL7lYNKtu2/qu8I9NKkjx4/Kn3I9Is/f37EIn
+rF3ygUg3ee5zo3fvMjlhCNs6djm+ANx2KzdZkS7UU/jb0o+OSEvoMIgZh5NNgUlC
+aVR3opS3PTqwu4plN0Evh5kr3nEOx0vcIK726DwnpgNRhcG9cNcSi2UB4NYCWaw=
+-----END CERTIFICATE-----

test/complex_sample_project/Fes.toml

@@ -1,5 +0,0 @@
-[app]
-
-name = "best"
-version = "0.0.1"
-authors = ["vx-clutch"]

test/complex_sample_project/README.md

@@ -1,23 +0,0 @@
-# best
-
-This is an example of best practices for the Fes framework.
-
-## Parts
-
-With best practice we can break our sites into a few parts.
-
-## Index
-
-The main page of the site loads in the header and the footer, as well as shows
-some core information
-
-## Include
-
-Within include the header and footer are defined.
-
-* **Header:** Site navigation and name display
-* **Footer:** Extra and external information.
-
-## Static
-
-This is where we store our favicon.

test/complex_sample_project/include/footer.lua

@@ -1,13 +0,0 @@
-local footer = {}
-
-footer.render = function(std)
-    return table.concat({
-	std.h2("Other resources"),
-	std.tl({
-		std.external("https://git.vxserver.dev/fSD/fes", "Fes source"),
-		std.external("https://docs.vxserver.dev/static/fes.html", "Documentation"),
-	}),
-})
-end
-
-return footer

test/complex_sample_project/include/header.lua

@@ -1,7 +0,0 @@
-local header = {}
-
-header.render = function(std)
-    return std.center(std.ha("/", std.h1("Best Practices")))
-end
-
-return header

test/complex_sample_project/www/index.lua

@@ -1,20 +0,0 @@
-local fes = require("fes")
-local std = fes.std
-local u = fes.util
-
-local site = fes.fes()
-
-site.copyright = fes.util.copyright("https://fsd.vxserver.dev", "fSD")
-site.title = "Best practices"
-site.favicon = "/static/favicon.ico"
-
-site:banner(fes.app.header.render(std))
-
-site:note(u.cc {
-	std.h2("Hello, World!"),
-	std.p("This is an example of the best practices/canonical Fes site.")
-})
-
-site:note(fes.app.footer.render(std))
-
-return site

test/default_project/Fes.toml

@@ -1,5 +0,0 @@
-[app]
-
-name = "default"
-version = "0.0.1"
-authors = ["vx-clutch"]

test/default_project/www/index.lua

@@ -1,8 +0,0 @@
-local fes = require("fes")
-local site = fes.fes()
-
-site.copyright = fes.util.copyright("https://fsd.vxserver.dev", "fSD")
-
-site:h1("Hello, World!")
-
-return site

test/expected_error/Fes.toml

@@ -1,5 +0,0 @@
-[app]
-
-name = "error"
-version = "0.0.1"
-authors = ["vx-clutch"]

test/expected_error/README.md

@@ -1,6 +0,0 @@
-# error
-
-This shows what a Lua error looks like to the user. Lua errors are the most
-common and the most critical so that is why they are shown to the user. Other,
-lesser errors, are only shown to the developer because of their different
-nature.

test/expected_error/www/index.lua

@@ -1,10 +0,0 @@
-local fes = require("fes")
-local site = fes.fes()
-
-site.copyright = fes.util.copyright("https://fsd.vxserver.dev", "fSD")
-
-This is what an error looks like
-
-site:h1("Hello, World!")
-
-return site

test/key.pem

@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCfl+m81U9+WLBn
+PiJ1ZADnZC+BecXArguAdnbkgDlmfqe1eU6M0PBmXXFHEvJYOh2oYQZ7DMbuLLvo
+DdjomXM4yb9Axu2KDHfflTcw3wHD3850ganf9rwVG460gkVfUGaRiokyCvEJKd05
+BxKmx8Zh6G2tpetaDKm72ONYQFyaBCelYMzaBRpJ2kcPqk/gEhUSvQKVF4oDREm+
+sTEkCTWsjUesiG0393t3psFa/SlZKsNXNrb+N6y9SElKVlQOT28r9YGiDfy5PiAQ
+iFtQse2gqC4IhG2MGi0b4mu4Qa3+d2u3jsmn6Gqt92hKrbFOpz+Ci5GQ+zKXnE+j
+/h40l1J3h/aTM5/qS7malAtXySMVzLQnJzai6IL+nBKbIOMCzP1Bns64Oo7YuuhV
+Cx/sovrvgFF+8j4nLXOBgrx8llYB5cvgVYkNmccXtPzd7hZI6PHgZRGOd0uBKlZ+
+OHeKhgdnz/a+pCUBwJe8JAzX7fzoZ+HLy26ADx2Uywh0Rjfj4gVOSZXaGS0ne0p5
+PciN0xsWQdaAWPcVe6+YYRKS6l6qaWuGaPwVsZSvNgIMMPOgUn7+s2Bxh51DhqZT
+4MDFUJWXFmTnyhHg3Cq7pWJR7pv2erv5q32b8iah5o+CP4W3FeZX1CcBuiIsrimh
+vZZIa5W2vzpkLHbWgI2XGbx8yKRXowIDAQABAoICAENZb5lyB5cRRHh9XztdFYiQ
+3f9s7UhP6qiu1aO+fPrFDm9mHwEMF7eLTYep9j3HYMazE3IQRU8z76SRW21lfJuF
+gEGM8aeldV0UcnMcWXlY1J6ULaVHUb4yn/mLVE1R98cJyLYmqeutEB/F3VgmzJB6
+7vYuI/EfkO2mLOMMXkfc4wJGpIyJRLvP8tcoj4bG+r+qphFXGrYgNmLUEiHcBRup
+j4q/FCBfP2qSI90LI0zu3/rJK1aDFlHW1J8baWOUoBzUAX3rGzDth8iSUr7uJ5L6
+Blsvz68lSM4QslbS2OOfcATJrE5Apex+kTOas023BPVJgwfFCmey3mUdk4+sIG+I
+YpvrfUHBAbhRt1itGjjx/BH3HVtkwKsm3nNNgE8qS0qmziGVa60amLng0OgD4SOH
+QKWrotcojYlWHywdHNAmiaWP+ZV9U0u4T59dkHhjqBoPuY64kNddRCLYItszqOmC
+tamnflcoFPThdBnDpnXhLX+MnvQKIO2K2QTKjdYrkSMvEC/m96H49Vf4w+Fe3coc
+SLsyMqHmYSG3+QtFN3JSmqDdBLQ+bFK0KZOk3IE2UK+lvabmtHuGLkYguur/fOnG
+FvxcC+MIHHFrtSfqfvIrXeGFqe2Fb6DIKdMJFPV8iP5Px91A0GAGeabyktyya1n5
+kk5nMJY3A7rTmnDO2PUBAoIBAQDSd+pvNGDf/We74+NODKQBcleCfF0NNzvRIuYH
+9vel5jhyD28Y30XQS7+YBo3Y5Yo5pVlJ425Z5CveZOmr4VImuYG8LTbbGYY8ns3c
+R/IdP1ByAcIa1eRGQNcKHid7RW4aEoFdvW3jZNj6/ukbJwd9ZHOt4HEUv5MOObn7
+VXiXiwHjVy3X4uD5j0bHS4owd7S3Ygg0OneUzX3XJ+8qUgfU9B+lD3SbtsI4baoU
+qUKcQc/0yXKvJvoz9oX2tjQOHqGrGwHdootc2CLnr0PMI7fKBwT3k63B+24xEGcx
+OAPc5tUuiqIewiCn1oZbeCxmNnnimkAjDfG2KXMXj1R1G96BAoIBAQDCHnTNQhXH
+tcfwnxj86E+Zd7ORS7iH/5eWvnspt2pnNCpufLFQlbdiL3d9ysSN9nw3+y15/o83
+R79s7fLdC0+blc6q/ZQEdB1C+8YQa0nTlqqlZWVbRPjQUV+SfGssaZFEO4W7QWh3
+hJL14HbWUFC3XSdMAeKTNOcgvfVvQ9M8HlJI1ZPo4Pe4rGNFIEsKUz/6HVE7HFgQ
+OwcLSxZlSQSQ6/YErP/XJoyQUPjHldAjphV/rn28cvh2quoI35fbBuZu5pyKLXTg
+RKbdWbeoIZTthRojpqnfqnIR+rPXIIiaMYhStdPshNUxLL7DX+/3yI05qq8R+yqa
+2gLb2mJltuwjAoIBAF0WQI/ywK4Q7CKEBnLs0FT7d4z06EsCFOjI4KjBKIMtseVw
+whhkGAKqnhDlRTObQmmAol81wgbsDiMMyvUEcUtDXQgXj12UinShYDd/cqxQ5omm
+EW3BEHeqEfIdqCSzbqEFckY9lC6w2e8Zc4xY1M028psC28DrgmUWTxXEldOg3bLp
+ShNj+1Eld46J8JLDPyCksTA4c89Sm8ffl75GDcS4PI7KqS59xKUki8cbnaRyz0Fb
+H+gr+xmkfVfC+n8MOUDubwLR84Wa6sVCFWBio9UtCZteq8lSJUh6EsoIFl1LkxpE
+orOr9LmG/mHSYwDKM1pwEtHuRuvkpUzUTeyF6QECggEAbm/vWZtgUsdbocyR5cix
+CImuUlo2+MBz2KIz5c7grShjf4pXQpZ6x1Rj8d/7JRz3HM482Cv4BKZABNP3GMTH
+nKeE9YjgvgvlXedpjovLa6JLIV/nYx6BQ9sXuXopaxIAQEZw1dDngx+ckGAMm+8D
+jN5lbfugkMlHOTx5Nrzqn0hM3f0McjATHzCMJZayuoQUYNJvFWcRvuImJsmoSyVY
+gK6Nv6lAwIHA9JXsg3f6+10Q3BxEkoMCUlj4XuX+OfDaBnwS0RX9aV4FZOcW8oNw
+fBT+gwvdl08cKJht2lU7AiZt/UhO8j+8HobrXLHnDxw9JHKzuVIgsgqYF8ZNtrpz
+6wKCAQEAqJc9xfNYL2jyJTVBvqX34Uct9xV1fq7z45B3gpPHj4tc0dBOIwPKSsu8
+rGyefPuMDvbecJoaXqRZGQEcv03ecLVtHHDCsJcWavth9sCQJW9mnOxjOnLHdGnl
+h2yIV4iVzNEx5XA1+0JRAAwFMXrC9LUZDTT61opjohMJSEySo/HVekoWG9A0bQGn
+Ui+JbtLeuuCwwAGSgdAhVkjr27ANyFtjR63KVrDvSLbYFyZXKxrRYnZWs92Ho/g6
+oTLnUSmkbLlhsUDjknAaNfp+enETSoPHcpkd7MeqVw2oYrLw6MCo4h2tBsIgtZEd
+h6CgX4Gc3+bhvKx36XYxVwScPJUWsQ==
+-----END PRIVATE KEY-----

test/markdown_render/Fes.toml

@@ -1,5 +0,0 @@
-[app]
-
-name = "markdown"
-version = "0.0.1"
-authors = ["vx-clutch"]

test/markdown_render/README.md

@@ -1,3 +0,0 @@
-# markdown
-
-This example demonstrate Fes's ability to handle markdown routes.

test/markdown_render/www/index.md

@@ -1,3 +0,0 @@
-# Markdown!
-
-**Fes** also supports markdown routes!

test/minimal_return/Fes.toml

@@ -1,5 +0,0 @@
-[app]
-
-name = "simple"
-version = "0.0.1"
-authors = ["vx-clutch"]

test/minimal_return/README.md

@@ -1,5 +0,0 @@
-# simple
-
-This simple example shows the extensibility of the Fes framework. It shows the
-you do not necessarily need to use the site object (although it is recommended)
-you can define your own site, similar to how Lisps do things.

test/minimal_return/www/index.lua

@@ -1 +0,0 @@
-return "Hello, World!"

test/www/index.lua

@@ -0,0 +1,46 @@
+local fes = require("fes")
+local site = fes.fes()
+
+local std = fes.std
+local u = fes.util
+
+site.copyright = std.link("https://fsdproject.org/", "fSD")
+
+site:banner(table.concat {
+	std.h(1, "Testing Page"),
+})
+
+site:note(table.concat {
+	std.h(1, "Example syntax features"),
+	std.h(2, "Paragraphs"),
+	std.p("This is a paragraph."),
+	std.h(2, "Codeblocks"),
+	std.codeblock([[
+#include <stdio.h>
+
+int main() {
+	puts("Hello, World!");
+	return 0;
+}]]),
+	std.h(2, "Inline Codeblocks"),
+	std.inline([[puts("Hello, World!");]]),
+	std.h(2, "Links"),
+	std.link("geminiprotocol.net/"),
+	std.h(2, "Lists"),
+	std.list {
+		"Item 1",
+		"Item 2",
+		"Item 3",
+	},
+	std.h(2, "Blockquotes"),
+	std.blockquote([["UNIX is very simple" - Dennis Ritchie
+"GNU's Not UNIX" - Richard Stallman]]),
+	std.h(2, "Rules"),
+	std.rule(),
+	std.h(2, "Images"),
+	std.image("fluffy baby seal", "/static/seal.png"),
+	std.h(2, "Files"),
+	std.file("seal.png", "/static/seal.png"),
+})
+
+return site

todo

@@ -0,0 +1,2 @@
+gemini: Add command-line options
+http: https://git.erock.io