[mod] #424 reintroduce jetty9 support

README.md

@@ -21,8 +21,6 @@
 
 > **Sen-te** (先手) is a Japanese [Go] term used to describe a play with such an overwhelming follow-up that it demands an immediate response, leaving its player with the initiative.
 
-(I'd also recommend checking out James Henderson's [Chord] and Kevin Lynagh's [jetty7-websockets-async] as possible alternatives!)
-
 ## Features
  * **Bidirectional a/sync comms** over both **WebSockets** and **Ajax** (auto-fallback)
  * **It just works**: auto keep-alives, buffering, protocol selection, reconnects

example-project/project.clj

@@ -1,4 +1,4 @@
-(defproject com.taoensso.examples/sente "1.17.0"
+(defproject com.taoensso.examples/sente "1.18.0-SNAPSHOT"
  :description "Sente, reference web-app example project"
  :url "https://github.com/ptaoussanis/sente"
  :license {:name "Eclipse Public License"
@@ -15,7 +15,7 @@
  [org.clojure/core.async "1.6.673"]
  [nrepl "1.0.0"] ; Optional, for Cider
 
- [com.taoensso/sente "1.17.0"] ; <--- Sente
+ [com.taoensso/sente "1.18.0-SNAPSHOT"] ; <--- Sente
  [com.taoensso/timbre "6.1.0"]
 
  ;;; TODO Choose (uncomment) a supported web server -----------------------
@@ -25,6 +25,8 @@
  ;; [nginx-clojure/nginx-clojure-embed "x.y.z"] ; Needs v0.4.2+
  ;; [aleph "x.y.z"]
  ;; [info.sunng/ring-jetty9-adapter "x.y.z"]
+ [info.sunng/ring-jetty9-adapter "0.18.5"]
+ [commons-io/commons-io "2.11.0"]
  ;; -----------------------------------------------------------------------
 
  [ring "1.10.0"]

example-project/src/example/server.clj

@@ -15,8 +15,8 @@
  [taoensso.sente :as sente]
 
  ;;; TODO Choose (uncomment) a supported web server + adapter -------------
- [org.httpkit.server :as http-kit]
- [taoensso.sente.server-adapters.http-kit :refer [get-sch-adapter]]
+ ;;[org.httpkit.server :as http-kit]
+ ;;[taoensso.sente.server-adapters.http-kit :refer [get-sch-adapter]]
 
  ;; [immutant.web :as immutant]
  ;; [taoensso.sente.server-adapters.immutant :refer [get-sch-adapter]]
@@ -27,8 +27,8 @@
  ;; [aleph.http :as aleph]
  ;; [taoensso.sente.server-adapters.aleph :refer [get-sch-adapter]]
 
- ;; [ring.adapter.jetty9.websocket :as jetty9.websocket]
- ;; [taoensso.sente.server-adapters.jetty9 :refer [get-sch-adapter]]
+ [ring.adapter.jetty9 :as jetty]
+ [taoensso.sente.server-adapters.community.jetty9 :refer [get-sch-adapter]]
  ;;
  ;; See https://gist.github.com/wavejumper/40c4cbb21d67e4415e20685710b68ea0
  ;; for full example using Jetty 9
@@ -245,13 +245,13 @@
 (defn stop-web-server! [] (when-let [stop-fn @web-server_] (stop-fn)))
 (defn start-web-server! [& [port]]
  (stop-web-server!)
- (let [port (or port 0) ; 0 => Choose any available port
+ (let [port (or port 3333) ; 0 => Choose any available port
  ring-handler (var main-ring-handler)
 
  [port stop-fn]
  ;;; TODO Choose (uncomment) a supported web server ------------------
- (let [stop-fn (http-kit/run-server ring-handler {:port port})]
- [(:local-port (meta stop-fn)) (fn [] (stop-fn :timeout 100))])
+ ;;(let [stop-fn (http-kit/run-server ring-handler {:port port})]
+ ;; [(:local-port (meta stop-fn)) (fn [] (stop-fn :timeout 100))]]
  ;;
  ;; (let [server (immutant/run ring-handler :port port)]
  ;; [(:port server) (fn [] (immutant/stop server))])
@@ -265,6 +265,11 @@
  ;; ;; (aleph.netty/wait-for-close server)
  ;; [(aleph.netty/port server)
  ;; (fn [] (.close ^java.io.Closeable server) (deliver p nil))])
+
+ (let [server (jetty/run-jetty ring-handler {:port port
+ :async? true
+ :join? false})]
+ [port (fn [] (jetty/stop-server server))])
  ;; ------------------------------------------------------------------
 
  uri (format "http://localhost:%s/" port)]
@@ -283,4 +288,5 @@
 
 (comment
  (start!) ; Eval this at REPL to start server via REPL
- (test-fast-server>user-pushes))
+ (test-fast-server>user-pushes)
+ (stop!))

project.clj

@@ -1,4 +1,4 @@
-(defproject com.taoensso/sente "1.17.0"
+(defproject com.taoensso/sente "1.18.0-SNAPSHOT"
  :author "Peter Taoussanis <https://www.taoensso.com>"
  :description "Realtime web comms for Clojure/Script"
  :url "https://github.com/ptaoussanis/sente"

src/taoensso/sente.cljc

@@ -91,9 +91,7 @@
  #?(:clj (:import [org.java_websocket.client WebSocketClient])))
 
 (enc/assert-min-encore-version [3 49 0])
-
-(def sente-version "Useful for identifying client/server mismatch"
- [1 11 0])
+(def sente-version "Useful for identifying client/server mismatch" [1 18 0])
 
 #?(:cljs (def ^:private node-target? (= *target* "nodejs")))
 

src/taoensso/sente/server_adapters/community/jetty9.clj

@@ -0,0 +1,49 @@
+(ns taoensso.sente.server-adapters.community.jetty9
+ "Sente adapter for ring-jetty9-adapter,
+ (https://github.com/sunng87/ring-jetty9-adapter).
+
+ Note that ring-jetty9-adapter defines WebSocket routes/handlers
+ separately from regular Ring routes/handlers [1,2].
+
+ This can make it tricky to set up stateful middleware correctly
+ (for example as you may want to do for CSRF protection).
+
+ See [3] for a full example.
+
+ [1] https://github.com/sunng87/ring-jetty9-adapter/blob/master/examples/rj9a/websocket.clj
+ [2] https://github.com/sunng87/ring-jetty9-adapter/issues/41#issuecomment-630206233
+ [3] https://gist.github.com/wavejumper/40c4cbb21d67e4415e20685710b68ea0"
+
+ {:author "Thomas Crowley (@wavejumper), modified for async jetty by Timo Kramer"}
+ (:require [ring.adapter.jetty9.websocket :as jetty9.websocket]
+ [taoensso.sente.interfaces :as i]))
+
+(defn- ajax-cbs [sch]
+ {:write-failed (fn [_throwable] (jetty9.websocket/close! sch))
+ :write-success (fn [ ] (jetty9.websocket/close! sch))})
+
+(extend-type org.eclipse.jetty.websocket.api.WebSocketAdapter
+ i/IServerChan
+ (sch-open? [sch] (jetty9.websocket/connected? sch))
+ (sch-close! [sch] (jetty9.websocket/close! sch))
+ (sch-send! [sch websocket? msg]
+ (if websocket?
+ (jetty9.websocket/send! sch msg)
+ (jetty9.websocket/send! sch msg (ajax-cbs sch)))))
+
+(defn- server-ch-resp
+ [websocket? {:keys [on-open on-close on-msg on-error ring-async-resp-fn ring-async-raise-fn]}]
+ {:on-connect (fn [sch ] (on-open sch websocket?))
+ :on-text (fn [sch msg ] (on-msg sch websocket? msg))
+ :on-error (fn [sch error ] (on-error sch websocket? error))
+ :on-close (fn [sch status _] (on-close sch websocket? status))
+ :ring-async-resp-fn ring-async-resp-fn
+ :ring-async-raise-fn ring-async-raise-fn})
+
+(deftype JettyServerChanAdapter []
+ i/IServerChanAdapter
+ (ring-req->server-ch-resp [_ req callbacks-map]
+ (jetty9.websocket/ws-upgrade-response
+ (server-ch-resp (jetty9.websocket/ws-upgrade-request? req) callbacks-map))))
+
+(defn get-sch-adapter [] (JettyServerChanAdapter.))