Merge branch 'main' into dependabot/npm_and_yarn/main/eslint/js-10.0.1

Author: adamtasteslikegood

.github/workflows/ci-cd-backend.yml

@@ -18,13 +18,13 @@ jobs:
     name: Install & pytest
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.12'
-      - uses: astral-sh/setup-uv@v5
+      - uses: astral-sh/setup-uv@v7
       - name: Install dependencies
         working-directory: Backend
         run: uv sync

.github/workflows/ci-cd.yml

@@ -19,15 +19,15 @@ jobs:
     name: Install dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: '20'
           cache: npm
       - run: npm ci
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         with:
           path: node_modules
           key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
@@ -37,12 +37,12 @@ jobs:
     needs: [install]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
         with:
           node-version: '20'
           cache: npm
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         with:
           path: node_modules
           key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}

.github/workflows/daily-repo-status.lock.yml

@@ -24,5 +24,5 @@ jobs:
           fail-on-severity: high
           # Comment on the PR with a summary of changes
           comment-summary-in-pr: always
-          # Deny copyleft licenses incompatible with the project's proprietary distribution
-          deny-licenses: GPL-2.0-only, GPL-3.0-only, AGPL-3.0-only
+          # Retry if snapshots are not immediately available
+          retry-on-snapshot-warnings: true

.github/workflows/dependency-review.yml

@@ -0,0 +1,28 @@
+name: Dependency Submission
+
+on:
+  push:
+    branches: [main, develop]
+  pull_request:
+    branches: [main, develop]
+
+permissions:
+  contents: write
+
+jobs:
+  dependency-submission:
+    name: Submit Dependency Snapshot
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: '20'
+          cache: 'npm'
+
+      - name: Submit npm dependency snapshot
+        uses: actions/npm-dependency-submission-action@v1

.github/workflows/dependency-submission.yml

@@ -94,10 +94,10 @@ jobs:
       - uses: actions/checkout@v6
         with:
           submodules: recursive
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: '3.12'
-      - uses: astral-sh/setup-uv@v5
+      - uses: astral-sh/setup-uv@v7
       - name: Install backend dependencies
         working-directory: Backend
         run: uv sync

.github/workflows/pr-gate.yml

@@ -6,6 +6,18 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ---
 
+## [Unreleased]
+
+### Fixed
+
+- Catch `shutdownValkey()` failures inside `createValkeyClient()` so a broken `quit()` cannot prevent reinitialization or fallback to in-memory rate limiting ([TAS-48](https://linear.app/tasteslikegood/issue/TAS-48/catch-quit-failures-before-reinitializing-valkey-client))
+
+### Changed
+
+- Mark all `inject()` service references as `readonly` across Angular components and services ([TAS-2707](https://linear.app/tasteslikegood/issue/TAS-2707/find-a-small-improvement-copy))
+- Use `Number.parseInt()` instead of global `parseInt()` in `server/valkey.ts` for consistency with the rest of the codebase
+- Add descriptive context to bare `console.error()` in recipe import error handler
+
 ## [0.1.0] - 2026-04-13
 
 ### Added

CHANGELOG.md

@@ -74,7 +74,11 @@ export async function createValkeyClient(): Promise<Redis | null> {
     // removed, tear it down to avoid leaking handles (e.g. in tests / dev).
     if (client) {
       console.warn('[Valkey] VALKEY_HOST removed — shutting down existing client');
-      await shutdownValkey();
+      try {
+        await shutdownValkey();
+      } catch (err) {
+        console.error('[Valkey] Shutdown failed during cleanup:', (err as Error).message);
+      }
     }
     console.log('[Valkey] VALKEY_HOST not set — using in-memory rate limiting');
     return null;
@@ -86,13 +90,18 @@ export async function createValkeyClient(): Promise<Redis | null> {
       await client.ping();
       return client;
     } catch {
-      // Existing client is unhealthy — tear it down before reinitializing
+      // Existing client is unhealthy — tear it down before reinitializing.
+      // Catch shutdown errors so a broken quit() cannot prevent reinitialization.
       console.warn('[Valkey] Existing client unhealthy, reinitializing...');
-      await shutdownValkey();
+      try {
+        await shutdownValkey();
+      } catch (err) {
+        console.error('[Valkey] Shutdown failed during reinit:', (err as Error).message);
+      }
     }
   }
 
-  const port = parseInt(process.env.VALKEY_PORT || '6379', 10);
+  const port = Number.parseInt(process.env.VALKEY_PORT || '6379', 10);
   const authMode = process.env.VALKEY_AUTH_MODE;
 
   try {
@@ -149,7 +158,11 @@ export async function createValkeyClient(): Promise<Redis | null> {
     return client;
   } catch (err) {
     console.error('[Valkey] Connection failed, falling back to in-memory rate limiting:', err);
-    await shutdownValkey();
+    try {
+      await shutdownValkey();
+    } catch (shutdownErr) {
+      console.error('[Valkey] Shutdown failed during fallback:', (shutdownErr as Error).message);
+    }
     return null;
   }
 }

server/valkey.ts

@@ -14,9 +14,9 @@ import { Ingredient, IngredientGroup, Recipe } from './recipe.types';
   styleUrls: [],
 })
 export class AppComponent {
-  private geminiService = inject(GeminiService);
-  private persistenceService = inject(PersistenceService);
-  authService = inject(AuthService);
+  private readonly geminiService = inject(GeminiService);
+  private readonly persistenceService = inject(PersistenceService);
+  readonly authService = inject(AuthService);
 
   // Navigation
   activeView = signal<'generator' | 'kitchen'>('generator');
@@ -392,7 +392,7 @@ export class AppComponent {
           alert(`Successfully imported ${count} recipes!`);
         }
       } catch (err) {
-        console.error(err);
+        console.error('Failed to parse recipe import file:', err);
         alert('Failed to parse recipe file. Please ensure it is valid JSON.');
       }
     };

src/app.component.ts

@@ -20,7 +20,7 @@ import { Cookbook } from '../auth.types';
 export class PersistenceService {
   /** Prevents duplicate API loads for the same session. */
   private _apiSynced = false;
-  private auth = inject(AuthService);
+  private readonly auth = inject(AuthService);
 
   constructor() {
     // Auto-load from API when a logged-in user's session is confirmed.