test(config): cover required defaults handling

Author: dcoric

src/config/index.ts

@@ -62,7 +62,7 @@ type MissingRequiredTopLevelConfigKeys = Exclude<
 type AssertNever<T extends never> = T;
 type _RequiredTopLevelConfigKeysAreExhaustive = AssertNever<MissingRequiredTopLevelConfigKeys>;
 
-function assertHasRequiredTopLevelConfig(
+export function assertHasRequiredTopLevelConfig(
   config: GitProxyConfig,
 ): asserts config is FullGitProxyConfig {
   const missingKeys = REQUIRED_TOP_LEVEL_CONFIG_KEYS.filter((key) => config[key] === undefined);
@@ -375,7 +375,7 @@ const handleConfigUpdate = async (newConfig: Configuration) => {
     const validatedConfig = Convert.toGitProxyConfig(JSON.stringify(newConfig));
 
     // 2. Get proxy module dynamically to avoid circular dependency
-    const proxy = require('../proxy');
+    const proxy = (await import('../proxy')) as any;
 
     // 3. Stop existing services
     await proxy.stop();
@@ -392,7 +392,7 @@ const handleConfigUpdate = async (newConfig: Configuration) => {
     handleErrorAndLog(error, 'Failed to apply new configuration');
     // Attempt to restart with previous config
     try {
-      const proxy = require('../proxy');
+      const proxy = (await import('../proxy')) as any;
       await proxy.start();
     } catch (startError: unknown) {
       handleErrorAndLog(startError, 'Failed to restart services');

test/testConfig.test.ts

@@ -426,24 +426,29 @@ describe('Configuration Update Handling', () => {
   let tempUserFile: string;
   let oldEnv: NodeJS.ProcessEnv;
 
+  const waitForMockCall = async (mock: MockInstance, callCount = 1) => {
+    for (let i = 0; i < 20; i += 1) {
+      if (mock.mock.calls.length >= callCount) {
+        return;
+      }
+      await new Promise((resolve) => setTimeout(resolve, 10));
+    }
+  };
+
   beforeEach(() => {
     oldEnv = { ...process.env };
     tempDir = fs.mkdtempSync('gitproxy-test');
     tempUserFile = path.join(tempDir, 'test-settings.json');
+    process.env.CONFIG_FILE = tempUserFile;
     configFile.setConfigFile(tempUserFile);
   });
 
   it('should test ConfigLoader initialization', async () => {
     const configWithSources = {
+      ...defaultSettings,
       configurationSources: {
         enabled: true,
-        sources: [
-          {
-            type: 'file',
-            enabled: true,
-            path: tempUserFile,
-          },
-        ],
+        sources: [],
       },
     };
 
@@ -481,15 +486,98 @@ describe('Configuration Update Handling', () => {
     consoleErrorSpy.mockRestore();
   });
 
-  afterEach(() => {
-    if (fs.existsSync(tempUserFile)) {
-      fs.rmSync(tempUserFile, { force: true });
+  it('should apply valid configuration updates from external sources', async () => {
+    const updatedConfigFile = path.join(tempDir, 'updated-settings.json');
+    const proxyStop = vi.fn().mockResolvedValue(undefined);
+    const proxyStart = vi.fn().mockResolvedValue(undefined);
+    vi.doMock('../src/proxy', () => ({
+      stop: proxyStop,
+      start: proxyStart,
+    }));
+
+    const configWithSources = {
+      configurationSources: {
+        enabled: true,
+        sources: [
+          {
+            type: 'file',
+            enabled: true,
+            path: updatedConfigFile,
+          },
+        ],
+      },
+    };
+    const updatedConfig = {
+      ...defaultSettings,
+      configurationSources: configWithSources.configurationSources,
+      sessionMaxAgeHours: 8,
+    };
+
+    fs.writeFileSync(tempUserFile, JSON.stringify(configWithSources));
+    fs.writeFileSync(updatedConfigFile, JSON.stringify(updatedConfig));
+
+    const config = await import('../src/config');
+
+    await waitForMockCall(proxyStart);
+
+    expect(proxyStop).toHaveBeenCalledTimes(1);
+    expect(proxyStart).toHaveBeenCalledTimes(1);
+    expect(config.getSessionMaxAgeHours()).toBe(updatedConfig.sessionMaxAgeHours);
+  });
+
+  it('should restart the proxy with the previous config when updates fail', async () => {
+    const updatedConfigFile = path.join(tempDir, 'updated-settings.json');
+    const proxyStop = vi.fn().mockRejectedValue(new Error('stop failed'));
+    const proxyStart = vi.fn().mockResolvedValue(undefined);
+    vi.doMock('../src/proxy', () => ({
+      stop: proxyStop,
+      start: proxyStart,
+    }));
+    const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+
+    const configWithSources = {
+      configurationSources: {
+        enabled: true,
+        sources: [
+          {
+            type: 'file',
+            enabled: true,
+            path: updatedConfigFile,
+          },
+        ],
+      },
+    };
+    const updatedConfig = {
+      ...defaultSettings,
+      configurationSources: configWithSources.configurationSources,
+      sessionMaxAgeHours: 8,
+    };
+
+    fs.writeFileSync(tempUserFile, JSON.stringify(configWithSources));
+    fs.writeFileSync(updatedConfigFile, JSON.stringify(updatedConfig));
+
+    try {
+      await import('../src/config');
+
+      await waitForMockCall(proxyStart);
+
+      expect(proxyStop).toHaveBeenCalledTimes(1);
+      expect(proxyStart).toHaveBeenCalledTimes(1);
+      expect(consoleErrorSpy).toHaveBeenCalledWith(
+        'Failed to apply new configuration: stop failed',
+      );
+    } finally {
+      consoleErrorSpy.mockRestore();
     }
+  });
+
+  afterEach(() => {
     if (fs.existsSync(tempDir)) {
-      fs.rmdirSync(tempDir);
+      fs.rmSync(tempDir, { recursive: true, force: true });
     }
     process.env = oldEnv;
 
+    vi.doUnmock('../src/proxy');
     vi.resetModules();
   });
 });
@@ -591,5 +679,14 @@ describe('loadFullConfiguration', () => {
         'Invalid regular expression for commitConfig.author.email.local.block: [invalid(regex',
       );
     });
+
+    it('should throw error when merged defaults miss required top-level values', async () => {
+      const config = await import('../src/config');
+      const settingsWithoutSink = { ...defaultSettings, sink: undefined };
+
+      expect(() => config.assertHasRequiredTopLevelConfig(settingsWithoutSink)).toThrow(
+        'Missing required top-level configuration values: sink',
+      );
+    });
   });
 });