From 05013dd356f82989a5a7b3caaa83e44505257781 Mon Sep 17 00:00:00 2001 From: Timo Kramer Date: Tue, 21 Mar 2023 19:18:45 +0100 Subject: [PATCH] fixup! [mod] [#424] reintroduce fixed `jetty9-ring-adapter` support --- example-project/src/example/server.clj | 5 +---- .../sente/server_adapters/community/jetty9.clj | 12 ++++++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/example-project/src/example/server.clj b/example-project/src/example/server.clj index 69ea591..3609789 100644 --- a/example-project/src/example/server.clj +++ b/example-project/src/example/server.clj @@ -28,7 +28,6 @@ ;; [taoensso.sente.server-adapters.aleph :refer [get-sch-adapter]] [ring.adapter.jetty9 :as jetty] - [ring.adapter.jetty9.websocket :as jetty9.websocket] [taoensso.sente.server-adapters.jetty9 :refer [get-sch-adapter]] ;; ;; See https://gist.github.com/wavejumper/40c4cbb21d67e4415e20685710b68ea0 @@ -147,9 +146,7 @@ You're also STRONGLY recommended to use `ring.middleware.anti-forgery` or something similar." (ring.middleware.defaults/wrap-defaults - ring-routes (-> ring.middleware.defaults/site-defaults - (assoc-in [:params :multipart] false) - (dissoc :security)))) + ring-routes ring.middleware.defaults/site-defaults)) ;;;; Some server>user async push examples diff --git a/src/taoensso/sente/server_adapters/community/jetty9.clj b/src/taoensso/sente/server_adapters/community/jetty9.clj index 18ca25a..a3111d1 100644 --- a/src/taoensso/sente/server_adapters/community/jetty9.clj +++ b/src/taoensso/sente/server_adapters/community/jetty9.clj @@ -14,7 +14,7 @@ [2] https://github.com/sunng87/ring-jetty9-adapter/issues/41#issuecomment-630206233 [3] https://gist.github.com/wavejumper/40c4cbb21d67e4415e20685710b68ea0" - {:author "Thomas Crowley (@wavejumper)"} + {:author "Thomas Crowley (@wavejumper), modified for async jetty by Timo Kramer"} (:require [clojure.string :as str] [ring.adapter.jetty9.websocket :as jetty9.websocket] [taoensso.sente.interfaces :as i])) @@ -34,11 +34,11 @@ (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 + {: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 []