@@ -10,6 +10,11 @@ const serviceMethodSplit = (serviceMethod) => {
1010 return serviceMethod . split ( ':' ) ;
1111} ;
1212
13+ const tSend = '↑' ;
14+ const tSendAndReceive = '↑↓' ;
15+ const tReceive = '↓' ;
16+ const tReceiveAndSend = '↓↑' ;
17+
1318const updateMessages = ( oldMessages , newRawMessages ) => {
1419 const newMessages = [ ] ;
1520 let sendBytes = 0 ;
@@ -36,18 +41,18 @@ const updateMessages = (oldMessages, newRawMessages) => {
3641 }
3742
3843 if ( msg . type === 'sendNotification' ) {
39- msg . type = '↑' ;
44+ msg . type = tSend ;
4045 msg . service = serviceMethodSplitResult [ 0 ] ;
4146 msg . method = serviceMethodSplitResult [ 1 ] ;
4247 msg . send = JSON . stringify ( message . arguments ) ;
4348 } else if ( msg . type === 'sendRequest' ) {
44- msg . type = '↑↓' ;
49+ msg . type = tSendAndReceive ;
4550 msg . requestId = message . requestId ;
4651 msg . service = serviceMethodSplitResult [ 0 ] ;
4752 msg . method = serviceMethodSplitResult [ 1 ] ;
4853 msg . send = JSON . stringify ( message . arguments ) ;
4954 } else if ( msg . type === 'requestResult' ) {
50- msg . type = '↑↓' ;
55+ msg . type = tSendAndReceive ;
5156 msg . requestId = message . requestId ;
5257 msg . status = message . status ;
5358 if ( msg . status === 'success' ) {
@@ -56,18 +61,18 @@ const updateMessages = (oldMessages, newRawMessages) => {
5661 msg . receive = JSON . stringify ( message . error ) ;
5762 }
5863 } else if ( msg . type === 'onNotification' ) {
59- msg . type = '↓' ;
64+ msg . type = tReceive ;
6065 msg . service = serviceMethodSplitResult [ 0 ] ;
6166 msg . method = serviceMethodSplitResult [ 1 ] ;
6267 msg . receive = JSON . stringify ( message . arguments ) ;
6368 } else if ( msg . type === 'onRequest' ) {
64- msg . type = '↓' ;
69+ msg . type = tReceiveAndSend ;
6570 msg . requestId = message . requestId ;
6671 msg . service = serviceMethodSplitResult [ 0 ] ;
6772 msg . method = serviceMethodSplitResult [ 1 ] ;
6873 msg . receive = JSON . stringify ( message . arguments ) ;
6974 } else if ( msg . type === 'onRequestResult' ) {
70- msg . type = '↓↑' ;
75+ msg . type = tReceiveAndSend ;
7176 msg . requestId = message . requestId ;
7277 msg . status = message . status ;
7378 if ( msg . status === 'success' ) {
@@ -86,13 +91,13 @@ const updateMessages = (oldMessages, newRawMessages) => {
8691 receiveBytes += new Blob ( [ msg . receive ] ) . size ;
8792 }
8893
89- if ( msg . type === '↑↓' ) {
94+ if ( msg . type === tSendAndReceive ) {
9095 // merge requestResult row into corresponding sendRequest row
9196 let isCorrespondingRowInNewMessages = false ;
9297 let isCorrespondingRowInMessages = false ;
9398
9499 for ( let i = newMessages . length - 1 ; i >= 0 ; i -- ) {
95- if ( newMessages [ i ] . type === '↑↓' ) {
100+ if ( newMessages [ i ] . type === tSendAndReceive ) {
96101 if ( newMessages [ i ] . requestId === msg . requestId ) {
97102 newMessages [ i ] . receive = msg . receive ;
98103 isCorrespondingRowInNewMessages = true ;
@@ -103,7 +108,7 @@ const updateMessages = (oldMessages, newRawMessages) => {
103108
104109 if ( ! isCorrespondingRowInNewMessages ) {
105110 for ( let i = oldMessages . length - 1 ; i >= 0 ; i -- ) {
106- if ( oldMessages [ i ] . type === '↑↓' ) {
111+ if ( oldMessages [ i ] . type === tSendAndReceive ) {
107112 if ( oldMessages [ i ] . requestId === msg . requestId ) {
108113 updatedMessages [ i ] = structuredClone ( oldMessages [ i ] ) ;
109114 updatedMessages [ i ] . receive = msg . receive ;
@@ -118,13 +123,13 @@ const updateMessages = (oldMessages, newRawMessages) => {
118123 if ( ! isCorrespondingRowInNewMessages && ! isCorrespondingRowInMessages ) {
119124 newMessages . push ( msg ) ;
120125 }
121- } else if ( msg . type === '↓↑' ) {
126+ } else if ( msg . type === tReceiveAndSend ) {
122127 // merge onRequestResult row into corresponding onRequest row
123128 let isCorrespondingRowInNewMessages = false ;
124129 let isCorrespondingRowInMessages = false ;
125130
126131 for ( let i = newMessages . length - 1 ; i >= 0 ; i -- ) {
127- if ( newMessages [ i ] . type === '↓↑' ) {
132+ if ( newMessages [ i ] . type === tReceiveAndSend ) {
128133 if ( newMessages [ i ] . requestId === msg . requestId ) {
129134 newMessages [ i ] . send = msg . send ;
130135 isCorrespondingRowInNewMessages = true ;
@@ -135,7 +140,7 @@ const updateMessages = (oldMessages, newRawMessages) => {
135140
136141 if ( ! isCorrespondingRowInNewMessages ) {
137142 for ( let i = oldMessages . length - 1 ; i >= 0 ; i -- ) {
138- if ( oldMessages [ i ] . type === '↓↑' ) {
143+ if ( oldMessages [ i ] . type === tReceiveAndSend ) {
139144 if ( oldMessages [ i ] . requestId === msg . requestId ) {
140145 updatedMessages [ i ] = structuredClone ( oldMessages [ i ] ) ;
141146 updatedMessages [ i ] . send = msg . send ;
0 commit comments