ci: Bump version to 0.2.10 [skip ci]

.gitea/workflows/deploy-to-test.yml

@@ -90,10 +90,11 @@ jobs:
         # integration test suite can launch its own, fresh server instance.
         # '|| true' ensures the workflow doesn't fail if the process isn't running.
         run: |
-          pm2 stop flyer-crawler-api-test || true
-          pm2 stop flyer-crawler-worker-test || true
-          pm2 delete flyer-crawler-api-test || true
-          pm2 delete flyer-crawler-worker-test || true
+          echo "--- Stopping and deleting all test processes ---"
+          # Use a script to parse pm2's JSON output and delete any process whose name ends with '-test'.
+          # This is safer than 'pm2 delete all' and more robust than naming each process individually.
+          # It prevents the accumulation of duplicate processes from previous test runs.
+          node -e "const exec = require('child_process').execSync; try { const list = JSON.parse(exec('pm2 jlist').toString()); list.forEach(p => { if (p.name && p.name.endsWith('-test')) { console.log('Deleting test process: ' + p.name + ' (' + p.pm2_env.pm_id + ')'); try { exec('pm2 delete ' + p.pm2_env.pm_id); } catch(e) { console.error('Failed to delete ' + p.pm2_env.pm_id, e.message); } } }); console.log('✅ Test process cleanup complete.'); } catch (e) { if (e.stdout.toString().includes('No process found')) { console.log('No PM2 processes running, cleanup not needed.'); } else { console.error('Error cleaning up test processes:', e.message); } }" || true
 
       - name: Run All Tests and Generate Merged Coverage Report
         # This single step runs both unit and integration tests, then merges their

ecosystem.config.cjs

