Enhance chat message metadata logging for verbose debug mode (#797)

threema-ch · May 8, 2019 · 124225a · 124225a
1 parent d356d5b
commit 124225a
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/services/webclient.ts b/src/services/webclient.ts
@@ -2654,9 +2654,6 @@ export class WebClientService {
             this.$log.warn('Invalid messages response, data or arguments missing');
             return future.reject('invalidResponse');
         }
-        if (this.config.MSG_DEBUGGING) {
-            this.logChatMessages(message.type, message.subType, data);
-        }
 
         // Unpack required argument fields
         const type: string = args[WebClientService.ARGUMENT_RECEIVER_TYPE];
@@ -2670,6 +2667,9 @@ export class WebClientService {
             this.$log.warn('Invalid messages response, unknown receiver type (' + type + ')');
             return future.reject('invalidResponse');
         }
+        if (this.config.MSG_DEBUGGING) {
+            this.logChatMessages(message.type, message.subType, type, id, 'new', data);
+        }
         const receiver: threema.BaseReceiver = {type: type, id: id};
 
         // If there's no data returned, override `more` field.
@@ -2851,9 +2851,6 @@ export class WebClientService {
             this.$log.warn('Invalid message update, data or arguments missing');
             return future.reject('invalidResponse');
         }
-        if (this.config.MSG_DEBUGGING) {
-            this.logChatMessages(message.type, message.subType, data);
-        }
 
         // Unpack required argument fields
         const type: string = args[WebClientService.ARGUMENT_RECEIVER_TYPE];
@@ -2867,6 +2864,9 @@ export class WebClientService {
             this.$log.warn(this.logTag, 'Invalid messages update, unknown receiver type (' + type + ')');
             return future.reject('invalidResponse');
         }
+        if (this.config.MSG_DEBUGGING) {
+            this.logChatMessages(message.type, message.subType, type, id, mode, data);
+        }
         const receiver: threema.BaseReceiver = {type: type, id: id};
 
         // React depending on mode
@@ -4219,17 +4219,21 @@ export class WebClientService {
     /**
      * Log chat message's metadata for debugging purposes.
      */
-    private logChatMessages(type: string, subType: string, messages: threema.Message[]) {
+    private logChatMessages(
+        type: string, subType: string, receiverType: string, receiver: string, mode: string,
+        messages: threema.Message[],
+    ) {
         for (const message of messages) {
             let id: string = message.id;
             if (this.clientInfo.os === threema.OperatingSystem.Ios) {
                 try {
                     id = u8aToHex(base64ToU8a(message.id));
                 } catch { /* ignored */ }
             }
-            this.$log.debug('[MessageInspector]', `${type}/${subType}: direction=${message.isOutbox ? 'out' : 'in'}, ` +
-                `id=${id}, type=${message.type}, state=${message.state !== undefined ? message.state : '?'}, ` +
-                `is-status=${message.isStatus}, date=${message.date}`);
+            this.$log.debug('[MessageInspector]', `${type}/${subType}: receiver=${receiverType}/${receiver}, ` +
+                `mode=${mode}, direction=${message.isOutbox ? 'out' : 'in'}, id=${id}, type=${message.type}, ` +
+                `state=${message.state !== undefined ? message.state : '?'}, is-status=${message.isStatus}, ` +
+                `date=${message.date}`);
         }
     }
 }