|
@@ -135,14 +135,17 @@
|
|
|
^js sdk2 (aget js/window.logseq "sdk")]
|
|
^js sdk2 (aget js/window.logseq "sdk")]
|
|
|
|
|
|
|
|
(try
|
|
(try
|
|
|
- (println "invokeLogseqAPI:" method)
|
|
|
|
|
|
|
+ (println "invokeLogseqAPI:" method ", args:" args)
|
|
|
(let [^js methodTarget (if app? sdk1 (aget sdk2 ns'))]
|
|
(let [^js methodTarget (if app? sdk1 (aget sdk2 ns'))]
|
|
|
(when-not methodTarget
|
|
(when-not methodTarget
|
|
|
(throw (js/Error. (str "MethodNotExist: " method))))
|
|
(throw (js/Error. (str "MethodNotExist: " method))))
|
|
|
(-> (p/promise (apply js-invoke methodTarget method' args))
|
|
(-> (p/promise (apply js-invoke methodTarget method' args))
|
|
|
(p/then #(ret-fn! %))
|
|
(p/then #(ret-fn! %))
|
|
|
- (p/catch #(ret-fn! {:error (.-message %)}))))
|
|
|
|
|
- (catch js/Error e
|
|
|
|
|
|
|
+ (p/catch #(do
|
|
|
|
|
+ (js/console.error "Unexpected error:" %)
|
|
|
|
|
+ (ret-fn! {:error (.-message %)})))))
|
|
|
|
|
+ (catch :default e
|
|
|
|
|
+ (js/console.error "Unexpected error:" e)
|
|
|
(ret-fn! {:error (.-message e)}))))))
|
|
(ret-fn! {:error (.-message e)}))))))
|
|
|
|
|
|
|
|
(safe-api-call "syncAPIServerState"
|
|
(safe-api-call "syncAPIServerState"
|