Skip to content

livereload.js が使うポートを http serve が使う TCP ポートを併用するように修正 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tamx wants to merge 5 commits into
base: master
Choose a base branch
from
Open

livereload.js が使うポートを http serve が使う TCP ポートを併用するように修正 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2898e32
Merged the livereload port to the http server port.
Dec 16, 2025
b0ea28e
Fixed the bugs for merging http server TCP ports.
Dec 17, 2025
18c8447
made the option to merge the livereload port with the http port.
Dec 20, 2025
d702d63
Changed the deprecated packages.
Dec 27, 2025
c54e888
Implemented the livereload default port as 35729.
Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/mattn/mkup

go 1.17
go 1.24.0

toolchain go1.24.9

require (
github.com/omeid/livereload v0.0.0-20180903043807-18d58b752b26
Expand All @@ -11,6 +13,6 @@ require (

require (
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
github.com/gorilla/websocket v1.5.3 // indirect
golang.org/x/sys v0.39.0 // indirect
)
4 changes: 4 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWo
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/omeid/livereload v0.0.0-20180903043807-18d58b752b26 h1:UgrpxortNaAijXWp2dVezOb/2lVNtGlaI/y6SAosQds=
github.com/omeid/livereload v0.0.0-20180903043807-18d58b752b26/go.mod h1:zwZKGxj+J+XPXOcKyE1ByX0oRLb+iWZwy4wO7W9LHTM=
github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
Expand All @@ -11,5 +13,7 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
54 changes: 31 additions & 23 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"embed"
"flag"
"fmt"
"io/ioutil"
"log"
"mime"
"net/http"
Expand Down Expand Up @@ -37,9 +36,10 @@ const (
<link rel="stylesheet" href="/_assets/github-dark.css" media="all">
<script src="/_assets/highlight.min.js"></script>
<script>hljs.highlightAll();</script>
<script>document.write('<script src="http://'
+ (location.host || 'localhost').split(':')[0]
+ ':35729/livereload.js?snipver=1"></'
<script>document.write('<script src="'
+ location.protocol + '//'
+ (location.host || 'localhost')
+ '%s/_assets/livereload.js?snipver=1"></'
+ 'script>')</script>
</head>
<body>
Expand All @@ -56,7 +56,8 @@ const (
)

var (
addr = flag.String("http", ":8000", "HTTP service address (e.g., ':8000')")
addr = flag.String("http", ":8000", "HTTP service address (e.g., ':8000')")
usehttpport = flag.Bool("usehttpport", false, "use livereload port with the same http port")
)

//go:embed _assets
Expand All @@ -66,26 +67,14 @@ func main() {
runtime.GOMAXPROCS(runtime.NumCPU())
flag.Parse()
cwd, _ := os.Getwd()
livereloadPortAddr := ":35729"
if *usehttpport == true {
livereloadPortAddr = ""
}

lrs := livereload.New("mkup")
defer lrs.Close()

go func() {
mux := http.NewServeMux()
mux.HandleFunc("/livereload.js", func(w http.ResponseWriter, r *http.Request) {
b, err := local.ReadFile("_assets/livereload.js")
if err != nil {
http.Error(w, "404 page not found", 404)
return
}
w.Header().Set("Content-Type", "application/javascript")
w.Write(b)
return
})
mux.Handle("/", lrs)
log.Fatal(http.ListenAndServe(":35729", mux))
}()

fsw, err := fsnotify.NewWatcher()
if err != nil {
panic(err)
Expand Down Expand Up @@ -139,7 +128,7 @@ func main() {
fs.ServeHTTP(w, r)
return
}
b, err := ioutil.ReadFile(filepath.Join(cwd, name))
b, err := os.ReadFile(filepath.Join(cwd, name))
if err != nil {
if os.IsNotExist(err) {
http.Error(w, "404 page not found", 404)
Expand All @@ -155,8 +144,13 @@ func main() {
blackfriday.WithRenderer(renderer),
blackfriday.WithExtensions(extensions),
)
w.Write([]byte(fmt.Sprintf(template, name, string(b))))
w.Write([]byte(fmt.Sprintf(template, name, livereloadPortAddr, string(b))))
})
http.Handle("/livereload",
http.HandlerFunc(
func(w http.ResponseWriter, r *http.Request) {
lrs.ServeHTTP(w, r)
}))

server := &http.Server{
Addr: *addr,
Expand All @@ -166,6 +160,20 @@ func main() {
}),
}

if livereloadPortAddr != "" {
go func() {
server := &http.Server{
Addr: livereloadPortAddr,
Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
log.Printf("%s %s %s", r.RemoteAddr, r.Method, r.URL.RequestURI())
http.DefaultServeMux.ServeHTTP(w, r)
}),
}
fmt.Fprintln(os.Stderr, "Listening at "+livereloadPortAddr)
server.ListenAndServe()
}()
}

fmt.Fprintln(os.Stderr, "Listening at "+*addr)
log.Fatal(server.ListenAndServe())
}