Merge branch 'main' into improve-endpoint-status-codes

Author: jescalada

test/ConfigLoader.test.ts

@@ -332,13 +332,13 @@ describe('ConfigLoader', () => {
     });
 
     it('should load configuration from git repository', async function () {
-      const source = {
+      const source: GitSource = {
         type: 'git',
         repository: 'https://github.com/finos/git-proxy.git',
         path: 'proxy.config.json',
         branch: 'main',
         enabled: true,
-      } as GitSource;
+      };
 
       const config = await configLoader.loadFromSource(source);
 
@@ -348,37 +348,37 @@ describe('ConfigLoader', () => {
     }, 10000);
 
     it('should throw error for invalid configuration file path (git)', async () => {
-      const source = {
+      const source: GitSource = {
         type: 'git',
         repository: 'https://github.com/finos/git-proxy.git',
         path: '\0', // Invalid path
         branch: 'main',
         enabled: true,
-      } as GitSource;
+      };
 
       await expect(configLoader.loadFromSource(source)).rejects.toThrow(
         'Invalid configuration file path in repository',
       );
     });
 
     it('should throw error for invalid configuration file path (file)', async () => {
-      const source = {
+      const source: FileSource = {
         type: 'file',
         path: '\0', // Invalid path
         enabled: true,
-      } as FileSource;
+      };
 
       await expect(configLoader.loadFromSource(source)).rejects.toThrow(
         'Invalid configuration file path',
       );
     });
 
     it('should load configuration from http', async function () {
-      const source = {
+      const source: HttpSource = {
         type: 'http',
         url: 'https://raw.githubusercontent.com/finos/git-proxy/refs/heads/main/proxy.config.json',
         enabled: true,
-      } as HttpSource;
+      };
 
       const config = await configLoader.loadFromSource(source);
 
@@ -388,27 +388,27 @@ describe('ConfigLoader', () => {
     }, 10000);
 
     it('should throw error if repository is invalid', async () => {
-      const source = {
+      const source: GitSource = {
         type: 'git',
         repository: 'invalid-repository',
         path: 'proxy.config.json',
         branch: 'main',
         enabled: true,
-      } as GitSource;
+      };
 
       await expect(configLoader.loadFromSource(source)).rejects.toThrow(
         'Invalid repository URL format',
       );
     });
 
     it('should throw error if branch name is invalid', async () => {
-      const source = {
+      const source: GitSource = {
         type: 'git',
         repository: 'https://github.com/finos/git-proxy.git',
         path: 'proxy.config.json',
         branch: '..', // invalid branch pattern
         enabled: true,
-      } as GitSource;
+      };
 
       await expect(configLoader.loadFromSource(source)).rejects.toThrow(
         'Invalid branch name format',

test/proxy.test.ts

@@ -12,7 +12,8 @@ import fs from 'fs';
 
   Related: skipped tests in testProxyRoute.test.ts - these have a race condition
   where either these or those tests fail depending on execution order
-  TODO: Find root cause of this error and fix it
+  TODO: Find root cause of this error and fix it 
+  https://github.com/finos/git-proxy/issues/1294
 */
 describe.skip('Proxy Module TLS Certificate Loading', () => {
   let proxyModule: any;
@@ -111,8 +112,8 @@ describe.skip('Proxy Module TLS Certificate Loading', () => {
   afterEach(async () => {
     try {
       await proxyModule.stop();
-    } catch {
-      // ignore cleanup errors
+    } catch (err) {
+      console.error('Error occurred when stopping the proxy: ', err);
     }
     vi.restoreAllMocks();
   });

test/testProxyRoute.test.ts

@@ -20,23 +20,23 @@ import service from '../src/service';
 const TEST_DEFAULT_REPO = {
   url: 'https://github.com/finos/git-proxy.git',
   name: 'git-proxy',
-  project: 'finos/git-proxy',
+  project: 'finos',
   host: 'github.com',
   proxyUrlPrefix: '/github.com/finos/git-proxy.git',
 };
 
 const TEST_GITLAB_REPO = {
   url: 'https://gitlab.com/gitlab-community/meta.git',
   name: 'gitlab',
-  project: 'gitlab-community/meta',
+  project: 'gitlab-community',
   host: 'gitlab.com',
   proxyUrlPrefix: '/gitlab.com/gitlab-community/meta.git',
 };
 
 const TEST_UNKNOWN_REPO = {
   url: 'https://github.com/finos/fdc3.git',
   name: 'fdc3',
-  project: 'finos/fdc3',
+  project: 'finos',
   host: 'github.com',
   proxyUrlPrefix: '/github.com/finos/fdc3.git',
   fallbackUrlPrefix: '/finos/fdc3.git',
@@ -214,6 +214,31 @@ describe.skip('proxy express application', () => {
     expect(res2.status).toBe(200);
     expect(res2.text).toContain('Rejecting repo');
   }, 5000);
+
+  it('should create the default repo if it does not exist', async function () {
+    // Remove the default repo from the db and check it no longer exists
+    await cleanupRepo(TEST_DEFAULT_REPO.url);
+
+    const repo = await db.getRepoByUrl(TEST_DEFAULT_REPO.url);
+    expect(repo).toBeNull();
+
+    // Restart the proxy
+    await proxy.stop();
+    await proxy.start();
+
+    // Check that the default repo was created in the db
+    const repo2 = await db.getRepoByUrl(TEST_DEFAULT_REPO.url);
+    expect(repo2).not.toBeNull();
+
+    // Check that the default repo isn't duplicated on subsequent restarts
+    await proxy.stop();
+    await proxy.start();
+
+    const allRepos = await db.getRepos();
+    const matchingRepos = allRepos.filter((r) => r.url === TEST_DEFAULT_REPO.url);
+
+    expect(matchingRepos).toHaveLength(1);
+  });
 });
 
 describe('handleRefsErrorMessage', () => {

website/src/pages/index.js

@@ -3,7 +3,6 @@ import Layout from '@theme/Layout';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import Avatar from '../components/avatar';
 import Testimonials from './testimonials';
-import ReactPlayer from 'react-player';
 import axios from 'axios';
 
 /**
@@ -60,14 +59,17 @@ function Home() {
           </header>
           {showDemo ? (
             <section style={{ background: 'black' }}>
-              <ReactPlayer
-                url='https://www.finos.org/hubfs/Projects%20%2B%20SIGs/Open%20Source%20Readiness%20OSR/OSR%20Meeting_%20GitProxy%20Jamie%20Slome%20Citi%20Presentation.mp4#t=496'
-                controls={true}
-                width='100%'
-                pip={true}
-                stopOnUnmount={false}
-                playing={true}
-              />
+              <video
+                controls
+                style={{ width: '100%', display: 'block', aspectRatio: '16/9' }}
+                preload='metadata'
+              >
+                <source
+                  src='https://www.finos.org/hubfs/Projects%20%2B%20SIGs/Open%20Source%20Readiness%20OSR/OSR%20Meeting_%20GitProxy%20Jamie%20Slome%20Citi%20Presentation.mp4#t=496'
+                  type='video/mp4'
+                />
+                Your browser does not support the video tag.
+              </video>
             </section>
           ) : (
             <section className='terminal'>