🚨 Add more logging to event pipeline, 0.0.177

rslnd · Mar 5, 2019 · 10a30f0 · 10a30f0
1 parent 67d1af9
commit 10a30f0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/app/electron/package.json b/app/electron/package.json
@@ -1,7 +1,7 @@
 {
   "name": "rosalind",
   "productName": "Rosalind",
-  "version": "0.0.176",
+  "version": "0.0.177",
   "private": true,
   "description": "Rosalind",
   "author": {

diff --git a/app/electron/renderer/preload.js b/app/electron/renderer/preload.js
@@ -76,7 +76,6 @@ try {
   // Can't just log/stringify the message object as it would just print { isTrusted: true }
   // Always need to read .data and .origin directly.
   const listener = (messageEvent) => {
-    // console.log(`preload: ${JSON.stringify(message)} (${JSON.stringify(message.data)}) [(${JSON.stringify(message.origin)})] {${message.source === window}}`)
     try {
       if (messageEvent.source !== window) {
         return
@@ -94,20 +93,19 @@ try {
         return
       }
 
-      logger.info(`[Preload] Message ${JSON.stringify(messageEvent.data)}`)
-
       const json = messageEvent.data.slice(eventPrefix.length)
-
       const parsed = JSON.parse(json)
 
-      if (!((Object.keys(parsed).length === 2) && parsed.name && parsed.payload)) {
-        throw new Error(`Invalid shape of event data: ${Object.keys(parsed).join(',')}`)
-      }
-
       if (toNative.indexOf(parsed.name) === -1) {
         return
       }
 
+      logger.info(`[Preload] Message ${JSON.stringify(messageEvent.data)}`)
+
+      if (!((Object.keys(parsed).length === 2) && parsed.name && parsed.payload)) {
+        throw new Error(`Invalid shape of event data: ${Object.keys(parsed).join(',')}`)
+      }
+
       logger.info(`[Preload] sending to ipc: ${parsed.name}`)
 
       ipcRenderer.send(parsed.name, parsed.payload)
@@ -127,7 +125,7 @@ try {
           eventPrefix,
           JSON.stringify(event)
         ].join('')
-        logger.info(`[Preload] Posting event ${name} ${eventString}`)
+        logger.info(`[Preload] Posting event ${name}`)
         window.postMessage(eventString, targetOrigin)
       } catch (e) {
         logger.error(`[Preload] Failed to serialize event ${name}`, e)

diff --git a/app/meteor/imports/startup/client/native/events.js b/app/meteor/imports/startup/client/native/events.js
@@ -11,6 +11,8 @@ const toWeb = [
   'dataTransfer'
 ]
 
+const DEBUG = true
+
 const eventPrefix = 'rslndNative*'
 const events = new EventEmitter()
 
@@ -47,7 +49,7 @@ export const onNativeEvent = (event, callback) => {
 }
 
 export const toNative = (name, payload = {}) => {
-  console.log('[Native] Posting message', name, payload)
+  console.log('[Native] Posting message', name)
 
   if (window.isAndroid) {
     console.error('[Native] Android interface not implemented')
@@ -58,20 +60,28 @@ export const toNative = (name, payload = {}) => {
 
 export const getClientKey = () => clientKey
 
+const debug = msg => DEBUG && console.log(`[Debug] ${msg}`)
+
 const listener = messageEvent => {
+  debug(`Received message ${messageEvent.origin}`)
+
   if (messageEvent.source !== window) {
+    debug('Discarding event becuase sources do not match')
     return
   }
 
   if (!isValidOrigin(messageEvent.origin)) {
+    debug('Discarding event becuase origin is invalid')
     return
   }
 
   if (typeof messageEvent.data !== 'string') {
+    debug('Discarding event because data is not a string')
     return
   }
 
   if (messageEvent.data.indexOf(eventPrefix) !== 0) {
+    debug('Discarding event because prefix is missing')
     return
   }
 
@@ -82,10 +92,11 @@ const listener = messageEvent => {
   }
 
   if (toWeb.indexOf(parsed.name) === -1) {
+    debug('Discarding event because name is not whitelisted in toWeb')
     return
   }
 
-  console.log(`[Native] Emitting ${parsed.name} ${JSON.stringify(parsed.payload)}`)
+  console.log(`[Native] Emitting ${parsed.name}`)
   events.emit(parsed.name, parsed.payload)
 }