fix: launcher start config types

Lomray-Software · Mar 8, 2023 · aeb22e0 · aeb22e0
1 parent 16d796e
commit aeb22e0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/helpers/get-ms-start-config.ts b/src/helpers/get-ms-start-config.ts
@@ -4,21 +4,21 @@ import _ from 'lodash';
 import type { ICommonConstants } from '@helpers/get-constants';
 import GetDbConfig from '@helpers/get-db-config';
 import { GetMsOptions, GetMsParams } from '@helpers/get-ms-config';
-import type { IStartConfig, IStartConfigWithDb } from '@helpers/launchers';
+import type { IStartConfig, IStartConfigWithDb, IStartConfigSocket } from '@helpers/launchers';
 
 export type TOverloadMsStartConfigParams<T extends Record<string, any>> = T['DB'] extends Record<
   string,
   any
 >
-  ? PartialProps<IStartConfigWithDb, 'msOptions' | 'msParams' | 'dbOptions'>
-  : PartialProps<IStartConfig, 'msOptions' | 'msParams'>;
+  ? PartialProps<IStartConfigSocket<IStartConfigWithDb>, 'msOptions' | 'msParams' | 'dbOptions'>
+  : PartialProps<IStartConfigSocket<IStartConfig>, 'msOptions' | 'msParams'>;
 
 export type TOverloadMsStartConfigReturn<T extends Record<string, any>> = T['DB'] extends Record<
   string,
   any
 >
-  ? IStartConfigWithDb
-  : IStartConfig;
+  ? IStartConfigSocket<IStartConfigWithDb>
+  : IStartConfigSocket<IStartConfig>;
 
 /**
  * Get default microservice start config

diff --git a/src/helpers/launchers.ts b/src/helpers/launchers.ts
@@ -3,6 +3,8 @@ import type {
   IGatewayParams,
   IMicroserviceOptions,
   IMicroserviceParams,
+  ISocketOptions,
+  ISocketParams,
 } from '@lomray/microservice-nodejs-lib';
 import { Gateway, Microservice, Socket } from '@lomray/microservice-nodejs-lib';
 import type { IMiddlewareRepository } from '@lomray/microservice-remote-middleware';
@@ -24,8 +26,8 @@ type TRemoteMiddleware = { isEnable?: boolean } & (
 
 export interface IStartConfig {
   type: 'gateway' | 'microservice' | 'socket';
-  msOptions: Partial<IGatewayOptions | IMicroserviceOptions>;
-  msParams: Partial<IGatewayParams> | IMicroserviceParams;
+  msOptions: Partial<IGatewayOptions | IMicroserviceOptions | ISocketOptions>;
+  msParams: Partial<IGatewayParams | IMicroserviceParams | ISocketParams>;
   registerMethods?: (ms: Microservice | Gateway | Socket) => Promise<void> | void;
   registerEvents?: (ms: Microservice | Gateway | Socket) => Promise<void> | void;
   registerJobs?: (jobService: Jobs) => Promise<void> | void;
@@ -46,9 +48,9 @@ export interface IStartConfigWithDb extends IStartConfig {
   shouldUseDbRemoteOptions?: boolean;
 }
 
-export type IStartConfigSocket = {
+export type IStartConfigSocket<T = IStartConfig | IStartConfigWithDb> = {
   registerRooms?: (ms: Socket) => Promise<void> | void;
-} & (IStartConfig | IStartConfigWithDb);
+} & T;
 
 /**
  * 1. Initialize