add features: object based control, and GC(periodic delete) zombie object

This commit is contained in:
Anya Tokugawa committed 2026-05-31 20:07:37 +09:00
1 parent 6ad039c536
commit 4da7d4e42d
18 files changed
+939 -75

No files matched your search

+1 -1
View File
@@ -2,7 +2,7 @@ FROM golang:1.22-alpine
WORKDIR /src WORKDIR /src
RUN apk add --no-cache git RUN apk add git
COPY go.mod go.sum ./ COPY go.mod go.sum ./
RUN go mod download RUN go mod download
+3 -1
View File
@@ -1 +1,3 @@
pageswiki # pageswiki
Simplest and powerful wiki architecture for personal
+1 -1
View File
@@ -2,7 +2,7 @@ server {
listen 80; listen 80;
location / { location / {
proxy_pass http://app:81; proxy_pass http://app:3000;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
} }
+2
View File
@@ -1,5 +1,6 @@
services: services:
nginx: nginx:
container_name: pageswiki-proxy
image: nginx:1.27-alpine image: nginx:1.27-alpine
restart: unless-stopped restart: unless-stopped
ports: ports:
@@ -10,6 +11,7 @@ services:
- app - app
app: app:
container_name: pageswiki
build: . build: .
volumes: volumes:
- ./data:/data - ./data:/data
+118
View File
@@ -0,0 +1,118 @@
package server
import (
"encoding/json"
"net/http"
"strconv"
)
func (s *Server) handleZombieListAPI(
w http.ResponseWriter,
r *http.Request,
) {
graceSeconds := int64(86400)
if v := r.URL.Query().Get("grace_seconds"); v != "" {
n, err :=
strconv.ParseInt(
v,
10,
64,
)
if err == nil {
graceSeconds = n
}
}
zombies, err :=
s.store.ListZombieObjects(
graceSeconds,
)
if err != nil {
http.Error(
w,
err.Error(),
500,
)
return
}
w.Header().Set(
"Content-Type",
"application/json",
)
json.NewEncoder(w).Encode(
map[string]any{
"zombies": zombies,
"count": len(zombies),
},
)
}
func (s *Server) handleZombiePurgeAPI(
w http.ResponseWriter,
r *http.Request,
) {
graceSeconds := int64(86400)
limit := 100
if v := r.URL.Query().Get("grace_seconds"); v != "" {
n, err :=
strconv.ParseInt(
v,
10,
64,
)
if err == nil {
graceSeconds = n
}
}
if v := r.URL.Query().Get("limit"); v != "" {
n, err :=
strconv.Atoi(v)
if err == nil {
limit = n
}
}
deleted, err :=
s.store.PurgeZombieObjects(
graceSeconds,
limit,
)
if err != nil {
http.Error(
w,
err.Error(),
500,
)
return
}
w.Header().Set(
"Content-Type",
"application/json",
)
json.NewEncoder(w).Encode(
map[string]any{
"deleted": deleted,
},
)
}
+45
View File
@@ -0,0 +1,45 @@
package server
import (
"log"
"time"
)
func (s *Server) startGCWorker() {
go func() {
ticker :=
time.NewTicker(
6 * time.Hour,
)
defer ticker.Stop()
for {
deleted, err :=
s.store.PurgeZombieObjects(
24*60*60,
100,
)
if err != nil {
log.Printf(
"zombie gc error: %v",
err,
)
} else if deleted > 0 {
log.Printf(
"zombie gc purged=%d",
deleted,
)
}
<-ticker.C
}
}()
}
+4 -44
View File
@@ -2,22 +2,17 @@ package server
import ( import (
"net/http" "net/http"
"strings"
) )
type HomeObject struct {
UUID string
Path string
Kind string
}
func (s *Server) handleHome( func (s *Server) handleHome(
w http.ResponseWriter, w http.ResponseWriter,
r *http.Request, r *http.Request,
) { ) {
objects, err := objects, err :=
s.store.ListObjects() s.store.ListRecentObjects(
30,
)
if err != nil { if err != nil {
@@ -30,46 +25,11 @@ func (s *Server) handleHome(
return return
} }
var semanticObjects []HomeObject
for _, o := range objects {
path := o.UUID
if path == "" {
continue
}
if strings.HasPrefix(
path,
"/system/",
) {
continue
}
if strings.HasPrefix(
path,
"/o/",
) {
continue
}
semanticObjects = append(
semanticObjects,
HomeObject{
UUID: o.UUID,
Path: path,
Kind: o.Kind,
},
)
}
s.render( s.render(
w, w,
"home.gohtml", "home.gohtml",
map[string]any{ map[string]any{
"Title": "Pages Wiki", "Objects": objects,
"Objects": semanticObjects,
}, },
) )
} }
+41
View File
@@ -0,0 +1,41 @@
package server
import (
"encoding/json"
"net/http"
)
func (s *Server) handleDeleteObjectAPI(
w http.ResponseWriter,
r *http.Request,
) {
var req struct {
ObjectUUID string `json:"object_uuid"`
}
err := json.NewDecoder(
r.Body,
).Decode(&req)
if err != nil {
http.Error(w, err.Error(), 400)
return
}
if req.ObjectUUID == "" {
http.Error(w, "object_uuid is required", 400)
return
}
err = s.store.DeleteObject(
req.ObjectUUID,
)
if err != nil {
http.Error(w, err.Error(), 500)
return
}
w.WriteHeader(http.StatusNoContent)
}
+137
View File
@@ -0,0 +1,137 @@
package server
import (
"html/template"
"net/http"
"strings"
)
func objectUUIDFromURI(uri string) (string, bool) {
if !strings.HasPrefix(uri, "uuid:") {
return "", false
}
uuid := strings.TrimPrefix(uri, "uuid:")
if uuid == "" {
return "", false
}
return uuid, true
}
func (s *Server) handleObjectView(
w http.ResponseWriter,
r *http.Request,
) {
uri := strings.TrimPrefix(r.URL.Path, "/o/")
objectUUID, ok := objectUUIDFromURI(uri)
if !ok {
http.NotFound(w, r)
return
}
latest, err :=
s.store.GetLatestRevision(objectUUID)
if err != nil {
http.Error(
w,
err.Error(),
500,
)
return
}
s.render(
w,
"object_view.gohtml",
map[string]any{
"Title": "Object View",
"ObjectUUID": objectUUID,
"ObjectURI": uri,
"RenderedHTML": template.HTML(latest.Body),
},
)
}
func (s *Server) handleObjectEdit(
w http.ResponseWriter,
r *http.Request,
) {
uri := strings.TrimPrefix(r.URL.Path, "/o/e/")
objectUUID, ok := objectUUIDFromURI(uri)
if !ok {
http.NotFound(w, r)
return
}
latest, err :=
s.store.GetLatestRevision(objectUUID)
body := ""
if err == nil && latest != nil {
body = latest.Body
}
s.render(
w,
"object_editor.gohtml",
map[string]any{
"Title": "Object Edit",
"ObjectUUID": objectUUID,
"ObjectURI": uri,
"Body": body,
"EditType": "html",
},
)
}
func (s *Server) handleObjectRevisionHistory(
w http.ResponseWriter,
r *http.Request,
) {
uri := strings.TrimPrefix(r.URL.Path, "/o/r/")
objectUUID, ok := objectUUIDFromURI(uri)
if !ok {
http.NotFound(w, r)
return
}
revisions, err :=
s.store.ListRevisions(objectUUID)
if err != nil {
http.Error(
w,
err.Error(),
500,
)
return
}
s.render(
w,
"revisions.gohtml",
map[string]any{
"Title": "Object Revision History",
"ObjectUUID": objectUUID,
"Revisions": revisions,
},
)
}
+18
View File
@@ -5,6 +5,7 @@ import "net/http"
type APIHandlers struct { type APIHandlers struct {
CreateObject http.HandlerFunc CreateObject http.HandlerFunc
ListObjects http.HandlerFunc ListObjects http.HandlerFunc
DeleteObject http.HandlerFunc
SaveRevision http.HandlerFunc SaveRevision http.HandlerFunc
ListRevisions http.HandlerFunc ListRevisions http.HandlerFunc
RestoreRevision http.HandlerFunc RestoreRevision http.HandlerFunc
@@ -14,6 +15,8 @@ type APIHandlers struct {
RenamePath http.HandlerFunc RenamePath http.HandlerFunc
RenamePreview http.HandlerFunc RenamePreview http.HandlerFunc
RemovePath http.HandlerFunc RemovePath http.HandlerFunc
ZombieList http.HandlerFunc
ZombiePurge http.HandlerFunc
} }
func RegisterAPIRoutes( func RegisterAPIRoutes(
@@ -31,6 +34,11 @@ func RegisterAPIRoutes(
h.ListObjects, h.ListObjects,
) )
mux.HandleFunc(
"/_/api/v1/object/delete",
h.DeleteObject,
)
mux.HandleFunc( mux.HandleFunc(
"/_/api/v1/revisions/save", "/_/api/v1/revisions/save",
h.SaveRevision, h.SaveRevision,
@@ -75,4 +83,14 @@ func RegisterAPIRoutes(
"/_/api/v1/path/remove", "/_/api/v1/path/remove",
h.RemovePath, h.RemovePath,
) )
mux.HandleFunc(
"/_/api/v1/gc/zombies/list",
h.ZombieList,
)
mux.HandleFunc(
"/_/api/v1/gc/zombies/purge",
h.ZombiePurge,
)
} }
+49 -1
View File
@@ -1,9 +1,12 @@
package server package server
import ( import (
"fmt"
"html/template" "html/template"
"log" "log"
"net/http" "net/http"
"strings"
"time"
mw "pageswiki/internal/server/middleware" mw "pageswiki/internal/server/middleware"
routespkg "pageswiki/internal/server/routes" routespkg "pageswiki/internal/server/routes"
@@ -30,9 +33,27 @@ func New(
s.registerStaticRoutes() s.registerStaticRoutes()
s.mux.HandleFunc(
"/o/e/",
s.handleObjectEdit,
)
s.mux.HandleFunc(
"/o/r/",
s.handleObjectRevisionHistory,
)
s.mux.HandleFunc( s.mux.HandleFunc(
"/o/", "/o/",
s.handleObjectRoute, func(w http.ResponseWriter, r *http.Request) {
if strings.HasPrefix(r.URL.Path, "/o/uuid:") {
s.handleObjectView(w, r)
return
}
s.handleObjectRoute(w, r)
},
) )
s.mux.HandleFunc( s.mux.HandleFunc(
@@ -52,6 +73,8 @@ func New(
s.registerRoutes() s.registerRoutes()
s.startGCWorker()
return s return s
} }
@@ -94,6 +117,28 @@ func (s *Server) mustLoadTemplates() {
return out return out
}, },
"formatBytes": func(n int) string {
if n < 1024 {
return fmt.Sprintf("%d B", n)
}
if n < 1024*1024 {
return fmt.Sprintf("%.1f KiB", float64(n)/1024.0)
}
return fmt.Sprintf("%.1f MiB", float64(n)/(1024.0*1024.0))
},
"formatUnix": func(ts int64) string {
if ts <= 0 {
return "-"
}
return time.Unix(ts, 0).Format("2006-01-02 15:04")
},
} }
tmpl := template.New("").Funcs(funcs) tmpl := template.New("").Funcs(funcs)
@@ -130,6 +175,7 @@ func (s *Server) registerRoutes() {
routespkg.APIHandlers{ routespkg.APIHandlers{
CreateObject: s.handleCreateObjectAPI, CreateObject: s.handleCreateObjectAPI,
ListObjects: s.handleListObjectsAPI, ListObjects: s.handleListObjectsAPI,
DeleteObject: s.handleDeleteObjectAPI,
SaveRevision: s.handleSaveRevisionAPI, SaveRevision: s.handleSaveRevisionAPI,
ListRevisions: s.handleRevisionListAPI, ListRevisions: s.handleRevisionListAPI,
RestoreRevision: s.handleRestoreRevisionAPI, RestoreRevision: s.handleRestoreRevisionAPI,
@@ -139,6 +185,8 @@ func (s *Server) registerRoutes() {
RenamePath: s.handleRenamePath, RenamePath: s.handleRenamePath,
RenamePreview: s.handleRenamePreview, RenamePreview: s.handleRenamePreview,
RemovePath: s.handleRemovePathAPI, RemovePath: s.handleRemovePathAPI,
ZombieList: s.handleZombieListAPI,
ZombiePurge: s.handleZombiePurgeAPI,
}, },
) )
} }
+55
View File
@@ -0,0 +1,55 @@
package store
func (s *Store) DeleteObject(
objectUUID string,
) error {
tx, err :=
s.DB.Begin()
if err != nil {
return err
}
_, err = tx.Exec(`
DELETE FROM paths
WHERE object_uuid = ?
`, objectUUID)
if err != nil {
tx.Rollback()
return err
}
_, err = tx.Exec(`
DELETE FROM tags
WHERE object_uuid = ?
`, objectUUID)
if err != nil {
tx.Rollback()
return err
}
_, err = tx.Exec(`
DELETE FROM revisions
WHERE object_uuid = ?
`, objectUUID)
if err != nil {
tx.Rollback()
return err
}
_, err = tx.Exec(`
DELETE FROM objects
WHERE uuid = ?
`, objectUUID)
if err != nil {
tx.Rollback()
return err
}
return tx.Commit()
}
+82
View File
@@ -0,0 +1,82 @@
package store
type RecentObject struct {
UUID string
Path string
Size int
UpdatedAt int64
}
func (s *Store) ListRecentObjects(
limit int,
) ([]RecentObject, error) {
if limit <= 0 {
limit = 20
}
rows, err := s.DB.Query(`
WITH latest AS (
SELECT
r.object_uuid,
r.body,
r.created_at,
ROW_NUMBER() OVER (
PARTITION BY r.object_uuid
ORDER BY r.created_at DESC
) AS rn
FROM revisions r
),
primary_path AS (
SELECT
p.object_uuid,
MIN(p.path) AS path
FROM paths p
GROUP BY p.object_uuid
)
SELECT
o.uuid,
COALESCE(primary_path.path, ''),
COALESCE(LENGTH(latest.body), 0),
COALESCE(latest.created_at, o.created_at)
FROM objects o
LEFT JOIN latest
ON latest.object_uuid = o.uuid
AND latest.rn = 1
LEFT JOIN primary_path
ON primary_path.object_uuid = o.uuid
ORDER BY
COALESCE(latest.created_at, o.created_at) DESC
LIMIT ?
`,
limit,
)
if err != nil {
return nil, err
}
defer rows.Close()
var out []RecentObject
for rows.Next() {
var ro RecentObject
err := rows.Scan(
&ro.UUID,
&ro.Path,
&ro.Size,
&ro.UpdatedAt,
)
if err != nil {
return nil, err
}
out = append(out, ro)
}
return out, nil
}
+141
View File
@@ -0,0 +1,141 @@
package store
type ZombieObject struct {
UUID string
CreatedAt int64
RevisionCount int
MaxBodyLength int
}
func (s *Store) ListZombieObjects(
graceSeconds int64,
) ([]ZombieObject, error) {
rows, err := s.DB.Query(`
SELECT
o.uuid,
o.created_at,
COUNT(r.uuid) AS revision_count,
COALESCE(MAX(LENGTH(r.body)), 0) AS max_body_length
FROM objects o
LEFT JOIN paths p
ON p.object_uuid = o.uuid
LEFT JOIN revisions r
ON r.object_uuid = o.uuid
WHERE p.object_uuid IS NULL
AND o.created_at < strftime('%s','now') - ?
GROUP BY
o.uuid,
o.created_at
HAVING
revision_count = 0
OR max_body_length = 0
ORDER BY
o.created_at ASC
`,
graceSeconds,
)
if err != nil {
return nil, err
}
defer rows.Close()
var out []ZombieObject
for rows.Next() {
var z ZombieObject
err := rows.Scan(
&z.UUID,
&z.CreatedAt,
&z.RevisionCount,
&z.MaxBodyLength,
)
if err != nil {
return nil, err
}
out = append(out, z)
}
return out, nil
}
func (s *Store) PurgeZombieObjects(
graceSeconds int64,
limit int,
) (int, error) {
zombies, err :=
s.ListZombieObjects(
graceSeconds,
)
if err != nil {
return 0, err
}
if limit > 0 &&
len(zombies) > limit {
zombies = zombies[:limit]
}
tx, err :=
s.DB.Begin()
if err != nil {
return 0, err
}
for _, z := range zombies {
_, err = tx.Exec(`
DELETE FROM tags
WHERE object_uuid = ?
`,
z.UUID,
)
if err != nil {
tx.Rollback()
return 0, err
}
_, err = tx.Exec(`
DELETE FROM revisions
WHERE object_uuid = ?
`,
z.UUID,
)
if err != nil {
tx.Rollback()
return 0, err
}
_, err = tx.Exec(`
DELETE FROM objects
WHERE uuid = ?
`,
z.UUID,
)
if err != nil {
tx.Rollback()
return 0, err
}
}
err = tx.Commit()
if err != nil {
return 0, err
}
return len(zombies), nil
}
+4
View File
@@ -5,6 +5,10 @@ body {
margin: 0; margin: 0;
} }
a {
color:lime;
}
.topbar { .topbar {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
+88 -27
View File
@@ -44,7 +44,7 @@ Draft
<main class="container"> <main class="container">
<section class="card"> <section>
<h1>Pages Wiki</h1> <h1>Pages Wiki</h1>
@@ -70,35 +70,70 @@ Create / Edit
</div> </div>
<p class="hint">
Examples:
</p>
<ul>
<li>/pageswiki/network/bgp</li>
<li>/notes/todo</li>
<li>/dc/cooling</li>
</ul>
</section> </section>
<section class="card"> <section>
<h2>Recent Objects</h2> <h2>Recent Objects</h2>
<ul class="object-list"> <table class="recent-table">
<thead>
<tr>
<th>Primary Link</th>
<th>Size</th>
<th>Updated</th>
<th>Object UUID</th>
</tr>
</thead>
<tbody>
{{ range .Objects }} {{ range .Objects }}
<li> <tr>
<a href="/e/{{ .UUID }}">
{{ .UUID }} <td>
{{ if .Path }}
<a href="{{ .Path }}">
{{ .Path }}
</a> </a>
</li>
{{ else }}
<span class="muted">
unlinked
</span>
{{ end }} {{ end }}
</ul> </td>
<td class="mono">
{{ formatBytes .Size }}
</td>
<td class="mono">
{{ formatUnix .UpdatedAt }}
</td>
<td class="mono muted">
<a href="/o/uuid:{{ .UUID }}">
{{ .UUID }}
</a>
</td>
</tr>
{{ end }}
</tbody>
</table>
</section> </section>
@@ -160,6 +195,14 @@ document
<style> <style>
main.container {
padding: 1.25rem;
}
section {
margin-bottom: 2rem;
}
.create-path-box { .create-path-box {
display: flex; display: flex;
gap: 0.5rem; gap: 0.5rem;
@@ -168,9 +211,9 @@ document
.create-path-box input { .create-path-box input {
flex: 1; flex: 1;
background: #111; background: #0b0b0b;
color: #eee; color: #eee;
border: 1px solid #333; border: 1px solid #222;
padding: 0.6rem; padding: 0.6rem;
font-family: monospace; font-family: monospace;
} }
@@ -179,18 +222,36 @@ document
padding: 0.6rem 1rem; padding: 0.6rem 1rem;
} }
.hint { .recent-table {
margin-top: 1rem; width: 100%;
border-collapse: collapse;
}
.recent-table th {
text-align: left;
font-weight: normal;
color: #888; color: #888;
border-bottom: 1px solid rgba(255,255,255,0.08);
padding: 0.45rem 0.35rem;
} }
.object-list { .recent-table td {
margin: 0; border-bottom: 1px solid rgba(255,255,255,0.035);
padding-left: 1.2rem; padding: 0.38rem 0.35rem;
} }
.object-list li { .recent-table tr:hover {
margin: 0.2rem 0; background: rgba(255,255,255,0.025);
}
.mono {
font-family:
"JetBrains Mono",
monospace;
}
.muted {
color: #777;
} }
</style> </style>
+79
View File
@@ -0,0 +1,79 @@
{{ define "object_editor.gohtml" }}
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>{{ .Title }}</title>
<link rel="stylesheet" href="/o/path:/system/static/css/main.css">
<link rel="stylesheet" href="/o/path:/system/static/css/modes.css">
</head>
<body class="mode-editor">
<header class="topbar">
<div class="brand">
<a href="/">Pages Wiki</a>
</div>
<nav>
<a href="/o/{{ .ObjectURI }}">View</a>
<a href="/o/r/{{ .ObjectURI }}">History</a>
<a href="/l?object_uuid={{ .ObjectUUID }}">Link</a>
</nav>
</header>
<main class="container">
<section>
<div class="path-label">
Object:
<code>{{ .ObjectURI }}</code>
</div>
<div class="editor-toolbar">
<button
type="button"
onclick="PagesEditor.saveNow()"
>
Save
</button>
</div>
<div class="editor-grid">
<textarea
id="editor"
class="editor"
>{{ .Body }}</textarea>
<article
id="preview"
class="preview"
></article>
</div>
<input
type="hidden"
id="object-uuid"
value="{{ .ObjectUUID }}"
>
<input
type="hidden"
id="edit-type"
value="html"
>
</section>
</main>
<script src="/o/path:/system/static/js/editor.js"></script>
</body>
</html>
{{ end }}
+71
View File
@@ -0,0 +1,71 @@
{{ define "object_view.gohtml" }}
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>{{ .Title }}</title>
<link rel="stylesheet" href="/o/path:/system/static/css/main.css">
<link rel="stylesheet" href="/o/path:/system/static/css/modes.css">
</head>
<body>
<header class="topbar">
<div class="brand">
<a href="/">Pages Wiki</a>
</div>
<nav>
<a href="/o/e/{{ .ObjectURI }}">Edit</a>
<a href="/o/r/{{ .ObjectURI }}">History</a>
<a href="/l?object_uuid={{ .ObjectUUID }}">Link</a>
<a href="#" onclick="deleteObject('{{ .ObjectUUID }}'); return false;">Delete</a>
</nav>
</header>
<main class="container">
<section>
<div class="path-label">
Object:
<code>{{ .ObjectURI }}</code>
</div>
<article class="page-html">
{{ .RenderedHTML }}
</article>
</section>
</main>
<script>
async function deleteObject(uuid) {
if (!confirm("Delete object?\n\n" + uuid)) {
return
}
const res = await fetch(
"/_/api/v1/object/delete",
{
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
object_uuid: uuid,
}),
},
)
if (!res.ok) {
alert("delete failed")
return
}
location.href = "/"
}
</script>
</body>
</html>
{{ end }}