@@ -7,19 +7,21 @@ module.exports = {
   apps: [
     {
       // --- API Server ---
-      // The name is now dynamically set based on the environment.
-      // This is a common pattern but requires you to call pm2 with the correct name.
-      // The deploy script handles this by using 'flyer-crawler-api' for prod and 'flyer-crawler-api-test' for test.
       name: 'flyer-crawler-api',
       script: './node_modules/.bin/tsx',
-      args: 'server.ts', // tsx will execute this file
-      max_memory_restart: '500M', // Restart if memory usage exceeds 500MB
+      args: 'server.ts',
+      max_memory_restart: '500M',
+      
+      // Restart Logic
+      max_restarts: 40,
+      exp_backoff_restart_delay: 100,
+      min_uptime: '10s',
+
       // Production Environment Settings
       env_production: {
-        NODE_ENV: 'production', // Set the Node.js environment to production
+        NODE_ENV: 'production',
         name: 'flyer-crawler-api',
         cwd: '/var/www/flyer-crawler.projectium.com',
-        // Inherit secrets from the deployment environment
         DB_HOST: process.env.DB_HOST,
         DB_USER: process.env.DB_USER,
         DB_PASSWORD: process.env.DB_PASSWORD,
@@ -39,10 +41,9 @@ module.exports = {
       },
       // Test Environment Settings
       env_test: {
-        NODE_ENV: 'test', // Set to 'test' to match the environment purpose and disable pino-pretty
+        NODE_ENV: 'test',
         name: 'flyer-crawler-api-test',
         cwd: '/var/www/flyer-crawler-test.projectium.com',
-        // Inherit secrets from the deployment environment
         DB_HOST: process.env.DB_HOST,
         DB_USER: process.env.DB_USER,
         DB_PASSWORD: process.env.DB_PASSWORD,
@@ -66,7 +67,6 @@ module.exports = {
         name: 'flyer-crawler-api-dev',
         watch: true,
         ignore_watch: ['node_modules', 'logs', '*.log', 'flyer-images', '.git'],
-        // Inherit secrets from the deployment environment
         DB_HOST: process.env.DB_HOST,
         DB_USER: process.env.DB_USER,
         DB_PASSWORD: process.env.DB_PASSWORD,
@@ -89,14 +89,19 @@ module.exports = {
       // --- General Worker ---
       name: 'flyer-crawler-worker',
       script: './node_modules/.bin/tsx',
-      args: 'src/services/worker.ts', // tsx will execute this file
-      max_memory_restart: '1G', // Restart if memory usage exceeds 1GB
+      args: 'src/services/worker.ts',
+      max_memory_restart: '1G',
+      
+      // Restart Logic
+      max_restarts: 40,
+      exp_backoff_restart_delay: 100,
+      min_uptime: '10s',
+
       // Production Environment Settings
       env_production: {
         NODE_ENV: 'production',
         name: 'flyer-crawler-worker',
         cwd: '/var/www/flyer-crawler.projectium.com',
-        // Inherit secrets from the deployment environment
         DB_HOST: process.env.DB_HOST,
         DB_USER: process.env.DB_USER,
         DB_PASSWORD: process.env.DB_PASSWORD,
@@ -119,7 +124,6 @@ module.exports = {
         NODE_ENV: 'test',
         name: 'flyer-crawler-worker-test',
         cwd: '/var/www/flyer-crawler-test.projectium.com',
-        // Inherit secrets from the deployment environment
         DB_HOST: process.env.DB_HOST,
         DB_USER: process.env.DB_USER,
         DB_PASSWORD: process.env.DB_PASSWORD,
@@ -143,7 +147,6 @@ module.exports = {
         name: 'flyer-crawler-worker-dev',
         watch: true,
         ignore_watch: ['node_modules', 'logs', '*.log', 'flyer-images', '.git'],
-        // Inherit secrets from the deployment environment
         DB_HOST: process.env.DB_HOST,
         DB_USER: process.env.DB_USER,
         DB_PASSWORD: process.env.DB_PASSWORD,
@@ -166,14 +169,19 @@ module.exports = {
       // --- Analytics Worker ---
       name: 'flyer-crawler-analytics-worker',
       script: './node_modules/.bin/tsx',
-      args: 'src/services/worker.ts', // tsx will execute this file
-      max_memory_restart: '1G', // Restart if memory usage exceeds 1GB
+      args: 'src/services/worker.ts',
+      max_memory_restart: '1G',
+      
+      // Restart Logic
+      max_restarts: 40,
+      exp_backoff_restart_delay: 100,
+      min_uptime: '10s',
+
       // Production Environment Settings
       env_production: {
         NODE_ENV: 'production',
         name: 'flyer-crawler-analytics-worker',
         cwd: '/var/www/flyer-crawler.projectium.com',
-        // Inherit secrets from the deployment environment
         DB_HOST: process.env.DB_HOST,
         DB_USER: process.env.DB_USER,
         DB_PASSWORD: process.env.DB_PASSWORD,
@@ -196,7 +204,6 @@ module.exports = {
         NODE_ENV: 'test',
         name: 'flyer-crawler-analytics-worker-test',
         cwd: '/var/www/flyer-crawler-test.projectium.com',
-        // Inherit secrets from the deployment environment
         DB_HOST: process.env.DB_HOST,
         DB_USER: process.env.DB_USER,
         DB_PASSWORD: process.env.DB_PASSWORD,
@@ -220,7 +227,6 @@ module.exports = {
         name: 'flyer-crawler-analytics-worker-dev',
         watch: true,
         ignore_watch: ['node_modules', 'logs', '*.log', 'flyer-images', '.git'],
-        // Inherit secrets from the deployment environment
         DB_HOST: process.env.DB_HOST,
         DB_USER: process.env.DB_USER,
         DB_PASSWORD: process.env.DB_PASSWORD,

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "flyer-crawler",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "flyer-crawler",
-      "version": "0.2.8",
+      "version": "0.2.10",
       "dependencies": {
         "@bull-board/api": "^6.14.2",
         "@bull-board/express": "^6.14.2",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "flyer-crawler",
   "private": true,
-  "version": "0.2.8",
+  "version": "0.2.10",
   "type": "module",
   "scripts": {
     "dev": "concurrently \"npm:start:dev\" \"vite\"",

src/App.test.tsx

@@ -21,7 +21,6 @@ import {
   mockUseFlyerItems,
 } from './tests/setup/mockHooks';
 import { useAppInitialization } from './hooks/useAppInitialization';
-import { useModal } from './hooks/useModal';
 
 // Mock top-level components rendered by App's routes
 
@@ -57,10 +56,6 @@ vi.mock('./hooks/useFlyerItems', async () => {
 vi.mock('./hooks/useAppInitialization');
 const mockedUseAppInitialization = vi.mocked(useAppInitialization);
 
-// Mock useModal directly in this file to avoid dependency on mockHooks.ts
-vi.mock('./hooks/useModal');
-const mockedUseModal = vi.mocked(useModal);
-
 vi.mock('./hooks/useAuth', async () => {
   const hooks = await import('./tests/setup/mockHooks');
   return { useAuth: hooks.mockUseAuth };
@@ -131,11 +126,21 @@ vi.mock('./layouts/MainLayout', async () => {
   return { MainLayout: MockMainLayout };
 });
 
-vi.mock('./components/AppGuard', () => ({
-  AppGuard: ({ children }: { children: React.ReactNode }) => (
-    <div data-testid="app-guard-mock">{children}</div>
-  ),
-}));
+vi.mock('./components/AppGuard', async () => {
+  // We need to use the real useModal hook inside our mock AppGuard
+  const { useModal } = await vi.importActual<typeof import('./hooks/useModal')>('./hooks/useModal');
+  return {
+    AppGuard: ({ children }: { children: React.ReactNode }) => {
+      const { isModalOpen } = useModal();
+      return (
+        <div data-testid="app-guard-mock">
+          {children}
+          {isModalOpen('whatsNew') && <div data-testid="whats-new-modal-mock" />}
+        </div>
+      );
+    },
+  };
+});
 
 const mockedAiApiClient = vi.mocked(aiApiClient);
 const mockedApiClient = vi.mocked(apiClient);
@@ -196,11 +201,6 @@ describe('App Component', () => {
       error: null,
     });
     mockedUseAppInitialization.mockReturnValue({ isDarkMode: false, unitSystem: 'imperial' });
-    mockedUseModal.mockReturnValue({
-      isModalOpen: vi.fn(),
-      openModal: vi.fn(),
-      closeModal: vi.fn(),
-    });
 
     // Default mocks for API calls
     // Use mockImplementation to create a new Response object for each call,
@@ -391,6 +391,7 @@ describe('App Component', () => {
 
   describe('Modal Interactions', () => {
     it('should open and close the ProfileManager modal', async () => {
+      console.log('[TEST DEBUG] Test Start: should open and close the ProfileManager modal');
       renderApp();
       expect(screen.queryByTestId('profile-manager-mock')).not.toBeInTheDocument();
 
@@ -398,11 +399,13 @@ describe('App Component', () => {
       fireEvent.click(screen.getByText('Open Profile'));
       expect(await screen.findByTestId('profile-manager-mock')).toBeInTheDocument();
 
+      console.log('[TEST DEBUG] ProfileManager modal opened. Now closing...');
       // Close modal
       fireEvent.click(screen.getByText('Close Profile'));
       await waitFor(() => {
         expect(screen.queryByTestId('profile-manager-mock')).not.toBeInTheDocument();
       });
+      console.log('[TEST DEBUG] ProfileManager modal closed.');
     });
 
     it('should open and close the VoiceAssistant modal for authenticated users', async () => {
@@ -427,7 +430,7 @@ describe('App Component', () => {
       fireEvent.click(screen.getByText('Open Voice Assistant'));
 
       console.log('[TEST DEBUG] Waiting for voice-assistant-mock');
-      expect(await screen.findByTestId('voice-assistant-mock')).toBeInTheDocument();
+      expect(await screen.findByTestId('voice-assistant-mock', {}, { timeout: 3000 })).toBeInTheDocument();
 
       // Close modal
       fireEvent.click(screen.getByText('Close Voice Assistant'));
@@ -586,7 +589,7 @@ describe('App Component', () => {
       renderApp();
       console.log('[TEST DEBUG] Opening Profile');
       fireEvent.click(screen.getByText('Open Profile'));
-      const loginButton = await screen.findByText('Login');
+      const loginButton = await screen.findByRole('button', { name: 'Login' });
       console.log('[TEST DEBUG] Clicking Login');
       fireEvent.click(loginButton);
 
@@ -622,7 +625,8 @@ describe('App Component', () => {
       renderApp();
       const openButton = await screen.findByTitle("Show what's new in this version");
       fireEvent.click(openButton);
-      expect(mockedUseModal().openModal).toHaveBeenCalledWith('whatsNew');
+      // The mock AppGuard now renders the modal when it's open
+      expect(await screen.findByTestId('whats-new-modal-mock')).toBeInTheDocument();
     });
   });
 });

src/hooks/useAppInitialization.test.tsx

@@ -28,7 +28,7 @@ const mockedUseAuth = vi.mocked(useAuth);
 const mockedUseModal = vi.mocked(useModal);
 const mockedUseNavigate = vi.mocked(useNavigate);
 
-const mockLogin = vi.fn();
+const mockLogin = vi.fn().mockResolvedValue(undefined);
 const mockNavigate = vi.fn();
 const mockOpenModal = vi.fn();
 

src/hooks/useAppInitialization.ts

@@ -69,7 +69,7 @@ export const useAppInitialization = () => {
     if (userProfile && userProfile.preferences?.darkMode !== undefined) {
       localStorage.setItem('darkMode', String(userProfile.preferences.darkMode));
     }
-  }, [userProfile?.preferences?.darkMode, userProfile?.user.user_id]);
+  }, [userProfile]);
 
   // Effect to set initial unit system based on user profile or local storage
   useEffect(() => {

src/layouts/MainLayout.test.tsx

@@ -79,7 +79,7 @@ vi.mock('../pages/admin/ActivityLog', async () => {
     ),
   };
 });
-vi.mock('../pages/admin/components/AnonymousUserBanner', () => ({
+vi.mock('../components/AnonymousUserBanner', () => ({
   AnonymousUserBanner: () => <div data-testid="anonymous-banner" />,
 }));
 vi.mock('../components/ErrorDisplay', () => ({

src/pages/admin/components/AuthView.test.tsx

@@ -374,7 +374,11 @@ describe('AuthView', () => {
     fireEvent.submit(screen.getByTestId('auth-form'));
 
     await waitFor(() => {
-      expect(screen.getByRole('button', { name: 'Register' })).toBeDisabled();
+      const submitButton = screen.getByTestId('auth-form').querySelector('button[type="submit"]');
+      expect(submitButton).toBeInTheDocument();
+      expect(submitButton).toBeDisabled();
+      // Verify the text 'Register' is gone from any button
+      expect(screen.queryByRole('button', { name: 'Register' })).not.toBeInTheDocument();
     });
   });
 });