Skip to content

Move to reitit router from compojure #16

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
benfb wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Move to reitit router from compojure #16

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
;;;;
;;;; gorilla-repl is licenced to you under the MIT licence. See the file LICENCE.txt for full details.

(defproject org.clojars.benfb/gorilla-repl "0.7.0"
(defproject org.clojars.benfb/gorilla-repl "0.7.1-SNAPSHOT"
:description "A rich REPL for Clojure in the notebook style."
:url "https://github.com/benfb/gorilla-repl"
:license {:name "MIT"}
:dependencies ^:replace [[org.clojure/clojure "1.10.1"]
[http-kit "2.4.0-alpha6" :exclusions [ring/ring-core]]
[http-kit "2.4.0-alpha6"]
[ring/ring-json "0.5.0" :exclusions [org.clojure/clojure]]
[cheshire "5.9.0"]
[compojure "1.6.1" :exclusions [ring/ring-core ring/ring-json]]
[metosin/reitit "0.5.2"]
[gorilla-renderable "2.0.0"]
[gorilla-plot "0.1.4" :exclusions [org.clojure/clojure]]
[grimradical/clj-semver "0.2.0" :exclusions [org.clojure/clojure]]
Expand Down
44 changes: 24 additions & 20 deletions src/gorilla_repl/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,32 @@
;;;; gorilla-repl is licenced to you under the MIT licence. See the file LICENCE.txt for full details.

(ns gorilla-repl.core
(:require [compojure.core :refer :all]
[compojure.route :as route]
[org.httpkit.server :as server]
[gorilla-repl.nrepl :as nrepl]
[gorilla-repl.websocket-relay :as ws-relay]
[gorilla-repl.renderer :as renderer] ;; this is needed to bring the render implementations into scope
[gorilla-repl.version :as version]
[gorilla-repl.handle :as handle]
[clojure.set :as set]
[clojure.java.io :as io])
(:require
[org.httpkit.server :as server]
[gorilla-repl.nrepl :as nrepl]
[gorilla-repl.websocket-relay :as ws-relay]
[gorilla-repl.renderer :as renderer] ;; this is needed to bring the render implementations into scope
[gorilla-repl.version :as version]
[gorilla-repl.handle :as handle]
[clojure.set :as set]
[clojure.java.io :as io]
[reitit.ring :as ring])
(:gen-class))

;; the combined routes - we serve up everything in the "public" directory of resources under "/".
;; The REPL traffic is handled in the websocket-transport ns.
(defroutes app-routes
(GET "/load" [] (handle/wrap-api-handler handle/load-worksheet))
(POST "/save" [] (handle/wrap-api-handler handle/save))
(GET "/gorilla-files" [] (handle/wrap-api-handler handle/gorilla-files))
(GET "/config" [] (handle/wrap-api-handler handle/config))
(GET "/repl" [] ws-relay/ring-handler)
(route/resources "/" {:root "gorilla-repl-client"})
(route/files "/project-files" {:root "."}))
(def router
(ring/router
[["/load" {:get (handle/wrap-api-handler handle/load-worksheet)}]
["/save" {:post (handle/wrap-api-handler handle/save)}]
["/gorilla-files" {:get (handle/wrap-api-handler handle/gorilla-files)}]
["/config" {:get (handle/wrap-api-handler handle/config)}]
["/repl" {:get ws-relay/ring-handler}]]))

(def reitit-app (ring/ring-handler router
(ring/routes
(ring/create-resource-handler
{:path "/" :root "gorilla-repl-client"}))))

(defn run-gorilla-server
[conf]
Expand All @@ -47,11 +50,12 @@
(handle/set-config :keymap keymap)
;; check for updates
(if phone-home
(version/check-for-update version)) ;; runs asynchronously)
(version/check-for-update version)
nil) ;; runs asynchronously)
;; first startup nREPL
(nrepl/start-and-connect nrepl-requested-port nrepl-port-file)
;; and then the webserver
(let [s (server/run-server #'app-routes {:port webapp-requested-port :join? false :ip ip :max-body 500000000})
(let [s (server/run-server #'reitit-app {:port webapp-requested-port :join? false :ip ip :max-body 500000000})
webapp-port (:local-port (meta s))]
(spit (doto gorilla-port-file .deleteOnExit) webapp-port)
(println (str "Running at http://" ip ":" webapp-port "/worksheet.html ."))
Expand Down