@@ -141,7 +141,6 @@ export class Server {
141
141
field ( "id" , id ) ,
142
142
field ( "proxyId" , proxyId ) ,
143
143
field ( "method" , method ) ,
144
- field ( "args" , proxyMessage . getArgsList ( ) ) ,
145
144
] ) ;
146
145
147
146
let response : any ;
@@ -183,12 +182,10 @@ export class Server {
183
182
* Send a callback to the client.
184
183
*/
185
184
private sendCallback ( proxyId : number | Module , callbackId : number , args : any [ ] ) : void {
186
- const protoArgs = args . map ( ( a ) => this . argumentToProto ( a ) ) ;
187
185
logger . trace ( ( ) => [
188
186
"sending callback" ,
189
187
field ( "proxyId" , proxyId ) ,
190
188
field ( "callbackId" , callbackId ) ,
191
- field ( "args" , protoArgs ) ,
192
189
] ) ;
193
190
194
191
const message = new Callback ( ) ;
@@ -203,7 +200,7 @@ export class Server {
203
200
message . setNumberedCallback ( callbackMessage ) ;
204
201
}
205
202
callbackMessage . setCallbackId ( callbackId ) ;
206
- callbackMessage . setArgsList ( protoArgs ) ;
203
+ callbackMessage . setArgsList ( args . map ( ( a ) => this . argumentToProto ( a ) ) ) ;
207
204
208
205
const serverMessage = new ServerMessage ( ) ;
209
206
serverMessage . setCallback ( message ) ;
@@ -268,12 +265,10 @@ export class Server {
268
265
* Send an event to the client.
269
266
*/
270
267
private sendEvent ( proxyId : number | Module , event : string , ...args : any [ ] ) : void {
271
- const stringifiedArgs = args . map ( ( a ) => this . argumentToProto ( a ) ) ;
272
268
logger . trace ( ( ) => [
273
269
"sending event" ,
274
270
field ( "proxyId" , proxyId ) ,
275
271
field ( "event" , event ) ,
276
- field ( "args" , stringifiedArgs ) ,
277
272
] ) ;
278
273
279
274
const message = new Event ( ) ;
@@ -288,7 +283,7 @@ export class Server {
288
283
message . setNumberedEvent ( eventMessage ) ;
289
284
}
290
285
eventMessage . setEvent ( event ) ;
291
- eventMessage . setArgsList ( stringifiedArgs ) ;
286
+ eventMessage . setArgsList ( args . map ( ( a ) => this . argumentToProto ( a ) ) ) ;
292
287
293
288
const serverMessage = new ServerMessage ( ) ;
294
289
serverMessage . setEvent ( message ) ;
@@ -299,16 +294,14 @@ export class Server {
299
294
* Send a response back to the client.
300
295
*/
301
296
private sendResponse ( id : number , response : any ) : void {
302
- const protoResponse = this . argumentToProto ( response ) ;
303
297
logger . trace ( ( ) => [
304
298
"sending resolve" ,
305
299
field ( "id" , id ) ,
306
- field ( "response" , protoResponse ) ,
307
300
] ) ;
308
301
309
302
const successMessage = new Method . Success ( ) ;
310
303
successMessage . setId ( id ) ;
311
- successMessage . setResponse ( protoResponse ) ;
304
+ successMessage . setResponse ( this . argumentToProto ( response ) ) ;
312
305
313
306
const serverMessage = new ServerMessage ( ) ;
314
307
serverMessage . setSuccess ( successMessage ) ;
@@ -319,16 +312,14 @@ export class Server {
319
312
* Send an exception back to the client.
320
313
*/
321
314
private sendException ( id : number , error : Error ) : void {
322
- const protoError = argumentToProto ( error ) ;
323
315
logger . trace ( ( ) => [
324
316
"sending reject" ,
325
317
field ( "id" , id ) ,
326
- field ( "response" , protoError ) ,
327
318
] ) ;
328
319
329
320
const failedMessage = new Method . Fail ( ) ;
330
321
failedMessage . setId ( id ) ;
331
- failedMessage . setResponse ( protoError ) ;
322
+ failedMessage . setResponse ( argumentToProto ( error ) ) ;
332
323
333
324
const serverMessage = new ServerMessage ( ) ;
334
325
serverMessage . setFail ( failedMessage ) ;
0 commit comments