From 52eb6c609ad800e40e3220e9a54f5523b7d68276 Mon Sep 17 00:00:00 2001 From: Max Schmitt Date: Thu, 30 Jul 2020 05:42:14 +0200 Subject: [PATCH] fix(rpc): protocol Route.fulfill (#3200) --- src/rpc/channels.ts | 8 ++++---- src/rpc/protocol.yml | 9 +++++---- src/rpc/validator.ts | 10 +++++----- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/rpc/channels.ts b/src/rpc/channels.ts index ecb2ac4713..9c0c9b2aa6 100644 --- a/src/rpc/channels.ts +++ b/src/rpc/channels.ts @@ -2055,13 +2055,13 @@ export type RouteContinueOptions = { }; export type RouteContinueResult = void; export type RouteFulfillParams = { - status: number, - headers: { + status?: number, + headers?: { name: string, value: string, }[], - body: string, - isBase64: boolean, + body?: string, + isBase64?: boolean, }; export type RouteFulfillOptions = { diff --git a/src/rpc/protocol.yml b/src/rpc/protocol.yml index 8c8aa65154..6e354a91b3 100644 --- a/src/rpc/protocol.yml +++ b/src/rpc/protocol.yml @@ -1694,16 +1694,17 @@ Route: fulfill: parameters: - status: number + # default is 200 + status: number? headers: - type: array + type: array? items: type: object properties: name: string value: string - body: string - isBase64: boolean + body: string? + isBase64: boolean? diff --git a/src/rpc/validator.ts b/src/rpc/validator.ts index 279f109128..a7df3d78ec 100644 --- a/src/rpc/validator.ts +++ b/src/rpc/validator.ts @@ -803,13 +803,13 @@ export function createScheme(tChannel: (name: string) => Validator): Scheme { postData: tOptional(tBinary), }); scheme.RouteFulfillParams = tObject({ - status: tNumber, - headers: tArray(tObject({ + status: tOptional(tNumber), + headers: tOptional(tArray(tObject({ name: tString, value: tString, - })), - body: tString, - isBase64: tBoolean, + }))), + body: tOptional(tString), + isBase64: tOptional(tBoolean), }); scheme.ResponseBodyParams = tOptional(tObject({})); scheme.ResponseFinishedParams = tOptional(tObject({}));