Skip to content

Move mux cfg to draft object #27

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

Merged
RubaXa merged 1 commit into from
Oct 3, 2023
Merged

Move mux cfg to draft object #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 16 additions & 14 deletions draft.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
// APIService -
type APIService struct {
http.Handler
mux *http.ServeMux
config Config
routes map[string]apiServiceRoute
rootGroup *apiGroupEntry
Expand Down Expand Up @@ -164,10 +165,6 @@ func (api *APIService) GroupHR() {

// Handle -
func (api *APIService) Handle(endpoint EndpointAPI, handler http.Handler) {
api.HandleWithMux(http.DefaultServeMux, endpoint, handler)
}

func (api *APIService) HandleWithMux(mux *http.ServeMux, endpoint EndpointAPI, handler http.Handler) {
endpoint.InitEndpoint(endpoint)
pattern := endpoint.URL()

Expand All @@ -179,17 +176,17 @@ func (api *APIService) HandleWithMux(mux *http.ServeMux, endpoint EndpointAPI, h

if api.config.MockMode == MockEnable {
if isHTTPHandler(handler) {
mux.Handle(pattern, handler)
api.mux.Handle(pattern, handler)
} else if api.config.DevMode {
mux.Handle(pattern, api)
api.mux.Handle(pattern, api)
}
}

if api.config.DevMode {
mux.Handle("/godraft"+pattern, api)
mux.Handle("/godraft:doc"+pattern, api)
mux.Handle("/godraft:docs"+pattern, api)
mux.Handle("/godraft:scheme"+pattern, api)
api.mux.Handle("/godraft"+pattern, api)
api.mux.Handle("/godraft:doc"+pattern, api)
api.mux.Handle("/godraft:docs"+pattern, api)
api.mux.Handle("/godraft:scheme"+pattern, api)
}
}

Expand Down Expand Up @@ -223,8 +220,13 @@ func Create(cfg Config) *APIService {
}

func CreateWithMux(mux *http.ServeMux, cfg Config) *APIService {
if mux == nil {
mux = http.DefaultServeMux
}

root := createGroupEntry("G", "#root", "")
srv := &APIService{
mux: mux,
config: cfg,
rootGroup: root,
activeGroup: root,
Expand All @@ -241,10 +243,10 @@ func CreateWithMux(mux *http.ServeMux, cfg Config) *APIService {

if cfg.DevMode && !draftHandled {
draftHandled = true
mux.Handle("/godraft:doc/", srv)
mux.Handle("/godraft:docs/", srv)
mux.Handle("/godraft:scheme/", srv)
mux.Handle("/godraft:request/", srv)
srv.mux.Handle("/godraft:doc/", srv)
srv.mux.Handle("/godraft:docs/", srv)
srv.mux.Handle("/godraft:scheme/", srv)
srv.mux.Handle("/godraft:request/", srv)
}

return srv
Expand Down