Merge pull request #183 from yandex-cloud/ClientCallArgs

Client call args

Author: DavyJohnes

src/index.ts

@@ -4,4 +4,4 @@ export * from './session';
 export * from './utils/operation';
 export * from './utils/decode-message';
 export * as errors from './errors';
-export { WrappedServiceClientType } from './types';
+export { WrappedServiceClientType, ClientCallArgs } from './types';

src/types.ts

@@ -1,8 +1,9 @@
 import { ChannelCredentials, ChannelOptions, Client, ServiceDefinition } from '@grpc/grpc-js';
 import { RawClient } from 'nice-grpc';
-import { DeadlineOptions } from 'nice-grpc-client-middleware-deadline';
 import { NormalizedServiceDefinition } from 'nice-grpc/lib/service-definitions';
-import { RetryOptions } from './middleware/retry';
+
+import { ClientCallArgs } from './utils/client-factory';
+export { ClientCallArgs } from './utils/client-factory';
 
 export interface TokenService {
     getToken: () => Promise<string>;
@@ -62,5 +63,5 @@ export type SessionConfig =
 
 export type WrappedServiceClientType<S extends ServiceDefinition> = RawClient<
     NormalizedServiceDefinition<S>,
-    DeadlineOptions & RetryOptions
+    ClientCallArgs
 >;

src/utils/client-factory.ts

@@ -1,9 +1,11 @@
-import { createClientFactory } from 'nice-grpc';
-import { deadlineMiddleware } from 'nice-grpc-client-middleware-deadline';
-import { retryMiddleware } from '../middleware/retry';
+import { ClientFactory, createClientFactory } from 'nice-grpc';
+import { deadlineMiddleware, DeadlineOptions } from 'nice-grpc-client-middleware-deadline';
+import { retryMiddleware, RetryOptions } from '../middleware/retry';
 import { errorMetadataMiddleware } from '../middleware/error-metadata';
 
-export const clientFactory = createClientFactory()
+export type ClientCallArgs = RetryOptions & DeadlineOptions;
+
+export const clientFactory: ClientFactory<ClientCallArgs> = createClientFactory()
     .use(errorMetadataMiddleware)
     .use(retryMiddleware)
     .use(deadlineMiddleware);