verify that exception data is serializable

alexnixon · Apr 26, 2018 · 9a91b8b · 9a91b8b
1 parent 0136c9a
commit 9a91b8b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/figwheel-core/src/figwheel/core.cljc b/figwheel-core/src/figwheel/core.cljc
@@ -600,12 +600,18 @@
 ;; -------------------------------------------------------------
 
 (defn exception-code [parsed-exception]
-  (format "figwheel.core.handle_exception_remote(%s);"
-          (json/write-str
-           (-> parsed-exception
-               (update :tag #(string/join "/" ((juxt namespace name) %)))
-               pr-str
-               edn/read-string))))
+  (let [parsable-data?
+        (try (some-> parsed-exception :data pr-str edn/read-string)
+             (catch Throwable t
+               false))
+        parsed-exception' (cond-> parsed-exception
+                            (not parsable-data?) (dissoc :data))]
+    (format "figwheel.core.handle_exception_remote(%s);"
+            (json/write-str
+             (-> parsed-exception'
+                 (update :tag #(string/join "/" ((juxt namespace name) %)))
+                 pr-str
+                 edn/read-string)))))
 
 (defn handle-exception [exception-o-throwable-map]
   (let [{:keys [file line] :as parsed-ex} (fig-ex/parse-exception exception-o-throwable-map)

diff --git a/figwheel-core/src/figwheel/tools/exceptions.clj b/figwheel-core/src/figwheel/tools/exceptions.clj
@@ -127,11 +127,12 @@
 (defmethod data :default [tm]
   (or (:data tm) (->> tm :via reverse (keep :data) first)))
 
-(defmethod data :clj/spec-based-syntax-error [tm] nil)
+#_(defmethod data :clj/spec-based-syntax-error [tm] nil)
 
 (defn ex-type [tm]
   (some-> tm :via last :type pr-str symbol))
 
+
 (defn parse-exception [e]
   (let [tm     (if (instance? Throwable e) (Throwable->map e) e)
         tag    (exception-type? tm)