File tree Expand file tree Collapse file tree 2 files changed +6
-18
lines changed Expand file tree Collapse file tree 2 files changed +6
-18
lines changed Original file line number Diff line number Diff line change @@ -20,7 +20,6 @@ import {
20
20
} from "../../types" ;
21
21
22
22
import { Replace } from '../../util/type-utils' ;
23
- import { buildBodyReader } from '../../util/request-utils' ;
24
23
import { asBuffer } from '../../util/buffer-utils' ;
25
24
import {
26
25
Serializable ,
@@ -316,10 +315,7 @@ export interface SerializedCallbackHandlerData {
316
315
* @internal
317
316
*/
318
317
export interface CallbackRequestMessage {
319
- args : [
320
- | Replace < CompletedRequest , { body : string } > // New format
321
- | CompletedRequest // Old format with directly serialized body
322
- ] ;
318
+ args : [ Replace < CompletedRequest , { body : string } > ] ;
323
319
}
324
320
325
321
export class CallbackHandlerDefinition extends Serializable implements RequestHandlerDefinition {
@@ -343,14 +339,10 @@ export class CallbackHandlerDefinition extends Serializable implements RequestHa
343
339
CallbackRequestMessage ,
344
340
CallbackResponseResult
345
341
> ( async ( streamMsg ) => {
346
- const request = _ . isString ( streamMsg . args [ 0 ] . body )
347
- ? withDeserializedBodyReader ( // New format: body serialized as base64
348
- streamMsg . args [ 0 ] as Replace < CompletedRequest , { body : string } >
349
- )
350
- : { // Backward compat: old fully-serialized format
351
- ...streamMsg . args [ 0 ] ,
352
- body : buildBodyReader ( streamMsg . args [ 0 ] . body . buffer , streamMsg . args [ 0 ] . headers )
353
- } ;
342
+ const request = withDeserializedBodyReader (
343
+ // Body serialized as base64
344
+ streamMsg . args [ 0 ]
345
+ )
354
346
355
347
const callbackResult = await this . callback . call ( null , request ) ;
356
348
Original file line number Diff line number Diff line change @@ -253,11 +253,7 @@ export class CallbackHandler extends CallbackHandlerDefinition {
253
253
| WithSerializedCallbackBuffers < CallbackResponseMessageResult >
254
254
| 'close'
255
255
| 'reset'
256
- > ( { args : [
257
- ( version || - 1 ) >= 2
258
- ? withSerializedBodyReader ( request )
259
- : request // Backward compat: old handlers
260
- ] } ) ;
256
+ > ( { args : [ withSerializedBodyReader ( request ) ] } ) ;
261
257
262
258
if ( typeof callbackResult === 'string' ) {
263
259
return callbackResult ;
You can’t perform that action at this time.
0 commit comments