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 {
2020} from "../../types" ;
2121
2222import { Replace } from '../../util/type-utils' ;
23- import { buildBodyReader } from '../../util/request-utils' ;
2423import { asBuffer } from '../../util/buffer-utils' ;
2524import {
2625 Serializable ,
@@ -316,10 +315,7 @@ export interface SerializedCallbackHandlerData {
316315 * @internal
317316 */
318317export 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 } > ] ;
323319}
324320
325321export class CallbackHandlerDefinition extends Serializable implements RequestHandlerDefinition {
@@ -343,14 +339,10 @@ export class CallbackHandlerDefinition extends Serializable implements RequestHa
343339 CallbackRequestMessage ,
344340 CallbackResponseResult
345341 > ( 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+ )
354346
355347 const callbackResult = await this . callback . call ( null , request ) ;
356348
Original file line number Diff line number Diff line change @@ -253,11 +253,7 @@ export class CallbackHandler extends CallbackHandlerDefinition {
253253 | WithSerializedCallbackBuffers < CallbackResponseMessageResult >
254254 | 'close'
255255 | 'reset'
256- > ( { args : [
257- ( version || - 1 ) >= 2
258- ? withSerializedBodyReader ( request )
259- : request // Backward compat: old handlers
260- ] } ) ;
256+ > ( { args : [ withSerializedBodyReader ( request ) ] } ) ;
261257
262258 if ( typeof callbackResult === 'string' ) {
263259 return callbackResult ;
You can’t perform that action at this time.
0 commit comments