added better handling of foreign postMessages

benzap · Sep 4, 2014 · 7a371ca · 7a371ca
1 parent e0d5f9b
commit 7a371ca
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject flyer "0.1.0"
+(defproject flyer "0.1.2"
   :description "Clojurescript + Javascript Broadcast Messaging between
   iFrames, Framesets, and Windows"
   :url "https://github.com/benzap/flyer.js"

diff --git a/resources/public/index-test.html b/resources/public/index-test.html
@@ -59,13 +59,24 @@ <h1>I am the main index</h1>
 
      flyer.subscribe({
 	   topic: "general.*",
-       callback: function(data, topic, channel) {
+	   callback: function(data, topic, channel) {
 		 console.log("called from main");
 		 console.log("data: ", data);
 		 console.log("topic: ", topic);
 		 console.log("channel: ", channel);
 	   }
      });
+
+     flyer.subscribe({
+	   channel: "FOREIGN",
+	   callback: function(data, topic, channel) {
+		 console.log("this is a foreign post message");
+		 console.log("data: ", data);
+		 console.log("topic: ", topic);
+		 console.log("channel: ", channel);
+	   }
+     });
+
 
     </script>
   </body>

diff --git a/src-cljs/flyer/messaging.cljs b/src-cljs/flyer/messaging.cljs
@@ -88,12 +88,16 @@ and the topic"
   (let [callback-wrapper
         (fn [event]
           (let [data (.-data (.getBrowserEvent event))
-                msg-js (.parse js/JSON data)
+                msg-js (try (.parse js/JSON data)
+                            (catch js/Error e
+                              #js {:channel "FOREIGN"
+                                   :topic (default-message :topic)
+                                   :data data}))
                 msg (js->clj msg-js)
                 ;;extract data from channel
-                msg-data (.-data msg-js)
-                msg-topic (.-topic msg-js)
-                msg-channel (.-channel msg-js)]
+                msg-channel (or (.-channel msg-js) "FOREIGN")
+                msg-topic (or (.-topic msg-js) (default-message :topic))
+                msg-data (or (.-data msg-js) (default-message :data))]
             (when (like-this-flyer? msg-topic msg-channel
                                     topic channel)
               (callback msg-data msg-topic msg-channel))))]