@@ -10,6 +10,11 @@ const serviceMethodSplit = (serviceMethod) => {
10
10
return serviceMethod . split ( ':' ) ;
11
11
} ;
12
12
13
+ const tSend = '↑' ;
14
+ const tSendAndReceive = '↑↓' ;
15
+ const tReceive = '↓' ;
16
+ const tReceiveAndSend = '↓↑' ;
17
+
13
18
const updateMessages = ( oldMessages , newRawMessages ) => {
14
19
const newMessages = [ ] ;
15
20
let sendBytes = 0 ;
@@ -36,18 +41,18 @@ const updateMessages = (oldMessages, newRawMessages) => {
36
41
}
37
42
38
43
if ( msg . type === 'sendNotification' ) {
39
- msg . type = '↑' ;
44
+ msg . type = tSend ;
40
45
msg . service = serviceMethodSplitResult [ 0 ] ;
41
46
msg . method = serviceMethodSplitResult [ 1 ] ;
42
47
msg . send = JSON . stringify ( message . arguments ) ;
43
48
} else if ( msg . type === 'sendRequest' ) {
44
- msg . type = '↑↓' ;
49
+ msg . type = tSendAndReceive ;
45
50
msg . requestId = message . requestId ;
46
51
msg . service = serviceMethodSplitResult [ 0 ] ;
47
52
msg . method = serviceMethodSplitResult [ 1 ] ;
48
53
msg . send = JSON . stringify ( message . arguments ) ;
49
54
} else if ( msg . type === 'requestResult' ) {
50
- msg . type = '↑↓' ;
55
+ msg . type = tSendAndReceive ;
51
56
msg . requestId = message . requestId ;
52
57
msg . status = message . status ;
53
58
if ( msg . status === 'success' ) {
@@ -56,18 +61,18 @@ const updateMessages = (oldMessages, newRawMessages) => {
56
61
msg . receive = JSON . stringify ( message . error ) ;
57
62
}
58
63
} else if ( msg . type === 'onNotification' ) {
59
- msg . type = '↓' ;
64
+ msg . type = tReceive ;
60
65
msg . service = serviceMethodSplitResult [ 0 ] ;
61
66
msg . method = serviceMethodSplitResult [ 1 ] ;
62
67
msg . receive = JSON . stringify ( message . arguments ) ;
63
68
} else if ( msg . type === 'onRequest' ) {
64
- msg . type = '↓' ;
69
+ msg . type = tReceiveAndSend ;
65
70
msg . requestId = message . requestId ;
66
71
msg . service = serviceMethodSplitResult [ 0 ] ;
67
72
msg . method = serviceMethodSplitResult [ 1 ] ;
68
73
msg . receive = JSON . stringify ( message . arguments ) ;
69
74
} else if ( msg . type === 'onRequestResult' ) {
70
- msg . type = '↓↑' ;
75
+ msg . type = tReceiveAndSend ;
71
76
msg . requestId = message . requestId ;
72
77
msg . status = message . status ;
73
78
if ( msg . status === 'success' ) {
@@ -86,13 +91,13 @@ const updateMessages = (oldMessages, newRawMessages) => {
86
91
receiveBytes += new Blob ( [ msg . receive ] ) . size ;
87
92
}
88
93
89
- if ( msg . type === '↑↓' ) {
94
+ if ( msg . type === tSendAndReceive ) {
90
95
// merge requestResult row into corresponding sendRequest row
91
96
let isCorrespondingRowInNewMessages = false ;
92
97
let isCorrespondingRowInMessages = false ;
93
98
94
99
for ( let i = newMessages . length - 1 ; i >= 0 ; i -- ) {
95
- if ( newMessages [ i ] . type === '↑↓' ) {
100
+ if ( newMessages [ i ] . type === tSendAndReceive ) {
96
101
if ( newMessages [ i ] . requestId === msg . requestId ) {
97
102
newMessages [ i ] . receive = msg . receive ;
98
103
isCorrespondingRowInNewMessages = true ;
@@ -103,7 +108,7 @@ const updateMessages = (oldMessages, newRawMessages) => {
103
108
104
109
if ( ! isCorrespondingRowInNewMessages ) {
105
110
for ( let i = oldMessages . length - 1 ; i >= 0 ; i -- ) {
106
- if ( oldMessages [ i ] . type === '↑↓' ) {
111
+ if ( oldMessages [ i ] . type === tSendAndReceive ) {
107
112
if ( oldMessages [ i ] . requestId === msg . requestId ) {
108
113
updatedMessages [ i ] = structuredClone ( oldMessages [ i ] ) ;
109
114
updatedMessages [ i ] . receive = msg . receive ;
@@ -118,13 +123,13 @@ const updateMessages = (oldMessages, newRawMessages) => {
118
123
if ( ! isCorrespondingRowInNewMessages && ! isCorrespondingRowInMessages ) {
119
124
newMessages . push ( msg ) ;
120
125
}
121
- } else if ( msg . type === '↓↑' ) {
126
+ } else if ( msg . type === tReceiveAndSend ) {
122
127
// merge onRequestResult row into corresponding onRequest row
123
128
let isCorrespondingRowInNewMessages = false ;
124
129
let isCorrespondingRowInMessages = false ;
125
130
126
131
for ( let i = newMessages . length - 1 ; i >= 0 ; i -- ) {
127
- if ( newMessages [ i ] . type === '↓↑' ) {
132
+ if ( newMessages [ i ] . type === tReceiveAndSend ) {
128
133
if ( newMessages [ i ] . requestId === msg . requestId ) {
129
134
newMessages [ i ] . send = msg . send ;
130
135
isCorrespondingRowInNewMessages = true ;
@@ -135,7 +140,7 @@ const updateMessages = (oldMessages, newRawMessages) => {
135
140
136
141
if ( ! isCorrespondingRowInNewMessages ) {
137
142
for ( let i = oldMessages . length - 1 ; i >= 0 ; i -- ) {
138
- if ( oldMessages [ i ] . type === '↓↑' ) {
143
+ if ( oldMessages [ i ] . type === tReceiveAndSend ) {
139
144
if ( oldMessages [ i ] . requestId === msg . requestId ) {
140
145
updatedMessages [ i ] = structuredClone ( oldMessages [ i ] ) ;
141
146
updatedMessages [ i ] . send = msg . send ;
0 commit comments