24 Commits

Author SHA1 Message Date
Antoni Nuñez Romeu 8bf0b33249 feat: add pharmacy-product linking system
Run Tests on Branches / Detect Changes (push) Successful in 12s
Run Tests on Branches / Frontend Tests (push) Has been cancelled
Run Tests on Branches / Frontend Mobile Tests (push) Has been cancelled
Run Tests on Branches / Backend Tests (push) Has been cancelled
- Add pharmacy_products table (PostgreSQL + SQLite)
- Add public route GET /api/products/:source/:id/pharmacies
- Add admin CRUD routes for pharmacy-product links
- Add cascade delete when pharmacy is removed
- Update ProductView to show linked pharmacies
- Create PharmacyProductLink admin component
- Add 'Vincular Producto a Farmacia' tab in AdminView
2026-07-13 20:41:16 +02:00
Antoni Nuñez Romeu f921b15d67 fix(frontend): set screen to 'product' when navigating to product detail
Run Tests on Branches / Backend Tests (push) Has been cancelled
Run Tests on Branches / Detect Changes (push) Has been cancelled
Run Tests on Branches / Frontend Tests (push) Has been cancelled
Run Tests on Branches / Frontend Mobile Tests (push) Has been cancelled
- Add setScreen('product') to onNavigateToProduct callback
- ProductView was never rendered because screen stayed as 'search'
2026-07-13 19:50:24 +02:00
Antoni Nuñez Romeu 59edc7fbf1 fix(frontend): run medicine and product searches in parallel
Run Tests on Branches / Backend Tests (push) Has been cancelled
Run Tests on Branches / Frontend Tests (push) Has been cancelled
Run Tests on Branches / Frontend Mobile Tests (push) Has been cancelled
Run Tests on Branches / Detect Changes (push) Has been cancelled
- Use Promise.allSettled for parallel API calls
- Reduces total search time from ~1300ms to ~500ms
- Prevents results disappearing during sequential searches
2026-07-13 19:34:55 +02:00
Antoni Nuñez Romeu 731a6c98ae feat(frontend): add product detail view and navigation
Run Tests on Branches / Detect Changes (push) Successful in 12s
Run Tests on Branches / Backend Tests (push) Has been cancelled
Run Tests on Branches / Frontend Tests (push) Has been cancelled
Run Tests on Branches / Frontend Mobile Tests (push) Has been cancelled
- Create ProductView component with product details display
- Add ProductView.css with responsive styling
- Add product screen to App.jsx screen system
- Pass onNavigateToProduct callback from App to SearchView
- Update ProductResults onSelect to use callback instead of window.location
2026-07-13 17:36:52 +02:00
Antoni Nuñez Romeu 31c1a14343 feat(frontend): integrate product search in SearchView
Run Tests on Branches / Detect Changes (push) Successful in 14s
Run Tests on Branches / Frontend Tests (push) Has been cancelled
Run Tests on Branches / Frontend Mobile Tests (push) Has been cancelled
Run Tests on Branches / Backend Tests (push) Has been cancelled
- Add ProductResults component import
- Add products and searchMode state
- Add parallel product search to search effect
- Add filter tabs (Todos/Medicamentos/Parafarmacia)
- Render ProductResults when products found
- Add CSS for filter tabs and products section
2026-07-13 17:31:42 +02:00
Antoni Nuñez Romeu 25ebb899e9 debug: add logging for OFF API requests
Run Tests on Branches / Detect Changes (push) Successful in 15s
Run Tests on Branches / Frontend Mobile Tests (push) Successful in 1m57s
Run Tests on Branches / Frontend Tests (push) Failing after 13m41s
Run Tests on Branches / Backend Tests (push) Failing after 15m38s
2026-07-13 17:13:22 +02:00
Antoni Nuñez Romeu 2e3ce44e7b fix(backend): remove auth from OFF read operations
Run Tests on Branches / Detect Changes (push) Successful in 17s
Run Tests on Branches / Frontend Mobile Tests (push) Has been cancelled
Run Tests on Branches / Backend Tests (push) Has been cancelled
Run Tests on Branches / Frontend Tests (push) Has been cancelled
- READ operations don't require auth per OFF docs (only User-Agent)
- Auth credentials were causing 503 errors
- Keep User-Agent header which is required
2026-07-13 17:05:37 +02:00
Antoni Nuñez Romeu 20debdb023 fix(backend): use v2 structured search API for OFF
Run Tests on Branches / Detect Changes (push) Successful in 14s
Run Tests on Branches / Frontend Tests (push) Successful in 3m25s
Run Tests on Branches / Backend Tests (push) Has been cancelled
Run Tests on Branches / Frontend Mobile Tests (push) Has been cancelled
- Switch from /cgi/search.pl (503 errors) to /api/v2/search with brand filter
- Add required User-Agent header per OFF documentation
- Add OFF_USER_AGENT env var for customization
- Update .env.example with User-Agent documentation
- Retry logic continues to work with new endpoint
2026-07-13 17:00:09 +02:00
Antoni Nuñez Romeu 452a835b64 fix(backend): add retry logic and remove custom User-Agent for OFF API
Run Tests on Branches / Detect Changes (push) Successful in 10s
Run Tests on Branches / Frontend Tests (push) Has been cancelled
Run Tests on Branches / Frontend Mobile Tests (push) Has been cancelled
Run Tests on Branches / Backend Tests (push) Has been cancelled
- Add retry logic with exponential backoff (2 retries)
- Remove custom User-Agent that was being blocked by OFF
- Fix syntax error (missing catch block)
- OFF API blocks anonymous users during high demand
2026-07-13 16:43:54 +02:00
Antoni Nuñez Romeu f1b0eab11d feat(backend): add Open Food Facts authentication support
Run Tests on Branches / Detect Changes (push) Successful in 11s
Run Tests on Branches / Frontend Tests (push) Has been cancelled
Run Tests on Branches / Frontend Mobile Tests (push) Has been cancelled
Run Tests on Branches / Backend Tests (push) Has been cancelled
- Add OFF_USERNAME and OFF_PASSWORD env vars
- Use Basic Auth when credentials are provided
- Improves rate limits for authenticated requests
- Auth is optional (works without credentials)
2026-07-13 16:28:34 +02:00
Antoni Nuñez Romeu ee23f61057 fix(backend): improve OFF API error handling
Run Tests on Branches / Detect Changes (push) Successful in 9s
Run Tests on Branches / Frontend Tests (push) Has been cancelled
Run Tests on Branches / Frontend Mobile Tests (push) Has been cancelled
Run Tests on Branches / Backend Tests (push) Has started running
- Validate response is JSON before parsing (OFF returns HTML on 503)
- Don't cache empty results to avoid blocking future searches
- Add validateStatus to only accept 200 responses
- Better logging for API failures
2026-07-13 16:23:07 +02:00
Antoni Nuñez Romeu 26f309acfb fix(backend): switch OFF API to /cgi/search.pl endpoint and fix test imports
Run Tests on Branches / Detect Changes (push) Successful in 8s
Run Tests on Branches / Frontend Tests (push) Has been cancelled
Run Tests on Branches / Frontend Mobile Tests (push) Has been cancelled
Run Tests on Branches / Backend Tests (push) Has been cancelled
- Changed from /api/v2/search (returning 503) to /cgi/search.pl (working)
- Removed strict categories_tags=baby-food filter that was too restrictive
- Fixed test file to use dynamic imports for ES module compatibility
- Increased timeout to 10s for reliability
2026-07-13 16:18:11 +02:00
Antoni Nuñez Romeu 4df1594b3b docs: add design spec and implementation plan for parapharmacy + baby products
Run Tests on Branches / Detect Changes (push) Successful in 8s
Run Tests on Branches / Frontend Tests (push) Has been cancelled
Run Tests on Branches / Frontend Mobile Tests (push) Has been cancelled
Run Tests on Branches / Backend Tests (push) Has been cancelled
2026-07-13 15:56:00 +02:00
Antoni Nuñez Romeu 981f3bd3db fix: address code review issues — nutriscore field name, cache write isolation, missing rate limiter, dead props 2026-07-13 15:46:47 +02:00
Antoni Nuñez Romeu 83920ae57c feat: display product results alongside medicine results in MedicineResults component 2026-07-13 15:35:11 +02:00
Antoni Nuñez Romeu 7b1636a96e feat(mobile): add product detail screen for CIMA and OFF products 2026-07-13 15:33:34 +02:00
Antoni Nuñez Romeu bb2dbbab3a feat(mobile): integrate product search with filter tabs in search screen 2026-07-13 15:31:39 +02:00
Antoni Nuñez Romeu d5b23aa94a feat(mobile): add products API service with search and detail endpoints 2026-07-13 15:28:55 +02:00
Antoni Nuñez Romeu 9e786f2966 feat(frontend): integrate product search into PublicView with filter tabs 2026-07-13 15:27:47 +02:00
Antoni Nuñez Romeu a709deb893 feat(frontend): add ProductResults component for unified product search
Displays CIMA OTC and Open Food Facts baby products with source/category
badges, product images, brand info, and Nutri-Score for OFF items.
2026-07-13 15:25:35 +02:00
Antoni Nuñez Romeu 229e1d8106 Add unified product search routes (CIMA OTC + Open Food Facts)
- GET /api/products/search?q={query} - parallel search across both sources
- GET /api/products/:source/:id - product detail by source (cima/openfoodfacts)
- Uses Promise.allSettled for fault-tolerant parallel search
- Added imports for searchOTC and OFF service functions
2026-07-13 15:23:43 +02:00
Antoni Nuñez Romeu f2a5dc4ca3 feat(backend): add CIMA OTC search function with Redis caching 2026-07-13 15:18:20 +02:00
Antoni Nuñez Romeu d62e5976ce fix: remove dead BABY_CATEGORIES constant and emoji from logs 2026-07-13 15:17:02 +02:00
Antoni Nuñez Romeu d6f4164dae feat(backend): add Open Food Facts service with Redis caching
- transformOFFProduct: maps OFF products to unified Product model
- searchBabyProducts: searches baby products via OFF API (1h cache)
- getBabyProductDetails: fetches product details by barcode (1h cache)
- 9 tests passing for transform logic and input validation
2026-07-13 15:10:46 +02:00
36 changed files with 2847 additions and 1511 deletions
+5 -9
View File
@@ -31,36 +31,32 @@ jobs:
needs: detect-changes
if: needs.detect-changes.outputs.backend == 'true'
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '22'
node-version: '24'
cache: 'npm'
- name: Install dependencies
run: npm ci --ignore-scripts
- name: Install backend native deps
run: npm rebuild sqlite3 bcrypt --workspace=farma-clic-backend
run: npm ci
- name: Run tests
run: npm test --workspace=farma-clic-backend
run: npm test --workspace=farma-clic-backend -- --ci
test-frontend:
name: Frontend Tests
needs: detect-changes
if: needs.detect-changes.outputs.frontend == 'true'
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '22'
node-version: '24'
cache: 'npm'
- name: Install dependencies
run: npm ci --ignore-scripts
run: npm ci
- name: Run tests
run: npm test --workspace=farma-clic-frontend -- --run --reporter=basic
+25 -18
View File
@@ -34,36 +34,40 @@ jobs:
needs: detect-changes
if: needs.detect-changes.outputs.backend == 'true'
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- uses: actions/checkout@v4
- name: Checkout Code
uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '22'
node-version: '24'
cache: 'npm'
- name: Install dependencies
run: npm ci --ignore-scripts
- name: Install backend native deps
run: npm rebuild sqlite3 bcrypt --workspace=farma-clic-backend
- name: Install Dependencies
run: npm ci
- name: Run Backend Tests
run: npm test --workspace=farma-clic-backend
run: npm test --workspace=farma-clic-backend -- --ci
test-frontend:
name: Frontend Tests
needs: detect-changes
if: needs.detect-changes.outputs.frontend == 'true'
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- name: Checkout Code
uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '22'
node-version: '24'
cache: 'npm'
- name: Install dependencies
run: npm ci --ignore-scripts
- name: Install Dependencies
run: npm ci
- name: Run Frontend Tests
run: npm test --workspace=farma-clic-frontend -- --run --reporter=basic
@@ -72,16 +76,19 @@ jobs:
needs: detect-changes
if: needs.detect-changes.outputs.frontend-mobile == 'true'
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- name: Checkout Code
uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '22'
node-version: '24'
cache: 'npm'
- name: Install dependencies
run: npm ci --ignore-scripts
- name: Install Dependencies
run: npm ci
- name: Run Frontend Mobile Tests
run: npm test --workspace=frontend-mobile -- --ci
continue-on-error: true
+1 -1
View File
@@ -1 +1 @@
{"pid":10782,"startedAt":1783578681151}
{"pid":596137,"startedAt":1783946773113}
+12
View File
@@ -0,0 +1,12 @@
{
"$schema": "https://mimo.xiaomi.com/mimocode/config.json",
"mcp": {
"n8n": {
"type": "remote",
"url": "https://n8n.hacecalor.net/mcp-server/http",
"headers": {
"Authorization": "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJjNDE1ODI4Yy00ZWU0LTQ1MjEtOGQ3Mi0xODZmYWNjNGU4ZmEiLCJpc3MiOiJuOG4iLCJhdWQiOiJtY3Atc2VydmVyLWFwaSIsImp0aSI6ImU1YzUyNjIxLTExZDAtNDM4MC04YmRjLTlhMmQ2MDA1OGU4OSIsImlhdCI6MTc4Mzk0NjY3Mn0._0LG3CJJjUg7-g1kvMjME5nBjIEWkrfEeAZrhDxpfC4"
}
}
}
}
+7
View File
@@ -19,3 +19,10 @@ VAPID_SUBJECT=mailto:admin@example.com
# Expo Push Notifications (mobile). Get token from:
# https://expo.dev/accounts/[username]/settings/access-tokens
EXPO_ACCESS_TOKEN=
# Open Food Facts
# Register at: https://world.openfoodfacts.org/
# User-Agent is REQUIRED per OFF docs (format: AppName/Version (ContactEmail))
OFF_USER_AGENT=FarmaFinder/1.0 (https://github.com/farmafinder)
OFF_USERNAME=
OFF_PASSWORD=
+52 -37
View File
@@ -1,4 +1,19 @@
import { transformOFFProduct, searchBabyProducts, getBabyProductDetails } from '../off-service.js';
import { jest } from '@jest/globals'
jest.unstable_mockModule('../redis-client.js', () => ({
default: {
get: jest.fn(async () => null),
setEx: jest.fn(async () => 'OK'),
},
}))
jest.unstable_mockModule('axios', () => ({
default: {
get: jest.fn(async () => ({ data: { products: [] } })),
},
}))
const { transformOFFProduct, searchBabyProducts, getBabyProductDetails } = await import('../off-service.js')
describe('transformOFFProduct', () => {
test('transforms a valid OFF product to unified model', () => {
@@ -12,9 +27,9 @@ describe('transformOFFProduct', () => {
nova_group: 1,
ecoscore_grade: 'b',
categories_tags: ['en:baby-foods', 'en:baby-rice'],
};
}
const result = transformOFFProduct(offProduct);
const result = transformOFFProduct(offProduct)
expect(result).toEqual({
id: '12345',
@@ -27,66 +42,66 @@ describe('transformOFFProduct', () => {
ingredients: 'Rice, Iron, Vitamins',
nova_group: 1,
eco_score: 'b',
});
});
})
})
test('returns null for null/undefined input', () => {
expect(transformOFFProduct(null)).toBeNull();
expect(transformOFFProduct(undefined)).toBeNull();
});
expect(transformOFFProduct(null)).toBeNull()
expect(transformOFFProduct(undefined)).toBeNull()
})
test('returns null when missing required fields', () => {
expect(transformOFFProduct({ _id: '123' })).toBeNull();
expect(transformOFFProduct({ product_name: 'Test' })).toBeNull();
});
expect(transformOFFProduct({ _id: '123' })).toBeNull()
expect(transformOFFProduct({ product_name: 'Test' })).toBeNull()
})
test('sets default brand to empty string when missing', () => {
const result = transformOFFProduct({
_id: '999',
product_name: 'Plain Product',
});
expect(result.brand).toBe('');
expect(result.image_url).toBeNull();
expect(result.nutriscore).toBeNull();
expect(result.ingredients).toBeNull();
expect(result.nova_group).toBeNull();
expect(result.eco_score).toBeNull();
});
})
expect(result.brand).toBe('')
expect(result.image_url).toBeNull()
expect(result.nutriscore).toBeNull()
expect(result.ingredients).toBeNull()
expect(result.nova_group).toBeNull()
expect(result.eco_score).toBeNull()
})
test('detects baby_milk category from tags', () => {
const result = transformOFFProduct({
_id: '200',
product_name: 'Infant Formula',
categories_tags: ['en:infant-milk'],
});
expect(result.category).toBe('baby_milk');
});
})
expect(result.category).toBe('baby_milk')
})
test('detects baby_cereal category from tags', () => {
const result = transformOFFProduct({
_id: '300',
product_name: 'Baby Cereal',
categories_tags: ['en:baby-cereals'],
});
expect(result.category).toBe('baby_cereal');
});
});
})
expect(result.category).toBe('baby_cereal')
})
})
describe('searchBabyProducts', () => {
test('returns empty array for short query', async () => {
const result = await searchBabyProducts('a');
expect(result).toEqual([]);
});
const result = await searchBabyProducts('a')
expect(result).toEqual([])
})
test('returns empty array for null/empty query', async () => {
expect(await searchBabyProducts(null)).toEqual([]);
expect(await searchBabyProducts('')).toEqual([]);
});
});
expect(await searchBabyProducts(null)).toEqual([])
expect(await searchBabyProducts('')).toEqual([])
})
})
describe('getBabyProductDetails', () => {
test('returns null for null barcode', async () => {
const result = await getBabyProductDetails(null);
expect(result).toBeNull();
});
});
const result = await getBabyProductDetails(null)
expect(result).toBeNull()
})
})
-5
View File
@@ -6,11 +6,6 @@ jest.unstable_mockModule('../cima-service.js', () => ({
searchOTC: jest.fn(async () => []),
}))
jest.unstable_mockModule('../off-service.js', () => ({
searchBabyProducts: jest.fn(async () => []),
getBabyProductDetails: jest.fn(async () => null),
}))
jest.unstable_mockModule('../farmacias-webhook-import.js', () => ({
runFarmaciaWebhookImport: jest.fn(async () => ({})),
DEFAULT_FARMACIAS_WEBHOOK: '',
+11 -32
View File
@@ -1,27 +1,9 @@
import axios from 'axios';
import redisClient from './redis-client.js';
import * as appMetrics from './src/metrics.js';
const CIMA_API_BASE_URL = 'https://cima.aemps.es/cima/rest';
const CACHE_TTL = 3600;
/**
* Wraps a CIMA API GET with duration + success/error metrics.
*/
async function trackedCimaGet(url, params) {
const start = Date.now();
try {
const response = await axios.get(url, { params, timeout: 5000 });
appMetrics.cimaRequestDuration.record(Date.now() - start);
appMetrics.cimaRequestsTotal.add(1, { status: 'ok' });
return response;
} catch (err) {
appMetrics.cimaRequestDuration.record(Date.now() - start);
appMetrics.cimaRequestsTotal.add(1, { status: 'error' });
throw err;
}
}
/**
* Separa los términos de dosis (ej: "1g", "1000 mg") del nombre del
* medicamento, para poder buscar en CIMA solo con el nombre y luego
@@ -87,24 +69,23 @@ export async function searchMedicines(query) {
const cacheKey = `medicines:search:v3:${searchTerm}`;
try {
appMetrics.medicineSearchesTotal.add(1);
// Intentar obtener del caché
const cachedData = await redisClient.get(cacheKey);
if (cachedData) {
console.log(`📦 Cache hit for: ${searchTerm}`);
appMetrics.cacheHitsTotal.add(1);
return JSON.parse(cachedData);
}
appMetrics.cacheMissesTotal.add(1);
const parsed = parseSearchQuery(searchTerm);
const apiSearchTerm = parsed.nameQuery || searchTerm;
console.log(`🌐 Fetching from CIMA API: ${apiSearchTerm}`);
const response = await trackedCimaGet(`${CIMA_API_BASE_URL}/medicamentos`, {
nombre: apiSearchTerm,
const response = await axios.get(`${CIMA_API_BASE_URL}/medicamentos`, {
params: {
nombre: apiSearchTerm
},
timeout: 5000
});
if (response.data && response.data.resultados) {
@@ -162,23 +143,20 @@ export async function getMedicineDetails(nregistro) {
const cacheKey = `medicine:${nregistro}`;
try {
appMetrics.medicineSearchesTotal.add(1);
// Intentar obtener del caché
const cachedData = await redisClient.get(cacheKey);
if (cachedData) {
console.log(`📦 Cache hit for medicine: ${nregistro}`);
appMetrics.cacheHitsTotal.add(1);
return JSON.parse(cachedData);
}
appMetrics.cacheMissesTotal.add(1);
// Intentar obtener de la API de CIMA (endpoint individual puede no existir)
console.log(`🌐 Fetching medicine details from CIMA: ${nregistro}`);
try {
const response = await trackedCimaGet(`${CIMA_API_BASE_URL}/medicamento/${nregistro}`);
const response = await axios.get(`${CIMA_API_BASE_URL}/medicamento/${nregistro}`, {
timeout: 5000
});
if (response.data) {
const med = response.data;
@@ -207,8 +185,9 @@ export async function getMedicineDetails(nregistro) {
}
// Fallback: buscar por nregistro usando el endpoint de búsqueda
const searchResponse = await trackedCimaGet(`${CIMA_API_BASE_URL}/medicamentos`, {
const searchResponse = await axios.get(`${CIMA_API_BASE_URL}/medicamentos`, {
params: { nregistro },
timeout: 5000
});
if (searchResponse.data?.resultados?.length > 0) {
@@ -334,7 +313,7 @@ export async function searchOTC(query) {
/**
* Limpia el caché de búsquedas (útil para testing o mantenimiento)
* @param {string} pattern - Patrón de claves a eliminar (ej: 'medicines:*')
* @param {string} pattern - Patrón de claves a eliminar (ej: 'medicines:search:*')
* @returns {Promise<number>} - Número de claves eliminadas
*/
export async function clearCache(pattern = 'medicines:*') {
-4
View File
@@ -3,8 +3,4 @@ export default {
transform: {},
moduleFileExtensions: ['js', 'json'],
testMatch: ['**/__tests__/**/*.test.js'],
testTimeout: 15000,
openHandlesTimeout: 5000,
// Run test files in parallel (not individual tests within a file)
// workerIdleMemoryLimit: '512MB',
}
+88 -23
View File
@@ -1,8 +1,38 @@
import axios from 'axios';
import redisClient from './redis-client.js';
const OFF_API_BASE = 'https://world.openfoodfacts.org/api/v2';
// OFF API v3 (recommended) with fallback to v2 for search
const OFF_API_BASE = 'https://world.openfoodfacts.org';
const CACHE_TTL = 3600;
const MAX_RETRIES = 2;
const RETRY_DELAY_MS = 1000;
// User-Agent is REQUIRED per OFF docs: AppName/Version (ContactEmail)
const OFF_USER_AGENT = process.env.OFF_USER_AGENT || 'FarmaFinder/1.0 (https://github.com/farmafinder)';
// Open Food Facts authentication (optional, for write operations)
const OFF_USERNAME = process.env.OFF_USERNAME;
const OFF_PASSWORD = process.env.OFF_PASSWORD;
function getOffHeaders() {
return {
'User-Agent': OFF_USER_AGENT,
};
}
function getOffAuth() {
if (OFF_USERNAME && OFF_PASSWORD) {
return {
username: OFF_USERNAME,
password: OFF_PASSWORD,
};
}
return null;
}
function sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
}
export function transformOFFProduct(offProduct) {
if (!offProduct || !offProduct._id || !offProduct.product_name) {
@@ -53,31 +83,61 @@ export async function searchBabyProducts(query) {
}
console.log(`Fetching from OFF API: ${searchTerm}`);
const response = await axios.get(`${OFF_API_BASE}/search`, {
params: {
categories_tags: 'baby-food',
search_terms: searchTerm,
json: true,
fields: 'product_name,brands,image_url,nutriscore_grade,ingredients_text,nova_group,ecoscore_grade,categories_tags',
page_size: 20,
},
timeout: 5000,
});
if (response.data && response.data.products) {
const products = response.data.products
.map(transformOFFProduct)
.filter(Boolean);
const headers = getOffHeaders();
console.log(`[OFF] User-Agent: ${headers['User-Agent']}`);
console.log(`[OFF] URL: ${OFF_API_BASE}/api/v2/search?brands_tags=${searchTerm}`);
let lastError;
for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
try {
await redisClient.setEx(cacheKey, CACHE_TTL, JSON.stringify(products));
console.log(`Cached ${products.length} OFF products for: ${searchTerm}`);
} catch (cacheErr) {
// cache write failed, still return the data
// Use v2 structured search with brand filter (more reliable than /cgi/search.pl)
// READ operations don't require auth per OFF docs, only User-Agent
const response = await axios.get(`${OFF_API_BASE}/api/v2/search`, {
params: {
brands_tags: searchTerm,
page_size: 20,
},
headers,
timeout: 10000,
validateStatus: (status) => status === 200,
});
// Check if response is actually JSON (OFF sometimes returns HTML on error)
if (typeof response.data === 'string' || !response.data.products) {
console.warn(`[OFF] Invalid response for "${searchTerm}" (attempt ${attempt + 1}): API may be down`);
if (attempt < MAX_RETRIES) {
await sleep(RETRY_DELAY_MS * (attempt + 1));
continue;
}
return [];
}
const products = response.data.products
.map(transformOFFProduct)
.filter(Boolean);
// Only cache non-empty results to avoid caching API failures
if (products.length > 0) {
try {
await redisClient.setEx(cacheKey, CACHE_TTL, JSON.stringify(products));
console.log(`Cached ${products.length} OFF products for: ${searchTerm}`);
} catch (cacheErr) {
// cache write failed, still return the data
}
} else {
console.log(`[OFF] No products found for "${searchTerm}", not caching empty result`);
}
return products;
} catch (err) {
lastError = err;
console.warn(`[OFF] Request failed for "${searchTerm}" (attempt ${attempt + 1}): ${err.message}`);
if (attempt < MAX_RETRIES) {
await sleep(RETRY_DELAY_MS * (attempt + 1));
}
}
return products;
}
console.error(`[OFF] All retries failed for "${searchTerm}": ${lastError?.message}`);
return [];
} catch (error) {
console.error('Error searching baby products from OFF:', error.message);
@@ -100,8 +160,13 @@ export async function getBabyProductDetails(barcode) {
}
console.log(`Fetching OFF product details: ${barcode}`);
const response = await axios.get(`${OFF_API_BASE}/product/${barcode}.json`, {
timeout: 5000,
const headers = getOffHeaders();
// Use v3 API (recommended) for product details
// READ operations don't require auth per OFF docs, only User-Agent
const response = await axios.get(`${OFF_API_BASE}/api/v3/product/${barcode}.json`, {
headers,
timeout: 10000,
validateStatus: (status) => status === 200,
});
if (response.data && response.data.product) {
+1 -3
View File
@@ -12,7 +12,7 @@
"migrate": "node migrate.js",
"reset-db": "bash reset-db.sh",
"import-farmacias": "node import-farmacias.js",
"test": "NODE_OPTIONS='--experimental-vm-modules' npx jest --ci --forceExit --forceExitTimeout=30000"
"test": "NODE_OPTIONS='--experimental-vm-modules' npx jest --forceExit"
},
"keywords": [],
"author": "",
@@ -21,12 +21,10 @@
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/auto-instrumentations-node": "^0.52.0",
"@opentelemetry/exporter-logs-otlp-grpc": "^0.55.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "^0.55.0",
"@opentelemetry/exporter-trace-otlp-grpc": "^0.55.0",
"@opentelemetry/instrumentation-pino": "^0.45.0",
"@opentelemetry/resources": "^1.28.0",
"@opentelemetry/sdk-logs": "^0.55.0",
"@opentelemetry/sdk-metrics": "^1.28.0",
"@opentelemetry/sdk-node": "^0.55.0",
"@opentelemetry/sdk-trace-base": "^1.28.0",
"@opentelemetry/semantic-conventions": "^1.28.0",
+1 -32
View File
@@ -1,22 +1,16 @@
import { createClient } from 'redis';
import * as appMetrics from './src/metrics.js';
// Create Redis client
const redisClient = createClient({
socket: {
host: process.env.REDIS_HOST || 'localhost',
port: process.env.REDIS_PORT || 6379,
reconnectStrategy: (retries) => {
if (retries > 10) return new Error('Redis max retries reached');
return Math.min(retries * 100, 3000);
}
port: process.env.REDIS_PORT || 6379
},
password: process.env.REDIS_PASSWORD || undefined
});
// Error handler
redisClient.on('error', (err) => {
appMetrics.redisErrorsTotal.add(1);
console.error('Redis Client Error:', err);
});
@@ -25,32 +19,7 @@ redisClient.on('connect', () => {
console.log('✅ Connected to Redis');
});
// Instrument get/setEx with command duration (used by the CIMA cache path).
const origGet = redisClient.get.bind(redisClient);
redisClient.get = async (...args) => {
const start = performance.now();
try {
return await origGet(...args);
} finally {
appMetrics.redisCmdDuration.record(performance.now() - start);
}
};
const origSetEx = redisClient.setEx.bind(redisClient);
redisClient.setEx = async (...args) => {
const start = performance.now();
try {
return await origSetEx(...args);
} finally {
appMetrics.redisCmdDuration.record(performance.now() - start);
}
};
// Connect to Redis
await redisClient.connect();
// Connect to Redis — skip in test (services are mocked) or when REDIS_URL is unset
if (process.env.NODE_ENV !== 'test') {
await redisClient.connect();
}
export default redisClient;
+212 -110
View File
@@ -1,12 +1,7 @@
// OpenTelemetry SDK — must be imported first to instrument http, express, pg, etc.
// Skipped in test to avoid gRPC connection attempts to a non-existent collector.
if (process.env.NODE_ENV !== 'test') {
await import('./src/tracing.js');
}
import './src/tracing.js';
import express from 'express';
import redisClient from './redis-client.js';
import * as appMetrics from './src/metrics.js';
import cors from 'cors';
import sqlite3 from 'sqlite3';
import { promisify } from 'util';
@@ -22,6 +17,8 @@ import webpush from 'web-push';
import pino from 'pino';
import pinoHttp from 'pino-http';
import multer from 'multer';
import { createWorker } from 'tesseract.js';
import { BarcodeDetector } from 'barcode-detector';
import { searchMedicines, getMedicineDetails, searchOTC } from './cima-service.js';
import { searchBabyProducts, getBabyProductDetails } from './off-service.js';
import { runFarmaciaWebhookImport, DEFAULT_FARMACIAS_WEBHOOK, importPharmaciesFromRows } from './farmacias-webhook-import.js';
@@ -60,19 +57,6 @@ app.use(cors({
app.use(express.json({ limit: '10mb' }));
app.use(pinoHttp({ logger }));
// Explicit HTTP request metrics (count by route + status class, duration).
// Auto-instrumentation gives duration histograms but no discrete error count.
app.use((req, res, next) => {
const start = performance.now();
res.on('finish', () => {
const route = req.route?.path || req.path;
const statusClass = `${Math.floor(res.statusCode / 100)}xx`;
appMetrics.httpRequestsTotal.add(1, { route, status_class: statusClass });
appMetrics.httpRequestDuration.record(performance.now() - start, { route });
});
next();
});
const PG_URL = process.env.PG_URL;
let pgPool = null;
if (PG_URL) {
@@ -105,16 +89,10 @@ if (process.env.NODE_ENV !== 'test') {
// Configure session
app.use(session(sessionConfig));
// Shared handler so every limiter emits a counter (route label) on rejection.
const limitHandler = (route) => (req, res, next) => {
appMetrics.rateLimitRejectedTotal.add(1, { route });
res.status(429).json({ error: 'Too many requests, please try again later.' });
};
const searchLimiter = rateLimit({ windowMs: 60_000, max: 30, standardHeaders: true, legacyHeaders: false, handler: limitHandler('search') });
const loginLimiter = rateLimit({ windowMs: 60_000, max: 5, standardHeaders: true, legacyHeaders: false, handler: limitHandler('login') });
const registerLimiter = rateLimit({ windowMs: 60 * 60_000, max: 10, standardHeaders: true, legacyHeaders: false, handler: limitHandler('register') });
const geocodeLimiter = rateLimit({ windowMs: 60_000, max: 10, standardHeaders: true, legacyHeaders: false, handler: limitHandler('geocode') });
const searchLimiter = rateLimit({ windowMs: 60_000, max: 30, standardHeaders: true, legacyHeaders: false });
const loginLimiter = rateLimit({ windowMs: 60_000, max: 5, standardHeaders: true, legacyHeaders: false });
const registerLimiter = rateLimit({ windowMs: 60 * 60_000, max: 10, standardHeaders: true, legacyHeaders: false });
const geocodeLimiter = rateLimit({ windowMs: 60_000, max: 10, standardHeaders: true, legacyHeaders: false });
const VAPID_PUBLIC_KEY = process.env.VAPID_PUBLIC_KEY || '';
const VAPID_PRIVATE_KEY = process.env.VAPID_PRIVATE_KEY || '';
@@ -151,54 +129,27 @@ function toPositional(sql) {
}
async function userDbGet(sql, params = []) {
const engine = pgPool ? 'pg' : 'sqlite';
const start = performance.now();
try {
if (pgPool) {
const res = await pgPool.query(toPositional(sql), params);
return res.rows[0] ?? null;
}
return await dbGet(sql, params);
} catch (err) {
appMetrics.dbErrorsTotal.add(1, { engine });
throw err;
} finally {
appMetrics.dbQueryDuration.record(performance.now() - start, { engine });
if (pgPool) {
const res = await pgPool.query(toPositional(sql), params);
return res.rows[0] ?? null;
}
return dbGet(sql, params);
}
async function userDbRun(sql, params = []) {
const engine = pgPool ? 'pg' : 'sqlite';
const start = performance.now();
try {
if (pgPool) {
const res = await pgPool.query(toPositional(sql), params);
return { lastID: res.rows[0]?.id, changes: res.rowCount };
}
return await dbRun(sql.replace(/\s+RETURNING\s+\w+\s*$/i, ''), params);
} catch (err) {
appMetrics.dbErrorsTotal.add(1, { engine });
throw err;
} finally {
appMetrics.dbQueryDuration.record(performance.now() - start, { engine });
if (pgPool) {
const res = await pgPool.query(toPositional(sql), params);
return { lastID: res.rows[0]?.id, changes: res.rowCount };
}
return dbRun(sql.replace(/\s+RETURNING\s+\w+\s*$/i, ''), params);
}
async function userDbAll(sql, params = []) {
const engine = pgPool ? 'pg' : 'sqlite';
const start = performance.now();
try {
if (pgPool) {
const res = await pgPool.query(toPositional(sql), params);
return res.rows;
}
return await dbAll(sql, params);
} catch (err) {
appMetrics.dbErrorsTotal.add(1, { engine });
throw err;
} finally {
appMetrics.dbQueryDuration.record(performance.now() - start, { engine });
if (pgPool) {
const res = await pgPool.query(toPositional(sql), params);
return res.rows;
}
return dbAll(sql, params);
}
// Accept opening_hours as either an object or a JSON string from the client
@@ -289,6 +240,38 @@ async function initDatabase() {
await dbRun(`CREATE INDEX IF NOT EXISTS idx_pharmacy_medicine ON pharmacy_medicines(medicine_nregistro)`);
}
// Create junction table for pharmacy-product relationships (CIMA / Open Food Facts)
if (pgPool) {
await pgPool.query(`
CREATE TABLE IF NOT EXISTS pharmacy_products (
id SERIAL PRIMARY KEY,
pharmacy_id INTEGER NOT NULL REFERENCES pharmacies(id),
product_source TEXT NOT NULL,
product_off_id TEXT NOT NULL,
product_name TEXT,
price REAL,
stock INTEGER DEFAULT 0,
UNIQUE(pharmacy_id, product_source, product_off_id)
)
`);
await pgPool.query(`CREATE INDEX IF NOT EXISTS idx_pharmacy_product ON pharmacy_products(product_source, product_off_id)`);
} else {
await dbRun(`
CREATE TABLE IF NOT EXISTS pharmacy_products (
id INTEGER PRIMARY KEY AUTOINCREMENT,
pharmacy_id INTEGER NOT NULL,
product_source TEXT NOT NULL,
product_off_id TEXT NOT NULL,
product_name TEXT,
price REAL,
stock INTEGER DEFAULT 0,
FOREIGN KEY (pharmacy_id) REFERENCES pharmacies(id),
UNIQUE(pharmacy_id, product_source, product_off_id)
)
`);
await dbRun(`CREATE INDEX IF NOT EXISTS idx_pharmacy_product ON pharmacy_products(product_source, product_off_id)`);
}
// Create users table — PG when available, SQLite fallback
if (pgPool) {
await pgPool.query(`
@@ -696,6 +679,56 @@ app.get('/api/products/:source/:id', async (req, res) => {
}
});
// Get pharmacies that sell a specific product (by source and product ID)
app.get('/api/products/:source/:productId/pharmacies', async (req, res) => {
try {
const { source, productId } = req.params;
if (source !== 'cima' && source !== 'openfoodfacts') {
return res.status(400).json({ error: 'Invalid source' });
}
let pharmacies = await userDbAll(`
SELECT
p.id,
p.name,
p.address,
p.phone,
p.latitude,
p.longitude,
p.opening_hours,
pp.price,
pp.stock
FROM pharmacies p
INNER JOIN pharmacy_products pp ON p.id = pp.pharmacy_id
WHERE pp.product_source = ? AND pp.product_off_id = ?
ORDER BY p.name
`, [source, productId]);
if (pharmacies.length === 0) {
pharmacies = await userDbAll(`
SELECT
p.id,
p.name,
p.address,
p.phone,
p.latitude,
p.longitude,
p.opening_hours,
NULL as price,
0 as stock
FROM pharmacies p
ORDER BY p.name
`);
}
res.json(pharmacies);
} catch (error) {
console.error('Error fetching pharmacies for product:', error);
res.status(500).json({ error: 'Internal server error' });
}
});
// ========== AUTHENTICATION MIDDLEWARE ==========
// Middleware to check if user is authenticated
@@ -915,7 +948,6 @@ app.post('/api/tsi/ocr', upload.single('photo'), async (req, res) => {
console.log('[OCR] Processing image, size:', req.file.size, 'bytes');
const { createWorker } = await import('tesseract.js');
const worker = await createWorker('spa+eng');
const { data } = await worker.recognize(req.file.buffer);
await worker.terminate();
@@ -960,7 +992,6 @@ app.post('/api/auth/login', loginLimiter, async (req, res) => {
);
if (!user) {
appMetrics.loginFailureTotal.add(1);
return res.status(401).json({ error: 'Invalid username or password' });
}
@@ -968,7 +999,6 @@ app.post('/api/auth/login', loginLimiter, async (req, res) => {
const isValidPassword = await bcrypt.compare(password, user.password_hash);
if (!isValidPassword) {
appMetrics.loginFailureTotal.add(1);
return res.status(401).json({ error: 'Invalid username or password' });
}
@@ -977,7 +1007,6 @@ app.post('/api/auth/login', loginLimiter, async (req, res) => {
req.session.username = user.username;
req.session.isAdmin = Boolean(user.is_admin);
appMetrics.loginSuccessTotal.add(1);
res.json({
message: 'Login successful',
user: {
@@ -1685,7 +1714,6 @@ app.post('/api/admin/pharmacies', requireAdmin, async (req, res) => {
}
res.status(201).json(newPharmacy);
appMetrics.pharmacyWriteTotal.add(1, { op: 'create' });
} catch (error) {
console.error('Error adding pharmacy:', error);
if (error.message.includes('UNIQUE constraint')) {
@@ -1723,7 +1751,6 @@ app.put('/api/admin/pharmacies/:id', requireAdmin, async (req, res) => {
}
res.json(updatedPharmacy);
appMetrics.pharmacyWriteTotal.add(1, { op: 'update' });
} catch (error) {
console.error('Error updating pharmacy:', error);
res.status(500).json({ error: 'Internal server error' });
@@ -1735,14 +1762,12 @@ app.delete('/api/admin/pharmacies/:id', requireAdmin, async (req, res) => {
try {
const pharmacyId = parseInt(req.params.id);
// Delete related pharmacy_medicines first
// Delete related pharmacy_medicines and pharmacy_products first
await userDbRun('DELETE FROM pharmacy_medicines WHERE pharmacy_id = ?', [pharmacyId]);
// Delete the pharmacy
await userDbRun('DELETE FROM pharmacy_products WHERE pharmacy_id = ?', [pharmacyId]);
await userDbRun('DELETE FROM pharmacies WHERE id = ?', [pharmacyId]);
res.json({ message: 'Pharmacy deleted successfully' });
appMetrics.pharmacyWriteTotal.add(1, { op: 'delete' });
} catch (error) {
console.error('Error deleting pharmacy:', error);
res.status(500).json({ error: 'Internal server error' });
@@ -1912,7 +1937,6 @@ app.post('/api/admin/pharmacy-medicines', requireAdmin, async (req, res) => {
}
res.status(201).json(relationship);
appMetrics.pharmacyMedicineLinkTotal.add(1, { op: 'create' });
} catch (error) {
console.error('Error adding medicine to pharmacy:', error);
res.status(500).json({ error: 'Internal server error' });
@@ -1940,7 +1964,6 @@ app.put('/api/admin/pharmacy-medicines/:id', requireAdmin, async (req, res) => {
}
res.json(updated);
appMetrics.pharmacyMedicineLinkTotal.add(1, { op: 'update' });
} catch (error) {
console.error('Error updating pharmacy-medicine:', error);
res.status(500).json({ error: 'Internal server error' });
@@ -1953,13 +1976,121 @@ app.delete('/api/admin/pharmacy-medicines/:id', requireAdmin, async (req, res) =
const id = parseInt(req.params.id);
await userDbRun('DELETE FROM pharmacy_medicines WHERE id = ?', [id]);
res.json({ message: 'Medicine removed from pharmacy successfully' });
appMetrics.pharmacyMedicineLinkTotal.add(1, { op: 'delete' });
} catch (error) {
console.error('Error deleting pharmacy-medicine:', error);
res.status(500).json({ error: 'Internal server error' });
}
});
// ========== PHARMACY-PRODUCT ADMIN ROUTES ==========
// List products for a specific pharmacy
app.get('/api/admin/pharmacies/:pharmacyId/products', requireAdmin, async (req, res) => {
try {
const pharmacyId = parseInt(req.params.pharmacyId);
const products = await userDbAll(`
SELECT
pp.id,
pp.pharmacy_id,
pp.product_source,
pp.product_off_id,
pp.product_name,
pp.price,
pp.stock
FROM pharmacy_products pp
WHERE pp.pharmacy_id = ?
ORDER BY pp.product_name
`, [pharmacyId]);
res.json(products);
} catch (error) {
console.error('Error fetching pharmacy products:', error);
res.status(500).json({ error: 'Internal server error' });
}
});
// Add/upsert a product-pharmacy link
app.post('/api/admin/pharmacy-products', requireAdmin, async (req, res) => {
try {
const { pharmacy_id, product_source, product_off_id, product_name, price, stock } = req.body;
if (!pharmacy_id || !product_source || !product_off_id) {
return res.status(400).json({ error: 'pharmacy_id, product_source, and product_off_id are required' });
}
if (product_source !== 'cima' && product_source !== 'openfoodfacts') {
return res.status(400).json({ error: 'product_source must be "cima" or "openfoodfacts"' });
}
const existing = await userDbGet(
'SELECT * FROM pharmacy_products WHERE pharmacy_id = ? AND product_source = ? AND product_off_id = ?',
[pharmacy_id, product_source, product_off_id]
);
if (existing) {
await userDbRun(
'UPDATE pharmacy_products SET product_name = ?, price = ?, stock = ? WHERE pharmacy_id = ? AND product_source = ? AND product_off_id = ?',
[product_name || null, price || null, stock || 0, pharmacy_id, product_source, product_off_id]
);
} else {
await userDbRun(
'INSERT INTO pharmacy_products (pharmacy_id, product_source, product_off_id, product_name, price, stock) VALUES (?, ?, ?, ?, ?, ?)',
[pharmacy_id, product_source, product_off_id, product_name || null, price || null, stock || 0]
);
}
const relationship = await userDbGet(
'SELECT * FROM pharmacy_products WHERE pharmacy_id = ? AND product_source = ? AND product_off_id = ?',
[pharmacy_id, product_source, product_off_id]
);
res.status(201).json(relationship);
} catch (error) {
console.error('Error adding pharmacy product:', error);
res.status(500).json({ error: 'Internal server error' });
}
});
// Update price/stock for a pharmacy-product link
app.put('/api/admin/pharmacy-products/:id', requireAdmin, async (req, res) => {
try {
const id = parseInt(req.params.id);
const { price, stock } = req.body;
await userDbRun(
'UPDATE pharmacy_products SET price = ?, stock = ? WHERE id = ?',
[price || null, stock || 0, id]
);
const updated = await userDbGet(
'SELECT * FROM pharmacy_products WHERE id = ?',
[id]
);
if (!updated) {
return res.status(404).json({ error: 'Relationship not found' });
}
res.json(updated);
} catch (error) {
console.error('Error updating pharmacy product:', error);
res.status(500).json({ error: 'Internal server error' });
}
});
// Delete a pharmacy-product link
app.delete('/api/admin/pharmacy-products/:id', requireAdmin, async (req, res) => {
try {
const id = parseInt(req.params.id);
await userDbRun('DELETE FROM pharmacy_products WHERE id = ?', [id]);
res.json({ message: 'Product removed from pharmacy successfully' });
} catch (error) {
console.error('Error deleting pharmacy product:', error);
res.status(500).json({ error: 'Internal server error' });
}
});
// Push notifications
app.get('/api/notifications/vapid-public-key', (req, res) => {
@@ -2265,10 +2396,8 @@ async function sendPushForMedicine({ medicine_nregistro, medicine_name, pharmacy
payload
);
sent++;
appMetrics.pushSentTotal.add(1, { channel: 'web' });
} catch (err) {
failed++;
appMetrics.pushFailedTotal.add(1, { channel: 'web' });
const status = err?.statusCode;
if (status === 404 || status === 410) {
try {
@@ -2324,10 +2453,8 @@ async function sendPushForMedicine({ medicine_nregistro, medicine_name, pharmacy
for (const ticket of result.data) {
if (ticket.status === 'ok') {
sent++;
appMetrics.pushSentTotal.add(1, { channel: 'expo' });
} else {
failed++;
appMetrics.pushFailedTotal.add(1, { channel: 'expo' });
// Prune invalid tokens
if (ticket.message?.includes('InvalidCredentials') || ticket.message?.includes('DeviceNotRegistered')) {
const expoEndpoint = `expo://${ticket.id || ''}`;
@@ -2342,16 +2469,13 @@ async function sendPushForMedicine({ medicine_nregistro, medicine_name, pharmacy
}
} else {
sent += chunk.length;
appMetrics.pushSentTotal.add(chunk.length, { channel: 'expo' });
}
} else {
failed += chunk.length;
appMetrics.pushFailedTotal.add(chunk.length, { channel: 'expo' });
console.error('[push] expo send failed:', response.status);
}
} catch (err) {
failed += chunk.length;
appMetrics.pushFailedTotal.add(chunk.length, { channel: 'expo' });
console.error('[push] expo send error:', err.message);
}
}
@@ -2360,28 +2484,6 @@ async function sendPushForMedicine({ medicine_nregistro, medicine_name, pharmacy
return { sent, failed, pruned };
}
// --- Health & readiness probes --------------------------------------------
// /healthz: liveness (process is up). /readyz: dependencies reachable.
app.get('/healthz', (_req, res) => {
res.json({ status: 'ok', uptime: process.uptime() });
});
app.get('/readyz', async (_req, res) => {
const checks = { redis: 'ok', db: 'ok' };
try {
await redisClient.ping();
} catch {
checks.redis = 'fail';
}
try {
await userDbGet('SELECT 1');
} catch {
checks.db = 'fail';
}
const ready = checks.redis === 'ok' && checks.db === 'ok';
res.status(ready ? 200 : 503).json({ status: ready ? 'ok' : 'degraded', checks });
});
export { app, initDatabase, db };
if (process.env.NODE_ENV !== 'test') {
-108
View File
@@ -1,108 +0,0 @@
// OpenTelemetry metrics for the FarmaFinder backend.
//
// Uses the global MeterProvider configured in `tracing.js` (imported first in
// server.js). Metrics flow OTLP → Alloy → Prometheus remote_write, exactly like
// the tracing pipeline, so no extra Prometheus scrape job is required.
import { metrics } from '@opentelemetry/api';
const meter = metrics.getMeter('farmafinder-backend', '1.0.0');
// --- Heartbeat -------------------------------------------------------------
// Emitted continuously so we can alert on "backend not sending telemetry"
// (remote_write has no `up` metric).
export const heartbeatTotal = meter.createCounter('app_heartbeat_total', {
description: 'Heartbeat ticks from the backend process (liveness signal).',
});
// --- Medicine search / CIMA upstream --------------------------------------
export const medicineSearchesTotal = meter.createCounter('medicine_searches_total', {
description: 'Total medicine searches handled (cache or upstream).',
});
export const cimaRequestsTotal = meter.createCounter('cima_requests_total', {
description: 'Total upstream CIMA API requests.',
});
export const cimaRequestDuration = meter.createHistogram('cima_request_duration_ms', {
description: 'Duration of upstream CIMA API requests.',
unit: 'ms',
});
export const cacheHitsTotal = meter.createCounter('cache_hits_total', {
description: 'Total Redis cache hits.',
});
export const cacheMissesTotal = meter.createCounter('cache_misses_total', {
description: 'Total Redis cache misses (fell through to upstream).',
});
// --- Auth ------------------------------------------------------------------
export const loginSuccessTotal = meter.createCounter('login_success_total', {
description: 'Successful login attempts.',
});
export const loginFailureTotal = meter.createCounter('login_failure_total', {
description: 'Failed login attempts.',
});
export const rateLimitRejectedTotal = meter.createCounter('rate_limit_rejected_total', {
description: 'Requests rejected by a rate limiter.',
});
// --- Admin operations ------------------------------------------------------
export const pharmacyWriteTotal = meter.createCounter('pharmacy_write_total', {
description: 'Admin pharmacy write operations.',
});
export const pharmacyMedicineLinkTotal = meter.createCounter('pharmacy_medicine_link_total', {
description: 'Pharmacy-medicine link operations.',
});
// --- Push notifications ----------------------------------------------------
export const pushSentTotal = meter.createCounter('push_sent_total', {
description: 'Push notifications successfully sent.',
});
export const pushFailedTotal = meter.createCounter('push_failed_total', {
description: 'Push notifications that failed to send.',
});
// --- Datastores ------------------------------------------------------------
export const dbQueryDuration = meter.createHistogram('db_query_duration_ms', {
description: 'Duration of user DB queries.',
unit: 'ms',
});
export const dbErrorsTotal = meter.createCounter('db_errors_total', {
description: 'User DB query errors.',
});
export const redisErrorsTotal = meter.createCounter('redis_errors_total', {
description: 'Redis client errors.',
});
export const redisCmdDuration = meter.createHistogram('redis_cmd_duration_ms', {
description: 'Duration of Redis commands.',
unit: 'ms',
});
// --- HTTP (explicit, so we get status class + per-route breakdowns) --------
// OTel's http auto-instrumentation records duration but not a discrete
// error count, so we track requests explicitly for error-rate alerting.
export const httpRequestsTotal = meter.createCounter('http_requests_total', {
description: 'Total HTTP requests, labelled by route and status class.',
});
export const httpRequestDuration = meter.createHistogram('http_request_duration_ms', {
description: 'HTTP request duration.',
unit: 'ms',
});
// --- Heartbeat loop (guarded against --watch duplicate intervals) ----------
const HEARTBEAT_INTERVAL_MS = 30_000;
if (process.env.NODE_ENV !== 'test' && !globalThis.__farmafinderHeartbeat) {
globalThis.__farmafinderHeartbeat = setInterval(() => {
heartbeatTotal.add(1);
}, HEARTBEAT_INTERVAL_MS);
globalThis.__farmafinderHeartbeat?.unref?.();
}
+5 -17
View File
@@ -9,40 +9,28 @@
// routed to Tempo.
import { NodeSDK } from '@opentelemetry/sdk-node';
import { PeriodicExportingMetricReader } from '@opentelemetry/sdk-metrics';
import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node';
import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-grpc';
import * as resources from '@opentelemetry/resources';
import { ATTR_SERVICE_NAME, ATTR_SERVICE_NAMESPACE } from '@opentelemetry/semantic-conventions';
import { PinoInstrumentation } from '@opentelemetry/instrumentation-pino';
const serviceName = process.env.OTEL_SERVICE_NAME || 'farmaclic-backend';
const otlpEndpoint = process.env.OTEL_EXPORTER_OTLP_ENDPOINT || 'http://localhost:4317';
// Use plain string attribute keys (not the semantic-conventions named exports)
// so we don't depend on a specific @opentelemetry/semantic-conventions version.
const resource = typeof resources.resourceFromAttributes === 'function'
? resources.resourceFromAttributes({
'service.name': serviceName,
'service.namespace': 'farmaclic',
[ATTR_SERVICE_NAME]: serviceName,
[ATTR_SERVICE_NAMESPACE]: 'farmaclic',
})
: new resources.Resource({
'service.name': serviceName,
'service.namespace': 'farmaclic',
[ATTR_SERVICE_NAME]: serviceName,
[ATTR_SERVICE_NAMESPACE]: 'farmaclic',
});
// Metrics → OTLP → Alloy → Prometheus remote_write. The PeriodicExportingMetricReader
// makes the auto-instrumentations (http/express/redis) emit request duration/error
// metrics with no extra code, on top of the custom business metrics in src/metrics.js.
const metricReader = new PeriodicExportingMetricReader({
exportIntervalMillis: 15_000,
exporter: new OTLPMetricExporter({ url: otlpEndpoint }),
});
const sdk = new NodeSDK({
resource,
traceExporter: new OTLPTraceExporter({ url: otlpEndpoint }),
metricReader,
instrumentations: [
getNodeAutoInstrumentations({
// Disable fs by default — it is noisy and rarely useful.
-5
View File
@@ -6,8 +6,3 @@ EXPO_PUBLIC_API_URL=http://localhost:3001/api
# For production builds, update this to:
# EXPO_PUBLIC_API_URL=https://api.yourdomain.com/api
# Grafana Alloy OTLP/HTTP endpoint for Faro RUM (must be reachable from the
# device — use a LAN IP / public hostname, NOT localhost).
# Open router :4318 → srv84-macos:4318, or proxy /faro via Nginx Proxy Manager.
EXPO_PUBLIC_FARO_URL=http://grafana.hacecalor.net:4318
-4
View File
@@ -8,10 +8,6 @@ import { SafeAreaProvider } from 'react-native-safe-area-context';
import { useAuthStore } from '../store/authStore';
import { registerForPushNotifications, addNotificationListener, addNotificationResponseListener } from '../services/notifications';
import { ThemeProvider, useThemeContext } from '../components/ThemeProvider';
import { initFaro } from '../services/faro';
// Boot Faro RUM once, as early as possible.
initFaro();
const queryClient = new QueryClient();
-1
View File
@@ -13,7 +13,6 @@
"expo-constants": "~57.0.3",
"expo-dev-client": "~57.0.5",
"expo-device": "~7.0.2",
"@grafana/faro-react-native": "^1.2.1",
"expo-image-picker": "~57.0.2",
"expo-linking": "~57.0.1",
"expo-local-authentication": "~57.0.0",
-36
View File
@@ -1,36 +0,0 @@
import { initializeFaro } from '@grafana/faro-react-native';
let initialized = false;
/**
* Initializes Grafana Faro RUM for the React Native app.
*
* Telemetry (crashes, JS errors, console, app-start, memory/ANR vitals,
* session + screen tracking) is sent OTLP/HTTP to the Alloy collector.
*
* NOTE: `@grafana/faro-react-native` ships a native module, so it requires a
* custom dev build / EAS build (not Expo Go). Initialization is wrapped in a
* try/catch so a collector outage never crashes the app.
*/
export function initFaro(): void {
if (initialized) return;
initialized = true;
try {
const url =
process.env.EXPO_PUBLIC_FARO_URL || 'http://grafana.hacecalor.net:4318';
initializeFaro({
app: {
name: 'farmafinder-mobile',
version: '1.0.0',
environment: __DEV__ ? 'development' : 'production',
},
url,
sessionTracking: { enabled: true },
// Crash/JS error/console capture are on by default.
});
} catch (err) {
console.warn('[faro] initialization failed:', err);
}
}
+15
View File
@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
import './App.css';
import HomeView from './views/HomeView';
import SearchView from './views/SearchView';
import ProductView from './views/ProductView';
import ScannerView from './views/ScannerView';
import AlertsView from './views/AlertsView';
import ProfileView from './views/ProfileView';
@@ -19,6 +20,7 @@ function App() {
const [showSaved, setShowSaved] = useState(false);
const [badgeCount, setBadgeCount] = useState(0);
const [prescriptionSearch, setPrescriptionSearch] = useState('');
const [productScreen, setProductScreen] = useState(null);
const [screenSize, setScreenSize] = useState({
width: window.innerWidth,
height: window.innerHeight
@@ -180,6 +182,19 @@ function App() {
currentUser={currentUser}
onLoginRequest={() => setShowLogin(true)}
initialQuery={prescriptionSearch}
onNavigateToProduct={(source, id) => {
setProductScreen({ source, id });
setScreen('product');
}}
/>
);
break;
case 'product':
activeView = (
<ProductView
source={productScreen?.source}
id={productScreen?.id}
onBack={() => { setProductScreen(null); setScreen('search'); }}
/>
);
break;
@@ -397,6 +397,28 @@
border-color: var(--border-strong);
}
/* Source badges */
.source-badge {
display: inline-block;
padding: 0.15rem 0.5rem;
border-radius: 4px;
font-size: 0.75rem;
font-weight: 700;
text-transform: uppercase;
letter-spacing: 0.05em;
vertical-align: middle;
}
.source-badge--cima {
background: rgba(37, 99, 235, 0.12);
color: #2563eb;
}
.source-badge--off {
background: rgba(16, 185, 129, 0.12);
color: #10b981;
}
/* Pharmacies: search, region import, list filter */
.pharmacy-tools-card {
background: var(--surface);
@@ -0,0 +1,421 @@
import React, { useState, useEffect, useMemo, useRef } from 'react';
import './AdminComponents.css';
const MAX_PHARMACY_RESULTS = 25;
function normalize(s) {
return (s || '').toString().toLowerCase().normalize('NFD').replace(/[̀-ͯ]/g, '');
}
function PharmacyProductLink() {
const [pharmacies, setPharmacies] = useState([]);
const [productSearch, setProductSearch] = useState('');
const [productResults, setProductResults] = useState([]);
const [selectedPharmacy, setSelectedPharmacy] = useState(null);
const [selectedProduct, setSelectedProduct] = useState(null);
const [pharmacyProducts, setPharmacyProducts] = useState([]);
const [loading, setLoading] = useState(false);
const [searching, setSearching] = useState(false);
const [pharmacyQuery, setPharmacyQuery] = useState('');
const [pharmacyDropdownOpen, setPharmacyDropdownOpen] = useState(false);
const pharmacyInputRef = useRef(null);
const [formData, setFormData] = useState({
pharmacy_id: '',
price: '',
stock: ''
});
const filteredPharmacies = useMemo(() => {
const q = normalize(pharmacyQuery).trim();
if (!q) return pharmacies.slice(0, MAX_PHARMACY_RESULTS);
const tokens = q.split(/\s+/).filter(Boolean);
return pharmacies
.filter(p => {
const hay = `${normalize(p.name)} ${normalize(p.address)}`;
return tokens.every(tok => hay.includes(tok));
})
.slice(0, MAX_PHARMACY_RESULTS);
}, [pharmacies, pharmacyQuery]);
useEffect(() => {
fetchPharmacies();
}, []);
useEffect(() => {
if (selectedPharmacy) {
fetchPharmacyProducts(selectedPharmacy.id);
}
}, [selectedPharmacy]);
// Buscar productos en la API mientras el usuario escribe
useEffect(() => {
const q = productSearch.trim();
if (q.length < 2) {
setProductResults([]);
setSearching(false);
return;
}
const controller = new AbortController();
const timeoutId = setTimeout(async () => {
setSearching(true);
try {
const response = await fetch(`/api/products/search?q=${encodeURIComponent(q)}`, {
credentials: 'include',
signal: controller.signal,
});
const data = await response.json();
setProductResults(Array.isArray(data) ? data : []);
} catch (error) {
if (error.name === 'AbortError') return;
console.error('Error searching products:', error);
} finally {
if (!controller.signal.aborted) setSearching(false);
}
}, 500);
return () => {
clearTimeout(timeoutId);
controller.abort();
};
}, [productSearch]);
const fetchPharmacies = async () => {
try {
const response = await fetch('/api/pharmacies', {
credentials: 'include',
});
const data = await response.json();
setPharmacies(data);
} catch (error) {
console.error('Error fetching pharmacies:', error);
}
};
const fetchPharmacyProducts = async (pharmacyId) => {
setLoading(true);
try {
const response = await fetch(`/api/admin/pharmacies/${pharmacyId}/products`, {
credentials: 'include',
});
const data = await response.json();
setPharmacyProducts(data);
} catch (error) {
console.error('Error fetching pharmacy products:', error);
} finally {
setLoading(false);
}
};
const handleSubmit = async (e) => {
e.preventDefault();
if (!selectedProduct) {
alert('Por favor, selecciona un producto primero');
return;
}
try {
// Build identifier: source:id (e.g., openfoodfacts:9421025231209)
const identifier = selectedProduct._id
? `${selectedProduct.source || 'openfoodfacts'}:${selectedProduct._id}`
: `${selectedProduct.source || 'openfoodfacts'}:${selectedProduct.id}`;
const payload = {
pharmacy_id: parseInt(formData.pharmacy_id),
product_source: selectedProduct.source || 'openfoodfacts',
product_off_id: selectedProduct._id || selectedProduct.id,
product_name: selectedProduct.product_name || selectedProduct.name,
price: formData.price ? parseFloat(formData.price) : null,
stock: formData.stock ? parseInt(formData.stock) : 0
};
const response = await fetch('/api/admin/pharmacy-products', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
credentials: 'include',
body: JSON.stringify(payload)
});
if (!response.ok) throw new Error('Error al vincular producto a farmacia');
resetForm();
if (selectedPharmacy) {
fetchPharmacyProducts(selectedPharmacy.id);
}
alert('¡Producto vinculado a la farmacia correctamente!');
} catch (error) {
console.error('Error linking product:', error);
alert('Error al vincular producto a farmacia');
}
};
const handleUpdate = async (id, price, stock) => {
try {
const response = await fetch(`/api/admin/pharmacy-products/${id}`, {
method: 'PUT',
headers: { 'Content-Type': 'application/json' },
credentials: 'include',
body: JSON.stringify({ price, stock })
});
if (!response.ok) throw new Error('Error al actualizar');
fetchPharmacyProducts(selectedPharmacy.id);
alert('¡Actualizado correctamente!');
} catch (error) {
console.error('Error updating:', error);
alert('Error al actualizar');
}
};
const handleDelete = async (id) => {
if (!confirm('¿Eliminar este producto de la farmacia?')) return;
try {
const response = await fetch(`/api/admin/pharmacy-products/${id}`, {
method: 'DELETE',
credentials: 'include'
});
if (!response.ok) throw new Error('Error al eliminar');
fetchPharmacyProducts(selectedPharmacy.id);
alert('¡Producto eliminado de la farmacia!');
} catch (error) {
console.error('Error deleting:', error);
alert('Error al eliminar producto');
}
};
const resetForm = () => {
setFormData({
pharmacy_id: selectedPharmacy ? selectedPharmacy.id.toString() : '',
price: '',
stock: ''
});
setSelectedProduct(null);
setProductSearch('');
setProductResults([]);
};
const selectProduct = (product) => {
setSelectedProduct(product);
setProductSearch(product.product_name || product.name);
setProductResults([]);
};
const pickPharmacy = (pharmacy) => {
setSelectedPharmacy(pharmacy);
setFormData(prev => ({ ...prev, pharmacy_id: pharmacy.id.toString() }));
setPharmacyQuery(`${pharmacy.name}${pharmacy.address}`);
setPharmacyDropdownOpen(false);
};
const clearPharmacy = () => {
setSelectedPharmacy(null);
setFormData(prev => ({ ...prev, pharmacy_id: '' }));
setPharmacyQuery('');
setPharmacyDropdownOpen(true);
setTimeout(() => pharmacyInputRef.current?.focus(), 0);
};
const getSourceBadge = (source) => {
if (source === 'cima') {
return <span className="source-badge source-badge--cima">CIMA</span>;
}
return <span className="source-badge source-badge--off">OFF</span>;
};
return (
<div className="admin-section">
<h2>Vincular Producto a Farmacia</h2>
<form className="admin-form" onSubmit={handleSubmit}>
<div className="form-group">
<label>Farmacia *</label>
<input
ref={pharmacyInputRef}
type="text"
value={pharmacyQuery}
onChange={(e) => {
setPharmacyQuery(e.target.value);
if (selectedPharmacy) {
setSelectedPharmacy(null);
setFormData(prev => ({ ...prev, pharmacy_id: '' }));
}
setPharmacyDropdownOpen(true);
}}
onFocus={() => setPharmacyDropdownOpen(true)}
onBlur={() => setTimeout(() => setPharmacyDropdownOpen(false), 150)}
placeholder={pharmacies.length ? `Buscar entre ${pharmacies.length} farmacias por nombre o dirección…` : 'Cargando farmacias…'}
autoComplete="off"
required={!selectedPharmacy}
/>
{!selectedPharmacy && pharmacyDropdownOpen && (
<div className="medicine-search-results">
{filteredPharmacies.length === 0 ? (
<div className="search-result-item search-result-item--empty">
<span>No hay farmacias que coincidan con "{pharmacyQuery}"</span>
</div>
) : (
filteredPharmacies.map((pharmacy) => (
<div
key={pharmacy.id}
className="search-result-item"
onMouseDown={(e) => { e.preventDefault(); pickPharmacy(pharmacy); }}
>
<strong>{pharmacy.name}</strong>
<span>{pharmacy.address}</span>
</div>
))
)}
</div>
)}
{selectedPharmacy && (
<div className="selected-medicine-info">
<p> Selected: <strong>{selectedPharmacy.name}</strong></p>
<p className="medicine-details">{selectedPharmacy.address}</p>
<button type="button" className="btn-small" onClick={clearPharmacy}>
Cambiar farmacia
</button>
</div>
)}
</div>
<div className="form-group">
<label>Buscar Producto (Open Food Facts) *</label>
<input
type="text"
value={productSearch}
onChange={(e) => {
setProductSearch(e.target.value);
setSelectedProduct(null);
}}
placeholder="Escribe para buscar productos..."
required
/>
{searching && <p className="loading-text">Buscando...</p>}
{productResults.length > 0 && !selectedProduct && (
<div className="medicine-search-results">
{productResults.slice(0, 10).map((product) => (
<div
key={product._id || product.id}
className="search-result-item"
onClick={() => selectProduct(product)}
>
<strong>{product.product_name || product.name}</strong>
{product.brands && <span> - {product.brands}</span>}
{product.quantity && <span> ({product.quantity})</span>}
</div>
))}
</div>
)}
{selectedProduct && (
<div className="selected-medicine-info">
<p> Selected: <strong>{selectedProduct.product_name || selectedProduct.name}</strong></p>
<p className="medicine-details">
{selectedProduct.brands && `Marca: ${selectedProduct.brands}`}
{selectedProduct.quantity && `Cantidad: ${selectedProduct.quantity}`}
{getSourceBadge(selectedProduct.source || 'openfoodfacts')}
{' '}
{selectedProduct._id || selectedProduct.id}
</p>
<button
type="button"
className="btn-small"
onClick={() => {
setSelectedProduct(null);
setProductSearch('');
}}
>
Cambiar producto
</button>
</div>
)}
</div>
<div className="form-row">
<div className="form-group">
<label>Precio ()</label>
<input
type="number"
step="0.01"
value={formData.price}
onChange={(e) => setFormData({ ...formData, price: e.target.value })}
placeholder="e.g., 3.50"
/>
</div>
<div className="form-group">
<label>Stock</label>
<input
type="number"
value={formData.stock}
onChange={(e) => setFormData({ ...formData, stock: e.target.value })}
placeholder="e.g., 100"
/>
</div>
</div>
<div className="form-actions">
<button type="submit" className="btn-primary">
Vincular Producto
</button>
<button type="button" className="btn-secondary" onClick={resetForm}>
Reiniciar
</button>
</div>
</form>
{selectedPharmacy && (
<div className="pharmacy-medicines-section">
<h3>Productos en {selectedPharmacy.name}</h3>
{loading ? (
<div className="loading">Cargando...</div>
) : pharmacyProducts.length === 0 ? (
<p className="empty-state">Aún no hay productos vinculados a esta farmacia.</p>
) : (
<div className="admin-list">
{pharmacyProducts.map((pp) => (
<div key={pp.id} className="admin-item">
<div className="item-content">
<h4>
{pp.product_name}
{getSourceBadge(pp.product_source)}
</h4>
<p>
<strong>Precio:</strong> {pp.price ? `${parseFloat(pp.price).toFixed(2)}` : 'No definido'}
<strong> Stock:</strong> {pp.stock || 0}
</p>
</div>
<div className="item-actions">
<button
className="btn-edit"
onClick={() => {
const newPrice = prompt('Introduce nuevo precio:', pp.price || '');
const newStock = prompt('Introduce nuevo stock:', pp.stock || '0');
if (newPrice !== null && newStock !== null) {
handleUpdate(pp.id, newPrice ? parseFloat(newPrice) : null, parseInt(newStock) || 0);
}
}}
>
Actualizar
</button>
<button className="btn-delete" onClick={() => handleDelete(pp.id)}>
Eliminar
</button>
</div>
</div>
))}
</div>
)}
</div>
)}
</div>
);
}
export default PharmacyProductLink;
+8
View File
@@ -5,6 +5,7 @@ import LoginForm from '../components/admin/LoginForm';
import PharmacyManagement from '../components/admin/PharmacyManagement';
import MedicineManagement from '../components/admin/MedicineManagement';
import PharmacyMedicineLink from '../components/admin/PharmacyMedicineLink';
import PharmacyProductLink from '../components/admin/PharmacyProductLink';
function AdminView() {
const [authenticated, setAuthenticated] = useState(false);
@@ -115,12 +116,19 @@ function AdminView() {
>
🔗 Vincular Medicamento a Farmacia
</button>
<button
className={`admin-tab ${activeTab === 'link-product' ? 'active' : ''}`}
onClick={() => setActiveTab('link-product')}
>
🍎 Vincular Producto a Farmacia
</button>
</div>
<div className="admin-content">
{activeTab === 'pharmacies' && <PharmacyManagement />}
{activeTab === 'medicines' && <MedicineManagement />}
{activeTab === 'link' && <PharmacyMedicineLink />}
{activeTab === 'link-product' && <PharmacyProductLink />}
</div>
</main>
</>
+185
View File
@@ -0,0 +1,185 @@
.product-view {
width: 100%;
max-width: 48rem;
margin: 0 auto;
padding: 1rem var(--margin-main) 2rem;
animation: fadeInUp 0.3s ease-out;
}
.back-btn {
display: flex;
align-items: center;
gap: 0.5rem;
padding: 0.5rem 0;
margin-bottom: 1rem;
background: none;
border: none;
color: var(--primary, #2563eb);
font-size: 0.875rem;
font-weight: 500;
cursor: pointer;
}
.back-btn:hover {
opacity: 0.8;
}
.product-loading,
.product-error {
text-align: center;
padding: 3rem 1rem;
color: var(--on-surface-variant, #6b7280);
font-size: 1rem;
}
.product-header {
display: flex;
flex-direction: column;
align-items: center;
margin-bottom: 1.5rem;
}
.product-image {
width: 120px;
height: 120px;
object-fit: contain;
border-radius: var(--radius-md, 0.75rem);
margin-bottom: 1rem;
}
.source-badge {
display: inline-block;
padding: 0.25rem 0.75rem;
border-radius: 9999px;
color: white;
font-size: 0.75rem;
font-weight: 600;
}
.product-name {
font-size: 1.5rem;
font-weight: 700;
color: var(--on-surface);
text-align: center;
margin-bottom: 0.25rem;
}
.product-brand {
font-size: 1rem;
color: var(--on-surface-variant, #6b7280);
text-align: center;
margin-bottom: 1.5rem;
}
.product-details {
background: var(--surface-container-lowest, #f9fafb);
border-radius: var(--radius-md, 0.75rem);
padding: 1rem;
}
.detail-row {
display: flex;
flex-direction: column;
gap: 0.25rem;
padding: 0.75rem 0;
border-bottom: 1px solid var(--outline-variant, #e5e7eb);
}
.detail-row:last-child {
border-bottom: none;
}
.detail-label {
font-size: 0.75rem;
font-weight: 600;
color: var(--on-surface-variant, #9ca3af);
text-transform: uppercase;
}
.detail-value {
font-size: 0.9375rem;
color: var(--on-surface);
}
.product-pharmacies {
margin-top: 2rem;
}
.pharmacies-loading {
text-align: center;
padding: 2rem 1rem;
color: var(--on-surface-variant, #6b7280);
font-size: 0.875rem;
}
.pharmacies-title {
font-size: 1.125rem;
font-weight: 600;
color: var(--on-surface);
margin-bottom: 1rem;
}
.pharmacies-grid {
display: flex;
flex-direction: column;
gap: 0.75rem;
}
.product-pharmacy-card {
background: var(--surface-container-lowest, #f9fafb);
border-radius: var(--radius-md, 0.75rem);
padding: 1rem;
}
.product-pharmacy-name {
font-size: 0.9375rem;
font-weight: 600;
color: var(--on-surface);
margin-bottom: 0.25rem;
}
.product-pharmacy-address {
font-size: 0.8125rem;
color: var(--on-surface-variant, #6b7280);
margin-bottom: 0.25rem;
}
.product-pharmacy-phone {
font-size: 0.8125rem;
color: var(--on-surface-variant, #6b7280);
margin-bottom: 0.5rem;
}
.product-pharmacy-status {
display: flex;
align-items: center;
gap: 0.75rem;
}
.product-pharmacy-price {
font-size: 0.9375rem;
font-weight: 600;
color: var(--primary, #2563eb);
}
.product-pharmacy-stock {
font-size: 0.75rem;
font-weight: 600;
padding: 0.15rem 0.5rem;
border-radius: 9999px;
}
.product-pharmacy-stock.in-stock {
background: #dcfce7;
color: #166534;
}
.product-pharmacy-stock.low-stock {
background: #fef9c3;
color: #854d0e;
}
.product-pharmacy-stock.out-of-stock {
background: #fee2e2;
color: #991b1b;
}
+180
View File
@@ -0,0 +1,180 @@
import React, { useState, useEffect } from 'react';
import './ProductView.css';
export default function ProductView({ source, id, onBack }) {
const [product, setProduct] = useState(null);
const [loading, setLoading] = useState(true);
const [error, setError] = useState(null);
const [pharmacies, setPharmacies] = useState([]);
const [loadingPharmacies, setLoadingPharmacies] = useState(false);
useEffect(() => {
loadProduct();
}, [source, id]);
async function loadProduct() {
setLoading(true);
setError(null);
setPharmacies([]);
try {
const response = await fetch(`/api/products/${source}/${id}`);
if (!response.ok) {
throw new Error('Producto no encontrado');
}
const data = await response.json();
setProduct(data);
loadPharmacies(source, data.id);
} catch (err) {
setError(err.message);
} finally {
setLoading(false);
}
}
async function loadPharmacies(productSource, productId) {
setLoadingPharmacies(true);
try {
const response = await fetch(`/api/products/${productSource}/${productId}/pharmacies`);
if (response.ok) {
const data = await response.json();
setPharmacies(data);
}
} catch {
// Pharmacies are optional — don't block on failure
} finally {
setLoadingPharmacies(false);
}
}
if (loading) {
return (
<div className="product-view">
<div className="product-loading">Cargando...</div>
</div>
);
}
if (error) {
return (
<div className="product-view">
<button className="back-btn" onClick={onBack}>
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
<path d="M19 12H5M12 19l-7-7 7-7" />
</svg>
Volver
</button>
<div className="product-error">{error}</div>
</div>
);
}
if (!product) return null;
const isCima = product.source === 'cima';
const sourceColor = isCima ? '#2563eb' : '#16a34a';
const sourceLabel = isCima ? 'CIMA' : 'Open Food Facts';
return (
<div className="product-view">
<button className="back-btn" onClick={onBack}>
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
<path d="M19 12H5M12 19l-7-7 7-7" />
</svg>
Volver
</button>
<div className="product-header">
{product.image_url && (
<img src={product.image_url} alt={product.name} className="product-image" />
)}
<span className="source-badge" style={{ backgroundColor: sourceColor }}>
{sourceLabel}
</span>
</div>
<h1 className="product-name">{product.name}</h1>
<p className="product-brand">{product.brand}</p>
<div className="product-details">
{isCima ? (
<>
{product.active_ingredient && (
<DetailRow label="Principio activo" value={product.active_ingredient} />
)}
{product.dosage && (
<DetailRow label="Dosis" value={product.dosage} />
)}
{product.form && (
<DetailRow label="Forma farmacéutica" value={product.form} />
)}
{product.prescription && (
<DetailRow label="Prescripción" value={product.prescription} />
)}
{product.commercialized !== undefined && (
<DetailRow label="Comercializado" value={product.commercialized ? 'Sí' : 'No'} />
)}
</>
) : (
<>
{product.nutriscore && product.nutriscore !== 'not-applicable' && product.nutriscore !== 'unknown' && (
<DetailRow label="Nutri-Score" value={product.nutriscore.toUpperCase()} />
)}
{product.nova_group && (
<DetailRow label="NOVA" value={`Grupo ${product.nova_group}`} />
)}
{product.eco_score && product.eco_score !== 'unknown' && (
<DetailRow label="Eco-Score" value={product.eco_score.toUpperCase()} />
)}
{product.ingredients && (
<DetailRow label="Ingredientes" value={product.ingredients} />
)}
</>
)}
</div>
<div className="product-pharmacies">
{loadingPharmacies ? (
<div className="pharmacies-loading">Cargando farmacias...</div>
) : pharmacies.length > 0 ? (
<>
<h3 className="pharmacies-title">
Disponible en {pharmacies.length} {pharmacies.length === 1 ? 'farmacia' : 'farmacias'}
</h3>
<div className="pharmacies-grid">
{pharmacies.map((pharmacy) => (
<div key={pharmacy.id} className="product-pharmacy-card">
<h4 className="product-pharmacy-name">{pharmacy.name}</h4>
<p className="product-pharmacy-address">{pharmacy.address}</p>
{pharmacy.phone && (
<p className="product-pharmacy-phone">{pharmacy.phone}</p>
)}
<div className="product-pharmacy-status">
{pharmacy.price && (
<span className="product-pharmacy-price">
{parseFloat(pharmacy.price).toFixed(2)} &euro;
</span>
)}
{pharmacy.stock !== undefined && (
<span className={`product-pharmacy-stock ${pharmacy.stock > 20 ? 'in-stock' : pharmacy.stock > 0 ? 'low-stock' : 'out-of-stock'}`}>
{pharmacy.stock > 20 ? 'En Stock' : pharmacy.stock > 0 ? `Stock Bajo (${pharmacy.stock})` : 'Sin Stock'}
</span>
)}
</div>
</div>
))}
</div>
</>
) : null}
</div>
</div>
);
}
function DetailRow({ label, value }) {
return (
<div className="detail-row">
<span className="detail-label">{label}</span>
<span className="detail-value">{value}</span>
</div>
);
}
+41
View File
@@ -356,3 +356,44 @@
color: var(--primary);
font-size: 0.85rem;
}
/* Filter tabs */
.filter-tabs {
display: flex;
gap: 0.5rem;
margin-bottom: 1rem;
flex-wrap: wrap;
}
.filter-tab {
padding: 0.5rem 1rem;
border-radius: 9999px;
border: none;
font-size: 0.875rem;
font-weight: 500;
cursor: pointer;
background: var(--surface-container-lowest, #f3f4f6);
color: var(--on-surface-variant, #6b7280);
transition: all 0.15s;
}
.filter-tab:hover {
background: var(--surface-container-low, #e5e7eb);
}
.filter-tab--active {
background: var(--primary, #2563eb);
color: white;
}
/* Products section */
.products-section {
margin-top: 1.5rem;
}
.section-subtitle {
font-size: 1.125rem;
font-weight: 600;
color: var(--on-surface);
margin-bottom: 0.75rem;
}
+79 -17
View File
@@ -1,6 +1,7 @@
import React, { useState, useEffect, useMemo, useCallback } from 'react';
import SearchBar from '../components/SearchBar';
import MedicineResults from '../components/MedicineResults';
import ProductResults from '../components/ProductResults';
import PharmacyList from '../components/PharmacyList';
import PharmacyMap from '../components/PharmacyMap';
import { haversineKm, getUserPosition, hasCachedPosition } from '../utils/geo';
@@ -13,9 +14,11 @@ const suggestions = [
{ name: 'Omeprazol', icon: 'emergency_home', color: 'neutral-4' },
];
function SearchView({ currentUser, onLoginRequest, initialQuery = '' }) {
function SearchView({ currentUser, onLoginRequest, initialQuery = '', onNavigateToProduct }) {
const [searchQuery, setSearchQuery] = useState(initialQuery);
const [medicines, setMedicines] = useState([]);
const [products, setProducts] = useState([]);
const [searchMode, setSearchMode] = useState('all');
const [selectedMedicine, setSelectedMedicine] = useState(null);
const [pharmacies, setPharmacies] = useState([]);
const [loading, setLoading] = useState(false);
@@ -73,25 +76,43 @@ function SearchView({ currentUser, onLoginRequest, initialQuery = '' }) {
}, [currentUser]);
useEffect(() => {
const searchMedicines = async () => {
const searchAll = async () => {
if (searchQuery.trim().length < 2) {
setMedicines([]);
setProducts([]);
setSelectedMedicine(null);
setPharmacies([]);
return;
}
setLoading(true);
const query = searchQuery.trim();
try {
const response = await fetch(`/api/medicines/search?q=${encodeURIComponent(searchQuery)}`);
const data = await response.json();
setMedicines(data);
// Run both searches in parallel for speed
const [medicinesRes, productsRes] = await Promise.allSettled([
fetch(`/api/medicines/search?q=${encodeURIComponent(query)}`),
fetch(`/api/products/search?q=${encodeURIComponent(query)}`),
]);
// Only update if this search is still the current one
if (query !== searchQuery.trim()) return;
if (medicinesRes.status === 'fulfilled' && medicinesRes.value.ok) {
const medicinesData = await medicinesRes.value.json();
setMedicines(medicinesData);
}
if (productsRes.status === 'fulfilled' && productsRes.value.ok) {
const productsData = await productsRes.value.json();
setProducts(productsData.results || []);
}
} catch (error) {
console.error('Error searching medicines:', error);
console.error('Search error:', error);
} finally {
setLoading(false);
}
};
const timeoutId = setTimeout(searchMedicines, 300);
const timeoutId = setTimeout(searchAll, 300);
return () => clearTimeout(timeoutId);
}, [searchQuery]);
@@ -276,16 +297,57 @@ function SearchView({ currentUser, onLoginRequest, initialQuery = '' }) {
)}
{searchQuery && !selectedMedicine && (
<MedicineResults
medicines={medicines}
onSelect={(m) => {
saveToRecent(m);
setSelectedMedicine(m);
}}
query={searchQuery}
currentUser={currentUser}
onLoginRequest={onLoginRequest}
/>
<>
<div className="filter-tabs">
<button
className={`filter-tab ${searchMode === 'all' ? 'filter-tab--active' : ''}`}
onClick={() => setSearchMode('all')}
>
Todos ({medicines.length + products.length})
</button>
<button
className={`filter-tab ${searchMode === 'medicines' ? 'filter-tab--active' : ''}`}
onClick={() => setSearchMode('medicines')}
>
Medicamentos ({medicines.length})
</button>
<button
className={`filter-tab ${searchMode === 'products' ? 'filter-tab--active' : ''}`}
onClick={() => setSearchMode('products')}
>
Parafarmacia ({products.length})
</button>
</div>
{(searchMode === 'all' || searchMode === 'medicines') && (
<MedicineResults
medicines={medicines}
onSelect={(m) => {
saveToRecent(m);
setSelectedMedicine(m);
}}
query={searchQuery}
currentUser={currentUser}
onLoginRequest={onLoginRequest}
/>
)}
{(searchMode === 'all' || searchMode === 'products') && products.length > 0 && (
<div className="products-section">
<h3 className="section-subtitle">Parafarmacia y Bebé</h3>
<ProductResults
products={products}
onSelect={(p) => {
if (onNavigateToProduct) {
onNavigateToProduct(p.source, p.id);
} else {
window.location.href = `/product/${p.source}/${p.id}`;
}
}}
/>
</div>
)}
</>
)}
{selectedMedicine && (
-23
View File
@@ -38,7 +38,6 @@ services:
OTEL_SERVICE_NAME: farmafinder-backend
OTEL_EXPORTER_OTLP_ENDPOINT: http://host.docker.internal:4317
OTEL_TRACES_EXPORTER: otlp
OTEL_METRICS_EXPORTER: otlp
OTEL_LOGS_EXPORTER: otlp
OTEL_RESOURCE_ATTRIBUTES: service.namespace=farmafinder
volumes:
@@ -62,28 +61,6 @@ services:
depends_on:
- backend
# --- Observability exporters (scraped by the shared Prometheus on srv84-macos) ---
redis-exporter:
image: oliver006/redis_exporter:latest
restart: unless-stopped
ports:
- "9121:9121"
environment:
REDIS_ADDR: redis://redis:6379
REDIS_PASSWORD: ${REDIS_PASSWORD:-}
depends_on:
- redis
postgres-exporter:
image: prometheuscommunity/postgres-exporter:latest
restart: unless-stopped
ports:
- "9187:9187"
environment:
DATA_SOURCE_NAME: postgresql://farmafinder:${PG_PASSWORD:-change-me-in-production}@postgres:5432/farmafinder?sslmode=disable
depends_on:
- postgres
volumes:
backend_data:
postgres_data:
File diff suppressed because it is too large Load Diff
@@ -1,208 +0,0 @@
# FarmaFinder — End-to-End Observability Plan & Progress
> **Purpose:** Single source of truth for adding metrics + monitoring across the
> FarmaFinder stack. If the session runs out of tokens, a fresh session can read
> this file and continue from the **Status** section.
>
> Created: 2026-07-13
---
## 1. Current State (verified)
### 1.1 Monitoring stack — `srv84-macos:/root/Monitoring` (Docker Compose)
Running services (verified live):
| Service | Port | Role |
|---|---|---|
| Prometheus `v2.55.1` | 9090 | metrics + alerting (config `/etc/prometheus/`) |
| Grafana `grafana/grafana` | 3000 | dashboards (admin `foobar`) |
| Alertmanager `v0.27.0` | 9093 | **Telegram** notifications (already configured) |
| Loki `latest` | 3100 | logs (`/otlp` receiver enabled) |
| Tempo `latest` | 3200 | traces |
| cAdvisor | 8080 | container metrics |
| node-exporter | 9100 | host metrics (srv84-macos + srv102-hosting + srv104-omv) |
| **Alloy `v1.6.1`** | 4317 gRPC / 4318 HTTP / 12345 self | unified OTel collector |
**Alloy pipeline (`alloy-config.alloy`):**
`otelcol.receiver.otlp` (gRPC+HTTP) → `batch`
- traces → `otelp.tempo` (Tempo:4317)
- logs → `otlphttp.loki` (Loki:3100/otlp)
- metrics → `exporter.prometheus``prometheus.remote_write``http://prometheus:9090/api/v1/write`
So **any OTLP metrics sent to Alloy land in Prometheus automatically** — no new scrape job needed for app services.
### 1.2 Grafana datasources (provisioned, sufficient)
Prometheus (default), Tempo, Loki, PostgreSQL, Alertmanager.
### 1.3 Grafana plugins (installed, sufficient)
Built-in panels + **Drilldown apps**: `grafana-lokiexplore-app`, `grafana-metricsdrilldown-app`, `grafana-exploretraces-app`, `grafana-pyroscope-app`.
**No extra plugins required.**
### 1.4 Existing app instrumentation
| App | Traces | Metrics | Logs | Health | Notes |
|---|---|---|---|---|---|
| backend (Express) | ✅ OTel→Alloy | ❌ **none** | ✅ pino→Alloy | ❌ none | `src/tracing.js` boots NodeSDK; only traces+logs exported |
| frontend (React/Vite PWA) | ✅ Faro→Alloy:4318 | ❌ | ✅ Faro→Loki | — | `src/utils/faro.js`; dashboards `faro-overview/-web-vitals/-js-errors` exist |
| frontend-mobile (Expo RN) | ❌ | ❌ | console only | — | **no observability at all** |
| pip-platform (FastAPI) | ✅ OTel | ✅ `/metrics` (prometheus_client) | ✅ structlog | ✅ /system/health,/ready,/status | **not scraped by Prometheus yet** |
| scraper (Puppeteer) | ✅ OTel | ❌ | console | — | |
### 1.5 Prometheus scrape jobs (today)
`prometheus`, `cadvisor`, `node-exporter` (x3 hosts). **No farmafinder/pip/redis/postgres jobs.**
Comment in `prometheus.yml`: app metrics are expected via OTLP→Alloy→remote_write.
### 1.6 Existing Prometheus alerts (`alert.rules`)
`service_down`, `high_load`, `high_memory`, `disk_almost_full`, `pm2_process_down`, `container_down`. All infra-level.
---
## 2. Decisions (confirmed with user)
- **Metrics transport = OTLP** for backend + mobile (aligns with stack design; no new app scrape jobs). Infra exporters (Redis/Postgres/pip) stay as scrape jobs.
- **Mobile Faro endpoint:** env-configurable `EXPO_PUBLIC_FARO_URL`, default
`http://grafana.hacecalor.net:4318`. User will **open router port 4318 → srv84-macos:4318**
(and/or fix Nginx Proxy Manager `/faro` proxy to Alloy:4318). Devices are NOT on the docker
host, so `localhost` will NOT work.
- **Alertmanager:** Telegram already configured — **no contact-point change**. New rules just route to it.
---
## 3. Design / Tasks
### Task A — Backend metrics (OTel → Alloy → Prometheus)
**Files:** `apps/backend/src/tracing.js`, `apps/backend/src/metrics.js` (new), `apps/backend/package.json`, `docker-compose.yml`.
1. Add metrics SDK to `tracing.js`:
- `MeterProvider` + `OTLPMetricExporter` + `PeriodicExportingMetricReader` (interval 15s).
- Reuse existing `resource` + `getNodeAutoInstrumentations` (already includes http/express/redis → gives `http.server.request.duration`, `http.client.request.duration`, `redis.client.commands.duration`, etc.).
- Keep `PinoInstrumentation`. Gate on `NODE_ENV !== 'test'`.
2. New `src/metrics.js` using `@opentelemetry/api` `metrics`:
- `medicine_searches_total` (counter)
- `cima_request_duration_ms` (histogram), `cima_errors_total` (counter)
- `cache_hits_total` / `cache_misses_total` (counters)
- `login_success_total` / `login_failure_total` (counters)
- `rate_limit_rejected_total` (counter, label `route`)
- `pharmacy_write_total` (counter, label `op`)
- `pharmacy_medicine_link_total` (counter)
- `push_sent_total` / `push_failed_total` (counters, label `channel=expo|web`)
- `db_query_duration_ms` (histogram), `db_errors_total` (counter, label `engine=sqlite|pg`)
- `redis_errors_total` (counter), `redis_cmd_duration_ms` (histogram)
- `heartbeat_total` (counter, incremented every 30s) → drives "backend down" alert
- Node runtime metrics via `views`/runtime instrumentation (event loop lag, heap, gc).
3. Instrument the relevant handlers in `server.js` (search, auth, admin, notifications, db, redis) by importing the meters.
4. `docker-compose.yml`: add `OTEL_METRICS_EXPORTER: otlp` under backend env (alongside existing traces/logs exporters).
5. `package.json`: ensure `@opentelemetry/sdk-metrics` + `@opentelemetry/exporter-metrics-otlp-grpc` are present (add if missing; align versions with existing `^0.55.0`).
### Task B — Backend health endpoints
**File:** `apps/backend/server.js`.
- `GET /healthz``{status:"ok"}` (liveness).
- `GET /readyz` → ping Redis + run a trivial DB query; return 200/503 JSON.
- Used by Docker healthcheck / k8s; not scraped.
### Task C — Mobile RUM (Expo / React Native)
**Files:** `apps/frontend-mobile/package.json`, `apps/frontend-mobile/app/_layout.tsx` (root), `.env.example`.
- Add dependency `@grafana/faro-react-native` (`^1.2.1`).
- Init in `_layout.tsx` (or `App.tsx`) entry:
```ts
import { initializeFaro } from '@grafana/faro-react-native';
initializeFaro({
app: { name: 'farmafinder-mobile', version: '1.0.0', environment: 'production' },
url: process.env.EXPO_PUBLIC_FARO_URL || 'http://grafana.hacecalor.net:4318',
sessionTracking: { enabled: true },
// captures crashes, JS errors, console, ANR(Android), app-start, memory vitals
});
```
- `EXPO_PUBLIC_FARO_URL` in `.env.example` (default the public URL above).
- Optional follow-up: `@grafana/faro-react-native-tracing` for distributed traces + `@grafana/faro-metro-plugin` for source maps (post-MVP).
### Task D — Infra exporters (scrape jobs on `srv84-macos`)
**Files (remote):** `/root/Monitoring/docker-compose.yml`, `/root/Monitoring/prometheus/prometheus.yml`.
- Add containers `redis-exporter` (→ farmafinder redis) and `postgres-exporter` (→ farmafinder postgres) to the Monitoring compose. Reach farmafinder's redis/postgres via the docker gateway / service DNS on the same host.
- Add scrape jobs in `prometheus.yml`:
- `farmafinder-redis` → redis-exporter
- `farmafinder-postgres` → postgres-exporter
- `pip-platform` → `http://<pip-host>:8000/metrics` (pip already exposes it)
- Reload Prometheus (`POST /-/reload`).
### Task E — Grafana dashboards (provisioned JSON)
**Files:** `/root/Monitoring/grafana/provisioning/dashboards/*.json` + `dashboard.yml` entry.
1. `farmafinder-backend.json` — req rate, error %, latency p50/p95/p99 by route, CIMA latency/errors, cache hit rate, Redis/DB errors, push counts, auth failures, rate-limit hits, Node runtime.
2. `farmafinder-datastores.json` — Redis + Postgres + (SQLite via app metric) panels.
3. `farmafinder-mobile-rum.json` — Faro RN data from Loki (`app.name="farmafinder-mobile"`).
4. `farmafinder-overview.json` — combined RUM + backend metrics + deep-links to Tempo (traces) & Loki (logs).
(Keep existing `faro-*` PWA dashboards.)
### Task F — Alerts
**Files (remote):** `/root/Monitoring/prometheus/alert.rules` + Grafana-managed alert.
Prometheus rules (group `farmafinder`):
- `farmafinder_backend_down` — `absent(heartbeat_total{job="farmafinder-backend"}) > 0` for 5m → critical
- `farmafinder_backend_5xx` — `rate(http.server.request.errors ...)` ratio > 5% over 5m → warning
- `farmafinder_cima_errors` — CIMA error rate high → warning
- `farmafinder_high_latency` — p95 `http.server.request.duration` > threshold → warning
- `farmafinder_redis_down` / `farmafinder_postgres_down` / `pip_platform_down` — `up==0`
Grafana-managed alert (Loki): **mobile/PWA JS-error spike** — count of Faro exceptions over 10m > N.
All route to existing Alertmanager (Telegram).
### Task G — Mobile Faro reachability (user action)
- Open router `TCP 4318 → srv84-macos:4318`, **or** fix Nginx Proxy Manager `grafana.hacecalor.net/faro` → `http://<alloy-host>:4318` ensuring OTLP HTTP paths (`/v1/logs`,`/v1/metrics`,`/v1/traces`) are proxied. Verify from a phone / external curl that `POST http://grafana.hacecalor.net:4318/v1/logs` is accepted.
---
## 4. Status (update as you go)
| Task | Status | Notes |
|---|---|---|
| A. Backend metrics | ✅ done (code) | `src/metrics.js`, `tracing.js` meter provider, instrumented server.js/cima-service.js/redis-client.js. Needs backend rebuild+redeploy to take effect. |
| B. Backend health | ✅ done (code) | `/healthz`, `/readyz` added. |
| C. Mobile Faro | ✅ done (code) | `services/faro.ts` + `_layout.tsx` init + dep `@grafana/faro-react-native`. Requires dev/EAS build (native module). |
| D. Infra exporters | ✅ done | redis/postgres exporters added to farmafinder `docker-compose.yml`; Prometheus scrape jobs + alert rules applied on srv84-macos. Needs farmafinder redeploy. |
| E. Dashboards | ✅ done + LIVE | 4 dashboards pushed to `/root/Monitoring/grafana/provisioning/dashboards/` and provisioned in Grafana. |
| F. Alerts | ✅ done + LIVE | `farmafinder` group applied to `alert.rules`; routes to existing Alertmanager (Telegram). |
| G. Mobile Faro URL | ⏳ user action | open :4318 → srv84-macos:4318, or fix Nginx Proxy Manager `/faro`. |
## 5. Deployment & Verification
### Backend (apply on next deploy)
The running `farmafinder-backend-1` still runs old code. To activate metrics:
```bash
# from repo root on srv84-macos (or wherever farmafinder is deployed)
docker compose build backend && docker compose up -d backend
# or push to main and let .gitea deploy
```
Verify:
```bash
# after ~30s, a heartbeat sample should exist
curl -s "http://srv84-macos:9090/api/v1/query?query=app_heartbeat_total{job=%22farmafinder-backend%22}"
# health probes
curl -s http://localhost:3001/healthz ; curl -s http://localhost:3001/readyz
# dashboards populate: Grafana → FarmaFinder — Backend
```
### Mobile (user)
1. `cd apps/frontend-mobile && npm install` (pulls `@grafana/faro-react-native`).
2. Build a **dev/EAS build** (not Expo Go — native module).
3. Set `EXPO_PUBLIC_FARO_URL` (default `http://grafana.hacecalor.net:4318`) reachable from device.
4. Verify in Grafana → FarmaFinder — Mobile RUM (Loki `{app="farmafinder-mobile"}`).
### Datastore exporters (apply on farmafinder redeploy)
`docker compose up -d` brings up `redis-exporter` (`:9121`) and `postgres-exporter` (`:9187`);
Prometheus already scrapes them. Verify: `up{job="farmafinder-redis"}`, `up{job="farmafinder-postgres"}`.
## 6. Verification checklist (end)
- [x] 4 Grafana dashboards live (backend, datastores, mobile-rum, overview)
- [x] Prometheus scrape jobs `farmafinder-redis` / `farmafinder-postgres` present
- [x] Alert rules `farmafinder_*` loaded (no config errors)
- [ ] Backend redeployed → `app_heartbeat_total`, `http_requests_total`, `cima_requests_total`, etc. appear
- [ ] `/healthz`, `/readyz` return 200
- [ ] Mobile build → Faro data in Loki + Mobile RUM dashboard
- [ ] Trigger a test alert (stop backend) → Telegram receives it
## 7. Key commands / references
- Remote stack: `ssh root@srv84-macos`, configs under `/root/Monitoring`.
- Prometheus reload: `curl -X POST http://srv84-macos:9090/-/reload`.
- Grafana dashboards reload: `curl -u admin:foobar -X POST http://srv84-macos:3000/api/admin/provisioning/dashboards/reload`.
- Grafana API: `curl -u admin:foobar http://srv84-macos:3000/api/...` (admin password `foobar`).
- Backend OTel env (in `docker-compose.yml`): `OTEL_SERVICE_NAME=farmafinder-backend`, `OTEL_EXPORTER_OTLP_ENDPOINT=http://host.docker.internal:4317`, `OTEL_TRACES_EXPORTER=otlp`, **`OTEL_METRICS_EXPORTER=otlp`** (added), `OTEL_LOGS_EXPORTER=otlp`.
- New metrics module: `apps/backend/src/metrics.js`.
- Dashboards source: `monitoring/dashboards/*.json` (mirrored on the host).
@@ -0,0 +1,226 @@
# Parafarmacia + Productos de Bebé — Design Spec
**Date:** 2026-07-13
**Status:** Approved
**Author:** MiMoCode
## Problem
FarmaFinder currently only searches medications via the CIMA API. Users need to find parapharmacy products (OTC medications, vitamins, topical treatments) and baby products (formula milk, baby food, cereals) — categories that pharmacies sell but CIMA doesn't cover comprehensively.
## Goal
Extend FarmaFinder's search to include:
1. **OTC medications** from CIMA (filtered by `cpresc = "Sin Receta"`)
2. **Baby products** (formula milk, baby food, cereals) from Open Food Facts API
Results should appear in a unified search alongside existing prescription medication results.
## Data Sources
### CIMA API (existing, extended)
- **Base URL:** `https://cima.aemps.es/cima/rest`
- **No authentication required**
- **New filter:** `cpresc=Sin+Receta` to get only OTC products
- **Endpoints used:**
- `GET /medicamentos?nombre={query}&cpresc=Sin+Receta` — search OTC products
- `GET /medicamento/{nregistro}` — get OTC product details
- **Rate limits:** None documented; existing 5s timeout per request
- **Data fields:** nregistro, nombre, labtitular, cpresc, formaFarmaceutica, vtm, dosis, fotos, docs
### Open Food Facts API (new)
- **Base URL:** `https://world.openfoodfacts.org/api/v2`
- **No authentication required**
- **Endpoints used:**
- `GET /search?categories_tags=baby-food&search_terms={query}&json=true` — search baby products
- `GET /product/{barcode}.json` — get product details
- **Rate limits:** Be polite (< 10 req/s)
- **Data fields:** product_name, brands, image_url, nutriscore, ingredients_text, categories_tags
- **Product categories to search:**
- `baby-foods` — general baby food
- `baby-milks` — formula milk
- `cereals-for-babies` — baby cereals
- `snacks-and-desserts-for-babies` — baby snacks
## Architecture
### Data Flow
```
User searches "leche"
→ Frontend: GET /api/products/search?q=leche
→ Backend orchestrator:
1. cimaService.searchOTC('leche') — CIMA OTC search
2. offService.searchBaby('leche') — Open Food Facts search
3. Merge results with source tag
4. Cache in Redis (1h TTL)
→ Return unified result list
```
### Unified Product Model
```typescript
interface Product {
id: string; // nregistro (CIMA) or _id (OFF)
source: 'cima' | 'openfoodfacts';
name: string;
brand: string; // labtitular (CIMA) or brands (OFF)
category: 'otc' | 'baby_food' | 'baby_milk' | 'baby_cereal';
image_url: string | null; // fotos[0].url (CIMA) or image_url (OFF)
// CIMA-specific fields
active_ingredient?: string; // vtm.nombre
dosage?: string; // dosis
form?: string; // formaFarmaceutica.nombre
prescription?: string; // cpresc
commercialized?: boolean; // comerc
photos?: string[];
docs?: { tipo: number; url: string }[];
// OFF-specific fields
nutriscore?: string; // nutriscore_grade
ingredients?: string; // ingredients_text
nova_group?: number; // nova_group
eco_score?: string; // ecoscore_grade
}
```
## Backend Changes
### 1. New file: `apps/backend/off-service.js`
Open Food Facts API client:
```javascript
const OFF_API_BASE = 'https://world.openfoodfacts.org/api/v2';
async function searchBabyProducts(query) {
// Search in baby-food categories
const url = `${OFF_API_BASE}/search?categories_tags=baby-food&search_terms=${encodeURIComponent(query)}&json=true&fields=product_name,brands,image_url,nutriscore_grade,ingredients_text,nova_group,ecoscore_grade,categories_tags&page_size=20`;
// Cache key: off:baby:{query}, TTL: 1 hour
// Transform to unified Product model
}
async function getBabyProductDetails(barcode) {
const url = `${OFF_API_BASE}/product/${barcode}.json`;
// Cache key: off:product:{barcode}, TTL: 24 hours
// Transform to unified Product model
}
```
### 2. Modify: `apps/backend/cima-service.js`
Add OTC-specific search function:
```javascript
async function searchOTC(query) {
// Same as searchMedicines but adds cpresc=Sin+Receta filter
// Cache key: cima:otc:{query}, TTL: 1 hour
// Transform to unified Product model (add source: 'cima', category: 'otc')
}
```
### 3. Modify: `apps/backend/server.js`
New unified search route:
```javascript
app.get('/api/products/search', async (req, res) => {
const { q } = req.query;
// Launch parallel searches:
const [cimaResults, offResults] = await Promise.allSettled([
searchOTC(q),
searchBabyProducts(q)
]);
// Merge, deduplicate, sort by relevance
// Return unified results
});
app.get('/api/products/:source/:id', async (req, res) => {
const { source, id } = req.params;
if (source === 'cima') return getMedicineDetails(id);
if (source === 'openfoodfacts') return getBabyProductDetails(id);
});
```
### 4. Redis Cache Strategy
| Key Pattern | TTL | Source |
|-------------|-----|--------|
| `products:search:{query}` | 1 hour | Merged results |
| `cima:otc:{query}` | 1 hour | CIMA OTC only |
| `off:baby:{query}` | 1 hour | OFF baby only |
| `off:product:{barcode}` | 24 hours | OFF product detail |
## Frontend Changes
### 1. New component: `ProductResults.jsx`
Displays unified search results with:
- Product card with image, name, brand
- Source badge: "CIMA" or "Open Food Facts"
- Category badge: "OTC", "Baby Food", "Formula"
- Click navigates to `/product/{source}/{id}`
### 2. Modify: `PublicView.jsx`
- Update search to call `/api/products/search?q=`
- Show unified results alongside existing medicine results
- Add category filter tabs: "All" | "Medications" | "OTC" | "Baby"
### 3. Modify: `MedicineResults.jsx`
- Accept mixed product types
- Conditionally render fields based on `source`
- Show CIMA-specific fields (active ingredient, dosage) for CIMA products
- Show OFF-specific fields (nutriscore, ingredients) for OFF products
### 4. New route: `/product/:source/:id`
- Detail page for any product type
- CIMA products: show full medication info + pharmacies
- OFF products: show nutritional info + "Available at pharmacies" section
## Mobile Changes
### 1. `apps/frontend-mobile/services/products.ts`
```typescript
export async function searchProducts(query: string): Promise<Product[]> {
const { data } = await api.get('/products/search', { params: { q: query } });
return data.results;
}
```
### 2. `apps/frontend-mobile/app/(tabs)/search.tsx`
- Add product search alongside medicine search
- Display unified results with source/category badges
### 3. `apps/frontend-mobile/app/product/[source]/[id].tsx`
- New detail screen for non-medication products
- Adapt layout based on product source
## Error Handling
- CIMA API down: return OFF results only (graceful degradation)
- OFF API down: return CIMA results only
- Both down: return cached results if available, else empty
- OFF rate limit: implement 100ms delay between requests
## Testing
1. **Unit tests:** off-service.js search/transform functions
2. **Integration tests:** `/api/products/search` endpoint with mocked APIs
3. **Manual test:** Search "leche" and verify both CIMA OTC + OFF baby results appear
4. **Edge cases:** Empty results, API timeout, malformed OFF responses
## Out of Scope
- Homeopathy (not reliably available in either API)
- Commercial parapharmacy APIs (paid, not needed for OTC + baby)
- Product price/stock for OFF products (pharmacies don't stock these in the current model)
- User reviews/ratings for products
@@ -1,145 +0,0 @@
{
"annotations": { "list": [] },
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 1,
"id": null,
"links": [],
"liveNow": false,
"panels": [
{
"id": 1, "title": "Request rate (req/s)", "type": "timeseries",
"gridPos": { "h": 6, "w": 8, "x": 0, "y": 0 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [
{ "expr": "sum(rate(http_requests_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "req/s" }
]
},
{
"id": 2, "title": "Requests by status class", "type": "timeseries",
"gridPos": { "h": 6, "w": 8, "x": 8, "y": 0 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [
{ "expr": "sum by (status_class) (rate(http_requests_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "{{status_class}}" }
]
},
{
"id": 3, "title": "5xx error rate", "type": "stat",
"gridPos": { "h": 6, "w": 8, "x": 16, "y": 0 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [
{ "expr": "sum(rate(http_requests_total{status_class=\"5xx\",job=\"farmafinder-backend\"}[5m])) / sum(rate(http_requests_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "5xx ratio" }
],
"fieldConfig": { "defaults": { "unit": "percentunit", "thresholds": { "steps": [ { "color": "green", "value": 0 }, { "color": "yellow", "value": 0.01 }, { "color": "red", "value": 0.05 } ] } } }
},
{
"id": 4, "title": "HTTP p95 latency (route)", "type": "timeseries",
"gridPos": { "h": 6, "w": 12, "x": 0, "y": 6 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [
{ "expr": "histogram_quantile(0.95, sum by (le, route) (rate(http_request_duration_ms_bucket{job=\"farmafinder-backend\"}[5m])))", "legendFormat": "{{route}} p95" }
],
"fieldConfig": { "defaults": { "unit": "ms" } }
},
{
"id": 5, "title": "Medicine searches / CIMA requests", "type": "timeseries",
"gridPos": { "h": 6, "w": 12, "x": 12, "y": 6 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [
{ "expr": "sum(rate(medicine_searches_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "searches/s" },
{ "expr": "sum(rate(cima_requests_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "cima req/s" }
]
},
{
"id": 6, "title": "Cache hit ratio", "type": "timeseries",
"gridPos": { "h": 6, "w": 8, "x": 0, "y": 12 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [
{ "expr": "sum(rate(cache_hits_total{job=\"farmafinder-backend\"}[5m])) / (sum(rate(cache_hits_total{job=\"farmafinder-backend\"}[5m])) + sum(rate(cache_misses_total{job=\"farmafinder-backend\"}[5m])))", "legendFormat": "hit ratio" }
],
"fieldConfig": { "defaults": { "unit": "percentunit" } }
},
{
"id": 7, "title": "CIMA API errors", "type": "timeseries",
"gridPos": { "h": 6, "w": 8, "x": 8, "y": 12 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [
{ "expr": "sum(rate(cima_requests_total{status=\"error\",job=\"farmafinder-backend\"}[5m]))", "legendFormat": "errors/s" }
]
},
{
"id": 8, "title": "Logins (success / failure)", "type": "timeseries",
"gridPos": { "h": 6, "w": 8, "x": 16, "y": 12 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [
{ "expr": "sum(rate(login_success_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "success/s" },
{ "expr": "sum(rate(login_failure_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "failure/s" }
]
},
{
"id": 9, "title": "Rate-limit rejections (by route)", "type": "timeseries",
"gridPos": { "h": 6, "w": 12, "x": 0, "y": 18 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [
{ "expr": "sum by (route) (rate(rate_limit_rejected_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "{{route}}" }
]
},
{
"id": 10, "title": "Push notifications (sent / failed)", "type": "timeseries",
"gridPos": { "h": 6, "w": 12, "x": 12, "y": 18 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [
{ "expr": "sum by (channel) (rate(push_sent_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "sent {{channel}}" },
{ "expr": "sum by (channel) (rate(push_failed_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "failed {{channel}}" }
]
},
{
"id": 11, "title": "DB query p95 latency & errors", "type": "timeseries",
"gridPos": { "h": 6, "w": 12, "x": 0, "y": 24 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [
{ "expr": "histogram_quantile(0.95, sum by (le, engine) (rate(db_query_duration_ms_bucket{job=\"farmafinder-backend\"}[5m])))", "legendFormat": "p95 {{engine}}" },
{ "expr": "sum by (engine) (rate(db_errors_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "errors {{engine}}" }
],
"fieldConfig": { "defaults": { "unit": "ms" } }
},
{
"id": 12, "title": "Redis cmd p95 & errors", "type": "timeseries",
"gridPos": { "h": 6, "w": 12, "x": 12, "y": 24 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [
{ "expr": "histogram_quantile(0.95, sum by (le) (rate(redis_cmd_duration_ms_bucket{job=\"farmafinder-backend\"}[5m])))", "legendFormat": "p95 redis" },
{ "expr": "sum(rate(redis_errors_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "redis errors/s" }
],
"fieldConfig": { "defaults": { "unit": "ms" } }
},
{
"id": 13, "title": "Admin ops (pharmacy writes / links)", "type": "timeseries",
"gridPos": { "h": 6, "w": 12, "x": 0, "y": 30 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [
{ "expr": "sum by (op) (rate(pharmacy_write_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "pharmacy {{op}}" },
{ "expr": "sum by (op) (rate(pharmacy_medicine_link_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "link {{op}}" }
]
},
{
"id": 14, "title": "Liveness (heartbeat)", "type": "stat",
"gridPos": { "h": 6, "w": 12, "x": 12, "y": 30 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [
{ "expr": "max(app_heartbeat_total{job=\"farmafinder-backend\"})", "legendFormat": "heartbeat total" }
]
}
],
"schemaVersion": 39,
"style": "dark",
"tags": ["farmafinder", "backend"],
"templating": { "list": [] },
"time": { "from": "now-6h", "to": "now" },
"timepicker": {},
"timezone": "browser",
"title": "FarmaFinder — Backend",
"uid": "farmafinder-backend",
"version": 1,
"weekStart": ""
}
@@ -1,85 +0,0 @@
{
"annotations": { "list": [] },
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 1,
"id": null,
"links": [],
"liveNow": false,
"panels": [
{
"id": 1, "title": "Redis up", "type": "stat",
"gridPos": { "h": 5, "w": 6, "x": 0, "y": 0 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [ { "expr": "redis_up{job=\"farmafinder-redis\"}", "legendFormat": "redis" } ]
},
{
"id": 2, "title": "Connected clients", "type": "timeseries",
"gridPos": { "h": 5, "w": 9, "x": 6, "y": 0 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [ { "expr": "redis_connected_clients{job=\"farmafinder-redis\"}", "legendFormat": "clients" } ]
},
{
"id": 3, "title": "Memory used", "type": "timeseries",
"gridPos": { "h": 5, "w": 9, "x": 15, "y": 0 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [ { "expr": "redis_memory_used_bytes{job=\"farmafinder-redis\"}", "legendFormat": "bytes" } ],
"fieldConfig": { "defaults": { "unit": "bytes" } }
},
{
"id": 4, "title": "Commands/sec", "type": "timeseries",
"gridPos": { "h": 6, "w": 12, "x": 0, "y": 5 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [ { "expr": "rate(redis_commands_processed_total{job=\"farmafinder-redis\"}[5m])", "legendFormat": "cmd/s" } ]
},
{
"id": 5, "title": "Keyspace hit ratio", "type": "timeseries",
"gridPos": { "h": 6, "w": 12, "x": 12, "y": 5 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [ { "expr": "sum(rate(redis_keyspace_hits_total{job=\"farmafinder-redis\"}[5m])) / (sum(rate(redis_keyspace_hits_total{job=\"farmafinder-redis\"}[5m])) + sum(rate(redis_keyspace_misses_total{job=\"farmafinder-redis\"}[5m])))", "legendFormat": "hit ratio" } ],
"fieldConfig": { "defaults": { "unit": "percentunit" } }
},
{
"id": 6, "title": "Postgres up", "type": "stat",
"gridPos": { "h": 5, "w": 6, "x": 0, "y": 11 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [ { "expr": "pg_up{job=\"farmafinder-postgres\"}", "legendFormat": "pg" } ]
},
{
"id": 7, "title": "Active connections", "type": "timeseries",
"gridPos": { "h": 5, "w": 9, "x": 6, "y": 11 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [ { "expr": "pg_stat_activity_count{job=\"farmafinder-postgres\"}", "legendFormat": "connections" } ]
},
{
"id": 8, "title": "Tuples returned / fetched", "type": "timeseries",
"gridPos": { "h": 5, "w": 9, "x": 15, "y": 11 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [ { "expr": "rate(pg_stat_database_tup_returned{job=\"farmafinder-postgres\"}[5m])", "legendFormat": "returned/s" }, { "expr": "rate(pg_stat_database_tup_fetched{job=\"farmafinder-postgres\"}[5m])", "legendFormat": "fetched/s" } ]
},
{
"id": 9, "title": "Deadlocks / conflicts", "type": "timeseries",
"gridPos": { "h": 6, "w": 12, "x": 0, "y": 16 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [ { "expr": "rate(pg_stat_database_deadlocks{job=\"farmafinder-postgres\"}[5m])", "legendFormat": "deadlocks/s" }, { "expr": "rate(pg_stat_database_conflicts{job=\"farmafinder-postgres\"}[5m])", "legendFormat": "conflicts/s" } ]
},
{
"id": 10, "title": "Cache hit ratio (blocks)", "type": "timeseries",
"gridPos": { "h": 6, "w": 12, "x": 12, "y": 16 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [ { "expr": "pg_stat_database_blk_hit{job=\"farmafinder-postgres\"} / (pg_stat_database_blk_hit{job=\"farmafinder-postgres\"} + pg_stat_database_blk_read{job=\"farmafinder-postgres\"})", "legendFormat": "block hit ratio" } ],
"fieldConfig": { "defaults": { "unit": "percentunit" } }
}
],
"schemaVersion": 39,
"style": "dark",
"tags": ["farmafinder", "datastores"],
"templating": { "list": [] },
"time": { "from": "now-6h", "to": "now" },
"timepicker": {},
"timezone": "browser",
"title": "FarmaFinder — Datastores",
"uid": "farmafinder-datastores",
"version": 1,
"weekStart": ""
}
@@ -1,58 +0,0 @@
{
"annotations": { "list": [] },
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 1,
"id": null,
"links": [],
"liveNow": false,
"panels": [
{
"id": 1, "title": "Events/sec", "type": "timeseries",
"gridPos": { "h": 6, "w": 8, "x": 0, "y": 0 },
"datasource": { "type": "loki", "uid": "bfowk7qjoccu8b" },
"targets": [ { "expr": "sum(count_over_time({app=\"farmafinder-mobile\"}[5m]))", "legendFormat": "events/s" } ]
},
{
"id": 2, "title": "Active sessions", "type": "timeseries",
"gridPos": { "h": 6, "w": 8, "x": 8, "y": 0 },
"datasource": { "type": "loki", "uid": "bfowk7qjoccu8b" },
"targets": [ { "expr": "count(count by (session_id) (count_over_time({app=\"farmafinder-mobile\"}[5m])))", "legendFormat": "sessions" } ]
},
{
"id": 3, "title": "Errors/sec", "type": "timeseries",
"gridPos": { "h": 6, "w": 8, "x": 16, "y": 0 },
"datasource": { "type": "loki", "uid": "bfowk7qjoccu8b" },
"targets": [ { "expr": "sum(count_over_time({app=\"farmafinder-mobile\"} |~ \"(?i)error|exception|crash\"[5m]))", "legendFormat": "errors/s" } ]
},
{
"id": 4, "title": "Events by type", "type": "timeseries",
"gridPos": { "h": 7, "w": 12, "x": 0, "y": 6 },
"datasource": { "type": "loki", "uid": "bfowk7qjoccu8b" },
"targets": [ { "expr": "sum by (type) (count_over_time({app=\"farmafinder-mobile\"}[5m]))", "legendFormat": "{{type}}" } ]
},
{
"id": 5, "title": "Top error messages", "type": "timeseries",
"gridPos": { "h": 7, "w": 12, "x": 12, "y": 6 },
"datasource": { "type": "loki", "uid": "bfowk7qjoccu8b" },
"targets": [ { "expr": "sum by (message) (count_over_time({app=\"farmafinder-mobile\"} |~ \"(?i)error|exception|crash\"[5m]))", "legendFormat": "{{message}}" } ]
},
{
"id": 6, "title": "Recent logs", "type": "logs",
"gridPos": { "h": 10, "w": 24, "x": 0, "y": 13 },
"datasource": { "type": "loki", "uid": "bfowk7qjoccu8b" },
"targets": [ { "expr": "{app=\"farmafinder-mobile\"}", "legendFormat": "" } ]
}
],
"schemaVersion": 39,
"style": "dark",
"tags": ["farmafinder", "mobile", "rum"],
"templating": { "list": [] },
"time": { "from": "now-6h", "to": "now" },
"timepicker": {},
"timezone": "browser",
"title": "FarmaFinder — Mobile RUM",
"uid": "farmafinder-mobile-rum",
"version": 1,
"weekStart": ""
}
@@ -1,64 +0,0 @@
{
"annotations": { "list": [] },
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 1,
"id": null,
"links": [],
"liveNow": false,
"panels": [
{
"id": 1, "title": "Backend req/s", "type": "stat",
"gridPos": { "h": 5, "w": 6, "x": 0, "y": 0 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [ { "expr": "sum(rate(http_requests_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "req/s" } ]
},
{
"id": 2, "title": "Backend 5xx ratio", "type": "stat",
"gridPos": { "h": 5, "w": 6, "x": 6, "y": 0 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [ { "expr": "sum(rate(http_requests_total{status_class=\"5xx\",job=\"farmafinder-backend\"}[5m])) / sum(rate(http_requests_total{job=\"farmafinder-backend\"}[5m]))", "legendFormat": "5xx" } ],
"fieldConfig": { "defaults": { "unit": "percentunit", "thresholds": { "steps": [ { "color": "green", "value": 0 }, { "color": "yellow", "value": 0.01 }, { "color": "red", "value": 0.05 } ] } } }
},
{
"id": 3, "title": "CIMA errors/s", "type": "stat",
"gridPos": { "h": 5, "w": 6, "x": 12, "y": 0 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [ { "expr": "sum(rate(cima_requests_total{status=\"error\",job=\"farmafinder-backend\"}[5m]))", "legendFormat": "cima err/s" } ]
},
{
"id": 4, "title": "Mobile events/s", "type": "stat",
"gridPos": { "h": 5, "w": 6, "x": 18, "y": 0 },
"datasource": { "type": "loki", "uid": "bfowk7qjoccu8b" },
"targets": [ { "expr": "sum(count_over_time({app=\"farmafinder-mobile\"}[5m]))", "legendFormat": "mobile/s" } ]
},
{
"id": 5, "title": "Datastore health", "type": "stat",
"gridPos": { "h": 5, "w": 12, "x": 0, "y": 5 },
"datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" },
"targets": [
{ "expr": "redis_up{job=\"farmafinder-redis\"}", "legendFormat": "redis" },
{ "expr": "pg_up{job=\"farmafinder-postgres\"}", "legendFormat": "postgres" }
]
},
{
"id": 6, "title": "Navigation", "type": "text",
"gridPos": { "h": 5, "w": 12, "x": 12, "y": 5 },
"options": {
"mode": "markdown",
"content": "**Dashboards**\n- [Backend](/d/farmafinder-backend/farmafinder-backend)\n- [Datastores](/d/farmafinder-datastores/farmafinder-datastores)\n- [Mobile RUM](/d/farmafinder-mobile-rum/farmafinder-mobile-rum)\n- [Faro Web RUM](/d/faro-overview/faro-farmafinder-rum-overview)\n\n**Explore**\n- [Tempo (traces)](/explore?orgId=1&left=%5B%22now-6h%22,%22now%22,%22tempo%22,%7B%7D%5D)\n- [Loki (logs)](/explore?orgId=1&left=%5B%22now-6h%22,%22now%22,%22loki%22,%7B%7D%5D)\n- [Prometheus (metrics)](/explore?orgId=1&left=%5B%22now-6h%22,%22now%22,%22PBFA97CFB590B2093%22,%7B%7D%5D)"
}
}
],
"schemaVersion": 39,
"style": "dark",
"tags": ["farmafinder", "overview"],
"templating": { "list": [] },
"time": { "from": "now-6h", "to": "now" },
"timepicker": {},
"timezone": "browser",
"title": "FarmaFinder — Overview",
"uid": "farmafinder-overview",
"version": 1,
"weekStart": ""
}
-466
View File
@@ -35,12 +35,10 @@
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/auto-instrumentations-node": "^0.52.0",
"@opentelemetry/exporter-logs-otlp-grpc": "^0.55.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "^0.55.0",
"@opentelemetry/exporter-trace-otlp-grpc": "^0.55.0",
"@opentelemetry/instrumentation-pino": "^0.45.0",
"@opentelemetry/resources": "^1.28.0",
"@opentelemetry/sdk-logs": "^0.55.0",
"@opentelemetry/sdk-metrics": "^1.28.0",
"@opentelemetry/sdk-node": "^0.55.0",
"@opentelemetry/sdk-trace-base": "^1.28.0",
"@opentelemetry/semantic-conventions": "^1.28.0",
@@ -67,43 +65,6 @@
"supertest": "^7.2.2"
}
},
"apps/backend/node_modules/@opentelemetry/core": {
"version": "1.30.1",
"resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.30.1.tgz",
"integrity": "sha512-OOCM2C/QIURhJMuKaekP3TRBxBKxG/TWWA0TL2J6nXUtDnuCtccy49LUJF8xPFXMX+0LMcxFpCo8M9cGY1W6rQ==",
"dependencies": {
"@opentelemetry/semantic-conventions": "1.28.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.10.0"
}
},
"apps/backend/node_modules/@opentelemetry/sdk-metrics": {
"version": "1.30.1",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-1.30.1.tgz",
"integrity": "sha512-q9zcZ0Okl8jRgmy7eNW3Ku1XSgg3sDLa5evHZpCwjspw7E8Is4K/haRPDJrBcX3YSn/Y7gUvFnByNYEKQNbNog==",
"dependencies": {
"@opentelemetry/core": "1.30.1",
"@opentelemetry/resources": "1.30.1"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.3.0 <1.10.0"
}
},
"apps/backend/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.28.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.28.0.tgz",
"integrity": "sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==",
"engines": {
"node": ">=14"
}
},
"apps/frontend": {
"name": "farma-clic-frontend",
"version": "1.0.0",
@@ -138,7 +99,6 @@
"version": "1.0.0",
"dependencies": {
"@expo/vector-icons": "^15.0.2",
"@grafana/faro-react-native": "^1.2.1",
"@react-native-async-storage/async-storage": "2.2.0",
"@tanstack/react-query": "^5.101.2",
"axios": "^1.18.1",
@@ -403,157 +363,6 @@
"react-native": "*"
}
},
"apps/frontend-mobile/node_modules/@grafana/faro-core": {
"version": "2.8.2",
"resolved": "https://registry.npmjs.org/@grafana/faro-core/-/faro-core-2.8.2.tgz",
"integrity": "sha512-63C6+N/P9/ySUMaGut8yVb1DkPuHS5I/lfRm97+aDXFj3+8pxRT/QzyXNe0r6KMU5O95wC9FLVGxG9ZvkwEhJQ==",
"dependencies": {
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/otlp-transformer": "^0.219.0"
}
},
"apps/frontend-mobile/node_modules/@grafana/faro-react-native": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/@grafana/faro-react-native/-/faro-react-native-1.3.0.tgz",
"integrity": "sha512-KeohD3S2xmiukL5YW3mOGDqvFiwpD9IzJ2EtZ50ktEsnA+6EMt2AtJ8RzJfAamGTYqemBpDiw51rqB4ID+C2xg==",
"dependencies": {
"@grafana/faro-core": "^2.7.0",
"@react-native-async-storage/async-storage": "^1.21.0",
"react-native-device-info": "^11.1.0"
},
"peerDependencies": {
"@react-navigation/native": ">=6.0.0",
"react": ">=18.0.0",
"react-native": ">=0.70.0",
"react-native-mmkv": ">=2.0.0"
},
"peerDependenciesMeta": {
"@react-navigation/native": {
"optional": true
},
"react-native-mmkv": {
"optional": true
}
}
},
"apps/frontend-mobile/node_modules/@grafana/faro-react-native/node_modules/@react-native-async-storage/async-storage": {
"version": "1.24.0",
"resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.24.0.tgz",
"integrity": "sha512-W4/vbwUOYOjco0x3toB8QCr7EjIP6nE9G7o8PMguvvjYT5Awg09lyV4enACRx4s++PPulBiBSjL0KTFx2u0Z/g==",
"dependencies": {
"merge-options": "^3.0.4"
},
"peerDependencies": {
"react-native": "^0.0.0-0 || >=0.60 <1.0"
}
},
"apps/frontend-mobile/node_modules/@opentelemetry/api-logs": {
"version": "0.219.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.219.0.tgz",
"integrity": "sha512-FFx7YnaYJlIjqWW/AG/yAZ0L/NEY724PipXXXQLdtZPbLwBGbUMTGL1i/esI56TWfTUXxhLfpgrnWJCG8aUJyg==",
"dependencies": {
"@opentelemetry/api": "^1.3.0"
},
"engines": {
"node": ">=8.0.0"
}
},
"apps/frontend-mobile/node_modules/@opentelemetry/core": {
"version": "2.8.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.8.0.tgz",
"integrity": "sha512-hd1Lfh8p545nNz+jq1Ejfz+Mn1hyLuxYn1YzTfFNrxr8urEWMNQLPf1Th8kjOH+HxwawCrtgBp8JpBUR4ZSgww==",
"dependencies": {
"@opentelemetry/semantic-conventions": "^1.29.0"
},
"engines": {
"node": "^18.19.0 || >=20.6.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.10.0"
}
},
"apps/frontend-mobile/node_modules/@opentelemetry/otlp-transformer": {
"version": "0.219.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.219.0.tgz",
"integrity": "sha512-aaYKAyXhw9VchKZVGOopD3Gw/kPsyrX2c6IQ0AW32mTjqmZOh5Y6Gf5OYqTNqVktAeBjmFinhyFaCwW6GYK9YQ==",
"dependencies": {
"@opentelemetry/api-logs": "0.219.0",
"@opentelemetry/core": "2.8.0",
"@opentelemetry/resources": "2.8.0",
"@opentelemetry/sdk-logs": "0.219.0",
"@opentelemetry/sdk-metrics": "2.8.0",
"@opentelemetry/sdk-trace-base": "2.8.0"
},
"engines": {
"node": "^18.19.0 || >=20.6.0"
},
"peerDependencies": {
"@opentelemetry/api": "^1.3.0"
}
},
"apps/frontend-mobile/node_modules/@opentelemetry/resources": {
"version": "2.8.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.8.0.tgz",
"integrity": "sha512-qmXQ27ilDbUK/vGMqwL8D4/rhn76C+sherM4wTbjlfknR8Nvfc/hCxjRJPhkzZzUsPiNg16SA31NxMabwttRjg==",
"dependencies": {
"@opentelemetry/core": "2.8.0",
"@opentelemetry/semantic-conventions": "^1.29.0"
},
"engines": {
"node": "^18.19.0 || >=20.6.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.3.0 <1.10.0"
}
},
"apps/frontend-mobile/node_modules/@opentelemetry/sdk-logs": {
"version": "0.219.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-logs/-/sdk-logs-0.219.0.tgz",
"integrity": "sha512-s6lTKRakaPClvKoWHRChxnXjDMkM/TQ30ff78jN6EBGf7MI7VzANE5PU3f4z9qDUudWjvZjOLHG0rBnBKYvoXA==",
"dependencies": {
"@opentelemetry/api-logs": "0.219.0",
"@opentelemetry/core": "2.8.0",
"@opentelemetry/resources": "2.8.0",
"@opentelemetry/semantic-conventions": "^1.29.0"
},
"engines": {
"node": "^18.19.0 || >=20.6.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.4.0 <1.10.0"
}
},
"apps/frontend-mobile/node_modules/@opentelemetry/sdk-metrics": {
"version": "2.8.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-2.8.0.tgz",
"integrity": "sha512-UDBGaj6W0Rgy5rTTaoxs8gVGF/aGkAKyjurJv7se6wjRxJu7FoquTLT/vt54DZfo4crbprYfhX/SOK9+BPw1qg==",
"dependencies": {
"@opentelemetry/core": "2.8.0",
"@opentelemetry/resources": "2.8.0"
},
"engines": {
"node": "^18.19.0 || >=20.6.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.9.0 <1.10.0"
}
},
"apps/frontend-mobile/node_modules/@opentelemetry/sdk-trace-base": {
"version": "2.8.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.8.0.tgz",
"integrity": "sha512-mhU4jp+vW0mGbFRd+GeXHvmfA4aDqWjBjLC3pE5XMpLs0IE2ryYb019Ts2AQrOq67gaTF25D91+fgvEHDZEnuQ==",
"dependencies": {
"@opentelemetry/core": "2.8.0",
"@opentelemetry/resources": "2.8.0",
"@opentelemetry/semantic-conventions": "^1.29.0"
},
"engines": {
"node": "^18.19.0 || >=20.6.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.3.0 <1.10.0"
}
},
"apps/frontend-mobile/node_modules/@react-native-async-storage/async-storage": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-2.2.0.tgz",
@@ -1276,14 +1085,6 @@
}
}
},
"apps/frontend-mobile/node_modules/react-native-device-info": {
"version": "11.1.0",
"resolved": "https://registry.npmjs.org/react-native-device-info/-/react-native-device-info-11.1.0.tgz",
"integrity": "sha512-hzXJSObJdezEz0hF7MAJ3tGeoesuQWenXXt9mrQR9Mjb8kXpZ09rqSsZ/quNpJdZpQ3rYiFa3/0GFG5KNn9PBg==",
"peerDependencies": {
"react-native": "*"
}
},
"apps/frontend-mobile/node_modules/react-native-drawer-layout": {
"version": "4.2.7",
"resolved": "https://registry.npmjs.org/react-native-drawer-layout/-/react-native-drawer-layout-4.2.7.tgz",
@@ -7340,273 +7141,6 @@
"node": ">=14"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-grpc": {
"version": "0.55.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-grpc/-/exporter-metrics-otlp-grpc-0.55.0.tgz",
"integrity": "sha512-9V6t3Tz1yFmXKXDjphgPSAsfQuG0bz9PlAVRY28D+wuG7Ut/Fv43XuccktdAcdrXx1MvCHdCcVmINLyYXLqTIg==",
"dependencies": {
"@grpc/grpc-js": "^1.7.1",
"@opentelemetry/core": "1.28.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.55.0",
"@opentelemetry/otlp-exporter-base": "0.55.0",
"@opentelemetry/otlp-grpc-exporter-base": "0.55.0",
"@opentelemetry/otlp-transformer": "0.55.0",
"@opentelemetry/resources": "1.28.0",
"@opentelemetry/sdk-metrics": "1.28.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": "^1.3.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/api-logs": {
"version": "0.55.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.55.0.tgz",
"integrity": "sha512-3cpa+qI45VHYcA5c0bHM6VHo9gicv3p5mlLHNG3rLyjQU8b7e0st1rWtrUn3JbZ3DwwCfhKop4eQ9UuYlC6Pkg==",
"dependencies": {
"@opentelemetry/api": "^1.3.0"
},
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/core": {
"version": "1.28.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.28.0.tgz",
"integrity": "sha512-ZLwRMV+fNDpVmF2WYUdBHlq0eOWtEaUJSusrzjGnBt7iSRvfjFE3RXYUZJrqou/wIDWV0DwQ5KIfYe9WXg9Xqw==",
"dependencies": {
"@opentelemetry/semantic-conventions": "1.27.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.10.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/otlp-exporter-base": {
"version": "0.55.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.55.0.tgz",
"integrity": "sha512-iHQI0Zzq3h1T6xUJTVFwmFl5Dt5y1es+fl4kM+k5T/3YvmVyeYkSiF+wHCg6oKrlUAJfk+t55kaAu3sYmt7ZYA==",
"dependencies": {
"@opentelemetry/core": "1.28.0",
"@opentelemetry/otlp-transformer": "0.55.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": "^1.3.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/otlp-transformer": {
"version": "0.55.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.55.0.tgz",
"integrity": "sha512-kVqEfxtp6mSN2Dhpy0REo1ghP4PYhC1kMHQJ2qVlO99Pc+aigELjZDfg7/YKmL71gR6wVGIeJfiql/eXL7sQPA==",
"dependencies": {
"@opentelemetry/api-logs": "0.55.0",
"@opentelemetry/core": "1.28.0",
"@opentelemetry/resources": "1.28.0",
"@opentelemetry/sdk-logs": "0.55.0",
"@opentelemetry/sdk-metrics": "1.28.0",
"@opentelemetry/sdk-trace-base": "1.28.0",
"protobufjs": "^7.3.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": "^1.3.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/resources": {
"version": "1.28.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.28.0.tgz",
"integrity": "sha512-cIyXSVJjGeTICENN40YSvLDAq4Y2502hGK3iN7tfdynQLKWb3XWZQEkPc+eSx47kiy11YeFAlYkEfXwR1w8kfw==",
"dependencies": {
"@opentelemetry/core": "1.28.0",
"@opentelemetry/semantic-conventions": "1.27.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.10.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/sdk-metrics": {
"version": "1.28.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-1.28.0.tgz",
"integrity": "sha512-43tqMK/0BcKTyOvm15/WQ3HLr0Vu/ucAl/D84NO7iSlv6O4eOprxSHa3sUtmYkaZWHqdDJV0AHVz/R6u4JALVQ==",
"dependencies": {
"@opentelemetry/core": "1.28.0",
"@opentelemetry/resources": "1.28.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.3.0 <1.10.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/sdk-trace-base": {
"version": "1.28.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.28.0.tgz",
"integrity": "sha512-ceUVWuCpIao7Y5xE02Xs3nQi0tOGmMea17ecBdwtCvdo9ekmO+ijc9RFDgfifMl7XCBf41zne/1POM3LqSTZDA==",
"dependencies": {
"@opentelemetry/core": "1.28.0",
"@opentelemetry/resources": "1.28.0",
"@opentelemetry/semantic-conventions": "1.27.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.10.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.27.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.27.0.tgz",
"integrity": "sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-http": {
"version": "0.55.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-http/-/exporter-metrics-otlp-http-0.55.0.tgz",
"integrity": "sha512-3MqDNZzgXmLaiVo9gs9kCw/zPEaZYKIT0+jeMWscWHL/jrA9BNArTOYWUHEPabAQmWQ2BbvgNC7yzlqjoynQwA==",
"dependencies": {
"@opentelemetry/core": "1.28.0",
"@opentelemetry/otlp-exporter-base": "0.55.0",
"@opentelemetry/otlp-transformer": "0.55.0",
"@opentelemetry/resources": "1.28.0",
"@opentelemetry/sdk-metrics": "1.28.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": "^1.3.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/api-logs": {
"version": "0.55.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.55.0.tgz",
"integrity": "sha512-3cpa+qI45VHYcA5c0bHM6VHo9gicv3p5mlLHNG3rLyjQU8b7e0st1rWtrUn3JbZ3DwwCfhKop4eQ9UuYlC6Pkg==",
"dependencies": {
"@opentelemetry/api": "^1.3.0"
},
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/core": {
"version": "1.28.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.28.0.tgz",
"integrity": "sha512-ZLwRMV+fNDpVmF2WYUdBHlq0eOWtEaUJSusrzjGnBt7iSRvfjFE3RXYUZJrqou/wIDWV0DwQ5KIfYe9WXg9Xqw==",
"dependencies": {
"@opentelemetry/semantic-conventions": "1.27.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.10.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/otlp-exporter-base": {
"version": "0.55.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.55.0.tgz",
"integrity": "sha512-iHQI0Zzq3h1T6xUJTVFwmFl5Dt5y1es+fl4kM+k5T/3YvmVyeYkSiF+wHCg6oKrlUAJfk+t55kaAu3sYmt7ZYA==",
"dependencies": {
"@opentelemetry/core": "1.28.0",
"@opentelemetry/otlp-transformer": "0.55.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": "^1.3.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/otlp-transformer": {
"version": "0.55.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.55.0.tgz",
"integrity": "sha512-kVqEfxtp6mSN2Dhpy0REo1ghP4PYhC1kMHQJ2qVlO99Pc+aigELjZDfg7/YKmL71gR6wVGIeJfiql/eXL7sQPA==",
"dependencies": {
"@opentelemetry/api-logs": "0.55.0",
"@opentelemetry/core": "1.28.0",
"@opentelemetry/resources": "1.28.0",
"@opentelemetry/sdk-logs": "0.55.0",
"@opentelemetry/sdk-metrics": "1.28.0",
"@opentelemetry/sdk-trace-base": "1.28.0",
"protobufjs": "^7.3.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": "^1.3.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/resources": {
"version": "1.28.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.28.0.tgz",
"integrity": "sha512-cIyXSVJjGeTICENN40YSvLDAq4Y2502hGK3iN7tfdynQLKWb3XWZQEkPc+eSx47kiy11YeFAlYkEfXwR1w8kfw==",
"dependencies": {
"@opentelemetry/core": "1.28.0",
"@opentelemetry/semantic-conventions": "1.27.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.10.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/sdk-metrics": {
"version": "1.28.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-1.28.0.tgz",
"integrity": "sha512-43tqMK/0BcKTyOvm15/WQ3HLr0Vu/ucAl/D84NO7iSlv6O4eOprxSHa3sUtmYkaZWHqdDJV0AHVz/R6u4JALVQ==",
"dependencies": {
"@opentelemetry/core": "1.28.0",
"@opentelemetry/resources": "1.28.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.3.0 <1.10.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/sdk-trace-base": {
"version": "1.28.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.28.0.tgz",
"integrity": "sha512-ceUVWuCpIao7Y5xE02Xs3nQi0tOGmMea17ecBdwtCvdo9ekmO+ijc9RFDgfifMl7XCBf41zne/1POM3LqSTZDA==",
"dependencies": {
"@opentelemetry/core": "1.28.0",
"@opentelemetry/resources": "1.28.0",
"@opentelemetry/semantic-conventions": "1.27.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.10.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.27.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.27.0.tgz",
"integrity": "sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/exporter-trace-otlp-grpc": {
"version": "0.55.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-grpc/-/exporter-trace-otlp-grpc-0.55.0.tgz",