@@ -235,30 +235,22 @@ export abstract class HttpProvider {
235235 /**
236236 * Replace common templates strings.
237237 */
238- protected replaceTemplates ( route : Route , response : HttpStringFileResponse , sessionId ?: string ) : HttpStringFileResponse
239238 protected replaceTemplates < T extends object > (
240239 route : Route ,
241240 response : HttpStringFileResponse ,
242- options : T ,
243- ) : HttpStringFileResponse
244- protected replaceTemplates (
245- route : Route ,
246- response : HttpStringFileResponse ,
247- sessionIdOrOptions ?: string | object ,
241+ extraOptions ?: Omit < T , "base" | "csStaticBase" | "logLevel" > ,
248242 ) : HttpStringFileResponse {
249- if ( typeof sessionIdOrOptions === "undefined" || typeof sessionIdOrOptions === "string" ) {
250- sessionIdOrOptions = {
251- base : this . base ( route ) ,
252- commit : this . options . commit ,
253- logLevel : logger . level ,
254- sessionID : sessionIdOrOptions ,
255- } as Options
243+ const options : Options = {
244+ base : this . base ( route ) ,
245+ commit : this . options . commit ,
246+ logLevel : logger . level ,
247+ ...extraOptions ,
256248 }
257249 response . content = response . content
258250 . replace ( / { { COMMIT} } / g, this . options . commit )
259251 . replace ( / { { TO} } / g, Array . isArray ( route . query . to ) ? route . query . to [ 0 ] : route . query . to || "/dashboard" )
260252 . replace ( / { { BASE} } / g, this . base ( route ) )
261- . replace ( / " { { O P T I O N S } } " / , `'${ JSON . stringify ( sessionIdOrOptions ) } '` )
253+ . replace ( / " { { O P T I O N S } } " / , `'${ JSON . stringify ( options ) } '` )
262254 return response
263255 }
264256
@@ -664,7 +656,7 @@ export class HttpServer {
664656 e = new HttpError ( "Not found" , HttpCode . NotFound )
665657 }
666658 const code = typeof e . code === "number" ? e . code : HttpCode . ServerError
667- logger . debug ( "Request error" , field ( "url" , request . url ) , field ( "code" , code ) )
659+ logger . debug ( "Request error" , field ( "url" , request . url ) , field ( "code" , code ) , field ( "error" , error ) )
668660 if ( code >= HttpCode . ServerError ) {
669661 logger . error ( error . stack )
670662 }
0 commit comments