use bound-fn when appropriate to convey bindings

Author: Ramblurr

examples/plumbing_tls_alpn.clj

@@ -104,13 +104,13 @@
         executor (Executors/newVirtualThreadPerTaskExecutor)
         accept-thread
         (Thread.
-         (fn []
+         (bound-fn []
            (while @running
              (try
                (let [socket (.accept server-socket)]
                  (.submit executor
                           ^Callable
-                          (fn []
+                          (bound-fn []
                             (try
                               (let [^javax.net.ssl.SSLSocket ssl-socket (cast javax.net.ssl.SSLSocket socket)
                                     params (doto (SSLParameters.)

src/ol/clave/impl/http/impl.clj

@@ -231,10 +231,11 @@
 
 (defn then [x f]
   (if (instance? CompletableFuture x)
-    (.thenApply ^CompletableFuture x
-                ^Function (reify Function
-                            (apply [_ args]
-                              (f args))))
+    (let [bound-f (bound-fn* f)]
+      (.thenApply ^CompletableFuture x
+                  ^Function (reify Function
+                              (apply [_ args]
+                                (bound-f args)))))
     (f x)))
 
 (defn- apply-interceptors [init interceptors k]
@@ -363,22 +364,24 @@
                                              interceptors/default-interceptors)))]
           (if async
             (let [then-fn (:async-then req)
-                  catch-fn (:async-catch req)]
+                  catch-fn (:async-catch req)
+                  bound-then-fn (when then-fn (bound-fn* then-fn))
+                  bound-catch-fn (when catch-fn (bound-fn* catch-fn))]
               (cond-> ^CompletableFuture resp
                 then-fn (.thenApply
                          (reify Function
                            (apply [_ resp]
-                             (then-fn resp))))
+                             (bound-then-fn resp))))
                 catch-fn (.exceptionally
                           (reify Function
                             (apply [_ e]
                               (let [^Throwable e e
                                     cause (ex-cause e)]
-                                (catch-fn {:ex e
-                                           :ex-cause cause
-                                           :ex-data (ex-data (or cause e))
-                                           :ex-message (ex-message (or cause e))
-                                           :request req})))))))
+                                (bound-catch-fn {:ex e
+                                                 :ex-cause cause
+                                                 :ex-data (ex-data (or cause e))
+                                                 :ex-message (ex-message (or cause e))
+                                                 :request req})))))))
             resp)))))
 
 (defn request-with-lease
@@ -406,11 +409,12 @@
                           request-builder)
         request (.build request-builder)
         http-future (.sendAsync client request (HttpResponse$BodyHandlers/ofInputStream))
+        watcher-fn (bound-fn* (fn []
+                                (when (deref (lease/done-signal lease))
+                                  (.cancel http-future true))))
         watcher (CompletableFuture/runAsync
                  (reify Runnable
-                   (run [_]
-                     (when (deref (lease/done-signal lease))
-                       (.cancel http-future true))))
+                   (run [_] (watcher-fn)))
                  @shared-virtual-executor)]
     (try
       (let [response (.get http-future)]

src/ol/clave/storage/file.clj

@@ -265,7 +265,7 @@
 
 (defn- start-lock-freshener! [^Path filename]
   (Thread/startVirtualThread
-   (fn []
+   (bound-fn []
      (loop []
        (let [result (try
                       (Thread/sleep (long (.toMillis ^Duration lock-freshness-interval)))