fix default options

Author: filvecchiato

src/chains-config/index.ts

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { ApiPromise } from '@polkadot/api';
+import { ISidecarConfig } from 'src/types/sidecar-config';
 
 import { controllers } from '../controllers';
 import AbstractController from '../controllers/AbstractController';
@@ -125,7 +126,8 @@ function getControllersFromConfig(api: ApiPromise, config: ControllerConfig) {
 
 export const getControllersByPallets = (pallets: string[], api: ApiPromise, specName: string) => {
 	const controllersSet: AbstractController<AbstractService>[] = [];
-	const config = specToControllerMap?.[specName]?.options || specToControllerMap?.defaultControllers?.options;
+	const config = specToControllerMap?.[specName]?.options || defaultControllers?.options;
+
 	Object.values(controllers).forEach((controller) => {
 		if (controller.canInjectByPallets(pallets)) {
 			controllersSet.push(new controller(api, config));
@@ -134,3 +136,20 @@ export const getControllersByPallets = (pallets: string[], api: ApiPromise, spec
 
 	return controllersSet;
 };
+
+export const getControllers = (
+	api: ApiPromise,
+	config: ISidecarConfig,
+	specName: string,
+): AbstractController<AbstractService>[] => {
+	if (config.EXPRESS.INJECTED_CONTROLLERS) {
+		console.log('here');
+		return getControllersByPallets(
+			(api.registry.metadata.toJSON().pallets as unknown as Record<string, unknown>[]).map((p) => p.name as string),
+			api,
+			specName,
+		);
+	} else {
+		return getControllersForSpec(api, specName);
+	}
+};

src/controllers/controllerInjection.spec.ts

@@ -1,8 +1,9 @@
 // write tests that get the metadata from an rpc and then inject the metadata into the controller
 
 import { ApiPromise, WsProvider } from '@polkadot/api';
+import { ISidecarConfig } from 'src/types/sidecar-config';
 
-import { specToControllerMap } from '../chains-config';
+import { getControllers, specToControllerMap } from '../chains-config';
 import { defaultControllers } from '../chains-config/defaultControllers';
 import { controllers } from '.';
 
@@ -13,6 +14,42 @@ import { controllers } from '.';
  * @param implName
  */
 
+const mockSidecarConfig: ISidecarConfig = {
+	EXPRESS: {
+		HOST: '',
+		PORT: 3000,
+		KEEP_ALIVE_TIMEOUT: 5000,
+		MAX_BODY: '100kb',
+		INJECTED_CONTROLLERS: false,
+	},
+	SUBSTRATE: {
+		URL: '',
+		TYPES_BUNDLE: '',
+		TYPES_CHAIN: '',
+		TYPES_SPEC: '',
+		TYPES: '',
+		CACHE_CAPACITY: 1000,
+	},
+	LOG: {
+		LEVEL: 'info',
+		JSON: false,
+		FILTER_RPC: false,
+		STRIP_ANSI: false,
+		WRITE: false,
+		WRITE_PATH: '',
+		WRITE_MAX_FILE_SIZE: 0,
+		WRITE_MAX_FILES: 0,
+	},
+	METRICS: {
+		ENABLED: false,
+		PROM_HOST: '',
+		PROM_PORT: 0,
+		LOKI_HOST: '',
+		LOKI_PORT: 0,
+		INCLUDE_QUERYPARAMS: false,
+	},
+};
+
 const chainsToNode: Record<string, string> = {
 	'asset-hub-kusama': 'wss://asset-hub-kusama-rpc.dwellir.com',
 	kusama: 'wss://kusama-rpc.dwellir.com',
@@ -58,4 +95,44 @@ describe('controllerInjection', () => {
 			expect(filtered).toHaveLength(0);
 		});
 	}
+
+	it('should inject default controllers when pallets are not checked (injected-controllers: false) and a custom config is not available', async () => {
+		const wsProvider = new WsProvider('wss://kusama-rpc.dwellir.com');
+		const api = await ApiPromise.create({ provider: wsProvider });
+		try {
+			await api.isReady;
+		} finally {
+			await api?.disconnect(); // Close WebSocket connection
+		}
+
+		const controllers = getControllers(
+			api,
+			{
+				...mockSidecarConfig,
+				EXPRESS: {
+					...mockSidecarConfig.EXPRESS,
+					INJECTED_CONTROLLERS: true,
+				},
+			},
+			'kusama_go_default',
+		);
+
+		expect(controllers).toBeDefined();
+		expect(controllers).not.toHaveLength(0);
+
+		const controllersDefault = getControllers(
+			api,
+			{
+				...mockSidecarConfig,
+				EXPRESS: {
+					...mockSidecarConfig.EXPRESS,
+					INJECTED_CONTROLLERS: false,
+				},
+			},
+			'kusama_go_default',
+		);
+
+		expect(controllersDefault).toBeDefined();
+		expect(controllersDefault).toHaveLength(defaultControllers.controllers.length);
+	});
 });

src/main.ts

@@ -26,7 +26,7 @@ import { json } from 'express';
 
 import packageJSON from '../package.json';
 import App from './App';
-import { getControllersByPallets, getControllersForSpec } from './chains-config';
+import { getControllers } from './chains-config';
 import { consoleOverride } from './logging/consoleOverride';
 import { Log } from './logging/Log';
 import { MetricsApp } from './metrics/index';
@@ -80,17 +80,9 @@ async function main() {
 		metricsApp.listen();
 	}
 
-	const controllers = !config.EXPRESS.INJECTED_CONTROLLERS
-		? getControllersForSpec(api, specName.toString())
-		: getControllersByPallets(
-				(api.registry.metadata.toJSON().pallets as unknown as Record<string, unknown>[]).map((p) => p.name as string),
-				api,
-				specName.toString(),
-			);
-
 	const app = new App({
 		preMiddleware: preMiddlewares,
-		controllers: controllers,
+		controllers: getControllers(api, config, specName.toString()),
 		postMiddleware: [
 			middleware.txError,
 			middleware.httpError,