fix: correct check for websocket ping implementation

sunng87 · Apr 18, 2024 · 2a260c5 · 2a260c5
1 parent 3e38958
commit 2a260c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/examples/rj9a/websocket.clj b/examples/rj9a/websocket.clj
@@ -15,6 +15,9 @@
                                            (tap> [:ws :close status-code reason]))
                                :on-pong (fn [socket data]
                                           (tap> [:ws :pong]))
+                               :on-ping (fn [socket data]
+                                          (tap> [:ws :ping])
+                                          (ringws/pong socket))
                                :on-error (fn [socket error]
                                            (.printStackTrace error)
                                            (tap> [:ws :error error]))}

diff --git a/project.clj b/project.clj
@@ -34,7 +34,8 @@
                              :resource-paths ["dev-resources/"]
                              :main ^:skip-aot rj9a.http3}
              :example-websocket {:source-paths ["examples/"]
-                                 :dependencies [[org.eclipse.jetty/jetty-slf4j-impl ~jetty-version]]
+                                 :dependencies [[org.eclipse.jetty/jetty-slf4j-impl ~jetty-version]
+                                                [ring/ring-core "1.12.1"]]
                                  :main ^:skip-aot rj9a.websocket}
              :example-http {:source-paths ["examples/"]
                             :dependencies [[org.eclipse.jetty/jetty-slf4j-impl ~jetty-version]]

diff --git a/src/ring/adapter/jetty9/websocket.clj b/src/ring/adapter/jetty9/websocket.clj
@@ -60,7 +60,7 @@
       (^void onWebSocketBinary [this ^ByteBuffer payload ^Callback cb]
         (ring-ws/on-message listener @session payload))
       (^void onWebSocketPing [this ^ByteBuffer bytebuffer]
-        (when (extends? ring-ws/PingListener listener)
+        (when (satisfies? ring-ws/PingListener listener)
           (ring-ws/on-ping listener @session bytebuffer)))
       (^void onWebSocketPong [this ^ByteBuffer bytebuffer]
         (ring-ws/on-pong listener @session bytebuffer)))))