Improve portal.runtime async error handling

Author: djblue

.clj-kondo/config.edn

@@ -5,6 +5,8 @@
  :lint-as
  {portal.async/let clojure.core/let
   portal.sync/let  clojure.core/let
+  portal.async/try clojure.core/try
+  portal.sync/try  clojure.core/try
   reagent.core/with-let              clojure.core/let
   portal.bench/simple-benchmark      clojure.core/let
   portal.runtime.macros/extend-type? clojure.core/extend-type}}

src/portal/async.cljc

@@ -1,20 +1,41 @@
 (ns ^:no-doc portal.async
-  (:refer-clojure :exclude [let promise])
+  (:refer-clojure :exclude [let try promise])
   #?(:portal (:import) :cljs (:require-macros portal.async)))
 
 (defmacro do [& body]
   (reduce
    (fn [chain form]
      `(.then ~chain
-             (fn [] (js/Promise.resolve ~form))))
-   `(js/Promise.resolve nil)
+             (fn [] (.resolve js/Promise ~form))))
+   `(.resolve js/Promise nil)
    body))
 
 (defmacro let [bindings & body]
   (->> (partition-all 2 bindings)
        reverse
        (reduce (fn [body [n v]]
-                 `(.then (js/Promise.resolve ~v)
+                 `(.then (.resolve js/Promise ~v)
                          (fn [~n] ~body)))
                `(portal.async/do ~@body))))
 
+(defmacro try [& body]
+  (reduce
+   (fn [chain form]
+     (cond
+       (and (coll? form) (= 'finally (first form)))
+       `(.finally ~chain
+                  (fn []
+                    (portal.async/do ~@(rest form))))
+
+       (and (coll? form) (= 'catch (first form)))
+       (clojure.core/let [[_ _type ex-binding & body] form]
+         `(.catch ~chain
+                  (fn [~ex-binding]
+                    (portal.async/do ~@body))))
+
+       :else
+       `(.then ~chain
+               (fn []
+                 (.resolve js/Promise ~form)))))
+   `(.resolve js/Promise nil)
+   body))

src/portal/runtime.cljc

@@ -380,21 +380,22 @@
 
 (defn invoke [{:keys [f args]} done]
   (let [f (if (symbol? f) (get-function f) f)]
-    (try
+    (a/try
       (a/let [return (apply f args)]
         (done (assoc (source-info f) :return return)))
       (catch #?(:clj Exception :cljr Exception :cljs js/Error) e
         (done (assoc
                (source-info f)
                :error
                (-> (ex-info
-                    "invoke exception"
-                    {:function f
-                     :args     args
-                     :found?   (boolean (get-function f))}
+                    (ex-message e)
+                    {::function f
+                     ::args     args
+                     ::found?   (some? f)
+                     ::data     (ex-data e)}
                     e)
                    datafy
-                   (assoc :runtime #?(:bb :bb :clj :clj :cljs :cljs :cljr :cljr)))))))))
+                   (assoc :runtime (runtime)))))))))
 
 (def ops {:portal.rpc/invoke #'invoke})
 

src/portal/sync.cljc

@@ -1,5 +1,7 @@
 (ns ^:no-doc portal.sync
-  (:refer-clojure :exclude [let]))
+  (:refer-clojure :exclude [let try]))
 
 (defmacro let [bindings & body]
   `(clojure.core/let ~bindings ~@body))
+
+(defmacro try [& body] `(~'try ~@body))