fSD/fes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extract out protocol

Browse Source
This commit is contained in:
vx-clutch
2026-02-14 08:26:50 -05:00
parent d340c55e8c
commit 8bfe979093
3 changed files with 109 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
modules/server/http.go Normal file
View File

@@ -0,0 +1,64 @@
package server
import (
"fes/modules/config"
"fes/modules/ui"
"fmt"
"net/http"
"os"
"strings"
)
func httpHandler(w http.ResponseWriter, r *http.Request) {
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)
} 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}, &Sets)
} 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)
}

43
modules/server/render.go
View File

@@ -1,6 +1,7 @@
package server package server
import ( import (
"errors"
"fes/modules/config" "fes/modules/config"
"io/fs" "io/fs"
"os" "os"
@@ -16,8 +17,16 @@ type reqData struct {
params map[string]string params map[string]string
} }
/* returns a string of rendered html */ /* declarative sets in the page declaration */
func render(luapath string, requestData reqData) ([]byte, error) { type DeclarativeSets struct {
protos struct {
http bool
gemini bool
}
}
/* returns a string of rendered markup */
func render(luapath string, requestData reqData, setBuffer *DeclarativeSets) ([]byte, error) {
L := lua.NewState() L := lua.NewState()
defer L.Close() defer L.Close()
@@ -160,5 +169,35 @@ func render(luapath string, requestData reqData) ([]byte, error) {
return []byte(s), nil return []byte(s), nil
} }
L.GetGlobal("require")
L.Push(lua.LString("std"))
L.Call(1, 1)
ret := L.Get(-1)
L.Pop(1)
tbl, ok := ret.(*lua.LTable)
if !ok {
return nil, errors.New("Could not determine protocol")
}
proto := tbl.RawGetString("proto")
protoTbl, ok := proto.(*lua.LTable)
if !ok {
return nil, errors.New("Could not determine protocol")
}
protoTbl.ForEach(func(key lua.LValue, value lua.LValue) {
if str, ok := value.(lua.LString); ok {
switch str.String() {
case "http":
setBuffer.protos.http = true
case "gemini":
setBuffer.protos.gemini = true
}
}
})
return []byte(""), nil return []byte(""), nil
} }

60
modules/server/server.go
View File

@@ -8,10 +8,10 @@ import (
"net/http" "net/http"
"os" "os"
"path/filepath" "path/filepath"
"strings"
) )
var routes map[string]string var Routes map[string]string
var Sets DeclarativeSets
func Start(dir string) { func Start(dir string) {
if err := os.Chdir(dir); err != nil { if err := os.Chdir(dir); err != nil {
@@ -30,61 +30,9 @@ func Start(dir string) {
ui.Log("running root=%s, port=%d.", root, *config.Port) ui.Log("running root=%s, port=%d.", root, *config.Port)
routes := loadDirs() Routes = loadDirs()
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { http.HandleFunc("/", httpHandler)
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)
} 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})
} 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") ui.Log("Server initialized")
log.Fatal(http.ListenAndServe(fmt.Sprintf("0.0.0.0:%d", *config.Port), nil)) log.Fatal(http.ListenAndServe(fmt.Sprintf("0.0.0.0:%d", *config.Port), nil))