@@ -12,14 +12,10 @@ import (
1212 "strings"
1313 "time"
1414
15- "github.com/didip/tollbooth/v7"
16- "github.com/didip/tollbooth_chi"
17- "github.com/go-chi/chi/v5"
18- "github.com/go-chi/chi/v5/middleware"
19- "github.com/go-chi/render"
2015 log "github.com/go-pkgz/lgr"
2116 "github.com/go-pkgz/rest"
2217 "github.com/go-pkgz/rest/logger"
18+ "github.com/go-pkgz/routegroup"
2319 "go.mongodb.org/mongo-driver/bson/primitive"
2420
2521 "github.com/ukeeper/ukeeper-redabilty/backend/datastore"
@@ -67,42 +63,36 @@ func (s *Server) Run(ctx context.Context, address string, port int, frontendDir
6763 log .Printf ("[WARN] http server terminated, %s" , httpServer .ListenAndServe ())
6864}
6965
70- func (s * Server ) routes (frontendDir string ) chi. Router {
71- router := chi . NewRouter ( )
66+ func (s * Server ) routes (frontendDir string ) http. Handler {
67+ router := routegroup . New ( http . NewServeMux () )
7268
73- router .Use (middleware . RequestID , middleware . RealIP , rest .Recoverer (log .Default ()))
74- router .Use (middleware . Throttle ( 1000 ), middleware . Timeout ( 60 * time . Second ) )
69+ router .Use (rest .Recoverer (log .Default ()))
70+ router .Use (rest . RealIP )
7571 router .Use (rest .AppInfo ("ureadability" , "Umputun" , s .Version ), rest .Ping )
76- router .Use (tollbooth_chi .LimitHandler (tollbooth .NewLimiter (50 , nil )))
77-
72+ router .Use (rest .Throttle (50 ))
7873 router .Use (logger .New (logger .Log (log .Default ()), logger .WithBody , logger .Prefix ("[INFO]" )).Handler )
7974
80- router .Route ("/api" , func (r chi.Router ) {
81- r .Get ("/content/v1/parser" , s .extractArticleEmulateReadability )
82- r .Post ("/extract" , s .extractArticle )
83- r .Post ("/auth" , s .authFake )
84-
85- r .Group (func (protected chi.Router ) {
86- protected .Use (basicAuth ("ureadability" , s .Credentials ))
87- protected .Post ("/rule" , s .saveRule )
88- protected .Post ("/toggle-rule/{id}" , s .toggleRule )
89- protected .Post ("/preview" , s .handlePreview )
75+ router .Route (func (api * routegroup.Bundle ) {
76+ api .Mount ("/api" ).Route (func (api * routegroup.Bundle ) {
77+ api .HandleFunc ("GET /content/v1/parser" , s .extractArticleEmulateReadability )
78+ api .HandleFunc ("POST /extract" , s .extractArticle )
79+ api .HandleFunc ("POST /auth" , s .authFake )
80+
81+ // add protected group with its own set of middlewares
82+ protectedGroup := api .Group ()
83+ protectedGroup .Use (basicAuth ("ureadability" , s .Credentials ))
84+ protectedGroup .HandleFunc ("POST /rule" , s .saveRule )
85+ protectedGroup .HandleFunc ("POST /toggle-rule/{id}" , s .toggleRule )
86+ protectedGroup .HandleFunc ("POST /preview" , s .handlePreview )
9087 })
9188 })
9289
93- router .Get ( " /"s .handleIndex )
94- router .Get ( " /add/"s .handleAdd )
95- router .Get ( " /edit/{id}"s .handleEdit )
90+ router .HandleFunc ( "GET /"s .handleIndex )
91+ router .HandleFunc ( "GET /add/"s .handleAdd )
92+ router .HandleFunc ( "GET /edit/{id}"s .handleEdit )
9693
9794 _ = os .Mkdir (filepath .Join (frontendDir , "static" ), 0o700 )
98- fs , err := rest .NewFileServer ("/" , filepath .Join (frontendDir , "static" ), rest .FsOptSPA )
99- if err != nil {
100- log .Printf ("[ERROR] unable to create file server, %v" , err )
101- return nil
102- }
103- router .Get ("/*" , func (w http.ResponseWriter , r * http.Request ) {
104- fs .ServeHTTP (w , r )
105- })
95+ router .HandleFiles ("/" , http .Dir (filepath .Join (frontendDir , "static" )))
10696 return router
10797}
10898
@@ -140,7 +130,7 @@ func (s *Server) handleAdd(w http.ResponseWriter, _ *http.Request) {
140130}
141131
142132func (s * Server ) handleEdit (w http.ResponseWriter , r * http.Request ) {
143- id := getBid (chi . URLParam ( r , "id" ))
133+ id := getBid (r . PathValue ( "id" ))
144134 rule , found := s .Readability .Rules .GetByID (r .Context (), id )
145135 if ! found {
146136 http .Error (w , "Rule not found" , http .StatusNotFound )
@@ -163,59 +153,52 @@ func (s *Server) handleEdit(w http.ResponseWriter, r *http.Request) {
163153
164154func (s * Server ) extractArticle (w http.ResponseWriter , r * http.Request ) {
165155 artRequest := extractor.Response {}
166- if err := render .DecodeJSON (r .Body , & artRequest ); err != nil {
167- render .Status (r , http .StatusInternalServerError )
168- render .JSON (w , r , JSON {"error" : err .Error ()})
156+ if err := rest .DecodeJSON (r , & artRequest ); err != nil {
157+ rest .SendErrorJSON (w , r , log .Default (), http .StatusInternalServerError , err , "can't parse request" )
169158 return
170159 }
171160
172161 if artRequest .URL == "" {
173- render .Status (r , http .StatusBadRequest )
174- render .JSON (w , r , JSON {"error" : "url parameter is required" })
162+ rest .SendErrorJSON (w , r , log .Default (), http .StatusBadRequest , nil , "url parameter is required" )
175163 return
176164 }
177165
178166 res , err := s .Readability .Extract (r .Context (), artRequest .URL )
179167 if err != nil {
180- render .Status (r , http .StatusBadRequest )
181- render .JSON (w , r , JSON {"error" : err .Error ()})
168+ rest .SendErrorJSON (w , r , log .Default (), http .StatusBadRequest , err , "can't extract content" )
182169 return
183170 }
184171
185- render . JSON ( w , r , & res )
172+ rest . RenderJSON ( w , & res )
186173}
187174
188175// extractArticleEmulateReadability emulates readability API parse - https://www.readability.com/api/content/v1/parser?token=%s&url=%s
189176// if token is not set for application, it won't be checked
190177func (s * Server ) extractArticleEmulateReadability (w http.ResponseWriter , r * http.Request ) {
191178 token := r .URL .Query ().Get ("token" )
192179 if s .Token != "" && token == "" {
193- render .Status (r , http .StatusExpectationFailed )
194- render .JSON (w , r , JSON {"error" : "no token passed" })
180+ rest .SendErrorJSON (w , r , log .Default (), http .StatusExpectationFailed , nil , "no token passed" )
195181 return
196182 }
197183
198184 if s .Token != "" && s .Token != token {
199- render .Status (r , http .StatusUnauthorized )
200- render .JSON (w , r , JSON {"error" : "wrong token passed" })
185+ rest .SendErrorJSON (w , r , log .Default (), http .StatusUnauthorized , nil , "wrong token passed" )
201186 return
202187 }
203188
204189 extractURL := r .URL .Query ().Get ("url" )
205190 if extractURL == "" {
206- render .Status (r , http .StatusExpectationFailed )
207- render .JSON (w , r , JSON {"error" : "no url passed" })
191+ rest .SendErrorJSON (w , r , log .Default (), http .StatusExpectationFailed , nil , "no url passed" )
208192 return
209193 }
210194
211195 res , err := s .Readability .Extract (r .Context (), extractURL )
212196 if err != nil {
213- render .Status (r , http .StatusBadRequest )
214- render .JSON (w , r , JSON {"error" : err .Error ()})
197+ rest .SendErrorJSON (w , r , log .Default (), http .StatusBadRequest , err , "can't extract content" )
215198 return
216199 }
217200
218- render . JSON ( w , r , & res )
201+ rest . RenderJSON ( w , & res )
219202}
220203
221204// generates previews for the provided test URLs
@@ -322,11 +305,11 @@ func (s *Server) saveRule(w http.ResponseWriter, r *http.Request) {
322305 }
323306
324307 w .Header ().Set ("HX-Redirect" , "/" )
325- render . JSON ( w , r , & srule )
308+ rest . RenderJSON ( w , & srule )
326309}
327310
328311func (s * Server ) toggleRule (w http.ResponseWriter , r * http.Request ) {
329- id := getBid (chi . URLParam ( r , "id" ))
312+ id := getBid (r . PathValue ( "id" ))
330313 rule , found := s .Readability .Rules .GetByID (r .Context (), id )
331314 if ! found {
332315 log .Printf ("[WARN] rule not found for id: %s" , id .Hex ())
@@ -356,9 +339,9 @@ func (s *Server) toggleRule(w http.ResponseWriter, r *http.Request) {
356339}
357340
358341// authFake just a dummy post request used for external check for protected resource
359- func (s * Server ) authFake (w http.ResponseWriter , r * http.Request ) {
342+ func (s * Server ) authFake (w http.ResponseWriter , _ * http.Request ) {
360343 t := time .Now ()
361- render . JSON ( w , r , JSON {"pong" : t .Format ("20060102150405" )})
344+ rest . RenderJSON ( w , JSON {"pong" : t .Format ("20060102150405" )})
362345}
363346
364347func getBid (id string ) primitive.ObjectID {
0 commit comments