grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Delete client-specific options before passing them to the channel

This commit is contained in:
Michael Lumish 2020-03-24 12:55:24 -07:00
parent 22521ef8a7
commit a3526e98c8
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/grpc-js/src/client.ts
View File

@ -109,10 +109,28 @@ export class Client {
credentials: ChannelCredentials, credentials: ChannelCredentials,
options: ClientOptions = {} options: ClientOptions = {}
) { ) {
options = Object.assign({}, options);
this[INTERCEPTOR_SYMBOL] = options.interceptors ?? [];
delete options.interceptors;
this[INTERCEPTOR_PROVIDER_SYMBOL] = options.interceptor_providers ?? [];
delete options.interceptor_providers;
if (
this[INTERCEPTOR_SYMBOL].length > 0 &&
this[INTERCEPTOR_PROVIDER_SYMBOL].length > 0
) {
throw new Error(
'Both interceptors and interceptor_providers were passed as options ' +
'to the client constructor. Only one of these is allowed.'
);
}
this[CALL_INVOCATION_TRANSFORMER_SYMBOL] = options.callInvocationTransformer;
delete options.callInvocationTransformer;
if (options.channelOverride) { if (options.channelOverride) {
this[CHANNEL_SYMBOL] = options.channelOverride; this[CHANNEL_SYMBOL] = options.channelOverride;
} else if (options.channelFactoryOverride) { } else if (options.channelFactoryOverride) {
this[CHANNEL_SYMBOL] = options.channelFactoryOverride( const channelFactoryOverride = options.channelFactoryOverride;
delete options.channelFactoryOverride;
this[CHANNEL_SYMBOL] = channelFactoryOverride(
address, address,
credentials, credentials,
options options
@ -124,18 +142,6 @@ export class Client {
options options
); );
} }
this[INTERCEPTOR_SYMBOL] = options.interceptors ?? [];
this[INTERCEPTOR_PROVIDER_SYMBOL] = options.interceptor_providers ?? [];
if (
this[INTERCEPTOR_SYMBOL].length > 0 &&
this[INTERCEPTOR_PROVIDER_SYMBOL].length > 0
) {
throw new Error(
'Both interceptors and interceptor_providers were passed as options ' +
'to the client constructor. Only one of these is allowed.'
);
}
this[CALL_INVOCATION_TRANSFORMER_SYMBOL] = options.callInvocationTransformer;
} }
close(): void { close(): void {